changed props check order

WebReflection · WebReflection · commit 89d88bf11984 · 2021-06-30T11:44:07.000+02:00
diff --git a/cjs/json.js b/cjs/json.js
@@ -7,11 +7,11 @@ const ids = umap(new WeakMap);
 let id = 0;
 
 const tag = type => (template, ...values) => ({
+  id: ids.get(template) ||
+      ids.set(template, id++),
   type,
-  template,
   values,
-  id: ids.get(template) ||
-      ids.set(template, id++)
+  template
 });
 
 html.json = tag('html');
@@ -35,10 +35,10 @@ const asJSON = value => isJSON(value) ? unroll(value) : value;
 const isJSON = thing => (
   typeof thing === 'object' &&
   thing !== null &&
+  'id' in thing &&
   'type' in thing &&
-  'template' in thing &&
   'values' in thing &&
-  'id' in thing
+  'template' in thing
 );
 
 const render = (where, what) => $render(
diff --git a/esm/json.js b/esm/json.js
@@ -6,11 +6,11 @@ const ids = umap(new WeakMap);
 let id = 0;
 
 const tag = type => (template, ...values) => ({
+  id: ids.get(template) ||
+      ids.set(template, id++),
   type,
-  template,
   values,
-  id: ids.get(template) ||
-      ids.set(template, id++)
+  template
 });
 
 html.json = tag('html');
@@ -34,10 +34,10 @@ const asJSON = value => isJSON(value) ? unroll(value) : value;
 const isJSON = thing => (
   typeof thing === 'object' &&
   thing !== null &&
+  'id' in thing &&
   'type' in thing &&
-  'template' in thing &&
   'values' in thing &&
-  'id' in thing
+  'template' in thing
 );
 
 const render = (where, what) => $render(
diff --git a/test/json.html b/test/json.html
@@ -8,9 +8,9 @@
   <script type="module">
   import {render, html} from '../esm/json.js';
   const strong = name => html.json`<strong>${name}</strong>`;
-  const greetings = name => html.json`
+  const greetings = name => JSON.parse(JSON.stringify(html.json`
     <div>Hello ${strong(name)} 👋</div>
-  `;
+  `));
 
   console.log(greetings('console'));
   render(document.body, greetings('World'));
