Updated sources

product-team · product-team · commit 171eeba5f21c · 2022-03-17T06:51:09.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "groupdocs-conversion-cloud",
-  "version": "21.12.0",
+  "version": "22.3.0",
   "description": "GroupDocs.Conversion Cloud SDK for Node.js",
   "homepage": "https://products.groupdocs.cloud/conversion",
   "author": {
@@ -40,7 +40,7 @@
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.0.8",
     "chai": "^4.2.0",
-    "mocha": "^7.0.1",
+    "mocha": "^9.2.1",
     "ts-node": "^8.6.2",
     "tslint": "^5.17.0",
     "typescript": "^3.7.5"
diff --git a/src/api_client.ts b/src/api_client.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/api_error.ts b/src/api_error.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/auth.ts b/src/auth.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/configuration.ts b/src/configuration.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/conversion_api.ts b/src/conversion_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -161,6 +161,14 @@ export class ConvertApi {
             };
         }
 
+        if (requestObj.loadOptions !== undefined) {
+            formParams.loadOptions = JSON.stringify(requestObj.loadOptions);
+        }
+
+        if (requestObj.convertOptions !== undefined) {
+            formParams.convertOptions = JSON.stringify(requestObj.convertOptions);
+        }
+
         const requestOptions: request.Options = {
             method: "PUT",
             qs: queryParameters,
diff --git a/src/model.ts b/src/model.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -656,7 +656,11 @@ export class LoadOptions {
      * Attribute type map
      */
     public static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
-    ];
+        {
+            name: "format",
+            baseName: "format",
+            type: "string",
+        }    ];
 
     /**
      * Returns attribute type map
@@ -665,6 +669,11 @@ export class LoadOptions {
         return LoadOptions.attributeTypeMap;
     }
 
+    /**
+     * The format of input file, (\"docx\", for example). This field must be filled with correct input file format when using ConvertDirect method, which accept input file as binary stream, and, because of that, API can correctly handle LoadOptions. In regular conversion, the input file format taken from the input file name and this field ignored.
+     */
+    public format: string;
+    
     public constructor(init?: Partial<LoadOptions>) {
         
         Object.assign(this, init);
@@ -6932,12 +6941,24 @@ export class ConvertDocumentDirectRequest {
      * Number of pages to convert
      */
     public pagesCount: number;
+
+    /**
+     * Input file load options
+     */
+    public loadOptions: LoadOptions;
+
+    /**
+     * Conversion options
+     */
+    public convertOptions: ConvertOptions;
     
-    public constructor(format: string, file: Buffer, fromPage?: number, pagesCount?: number) {        
+    public constructor(format: string, file: Buffer, fromPage?: number, pagesCount?: number, loadOptions?: LoadOptions, convertOptions?: ConvertOptions) {        
         this.format = format;
         this.file = file;
         this.fromPage = fromPage;
         this.pagesCount = pagesCount;
+        this.loadOptions = loadOptions;
+        this.convertOptions = convertOptions;
     }
 }
 
diff --git a/src/package_version.ts b/src/package_version.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -25,4 +25,4 @@
 /**
  * Package version
  */
-export const PackageVersion: string = "21.12.0";
+export const PackageVersion: string = "22.3.0";
diff --git a/src/serializer.ts b/src/serializer.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/test/api/test_auth_api.ts b/test/api/test_auth_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/test/api/test_conversion_api.ts b/test/api/test_conversion_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,18 +26,20 @@ import { expect } from "chai";
 import "mocha";
 import * as TestContext from "../test_context";
 import { TestFile } from "../test_file";
-import { GetSupportedConversionTypesRequest,
+import {
+        GetSupportedConversionTypesRequest,
         GetDocumentMetadataRequest,
         ConvertDocumentRequest,
         ConvertDocumentDirectRequest,
         ConvertSettings,
         PdfConvertOptions,
-        JpgConvertOptions } from "../../src/model";
+        JpgConvertOptions,         
+        DocxLoadOptions} from "../../src/model";
 
 describe("test_conversion_api", () => {
     
     before(async () => {
-        process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
+        //process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
         await TestContext.uploadTestFiles();
     });
 
@@ -133,4 +135,22 @@ describe("test_conversion_api", () => {
         });          
     });
 
+    describe("test_convert_document_direct_options", () => {
+
+        it("convert document direct options", () => {            
+            const api = TestContext.getConvertApi();
+            var format = "pdf";
+            let filebuf = TestContext.getTestFileBuffer(TestFile.PasswordProtectedDocx);
+
+            let loadOptions = new DocxLoadOptions();
+            loadOptions.format = "docx";
+            loadOptions.password = TestFile.PasswordProtectedDocx.password;
+
+            var request = new ConvertDocumentDirectRequest(format, filebuf, undefined, undefined, loadOptions);
+            return api.convertDocumentDirect(request)
+                .then((result) => {     
+                    expect(result.length).greaterThan(0);
+                });
+        });          
+    });    
 });
diff --git a/test/api/test_file_api.ts b/test/api/test_file_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ import { TestFile } from "../test_file";
 describe("file_api", () => {
     
     before(async () => {
-        process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
+        //process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
         await TestContext.uploadTestFiles();
     });
 
diff --git a/test/api/test_folder_api.ts b/test/api/test_folder_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,7 @@ import * as TestContext from "../test_context";
 describe("folder_api", () => {
     
     before(async () => {
-        process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
+        //process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
         await TestContext.uploadTestFiles();
     });
 
diff --git a/test/api/test_storage_api.ts b/test/api/test_storage_api.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ import { TestFile } from "../test_file";
 describe("storage_api", () => {
     
     before(async () => {
-        process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
+        //process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = "0"
         await TestContext.uploadTestFiles();
     });
 
diff --git a/test/test_context.ts b/test/test_context.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
diff --git a/test/test_file.ts b/test/test_file.ts
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
-* Copyright (c) 2003-2021 Aspose Pty Ltd
+* Copyright (c) 2003-2022 Aspose Pty Ltd
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* The MIT License (MIT)`
`3`	`3`	`*`
`4`		`-* Copyright (c) 2003-2021 Aspose Pty Ltd`
	`4`	`+* Copyright (c) 2003-2022 Aspose Pty Ltd`
`5`	`5`	`*`
`6`	`6`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`7`	`7`	`* of this software and associated documentation files (the "Software"), to deal`