@omnia/tooling-vue 8.0.481-dev → 8.0.483-dev

package/internal-do-not-import-from-here/tasks/doc.js

@@ -10,8 +10,10 @@ const tooling_composers_1 = require("@omnia/tooling-composers");
 const tooling_1 = require("@omnia/tooling");
 const fsExtra = tslib_1.__importStar(require("fs-extra"));
 const fx_models_1 = require("@omnia/fx-models");
+let _duplicateElementNames = {};
 async function generateComponentTypingsAndDoc(componentRegistrations) {
     tooling_1.utils.log("Generate components typings and documentation running...");
+    _duplicateElementNames = {};
     var startTime = new Date().getTime();
     const docResult = {};
     async function buildDoc(wc) {
@@ -80,9 +82,12 @@ declare global {
             //{{namespace}}
         }`;
         Object.keys(elementNamespaces).forEach(key => {
+            let value = JSON.stringify(elementNamespaces[key], null, 2).replace(/\"typeof /g, "typeof ").replace(/ <<end>>\"/g, "");
+            Object.keys(_duplicateElementNames).forEach(duplicateKey => {
+                value = value.replace(`${duplicateKey}":`, `${duplicateKey.split("$")[1]}": ${_duplicateElementNames[duplicateKey]} `);
+            });
             result = result.replace("//{{namespace}}", `
-            let ${key}: ${JSON.stringify(elementNamespaces[key], null, 2)
-                .replace(/\"typeof /g, "typeof ").replace(/ <<end>>\"/g, "")}
+            let ${key}: ${value}
                 //{{namespace}}
             `);
         });
@@ -193,10 +198,11 @@ function populateElementNamespace(namespace, elementName, importElement) {
     const parts = elementName.split(".");
     for (let i = 0; i < parts.length; i++) {
         const name = parts[i];
+        const fullName = `${parts.slice(0, i).join("-")}$${name}`;
         if (typeof namespace === "string") {
             throw new Error("Build element namespace -> that element name contain another element name");
         }
-        if (!namespace[name]) {
+        if (!namespace[name] && !namespace[fullName]) {
             if (i === parts.length - 1) {
                 namespace[name] = `typeof ${importElement} extends { propsDefinition: infer TProp } ? { new(...args: any[]): { $props: TProp & Omit<VueComponentBaseProps, keyof TProp> } } : typeof ${importElement} <<end>>`;
             }
@@ -206,17 +212,21 @@ function populateElementNamespace(namespace, elementName, importElement) {
         }
         else {
             if (i === parts.length - 1) {
-                tooling_1.utils.log(`Generate namespace for component with suffix $ -> ${parts.slice(0, i + 1).join(".")}$`);
-                namespace[`${name}$`] = `typeof ${importElement} extends { propsDefinition: infer TProp } ? { new(...args: any[]): { $props: TProp & Omit<VueComponentBaseProps, keyof TProp> } } : typeof ${importElement} <<end>>`;
-                // throw new Error("Build element namespace -> Exist an element name contain a above that element name");
+                // utils.log(`Generate namespace for component with suffix $ -> ${parts.slice(0, i + 1).join(".")}$`);
+                _duplicateElementNames[fullName] = `(typeof ${importElement} extends { propsDefinition: infer TProp } ? { new(...args: any[]): { $props: TProp & Omit<VueComponentBaseProps, keyof TProp> } } : typeof ${importElement}) &`;
+                if (!namespace[fullName]) {
+                    namespace[fullName] = namespace[name];
+                    namespace[name] = undefined;
+                }
             }
             else {
                 if (typeof namespace[name] === "string") {
-                    tooling_1.utils.log(`Generate namespace for component with suffix $ -> ${parts.slice(0, i + 1).join(".")}$`);
-                    namespace[`${name}$`] = namespace[name];
-                    namespace[name] = {};
+                    // utils.log(`Generate namespace for component with suffix $ -> ${parts.slice(0, i + 1).join(".")}$`);
+                    _duplicateElementNames[fullName] = `(${namespace[name].replace("<<end>>", ") &")}`;
+                    namespace[name] = undefined;
+                    namespace[fullName] = {};
                 }
-                namespace = namespace[name];
+                namespace = (namespace[name] || namespace[fullName]);
             }
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-vue",
   "license": "MIT",
-  "version": "8.0.481-dev",
+  "version": "8.0.483-dev",
   "description": "Used to bundle and serve manifests web component that build on Vue framework.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,8 +19,8 @@
   ],
   "author": "Omnia Digital Workplace AB",
   "dependencies": {
-    "@omnia/fx-models": "8.0.481-dev",
-    "@omnia/tooling-composers": "8.0.481-dev",
+    "@omnia/fx-models": "8.0.483-dev",
+    "@omnia/tooling-composers": "8.0.483-dev",
     "@types/mousetrap": "1.5.34",
     "@types/quill": "1.3.6",
     "@types/zepto": "1.0.29",