arkanalyzer 1.0.15 → 1.0.16

package/lib/core/model/ArkNamespace.d.ts

@@ -9,8 +9,8 @@ import { ArkError } from '../common/ArkError';
  * @category core/model
  */
 export declare class ArkNamespace extends ArkBaseModel implements ArkExport {
-    private code;
-    private lineCol;
+    private sourceCodes;
+    private lineCols;
     private declaringArkFile;
     private declaringArkNamespace;
     private declaringInstance;
@@ -30,11 +30,16 @@ export declare class ArkNamespace extends ArkBaseModel implements ArkExport {
     getNamespaceSignature(): NamespaceSignature;
     getName(): string;
     getCode(): string;
-    setCode(code: string): void;
+    setCode(sourceCode: string): void;
+    getCodes(): string[];
+    setCodes(sourceCodes: string[]): void;
+    addCode(sourceCode: string): void;
     getLine(): number;
     setLine(line: number): void;
     getColumn(): number;
     setColumn(column: number): void;
+    getLineColPairs(): [number, number][];
+    setLineCols(lineColPairs: [number, number][]): void;
     getDeclaringInstance(): ArkFile | ArkNamespace;
     setDeclaringInstance(declaringInstance: ArkFile | ArkNamespace): void;
     getDeclaringArkFile(): ArkFile;

package/lib/core/model/ArkNamespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAuB,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAa,YAAW,SAAS;IAC/D,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,qBAAqB,CAA6B;IAE1D,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,YAAY,CAAY;IAGhC,OAAO,CAAC,UAAU,CAA8D;IAChF,OAAO,CAAC,OAAO,CAAsD;IAErE,OAAO,CAAC,kBAAkB,CAAsB;IAEhD,OAAO,CAAC,oBAAoB,CAAa;;IAMlC,YAAY,CAAC,SAAS,EAAE,YAAY;IAIpC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAKzE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIhE,aAAa,IAAI,YAAY,EAAE;IAI/B,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAI1D,YAAY;IAIZ,qBAAqB;IAIrB,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,oBAAoB;IAIpB,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,YAAY;IAI9D,mBAAmB;IAInB,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IAI7C,wBAAwB;IAIxB,wBAAwB,CAAC,qBAAqB,EAAE,YAAY;IAI5D,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAMzD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIhD,UAAU,IAAI,QAAQ,EAAE;IAIxB,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,cAAc,IAAI,UAAU,EAAE;IAU9B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,aAAa,CAAC,UAAU,EAAE,UAAU;IAIpC,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,QAAQ;IAItC,+BAA+B,IAAI,SAAS,EAAE;IAW9C,+BAA+B,IAAI,QAAQ,EAAE;IAS7C,kCAAkC,IAAI,YAAY,EAAE;IASpD,uBAAuB;IAI9B,aAAa,IAAI,UAAU;IAIpB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAM3C,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO;IAMjD,QAAQ,IAAI,QAAQ;CAG9B"}
+{"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAuB,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAa,YAAW,SAAS;IAC/D,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,QAAQ,CAAiB;IAEjC,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,qBAAqB,CAA6B;IAE1D,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,YAAY,CAAY;IAGhC,OAAO,CAAC,UAAU,CAA8D;IAChF,OAAO,CAAC,OAAO,CAAsD;IAErE,OAAO,CAAC,kBAAkB,CAAsB;IAEhD,OAAO,CAAC,oBAAoB,CAAa;;IAMlC,YAAY,CAAC,SAAS,EAAE,YAAY;IAIpC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAKzE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIhE,aAAa,IAAI,YAAY,EAAE;IAI/B,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAI1D,YAAY;IAIZ,qBAAqB;IAIrB,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,UAAU,EAAE,MAAM;IAO1B,QAAQ,IAAI,MAAM,EAAE;IAOpB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAKrC,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIjC,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,eAAe,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAQrC,WAAW,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI;IAOnD,oBAAoB;IAIpB,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,YAAY;IAI9D,mBAAmB;IAInB,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IAI7C,wBAAwB;IAIxB,wBAAwB,CAAC,qBAAqB,EAAE,YAAY;IAI5D,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAMzD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIhD,UAAU,IAAI,QAAQ,EAAE;IAIxB,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,cAAc,IAAI,UAAU,EAAE;IAU9B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,aAAa,CAAC,UAAU,EAAE,UAAU;IAIpC,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,QAAQ;IAItC,+BAA+B,IAAI,SAAS,EAAE;IAW9C,+BAA+B,IAAI,QAAQ,EAAE;IAS7C,kCAAkC,IAAI,YAAY,EAAE;IASpD,uBAAuB;IAI9B,aAAa,IAAI,UAAU;IAIpB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAM3C,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO;IAMjD,QAAQ,IAAI,QAAQ;CAG9B"}

package/lib/core/model/ArkNamespace.js

@@ -26,8 +26,8 @@ const ArkBaseModel_1 = require("./ArkBaseModel");
 class ArkNamespace extends ArkBaseModel_1.ArkBaseModel {
     constructor() {
         super();
-        this.code = '';
-        this.lineCol = 0;
+        this.sourceCodes = [''];
+        this.lineCols = [];
         this.declaringArkNamespace = null;
         this.exportInfos = new Map();
         // name to model
@@ -61,22 +61,51 @@ class ArkNamespace extends ArkBaseModel_1.ArkBaseModel {
         return this.namespaceSignature.getNamespaceName();
     }
     getCode() {
-        return this.code;
+        return this.sourceCodes[0];
     }
-    setCode(code) {
-        this.code = code;
+    setCode(sourceCode) {
+        this.sourceCodes[0] = sourceCode;
+    }
+    /*
+     * Get multiple sourceCodes when the arkNamespace is merged from multiple namespace with the same name
+     */
+    getCodes() {
+        return this.sourceCodes;
+    }
+    /*
+     * Set multiple sourceCodes when the arkNamespace is merged from multiple namespace with the same name
+     */
+    setCodes(sourceCodes) {
+        this.sourceCodes = [];
+        this.sourceCodes.push(...sourceCodes);
+    }
+    addCode(sourceCode) {
+        this.sourceCodes.push(sourceCode);
     }
     getLine() {
-        return (0, Position_1.getLineNo)(this.lineCol);
+        return (0, Position_1.getLineNo)(this.lineCols[0]);
     }
     setLine(line) {
-        this.lineCol = (0, Position_1.setLine)(this.lineCol, line);
+        this.lineCols[0] = (0, Position_1.setLine)(this.lineCols[0], line);
     }
     getColumn() {
-        return (0, Position_1.getColNo)(this.lineCol);
+        return (0, Position_1.getColNo)(this.lineCols[0]);
     }
     setColumn(column) {
-        this.lineCol = (0, Position_1.setCol)(this.lineCol, column);
+        this.lineCols[0] = (0, Position_1.setCol)(this.lineCols[0], column);
+    }
+    getLineColPairs() {
+        const lineColPairs = [];
+        this.lineCols.forEach(lineCol => {
+            lineColPairs.push([(0, Position_1.getLineNo)(lineCol), (0, Position_1.getColNo)(lineCol)]);
+        });
+        return lineColPairs;
+    }
+    setLineCols(lineColPairs) {
+        this.lineCols = [];
+        lineColPairs.forEach(lineColPair => {
+            this.lineCols.push((0, Position_1.setLineCol)(lineColPair[0], lineColPair[1]));
+        });
     }
     getDeclaringInstance() {
         return this.declaringInstance;

package/lib/core/model/builder/ArkFileBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -86,14 +86,13 @@ exports.buildArkFileFromFile = buildArkFileFromFile;
  */
 function buildArkFile(arkFile, astRoot) {
     const statements = astRoot.statements;
+    const namespaces = [];
     statements.forEach((child) => {
-        if (ohos_typescript_1.default.isModuleDeclaration(child)
-        //child.kind === ts.SyntaxKind.ModuleDeclaration
-        ) {
+        if (ohos_typescript_1.default.isModuleDeclaration(child)) {
             let ns = new ArkNamespace_1.ArkNamespace();
             ns.setDeclaringArkFile(arkFile);
             (0, ArkNamespaceBuilder_1.buildArkNamespace)(child, arkFile, ns, astRoot);
-            arkFile.addNamespace(ns);
+            namespaces.push(ns);
             if (ns.isExported()) {
                 arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(ns, arkFile, Position_1.LineColPosition.buildFromNode(child, astRoot)));
             }
@@ -101,11 +100,7 @@ function buildArkFile(arkFile, astRoot) {
         else if (ohos_typescript_1.default.isClassDeclaration(child) ||
             ohos_typescript_1.default.isInterfaceDeclaration(child) ||
             ohos_typescript_1.default.isEnumDeclaration(child) ||
-            ohos_typescript_1.default.isStructDeclaration(child)
-        //child.kind === ts.SyntaxKind.ClassDeclaration
-        //child.kind === ts.SyntaxKind.InterfaceDeclaration
-        //child.kind === ts.SyntaxKind.EnumDeclaration
-        ) {
+            ohos_typescript_1.default.isStructDeclaration(child)) {
             let cls = new ArkClass_1.ArkClass();
             (0, ArkClassBuilder_1.buildNormalArkClassFromArkFile)(child, arkFile, cls, astRoot);
             arkFile.addArkClass(cls);
@@ -115,7 +110,7 @@ function buildArkFile(arkFile, astRoot) {
         }
         // TODO: Check
         else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
-            logger.warn("This is a MethodDeclaration in ArkFile.");
+            logger.warn('This is a MethodDeclaration in ArkFile.');
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, arkFile.getDefaultClass(), mthd, astRoot);
             if (mthd.isExported()) {
@@ -153,6 +148,14 @@ function buildArkFile(arkFile, astRoot) {
             logger.info('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
         }
     });
+    const mergedNameSpaces = (0, ArkNamespaceBuilder_1.mergeNameSpaces)(namespaces);
+    mergedNameSpaces.forEach(mergedNameSpace => {
+        arkFile.addNamespace(mergedNameSpace);
+        if (mergedNameSpace.isExport()) {
+            const linCol = new Position_1.LineColPosition(mergedNameSpace.getLine(), mergedNameSpace.getColumn());
+            arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mergedNameSpace, arkFile, linCol));
+        }
+    });
 }
 function genDefaultArkClass(arkFile, astRoot) {
     let defaultClass = new ArkClass_1.ArkClass();

package/lib/core/model/builder/ArkNamespaceBuilder.d.ts

@@ -2,4 +2,5 @@ import { ArkFile } from '../ArkFile';
 import ts from 'ohos-typescript';
 import { ArkNamespace } from '../ArkNamespace';
 export declare function buildArkNamespace(node: ts.ModuleDeclaration, declaringInstance: ArkFile | ArkNamespace, ns: ArkNamespace, sourceFile: ts.SourceFile): void;
+export declare function mergeNameSpaces(arkNamespaces: ArkNamespace[]): ArkNamespace[];
 //# sourceMappingURL=ArkNamespaceBuilder.d.ts.map

package/lib/core/model/builder/ArkNamespaceBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAW/C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAuDnJ"}
+{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAW/C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAoDnJ;AAmFD,wBAAgB,eAAe,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CA4B7E"}

package/lib/core/model/builder/ArkNamespaceBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildArkNamespace = void 0;
+exports.mergeNameSpaces = exports.buildArkNamespace = void 0;
 const Position_1 = require("../../base/Position");
 const ArkClassBuilder_1 = require("./ArkClassBuilder");
 const ArkFile_1 = require("../ArkFile");
@@ -88,19 +88,19 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
         // NamespaceDeclaration extends ModuleDeclaration
         //TODO: Check
         else if (ohos_typescript_1.default.isModuleDeclaration(node.body)) {
-            logger.warn("This ModuleBody is an NamespaceDeclaration.");
+            logger.warn('This ModuleBody is an NamespaceDeclaration.');
             let childNs = new ArkNamespace_1.ArkNamespace();
             buildArkNamespace(node.body, ns, childNs, sourceFile);
         }
         else if (ohos_typescript_1.default.isIdentifier(node.body)) {
-            logger.warn("ModuleBody is Identifier.");
+            logger.warn('ModuleBody is Identifier.');
         }
         else {
-            logger.warn("JSDocNamespaceDeclaration found.");
+            logger.warn('JSDocNamespaceDeclaration found.');
         }
     }
     else {
-        logger.warn("JSDocNamespaceDeclaration found.");
+        logger.warn('JSDocNamespaceDeclaration found.');
     }
     IRUtils_1.IRUtils.setComments(ns, node, sourceFile, ns.getDeclaringArkFile().getScene().getOptions());
 }
@@ -108,18 +108,14 @@ exports.buildArkNamespace = buildArkNamespace;
 // TODO: check and update
 function buildNamespaceMembers(node, namespace, sourceFile) {
     const statements = node.statements;
+    const nestedNamespaces = [];
     statements.forEach((child) => {
-        if (ohos_typescript_1.default.isModuleDeclaration(child)
-        //child.kind === ts.SyntaxKind.ModuleDeclaration
-        ) {
+        if (ohos_typescript_1.default.isModuleDeclaration(child)) {
             let childNs = new ArkNamespace_1.ArkNamespace();
             childNs.setDeclaringArkNamespace(namespace);
             childNs.setDeclaringArkFile(namespace.getDeclaringArkFile());
             buildArkNamespace(child, namespace, childNs, sourceFile);
-            namespace.addNamespace(childNs);
-            if (childNs.isExported()) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(childNs, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
-            }
+            nestedNamespaces.push(childNs);
         }
         else if (ohos_typescript_1.default.isClassDeclaration(child) ||
             ohos_typescript_1.default.isInterfaceDeclaration(child) ||
@@ -134,7 +130,7 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
         }
         // TODO: Check
         else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
-            logger.warn("This is a MethodDeclaration in ArkNamespace.");
+            logger.warn('This is a MethodDeclaration in ArkNamespace.');
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
             if (mthd.isExported()) {
@@ -161,6 +157,14 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
             // join default method
         }
     });
+    const nestedMergedNameSpaces = mergeNameSpaces(nestedNamespaces);
+    nestedMergedNameSpaces.forEach(nestedNameSpace => {
+        namespace.addNamespace(nestedNameSpace);
+        if (nestedNameSpace.isExport()) {
+            const linCol = new Position_1.LineColPosition(nestedNameSpace.getLine(), nestedNameSpace.getColumn());
+            namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(nestedNameSpace, namespace.getDeclaringArkFile(), linCol));
+        }
+    });
 }
 function genDefaultArkClass(ns, node, sourceFile) {
     let defaultClass = new ArkClass_1.ArkClass();
@@ -168,3 +172,34 @@ function genDefaultArkClass(ns, node, sourceFile) {
     ns.setDefaultClass(defaultClass);
     ns.addArkClass(defaultClass);
 }
+function mergeNameSpaces(arkNamespaces) {
+    const namespaceMap = new Map();
+    for (let i = 0; i < arkNamespaces.length; i++) {
+        const currNamespace = arkNamespaces[i];
+        const currName = currNamespace.getName();
+        if (namespaceMap.has(currName)) {
+            const prevNamespace = namespaceMap.get(currName);
+            const nestedPrevNamespaces = prevNamespace.getNamespaces();
+            const nestedCurrNamespaces = currNamespace.getNamespaces();
+            const nestedMergedNameSpaces = mergeNameSpaces([...nestedPrevNamespaces, ...nestedCurrNamespaces]);
+            nestedMergedNameSpaces.forEach(nestedNameSpace => {
+                prevNamespace.addNamespace(nestedNameSpace);
+            });
+            const classes = currNamespace.getClasses();
+            classes.forEach(cls => {
+                prevNamespace.addArkClass(cls);
+            });
+            const preSourceCodes = prevNamespace.getCodes();
+            const currSourceCodes = currNamespace.getCodes();
+            prevNamespace.setCodes([...preSourceCodes, ...currSourceCodes]);
+            const prevLineColPairs = prevNamespace.getLineColPairs();
+            const currLineColPairs = currNamespace.getLineColPairs();
+            prevNamespace.setLineCols([...prevLineColPairs, ...currLineColPairs]);
+        }
+        else {
+            namespaceMap.set(currName, currNamespace);
+        }
+    }
+    return [...namespaceMap.values()];
+}
+exports.mergeNameSpaces = mergeNameSpaces;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "files": [
     "docs",
     "lib",