@omnia/tooling-vue 8.0.74-dev → 8.0.75-dev

package/internal-do-not-import-from-here/shared.d.ts

@@ -4,7 +4,7 @@ export interface WebComponentOptionsExtends extends WebComponentOptions {
 }
 export type OutputInfo = {
     wc: {
-        namespace: string;
+        namespaces: string[];
         mappings: {
             [element: string]: string;
         };

package/internal-do-not-import-from-here/shared.js

@@ -35,11 +35,14 @@ exports.modifyComponent = modifyComponent;
 function replaceWebComponentNamespaceMapping(content) {
     const infos = _outputInfos.concat(ConfigurationManager.outputInfo.get());
     infos.forEach(info => {
-        if (info.wc?.namespace) {
-            content = content.replace(new RegExp(`(<|<\/|\\s)${info.wc.namespace}\\..*?(>|\\s)`, 'g'), function (match) {
-                return match.replace(new RegExp(`(${info.wc.namespace}.*)(?=(>|\\s))`), function (token) {
-                    return token.replace(/(\S+)/g, function (tag) {
-                        return info.wc.mappings[tag.replace(`${info.wc.namespace}.`, "")] || tag;
+        if (info.wc?.namespaces) {
+            info.wc.namespaces.forEach(namespace => {
+                content = content.replace(new RegExp(`(<|<\/|\\s)${namespace}\\..*?(>|\\s)`, 'g'), function (match) {
+                    return match.replace(new RegExp(`(${namespace}.*)(?=(>|\\s))`), function (token) {
+                        return token.replace(/(\S+)/g, function (tag) {
+                            // console.log("replaceWebComponentNamespaceMapping", tag)
+                            return info.wc.mappings[tag] || tag;
+                        });
                     });
                 });
             });

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

@@ -201,25 +201,25 @@ declare global {
         wcTypings = `import { VueComponentBaseProps } from "../../../../client/fx/ux/index";
         ${wcTypings}`;
     }
-    const elementNamespaceStucture = {};
+    const elementNamespaces = {};
     const wcNamespace = (0, shared_1.getBuildOption)()?.componentNamespace;
     const skipElementNames = (0, shared_1.getBuildOption)()?.skipElementNames;
     const info = shared_1.ConfigurationManager.outputInfo.get();
     info.wc = {
-        namespace: typeof wcNamespace === "string" ? wcNamespace : wcNamespace,
+        namespaces: wcNamespace ? [wcNamespace] : null,
         mappings: {}
     };
     await tooling_1.utils.asyncForEach(componentRegistrations, async (wc) => {
-        wcTypings = generateWebComponentTypings(wc, wcTypings, info, elementNamespaceStucture, skipElementNames);
+        wcTypings = generateWebComponentTypings(wc, wcTypings, info, elementNamespaces, skipElementNames);
         await buildDoc(wc);
     });
-    if (Object.keys(elementNamespaceStucture).length > 0) {
+    if (Object.keys(elementNamespaces).length > 0) {
         let result = `declare global {
             //{{namespace}}
         }`;
-        Object.keys(elementNamespaceStucture).forEach(key => {
+        Object.keys(elementNamespaces).forEach(key => {
             result = result.replace("//{{namespace}}", `
-            let ${key}: ${JSON.stringify(elementNamespaceStucture[key], null, 2)
+            let ${key}: ${JSON.stringify(elementNamespaces[key], null, 2)
                 .replace(/\"typeof /g, "typeof ").replace(/ <<end>>\"/g, "")}
                 //{{namespace}}
             `);
@@ -277,16 +277,19 @@ function generateWebComponentTypings(wc, template, info, elementNamespace, skipE
         else {
             importPath = `../../../../${importPath}`;
         }
-        if (info.wc.namespace && (!skipElementNames || skipElementNames.indexOf(wc.componentOptions.elementName) === -1)) {
+        if (info.wc.namespaces && (!skipElementNames || skipElementNames.indexOf(wc.componentOptions.elementName) === -1)) {
             let elementName = wc.componentOptions.elementName
                 .replace(/-/g, ".");
             // .replace("omfx-", "")
             // .replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
             // elementNamePascalCase = elementNamePascalCase[0].toUpperCase() + elementNamePascalCase.substring(1, elementNamePascalCase.length)
-            const namespace = (wc.componentOptions.namespace === true ? "" : wc.componentOptions.namespace) || info.wc.namespace;
+            const namespace = (wc.componentOptions.namespace === true ? "" : wc.componentOptions.namespace) || (0, shared_1.getBuildOption)()?.componentNamespace;
             if (namespace && elementName.indexOf(`${namespace}.`) !== 0) {
                 elementName = `${namespace}.${elementName}`;
             }
+            if (info.wc.namespaces && info.wc.namespaces.indexOf(elementName.split(".")[0]) === -1) {
+                info.wc.namespaces.push(elementName.split(".")[0]);
+            }
             info.wc.mappings[elementName] = wc.componentOptions.elementName;
             try {
                 populateElementNamespace(elementNamespace, elementName, friendlyManifestId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-vue",
   "license": "MIT",
-  "version": "8.0.74-dev",
+  "version": "8.0.75-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": "Precio Fishbone",
   "dependencies": {
-    "@omnia/fx-models": "8.0.74-dev",
-    "@omnia/tooling-composers": "8.0.74-dev",
+    "@omnia/fx-models": "8.0.75-dev",
+    "@omnia/tooling-composers": "8.0.75-dev",
     "@types/mousetrap": "1.5.34",
     "@types/quill": "1.3.6",
     "@types/zepto": "1.0.29",