@fnet/cli 0.120.0 → 0.122.0

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

@@ -6,7 +6,7 @@ export default function Block(context){
 
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{            
       {% include "src/default/macros/block-run-header.js.njk" %}

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

@@ -6,7 +6,7 @@ export default function Block(context){
 
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{            
         {% include "src/default/macros/block-run-header.js.njk" %}
@@ -15,6 +15,10 @@ export default function Block(context){
         
         const raise = {{context.transform.raise | safe}};
 
+        {% for assign in context.transform.assign %}
+          flow.set({{assign.key | safe}},{{assign.value | safe}});
+        {% endfor%}
+        
         onError? onError(new Error(raise?.message||raise||"Unknown error")) : reject(new Error(raise?.message||raise||"Unknown error"));
     });
   }

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

@@ -6,7 +6,7 @@ export default function Block(context){
 
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{            
         {% include "src/default/macros/block-run-header.js.njk" %}

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

@@ -8,7 +8,7 @@ export default function Block(context){
 
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{
         
@@ -40,7 +40,7 @@ export default function Block(context){
             return resolve(nextBlock);
 
           current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, onError, error });
-          currentArgs=nextBlock.withArgs;
+          currentArgs=nextBlock.input;
 
         } while(true);
 

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

@@ -19,7 +19,7 @@ export default function Block(context) {
   
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{
         
@@ -51,7 +51,7 @@ export default function Block(context) {
               console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
             {% endif %}
 
-            return resolve(await current.run.apply(current,args));
+            return resolve(Array.isArray(args)? await current.run.apply(current,args) : await current.run.call(current,args));
           }
       {% endfor%}
 

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

@@ -18,7 +18,7 @@ export default function Block(context) {
 
   this.run= function (){
       
-    const args=Array.from(arguments);
+    {% include "src/default/macros/block-entry-args.js.njk" %}
 
     return new Promise(async (resolve,reject)=>{
         
@@ -41,8 +41,7 @@ export default function Block(context) {
               console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
             {% endif %}
 
-            {# return resolve(await current.run.apply(current,args)); #}
-            current.run.apply(current,args).then(resolve);
+            Array.isArray(args)? current.run.apply(current,args).then(resolve):current.run.call(current,args).then(resolve);
           };
 
           {% if context.try.definition.dynamic %}
@@ -55,7 +54,7 @@ export default function Block(context) {
             console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
           {% endif %}
 
-          return resolve(await current.run.apply(current,args));
+          return resolve(Array.isArray(args)? await current.run.apply(current,args) : await current.run.call(current,args));
         }
         catch({{context.except.context.transform.as | safe}}){
             throw new Error('Error must not reach here!');

package/template/fnet/node/src/default/macros/block-entry-args.js.njk

@@ -0,0 +1,2 @@
+const args=Array.from(arguments);
+const input=arguments[0];

package/template/fnet/node/src/default/macros/block-next.js.njk

@@ -13,8 +13,8 @@ return resolve ({
     fromClosure: c,
     toType:{{context.next.codeKey}},
     onError,
-    {% if context.transform.nextArgs %}
-    withArgs: {{context.transform.nextArgs | safe}},
+    {% if context.transform.output %}
+    input: {{context.transform.output | safe}},
     {% endif %}
 });
 

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

@@ -103,7 +103,7 @@ export default class Workflow extends Object {
           throw new Error('Unknown situation');
         
         current=new nextBlock.toType({ parent:this, engine:this.engine, flow:this, caller:c });
-        currentArgs=nextBlock.withArgs;
+        currentArgs=nextBlock.input;
 
       } while(true);
 

package/template/fnode/bun/package.json.njk

@@ -44,7 +44,9 @@
     }
   },
   {% endif %}
-
+  "flownet": {
+    "type": "node",
+  },
   {% if atom.doc.repo.url %}
     "repository": {
         "type": "{{atom.doc.repo.type or 'git'}}",

package/template/fnode/node/package.json.njk

@@ -44,7 +44,9 @@
     }
   },
   {% endif %}
-
+  "flownet": {
+    "type": "node",
+  },
   {% if atom.doc.repo.url %}
     "repository": {
         "type": "{{atom.doc.repo.type or 'git'}}",