Merge pull request #35 from kaferi/master

Update to v20.4

Author: andrey-kotlyarov

README.md

@@ -526,6 +526,7 @@ Class | Description
 [**HtmlMarkupGenerationModes**](docs/HtmlMarkupGenerationModes.md) | Sometimes specific reqirments to created HTML are present. This enum defines HTML preparing modes that can be used during conversion of PDF to HTML to match such specific requirments. 
 [**Image**](docs/Image.md) | Represents image DTO.
 [**ImageFooter**](docs/ImageFooter.md) | Represents Pdf image footer.
+[**ImageFragment**](docs/ImageFragment.md) | Represents Image Fragment DTO.
 [**ImageHeader**](docs/ImageHeader.md) | Represents Pdf image header.
 [**ImageResponse**](docs/ImageResponse.md) | Represents response containing single image info
 [**Images**](docs/Images.md) | Represents list of images.

docs/Cell.md

@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **border** | [**BorderInfo**](BorderInfo.md) | Gets or sets the border. | [optional]
 **backgroundColor** | [**Color**](Color.md) | Gets or sets the background color. | [optional]
 **backgroundImageFile** | **string** | Gets or sets the background image file. | [optional]
+**backgroundImageStorageFile** | **string** | Gets or sets path of the background image file from storage. | [optional]
 **alignment** | [**HorizontalAlignment**](HorizontalAlignment.md) | Gets or sets the alignment. | [optional]
 **defaultCellTextState** | [**TextState**](TextState.md) | Gets or sets the default cell text state. | [optional]
 **paragraphs** | [**Array<TextRect>**](TextRect.md) | Gets or sets the cell's formatted text. | [optional]
@@ -17,6 +18,8 @@ Name | Type | Description | Notes
 **colSpan** | **number** | Gets or sets the column span. | [optional]
 **rowSpan** | **number** | Gets or sets the row span. | [optional]
 **width** | **number** | Gets or sets the column width. | [optional]
+**htmlFragment** | **string** | Gets or sets Html fragment. | [optional]
+**images** | [**Array<ImageFragment>**](ImageFragment.md) | Gets or sets ImageFragment list. | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) [[View Source]](../src/models/cell.ts)
 

docs/ImageFragment.md

@@ -0,0 +1,16 @@
+# ImageFragment
+Represents Image Fragment DTO.
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**imageFile** | **string** | Gets or sets full storage path of image. | 
+**fixWidth** | **number** | Gets or sets fix width of the image. | [optional]
+**fixHeight** | **number** | Gets or sets fix height of the image. | [optional]
+**horizontalAlignment** | [**HorizontalAlignment**](HorizontalAlignment.md) | Gets or sets horizontal alignment of the image. | [optional]
+**verticalAlignment** | [**VerticalAlignment**](VerticalAlignment.md) | Gets or sets vertical alignment of the image. | [optional]
+**imageScale** | **number** | Gets or sets ImageScale of the image. | [optional]
+**margin** | [**MarginInfo**](MarginInfo.md) | Gets or sets Margin of the image. | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) [[View Source]](../src/models/imageFragment.ts)
+

docs/PdfApi.md

@@ -3700,15 +3700,14 @@ Name | Type | Description  | Notes
 
 <a name="getPdfInStorageToLaTeX"></a>
 ## **getPdfInStorageToLaTeX**
-> getPdfInStorageToLaTeX(name, pagesCount, folder, storage)
+> getPdfInStorageToLaTeX(name, folder, storage)
 
 Converts PDF document (located on storage) to LaTeX format and returns resulting file in response content
 
 ### Parameters
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **name** | **string** | The document name. | 
-**pagesCount** | **number** | Pages count. | [optional]
 **folder** | **string** | The document folder. | [optional]
 **storage** | **string** | The document storage. | [optional]
 
@@ -7435,15 +7434,14 @@ Name | Type | Description  | Notes
 
 <a name="putPdfInRequestToLaTeX"></a>
 ## **putPdfInRequestToLaTeX**
-> putPdfInRequestToLaTeX(outPath, pagesCount, storage, file)
+> putPdfInRequestToLaTeX(outPath, storage, file)
 
 Converts PDF document (in request content) to LaTeX format and uploads resulting file to storage.
 
 ### Parameters
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **outPath** | **string** | Full resulting filename (ex. /folder1/folder2/result.tex) | 
-**pagesCount** | **number** | Pages count. | [optional]
 **storage** | **string** | The document storage. | [optional]
 **file** | **Buffer** | A file to be converted. | [optional]
 
@@ -7789,7 +7787,7 @@ Name | Type | Description  | Notes
 
 <a name="putPdfInStorageToLaTeX"></a>
 ## **putPdfInStorageToLaTeX**
-> putPdfInStorageToLaTeX(name, outPath, pagesCount, folder, storage)
+> putPdfInStorageToLaTeX(name, outPath, folder, storage)
 
 Converts PDF document (located on storage) to LaTeX format and uploads resulting file to storage
 
@@ -7798,7 +7796,6 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **name** | **string** | The document name. | 
 **outPath** | **string** | Full resulting filename (ex. /folder1/folder2/result.tex) | 
-**pagesCount** | **number** | Pages count. | [optional]
 **folder** | **string** | The document folder. | [optional]
 **storage** | **string** | The document storage. | [optional]
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "asposepdfcloud",
-    "version": "20.2.0",
+    "version": "20.4.0",
     "description": "Aspose.PDF Cloud SDK",
     "homepage": "https://products.aspose.cloud/pdf/cloud",
     "author": {

src/api/api.ts

@@ -64,6 +64,7 @@ import { GraphInfo } from "../models/graphInfo";
 import { HorizontalAlignment } from "../models/horizontalAlignment";
 import { HtmlDocumentType } from "../models/htmlDocumentType";
 import { HtmlMarkupGenerationModes } from "../models/htmlMarkupGenerationModes";
+import { ImageFragment } from "../models/imageFragment";
 import { ImageSrcType } from "../models/imageSrcType";
 import { ImageTemplate } from "../models/imageTemplate";
 import { ImageTemplatesRequest } from "../models/imageTemplatesRequest";
@@ -8846,11 +8847,10 @@ export class PdfApi {
      * 
      * @summary Converts PDF document (located on storage) to LaTeX format and returns resulting file in response content
      * @param name The document name.
-     * @param pagesCount Pages count.
      * @param folder The document folder.
      * @param storage The document storage.
      */
-    public async getPdfInStorageToLaTeX (name: string, pagesCount?: number, folder?: string, storage?: string) : Promise<{ response: http.IncomingMessage; body: Buffer;  }> {
+    public async getPdfInStorageToLaTeX (name: string, folder?: string, storage?: string) : Promise<{ response: http.IncomingMessage; body: Buffer;  }> {
         const localVarPath = this.basePath + '/pdf/{name}/convert/latex'
             .replace('{' + 'name' + '}', encodeURIComponent(String(name)).replace('%2F', '/'));
         let localVarQueryParameters: any = {};
@@ -8862,10 +8862,6 @@ export class PdfApi {
             throw new Error('Required parameter name was null or undefined when calling getPdfInStorageToLaTeX.');
         }
 
-        if (pagesCount !== undefined && null !== pagesCount) {
-            localVarQueryParameters['pagesCount'] = ObjectSerializer.serialize(pagesCount, "number");
-        }
-
         if (folder !== undefined && null !== folder) {
             localVarQueryParameters['folder'] = ObjectSerializer.serialize(folder, "string");
         }
@@ -19186,11 +19182,10 @@ export class PdfApi {
      * 
      * @summary Converts PDF document (in request content) to LaTeX format and uploads resulting file to storage.
      * @param outPath Full resulting filename (ex. /folder1/folder2/result.tex)
-     * @param pagesCount Pages count.
      * @param storage The document storage.
      * @param file A file to be converted.
      */
-    public async putPdfInRequestToLaTeX (outPath: string, pagesCount?: number, storage?: string, file?: Buffer) : Promise<{ response: http.IncomingMessage; body: AsposeResponse;  }> {
+    public async putPdfInRequestToLaTeX (outPath: string, storage?: string, file?: Buffer) : Promise<{ response: http.IncomingMessage; body: AsposeResponse;  }> {
         const localVarPath = this.basePath + '/pdf/convert/latex';
         let localVarQueryParameters: any = {};
         let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
@@ -19205,10 +19200,6 @@ export class PdfApi {
             localVarQueryParameters['outPath'] = ObjectSerializer.serialize(outPath, "string");
         }
 
-        if (pagesCount !== undefined && null !== pagesCount) {
-            localVarQueryParameters['pagesCount'] = ObjectSerializer.serialize(pagesCount, "number");
-        }
-
         if (storage !== undefined && null !== storage) {
             localVarQueryParameters['storage'] = ObjectSerializer.serialize(storage, "string");
         }
@@ -20283,11 +20274,10 @@ export class PdfApi {
      * @summary Converts PDF document (located on storage) to LaTeX format and uploads resulting file to storage
      * @param name The document name.
      * @param outPath Full resulting filename (ex. /folder1/folder2/result.tex)
-     * @param pagesCount Pages count.
      * @param folder The document folder.
      * @param storage The document storage.
      */
-    public async putPdfInStorageToLaTeX (name: string, outPath: string, pagesCount?: number, folder?: string, storage?: string) : Promise<{ response: http.IncomingMessage; body: AsposeResponse;  }> {
+    public async putPdfInStorageToLaTeX (name: string, outPath: string, folder?: string, storage?: string) : Promise<{ response: http.IncomingMessage; body: AsposeResponse;  }> {
         const localVarPath = this.basePath + '/pdf/{name}/convert/latex'
             .replace('{' + 'name' + '}', encodeURIComponent(String(name)).replace('%2F', '/'));
         let localVarQueryParameters: any = {};
@@ -20308,10 +20298,6 @@ export class PdfApi {
             localVarQueryParameters['outPath'] = ObjectSerializer.serialize(outPath, "string");
         }
 
-        if (pagesCount !== undefined && null !== pagesCount) {
-            localVarQueryParameters['pagesCount'] = ObjectSerializer.serialize(pagesCount, "number");
-        }
-
         if (folder !== undefined && null !== folder) {
             localVarQueryParameters['folder'] = ObjectSerializer.serialize(folder, "string");
         }

src/models/cell.ts

@@ -19,6 +19,7 @@
  *
  */
 
+import { ImageFragment } from "./imageFragment";
 import { VerticalAlignment } from "./verticalAlignment";
 import { TextRect } from "./textRect";
 import { TextState } from "./textState";
@@ -52,6 +53,10 @@ export class Cell {
     */
     'backgroundImageFile': string;
     /**
+    * Gets or sets path of the background image file from storage.
+    */
+    'backgroundImageStorageFile': string;
+    /**
     * Gets or sets the alignment.
     */
     'alignment': HorizontalAlignment;
@@ -83,6 +88,14 @@ export class Cell {
     * Gets or sets the column width.
     */
     'width': number;
+    /**
+    * Gets or sets Html fragment.
+    */
+    'htmlFragment': string;
+    /**
+    * Gets or sets ImageFragment list.
+    */
+    'images': Array<ImageFragment>;
 
     static discriminator = undefined;
 
@@ -112,6 +125,11 @@ export class Cell {
             "baseName": "BackgroundImageFile",
             "type": "string"
         },
+        {
+            "name": "backgroundImageStorageFile",
+            "baseName": "BackgroundImageStorageFile",
+            "type": "string"
+        },
         {
             "name": "alignment",
             "baseName": "Alignment",
@@ -151,6 +169,16 @@ export class Cell {
             "name": "width",
             "baseName": "Width",
             "type": "number"
+        },
+        {
+            "name": "htmlFragment",
+            "baseName": "HtmlFragment",
+            "type": "string"
+        },
+        {
+            "name": "images",
+            "baseName": "Images",
+            "type": "Array<ImageFragment>"
         }    ];
 
     static getAttributeTypeMap() {

src/models/imageFragment.ts

@@ -0,0 +1,103 @@
+ /**
+ *
+ *   Copyright (c) 2020 Aspose.PDF Cloud
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+import { MarginInfo } from "./marginInfo";
+import { VerticalAlignment } from "./verticalAlignment";
+import { HorizontalAlignment } from "./horizontalAlignment";
+
+/**
+* Represents Image Fragment DTO.
+*/
+export class ImageFragment {
+    /**
+    * Gets or sets full storage path of image.
+    */
+    'imageFile': string;
+    /**
+    * Gets or sets fix width of the image.
+    */
+    'fixWidth': number;
+    /**
+    * Gets or sets fix height of the image.
+    */
+    'fixHeight': number;
+    /**
+    * Gets or sets horizontal alignment of the image.
+    */
+    'horizontalAlignment': HorizontalAlignment;
+    /**
+    * Gets or sets vertical alignment of the image.
+    */
+    'verticalAlignment': VerticalAlignment;
+    /**
+    * Gets or sets ImageScale of the image.
+    */
+    'imageScale': number;
+    /**
+    * Gets or sets Margin of the image.
+    */
+    'margin': MarginInfo;
+
+    static discriminator = undefined;
+
+    static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
+        {
+            "name": "imageFile",
+            "baseName": "ImageFile",
+            "type": "string"
+        },
+        {
+            "name": "fixWidth",
+            "baseName": "FixWidth",
+            "type": "number"
+        },
+        {
+            "name": "fixHeight",
+            "baseName": "FixHeight",
+            "type": "number"
+        },
+        {
+            "name": "horizontalAlignment",
+            "baseName": "HorizontalAlignment",
+            "type": "HorizontalAlignment"
+        },
+        {
+            "name": "verticalAlignment",
+            "baseName": "VerticalAlignment",
+            "type": "VerticalAlignment"
+        },
+        {
+            "name": "imageScale",
+            "baseName": "ImageScale",
+            "type": "number"
+        },
+        {
+            "name": "margin",
+            "baseName": "Margin",
+            "type": "MarginInfo"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ImageFragment.attributeTypeMap;
+    }
+}
+
+

src/objectSerializer.ts

@@ -64,6 +64,7 @@ import { GraphInfo } from "./models/graphInfo";
 import { HorizontalAlignment } from "./models/horizontalAlignment";
 import { HtmlDocumentType } from "./models/htmlDocumentType";
 import { HtmlMarkupGenerationModes } from "./models/htmlMarkupGenerationModes";
+import { ImageFragment } from "./models/imageFragment";
 import { ImageSrcType } from "./models/imageSrcType";
 import { ImageTemplate } from "./models/imageTemplate";
 import { ImageTemplatesRequest } from "./models/imageTemplatesRequest";
@@ -372,6 +373,7 @@ let typeMap: {[index: string]: any} = {
     "FilesList": FilesList,
     "FilesUploadResult": FilesUploadResult,
     "GraphInfo": GraphInfo,
+    "ImageFragment": ImageFragment,
     "ImageTemplate": ImageTemplate,
     "ImageTemplatesRequest": ImageTemplatesRequest,
     "Link": Link,

test/baseTestPdfApi.ts

@@ -155,9 +155,8 @@ export function drawTable() {
           // change properties on paragraph AFTER first clearing and re-adding paragraphs
           else if (c == 4)
           {
-            cell.paragraphs[0].text = "y";
-            cell.paragraphs[0].textState = textState;
-            cell.paragraphs[0].textState.foregroundColor = { a: 0xFF, r: 0x00, g: 0x00, b: 0xFF };
+            cell.paragraphs = null;
+            cell.htmlFragment = '<ul><li>First</li><li>Second</li></ul>';
           }
           row.cells.push(cell);