@yr-lang/yr 0.3.8 → 0.3.11

package/lib/%build.yr

@@ -1,3 +1,4 @@
 **
 
 cd "$_PROJECT_PATH"
+if [[ ! -d node_modules ]]; then npm i $(cat node_modules.txt); fi

package/lib/%serve.yr

@@ -4,7 +4,6 @@ ___serve
 
 APP_NAME=$(echo $_CONFIG | jq -r .name)
 cd $_PROJECT_PATH
-if [[ ! -d node_modules ]]; then npm i $(cat node_modules.txt); fi
 
 pkill -9 -f "^node app/app.js$"
 node app/app.js

package/node.js

@@ -430,8 +430,13 @@ const window = {
   __api: '',
 };
 const fs = require('fs');
-let _PROJECT_PATH = '${parsePaths(projectPath)}';
 const _globals = [];
+function setGlobal(name, item, subscribe=false) {
+  if (!_globals.includes(name) || subscribe) {
+    global[name] = item;
+    _globals.push(name);
+  }
+}
 function parsePaths(newPaths) {
   let newStrPath = [];
   for (let item of newPaths.split(',')) {
@@ -442,15 +447,17 @@ function parsePaths(newPaths) {
 
   return newStrPath.join(',');
 }
-function setGlobal(name, item, subscribe=false) {
-  if (!_globals.includes(name) || subscribe) {
-    global[name] = item;
-    _globals.push(name);
-  }
-}
-_PROJECT_PATH = parsePaths(_PROJECT_PATH);
-const _config = require(\`\${_PROJECT_PATH}/yrconfig.json\`);
-const env = require(\`\${_PROJECT_PATH}/.env.json\`);
+//let _PROJECT_PATH = '${parsePaths(projectPath)}';
+//_PROJECT_PATH = parsePaths(_PROJECT_PATH);
+//const _config = require(\`\${_PROJECT_PATH}/yrconfig.json\`);
+//const env = require(\`\${_PROJECT_PATH}/.env.json\`);
+setGlobal('path', require('path'));
+const _PROJECT_PATH = path.resolve(process.cwd(), '..');
+const PROJECT_PATH = _PROJECT_PATH;
+const _config = JSON.parse(
+  fs.readFileSync(path.join(PROJECT_PATH, 'yrconfig.json'), 'utf8'));
+const env = JSON.parse(
+  fs.readFileSync(path.join(PROJECT_PATH, '.env.json'), 'utf8'));
 for (let item of ['HOME', 'LIBS', 'BUILDS', 'TREE', 'CONFIG']) {
   if (typeof env[item] === 'object') {
     env[item] = parsePaths(env[item].join(',')).split(',');
@@ -503,10 +510,8 @@ for (let item of ['HOME', 'LIBS', 'BUILDS', 'TREE', 'CONFIG']) {
 *\:Zone.Identifier
 node_modules/
 __pycache__/
-dist/
-.yrkitconf
 package*.json
-app/assets/`);
+.yrkitconf`);
 
       fs.writeFileSync(projectPath + '/yrconfig.json', JSON.stringify(result.config, null, 2));
       fs.writeFileSync(projectPath + '/app/app.js', result.app);

package/package.json

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

package/yr.js

@@ -344,7 +344,7 @@ const parserFns = {
   },
   nosection(line, sections, section, state, lineNumber, config={}) {
     if (line.startsWith('--')) sections.modules =
-      [...sections.modules, ...line.slice(2).trim().split(',')];
+      [...sections.modules, ...line.slice(2).trim().split(',').map(item => item.trim())];
   },
   string(line, sections, section, state, lineNumber, config={}) {
     sections[section] += line + '\n';
@@ -1546,18 +1546,25 @@ const core = {
           parsedItem.attributes = sections
             .wrappers[`${parsedItem.category}/${parsedItem.option}`].vars.attributes;
 
-          const newItem = `__${parsedItem.category}_${parsedItem.option}(${
+          // maybe add await here
+          newWrapperJs += `  __${parsedItem.category}_${parsedItem.option}(${
             JSON.stringify(parsedItem)
-          });`;
-
-          sections.parsedjs += newItem + '\n';
-          newWrapperJs += newItem + '\n';
-          break;
+          });\n`;
         }
       }
     }
-    //newWrapperJs += '};\n__runenv();\n';
-    //sections.parsedjs += '};\n__runenv();\n';
+
+    if (newWrapperJs) {
+      if (!sections.parsedyr) sections.parsedyr = sections.parsedyr = {};
+
+      if (!sections.parsedyr.body)
+        sections.parsedyr.body = sections.parsedyr.body = '';
+
+      sections.parsedjs += `(async () => {\n${
+        (!/\n\s*_![^\s/]+\/[^\s/]+/.test(code)) ? newWrapperJs
+          : newWrapperJs.split('\n').reverse().join('\n')
+      }})();`;
+    }
 
     if (config.preview) {
       function countCharacterOccurrences(str, char) {