@ticatec/dyna-js 0.1.1 → 0.1.3

package/dist/ModuleLoader.d.ts

@@ -20,7 +20,7 @@ export type SaveModuleToLocalStorage = (data: any) => void;
  * @param data - Module identifier or data
  * @returns The module script text
  */
-export type LoadLocalModule = (data: any) => string;
+export type LoadLocalModule = (data: any) => any;
 /**
  * Configuration options for ModuleLoader
  */
@@ -31,21 +31,12 @@ export interface ModuleLoaderOptions {
     saveModule?: SaveModuleToLocalStorage;
     /** Optional custom load local module function */
     loadLocalModule?: LoadLocalModule;
+    keyField?: string;
+    prefix?: string;
 }
 /**
  * ModuleLoader is a singleton class for managing dynamic module loading with caching
  * It supports checking for module updates, loading from remote sources, and caching in localStorage
- *
- * @example
- * ```typescript
- * const loader = ModuleLoader.initialize(
- *   async (data) => fetch(`/api/modules/${data.code}`).then(r => r.json()),
- *   {}
- * );
- *
- * await loader.checkFreshScripts([{ code: 'module1', digest: 'abc123' }]);
- * const module = loader.createModule('module1', { React, ReactDOM });
- * ```
  */
 export default class ModuleLoader {
     private static instance;
@@ -54,6 +45,8 @@ export default class ModuleLoader {
     private readonly saveModule;
     private readonly loadLocalModule;
     private modulesMap;
+    static keyField: string;
+    static prefix: string;
     /**
      * Private constructor for singleton pattern
      * @param loadModule - Function to load module from remote
@@ -69,6 +62,7 @@ export default class ModuleLoader {
      * @returns The singleton ModuleLoader instance
      */
     static initialize(loadModule: LoadModule, options: ModuleLoaderOptions): ModuleLoader;
+    static getInstance(): ModuleLoader;
     /**
      * Check and update modules that are not fresh
      * Iterates through the list, checks each module, and reloads if needed
@@ -89,5 +83,6 @@ export default class ModuleLoader {
      * @returns The instantiated module
      */
     createModule(key: string, imports: any): any;
+    getLayout(key: string): any;
 }
 //# sourceMappingURL=ModuleLoader.d.ts.map

package/dist/ModuleLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleLoader.d.ts","sourceRoot":"","sources":["../src/ModuleLoader.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC;AAEjD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAErD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;AAE3D;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC;AA+BpD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,2CAA2C;IAC3C,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,iDAAiD;IACjD,eAAe,CAAC,EAAE,eAAe,CAAA;CACpC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,UAAU,CAAmB;IAErC;;;;;;OAMG;IACH,OAAO;IAQP;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,mBAAmB,GAAG,YAAY;IAQrF;;;;;;;;OAQG;IACG,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;IAUxC;;;;;;;;OAQG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,GAAG;CAU/C"}
+{"version":3,"file":"ModuleLoader.d.ts","sourceRoot":"","sources":["../src/ModuleLoader.ts"],"names":[],"mappings":"AAcA;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC;AAEjD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAErD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;AAE3D;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;AAqCjD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,2CAA2C;IAC3C,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,iDAAiD;IACjD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,UAAU,CAAmB;IACrC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,OAAO;IAQP;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,mBAAmB,GAAG,YAAY;IAUrF,MAAM,CAAC,WAAW,IAAI,YAAY;IAIlC;;;;;;;;OAQG;IACG,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;IAWxC;;;;;;;;OAQG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,GAAG;IAU5C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;CAU9B"}

package/dist/ModuleLoader.esm.js

@@ -1,11 +1,20 @@
 import { getDynaJs } from "./index";
+const getDigestKey = (key) => {
+    return `${ModuleLoader.prefix}:md:${key}`;
+};
+const getScriptKey = (key) => {
+    return `${ModuleLoader.prefix}:script:${key}`;
+};
+const getLayoutKey = (key) => {
+    return `${ModuleLoader.prefix}:layout:${key}`;
+};
 /**
  * Default module check function that compares message digest
  * @param data - Module data containing code and digest
  * @returns true if the local digest matches the remote digest
  */
 const checkMessageDigest = (data) => {
-    let localDigest = window.localStorage.getItem(`md:${data.code}`);
+    let localDigest = window.localStorage.getItem(getDigestKey(data.code));
     return localDigest == data.digest;
 };
 /**
@@ -14,8 +23,12 @@ const checkMessageDigest = (data) => {
  * @param data - Module data containing code, digest, and scriptText
  */
 const saveModule = (data) => {
-    window.localStorage.setItem(`md:${data.code}`, data.digest);
-    window.localStorage.setItem(`script:${data.code}`, data.scriptText);
+    const key = data[ModuleLoader.keyField];
+    window.localStorage.setItem(getDigestKey(key), data.digest);
+    window.localStorage.setItem(getScriptKey(key), data.scriptText ?? '');
+    if (data.uiLayout) {
+        window.localStorage.setItem(key, data.uiLayout);
+    }
 };
 /**
  * Default function to load module script from localStorage
@@ -23,22 +36,13 @@ const saveModule = (data) => {
  * @returns The module script text
  */
 const loadLocalModule = (key) => {
-    return window.localStorage.getItem(`script:${key}`);
+    return {
+        scriptText: window.localStorage.getItem(getScriptKey(key))
+    };
 };
 /**
  * ModuleLoader is a singleton class for managing dynamic module loading with caching
  * It supports checking for module updates, loading from remote sources, and caching in localStorage
- *
- * @example
- * ```typescript
- * const loader = ModuleLoader.initialize(
- *   async (data) => fetch(`/api/modules/${data.code}`).then(r => r.json()),
- *   {}
- * );
- *
- * await loader.checkFreshScripts([{ code: 'module1', digest: 'abc123' }]);
- * const module = loader.createModule('module1', { React, ReactDOM });
- * ```
  */
 export default class ModuleLoader {
     /**
@@ -64,9 +68,14 @@ export default class ModuleLoader {
     static initialize(loadModule, options) {
         if (ModuleLoader.instance == null) {
             ModuleLoader.instance = new ModuleLoader(loadModule, options.moduleCheck ?? checkMessageDigest, options.saveModule ?? saveModule, options.loadLocalModule ?? loadLocalModule);
+            ModuleLoader.keyField = options.keyField ?? 'code';
+            ModuleLoader.prefix = options.prefix ?? "DynaJS";
         }
         return ModuleLoader.instance;
     }
+    static getInstance() {
+        return ModuleLoader.instance;
+    }
     /**
      * Check and update modules that are not fresh
      * Iterates through the list, checks each module, and reloads if needed
@@ -79,6 +88,7 @@ export default class ModuleLoader {
     async checkFreshScripts(list) {
         for (let item of list) {
             if (!this.moduleCheck(item)) {
+                this.modulesMap.delete(ModuleLoader.keyField);
                 let data = await this.loadModule(item);
                 this.saveModule(data);
             }
@@ -97,10 +107,20 @@ export default class ModuleLoader {
     createModule(key, imports) {
         let module = this.modulesMap.get(key);
         if (module == null) {
-            let scriptText = this.loadLocalModule(key);
-            module = getDynaJs().executeSync(scriptText, { imports });
+            let dynaCode = this.loadLocalModule(key);
+            module = getDynaJs().executeSync(dynaCode.scriptText, { imports });
             this.modulesMap.set(key, module);
         }
         return module;
     }
+    getLayout(key) {
+        let text = window.localStorage.getItem(getLayoutKey(key));
+        try {
+            return text == null ? null : JSON.parse(text);
+        }
+        catch (ex) {
+            console.warn('Cannot parse layout', text);
+            return null;
+        }
+    }
 }

package/dist/ModuleLoader.js

@@ -1,13 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("./index");
+const getDigestKey = (key) => {
+    return `${ModuleLoader.prefix}:md:${key}`;
+};
+const getScriptKey = (key) => {
+    return `${ModuleLoader.prefix}:script:${key}`;
+};
+const getLayoutKey = (key) => {
+    return `${ModuleLoader.prefix}:layout:${key}`;
+};
 /**
  * Default module check function that compares message digest
  * @param data - Module data containing code and digest
  * @returns true if the local digest matches the remote digest
  */
 const checkMessageDigest = (data) => {
-    let localDigest = window.localStorage.getItem(`md:${data.code}`);
+    let localDigest = window.localStorage.getItem(getDigestKey(data.code));
     return localDigest == data.digest;
 };
 /**
@@ -16,8 +25,13 @@ const checkMessageDigest = (data) => {
  * @param data - Module data containing code, digest, and scriptText
  */
 const saveModule = (data) => {
-    window.localStorage.setItem(`md:${data.code}`, data.digest);
-    window.localStorage.setItem(`script:${data.code}`, data.scriptText);
+    var _a;
+    const key = data[ModuleLoader.keyField];
+    window.localStorage.setItem(getDigestKey(key), data.digest);
+    window.localStorage.setItem(getScriptKey(key), (_a = data.scriptText) !== null && _a !== void 0 ? _a : '');
+    if (data.uiLayout) {
+        window.localStorage.setItem(key, data.uiLayout);
+    }
 };
 /**
  * Default function to load module script from localStorage
@@ -25,22 +39,13 @@ const saveModule = (data) => {
  * @returns The module script text
  */
 const loadLocalModule = (key) => {
-    return window.localStorage.getItem(`script:${key}`);
+    return {
+        scriptText: window.localStorage.getItem(getScriptKey(key))
+    };
 };
 /**
  * ModuleLoader is a singleton class for managing dynamic module loading with caching
  * It supports checking for module updates, loading from remote sources, and caching in localStorage
- *
- * @example
- * ```typescript
- * const loader = ModuleLoader.initialize(
- *   async (data) => fetch(`/api/modules/${data.code}`).then(r => r.json()),
- *   {}
- * );
- *
- * await loader.checkFreshScripts([{ code: 'module1', digest: 'abc123' }]);
- * const module = loader.createModule('module1', { React, ReactDOM });
- * ```
  */
 class ModuleLoader {
     /**
@@ -64,12 +69,17 @@ class ModuleLoader {
      * @returns The singleton ModuleLoader instance
      */
     static initialize(loadModule, options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (ModuleLoader.instance == null) {
             ModuleLoader.instance = new ModuleLoader(loadModule, (_a = options.moduleCheck) !== null && _a !== void 0 ? _a : checkMessageDigest, (_b = options.saveModule) !== null && _b !== void 0 ? _b : saveModule, (_c = options.loadLocalModule) !== null && _c !== void 0 ? _c : loadLocalModule);
+            ModuleLoader.keyField = (_d = options.keyField) !== null && _d !== void 0 ? _d : 'code';
+            ModuleLoader.prefix = (_e = options.prefix) !== null && _e !== void 0 ? _e : "DynaJS";
         }
         return ModuleLoader.instance;
     }
+    static getInstance() {
+        return ModuleLoader.instance;
+    }
     /**
      * Check and update modules that are not fresh
      * Iterates through the list, checks each module, and reloads if needed
@@ -82,6 +92,7 @@ class ModuleLoader {
     async checkFreshScripts(list) {
         for (let item of list) {
             if (!this.moduleCheck(item)) {
+                this.modulesMap.delete(ModuleLoader.keyField);
                 let data = await this.loadModule(item);
                 this.saveModule(data);
             }
@@ -100,11 +111,21 @@ class ModuleLoader {
     createModule(key, imports) {
         let module = this.modulesMap.get(key);
         if (module == null) {
-            let scriptText = this.loadLocalModule(key);
-            module = (0, index_1.getDynaJs)().executeSync(scriptText, { imports });
+            let dynaCode = this.loadLocalModule(key);
+            module = (0, index_1.getDynaJs)().executeSync(dynaCode.scriptText, { imports });
             this.modulesMap.set(key, module);
         }
         return module;
     }
+    getLayout(key) {
+        let text = window.localStorage.getItem(getLayoutKey(key));
+        try {
+            return text == null ? null : JSON.parse(text);
+        }
+        catch (ex) {
+            console.warn('Cannot parse layout', text);
+            return null;
+        }
+    }
 }
 exports.default = ModuleLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/dyna-js",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A TypeScript library for dynamic code execution using new Function() that works in both Node.js and browser environments",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",