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

Author: dynabic-billing-team

.eslintignore

@@ -0,0 +1,8 @@
+bdd
+dist
+examples
+ExamplesData
+node_modules
+reports
+scripts
+TestData

.eslintrc.json

@@ -0,0 +1,29 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "no-prototype-builtins": "off",
+        "no-useless-catch": "off",
+        "@typescript-eslint/no-namespace": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/no-inferrable-types": "off",
+        "@typescript-eslint/no-array-constructor": "off",
+        "@typescript-eslint/no-extra-semi": "off"
+    }
+}

.vscode/tasks.json

@@ -32,21 +32,5 @@
                 "isDefault": true           
             }
         },
-        {
-            "label": "runTsLint",
-            "type": "npm",
-            "script": "lint",
-            "problemMatcher": {
-                "base": "$tslint5",
-                "fileLocation": "relative"
-            }
-        },
-        {
-            "label": "runCucumber",
-            "type": "gulp",
-            "task": "cucumber",
-            "problemMatcher": [],
-            "group": "test"
-        },
     ]
 }

Jenkinsfile

@@ -67,7 +67,7 @@ def runtests(dockerImageVersion)
                             ]) {
                                 sh "npm install"
 
-                                sh "npm run gulp build"
+                                sh "npm run tsc"
                                 if (params.branch == 'refs/heads/master'){
                                     sh "npm run lint"
                                 }
@@ -88,7 +88,7 @@ def runtests(dockerImageVersion)
                     gitlabCommitStatus("bdd-tests") {
                         stage('bdd-tests'){
                             try {
-                                sh "npm run gulp cucumber"
+                                sh "npm run cucumber"
                             } finally {
                                 cucumber 'reports/**.json'
                             }

JenkinsfileRelease

@@ -28,7 +28,7 @@ node('words-linux') {
 					stage('build package')
 					{
 						sh "npm install"
-						sh "npm run gulp buildRelease"
+						sh "npm run release"
 						packageName = sh(returnStdout: true, script: 'npm pack').trim()
 
 						stash name: "newPackage", includes: "${packageName}" 
@@ -49,7 +49,7 @@ node('words-linux') {
 
 				gitlabCommitStatus("rebuild with the package") {
 					stage('rebuild with the package'){												
-						sh "npm run gulp build"
+						sh "npm run tsc"
 
 						if (params.branch == 'refs/heads/master'){
 							sh "npm run lint"
@@ -70,7 +70,7 @@ node('words-linux') {
 				gitlabCommitStatus("bdd package tests") {
 					stage('bdd package tests'){
 						try {
-							sh "npm run gulp cucumber"
+							sh "npm run cucumber"
 						} finally {
 							cucumber 'reports/**.json'
 						}

README.md

@@ -16,10 +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.6
+
+- Added 'DeleteBookmark' and 'DeleteBookmarkOnline' API methods for delete bookmarks by name from the document.
+- Added 'DeleteBookmarks' and 'DeleteBookmarksOnline' API methods for delete all bookmarks from the document.
+- Added 'InsertBookmark' and 'InsertBookmarkOnline' API methods for create new bookmarks in the document.
+- Support all save formats for 'CreateDocument' operation.
+
+
 ## Enhancements in Version 22.5
 
 - Internal API fixes and improvments.
 
+
 ## Enhancements in Version 22.4
 
 - Added ExportShapesAsSvg to HtmlSaveOption.

TestData/DocumentElements/Sections/Source.docx

@@ -24,7 +24,7 @@
 
 import { Buffer } from "buffer";
 import { expect } from "chai";
-import { Then } from "cucumber";
+import { Then } from "@cucumber/cucumber";
 
 Then(/^document is returned as an attachment$/, function() {
     expect(this.response.body).to.is.instanceof(Buffer);

bdd/steps/common/fileResultSteps.ts

@@ -22,10 +22,10 @@
 * SOFTWARE.
 */
 
-import { Given } from "cucumber";
+import { Given } from "@cucumber/cucumber";
 import * as BaseTest from "../../../test/baseTest";
 
-Given(/^I have specified format (.*) document to be converted$/, function(format) {    
+Given(/^I have specified format (.*) document to be converted$/, function(format) {
     this.request.format = format;
 });
 

bdd/steps/common/specifyOutputFormatRequestSteps.ts

@@ -23,25 +23,21 @@
 */
 
 import { expect } from "chai";
-import { Given, Then } from "cucumber";
+import { Given, Then } from "@cucumber/cucumber";
 import * as BaseTest from "../../../test/baseTest";
 import { DeleteFileRequest, DownloadFileRequest } from "../../../src/api";
 
 Given(/^I have uploaded document with name (.*) and subfolder is (.*) to storage$/, {timeout: 60000}, async function (documentName, folder) {
 
-    const wordsApi = BaseTest.initializeWordsApi();
-
     const remotePath = BaseTest.remoteBaseFolder + folder;
     const localPath = BaseTest.localBaseTestDataFolder + folder + documentName;
 
-    const result = await wordsApi.uploadFileToStorage(remotePath + documentName, localPath);
+    const result = await this.wordsApi.uploadFileToStorage(remotePath + documentName, localPath);
     expect(result.response.statusMessage).to.equal("OK");
 });
 
 Given(/^There is no file (.*) on storage in (.*) folder$/, {timeout: 60000}, async function (documentName, folder) {
 
-    const wordsApi = BaseTest.initializeWordsApi();
-
     let remotePath = BaseTest.remoteBaseFolder + folder + documentName;
     if (folder === "output") {
         remotePath = BaseTest.remoteBaseTestOutFolder + documentName;
@@ -50,14 +46,12 @@ Given(/^There is no file (.*) on storage in (.*) folder$/, {timeout: 60000}, asy
     const request = new DeleteFileRequest();
     request.path = remotePath;
 
-    const result = await wordsApi.deleteFile(request);
+    const result = await this.wordsApi.deleteFile(request);
     expect(result.statusMessage).to.equal("OK");
 });
 
 Then(/^document (.*) is existed on storage in (.*) folder$/, {timeout: 60000}, async function (documentName, folder) {
 
-    const wordsApi = BaseTest.initializeWordsApi();
-
     let remotePath = BaseTest.remoteBaseFolder + folder + documentName;
 
     if (folder === "output") {
@@ -67,6 +61,6 @@ Then(/^document (.*) is existed on storage in (.*) folder$/, {timeout: 60000}, a
     const request =  new DownloadFileRequest();
     request.path = remotePath;
 
-    const result = await wordsApi.downloadFile(request);
+    const result = await this.wordsApi.downloadFile(request);
     expect(result.response.statusMessage).to.equal("OK");
 });