jspdf-dynamo 1.0.5 → 1.0.7

package/README.md

@@ -4,7 +4,7 @@ jsPdf-Dynamo is a wrapper around the open-source JavaScript PDF generation libra
 template driven approach, it enables the separation of layout and formatting logic from the placement of
 data.
 
-jsPdf-Dynamo can be used with browser or NodeJs JavaScript or TypeScript applications.
+jsPdf-Dynamo can be used with browser or NodeJs applications written in JavaScript or TypeScript.
 
 Advantages of using jsPdf-Dynamo include:
 
@@ -31,8 +31,8 @@ yarn add jspdf
 There are a few basic concepts to be aware of when using jsPdf-Dynamo:
 
 - The functionality of jsPdf-Dynamo is implemented through the JsPdfDynamo class.
-- The initial page size, orientation and units of measure are set when the JsPdfDynamo instance is instantiated.
-- Output is driven by a series of plain text 'commands'. These commands can be provided as a list of strings from multiple sources, including the JavaScript or TypeScript application, or loaded from 'templates' retrieved from a URL (browser or NodeJs) or from local text files (NodeJs only).
+- The initial page size, orientation and unit of measure are set when the JsPdfDynamo instance is instantiated.
+- Output is driven by a series of plain text 'commands'. These commands can be provided as a list of strings from multiple sources, including the JavaScript or TypeScript application, or loaded from 'templates' retrieved from a URL (browser only) or from local text files (NodeJs only).
 - Positions are specified relative to the left and top margin. The exception to this are margins which are measured from the appropriate edge of the page.
 - All measurements and positions are in the unit of measure specified when the instance
   of JsPdfDynamo is created. This can be millimeters, inches, or points. The exception to this are fonts, which are always specified in points.

package/dist/index.cjs

@@ -75,19 +75,19 @@ var AppLogger = class {
       this._logger = console;
     }
   }
-  trace(message, ...args) {
+  trace(message, args) {
     this.canLog(0) ? this._logger.trace(message, args) : null;
   }
-  debug(message, ...args) {
+  debug(message, args) {
     this.canLog(1) ? this._logger.debug(message, args) : null;
   }
-  info(message, ...args) {
+  info(message, args) {
     this.canLog(2) ? this._logger.info(message, args) : null;
   }
-  warn(message, ...args) {
+  warn(message, args) {
     this.canLog(3) ? this._logger.warn(message, args) : null;
   }
-  error(message, ...args) {
+  error(message, args) {
     this.canLog(4) ? this._logger.error(message, args) : null;
   }
   logLevel(newLevel) {
@@ -264,6 +264,8 @@ function isValidFontStyle(fontStyle) {
 // src/models/jsPdfOptions.ts
 var JsPdfOptions = class {
   constructor(options = {}) {
+    this.compress = true;
+    this.putOnlyUsedFonts = true;
     var _a, _b, _c;
     this.pageSize = ((_a = options.pageSize) == null ? void 0 : _a.toLocaleLowerCase()) || "a4";
     this.orientation = ((_b = options.orientation) == null ? void 0 : _b.toLocaleLowerCase()) || "portrait";
@@ -343,15 +345,32 @@ var JsPdfProcessor = class {
     this.pageOrientation = optn.orientation;
     this.currentUom = optn.unit;
     this._pdfDocument.setLineHeightFactor(1);
+    const now = /* @__PURE__ */ new Date();
     this._variables.set(
       "_TIMEHM",
-      (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", {
+      now.toLocaleTimeString(void 0, {
         hour12: false,
         hour: "2-digit",
         minute: "2-digit"
       })
     );
-    this._variables.set("_DATEDMY", (/* @__PURE__ */ new Date()).toLocaleDateString("en-GB"));
+    this._variables.set(
+      "_DATEDDMMYYYY",
+      now.toLocaleDateString("en-GB", {
+        day: "2-digit",
+        month: "2-digit",
+        year: "numeric"
+      })
+    );
+    this._variables.set(
+      "_DATEMMDDYYYY",
+      now.toLocaleDateString("en-US", {
+        day: "2-digit",
+        month: "2-digit",
+        year: "numeric"
+      })
+    );
+    this._variables.set("_DATEISO", now.toISOString().substring(0, 10));
     this._variables.set("_IMAGEASPECT", "1");
     this._variables.set("_IMAGEHEIGHT", "0");
     this._variables.set("_IMAGEHEIGHTPX", "0");
@@ -823,6 +842,16 @@ var JsPdfProcessor = class {
     if (!this.checkPosition(left, top)) {
       return;
     }
+    if (isNaN(width)) {
+      this.lastError = `The width of the box is not a number`;
+      this.lastResult = "0";
+      return;
+    }
+    if (isNaN(height)) {
+      this.lastError = `The height of the box is not a number`;
+      this.lastResult = "0";
+      return;
+    }
     this.posnX = left;
     this.posnY = top;
     let lineWidthAdjustment = this._lineWidth;
@@ -843,6 +872,10 @@ var JsPdfProcessor = class {
         style = "FD";
         this._pdfDocument.setFillColor(this.fillColour);
         break;
+      default:
+        this.lastError = `The box style option '${boxType}' is not valid. It must be '0', '1' or '2'`;
+        this.lastResult = "0";
+        return;
     }
     this._pdfDocument.rect(x, y, w, h, style);
     this.posnX = this.posnX + width + this.spaceHoz;
@@ -851,10 +884,57 @@ var JsPdfProcessor = class {
     this.lastObjectWidth = width;
     this.lastResult = "1";
   }
+  drawCircle(input) {
+    const subs = this.logAndParseCommand(".drawCircle", input);
+    const { first: left, rest: rest1 } = getNextNumber(subs);
+    const { first: top, rest: rest2 } = getNextNumber(rest1);
+    const { first: radius, rest: rest3 } = getNextNumber(rest2);
+    const { first: option } = getNextNumber(rest3);
+    if (!this.checkPosition(left, top)) {
+      return;
+    }
+    if (isNaN(radius)) {
+      this.lastError = `The radius of the circle is not a number`;
+      this.lastResult = "0";
+      return;
+    }
+    this.posnX = left;
+    this.posnY = top;
+    const x = this.posnX + this._marginLeft;
+    const y = this.posnY + this._marginTop;
+    let r = radius;
+    let style = "S";
+    switch (option) {
+      case 0:
+        r -= this._lineWidth * 0.5;
+        break;
+      case 1:
+        style = "F";
+        this._pdfDocument.setFillColor(this.fillColour);
+        break;
+      case 2:
+        style = "FD";
+        this._pdfDocument.setFillColor(this.fillColour);
+        r -= this._lineWidth * 0.5;
+        break;
+      default:
+        this.lastError = `The circle style option '${option}' is not valid. It must be '0', '1' or '2'`;
+        this.lastResult = "0";
+        return;
+    }
+    this._pdfDocument.circle(x, y, r, style);
+    this.lastObjectHeight = radius * 2;
+    this.lastObjectWidth = this.lastObjectHeight;
+    this.posnX = this.posnX + radius + this.spaceHoz;
+    this.posnY = this.posnY + radius + this.spaceVert;
+    this.lastResult = "1";
+  }
   drawDebugGrid(input) {
     const subs = this.logAndParseCommand(".drawDebugGrid", input);
     const savedLineColour = this.lineColour;
     const savedLineWidth = this.lineWidth;
+    const savedX = this.posnX;
+    const savedY = this.posnY;
     const mm = 0.1;
     const pts = mmToPoints(mm);
     const lineWidth = this.pointsToUom(pts);
@@ -911,6 +991,62 @@ var JsPdfProcessor = class {
     }
     this.lineColour = savedLineColour;
     this.lineWidth = savedLineWidth;
+    this.posnX = savedX;
+    this.posnY = savedY;
+  }
+  drawEllipse(input) {
+    const subs = this.logAndParseCommand(".drawEllipse", input);
+    const { first: left, rest: rest1 } = getNextNumber(subs);
+    const { first: top, rest: rest2 } = getNextNumber(rest1);
+    const { first: radiusX, rest: rest3 } = getNextNumber(rest2);
+    const { first: radiusY, rest: rest4 } = getNextNumber(rest3);
+    const { first: option } = getNextNumber(rest4);
+    if (!this.checkPosition(left, top)) {
+      return;
+    }
+    if (isNaN(radiusX)) {
+      this.lastError = `The horizontal radius of the ellipse is not a number`;
+      this.lastResult = "0";
+      return;
+    }
+    if (isNaN(radiusY)) {
+      this.lastError = `The vertical radius of the ellipse is not a number`;
+      this.lastResult = "0";
+      return;
+    }
+    this.posnX = left;
+    this.posnY = top;
+    const x = this.posnX + this._marginLeft;
+    const y = this.posnY + this._marginTop;
+    let rx = radiusX;
+    let ry = radiusY;
+    let style = "S";
+    switch (option) {
+      case 0:
+        rx -= this._lineWidth * 0.5;
+        ry -= this._lineWidth * 0.5;
+        break;
+      case 1:
+        style = "F";
+        this._pdfDocument.setFillColor(this.fillColour);
+        break;
+      case 2:
+        style = "FD";
+        this._pdfDocument.setFillColor(this.fillColour);
+        rx -= this._lineWidth * 0.5;
+        ry -= this._lineWidth * 0.5;
+        break;
+      default:
+        this.lastError = `The circle style option '${option}' is not valid. It must be '0', '1' or '2'`;
+        this.lastResult = "0";
+        return;
+    }
+    this._pdfDocument.ellipse(x, y, rx, ry, style);
+    this.lastObjectHeight = radiusY * 2;
+    this.lastObjectWidth = radiusX * 2;
+    this.posnX = this.posnX + radiusX + this.spaceHoz;
+    this.posnY = this.posnY + radiusY + this.spaceVert;
+    this.lastResult = "1";
   }
   drawLine(input) {
     const subs = this.logAndParseCommand(".drawLine", input);
@@ -950,7 +1086,7 @@ var JsPdfProcessor = class {
       return;
     }
     if (isNaN(imageNo) || imageNo < 0 || imageNo > this._images.length - 1) {
-      this.lastError = this._images.length ? "The image number must be in the range of 0 to " + (this._images.length - 1).toString() : "Only one image has been loaded, the image number can only be 0";
+      this.lastError = this._images.length > 1 ? `The image number ${imageNo} must be in the range of 0 to ${(this._images.length - 1).toString()}` : "Only one image has been loaded, the image number can only be 0";
       this.lastResult = "0";
       return;
     }
@@ -1001,7 +1137,6 @@ var JsPdfProcessor = class {
     this.lastResult = "1";
   }
   drawText(input) {
-    var _a;
     const subs = this.logAndParseCommand(".drawText", input);
     const { first: left, rest: rest1 } = getNextNumber(subs);
     const { first: top, rest: rest2 } = getNextNumber(rest1);
@@ -1013,7 +1148,7 @@ var JsPdfProcessor = class {
     this.lastObjectWidth = 0;
     this.lastResult = "1";
     if (lines.length > 1) {
-      this.lastError = `Text was truncated to fit within the available width (${(_a = lines[0]) == null ? void 0 : _a.substring(0, 20)}...)`;
+      this.lastError = `Text was truncated to fit within the available width (${rest2.substring(0, 20)}...) on page ${this._currentPageNumber}.`;
       this.lastResult = "0";
       if (lines[0]) {
         if (this._pdfDocument.getTextWidth(lines[0]) < maxWidth) {
@@ -1319,10 +1454,11 @@ var JsPdfProcessor = class {
   }
   ifNotBlank(jsPdfDynamo, input) {
     return __async(this, null, function* () {
-      let { first: variable, rest } = getNextString(input);
+      let { first: value1, rest } = getNextString(input);
       const subs = this.substitute(rest.trim());
-      this._logger.debug(".ifNotBlank " + variable + " " + subs);
-      let value = this._variables.get(variable.toLocaleUpperCase()) || "";
+      this._logger.debug(".ifNotBlank " + value1 + " " + subs);
+      const variable1 = this.substitute(value1);
+      let value = this._variables.get(variable1.toLocaleUpperCase()) || "";
       this.lastResult = "-1";
       if (value.trim() !== "") {
         yield jsPdfDynamo.processDot(this, rest);
@@ -1576,9 +1712,14 @@ var JsPdfProcessor = class {
     }
   }
   setFillColour(input) {
-    let subs = this.substitute(input);
-    this._logger.debug(".setFillColour " + subs);
-    this.fillColour = subs;
+    const subs = this.logAndParseCommand(".setFillColour", input);
+    const { first: fillColour } = getNextString(subs);
+    if (fillColour === "") {
+      this.lastResult = "0";
+      this.lastError = "A fill colour must be specified";
+      return;
+    }
+    this.fillColour = fillColour;
     this.lastResult = "1";
   }
   setFontName(input) {
@@ -1594,14 +1735,25 @@ var JsPdfProcessor = class {
   }
   setFontSize(input) {
     const subs = this.logAndParseCommand(".setFontSize", input);
-    let { first: size } = getNextNumber(subs);
-    if (size > 0) {
-      this.fontPointSize = size;
-      this.lastResult = "1";
-    } else {
+    if (subs === "") {
       this.lastResult = "0";
-      this.lastError = "Invalid font size " + size;
+      this.lastError = "A font size must be specified";
+      return;
     }
+    let { first: sizeAlpha } = getNextNumber(subs);
+    const size = Number(sizeAlpha);
+    if (Number.isNaN(size)) {
+      this.lastResult = "0";
+      this.lastError = `A font size must be a number. '${sizeAlpha}' is not a number.`;
+      return;
+    }
+    if (size <= 0) {
+      this.lastResult = "0";
+      this.lastError = "A font size must be greater than 0";
+      return;
+    }
+    this.fontPointSize = size;
+    this.lastResult = "1";
   }
   setFontStyle(input) {
     const subs = this.logAndParseCommand(".setFontStyle", input);
@@ -1620,9 +1772,14 @@ var JsPdfProcessor = class {
     this.lastResult = "1";
   }
   setLineColour(input) {
-    let subs = this.substitute(input);
-    this._logger.debug(".setLineColour " + subs);
-    this.lineColour = subs;
+    const subs = this.logAndParseCommand(".setFontStyle", input);
+    const { first: lineColour } = getNextString(subs);
+    if (lineColour === "") {
+      this.lastResult = "0";
+      this.lastError = "A line colour must be specified";
+      return;
+    }
+    this.lineColour = lineColour;
     this.lastResult = "1";
   }
   setLineWidth(input) {
@@ -1728,7 +1885,13 @@ var JsPdfProcessor = class {
   }
   setTextColour(input) {
     const subs = this.logAndParseCommand(".setTextColour", input);
-    this.textColour = subs;
+    const { first: textColour } = getNextString(subs);
+    if (textColour === "") {
+      this.lastResult = "0";
+      this.lastError = "A text colour must be specified";
+      return;
+    }
+    this.textColour = textColour;
     this.lastResult = "1";
   }
   copyVar(input) {
@@ -1942,10 +2105,6 @@ var JsPdfDynamo = class {
         if (currLine.startsWith("[")) {
           if (inGroupLoading) {
             inGroupLoading = false;
-            __privateGet(this, _appLogger).debug(
-              `Finished loading group ${grpName}   (${currLine})
-`
-            );
           } else {
             if (currLine.length === 1) continue;
             grpName = currLine.substring(1);
@@ -1955,8 +2114,7 @@ var JsPdfDynamo = class {
             }
             grpName = grpName.trim().toLocaleUpperCase();
             inGroupLoading = true;
-            __privateGet(this, _appLogger).debug(`Loading group ${grpName}   (${currLine})
-`);
+            __privateGet(this, _appLogger).debug(`Loading group ${grpName}`);
             currGroup = [];
             __privateGet(this, _groups)[grpName] = currGroup;
           }
@@ -2007,9 +2165,15 @@ var JsPdfDynamo = class {
         case "DrawBox".toLowerCase():
           processor.drawBox(parameters);
           return;
+        case "DrawCircle".toLowerCase():
+          processor.drawCircle(parameters);
+          return;
         case "DrawDebugGrid".toLowerCase():
           processor.drawDebugGrid(parameters);
           return;
+        case "DrawEllipse".toLowerCase():
+          processor.drawEllipse(parameters);
+          return;
         case "DrawImage".toLowerCase():
           processor.drawImage(parameters);
           return;
@@ -2140,9 +2304,11 @@ var JsPdfDynamo = class {
         let { first: group, rest } = getNextString(subs);
         subs = rest;
         __privateGet(this, _appLogger).debug(`
-[${group}]`);
+[${group} - Enter]`);
         if (__privateGet(this, _groups)[group]) {
           yield this.processTemplate(processor, __privateGet(this, _groups)[group]);
+          __privateGet(this, _appLogger).debug(`[${group} - Exit]
+`);
         } else {
           __privateGet(this, _appLogger).warn(`Group ${group} was not found.`);
           processor.lastResult = "0";

package/dist/index.d.cts

@@ -1,21 +1,21 @@
 import jsPDF from 'jspdf';
 
 interface ILogger {
-    debug: (message: string, ...args: any | null) => void;
-    error: (message: string, ...args: any | null) => void;
-    info: (message: string, ...args: any | null) => void;
-    trace: (message: string, ...args: any | null) => void;
-    warn: (message: string, ...args: any | null) => void;
+    debug: (message: string, args?: any) => void;
+    error: (message: string, args?: any) => void;
+    info: (message: string, args?: any) => void;
+    trace: (message: string, args?: any) => void;
+    warn: (message: string, args?: any) => void;
 }
 declare class AppLogger implements ILogger {
     private _logLevel;
     private _logger;
     constructor(logger?: ILogger | null);
-    trace(message: string, ...args: any | null): void;
-    debug(message: string, ...args: any | null): void;
-    info(message: string, ...args: any | null): void;
-    warn(message: string, ...args: any | null): void;
-    error(message: string, ...args: any | null): void;
+    trace(message: string, args?: any): void;
+    debug(message: string, args?: any): void;
+    info(message: string, args?: any): void;
+    warn(message: string, args?: any): void;
+    error(message: string, args?: any): void;
     logLevel(newLevel: string | number): void;
     private canLog;
 }
@@ -193,6 +193,7 @@ declare const pageSizes: {
 type pageSizeType = keyof typeof pageSizes;
 
 interface IJsPdfOptions {
+    compress: boolean;
     margins: {
         top: number;
         bottom: number;
@@ -200,6 +201,7 @@ interface IJsPdfOptions {
         right: number;
     };
     pageSize: pageSizeType;
+    putOnlyUsedFonts: boolean;
     orientation: "portrait" | "landscape" | "p" | "l";
     unit: "mm" | "in" | "pt";
 }
@@ -313,7 +315,9 @@ declare class JsPdfProcessor {
     private getContentType;
     checkPage(jsPdfDynamo: JsPdfDynamo, input: string): Promise<void>;
     drawBox(input: string): void;
+    drawCircle(input: string): void;
     drawDebugGrid(input: string): void;
+    drawEllipse(input: string): void;
     drawLine(input: string): void;
     drawImage(input: string): void;
     drawText(input: string): void;

package/dist/index.d.ts

@@ -1,21 +1,21 @@
 import jsPDF from 'jspdf';
 
 interface ILogger {
-    debug: (message: string, ...args: any | null) => void;
-    error: (message: string, ...args: any | null) => void;
-    info: (message: string, ...args: any | null) => void;
-    trace: (message: string, ...args: any | null) => void;
-    warn: (message: string, ...args: any | null) => void;
+    debug: (message: string, args?: any) => void;
+    error: (message: string, args?: any) => void;
+    info: (message: string, args?: any) => void;
+    trace: (message: string, args?: any) => void;
+    warn: (message: string, args?: any) => void;
 }
 declare class AppLogger implements ILogger {
     private _logLevel;
     private _logger;
     constructor(logger?: ILogger | null);
-    trace(message: string, ...args: any | null): void;
-    debug(message: string, ...args: any | null): void;
-    info(message: string, ...args: any | null): void;
-    warn(message: string, ...args: any | null): void;
-    error(message: string, ...args: any | null): void;
+    trace(message: string, args?: any): void;
+    debug(message: string, args?: any): void;
+    info(message: string, args?: any): void;
+    warn(message: string, args?: any): void;
+    error(message: string, args?: any): void;
     logLevel(newLevel: string | number): void;
     private canLog;
 }
@@ -193,6 +193,7 @@ declare const pageSizes: {
 type pageSizeType = keyof typeof pageSizes;
 
 interface IJsPdfOptions {
+    compress: boolean;
     margins: {
         top: number;
         bottom: number;
@@ -200,6 +201,7 @@ interface IJsPdfOptions {
         right: number;
     };
     pageSize: pageSizeType;
+    putOnlyUsedFonts: boolean;
     orientation: "portrait" | "landscape" | "p" | "l";
     unit: "mm" | "in" | "pt";
 }
@@ -313,7 +315,9 @@ declare class JsPdfProcessor {
     private getContentType;
     checkPage(jsPdfDynamo: JsPdfDynamo, input: string): Promise<void>;
     drawBox(input: string): void;
+    drawCircle(input: string): void;
     drawDebugGrid(input: string): void;
+    drawEllipse(input: string): void;
     drawLine(input: string): void;
     drawImage(input: string): void;
     drawText(input: string): void;