Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

README.md

@@ -16,12 +16,19 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
 - Add & remove watermarks and protection.
 - Read & write access to Document Object Model.
 
+## Enhancements in Version 22.4
+
+- Added ExportShapesAsSvg to HtmlSaveOption.
+- Added new endpoint '~/styles/copy_from'.
+
+
 ## Enhancements in Version 22.3
 
 - Online methods returns the dictionary of files with included original filename as key instead of single file content in responses.
 - Parameters contained sensitive data should be passed in encrypted form. Names of the parameters have 'encrypted' prefix.
 - Added Encrypt method to encrypt data on the API public key. Use it to prepare values for parameters required encrypted data.
 - GetPublicKey method is not billable.
+- Changed type of enumerations for members of SaveOptionsData and other inherited classes from string to enum.
 
 
 ## Enhancements in Version 22.2

TestData/DocumentElements/Styles/StyleTemplate.docx

@@ -1,6 +1,6 @@
 {
   "name": "asposewordscloud",
-  "version": "22.3.0",
+  "version": "22.4.0",
   "description": "Aspose.Words Cloud SDK for Node.js",
   "homepage": "https://products.aspose.cloud/words/cloud",
   "author": {

package.json

@@ -423,6 +423,24 @@ export class WordsApi implements Encryptor {
         return Promise.resolve(result);
     }
 
+    /**
+     * Copies styles from the origin document to the target document.
+     * @param requestObj contains request parameters
+     */
+    public async copyStylesFromTemplate(requestObj: model.CopyStylesFromTemplateRequest): Promise< model.WordsIncomingMessage< model.WordsResponse > > {
+        if (requestObj === null || requestObj === undefined) {
+            throw new Error('Required parameter "request" was null or undefined when calling copyStylesFromTemplate.');
+        }
+
+        const requestOptions = await requestObj.createRequestOptions(this.configuration, this); 
+
+        const response = await invokeApiMethod(requestOptions, this.configuration);
+        const result = new model.WordsIncomingMessage< model.WordsResponse >();    
+        result.response = response;
+        result.body = requestObj.createResponse(response.body, response.headers);
+        return Promise.resolve(result);
+    }
+
     /**
      * Supported extensions: ".doc", ".docx", ".docm", ".dot", ".dotm", ".dotx", ".flatopc", ".fopc", ".flatopc_macro", ".fopc_macro", ".flatopc_template", ".fopc_template", ".flatopc_template_macro", ".fopc_template_macro", ".wordml", ".wml", ".rtf".
      * @param requestObj contains request parameters

src/api.ts

@@ -131,7 +131,7 @@ async function invokeApiMethodInternal(requestOptions: request.OptionsWithUri, c
     requestOptions.timeout = 1000 * confguration.timeout;
 
     requestOptions.headers["x-aspose-client"] = "nodejs sdk";
-    requestOptions.headers["x-aspose-client-version"] = "22.3";
+    requestOptions.headers["x-aspose-client-version"] = "22.4";
 
 	requestOptions.uri = encodeURI(requestOptions.uri.toString());
 

src/internal/requestHelper.ts

@@ -140,6 +140,11 @@ export class HtmlSaveOptionsData extends SaveOptionsData {
             baseName: "ExportRoundtripInformation",
             type: "boolean",
         },
+        {
+            name: "exportShapesAsSvg",
+            baseName: "ExportShapesAsSvg",
+            type: "boolean",
+        },
         {
             name: "exportTextBoxAsSvg",
             baseName: "ExportTextBoxAsSvg",
@@ -349,6 +354,11 @@ export class HtmlSaveOptionsData extends SaveOptionsData {
      */
     public exportRoundtripInformation: boolean;
 
+    /**
+     * Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.
+     */
+    public exportShapesAsSvg: boolean;
+
     /**
      * Gets or sets the flag, that controls how textboxes represented by Aspose.Words.Drawing.Shape are saved to HTML, MHTML or EPUB. The default value is false.
      * When set to true, exports textboxes as inline "svg" elements. When false, exports as "image" elements.

src/model/htmlSaveOptionsData.ts

@@ -2911,6 +2911,125 @@ export class CopyStyleOnlineRequest implements RequestInterface {
 	}
 }
 
+/**
+ * Request model for CopyStylesFromTemplate operation.
+ * Copies styles from the origin document to the target document.
+ */
+export class CopyStylesFromTemplateRequest implements RequestInterface {
+
+    public constructor(init?: Partial< CopyStylesFromTemplateRequest >) {
+        Object.assign(this, init);
+    }
+
+    /**
+     * The filename of the target document.
+     */
+    public name: string;
+
+    /**
+     * The filename of the origin document.
+     */
+    public templateName: string;
+
+    /**
+     * Original document folder.
+     */
+    public folder: string;
+
+    /**
+     * Original document storage.
+     */
+    public storage: string;
+
+    /**
+     * Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
+     */
+    public loadEncoding: string;
+
+    /**
+     * Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.
+     */
+    public password: string;
+
+    /**
+     * Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.
+     */
+    public encryptedPassword: string;
+
+    /**
+     * Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
+     */
+    public destFileName: string;
+
+    /**
+     * Initials of the author to use for revisions.If you set this parameter and then make some changes to the document programmatically, save the document and later open the document in MS Word you will see these changes as revisions.
+     */
+    public revisionAuthor: string;
+
+    /**
+     * The date and time to use for revisions.
+     */
+    public revisionDateTime: string;
+
+	/**
+	 * create the requst options for this request
+	 * @param configuration a configuration for the request
+	 * @param data encryptor 
+	 */
+	public async createRequestOptions(configuration: Configuration, _encryptor: Encryptor) : Promise<request.OptionsWithUri> {
+        let localVarPath = configuration.getApiBaseUrl() + "/words/{name}/styles/copy_from"
+            .replace("/{" + "name" + "}", (this.name !== null && this.name !== undefined) ? "/" + String(this.name) : "")
+            .replace("//", "/");
+        const queryParameters: any = {};
+        // verify required parameter 'this.name' is not undefined
+        if (this.name === undefined) {
+            throw new Error('Required parameter "this.name" was undefined when calling copyStylesFromTemplate.');
+        }
+
+        // verify required parameter 'this.name' is not null
+        if (this.name === null) {
+            throw new Error('Required parameter "this.name" was null when calling copyStylesFromTemplate.');
+        }
+
+        // verify required parameter 'this.templateName' is not undefined
+        if (this.templateName === undefined) {
+            throw new Error('Required parameter "this.templateName" was undefined when calling copyStylesFromTemplate.');
+        }
+
+        // verify required parameter 'this.templateName' is not null
+        if (this.templateName === null) {
+            throw new Error('Required parameter "this.templateName" was null when calling copyStylesFromTemplate.');
+        }
+
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "templateName", this.templateName, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "folder", this.folder, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "storage", this.storage, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "loadEncoding", this.loadEncoding, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "password", this.password, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "encryptedPassword", this.encryptedPassword, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "destFileName", this.destFileName, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "revisionAuthor", this.revisionAuthor, _encryptor);
+        localVarPath = await addQueryParameterToUrl(localVarPath, queryParameters, "revisionDateTime", this.revisionDateTime, _encryptor);
+
+        const requestOptions: request.Options = {
+            method: "PUT",
+            qs: queryParameters,
+            uri: localVarPath,
+            json: true,
+        };
+
+
+        return Promise.resolve(requestOptions);
+    }
+
+	/**
+	 * create response from string
+	 */
+	createResponse(_response: Buffer, _headers: http.IncomingHttpHeaders): any {
+        return ObjectSerializer.deserialize(_response, "WordsResponse");
+	}
+}
+
 /**
  * Request model for CreateDocument operation.
  * Supported extensions: ".doc", ".docx", ".docm", ".dot", ".dotm", ".dotx", ".flatopc", ".fopc", ".flatopc_macro", ".fopc_macro", ".flatopc_template", ".fopc_template", ".flatopc_template_macro", ".fopc_template_macro", ".wordml", ".wml", ".rtf".

src/model/model.ts

@@ -332,6 +332,7 @@ export namespace PdfSaveOptionsData {
         PdfA1b = 'PdfA1b' as any,
         PdfA2a = 'PdfA2a' as any,
         PdfA2u = 'PdfA2u' as any,
+        PdfA4 = 'PdfA4' as any,
         PdfUa1 = 'PdfUa1' as any
     }
 

src/model/pdfSaveOptionsData.ts

@@ -421,4 +421,42 @@ describe("styles", () => {
 
        });
     });
+
+    // Test for copying styles from a template.
+    describe("copyStylesFromTemplate test", () => {
+        it("should return response with code 200", () => {
+            const wordsApi = BaseTest.initializeWordsApi();
+            const remoteFileName = "TestCopyStylesFromTemplate.docx";
+            const templateFolder = "DocumentElements/Styles";
+            const templateName = "StyleTemplate.docx";
+
+            return wordsApi.uploadFileToStorage(
+                remoteDataFolder + "/" + remoteFileName,
+                BaseTest.localBaseTestDataFolder + localFile
+            ).then((result0) => {
+                expect(result0.response.statusMessage).to.equal("OK");
+                return wordsApi.uploadFileToStorage(
+                    remoteDataFolder + "/" + templateName,
+                    BaseTest.localBaseTestDataFolder + templateFolder + "/" + templateName
+                ).then((result1) => {
+                    expect(result1.response.statusMessage).to.equal("OK");
+                    const request = new model.CopyStylesFromTemplateRequest({
+                        name: remoteFileName,
+                        templateName: templateName,
+                        folder: remoteDataFolder
+                    });
+
+                    // Act
+                    return wordsApi.copyStylesFromTemplate(request)
+                    .then((resultApi) => {
+                        // Assert
+                        expect(resultApi.response.statusCode).to.equal(200);
+                    });
+
+                });
+
+            });
+
+       });
+    });
 });