d5-api-initializer 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-api-initializer",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "license": "MIT",
   "dependencies": {},
   "main": "publish/cjs/d5-api-initializer",

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

@@ -588,10 +588,10 @@ var ApiCore = class {
    * Валидирует xml по переданому xsd.
    * Если валидация происходит с ошибками, то бросается исключение.
    */
-  validateXml(xml, xsd) {
+  validateXml(xml, xsd, options) {
     if (!this.httpSender.validateXml)
       throw this.newApiException("validateXml() is not allowed");
-    return this.httpSender.validateXml(xsd, xml);
+    return this.httpSender.validateXml(xsd, xml, options);
   }
   /*
   * Will be implemented later
@@ -648,7 +648,8 @@ var convertSourceTypeToLoadParams = (params) => {
   return params.config;
 };
 function addWatermarkToPdf(jsWapiRequest, params) {
-  params.watermarks.forEach((watermark) => {
+  const watermarks = params.watermarks || [];
+  watermarks.forEach((watermark) => {
     if (!isDefined(watermark.position))
       throw new Error("Position is undefined for watermark");
     if (!isObject(watermark.position) && !isFunction(watermark.position))
@@ -657,7 +658,7 @@ function addWatermarkToPdf(jsWapiRequest, params) {
   jsWapiRequest.pdf().load({
     ...convertSourceTypeToLoadParams(params.sourcePdf),
     callback: (origPdf) => {
-      params.watermarks.forEach((watermark) => {
+      watermarks.forEach((watermark) => {
         jsWapiRequest.pdf().load({
           ...convertSourceTypeToLoadParams(watermark),
           callback: (stampPdf) => {

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

@@ -371,7 +371,7 @@ type WaterMarkSourceType = SourceTypeList & {
 };
 type AddWatermarkToPdfParams = {
     sourcePdf: SourceTypeList;
-    watermarks: Array<WaterMarkSourceType>;
+    watermarks?: Array<WaterMarkSourceType>;
     saveConfig: SaveConfig;
 };
 
@@ -517,7 +517,9 @@ declare class ApiFileInvoker implements IInvoker {
 type HTTPSender = {
     newJSWapiHttp(url: string): jsWapi.JSWapiHttp;
     /** Если не валидируется, то будет exception. */
-    validateXml?(xsd: string, xml: string): boolean;
+    validateXml?(xsd: string, xml: string, options?: {
+        macroses: Record<string, any>;
+    }): boolean;
 };
 declare class ApiCore {
     private readonly httpSender;
@@ -549,7 +551,9 @@ declare class ApiCore {
      * Валидирует xml по переданому xsd.
      * Если валидация происходит с ошибками, то бросается исключение.
      */
-    validateXml(xml: string, xsd: string): boolean;
+    validateXml(xml: string, xsd: string, options?: {
+        macroses: Record<string, any>;
+    }): boolean;
 }
 
 declare class ApiHttpResponse {

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

@@ -549,10 +549,10 @@ var ApiCore = class {
    * Валидирует xml по переданому xsd.
    * Если валидация происходит с ошибками, то бросается исключение.
    */
-  validateXml(xml, xsd) {
+  validateXml(xml, xsd, options) {
     if (!this.httpSender.validateXml)
       throw this.newApiException("validateXml() is not allowed");
-    return this.httpSender.validateXml(xsd, xml);
+    return this.httpSender.validateXml(xsd, xml, options);
   }
   /*
   * Will be implemented later
@@ -609,7 +609,8 @@ var convertSourceTypeToLoadParams = (params) => {
   return params.config;
 };
 function addWatermarkToPdf(jsWapiRequest, params) {
-  params.watermarks.forEach((watermark) => {
+  const watermarks = params.watermarks || [];
+  watermarks.forEach((watermark) => {
     if (!isDefined(watermark.position))
       throw new Error("Position is undefined for watermark");
     if (!isObject(watermark.position) && !isFunction(watermark.position))
@@ -618,7 +619,7 @@ function addWatermarkToPdf(jsWapiRequest, params) {
   jsWapiRequest.pdf().load({
     ...convertSourceTypeToLoadParams(params.sourcePdf),
     callback: (origPdf) => {
-      params.watermarks.forEach((watermark) => {
+      watermarks.forEach((watermark) => {
         jsWapiRequest.pdf().load({
           ...convertSourceTypeToLoadParams(watermark),
           callback: (stampPdf) => {

package/publish/d5-api-initializer.mjs

@@ -549,10 +549,10 @@ var ApiCore = class {
    * Валидирует xml по переданому xsd.
    * Если валидация происходит с ошибками, то бросается исключение.
    */
-  validateXml(xml, xsd) {
+  validateXml(xml, xsd, options) {
     if (!this.httpSender.validateXml)
       throw this.newApiException("validateXml() is not allowed");
-    return this.httpSender.validateXml(xsd, xml);
+    return this.httpSender.validateXml(xsd, xml, options);
   }
   /*
   * Will be implemented later
@@ -609,7 +609,8 @@ var convertSourceTypeToLoadParams = (params) => {
   return params.config;
 };
 function addWatermarkToPdf(jsWapiRequest, params) {
-  params.watermarks.forEach((watermark) => {
+  const watermarks = params.watermarks || [];
+  watermarks.forEach((watermark) => {
     if (!isDefined(watermark.position))
       throw new Error("Position is undefined for watermark");
     if (!isObject(watermark.position) && !isFunction(watermark.position))
@@ -618,7 +619,7 @@ function addWatermarkToPdf(jsWapiRequest, params) {
   jsWapiRequest.pdf().load({
     ...convertSourceTypeToLoadParams(params.sourcePdf),
     callback: (origPdf) => {
-      params.watermarks.forEach((watermark) => {
+      watermarks.forEach((watermark) => {
         jsWapiRequest.pdf().load({
           ...convertSourceTypeToLoadParams(watermark),
           callback: (stampPdf) => {