@fnet/cli 0.3.14 → 0.4.0

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

@@ -1,83 +1,66 @@
-{% include "src/default/macros/block-header.js.njk" %}
-
-{% include "src/default/macros/block-next-header.js.njk" %}
+{% set resolve=true %}
+
+{% import "src/default/types/block.js.njk" as block with context %}
+
+{% call block.header() %}
+  {% for child in childs %}
+    {% if not child.definition.dynamic %}
+      // SCHEDULED CHILD: {{child.indexKey}}
+      import {{child.codeKey}} from "./{{child.codeKey}}.js";
+    {% endif %}
+  {% endfor %}
+{% endcall %}
+
+{% call block.definition() %}
+  // Import node-cron for scheduling
+  const cron = await import('node-cron');
+
+  // Schedule configuration
+  const cronExpression = {{ context.transform.schedule.cron | safe }};
+  const timezone = {{ context.transform.schedule.timezone | dump | safe }};
+  const enabled = {{ context.transform.schedule.enabled | dump | safe }};
+
+  // Check if schedule is enabled
+  if (!enabled) {
+    // Schedule is disabled, skip to next block
+    {% include "src/default/macros/block-next.js.njk" %}
+    return;
+  }
 
-{% include "src/default/macros/block-modules-header.js.njk" %}
+  // Validate cron expression
+  if (!cron.validate(cronExpression)) {
+    reject(new Error(`Invalid cron expression: ${cronExpression}`));
+    return;
+  }
 
-{% for child in childs %}
-  {% if not child.definition.dynamic %}
-    // SCHEDULED CHILD: {{child.indexKey}}
-    import {{child.codeKey}} from "./{{child.codeKey}}.js";
+  // Get child block (the scheduled task)
+  {% if childs[0] %}
+  const scheduledTask = new {{childs[0].codeKey}}({
+    parent: _this,
+    engine: engine,
+    flow: flow
+  });
   {% endif %}
-{% endfor %}
-
-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(async (resolve,reject)=>{
-      {% include "src/default/macros/block-run-header.js.njk" %}
-
-      {% include "src/default/macros/page.js.njk" %}
 
-      // Import node-cron for scheduling
-      const cron = await import('node-cron');
-
-      // Schedule configuration
-      const cronExpression = {{ context.transform.schedule.cron | safe }};
-      const timezone = {{ context.transform.schedule.timezone | dump | safe }};
-      const enabled = {{ context.transform.schedule.enabled | dump | safe }};
-
-      // Check if schedule is enabled
-      if (!enabled) {
-        // Schedule is disabled, skip to next block
-        {% include "src/default/macros/block-next.js.njk" %}
-        return;
-      }
-
-      // Validate cron expression
-      if (!cron.validate(cronExpression)) {
-        reject(new Error(`Invalid cron expression: ${cronExpression}`));
-        return;
-      }
-
-      // Get child block (the scheduled task)
+  // Schedule the task with optional timezone
+  const scheduleOptions = timezone ? { timezone } : {};
+  const task = cron.schedule(cronExpression, async () => {
+    try {
       {% if childs[0] %}
-      const scheduledTask = new {{childs[0].codeKey}}({
-        parent: _this,
-        engine: engine,
-        flow: flow
-      });
+      await scheduledTask.run();
       {% endif %}
+    } catch (error) {
+      console.error(`Scheduled task '{{indexKey}}' failed:`, error);
+    }
+  }, scheduleOptions);
 
-      // Schedule the task with optional timezone
-      const scheduleOptions = timezone ? { timezone } : {};
-      const task = cron.schedule(cronExpression, async () => {
-        try {
-          {% if childs[0] %}
-          await scheduledTask.run();
-          {% endif %}
-        } catch (error) {
-          console.error(`Scheduled task '{{indexKey}}' failed:`, error);
-        }
-      }, scheduleOptions);
+  // Start the scheduled task
+  task.start();
 
-      // Start the scheduled task
-      task.start();
-
-      // Store task reference for potential cleanup
-      flow.set('{{indexKey}}_task', task);
-
-      {% include "src/default/macros/block-next.js.njk" %}
-
-      {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
-  }
-}
+  // Store task reference for potential cleanup
+  flow.set('{{indexKey}}_task', task);
 
-{% include "src/default/macros/block-footer.js.njk" %}
+{% endcall %}
 
+{% call block.footer()%} 
+{% endcall %}

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

@@ -1,37 +1,15 @@
-{% 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() %}
 
-    return new Promise(async (resolve,reject)=>{            
-      {% include "src/default/macros/block-run-header.js.njk" %}
-      
-      {% include "src/default/macros/page.js.njk" %}
+{% endcall %}
 
-      {% for assign in context.transform.assign %}
-      flow.set({{assign.key | safe}},{{assign.value | safe}});
-      {% endfor%}
-
-      {% 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 %}
-
-      {% if context.transform.signal==='next' %}
-        flow.continueForNext({key:'{{indexKey}}'});
-      {% endif %}
-
-      {% 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/blocks/steps.js.njk

@@ -1,70 +1,47 @@
-{% include "src/default/macros/block-header.js.njk" %}
+{% set assign=true %}
+{% set signal=true %}
+{% set resolve=true %}
 
-{% include "src/default/macros/block-next-header.js.njk" %}
+{% import "src/default/types/block.js.njk" as block with context %}
 
-export default function Block(context){
+{% call block.header() %}
+{% endcall %}
 
-  {% include "src/default/macros/block-body-header.js.njk" %}
+{% call block.definition() %}
 
-  this.run= function (){
-      
-    {% include "src/default/macros/block-entry-args.js.njk" %}
+  {% if context.next %}
 
-    return new Promise(async (resolve,reject)=>{
-        
-      {% include "src/default/macros/block-run-header.js.njk" %}
+    // NEXT : {{context.next.indexKey}}
+    {% if context.next.definition.dynamic %}
+      const { default: {{context.next.codeKey}} } = await import("./{{context.next.codeKey}}.js");
+    {% endif %}
 
-      {% if context.next %}
+    let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c , error });
+    let currentArgs=args;
 
-        // NEXT : {{context.next.indexKey}}
-        {% if context.next.definition.dynamic %}
-          const { default: {{context.next.codeKey}} } = await import("./{{context.next.codeKey}}.js");
-        {% endif %}
-
-        let current=new {{context.next.codeKey}}({ parent:_this, engine, flow, caller:c ,onError, error });
-        let currentArgs=args;
-
-        do {
-
-          {% if workflow.parent.context.atom.doc.features.print_runners %}
-            console.log(new Date().toLocaleString(),' * ',_this.constructor.IndexKey,' -> ',current.constructor.IndexKey);
-          {% endif %}
-
-          try {
-            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, onError, error });
-            currentArgs=nextBlock.input;
-          } catch (err) {
-            if (onError) {
-              return onError(err);
-            }
-            throw err;
-          }
-
-        } while(true);
+    do {
 
+      {% 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) ;
+
+      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;
 
-      resolve();
-      
-      {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
-  }
+    } while(true);
 
-  Object.freeze(this);
-}
+  {% endif %}
+  
+{% endcall %}
 
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}

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

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

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}},