@aemforms/af-core 0.22.57 → 0.22.59

package/lib/rules/FunctionRuntime.d.ts

@@ -7,7 +7,10 @@ export declare type FunctionDefinition = {
     _signature: Array<any>;
 };
 declare class FunctionRuntimeImpl {
+    private static instance;
     private customFunctions;
+    private constructor();
+    static getInstance(): FunctionRuntimeImpl;
     registerFunctions(functions: {
         [key: string]: FunctionDefinition | CustomFunction;
     }): void;

package/lib/rules/FunctionRuntime.js

@@ -167,6 +167,12 @@ class FunctionRuntimeImpl {
     constructor() {
         this.customFunctions = {};
     }
+    static getInstance() {
+        if (!FunctionRuntimeImpl.instance) {
+            FunctionRuntimeImpl.instance = new FunctionRuntimeImpl();
+        }
+        return FunctionRuntimeImpl.instance;
+    }
     registerFunctions(functions) {
         Object.entries(functions).forEach(([name, funcDef]) => {
             let finalFunction = funcDef;
@@ -176,7 +182,7 @@ class FunctionRuntimeImpl {
                         const globals = {
                             form: interpreter.globals.form,
                             invoke: (funcName, ...args) => {
-                                return this.customFunctions[funcName]._func.call(undefined, args, data, interpreter);
+                                return FunctionRuntimeImpl.getInstance().customFunctions[funcName]._func.call(undefined, args, data, interpreter);
                             }
                         };
                         return funcDef(...args, globals);
@@ -188,13 +194,13 @@ class FunctionRuntimeImpl {
                 console.warn(`Unable to register function with name ${name}.`);
                 return;
             }
-            this.customFunctions[name] = finalFunction;
+            FunctionRuntimeImpl.getInstance().customFunctions[name] = finalFunction;
         });
     }
     unregisterFunctions(...names) {
         names.forEach(name => {
-            if (name in this.customFunctions) {
-                delete this.customFunctions[name];
+            if (name in FunctionRuntimeImpl.getInstance().customFunctions) {
+                FunctionRuntimeImpl === null || FunctionRuntimeImpl === void 0 ? true : delete FunctionRuntimeImpl.getInstance().customFunctions[name];
             }
         });
     }
@@ -372,7 +378,8 @@ class FunctionRuntimeImpl {
                 _signature: []
             }
         };
-        return Object.assign(Object.assign({}, defaultFunctions), this.customFunctions);
+        return Object.assign(Object.assign({}, defaultFunctions), FunctionRuntimeImpl.getInstance().customFunctions);
     }
 }
-exports.FunctionRuntime = new FunctionRuntimeImpl();
+FunctionRuntimeImpl.instance = null;
+exports.FunctionRuntime = FunctionRuntimeImpl.getInstance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.57",
+  "version": "0.22.59",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.57"
+    "@aemforms/af-formatters": "^0.22.59"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",