Enforce the stringify from the worker too

Lcfvs · Apr 26, 2021 · 0d66a63 · 0d66a63
1 parent 25b3ee8
commit 0d66a63
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lib/worker.js b/lib/worker.js
@@ -1,6 +1,7 @@
 const {
   entries,
-  fromEntries
+  fromEntries,
+  hasOwnProperty
 } = Object
 
 const flag = '@@template'
@@ -23,14 +24,16 @@ const random = values => {
     .filter(isHidden)[~~(Math.random() * (values.length + 1))] ?? 0]
 }
 
-const parse = ([name, value]) => [name, format(value)]
+const parse = (parsed, [name, value]) => typeof value === 'function'
+  ? parsed
+  : [...parsed, [name, format(value)]]
 
 const format = value => {
-  return Object(value) !== value
-    ? [value]
+  return typeof value !== 'object' || hasOwnProperty.call(value, 'toString')
+    ? [value?.toString()]
     : Array.isArray(value)
       ? [[...value.values()].map(format)]
-      : [fromEntries(entries(value).map(parse)), value[symbol]]
+      : [fromEntries(entries(value).reduce(parse, [])), value[symbol]]
 }
 
 const send = (template, client) => resolve => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lcf.vs/dom-engine",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "A composable DOM based template engine",
   "type": "module",
   "main": "lib/engine.js",