@yr-lang/yr 0.3.5 → 0.3.8

package/lib/%gh-pages.yr

@@ -18,7 +18,9 @@ gh-pages() {
 
   git add .
   git commit -m "# DEPLOY"
+
   git push -f origin main
+  if [[ ! -d "$1" ]]; then exit 1; fi
 
   git branch -D gh-pages
   git checkout -b gh-pages
@@ -34,6 +36,8 @@ gh-pages() {
   git commit -m "# DEPLOY"
   git push -f origin gh-pages
   git checkout main
+
+  rm -rf "$1"
 }
 
 gh-pages_fix() {

package/lib/element.yr

@@ -14,10 +14,6 @@ _@elementListener(#query, #parent=document, #listener='click') {
   });
 @}
 
-_@eqs(#name, #container, #query, #type='') {
-  const #name = #container.querySelector(#query);
-@}
-
 @>
 
 function eventListener(element, action, callback) {
@@ -50,8 +46,9 @@ function createElement(options={}, listener=false) {
   if (options.selected) element.selected = options.selected;
 
   if (!options.attributes) options.attributes = {};
-  for (let key of Object.keys(options.attributes)) {
-    element.setAttribute(key, options.attributes[key]);
+  for (let key in options.attributes) {
+    if (key === 'value') element.value = options.attributes[key];
+    else element.setAttribute(key, options.attributes[key]);
   }
 
   if (!options.style) options.style = {};
@@ -61,8 +58,8 @@ function createElement(options={}, listener=false) {
 
   if (listener) eventListener(element,
     (options.selector === 'form') ? 'submit'
-      : ((options.selector === 'input' || options.selector === 'select')
-        ? 'change' : 'click'),
+      : ((options.selector === 'input' || options.selector === 'select'
+      || options.selector === 'textarea') ? 'change' : 'click'),
     listener
   );
 

package/node.js

@@ -382,17 +382,11 @@ module.exports = {
             app[value] = [...new Set([...app[value], ...item.output[value]])];
         }
 
-        let ext = item?.outputs?.devops;
-        if (!ext) ext = [];
-        if (!devops) devops = [];
-        devops = [...ext, ...devops];
+        devops = [...item.output.devops, ...devops];
         result.macros = { ...item.output.macros, ...result.macros };
 
-        let mods = item?.outputs?.modules;
-        if (!mods) mods = [];
-
         result.modules = [...new Set([
-          ...mods, ...result.modules
+          ...item.output.modules, ...result.modules
         ])];
 
         views.push(item);
@@ -509,7 +503,10 @@ for (let item of ['HOME', 'LIBS', 'BUILDS', 'TREE', 'CONFIG']) {
 *\:Zone.Identifier
 node_modules/
 __pycache__/
-dist/`);
+dist/
+.yrkitconf
+package*.json
+app/assets/`);
 
       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.5",
+  "version": "0.3.8",
   "description": "Yr is a modern structural language and parser",
   "main": "./node.js",
   "exports": {

package/yr.js

@@ -149,50 +149,185 @@ function getElementAttributes(line) {
   return { ...attributes, ...parse };
 }
 
+function splitRespectingQuotes(line) {
+  const tokens = [];
+  let current = '';
+  let inQuote = false;
+  let quoteChar = '';
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (!inQuote && (ch === '"' || ch === "'")) {
+      inQuote = true;
+      quoteChar = ch;
+      current += ch;
+    } else if (inQuote && ch === quoteChar) {
+      inQuote = false;
+      quoteChar = '';
+      current += ch;
+    } else if (!inQuote && ch === ' ') {
+      if (current) tokens.push(current);
+      current = '';
+    } else {
+      current += ch;
+    }
+  }
+  if (current) tokens.push(current);
+  return tokens;
+}
+
 function addIdToElement(line, config, elementId=false) {
   let tag = line.trim().split(' ')[0];
-
   if (tag.startsWith('_')) {
     tag = tag.replace(/^_/, '');
-
     if ((VOID_TAGS.has(tag) && !['input', 'img'].includes(tag))
     || ['title', 'script', 'style'].includes(tag)) return line;
   }
-
   if (config.preview && !line.includes('.__') && !line.includes('.{{__')) {
     if (!elementId) elementId = '__' + crypto.generateToken(8);
     if (!line.trim().startsWith('_')) elementId = '{{' + elementId;
-
-    let openCase, newLine = '', addedClass;
-    for (let item of line.split(' ')) {
-      if (item.endsWith('{{')) {
-        openCase = true;
-        newLine += item + ' ';
-        continue;
-      }
-
-      if (item.endsWith('}}') && openCase) {
-        openCase = false;
-        newLine += item + ' ';
+    let openCase, newLine = '', addedClass, attContent = '';
+    for (let item of splitRespectingQuotes(line)) {
+      if (!openCase) {
+        if (item.endsWith('{{')) {
+          openCase = '}}';
+          attContent += (attContent ? ', ' : '') + item.slice(item.indexOf('{{') + 2).trim();
+          continue;
+        }
+      } else if (openCase === '}}') {
+        if (item === '}}') {
+          openCase = null;
+        } else if (item.endsWith('}}')) {
+          attContent += ' ' + item.slice(0, -2).trim();
+          openCase = null;
+        } else {
+          attContent += ' ' + item;
+        }
         continue;
       }
-
       if (!openCase && item.startsWith('.') && !addedClass) {
         addedClass = true;
-        item = item.replace(/\./, `.${elementId}.`);
+        item = item.replace(/^\./, `.${elementId}.`);
       }
-
       newLine += item + ' ';
     }
-
     newLine = newLine.trimEnd();
     if (!addedClass) newLine += ` .${elementId}`;
+    if (attContent) {
+      // Rebuild att={{ from parsed attributes: normalize to double-quoted strings,
+      // bare values for non-strings (e.g. redirect-success: / instead of '/')
+      const parsedAttrs = getElementAttributes(`_ att={{ ${attContent.trim()} }}`);
+      const rebuiltParts = Object.entries(parsedAttrs).map(([k, v]) => {
+        const needsQuotes = /[\s,{}]/.test(v);
+        return `${k}: ${needsQuotes ? `"${v}"` : v}`;
+      });
+      newLine += ` att={{ ${rebuiltParts.join(', ')} }}`;
+    }
     line = newLine;
   }
-
   return line;
 }
 
+//function addIdToElement(line, config, elementId=false) {
+//  let tag = line.trim().split(' ')[0];
+//
+//  if (tag.startsWith('_')) {
+//    tag = tag.replace(/^_/, '');
+//
+//    if ((VOID_TAGS.has(tag) && !['input', 'img'].includes(tag))
+//    || ['title', 'script', 'style'].includes(tag)) return line;
+//  }
+//
+//  if (config.preview && !line.includes('.__') && !line.includes('.{{__')) {
+//    if (!elementId) elementId = '__' + crypto.generateToken(8);
+//    if (!line.trim().startsWith('_')) elementId = '{{' + elementId;
+//
+//    let openCase, newLine = '', addedClass, attContent = '';
+//    for (let item of line.split(' ')) {
+//      if (!openCase) {
+//        if (item.endsWith('{{')) {
+//          openCase = '}}';
+//          attContent += (attContent ? ', ' : '') + item.slice(item.indexOf('{{') + 2).trim();
+//          continue;
+//        } else if (item.includes('="') && !item.endsWith('"')) {
+//          openCase = '"';
+//        } else if (item.includes("='") && !item.endsWith("'")) {
+//          openCase = "'";
+//        }
+//      } else if (openCase === '}}') {
+//        if (item === '}}') {
+//          openCase = null;
+//        } else if (item.endsWith('}}')) {
+//          attContent += ' ' + item.slice(0, -2).trim();
+//          openCase = null;
+//        } else {
+//          attContent += ' ' + item;
+//        }
+//        continue;
+//      } else if (item.endsWith(openCase)) {
+//        openCase = null;
+//      } else if (!openCase && item.startsWith('.') && !addedClass) {
+//        addedClass = true;
+//        item = item.replace(/^\./, `.${elementId}.`);
+//      }
+//
+//      newLine += item + ' ';
+//    }
+//
+//    newLine = newLine.trimEnd();
+//    if (!addedClass) newLine += ` .${elementId}`;
+//    if (attContent) newLine += ` att={{ ${attContent} }}`;
+//    line = newLine;
+//  }
+//
+//  return line;
+//}
+
+//function addIdToElement(line, config, elementId=false) {
+//  let tag = line.trim().split(' ')[0];
+//
+//  if (tag.startsWith('_')) {
+//    tag = tag.replace(/^_/, '');
+//
+//    if ((VOID_TAGS.has(tag) && !['input', 'img'].includes(tag))
+//    || ['title', 'script', 'style'].includes(tag)) return line;
+//  }
+//
+//  if (config.preview && !line.includes('.__') && !line.includes('.{{__')) {
+//    if (!elementId) elementId = '__' + crypto.generateToken(8);
+//    if (!line.trim().startsWith('_')) elementId = '{{' + elementId;
+//
+//    let openCase, newLine = '', addedClass;
+//    for (let item of line.split(' ')) {
+//      if (!openCase) {
+//        if (item.endsWith('{{')) {
+//          openCase = '}}';
+//        } else if (item.includes('="') && !item.endsWith('"')) {
+//          openCase = '"';
+//        } else if (item.includes("='") && !item.endsWith("'")) {
+//          openCase = "'";
+//        }
+//      } else if (item.endsWith(openCase)) {
+//        openCase = null;
+//        newLine += item + ' ';
+//        continue;
+//      }
+//
+//      if (!openCase && item.startsWith('.') && !addedClass) {
+//        addedClass = true;
+//        item = item.replace(/^\./, `.${elementId}.`);
+//      }
+//
+//      newLine += item + ' ';
+//    }
+//
+//    newLine = newLine.trimEnd();
+//    if (!addedClass) newLine += ` .${elementId}`;
+//    line = newLine;
+//  }
+//
+//  return line;
+//}
+
 const VOID_TAGS = new Set([
   'area','base','br','col','embed','hr','img','input',
   'link','meta','param','source','track','wbr'
@@ -322,10 +457,12 @@ const parserFns = {
     }
     if (parsedLine.line[0] === '_') {
       const elementAttributes = getElementAttributes(parsedLine.line);
-      const attSplit = parsedLine.line.split(' att={{');
-      if (attSplit.length > 1)
+      let attSplit = parsedLine.line.split(' att={{');
+      while (attSplit.length > 1) {
         parsedLine.line = attSplit[0] + attSplit[1].split('}}')[1];
-      const lineSplit = parsedLine.line.split(' ');
+        attSplit = parsedLine.line.split(' att={{');
+      }
+      const lineSplit = splitRespectingQuotes(parsedLine.line);
       let tag = lineSplit.shift().substring(1);
       if (tag === '') tag = 'div';
       if (tag[0] === '_') {
@@ -406,7 +543,9 @@ const parserFns = {
               for (let value of sections.wrappers[wrapperName]
               .yrwrapperbody.split('\n')) {
                 if (value.trim() === '') continue;
-                value = addIdToElement(value, config);
+                const valueIndent = value.search(/\S/);
+                const valueWhiteSpace = value.slice(0, valueIndent);
+                value = valueWhiteSpace + addIdToElement(value.trim(), config);
                 if (yrIndentation % 2 !== 0) yrIndentation -= 1;
                 if (newWrapper.reference % 2 !== 0) newWrapper.reference -= 1;
                 if (newWrapper.new % 2 !== 0) newWrapper.new -= 1;
@@ -724,18 +863,6 @@ const core = {
     }
   },
   parse(code, config={}) {
-    if (!isYrSyntax(code)) {
-      const sections = { parsedhtml: code };
-
-      if (config.name) sections.ui = [{
-        name: (config.name.includes('.html'))
-          ? config.name : `${config.name}.html`,
-        content: sections.parsedhtml
-      }];
-
-      return sections;
-    }
-
     if (config.opposite) {
       const file = code;
       const isProject = config.isProject;
@@ -1047,6 +1174,18 @@ const core = {
       return yrResult;
     }
 
+    if (!isYrSyntax(code)) {
+      const sections = { parsedhtml: code };
+
+      if (config.name) sections.ui = [{
+        name: (config.name.includes('.html'))
+          ? config.name : `${config.name}.html`,
+        content: sections.parsedhtml
+      }];
+
+      return sections;
+    }
+
     const sections = (config.sections) ? config.sections : parsers.defaults();
 
     const state = {

package/lib/windowListener.yr

@@ -1,9 +0,0 @@
-@@
-
-function windowListener(callback) {
-  if (typeof window.addEventListener != 'undefined') {
-    window.addEventListener('message', callback);
-  } else if (typeof window.attachEvent != 'undefined') {
-    window.attachEvent('onmessage', callback);
-  }
-}