refactor: remove duplicate registers

Author: vakrilov

xml-namespace-loader.spec.ts

@@ -173,23 +173,6 @@ fdescribe("XmlNamespaceLoader", () => {
         xmlNsLoader.call(loaderContext, CODE_FILE);
     })
 
-    it("with plugin path", (done) => {
-        const resolveMap = {
-            "nativescript-ui-chart": "node_module/nativescript-ui-chart/ui-chart.js",
-        }
-
-        const expectedDeps = [
-        ];
-
-        const expectedRegs = [
-            { name: "nativescript-ui-chart", path: "nativescript-ui-chart" },
-            { name: "nativescript-ui-chart/RadCartesianChart", path: "nativescript-ui-chart" },
-        ];
-
-        const loaderContext = getContext(done, { resolveMap, expectedDeps, expectedRegs });
-        xmlNsLoader.call(loaderContext, CODE_FILE);
-    })
-
     it("with ignored namespace should not add deps or register calls", (done) => {
         const resolveMap = {
             "app/nativescript-ui-chart": "app/nativescript-ui-chart.js",

xml-namespace-loader.ts

@@ -3,6 +3,11 @@ import { promisify } from "util";
 import { loader } from "webpack";
 import { convertSlashesInPath } from "./projectHelpers";
 
+interface NamespaceEntry {
+    name: string;
+    path: string
+}
+
 const loader: loader.Loader = function (source, map) {
     this.value = source;
     const { ignore } = this.query;
@@ -11,9 +16,9 @@ const loader: loader.Loader = function (source, map) {
     const { XmlParser } = require("tns-core-modules/xml");
 
     const resolvePromise = promisify(this.resolve);
-    const promises = [];
+    const promises: Promise<any>[] = [];
 
-    const namespaces = [];
+    const namespaces: NamespaceEntry[] = [];
     const parser = new XmlParser((event) => {
         const { namespace, elementName } = event;
         const moduleName = `${namespace}/${elementName}`;
@@ -87,20 +92,21 @@ const loader: loader.Loader = function (source, map) {
     parser.parse(source);
 
     Promise.all(promises).then(() => {
-        const moduleRegisters = namespaces
-            .map(convertPath)
-            .map(n =>
-                `global.registerModule("${n.name}", function() { return require("${n.path}"); });\n`
-            )
-            .join("");
+        const distinctNamespaces = new Map<string, string>();
+        namespaces.forEach(({ name, path }) => distinctNamespaces.set(name, convertSlashesInPath(path)));
+
+        const moduleRegisters: string[] = [];
+        distinctNamespaces.forEach((path, name) => {
+            moduleRegisters.push(`global.registerModule("${name}", function() { return require("${path}"); });\n`);
+        });
 
         // escape special whitespace characters
         // see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#Issue_with_plain_JSON.stringify_for_use_as_JavaScript
         const json = JSON.stringify(source)
             .replace(/\u2028/g, '\\u2028')
             .replace(/\u2029/g, '\\u2029');
 
-        const wrapped = `${moduleRegisters}\nmodule.exports = ${json}`;
+        const wrapped = `${moduleRegisters.join("")}\nmodule.exports = ${json}`;
 
         callback(null, wrapped, map);
     }).catch((err) => {
@@ -109,9 +115,4 @@ const loader: loader.Loader = function (source, map) {
 
 }
 
-function convertPath(obj) {
-    obj.path = convertSlashesInPath(obj.path);
-    return obj;
-}
-
 export default loader;