abstract-image 13.0.9 → 13.0.11

package/lib/dynamic-image/dynamic-image.d.ts

@@ -1,3 +1,4 @@
+import { PropertySchema } from "jsxpression";
 import { AbstractImage } from "../model/abstract-image.js";
 export type DynamicImageResult = {
     readonly type: "Ok";
@@ -13,4 +14,13 @@ export type DynamicImageError = {
     cause?: unknown;
 };
 export declare function dynamicImage(source: string, data: Record<string, unknown>): DynamicImageResult;
+export type CompileDynamicImageResult = {
+    readonly type: "Ok";
+    value: string;
+} | {
+    readonly type: "Err";
+    readonly error: DynamicImageError;
+};
+export declare function compileDynamicImage(source: string, dataSchema?: Record<string, PropertySchema>): CompileDynamicImageResult;
+export declare function renderDynamicImage(jsString: string, data: Record<string, unknown>): DynamicImageResult;
 //# sourceMappingURL=dynamic-image.d.ts.map

package/lib/dynamic-image/dynamic-image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-image.d.ts","sourceRoot":"","sources":["../../src/dynamic-image/dynamic-image.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAM3D,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,GACjG;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB,CAyB9F"}
+{"version":3,"file":"dynamic-image.d.ts","sourceRoot":"","sources":["../../src/dynamic-image/dynamic-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,cAAc,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAK3D,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,GACjG;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB,CAqB9F;AAED,MAAM,MAAM,yBAAyB,GACjC;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAEhE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAC1C,yBAAyB,CAS3B;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB,CActG"}

package/lib/dynamic-image/dynamic-image.js

@@ -1,4 +1,4 @@
-import { render } from "jsxpression";
+import { render, compile, evaluate } from "jsxpression";
 import { generateDataSchema } from "./utils.js";
 import { createComponents } from "./components.js";
 import { baseSchema } from "./schema.js";
@@ -18,11 +18,34 @@ export function dynamicImage(source, data) {
     catch (error) {
         return {
             type: "Err",
-            error: {
-                type: "RENDER_ERROR",
-                message: error instanceof Error ? error.message : String(error),
-                cause: error,
-            },
+            error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
+        };
+    }
+}
+export function compileDynamicImage(source, dataSchema) {
+    try {
+        return { type: "Ok", value: compile(source, dataSchema ? { ...baseSchema, data: dataSchema } : baseSchema) };
+    }
+    catch (error) {
+        return {
+            type: "Err",
+            error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
+        };
+    }
+}
+export function renderDynamicImage(jsString, data) {
+    const imageUrls = Array();
+    try {
+        return {
+            type: "Ok",
+            image: evaluate(jsString, baseSchema, { data, components: createComponents(imageUrls) }),
+            imageUrls,
+        };
+    }
+    catch (error) {
+        return {
+            type: "Err",
+            error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
         };
     }
 }

package/lib/dynamic-image/dynamic-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-image.js","sourceRoot":"","sources":["../../src/dynamic-image/dynamic-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYzC,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,IAA6B;IACxE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,EAAU,CAAC;QAElC,MAAM,MAAM,GAAW;YACrB,GAAG,UAAU;YACb,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC;SAC/B,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,CAAgB,MAAM,EAAE,MAAM,EAAE;YAClD,IAAI;YACJ,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC;SACxC,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE;gBACL,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC/D,KAAK,EAAE,KAAK;aACb;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"dynamic-image.js","sourceRoot":"","sources":["../../src/dynamic-image/dynamic-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,OAAO,EAAE,QAAQ,EAAkB,MAAM,aAAa,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYzC,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,IAA6B;IACxE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,EAAU,CAAC;QAElC,MAAM,MAAM,GAAW;YACrB,GAAG,UAAU;YACb,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC;SAC/B,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,CAAgB,MAAM,EAAE,MAAM,EAAE;YAClD,IAAI;YACJ,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC;SACxC,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SAC/G,CAAC;IACJ,CAAC;AACH,CAAC;AAMD,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,UAA2C;IAE3C,IAAI,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/G,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SAC/G,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,IAA6B;IAChF,MAAM,SAAS,GAAG,KAAK,EAAU,CAAC;IAClC,IAAI,CAAC;QACH,OAAO;YACL,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAkB;YACzG,SAAS;SACV,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SAC/G,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/index.d.ts

@@ -9,6 +9,5 @@ export * from "./exporters/png-export-image.js";
 export * from "./exporters/dxf2d-export-image.js";
 export * from "./exporters/react-svg-export-image.js";
 export * from "./exporters/eps-export-image.js";
-export * from "./dynamic-image/index.js";
 export * as AbstractImageJsx from "./abstract-image-jsx/index.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC"}

package/lib/index.js

@@ -9,6 +9,5 @@ export * from "./exporters/png-export-image.js";
 export * from "./exporters/dxf2d-export-image.js";
 export * from "./exporters/react-svg-export-image.js";
 export * from "./exporters/eps-export-image.js";
-export * from "./dynamic-image/index.js";
 export * as AbstractImageJsx from "./abstract-image-jsx/index.js";
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abstract-image",
-  "version": "13.0.9",
+  "version": "13.0.11",
   "description": "Dynamically create images using code or JSX and render to any format",
   "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-image",
   "main": "lib/index.js",
@@ -9,7 +9,8 @@
   "type": "module",
   "license": "MIT",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./dynamic-image": "./lib/dynamic-image/index.js"
   },
   "files": [
     "/lib",
@@ -26,7 +27,7 @@
     "handlebars": "4.7.8",
     "handlebars-xml": "^0.4.3",
     "iconv-lite": "^0.7.2",
-    "jsxpression": "^0.1.13"
+    "jsxpression": "^0.1.15"
   },
   "peerDependencies": {
     "react": ">=17.0.0 <20.0.0"
@@ -38,5 +39,5 @@
     "vite": "^6.0.1",
     "vitest": "^2.1.6"
   },
-  "gitHead": "1a8ce6585fe2bfa1e57b64170c331120f9f95391"
+  "gitHead": "b488708345c01b260b88113fca5edee60ec774e6"
 }

package/src/dynamic-image/dynamic-image.ts

@@ -1,6 +1,5 @@
-import { render, Schema } from "jsxpression";
+import { render, Schema, compile, evaluate, PropertySchema } from "jsxpression";
 import { AbstractImage } from "../model/abstract-image.js";
-
 import { generateDataSchema } from "./utils.js";
 import { createComponents } from "./components.js";
 import { baseSchema } from "./schema.js";
@@ -33,11 +32,41 @@ export function dynamicImage(source: string, data: Record<string, unknown>): Dyn
   } catch (error) {
     return {
       type: "Err",
-      error: {
-        type: "RENDER_ERROR",
-        message: error instanceof Error ? error.message : String(error),
-        cause: error,
-      },
+      error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
+    };
+  }
+}
+
+export type CompileDynamicImageResult =
+  | { readonly type: "Ok"; value: string }
+  | { readonly type: "Err"; readonly error: DynamicImageError };
+
+export function compileDynamicImage(
+  source: string,
+  dataSchema?: Record<string, PropertySchema>
+): CompileDynamicImageResult {
+  try {
+    return { type: "Ok", value: compile(source, dataSchema ? { ...baseSchema, data: dataSchema } : baseSchema) };
+  } catch (error) {
+    return {
+      type: "Err",
+      error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
+    };
+  }
+}
+
+export function renderDynamicImage(jsString: string, data: Record<string, unknown>): DynamicImageResult {
+  const imageUrls = Array<string>();
+  try {
+    return {
+      type: "Ok",
+      image: evaluate(jsString, baseSchema, { data, components: createComponents(imageUrls) }) as AbstractImage,
+      imageUrls,
+    };
+  } catch (error) {
+    return {
+      type: "Err",
+      error: { type: "RENDER_ERROR", message: error instanceof Error ? error.message : String(error), cause: error },
     };
   }
 }

package/src/index.ts

@@ -9,5 +9,4 @@ export * from "./exporters/png-export-image.js";
 export * from "./exporters/dxf2d-export-image.js";
 export * from "./exporters/react-svg-export-image.js";
 export * from "./exporters/eps-export-image.js";
-export * from "./dynamic-image/index.js";
 export * as AbstractImageJsx from "./abstract-image-jsx/index.js";