@fnet/cli 0.3.15 → 0.4.1

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

@@ -1,107 +1,71 @@
+{% set assign=true %}
+{% set signal=true %}
+{% set resolve=true %}
+
+{% import "src/default/types/block.js.njk" as block with context %}
+
+{% call block.header() %}
+  {% if childs.length %}
+    {% if not childs[0].definition.dynamic %}
+      // FIRST CHILD: {{childs[0].indexKey}}
+      import {{childs[0].codeKey}} from "./{{childs[0].codeKey}}.js";
+    {% endif %}
+  {% endif%}
+{% endcall %}
+
+{% call block.definition() %}
+
+  {% if childs.length %}
+    {% if childs[0].definition.dynamic %}
+      // FIRST CHILD: {{childs[0].indexKey}}
+      const { default: {{childs[0].codeKey}} } = await import("./{{childs[0].codeKey}}.js");
+    {% endif %}
+  {% endif%}
+
+  for await(const {{context.transform.for.as | safe}} of {{context.transform.for.in | safe}}){
+    // Create Proxy for closure-like variable resolution
+    // Local variable shadows parent, but parent scope accessible via Proxy fallback
+    const localForVar = { {{context.transform.for.as | safe}}: {{context.transform.for.as | safe}} };
+    const forProxy = new Proxy(localForVar, {
+      get(target, prop) {
+        // Check local scope first (shadowing)
+        if (prop in target) return target[prop];
+        // Fallback to parent scope
+        return c.for?.[prop];
+      }
+    });
 
-{% 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}}.js";
-  {% endif %}
-{% endif%}
+    // Create new context with updated for
+    const loopContext = { ...c, for: forProxy };
 
-export default function Block(context) {
+    {% if childs.length %}
+      let current= new {{childs[0].codeKey}}({ parent:_this, engine, flow, caller:loopContext  });
+      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" %}
-      
-      {% include "src/default/macros/page.js.njk" %}
-      
-      {% include "src/default/macros/block-modules.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) ;
 
-      {% if childs.length %}
-        {% if childs[0].definition.dynamic %}
-          // FIRST CHILD: {{childs[0].indexKey}}
-          const { default: {{childs[0].codeKey}} } = await import("./{{childs[0].codeKey}}.js");
-        {% endif %}
-      {% endif%}
-
-      for await(const {{context.transform.for.as | safe}} of {{context.transform.for.in | safe}}){
-        // Create Proxy for closure-like variable resolution
-        // Local variable shadows parent, but parent scope accessible via Proxy fallback
-        const localForVar = { {{context.transform.for.as | safe}}: {{context.transform.for.as | safe}} };
-        const forProxy = new Proxy(localForVar, {
-          get(target, prop) {
-            // Check local scope first (shadowing)
-            if (prop in target) return target[prop];
-            // Fallback to parent scope
-            return c.for?.[prop];
-          }
-        });
-
-        // Create new context with updated for
-        const loopContext = { ...c, for: forProxy };
-
-        {% if childs.length %}
-          let current= new {{childs[0].codeKey}}({ parent:_this, engine, flow, caller:loopContext  });
-          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:loopContext, onError, error });
-              currentArgs=nextBlock.input;
-            } catch (err) {
-              if (onError) {
-                return onError(err);
-              }
-              throw err;
-            }
-
-          } while(true);
-            
-        {% endif %}
-      }
+        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:loopContext, error });
+        currentArgs=nextBlock.input;
 
-      {% 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 %}
+      } while(true);
 
-      {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
-  }    
+    {% endif %}
+  }
 
-  Object.freeze(this); 
-}
+{% endcall %}
 
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}

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

@@ -1,69 +1,31 @@
-import React from "react";
+{% set waitForNext=true %}
+{% set assign=true %}
+{% set signal=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() %}
 
-{% include "src/default/macros/block-library-header.js.njk" %}
+  {% include "src/default/macros/block-library-header.js.njk" %}
 
-{% include "src/default/macros/block-modules-header.js.njk" %}
+  import React from "react";
 
-export default function Block(context){
-    
-  {% include "src/default/macros/block-body-header.js.njk" %}
+{% endcall %}
 
-  this.run= function (){
-      
-    {% include "src/default/macros/block-entry-args.js.njk" %}
+{% call block.definition() %}
 
-    return new Promise(async (resolve,reject)=>{
+  {% if context.lib.type==='atom'%}
+    const formLib=LIBRARY;
+  {% elseif context.lib.type==='subworkflow' %}
+    const formLib={{context.lib.codeKey}};
+  {% else %}
+    const formLib=undefined; 
+    throw new Error('Couldnt find form.');
+  {% endif %}
 
+  {% include "src/default/macros/block-run-form.js.njk" %}
 
-      try{
-        {% include "src/default/macros/block-run-header.js.njk" %}
-        
-        {% include "src/default/macros/page.js.njk" %}
+{% endcall %}
 
-        {% include "src/default/macros/block-modules.js.njk" %}
-        
-        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 %}
-          }
-        });
-        
-        {% if context.lib.type==='atom'%}
-          const formLib=LIBRARY;
-        {% elseif context.lib.type==='subworkflow' %}
-          const formLib={{context.lib.codeKey}};
-        {% else %}
-          const formLib=undefined; 
-          throw new Error('Couldnt find form.');
-        {% endif %}
-
-        {% include "src/default/macros/block-run-form.js.njk" %}
-
-        {% include "src/default/macros/block-assign.js.njk" %}
-        
-        {% include "src/default/macros/block-signal.js.njk" %}
-
-        {% include "src/default/macros/block-run-footer.js.njk" %}
-      }
-      catch(error){
-        reject(error);                
-      }
-
-    });
-  } 
-
-  Object.freeze(this);    
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}

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

@@ -1,157 +1,135 @@
-{% 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" %}
-      
-      // HTTP configuration
-      let url = {{ context.transform.http.url | safe }};
-      let method = "{{ context.transform.http.method }}";
-      let headers = {{ context.transform.http.headers | dump | safe }};
-      let timeout = {{ context.transform.http.timeout }};
-      {% if context.transform.http.body !== undefined %}
-      let body = {% if context.transform.http.body is string %}{{ context.transform.http.body | safe }}{% else %}{{ context.transform.http.body | dump | safe }}{% endif %};
-      {% endif %}
-      {% if context.transform.http.params %}
-      let params = {{ context.transform.http.params | dump | safe }};
-      {% endif %}
-
-      // Create HTTP context for modules
-      const httpContext = { url, method, headers, timeout, params: {% if context.transform.http.params %}params{% else %}undefined{% endif %}, body: {% if context.transform.http.body !== undefined %}body{% else %}undefined{% endif %} };
-
-      // If any property is a module function (m::), call it with HTTP context
-      if (typeof url === 'function') {
-        url = await url(httpContext);
-      }
+{% set assign=true %}
+{% set signal=true %}
+{% set resolve=true %}
+{% set result=true %}
+
+{% import "src/default/types/block.js.njk" as block with context %}
+
+{% call block.header() %}
+{% endcall %}
+
+{% call block.definition() %}
+  
+  // HTTP configuration
+  let url = {{ context.transform.http.url | safe }};
+  let method = "{{ context.transform.http.method }}";
+  let headers = {{ context.transform.http.headers | dump | safe }};
+  let timeout = {{ context.transform.http.timeout }};
+  {% if context.transform.http.body !== undefined %}
+  let body = {% if context.transform.http.body is string %}{{ context.transform.http.body | safe }}{% else %}{{ context.transform.http.body | dump | safe }}{% endif %};
+  {% endif %}
+  {% if context.transform.http.params %}
+  let params = {{ context.transform.http.params | dump | safe }};
+  {% endif %}
+
+  // Create HTTP context for modules
+  const httpContext = { url, method, headers, timeout, params: {% if context.transform.http.params %}params{% else %}undefined{% endif %}, body: {% if context.transform.http.body !== undefined %}body{% else %}undefined{% endif %} };
+
+  // If any property is a module function (m::), call it with HTTP context
+  if (typeof url === 'function') {
+    url = await url(httpContext);
+  }
 
-      if (typeof method === 'function') {
-        method = await method(httpContext);
-      }
+  if (typeof method === 'function') {
+    method = await method(httpContext);
+  }
 
-      if (typeof headers === 'function') {
-        headers = await headers(httpContext);
-      }
+  if (typeof headers === 'function') {
+    headers = await headers(httpContext);
+  }
 
-      if (typeof timeout === 'function') {
-        timeout = await timeout(httpContext);
-      }
+  if (typeof timeout === 'function') {
+    timeout = await timeout(httpContext);
+  }
 
-      {% if context.transform.http.params %}
-      if (typeof params === 'function') {
-        params = await params(httpContext);
-      }
-      {% endif %}
+  {% if context.transform.http.params %}
+  if (typeof params === 'function') {
+    params = await params(httpContext);
+  }
+  {% endif %}
 
-      {% if context.transform.http.body !== undefined %}
-      if (typeof body === 'function') {
-        body = await body(httpContext);
-      }
-      {% endif %}
-
-      // Build URL with query parameters if provided
-      let finalUrl = url;
-      {% if context.transform.http.params %}
-      if (params && Object.keys(params).length > 0) {
-        const queryString = new URLSearchParams(params).toString();
-        finalUrl = url + (url.includes('?') ? '&' : '?') + queryString;
-      }
-      {% endif %}
-
-      // Prepare fetch options
-      const fetchOptions = {
-        method: method,
-        headers: headers
-      };
-
-      // Add body if present (and not GET/HEAD)
-      {% if context.transform.http.body %}
-      if (body !== undefined && method !== 'GET' && method !== 'HEAD') {
-        // Auto JSON.stringify if body is object
-        if (typeof body === 'object' && body !== null) {
-          fetchOptions.body = JSON.stringify(body);
-          // Auto set Content-Type if not already set
-          if (!fetchOptions.headers['Content-Type'] && !fetchOptions.headers['content-type']) {
-            fetchOptions.headers['Content-Type'] = 'application/json';
-          }
-        } else {
-          fetchOptions.body = body;
-        }
+  {% if context.transform.http.body !== undefined %}
+  if (typeof body === 'function') {
+    body = await body(httpContext);
+  }
+  {% endif %}
+
+  // Build URL with query parameters if provided
+  let finalUrl = url;
+  {% if context.transform.http.params %}
+  if (params && Object.keys(params).length > 0) {
+    const queryString = new URLSearchParams(params).toString();
+    finalUrl = url + (url.includes('?') ? '&' : '?') + queryString;
+  }
+  {% endif %}
+
+  // Prepare fetch options
+  const fetchOptions = {
+    method: method,
+    headers: headers
+  };
+
+  // Add body if present (and not GET/HEAD)
+  {% if context.transform.http.body %}
+  if (body !== undefined && method !== 'GET' && method !== 'HEAD') {
+    // Auto JSON.stringify if body is object
+    if (typeof body === 'object' && body !== null) {
+      fetchOptions.body = JSON.stringify(body);
+      // Auto set Content-Type if not already set
+      if (!fetchOptions.headers['Content-Type'] && !fetchOptions.headers['content-type']) {
+        fetchOptions.headers['Content-Type'] = 'application/json';
       }
-      {% endif %}
-
-      // Create abort controller for timeout
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), timeout);
-      fetchOptions.signal = controller.signal;
-
+    } else {
+      fetchOptions.body = body;
+    }
+  }
+  {% endif %}
+
+  // Create abort controller for timeout
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeout);
+  fetchOptions.signal = controller.signal;
+
+  let result;
+
+  try {
+    // Execute HTTP request
+    const response = await fetch(finalUrl, fetchOptions);
+    clearTimeout(timeoutId);
+
+    // Check if response is successful (2xx)
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+
+    // Parse response based on Content-Type
+    const contentType = response.headers.get('content-type');
+    
+    if (contentType && contentType.includes('application/json')) {
+      result = await response.json();
+    } else if (contentType && contentType.includes('text/')) {
+      result = await response.text();
+    } else {
+      // Try JSON first, fallback to text
       try {
-        // Execute HTTP request
-        const response = await fetch(finalUrl, fetchOptions);
-        clearTimeout(timeoutId);
-
-        // Check if response is successful (2xx)
-        if (!response.ok) {
-          throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-        }
-
-        // Parse response based on Content-Type
-        const contentType = response.headers.get('content-type');
-        let result;
-        
-        if (contentType && contentType.includes('application/json')) {
-          result = await response.json();
-        } else if (contentType && contentType.includes('text/')) {
-          result = await response.text();
-        } else {
-          // Try JSON first, fallback to text
-          try {
-            result = await response.json();
-          } catch (e) {
-            result = await response.text();
-          }
-        }
-
-        // Store result in flow variable
-        flow.set('result', result);
-
-        {% include "src/default/macros/block-assign.js.njk" %}
-
-      } catch (error) {
-        clearTimeout(timeoutId);
-
-        // Handle timeout error
-        if (error.name === 'AbortError') {
-          const timeoutError = new Error(`HTTP request timeout after ${timeout}ms: ${finalUrl}`);
-          onError ? onError(timeoutError) : reject(timeoutError);
-          return;
-        }
-
-        // Handle other errors
-        onError ? onError(error) : reject(error);
-        return;
+        result = await response.json();
+      } catch (e) {
+        result = await response.text();
       }
-
-      {% include "src/default/macros/block-next.js.njk" %}
-
-      {% include "src/default/macros/block-run-footer.js.njk" %}
-    });
+    }
+  } catch (error) {
+    clearTimeout(timeoutId);
+
+    // Handle timeout error
+    if (error.name === 'AbortError') {
+      const timeoutError = new Error(`HTTP request timeout after ${timeout}ms: ${finalUrl}`);
+      return reject(timeoutError);
+    }
+
+    // Handle other errors
+    return reject(error);
   }
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}
+{% endcall %}
 
+{% call block.footer()%} 
+{% endcall %}

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

@@ -1,57 +1,15 @@
-{% 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 %}
 
-{% include "src/default/macros/block-modules-header.js.njk" %}
+{% call block.header() %}
+{% endcall %}
 
-export default function Block(context){
+{% call block.definition() %}
 
-  {% include "src/default/macros/block-body-header.js.njk" %}
+{% endcall %}
 
-  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" %}
-
-        {% if context.next and context.transform.wait==='next' %}
-        flow.waitForNext({
-          key:'{{indexKey}}',
-          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.wait!=='next'%}
-          {% include "src/default/macros/block-next.js.njk" %}
-        {% elseif not context.next%}
-          resolve();
-        {% endif %}
-
-        {% include "src/default/macros/block-run-footer.js.njk" %}
-      }
-      catch(error){
-        reject(error);
-      }
-    });
-  }
-
-  Object.freeze(this);
-}
-
-{% include "src/default/macros/block-footer.js.njk" %}
+{% call block.footer()%} 
+{% endcall %}