@fnet/cli 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnet/cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "files": [
     "dist",
     "template"

package/template/fnet/node/src/default/blocks/call.js.njk

@@ -81,25 +81,25 @@
 
     {% if context.transform.new !== undefined %}
       {# For constructor calls, use instance as context #}
-      const result = Array.isArray(callArgs)?  await callLib.apply(instance,callArgs): await callLib.call(instance,callArgs);
+      const result = Array.isArray(callArgs)?  await callLib.apply(instance,callArgs): await callLib(callArgs);
     {% else %}
       {# For regular calls, use _this as context #}
       {% if context.transform.context !== undefined %}
         const result = Array.isArray(callArgs)?  await callLib.apply({{context.transform.context | safe}},callArgs): await callLib.call({{context.transform.context | safe}},callArgs);
       {% else %}            
-        const result = Array.isArray(callArgs)?  await callLib.apply(_this,callArgs): await callLib.call(_this,callArgs);
+        const result = Array.isArray(callArgs)?  await callLib.apply(_this,callArgs): await callLib(callArgs);
       {% endif %}
 
     {% endif %}
 
   {% else %}
     {% if context.transform.new !== undefined %}
-      const result = await callLib.call(instance);
+      const result = await callLib();
     {% else %}
       {% if context.transform.context !== undefined %}
         const result = await callLib.call({{context.transform.context | safe}});
       {% else %}            
-        const result = await callLib.call(_this);
+        const result = await callLib();
       {% endif %}
     {% endif %}
   {% endif %}

package/template/fnet/node/src/default/blocks/for.js.njk

@@ -49,7 +49,7 @@
         {% endif %}
 
         const nextBlock= typeof currentArgs==='undefined'? await current.run()
-          : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+          : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
         if(nextBlock?.type==='return') return resolve(nextBlock);
         else if(nextBlock?.type!=='block') break;

package/template/fnet/node/src/default/blocks/parallel.js.njk

@@ -33,7 +33,7 @@
 
       const nextBlock = Array.isArray(args)
         ? await current.run.apply(current, args)
-        : await current.run.call(current, args);
+        : await current.run(args);
 
       return nextBlock;
     })());

package/template/fnet/node/src/default/blocks/steps.js.njk

@@ -26,7 +26,7 @@
       {% endif %}
 
       const nextBlock= typeof currentArgs==='undefined'? await current.run()
-        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
       if(nextBlock?.type==='return') return resolve(nextBlock);
       else if(nextBlock?.type!=='block') break;

package/template/fnet/node/src/default/blocks/switch.js.njk

@@ -39,7 +39,7 @@
           console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
         {% endif %}
 
-        return resolve(Array.isArray(args)? await current.run.apply(current,args) : await current.run.call(current,args));
+        return resolve(Array.isArray(args)? await current.run.apply(current,args) : await current.run(args));
       }
   {% endfor%}
 

package/template/fnet/node/src/default/blocks/tryexcept.js.njk

@@ -31,7 +31,7 @@
       {% endif %}
 
       const nextBlock= typeof currentArgs==='undefined'? await current.run()
-        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
       if(nextBlock?.type==='return') return resolve(nextBlock);
       else if(nextBlock?.type!=='block') break;
@@ -60,7 +60,7 @@
       {% endif %}
 
       const nextBlock= typeof currentArgs==='undefined'? await current.run()
-        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
       if(nextBlock?.type==='return') return resolve(nextBlock);
       else if(nextBlock?.type!=='block') break;

package/template/fnet/node/src/default/types/block.js.njk

@@ -101,7 +101,7 @@
   do {
 
     const nextBlock= typeof currentArgs==='undefined'? await current.run()
-      : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+      : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
     if(nextBlock?.type==='return') return resolve(nextBlock);
     else if(nextBlock?.type!=='block') break;

package/template/fnet/node/src/default/workflow.js.njk

@@ -92,7 +92,7 @@ export default class Workflow extends Object {
         {% endif %}
 
         const nextBlock= typeof currentArgs==='undefined'? await current.run() 
-          : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+          : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run(currentArgs) ;
 
 
         if(nextBlock?.type==='return') return nextBlock;