free-framework 4.5.6 → 4.5.7

package/compiler/generator.js

@@ -51,8 +51,8 @@ function generate(ast) {
 
             output += `const loadAuthTemplate = (name, vars = {}) => {
                 const userTemplate = path.join(process.cwd(), 'resources/views/auth', name + '.html');
-                const coreTemplate = path.join(process.env.FREE_PATH || '', 'templates/auth', name + '.html');
-                let html = fs.existsSync(userTemplate) ? fs.readFileSync(userTemplate, 'utf8') : (fs.existsSync(coreTemplate) ? fs.readFileSync(coreTemplate, 'utf8') : 'Template not found');
+                const coreTemplate = path.join(__dirname, '../templates/auth', name + '.html');
+                let html = fs.existsSync(userTemplate) ? fs.readFileSync(userTemplate, 'utf8') : (fs.existsSync(coreTemplate) ? fs.readFileSync(coreTemplate, 'utf8') : 'Template not found: ' + name);
                 Object.keys(vars).forEach(k => html = html.replace(new RegExp('{{' + k + '}}', 'g'), vars[k]));
                 return html;
             };\n`;
@@ -338,7 +338,7 @@ function generateTagCode(tag, stateNames) {
         Object.keys(tag.attributes).forEach(a => {
             if (a.startsWith('on')) {
                 const eventName = a.substring(2).toLowerCase();
-                const uniqueId = `\${eventName}_\${tag.name}_\${Math.random().toString(36).substring(7)}`;
+                const uniqueId = `${eventName}_${tag.name}_${Math.random().toString(36).substring(7)}`;
                 if (tag.attributes[a].includes('++')) {
                     const key = tag.attributes[a].split('++')[0].trim();
                     code += `    _events.push({ id: '${uniqueId}', fn: function(state) { state['${key}']++; } });\n`;
@@ -357,7 +357,7 @@ function generateTagCode(tag, stateNames) {
         tag.children.forEach(child => {
             if (child.type === 'event') {
                 const eventName = child.event.toLowerCase();
-                const uniqueId = `\${eventName}_child_\${Math.random().toString(36).substring(7)}`;
+                const uniqueId = `${eventName}_child_${Math.random().toString(36).substring(7)}`;
                 code += `    _events.push({ id: '${uniqueId}', fn: function(state, event) { ${child.code} } });\n`;
                 code += `    html += " data-on-${eventName}='${uniqueId}'";\n`;
             }

package/compiler/parser.js

@@ -132,33 +132,33 @@ function parseComponent(tokens, filename, source) {
     while (tokens.length > 0 && tokens[0].value !== '}' && tokens[0].value !== 'component') {
         const next = tokens.shift();
         if (next.value === 'state') {
-            const sName = tokens.shift().value;
-            if (tokens[0] && tokens[0].value === '=') tokens.shift();
-
-            let sVal = "";
-            let braceCount = 0;
-            let bracketCount = 0;
-
-            while (tokens.length > 0) {
-                const t = tokens.shift();
-                sVal += t.value;
-                if (t.value === '{') braceCount++;
-                if (t.value === '}') braceCount--;
-                if (t.value === '[') bracketCount++;
-                if (t.value === ']') bracketCount--;
-
-                if (braceCount === 0 && bracketCount === 0) {
-                    // Check if next token is on same line (simple case) or if we are done with complex
-                    if (tokens[0] && tokens[0].line !== t.line && !['{', '[', '(', ','].includes(t.value)) {
-                        break;
+            if (tokens[0] && tokens[0].value === '{') {
+                tokens.shift(); // consume {
+                while (tokens.length > 0 && tokens[0].value !== '}') {
+                    const sName = tokens.shift().value;
+                    if (tokens[0] && tokens[0].value === ':') tokens.shift();
+
+                    let sVal = "";
+                    let bCount = 0;
+                    while (tokens.length > 0) {
+                        const t = tokens.shift();
+                        if (t.value === '{') bCount++;
+                        if (t.value === '}') bCount--;
+                        if (bCount < 0) { tokens.unshift(t); break; }
+                        if (bCount === 0 && (t.value === ',' || t.line !== tokens[0]?.line)) {
+                            if (t.value !== ',') sVal += t.value;
+                            break;
+                        }
+                        sVal += t.value;
                     }
+                    states.push({ name: sName, default: sVal.trim().replace(/^'|'$/g, '"') || "null" });
                 }
-            }
-            sVal = sVal.replace(/"/g, '');
-            if (!isNaN(sVal) && sVal.trim() !== "" && !sVal.includes('.')) {
-                states.push({ name: sName, default: Number(sVal) });
+                if (tokens[0] && tokens[0].value === '}') tokens.shift();
             } else {
-                states.push({ name: sName, default: sVal.trim() || "null" });
+                const sName = tokens.shift().value;
+                if (tokens[0] && (tokens[0].value === '=' || tokens[0].value === ':')) tokens.shift();
+                let sVal = tokens.shift().value;
+                states.push({ name: sName, default: sVal });
             }
         } else if (next.value === 'onMount') {
             body.push({ type: 'onMount', code: parseActionBody(tokens, source) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-framework",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Professional Node.js engine for the .free language. Blazing-fast SSR, Islands Architecture, and built-in ORM.",
   "main": "index.js",
   "bin": {