d5-api-initializer 1.4.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-api-initializer",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "license": "MIT",
   "dependencies": {},
   "main": "publish/cjs/d5-api-initializer",
@@ -35,13 +35,13 @@
     "@types/node": "20.11.16",
     "archiver": "6.0.1",
     "copy-webpack-plugin": "^11.0.0",
-    "webpack": "5.86.0",
-    "webpack-cli": "5.1.4",
-    "dotenv": "8.2.0",
+    "webpack": "5.98.0",
+    "webpack-cli": "6.0.1",
+    "dotenv": "16.4.7",
     "eslint": "7.19.0",
     "rimraf": "5.0.5",
-    "ts-loader": "8.0.17",
+    "ts-loader": "9.5.2",
     "tsup": "7.0.0",
-    "typescript": "5.3.3"
+    "typescript": "5.7.3"
   }
 }

package/publish/cjs/d5-api-initializer.cjs

@@ -606,6 +606,76 @@ var ApiCore = class {
    */
 };
 
+// src/typeUtils.ts
+var types = {
+  "[object Array]": "array",
+  "[object Date]": "date",
+  "[object Object]": "object",
+  "[object String]": "string",
+  "[object Null]": "null"
+};
+var type = function(object) {
+  const typeOfObject = Object.prototype.toString.call(object);
+  return typeof object === "object" ? types[typeOfObject] || "object" : typeof object;
+};
+var isDate = function(object) {
+  return type(object) === "date";
+};
+var isUndefined = (val) => val === void 0;
+var isDefined = function(value) {
+  return value !== null && !isUndefined(value);
+};
+var isFunction = function(object) {
+  return typeof object === "function";
+};
+var isObject = function(value) {
+  return type(value) === "object" && !isNull(value) && !isArray(value) && !isDate(value);
+};
+var isNull = function(value) {
+  return type(value) === "null";
+};
+var isArray = function(value) {
+  return type(value) === "array";
+};
+
+// src/classes/addWaterMark.ts
+var convertSourceTypeToLoadParams = (params) => {
+  if (params.sourceType === "report") {
+    return {
+      report: params.config
+    };
+  }
+  return params.config;
+};
+function addWatermarkToPdf(jsWapiRequest, params) {
+  params.watermarks.forEach((watermark) => {
+    if (!isDefined(watermark.position))
+      throw new Error("Position is undefined for watermark");
+    if (!isObject(watermark.position) && !isFunction(watermark.position))
+      throw new Error("Position must be type of object or function");
+  });
+  jsWapiRequest.pdf().load({
+    ...convertSourceTypeToLoadParams(params.sourcePdf),
+    callback: (origPdf) => {
+      params.watermarks.forEach((watermark) => {
+        jsWapiRequest.pdf().load({
+          ...convertSourceTypeToLoadParams(watermark),
+          callback: (stampPdf) => {
+            if (isObject(watermark.position)) {
+              const position = watermark.position;
+              origPdf.overlay(stampPdf, { page: position.page, x: position.x, y: position.y });
+            }
+            if (typeof watermark.position === "function") {
+              origPdf.overlay(stampPdf, watermark.position(origPdf, stampPdf));
+            }
+          }
+        });
+      });
+      origPdf.save(params.saveConfig);
+    }
+  });
+}
+
 // src/classes/ApiRequest.ts
 var ApiRequest = class {
   constructor(jsWapiRequest, objectName) {
@@ -836,6 +906,9 @@ var ApiRequest = class {
   newApiInvoker(objectName, operName) {
     return new ApiInvoker(this.newJSWapiInvoker(objectName, operName), objectName);
   }
+  addWatermarkToPdf(params) {
+    addWatermarkToPdf(this._jsWapiRequest, params);
+  }
   /**
    * Переводит и форматирует строку из словаря переводов согласно текущего языка приложения.
    * @param msgKey

package/publish/d5-api-initializer.d.ts

@@ -42,9 +42,27 @@ declare namespace jsWapi {
         getParams(): any;
         getUserId(): number;
         getPage(): number;
+        addSorts(sorts: string[]): JSWapiRequest;
+        putAggregatedColumns(columns: any): JSWapiRequest;
+        addColumns(columns: string[]): JSWapiRequest;
+        putNestedColumns(columns: Record<string, any>): JSWapiRequest;
+        putFilters(filters: IFiltersCollection): JSWapiRequest;
+        putParam(params: Record<string, any>): JSWapiRequest;
+        removeSorts(sortsNames: string[]): JSWapiRequest;
+        removeColumns(columnsNames: string[]): JSWapiRequest;
+        removeAggregatedColumns(aggregatedColumnsNames: string[]): JSWapiRequest;
+        removeNestedColumns(nestedColumnsNames: string[]): JSWapiRequest;
+        removeParams(paramsNames: string[]): JSWapiRequest;
+        removeFilters(filtersNames: string[]): JSWapiRequest;
+        isFilterExists(filterName: string): boolean;
+        invoke(): JSWapiResponse;
+        newJSWapiInvoker(objectName: string, operName: string): JSWapiInvoker;
         getFirstRows(): number;
         getRowsPerPage(): number;
         getLanguage(): string;
+        pdf(): JSWapiPdf;
+        getMultiFileAsString(...arg: string[]): any;
+        getMultiExcelFileAsJson(...arg: string[]): any;
         getRequest(object: string): Record<string, any>[];
         getFilter(filterName: string): any;
         getFilterEqualOneValue(filterName: string): any;
@@ -61,6 +79,7 @@ declare namespace jsWapi {
         setRowsPerPage(number: number): JSWapiRequest;
         setFirstRows(number: number): JSWapiRequest;
         setRequest(request: any): JSWapiRequest;
+        putRequest(objectName: string, req: any): JSWapiRequest;
         setHierarchy(parentColumn: string, requestKind?: number): JSWapiRequest;
     };
     type JSWapiResponse = {
@@ -142,6 +161,64 @@ declare namespace jsWapi {
         putJSWapiOper(operation: string, callback: (request: JSWapiRequest, response: JSWapiResponse) => void): void;
     }
     function setJSWapiObject(init: (object: JSWapiApplication) => void): void;
+    type JSWapiPdfLoadParamsObject = {
+        object: string;
+        field: string;
+        keyValue: any;
+        callback: (pdf: JSWapiPdfDocument) => void;
+    };
+    type JSWapiPdfLoadParamsReport = {
+        report: {
+            type: 'dx' | 'xls';
+            name: string;
+            params: Record<string, any>;
+        } | {
+            type: 'tax';
+            code: string;
+            params: Record<string, any>;
+        };
+        callback: (pdf: JSWapiPdfDocument) => void;
+    };
+    type JSWapiPdfLoadParams = JSWapiPdfLoadParamsObject | JSWapiPdfLoadParamsReport;
+    type JSWapiStampPosition = {
+        page: number;
+        x: number;
+        y: number;
+    };
+    interface JSWapiPdfDocument {
+        save(params: {
+            object: string;
+            keyValue: any;
+            field: string;
+            fileName: string;
+        }): void;
+        /**
+         * На поточний документ накласти печать stampPdf
+         * @param stampPdf PDF документ на который будет наложено текущий документ
+         * @param params
+         * @param params.page номер страницы, на которую накладывать. Если page < 0, то нумерация с конца (т.е. page = -1 - последняя страница)
+         * @param params.x координата левого угла в мм
+         * @param params.y координата верхнего угла в мм
+         */
+        overlay(stampPdf: JSWapiPdfDocument, params: JSWapiStampPosition): void;
+        /**
+         * Ширина страницы в мм
+         * @param pageNumber Номер страницы. Если pageNumber < 0, то нумеровать с конца
+         */
+        getPageWidth(pageNumber: number): number;
+        /**
+         * Высота страницы в мм
+         * @param pageNumber Номер страницы. Если pageNumber < 0, то нумеровать с конца
+         */
+        getPageHeight(pageNumber: number): number;
+        /**
+         * Количество страниц
+         */
+        getPageCount(): number;
+    }
+    interface JSWapiPdf {
+        load(params: JSWapiPdfLoadParams): JSWapiPdf;
+    }
 }
 
 declare class FileLink {
@@ -258,10 +335,34 @@ declare class ApiInvoker implements IInvoker$1<ApiInvoker> {
     invoke(): ApiResponse;
 }
 
+type SourceTypeReport = {
+    sourceType: 'report';
+    config: jsWapi.JSWapiPdfLoadParamsReport['report'];
+};
+type SourceTypeObject = {
+    sourceType: 'object';
+    config: Omit<jsWapi.JSWapiPdfLoadParamsObject, 'callback'>;
+};
+type SourceTypeList = SourceTypeReport | SourceTypeObject;
+type SaveConfig = {
+    object: string;
+    keyValue: any;
+    field: string;
+    fileName: string;
+};
+type WaterMarkSourceType = SourceTypeList & {
+    position: ((sourcePdf: jsWapi.JSWapiPdfDocument, stampPdf: jsWapi.JSWapiPdfDocument) => jsWapi.JSWapiStampPosition) | jsWapi.JSWapiStampPosition;
+};
+type AddWatermarkToPdfParams = {
+    sourcePdf: SourceTypeList;
+    watermarks: Array<WaterMarkSourceType>;
+    saveConfig: SaveConfig;
+};
+
 declare class ApiRequest {
     private _jsWapiRequest;
     private readonly _objectName;
-    constructor(jsWapiRequest: any, objectName: string);
+    constructor(jsWapiRequest: jsWapi.JSWapiRequest, objectName: string);
     get objectName(): string;
     get columns(): string[];
     get aggregatedColumns(): IMappedCollection;
@@ -336,8 +437,9 @@ declare class ApiRequest {
     removeFilters(filtersNames: string[]): ApiRequest;
     hasFilter(filterName: string): boolean;
     invoke(): ApiResponse;
-    newJSWapiInvoker(objectName: string, operName: string): any;
+    newJSWapiInvoker(objectName: string, operName: string): jsWapi.JSWapiInvoker;
     newApiInvoker(objectName: string, operName: string): ApiInvoker;
+    addWatermarkToPdf(params: AddWatermarkToPdfParams): void;
     /**
      * Переводит и форматирует строку из словаря переводов согласно текущего языка приложения.
      * @param msgKey
@@ -440,22 +542,25 @@ declare class ApiHttpResponse {
 }
 
 interface IFilterValue {
-    '='?: string | number | Array<string | number>;
-    '>'?: string | number | Array<string | number>;
-    '>='?: string | number | Array<string | number>;
-    '<'?: string | number | Array<string | number>;
-    '<='?: string | number | Array<string | number>;
-    '!='?: string | number | Array<string | number>;
-    'between'?: string | number | Array<string | number>;
-    'like'?: string | number | Array<string | number>;
-    '%'?: string | number | Array<string | number>;
+    '='?: string | number | null | Array<string | number>;
+    '=~'?: string | null | Array<string>;
+    '>'?: string | number;
+    '>='?: string | number;
+    '<'?: string | number;
+    '<='?: string | number;
+    '!='?: string | number | null | Array<string | number>;
+    '<>'?: string | number | null | Array<string | number>;
+    'between'?: [string | number, string | number];
+    'like'?: string | number;
+    '%'?: string;
+    '%~'?: string;
 }
 interface IFilter {
     [fieldName: string]: IFilterValue;
 }
-interface IFiltersCollection {
-    [property: string]: IFilterValue | IFilter[];
-}
+type IFiltersCollection = {
+    [fieldName: string]: IFilterValue | IFilterValue[] | IFiltersCollection[];
+};
 interface IMappedCollection {
     [name: string]: any;
 }

package/publish/d5-api-initializer.legacy-esm.js

@@ -567,6 +567,76 @@ var ApiCore = class {
    */
 };
 
+// src/typeUtils.ts
+var types = {
+  "[object Array]": "array",
+  "[object Date]": "date",
+  "[object Object]": "object",
+  "[object String]": "string",
+  "[object Null]": "null"
+};
+var type = function(object) {
+  const typeOfObject = Object.prototype.toString.call(object);
+  return typeof object === "object" ? types[typeOfObject] || "object" : typeof object;
+};
+var isDate = function(object) {
+  return type(object) === "date";
+};
+var isUndefined = (val) => val === void 0;
+var isDefined = function(value) {
+  return value !== null && !isUndefined(value);
+};
+var isFunction = function(object) {
+  return typeof object === "function";
+};
+var isObject = function(value) {
+  return type(value) === "object" && !isNull(value) && !isArray(value) && !isDate(value);
+};
+var isNull = function(value) {
+  return type(value) === "null";
+};
+var isArray = function(value) {
+  return type(value) === "array";
+};
+
+// src/classes/addWaterMark.ts
+var convertSourceTypeToLoadParams = (params) => {
+  if (params.sourceType === "report") {
+    return {
+      report: params.config
+    };
+  }
+  return params.config;
+};
+function addWatermarkToPdf(jsWapiRequest, params) {
+  params.watermarks.forEach((watermark) => {
+    if (!isDefined(watermark.position))
+      throw new Error("Position is undefined for watermark");
+    if (!isObject(watermark.position) && !isFunction(watermark.position))
+      throw new Error("Position must be type of object or function");
+  });
+  jsWapiRequest.pdf().load({
+    ...convertSourceTypeToLoadParams(params.sourcePdf),
+    callback: (origPdf) => {
+      params.watermarks.forEach((watermark) => {
+        jsWapiRequest.pdf().load({
+          ...convertSourceTypeToLoadParams(watermark),
+          callback: (stampPdf) => {
+            if (isObject(watermark.position)) {
+              const position = watermark.position;
+              origPdf.overlay(stampPdf, { page: position.page, x: position.x, y: position.y });
+            }
+            if (typeof watermark.position === "function") {
+              origPdf.overlay(stampPdf, watermark.position(origPdf, stampPdf));
+            }
+          }
+        });
+      });
+      origPdf.save(params.saveConfig);
+    }
+  });
+}
+
 // src/classes/ApiRequest.ts
 var ApiRequest = class {
   constructor(jsWapiRequest, objectName) {
@@ -797,6 +867,9 @@ var ApiRequest = class {
   newApiInvoker(objectName, operName) {
     return new ApiInvoker(this.newJSWapiInvoker(objectName, operName), objectName);
   }
+  addWatermarkToPdf(params) {
+    addWatermarkToPdf(this._jsWapiRequest, params);
+  }
   /**
    * Переводит и форматирует строку из словаря переводов согласно текущего языка приложения.
    * @param msgKey

package/publish/d5-api-initializer.mjs

@@ -567,6 +567,76 @@ var ApiCore = class {
    */
 };
 
+// src/typeUtils.ts
+var types = {
+  "[object Array]": "array",
+  "[object Date]": "date",
+  "[object Object]": "object",
+  "[object String]": "string",
+  "[object Null]": "null"
+};
+var type = function(object) {
+  const typeOfObject = Object.prototype.toString.call(object);
+  return typeof object === "object" ? types[typeOfObject] || "object" : typeof object;
+};
+var isDate = function(object) {
+  return type(object) === "date";
+};
+var isUndefined = (val) => val === void 0;
+var isDefined = function(value) {
+  return value !== null && !isUndefined(value);
+};
+var isFunction = function(object) {
+  return typeof object === "function";
+};
+var isObject = function(value) {
+  return type(value) === "object" && !isNull(value) && !isArray(value) && !isDate(value);
+};
+var isNull = function(value) {
+  return type(value) === "null";
+};
+var isArray = function(value) {
+  return type(value) === "array";
+};
+
+// src/classes/addWaterMark.ts
+var convertSourceTypeToLoadParams = (params) => {
+  if (params.sourceType === "report") {
+    return {
+      report: params.config
+    };
+  }
+  return params.config;
+};
+function addWatermarkToPdf(jsWapiRequest, params) {
+  params.watermarks.forEach((watermark) => {
+    if (!isDefined(watermark.position))
+      throw new Error("Position is undefined for watermark");
+    if (!isObject(watermark.position) && !isFunction(watermark.position))
+      throw new Error("Position must be type of object or function");
+  });
+  jsWapiRequest.pdf().load({
+    ...convertSourceTypeToLoadParams(params.sourcePdf),
+    callback: (origPdf) => {
+      params.watermarks.forEach((watermark) => {
+        jsWapiRequest.pdf().load({
+          ...convertSourceTypeToLoadParams(watermark),
+          callback: (stampPdf) => {
+            if (isObject(watermark.position)) {
+              const position = watermark.position;
+              origPdf.overlay(stampPdf, { page: position.page, x: position.x, y: position.y });
+            }
+            if (typeof watermark.position === "function") {
+              origPdf.overlay(stampPdf, watermark.position(origPdf, stampPdf));
+            }
+          }
+        });
+      });
+      origPdf.save(params.saveConfig);
+    }
+  });
+}
+
 // src/classes/ApiRequest.ts
 var ApiRequest = class {
   constructor(jsWapiRequest, objectName) {
@@ -797,6 +867,9 @@ var ApiRequest = class {
   newApiInvoker(objectName, operName) {
     return new ApiInvoker(this.newJSWapiInvoker(objectName, operName), objectName);
   }
+  addWatermarkToPdf(params) {
+    addWatermarkToPdf(this._jsWapiRequest, params);
+  }
   /**
    * Переводит и форматирует строку из словаря переводов согласно текущего языка приложения.
    * @param msgKey