Fixed Multi.Name.Space components

ungap · Dec 16, 2022 · 0f41b8f · 0f41b8f
1 parent c74315f
commit 0f41b8f
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ function B() {}
   * **transformer** - the tokenizer takes less than 1ms to transform even complex templates, closing it to zero time to update the resulting structure
   * **memory** - each unique template generates *one and one only* token, updating interpolations and values *only* when the same template is executed again. This procedure grants no extra memory or Garbage Collector pressure when the same template is reused multiple times, also weakly relating the template with its own tokens to keep the heap under control
   * **serialization** - complex structures can still be serialized in less than 1ms and revived in even less than that
-  * **size** - once minified and compressed, the [es.js](./es.js) file is around 960bytes while the [json.js](./json.js) helper is around 580bytes
+  * **size** - once minified and compressed, the [es.js](./es.js) file is around 990bytes while the [json.js](./json.js) helper is around 590bytes
 
 </details>
 

diff --git a/cjs/constants.js b/cjs/constants.js
@@ -1,3 +1,5 @@
 'use strict';
 const EMPTY = Object.freeze([]);
 exports.EMPTY = EMPTY;
+const target = (nmsp, key) => nmsp[key];
+exports.target = target;
diff --git a/cjs/index.js b/cjs/index.js
@@ -2,7 +2,7 @@
 /** (c) Andrea Giammarchi - ISC */
 
 const {Token} = require('./token.js');
-const {EMPTY} = require('./constants.js');
+const {EMPTY, target} = require('./constants.js');
 
 const NUL = '\x00';
 
@@ -58,10 +58,6 @@ const parse = (template, nmsp, components) => {
     if (tree) addToken(token);
     tree = [token, tree || token];
   };
-  const getKey = value => {
-    const i = context.indexOf(value);
-    return NUL + (i < 0 ? (context.push(value) - 1) : i);
-  };
   const context = [Token.prototype, EMPTY, {}];
   const esx = template.join('\x00');
   let tree, i = 0, updates = 0;
@@ -103,13 +99,20 @@ const parse = (template, nmsp, components) => {
             }
           }
           const tagName = name || other;
-          const isComponent = components.has(tagName);
+          const splitted = tagName.split('.');
+          const isComponent = components.has(splitted[0]);
+          let value = tagName;
+          if (isComponent) {
+            const component = splitted.reduce(target, nmsp);
+            const i = context.indexOf(component);
+            value = NUL + (i < 0 ? (context.push(component) - 1) : i);
+          }
           pushTree(node(
             isComponent ? Token.COMPONENT : Token.ELEMENT,
             attributes,
             selfClosing ? EMPTY : [],
             tagName,
-            isComponent ? getKey(nmsp[tagName]) : tagName
+            value
           ));
           if (selfClosing)
             tree = tree[1];

diff --git a/cjs/json.js b/cjs/json.js
@@ -2,7 +2,7 @@
 /** (c) Andrea Giammarchi - ISC */
 
 const {Token} = require('./token.js');
-const {EMPTY} = require('./constants.js');
+const {EMPTY, target} = require('./constants.js');
 
 function parse(esx, nmsp, ...rest) {
   const ids = (this || JSON).parse(esx, ...rest);
@@ -22,7 +22,7 @@ function fromJSON(esx) {
   const {type} = esx;
   switch (type) {
     case Token.COMPONENT:
-      esx.value = this.nmsp[esx.name];
+      esx.value = esx.name.split('.').reduce(target, this.nmsp);
     case Token.ELEMENT:
     case Token.FRAGMENT: {
       esx.attributes = (esx.attributes || EMPTY).map(fromJSON, this);

diff --git a/es.js b/es.js
diff --git a/esm/constants.js b/esm/constants.js
@@ -1 +1,2 @@
 export const EMPTY = Object.freeze([]);
+export const target = (nmsp, key) => nmsp[key];
diff --git a/esm/index.js b/esm/index.js
@@ -1,7 +1,7 @@
 /** (c) Andrea Giammarchi - ISC */
 
 import {Token} from './token.js';
-import {EMPTY} from './constants.js';
+import {EMPTY, target} from './constants.js';
 
 const NUL = '\x00';
 
@@ -57,10 +57,6 @@ const parse = (template, nmsp, components) => {
     if (tree) addToken(token);
     tree = [token, tree || token];
   };
-  const getKey = value => {
-    const i = context.indexOf(value);
-    return NUL + (i < 0 ? (context.push(value) - 1) : i);
-  };
   const context = [Token.prototype, EMPTY, {}];
   const esx = template.join('\x00');
   let tree, i = 0, updates = 0;
@@ -102,13 +98,20 @@ const parse = (template, nmsp, components) => {
             }
           }
           const tagName = name || other;
-          const isComponent = components.has(tagName);
+          const splitted = tagName.split('.');
+          const isComponent = components.has(splitted[0]);
+          let value = tagName;
+          if (isComponent) {
+            const component = splitted.reduce(target, nmsp);
+            const i = context.indexOf(component);
+            value = NUL + (i < 0 ? (context.push(component) - 1) : i);
+          }
           pushTree(node(
             isComponent ? Token.COMPONENT : Token.ELEMENT,
             attributes,
             selfClosing ? EMPTY : [],
             tagName,
-            isComponent ? getKey(nmsp[tagName]) : tagName
+            value
           ));
           if (selfClosing)
             tree = tree[1];

diff --git a/esm/json.js b/esm/json.js
@@ -1,7 +1,7 @@
 /** (c) Andrea Giammarchi - ISC */
 
 import {Token} from './token.js';
-import {EMPTY} from './constants.js';
+import {EMPTY, target} from './constants.js';
 
 export function parse(esx, nmsp, ...rest) {
   const ids = (this || JSON).parse(esx, ...rest);
@@ -19,7 +19,7 @@ function fromJSON(esx) {
   const {type} = esx;
   switch (type) {
     case Token.COMPONENT:
-      esx.value = this.nmsp[esx.name];
+      esx.value = esx.name.split('.').reduce(target, this.nmsp);
     case Token.ELEMENT:
     case Token.FRAGMENT: {
       esx.attributes = (esx.attributes || EMPTY).map(fromJSON, this);

diff --git a/json.js b/json.js
diff --git a/test/benchmark.js b/test/benchmark.js
@@ -3,15 +3,7 @@
   const {ESX} = await import('../esm/index.js');
   const {stringify, parse} = await import('../esm/json.js');
 
-  const esx = ESX({
-    Object,
-    Array,
-    Uint16Array,
-    Function,
-    String,
-    Boolean,
-    Number
-  });
+  const esx = ESX();
 
   const program = (a, b, c, d, e) => esx`
     <Object>

diff --git a/test/index.js b/test/index.js
@@ -1,5 +1,8 @@
 const {ESX, Token} = require('../cjs/index.js');
 
+function Component() {}
+Component.Nested = function () {};
+
 const assert = (value, expected, message = `expected: ${expected} - received: ${value}`) => {
   if (value !== expected)
     throw new Error(message);
@@ -103,6 +106,12 @@ assertFields(outcome.children[2], {
   value: ' c'
 });
 
+var outcome = esx`<Component.Nested />`;
+assertFields(outcome, {
+  type: Token.COMPONENT,
+  name: 'Component.Nested',
+  value: Component.Nested
+});
 
 var outcome = esx`
   <>
@@ -119,5 +128,3 @@ assertFields(outcome.children[1], {
   type: Token.COMPONENT,
   value: Component
 });
-
-function Component() {}