@fnet/cli 0.119.4 → 0.120.0

package/package.json

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

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

@@ -81,7 +81,8 @@ export default function Block(context){
         {% endif %}
       }
       catch(error){
-          reject(error);
+          onError? onError(error) : reject(error);
+          {# reject(error); #}
       }
     });
   }

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

@@ -57,7 +57,7 @@ export default function Block(context) {
             if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
               return resolve(nextBlock);
 
-            current=new nextBlock.toType({ parent:_this, engine, flow, caller:c});
+            current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, onError, error });
             currentArgs=nextBlock.withArgs;
             
           } while(true);

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

@@ -15,7 +15,7 @@ export default function Block(context){
         
         const raise = {{context.transform.raise | safe}};
 
-        reject(new Error(raise?.message||raise||"Unknown error"));
+        onError? onError(new Error(raise?.message||raise||"Unknown error")) : reject(new Error(raise?.message||raise||"Unknown error"));
     });
   }
 

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

@@ -21,7 +21,7 @@ export default function Block(context){
           const { default: {{context.next.codeKey}} } = await import("./{{context.next.codeKey}}");
         {% endif %}
 
-        let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c });
+        let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c ,onError, error });
         let currentArgs=args;
 
         do {
@@ -39,7 +39,7 @@ export default function Block(context){
           if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
             return resolve(nextBlock);
 
-          current=new nextBlock.toType({ parent:_this, engine, flow, caller:c});
+          current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, onError, error });
           currentArgs=nextBlock.withArgs;
 
         } while(true);

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

@@ -1,8 +1,7 @@
+
 {% include "src/default/macros/block-header.js.njk" %}
 
-{% if not hasDefaultCondition %}
-  {% include "src/default/macros/block-next-header.js.njk" %}
-{% endif %}
+{# {% include "src/default/macros/block-next-header.js.njk" %} #}
 
 {% include "src/default/macros/block-modules-header.js.njk" %}
 
@@ -16,56 +15,53 @@
 export default function Block(context) {
 
   {% include "src/default/macros/block-body-header.js.njk" %}
-  
+
   this.run= function (){
       
     const args=Array.from(arguments);
 
     return new Promise(async (resolve,reject)=>{
         
-      {% include "src/default/macros/block-run-header.js.njk" %}
+        {% include "src/default/macros/block-run-header.js.njk" %}
 
-      {% include "src/default/macros/page.js.njk" %}
+        {% include "src/default/macros/page.js.njk" %}
 
-      {% include "src/default/macros/block-modules.js.njk" %}
-      
-      {% for child in childs %}
-        {% if loop.first %}
-          if ({{child.context.transform.condition | safe}}) 
-        {% else %}
-          {%if child.context.transform.condition %}
-            else if ({{child.context.transform.condition | safe}}) 
-          {% else %}
-            else
-          {% endif %}
-        {% endif %} 
-          {
-            {% if child.definition.dynamic %}
-              // CHILD: {{child.indexKey}}
-              const { default: {{child.codeKey}} } = await import("./{{child.codeKey}}");
+        {% 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}}");
             {% endif %}
 
-            const current=new {{child.codeKey}}({ parent:_this, engine, flow, caller:c });
+            const current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c , error });
 
             {% if workflow.parent.context.atom.doc.features.print_runners %}
               console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
             {% endif %}
 
-            return resolve(await current.run.apply(current,args));
-          }
-      {% endfor%}
-
-      {% if not hasDefaultCondition %}
-        {% 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 %}
+            {# return resolve(await current.run.apply(current,args)); #}
+            current.run.apply(current,args).then(resolve);
+          };
+
+          {% if context.try.definition.dynamic %}
+              const { default: {{context.try.codeKey}} } = await import("./{{context.try.codeKey}}");
+          {% 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 %}
+
+          return resolve(await current.run.apply(current,args));
+        }
+        catch({{context.except.context.transform.as | safe}}){
+            throw new Error('Error must not reach here!');
+        }
     });
-  }  
+  }
 
   Object.freeze(this);
 }

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

@@ -29,7 +29,21 @@ export default function Block(context) {
         {% 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}}");
+            {% endif %}
+
+            const current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c, onError });
+
+            {% if workflow.parent.context.atom.doc.features.print_runners %}
+              console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
+            {% endif %}
+
+            return resolve(await current.run.apply(current,args));
+          };
+
           {% if context.try.definition.dynamic %}
               const { default: {{context.try.codeKey}} } = await import("./{{context.try.codeKey}}");
           {% endif %}

package/template/fnet/bun/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 }=context || {};
+const { engine, flow, caller, onError, error }=context || {};
 
 const _this=this;

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

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

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

@@ -81,7 +81,8 @@ export default function Block(context){
         {% endif %}
       }
       catch(error){
-          reject(error);
+          onError? onError(error) : reject(error);
+          {# reject(error); #}
       }
     });
   }

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

@@ -57,7 +57,7 @@ export default function Block(context) {
             if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
               return resolve(nextBlock);
 
-            current=new nextBlock.toType({ parent:_this, engine, flow, caller:c});
+            current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, onError, error });
             currentArgs=nextBlock.withArgs;
             
           } while(true);

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

@@ -15,7 +15,7 @@ export default function Block(context){
         
         const raise = {{context.transform.raise | safe}};
 
-        reject(new Error(raise?.message||raise||"Unknown error"));
+        onError? onError(new Error(raise?.message||raise||"Unknown error")) : reject(new Error(raise?.message||raise||"Unknown error"));
     });
   }
 

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

@@ -21,7 +21,7 @@ export default function Block(context){
           const { default: {{context.next.codeKey}} } = await import("./{{context.next.codeKey}}");
         {% endif %}
 
-        let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c });
+        let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c ,onError, error });
         let currentArgs=args;
 
         do {
@@ -39,7 +39,7 @@ export default function Block(context){
           if(nextBlock.toType.ParentTypeId!==_this.constructor.TypeId)
             return resolve(nextBlock);
 
-          current=new nextBlock.toType({ parent:_this, engine, flow, caller:c});
+          current=new nextBlock.toType({ parent:_this, engine, flow, caller:c, onError, error });
           currentArgs=nextBlock.withArgs;
 
         } while(true);

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

@@ -45,7 +45,7 @@ export default function Block(context) {
               const { default: {{child.codeKey}} } = await import("./{{child.codeKey}}");
             {% endif %}
 
-            const current=new {{child.codeKey}}({ parent:_this, engine, flow, caller:c });
+            const current=new {{child.codeKey}}({ parent:_this, engine, flow, caller:c, onError });
 
             {% if workflow.parent.context.atom.doc.features.print_runners %}
               console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);

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

@@ -30,11 +30,26 @@ export default function Block(context) {
         
         try{
             
+          const onError=error=>{
+            {% if context.except.definition.dynamic %}
+                const { default: {{context.except.codeKey}} } = await import("./{{context.except.codeKey}}");
+            {% endif %}
+
+            const current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c , error });
+
+            {% if workflow.parent.context.atom.doc.features.print_runners %}
+              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);
+          };
+
           {% if context.try.definition.dynamic %}
               const { default: {{context.try.codeKey}} } = await import("./{{context.try.codeKey}}");
           {% endif %}
           
-          const current=new {{context.try.codeKey}}({ parent:_this, engine, flow, caller:c });
+          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);
@@ -43,18 +58,7 @@ export default function Block(context) {
           return resolve(await current.run.apply(current,args));
         }
         catch({{context.except.context.transform.as | safe}}){
-            
-          {% if context.except.definition.dynamic %}
-              const { default: {{context.except.codeKey}} } = await import("./{{context.except.codeKey}}");
-          {% endif %}
-
-          const current=new {{context.except.codeKey}}({ parent:_this, engine, flow, caller:c });
-
-          {% if workflow.parent.context.atom.doc.features.print_runners %}
-            console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
-          {% endif %}
-
-          return resolve(await current.run.apply(current,args));
+            throw new Error('Error must not reach here!');
         }
     });
   }

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 }=context || {};
+const { engine, flow, caller, onError, error }=context || {};
 
 const _this=this;

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

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