@yr-lang/yr 0.2.1 → 0.3.4

package/BUGS.md

@@ -15,3 +15,62 @@ _ .teste
     _ .teste2
     _wrapper/test2
 ```
+
+### Wrappers calls are not being called in the correct order ✓ Fixed in 0.3.4
+
+e.g, if I have
+
+#### Test/N2
+
+```
+!! @wrapper
+
+++
+
+_ .something
+
+
+@>
+
+_@wrapper(Test, N2) {
+  console.log('n2');
+@}
+```
+
+#### Test/N1
+
+```
+!! @wrapper
+
+++
+
+_test/n2
+
+@>
+
+_@wrapper(Test, N1) {
+  console.log('n1');
+@}
+```
+
+My output becomes
+
+```
+__Teste_N1({});
+__Teste_N2({});
+```
+
+Instead of
+
+```
+__Teste_N2({});
+__Teste_N1({});
+```
+
+That means that the wrapper calls might be swapping the orders, or some other
+behaviour, which is incorrect. The correct would be:
+
+* The calls of the imported wrappers must come first
+
+The workaround for this issues is to add the code that relies on the child
+wrappers calls, inside a `setTimeout`, so it goes to the next event loop.

package/lib/@wrapper.yr

@@ -0,0 +1,32 @@
+%%
+
+_@wrapper(#category, #option, #debug=false) {
+  async function __#category_#option(_config) {
+    let element = (_config.id === 'body') ? document.body
+      : document.querySelector(`.${_config.id}`);
+
+    if (!element) return;
+
+    try {
+      element._config = _config;
+
+      if (window.__preview) {
+        element._html = element.outerHTML;
+
+        element._refresh = () => {
+          element.outerHTML = element._html;
+          __#category_#option(_config)
+        };
+      }
+
+      ___
+    } catch(error) {
+      if (window.__preview || #debug) {
+        //element.innerHTML = '<div style="background: red; color: white">'
+          //+ `#category #option error: ${error.message}</div>`;
+
+        console.error(error);
+      }
+    }
+  }
+@}

package/node.js

@@ -382,11 +382,17 @@ module.exports = {
             app[value] = [...new Set([...app[value], ...item.output[value]])];
         }
 
-        devops = [...item.output.devops, ...devops];
+        let ext = item?.outputs?.devops;
+        if (!ext) ext = [];
+        if (!devops) devops = [];
+        devops = [...ext, ...devops];
         result.macros = { ...item.output.macros, ...result.macros };
 
+        let mods = item?.outputs?.modules;
+        if (!mods) mods = [];
+
         result.modules = [...new Set([
-          ...item.output.modules, ...result.modules
+          ...mods, ...result.modules
         ])];
 
         views.push(item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yr-lang/yr",
-  "version": "0.2.1",
+  "version": "0.3.4",
   "description": "Yr is a modern structural language and parser",
   "main": "./node.js",
   "exports": {

package/yr.js

@@ -154,7 +154,9 @@ function addIdToElement(line, config, elementId=false) {
 
   if (tag.startsWith('_')) {
     tag = tag.replace(/^_/, '');
-    if (VOID_TAGS.has(tag) || ['title', 'script', 'style'].includes(tag)) return line;
+
+    if ((VOID_TAGS.has(tag) && !['input', 'img'].includes(tag))
+    || ['title', 'script', 'style'].includes(tag)) return line;
   }
 
   if (config.preview && !line.includes('.__') && !line.includes('.{{__')) {
@@ -364,7 +366,8 @@ const parserFns = {
         wrapper[1] = utils.capitalize(wrapper[1]);
         const wrapperName = wrapper.join('/');
         core.extend(wrapper, wrapperName, sections, state, {
-          redoWrapper: true, simple: config.simple
+          redoWrapper: true, simple: config.simple,
+          ignoreHtml: config.ignoreHtml
         });
         let newWrapper, wrapperIndentation;
         if (!tag.includes('!')) {
@@ -659,6 +662,8 @@ const core = {
         wrapper[1] = wrapper[1].replace(/!/, '');
         wrapperName = wrapperName.replace(/!/, '');
         config.ignoreHtml = true;
+        sections.wrappers[wrapperName] = sections.wrappers[wrapperName] || {};
+        sections.wrappers[wrapperName].owned = true;
       }
 
       if (!sections.wrapperjs) sections.wrapperjs = '';
@@ -671,7 +676,7 @@ const core = {
 
           sections.wrappers[wrapperName] = newWrapper.wrappers[wrapperName];
           sections.wrappers[wrapperName].redone = true;
-          sections.wrapperjs += newWrapper.wrapperjs;
+          sections.wrapperjs = newWrapper.wrapperjs + sections.wrapperjs;
         }
 
         return;
@@ -1136,7 +1141,7 @@ const core = {
           if (wrapper.length === 1) wrapper.unshift('__');
 
           this.extend(wrapper, wrapperName, sections, state, {
-            simple: config.simple
+            simple: config.simple, ignoreHtml: config.ignoreHtml
           });
         //} else if (line.startsWith('\\\\')) {
         //  const wrapperName = line.replace(/\\\\/g, '').trim() + '\n';
@@ -1336,9 +1341,8 @@ const core = {
       sections.parsedyr[value] = sections.yr[value];
 
       for (let item in sections.wrappers) {
-        // fix!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        if (sections.wrappers[item].redone) continue; // this will cause files to be parsed wrongly
-        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        if (sections.wrappers[item].redone && value === 'body') continue;
+        if (value === 'body' && sections.wrappers[item].owned) continue;
 
         if (!sections.wrappers[item].yr)
           sections.wrappers[item].yr = {};
@@ -1382,10 +1386,9 @@ const core = {
     if (sections.parsedjs !== '')
       sections.parsedjs = this.macros(sections, 'parsedjs');
 
-    let newWrapperJs = '';//const __runenv = async () => {\n';
-    //sections.parsedjs += 'const __runenv = async () => {\n';
+    let newWrapperJs = '';
     const arr = sections.parsedyr.wrapperjs.split('\n');
-    if (code.includes('!! !')) arr.reverse();
+
     for (let item of arr) {
       if (!item) continue;
 
@@ -1698,12 +1701,12 @@ if (typeof window !== 'undefined' && !window.yr) {
   const parse = core.parse.bind(core);
   window.yr = parse;
 
-  const createLog = (text) => {
-    const parsed = parse(text);
-    console.log(parsed);
-    document.body.innerHTML += `<div>${text}</div>`;
-    document.body.innerHTML += `<div>${parsed.parsedyr.body}</div>`;
-  };
+  //const createLog = (text) => {
+  //  const parsed = parse(text);
+  //  console.log(parsed);
+  //  document.body.innerHTML += `<div>${text}</div>`;
+  //  document.body.innerHTML += `<div>${parsed.parsedyr.body}</div>`;
+  //};
 
-  createLog('><\n_ .teste');
+  //createLog('><\n_ .teste');
 }