@fnet/cli 0.3.15 → 0.4.1

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

@@ -1,74 +1,80 @@
+{% set assign=true %}
+{% set signal=true %}
+{% set resolve=true %}
 
-{% include "src/default/macros/block-header.js.njk" %}
+{% import "src/default/types/block.js.njk" as block with context %}
 
-{# {% include "src/default/macros/block-next-header.js.njk" %} #}
+{% call block.header() %}
+  {% for child in childs %}
+    {% if not child.definition.dynamic %}
+      // CHILD: {{child.indexKey}}
+      import {{child.codeKey}} from "./{{child.codeKey}}.js";
+    {% endif %}
+  {% endfor%}
+{% endcall %}
 
-{% include "src/default/macros/block-modules-header.js.njk" %}
+{% call block.definition() %}
+  
+  try{
 
-{% for child in childs %}
-  {% if not child.definition.dynamic %}
-    // CHILD: {{child.indexKey}}
-    import {{child.codeKey}} from "./{{child.codeKey}}.js";
-  {% endif %}
-{% endfor%}
+    {% if context.try.definition.dynamic %}
+      const { default: {{context.try.codeKey}} } = await import("./{{context.try.codeKey}}.js");
+    {% endif %}
 
-export default function Block(context) {
+    let current=new {{context.try.codeKey}}({ parent:_this, engine, flow, caller:c, error });
+    let currentArgs=args;
 
-  {% include "src/default/macros/block-body-header.js.njk" %}
+    do {
 
-  this.run= function (){
-      
-    {% include "src/default/macros/block-entry-args.js.njk" %}
+      {% if workflow.parent.context.atom.doc.features.print_runners %}
+        console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
+      {% endif %}
 
-    return new Promise(async (resolve,reject)=>{
-        
-        {% include "src/default/macros/block-run-header.js.njk" %}
+      const nextBlock= typeof currentArgs==='undefined'? await current.run()
+        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
 
-        {% include "src/default/macros/page.js.njk" %}
+      if(nextBlock?.type==='return') return resolve(nextBlock);
+      else if(nextBlock?.type!=='block') break;
 
-        {% include "src/default/macros/block-modules.js.njk" %}
-        
-        try{
-            
-          const onError=error=>{
-            {% if context.except.definition.dynamic %}
-                const { default: {{context.except.codeKey}} } = await import("./{{context.except.codeKey}}.js");
-            {% endif %}
+      if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
+        return resolve(nextBlock);
 
-            const current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c , error });
+      current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, error });
+      currentArgs=nextBlock.input;
 
-            {% if workflow.parent.context.atom.doc.features.print_runners %}
-              console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
-            {% endif %}
+    } while(true);            
+  }
+  catch(error){
+
+    {% if context.except.definition.dynamic %}
+      const { default: {{context.except.codeKey}} } = await import("./{{context.except.codeKey}}.js");
+    {% endif %}
+
+    let current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c , error });
+    let currentArgs=args;
 
-            Array.isArray(args)? current.run.apply(current,args).then(resolve):current.run.call(current,args).then(resolve);
-          };
+    do {
 
-          {% if context.try.definition.dynamic %}
-              const { default: {{context.try.codeKey}} } = await import("./{{context.try.codeKey}}.js");
-          {% endif %}
-          
-          const current=new {{context.try.codeKey}}({ parent:_this, engine, flow, caller:c ,onError, error });
+      {% if workflow.parent.context.atom.doc.features.print_runners %}
+        console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
+      {% endif %}
 
-          {% if workflow.parent.context.atom.doc.features.print_runners %}
-            console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
-          {% endif %}
+      const nextBlock= typeof currentArgs==='undefined'? await current.run()
+        : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
 
-          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!');
-        }
+      if(nextBlock?.type==='return') return resolve(nextBlock);
+      else if(nextBlock?.type!=='block') break;
 
-        {% include "src/default/macros/block-assign.js.njk" %}
+      if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
+        return resolve(nextBlock);
 
-        {% include "src/default/macros/block-signal.js.njk" %}
+      current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, error });
+      currentArgs=nextBlock.input;
 
-        {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
+    } while(true);
   }
 
-  Object.freeze(this);
-}
+{% endcall %}
 
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}

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

@@ -1,34 +1,14 @@
-{% include "src/default/macros/block-header.js.njk" %}
+{% set assign=true %}
+{% set signal=true %}
+{% set resolve=true %}
 
-export default function Block(context){
+{% import "src/default/types/block.js.njk" as block with context %}
 
-  {% include "src/default/macros/block-body-header.js.njk" %}
+{% call block.header() %}
+{% endcall %}
 
-  this.run= function (){
-      
-    {% include "src/default/macros/block-entry-args.js.njk" %}
+{% call block.definition() %}
+{% endcall %}
 
-    return new Promise(async (resolve,reject)=>{            
-      {% include "src/default/macros/block-run-header.js.njk" %}
-      
-      {% include "src/default/macros/page.js.njk" %}
-
-      {% if context.next and context.transform.wait==='next' %}
-        flow.waitForNext({
-          key:'{{indexKey}}',
-          next: async () =>  {
-            {% include "src/default/macros/block-next.js.njk" %}
-          }
-        });
-      {% endif %}
-
-      {% for assign in context.transform.assign %}
-        flow.set({{assign.key | safe}},{{assign.value | safe}});
-      {% endfor%}
-
-      {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
-  }
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}

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

@@ -2,6 +2,6 @@ if (this.constructor !== Block) throw Error(Message.USE_CONSTRUCTOR);
 
 this.context=context;
 
-const { engine, flow, caller, onError, error }=context || {};
+const { engine, flow, caller, error }=context || {};
 
 const _this=this;

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

@@ -12,7 +12,6 @@ resolve ({
     fromType: _this.constructor,
     fromClosure: c,
     toType:{{context.next.codeKey}},
-    onError,
     error,
     {% if context.transform.output %}
     input: {{context.transform.output | safe}},

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

@@ -0,0 +1,133 @@
+{% macro header() %}
+
+  {% include "src/default/macros/block-header.js.njk" %}
+
+  {% include "src/default/macros/block-next-header.js.njk" %}
+
+  {% include "src/default/macros/block-modules-header.js.njk" %}
+
+  {{ caller() }}
+
+{% endmacro %}
+
+{% macro definition() %}
+
+  export default function Block(context){
+
+    {% include "src/default/macros/block-body-header.js.njk" %}
+
+    this.run= function (){
+        
+      {% include "src/default/macros/block-entry-args.js.njk" %}
+
+      return new Promise((resolve,reject)=>{
+
+        (async () => {
+          try{
+              {% include "src/default/macros/block-run-header.js.njk" %}
+
+              {% include "src/default/macros/page.js.njk" %}
+
+              {% include "src/default/macros/block-modules.js.njk" %}
+
+              {% if (context.next and context.transform.wait==='next') or waitForNext === true %}
+              flow.waitForNext({
+                key:'{{indexKey}}',
+                next: async () => {
+                  {% if context.transform.return %}
+                    resolve({type:'return',value: {{context.transform.return | safe}}});
+                  {% elseif context.next %}
+                    {% include "src/default/macros/block-next.js.njk" %}
+                  {% else %}
+                    resolve();
+                  {% endif %}
+                }
+              });
+              {% endif %}
+
+              {{ caller() }}
+
+              {% if result === true %}
+                {% for assign in context.transform.result %}
+                  flow.set({{assign.key | safe}},{{assign.value | safe}});
+                {% endfor%}
+              {% endif %}
+
+              {% if assign === true %}
+                {% include "src/default/macros/block-assign.js.njk" %}
+              {% endif %}
+
+              {% if signal === true %}
+                {% include "src/default/macros/block-signal.js.njk" %}
+              {% endif %}
+
+              {% if resolve === true %}
+                {% if context.transform.return %}
+                  resolve({type:'return',value: {{context.transform.return | safe}}});
+                {% elseif context.next and context.transform.wait!=='next'%}
+                  {% include "src/default/macros/block-next.js.njk" %}
+                {% elseif not context.next%}
+                  resolve();
+                {% endif %}
+              {% endif %}
+
+              {% include "src/default/macros/block-run-footer.js.njk" %}
+          }
+          catch(error){
+            reject(error);
+          }
+        })();
+      });
+    }
+
+    Object.freeze(this);  
+  }
+
+{% endmacro %}
+
+{% macro footer() %}
+  {% include "src/default/macros/block-footer.js.njk" %}
+  {{ caller() }}
+{% endmacro %}
+
+{% macro runner({ step: null }) %}
+  {% if step.definition.dynamic %}
+    const { default: {{step.codeKey}} } = await import("./{{step.codeKey}}.js");
+  {% endif %}
+
+  let current=new {{step.codeKey}}({ parent:_this, engine, flow, caller:c, error });
+  let currentArgs=args;
+
+  do {
+
+    const nextBlock= typeof currentArgs==='undefined'? await current.run()
+      : Array.isArray(currentArgs)? await current.run.apply(current,currentArgs) : await current.run.call(current, currentArgs) ;
+
+    if(nextBlock?.type==='return') return resolve(nextBlock);
+    else if(nextBlock?.type!=='block') break;
+
+    if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
+      return resolve(nextBlock);
+
+    current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, error });
+    currentArgs=nextBlock.input;
+
+  } while(true);
+{% endmacro %}
+
+{# USAGE #}
+{# 
+
+{% import "src/default/types/block.js.njk" as block with context %}
+
+{% call block.header() %}
+{% endcall %}
+
+{% call block.definition() %}
+
+{% endcall %}
+
+{% call block.footer()%} 
+{% endcall %}
+
+#}

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

@@ -99,7 +99,7 @@ export default class Workflow extends Object {
         if(nextBlock.toType.ParentTypeId!==this.constructor.TypeId)
           throw new Error('Unknown situation');
 
-        current=new nextBlock.toType({ parent:this, engine:this.engine, flow:this, caller:c, onError:nextBlock.onError, error:nextBlock.error });
+        current=new nextBlock.toType({ parent:this, engine:this.engine, flow:this, caller:c, error:nextBlock.error });
         currentArgs=nextBlock.input;
 
       } while(true);