@fnet/cli 0.122.0 → 0.125.0

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

@@ -28,11 +28,6 @@ export default function Block(context){
         flow.waitForNext({
           key:'{{indexKey}}',
           next: async () => {
-
-            {% 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 %}
@@ -53,10 +48,10 @@ export default function Block(context){
         {% endif %}
 
         {% include "src/default/macros/block-run-form.js.njk" %}
+
+        {% include "src/default/macros/block-assign.js.njk" %}
         
-        {% if context.transform.operation==='continue-for-next' %}
-          flow.continueForNext({key:'{{indexKey}}'});
-        {% endif %}
+        {% include "src/default/macros/signal.js.njk" %}
       }
       catch(error){
         reject(error);                

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

@@ -15,13 +15,17 @@ export default function Block(context){
       
       {% include "src/default/macros/page.js.njk" %}
       
+      {% include "src/default/macros/block-assign.js.njk" %}
+
+      {% include "src/default/macros/block-signal.js.njk" %}
+
       {% 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 %}      
     });
   }
 

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

@@ -19,20 +19,25 @@ export default function Block(context){
 
         {% include "src/default/macros/page.js.njk" %}
 
-        {% if context.next and context.transform.operation==='wait-for-next' %}
+        {% if context.next and context.transform.wait==='next' %}
         flow.waitForNext({
           key:'{{indexKey}}',
-          next: new Promise((resolve,reject) => {
+          next: async () =>  {
               {% include "src/default/macros/block-next.js.njk" %}
-          })
+          }
         });
         {% endif %}
         
         {% include "src/default/macros/block-modules.js.njk" %}
         
+
+        {% include "src/default/macros/block-assign.js.njk" %}
+
+        {% include "src/default/macros/block-signal.js.njk" %}
+
         {% if context.transform.return %}
           resolve({type:'return',value: {{context.transform.return | safe}}});
-        {% elseif context.next and context.transform.operation!=='wait-for-next'%}
+        {% elseif context.next and context.transform.wait!=='next'%}
           {% include "src/default/macros/block-next.js.njk" %}
         {% elseif not context.next%}
           resolve();

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

@@ -15,10 +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%}
+        {% include "src/default/macros/block-assign.js.njk" %}
         
+        {% include "src/default/macros/block-signal.js.njk" %}
+
         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

@@ -17,7 +17,11 @@ export default function Block(context){
 
         flow.result={value: value};
 
-        resolve();            
+        {% include "src/default/macros/block-assign.js.njk" %}
+        
+        {% include "src/default/macros/block-signal.js.njk" %}
+
+        resolve();
     });
   }
 

package/template/fnet/{bun/src/default/blocks/jump.js.njk → node/src/default/blocks/signal.js.njk}

@@ -1,9 +1,7 @@
 {% include "src/default/macros/block-header.js.njk" %}
 
-{% include "src/default/macros/block-next-header.js.njk" %}
-
 export default function Block(context){
-  
+
   {% include "src/default/macros/block-body-header.js.njk" %}
 
   this.run= function (){
@@ -14,18 +12,24 @@ export default function Block(context){
       {% include "src/default/macros/block-run-header.js.njk" %}
       
       {% include "src/default/macros/page.js.njk" %}
-      
+
+      {% 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 %}
+      {% elseif context.next and context.transform.wait!=='next'%}
         {% include "src/default/macros/block-next.js.njk" %}
-      {% else %}
+      {% elseif not context.next%}
         resolve();
       {% endif %}
+
+      {% if context.transform.signal==='next' %}
+        flow.continueForNext({key:'{{indexKey}}'});
+      {% endif %}
     });
   }
-
-  Object.freeze(this);       
 }
 
 {% include "src/default/macros/block-footer.js.njk" %}

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

@@ -46,7 +46,13 @@ export default function Block(context){
 
       {% endif %}
 
+
+      {% include "src/default/macros/block-assign.js.njk" %}
+
+      {% include "src/default/macros/block-signal.js.njk" %}
+
       resolve();
+      
     });
   }
 

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

@@ -55,6 +55,10 @@ export default function Block(context) {
           }
       {% endfor%}
 
+      {% include "src/default/macros/block-assign.js.njk" %}
+
+      {% include "src/default/macros/block-signal.js.njk" %}
+
       {% if not hasDefaultCondition %}
         {% if context.transform.return %}
           resolve({type:'return',value: {{context.transform.return | safe}}});
@@ -64,6 +68,7 @@ export default function Block(context) {
           resolve();
         {% endif %}
       {% endif %}
+
     });
   }  
 

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

@@ -54,11 +54,15 @@ export default function Block(context) {
             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));
+          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!');
         }
+
+        {% include "src/default/macros/block-assign.js.njk" %}
+
+        {% include "src/default/macros/block-signal.js.njk" %}
     });
   }
 

package/template/fnet/{bun/src/default/blocks/operation.js.njk → node/src/default/blocks/wait.js.njk}

@@ -13,10 +13,19 @@ export default function Block(context){
       
       {% include "src/default/macros/page.js.njk" %}
 
-      {% if context.transform.operation==='continue-for-next' %}
-          await flow.continueForNext({key:'{{indexKey}}'});
-          resolve();
-      {% endif %}                        
+      {% 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%}
+
     });
   }
 }

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

@@ -0,0 +1,3 @@
+{% for assign in context.transform.assign %}
+flow.set({{assign.key | safe}},{{assign.value | safe}});
+{% endfor%}

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

@@ -6,7 +6,7 @@
   {% endif %}
 
 
-return resolve ({
+resolve ({
     type: 'block',
     from: _this,
     fromType: _this.constructor,

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

@@ -0,0 +1,3 @@
+{% if context.transform.signal==='next' %}
+  flow.continueForNext({key:'{{indexKey}}'});
+{% endif %}

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

@@ -41,10 +41,13 @@ export default class Workflow extends Object {
 
   waitForNext(context){
     this.#waitContext=context;
+    this.#waitContext?.timeoutId && clearTimeout(this.#waitContext.timeoutId) && (this.#waitContext.timeoutId=undefined);
+    this.#waitContext.timeoutId = setInterval(() => {}, 0x7FFFFFFF);
   }
-    
+
   async continueForNext(context){
     const next=this.#waitContext?.next;
+    this.#waitContext?.timeoutId && clearTimeout(this.#waitContext.timeoutId) && (this.#waitContext.timeoutId=undefined);
     this.#waitContext=undefined;
     next && await next();
   }

package/template/fnet/bun/src/app/index.html.njk

@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>{{atom.doc.title or atom.doc.name}}</title>
-
-    {% if atom.doc.features.css.options.extract===true %}
-      <link rel="stylesheet" href="./index.css" />    
-    {% endif %}
-
-    {% if atom.doc.features.app.format==='iife' %}
-      <script src="./index.js"></script>
-    {% endif %}
-
-  </head>
-  <body style="height:100vh;margin:0;padding:0;background-color: #eeeeee;">
-    <div id="container" style="height:100%;"></div>
-    {% if atom.doc.features.app.export===true %}    
-        {% if atom.doc.features.app.format==='esm' %}
-            <script type="module">
-                import { createApp } from "./index.js";
-                const run = createApp({container: document.getElementById("container")});
-                {% if atom.doc.features.app.props %}
-                  const dispose=run({{ atom.doc.features.app.props | dump | safe }});
-                {% else %}
-                  const dispose=run();
-                {% endif %}
-            </script>
-        {% endif %}
-        
-        {% if atom.doc.features.app.format==='iife' %}
-            <script>
-                const { createApp } = window['{{atom.doc.bundleName}}'];
-                const run = createApp({container: document.getElementById("container")});
-                {% if atom.doc.features.app.props %}
-                  const dispose=run({{ atom.doc.features.app.props | dump | safe }});
-                {% else %}
-                  const dispose=run();
-                {% endif %}
-            </script>
-        {% endif %}
-    {% endif %}
-
-    {% if atom.doc.features.workbox_enabled %}
-      {% if atom.doc.features.rollup_output.app.workbox.enabled %}
-        <!-- Service Worker Registration -->
-        <script>
-          if ('serviceWorker' in navigator) {
-            window.addEventListener('load', () => {
-              navigator
-                .serviceWorker
-                .register('./sw.js', {scope: './'}) // Optionally add scope
-                .then((registration) => {
-                  console.log('Service Worker registered with scope:', registration.scope);
-                })
-                .catch((error) => {
-                  console.log('Service Worker registration failed:', error);
-                });
-            });
-          }
-        </script>
-      {% endif%}
-    {% endif%}
-  </body>
-</html>

package/template/fnet/bun/src/app/index.js.njk

@@ -1,36 +0,0 @@
-{% if atom.doc.features.app.enabled===true %}
-
-import { default as Engine } from "../default/{{ atom.doc.features.app_default_entry_file or atom.doc.features.main_default_entry_file }}";
-
-  {% if atom.doc.features.app.export===true %}
-    {% if atom.doc.features.app.extend===true %}
-      import { default as init } from '../../../app';
-    {% endif %}
-    const createApp = ({ container }) => {
-        {% if atom.doc.features.app.extend===true %}
-          return init({container,Engine});
-        {% else %} 
-          return (props) => {
-              const engine = new Engine();
-              engine.run({ ...props, container }).catch((error) => {
-                console.log(error.message)
-              });
-          }
-        {% endif %}
-    };
-    export { createApp };
-  {% else %}
-      {% if atom.doc.features.app.extend===true %}
-        import { default as run } from '../../../app';
-        run({ Engine }).catch((error) => {
-            console.log(error.message)
-        });
-      {% else %} 
-        const engine = new Engine();
-        engine.run().catch((error) => {
-          console.log(error.message)
-        });
-      {% endif %}    
-  {% endif %}
-
-{% endif %}

package/template/fnet/bun/src/cli/index.js.njk

@@ -1,45 +0,0 @@
-{% if atom.doc.features.cli.enabled===true %}
-import argv from '../default/input.args.js';
-import { schema as inputSchema } from '../default/validate_input.js';
-import { default as Engine } from '../default/{{atom.doc.features.cli_default_entry_file or atom.doc.features.main_default_entry_file}}';
-
-  {% if atom.doc.features.cli.extend===true %}
-    {# TYPE 1 #}
-    import { default as runExtended } from '../../../cli';
-
-    const run = async () => {
-      return await runExtended(await argv(),{ Engine });
-    };
-
-    run()
-      .then(() => {    
-        {# process.exit(0);  #}
-      })
-      .catch((error) => {    
-        console.error(error.message);
-        process.exit(1);
-      });
-  {% else %}
-    {# TYPE 2 #}
-    const run = async () => {
-      const engine = new Engine();
-      return await engine.run(await argv());
-    };
-
-    run()
-      .then((result) => {    
-        if (typeof result !== 'undefined')
-        {
-          // TODO: REMOVE THIS LINE
-          const stdout_format=process.argv.slice(2).indexOf()!==-1? process.argv.slice(2)[process.argv.slice(2).indexOf('--stdout_format')+1]:null;
-          if(stdout_format==='json') console.log(JSON.stringify(result,null,2));
-          else console.log(result);
-        }
-        {# process.exit(0); #}    
-      })
-      .catch((error) => {    
-        console.error(error.message);
-        process.exit(1);
-      });
-  {% endif %}
-{% endif %}

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

@@ -1,40 +0,0 @@
-{% 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" %}
-
-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" %}
-
-      {% include "src/default/macros/block-modules.js.njk" %}
-
-      {% 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 %}
-          {% include "src/default/macros/block-next.js.njk" %}
-      {% else %}
-          resolve();
-      {% endif %}
-    });
-  }
-
-  Object.freeze(this);
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}

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

@@ -1,97 +0,0 @@
-{% include "src/default/macros/block-header.js.njk" %}
-
-{% include "src/default/macros/block-next-header.js.njk" %}
-
-{% include "src/default/macros/block-library-header.js.njk" %}
-
-{% include "src/default/macros/block-modules-header.js.njk" %}
-
-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)=>{
-
-      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.operation==='wait-for-next' %}
-          flow.waitForNext({
-            key:'{{indexKey}}',
-            next: new Promise((resolve,reject) => {
-                {% include "src/default/macros/block-next.js.njk" %}
-            })
-          });
-        {% endif %}
-        
-        {% if context.lib.type==='atom'%}
-          const lib=LIBRARY;
-        {% elseif context.lib.type==='subworkflow' %}
-          const lib={{context.lib.codeKey}};
-        {% elseif target.atom.protocol==='use:' %}
-          const lib={{context.transform.call}};
-        {% else %}
-          const lib=undefined; 
-          throw new Error('Couldn file lib.');
-        {% endif %}
-
-        {% if context.lib.atom.doc.subtype==='workflow'%}
-          const Workflow=lib;
-          const workflow=new Workflow({app:engine.app,caller:c});
-          const callLib = workflow.run.bind(workflow);
-        {% elseif context.lib.type==='subworkflow'%}
-          const Workflow=lib;
-          const workflow=new Workflow({engine,flow,caller:c});
-          const callLib = workflow.run.bind(workflow);
-        {% else %}
-          const callLib = lib;
-        {% endif %}
-
-        {% if context.transform.args %}
-          {% if context.lib.type==='subworkflow' %}
-            const callArgs ={ params: {{ context.transform.args | safe }} };
-          {% else %}
-            const callArgs ={{ context.transform.args | safe }} ;
-          {% endif %}
-
-          const result = Array.isArray(callArgs)?  await callLib.apply(_this,callArgs): await callLib.call(_this,callArgs);
-
-        {% else %}
-          const result = await callLib.call(_this);
-        {% endif %}
-
-        {% for assign in context.transform.result %}
-          flow.set({{assign.key | safe}},{{assign.value | safe}});
-        {% endfor%}
-
-        {% 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.operation!=='wait-for-next'%}
-          {% include "src/default/macros/block-next.js.njk" %}
-        {% elseif not context.next%}
-          resolve();
-        {% endif %}
-      }
-      catch(error){
-          onError? onError(error) : reject(error);
-          {# reject(error); #}
-      }
-    });
-  }
-
-  Object.freeze(this); 
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}

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

@@ -1,81 +0,0 @@
-
-{% 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" %}
-
-{% if childs.length %}
-  {% if not childs[0].definition.dynamic %}
-    // FIRST CHILD: {{childs[0].indexKey}}
-    import {{childs[0].codeKey}} from "./{{childs[0].codeKey}}";
-  {% endif %}
-{% endif%}
-
-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" %}
-      
-      {% include "src/default/macros/block-modules.js.njk" %}
-
-      {% if childs.length %}
-        {% if childs[0].definition.dynamic %}
-          // FIRST CHILD: {{childs[0].indexKey}}
-          const { default: {{childs[0].codeKey}} } = await import("./{{childs[0].codeKey}}");
-        {% endif %}
-      {% endif%}
-
-      for await(const {{context.transform.for.value | safe}} of {{context.transform.for.in | safe}}){
-        c.for={ {{context.transform.for.value | safe}} };
-
-        {% if childs.length %}
-          let current= new {{childs[0].codeKey}}({ parent:_this, engine, flow, caller:c  });
-          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 %}
-
-            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;
-            
-          } while(true);
-            
-        {% endif %}
-      }
-
-      {% 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 %}
-    });
-  }    
-
-  Object.freeze(this); 
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}