Nue JS: Compiler whitespace fix. Fixes #218

nuejs · Feb 24, 2024 · ad6a292 · ad6a292
1 parent 7e37f02
commit ad6a292
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/packages/nuejs/package.json b/packages/nuejs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "nuejs-core",
-	"version": "0.3.3",
+	"version": "0.3.4",
 
 	"description": "The Nue framework for building user interfaces",
 	"homepage": "https://nuejs.org",

diff --git a/packages/nuejs/src/compile.js b/packages/nuejs/src/compile.js
@@ -82,7 +82,10 @@ function compileNode(root) {
 }
 
 const quote = str => `'${str}'`
-const arrwrap = str => '[' + str + ']'
+
+function arrwrap(str) {
+  return '[' + str + ']'
+}
 
 function getHTML(str) {
   str = str.trim()

diff --git a/packages/nuejs/src/expr.js b/packages/nuejs/src/expr.js
@@ -35,7 +35,10 @@ export function parseExpr(str, is_style) {
 
     // normal string
     if (i % 2 == 0) {
-      if (str) ret.push(str.includes("'") ? JSON.stringify(str) : `'${str}'`)
+      if (str) {
+        str = str.replace(/\s+/g, ' ')
+        ret.push(str.includes("'") ? JSON.stringify(str) : `'${str}'`)
+      }
 
     // Object: { is-active: isActive() }
     } else if (isObject(str.trim())) {

diff --git a/packages/nuejs/src/render.js b/packages/nuejs/src/render.js
@@ -17,8 +17,6 @@ function parseError(e) {
 
 // name == optional
 function renderExpr(str, data, is_class) {
-  str = str.replaceAll('\n', '\\n')
-
   try {
     const arr = exec('[' + parseExpr(str) + ']', data)
     return arr.filter(el => is_class ? el : el != null).join('')

diff --git a/packages/nuejs/test/client/basics.html b/packages/nuejs/test/client/basics.html
@@ -6,7 +6,7 @@ <h1>Basics</h1>
 <div id="basics"></div>
 
 <script type="module">
-  import createApp from '../../src/nue.js'
+  import createApp from '../../src/browser/nue.js'
   import { lib } from '../dist/basics.js'
   const [ App, ...deps ] = lib
   createApp(App, {}, deps).mount(basics)

diff --git a/packages/nuejs/test/client/basics.nue b/packages/nuejs/test/client/basics.nue
@@ -7,7 +7,9 @@
 </main>
 
 <div @name="refs-test">
-  <h3>Ref: { $refs.email.placeholder }</h3>
+  <h3>
+    Ref: { $refs.email.placeholder }
+  </h3>
   <input name="email" placeholder="Your email">
 
   <script>

diff --git a/packages/nuejs/test/client/loops.html b/packages/nuejs/test/client/loops.html
@@ -4,7 +4,7 @@
 <div id="plain"></div>
 
 <script type="module">
-  import createApp from '../../src/nue.js'
+  import createApp from '../../src/browser/nue.js'
   import { lib } from '../dist/loops.js'
   const [ App, ...deps ] = lib
   createApp(App, {}, deps).mount(plain)