arkanalyzer 1.0.6 → 1.0.8

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

@@ -1 +1 @@
-{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GACxH,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAwDpH;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,QAoB1H;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAiCtH"}
+{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAUzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GACxH,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAuDpH;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,QAmB1H;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAiCtH"}

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

@@ -48,6 +48,8 @@ const builderUtils_1 = require("./builderUtils");
 const ArkSignature_1 = require("../ArkSignature");
 const Type_1 = require("../../base/Type");
 const Position_1 = require("../../base/Position");
+const ArkBaseModel_1 = require("../ArkBaseModel");
+const IRUtils_1 = require("../../common/IRUtils");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFieldBuilder');
 function buildProperty2ArkField(member, sourceFile, cls) {
     let field = new ArkField_1.ArkField();
@@ -73,23 +75,22 @@ function buildProperty2ArkField(member, sourceFile, cls) {
     else if (member.name && ohos_typescript_1.default.isPrivateIdentifier(member.name)) {
         let propertyName = member.name.text;
         fieldName = propertyName.substring(1);
-        field.addModifier(ohos_typescript_1.default.ScriptElementKindModifier.privateMemberModifier);
+        field.addModifier(ArkBaseModel_1.ModifierType.PRIVATE);
     }
     else {
         logger.warn("Other type of property name found!");
     }
     if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) && member.modifiers) {
-        let modifiers = (0, builderUtils_1.buildModifiers)(member, sourceFile);
-        modifiers.forEach((modifier) => {
-            field.addModifier(modifier);
-        });
+        let modifiers = (0, builderUtils_1.buildModifiers)(member);
+        field.addModifier(modifiers);
+        field.setDecorators((0, builderUtils_1.buildDecorators)(member, sourceFile));
     }
     let fieldType = Type_1.UnknownType.getInstance();
     if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) && member.type) {
         fieldType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(member.type, sourceFile, cls), field);
     }
     if (ohos_typescript_1.default.isEnumMember(member)) {
-        field.addModifier('StaticKeyword');
+        field.addModifier(ArkBaseModel_1.ModifierType.STATIC);
         fieldType = new Type_1.ClassType(cls.getSignature());
     }
     const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, field.isStatic());
@@ -100,6 +101,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
     if (ohos_typescript_1.default.isPropertyDeclaration(member) && member.exclamationToken) {
         field.setExclamationToken(true);
     }
+    IRUtils_1.IRUtils.setLeadingComments(field, member, sourceFile, cls.getDeclaringArkFile().getScene().getOptions());
     cls.addField(field);
     return field;
 }
@@ -111,14 +113,14 @@ function buildIndexSignature2ArkField(member, sourceFile, cls) {
     field.setDeclaringArkClass(cls);
     field.setOriginPosition(Position_1.LineColPosition.buildFromNode(member, sourceFile));
     if (member.modifiers) {
-        (0, builderUtils_1.buildModifiers)(member, sourceFile).forEach((modifier) => {
-            field.addModifier(modifier);
-        });
+        let modifier = (0, builderUtils_1.buildModifiers)(member);
+        field.addModifier(modifier);
     }
     const fieldName = '[' + member.parameters[0].getText(sourceFile) + ']';
     const fieldType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(member.type, sourceFile, field), field);
     const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, true);
     field.setSignature(fieldSignature);
+    IRUtils_1.IRUtils.setLeadingComments(field, member, sourceFile, cls.getDeclaringArkFile().getScene().getOptions());
     cls.addField(field);
 }
 exports.buildIndexSignature2ArkField = buildIndexSignature2ArkField;
@@ -184,6 +186,8 @@ function mapSyntaxKindToFieldOriginType(syntaxKind) {
         case ohos_typescript_1.default.SyntaxKind.GetAccessor:
             fieldOriginType = ArkField_1.FieldCategory.GET_ACCESSOR;
             break;
+        default:
+            ;
     }
     return fieldOriginType;
 }

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

@@ -118,7 +118,6 @@ function buildArkFile(arkFile, astRoot) {
             logger.warn("This is a MethodDeclaration in ArkFile.");
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, arkFile.getDefaultClass(), mthd, astRoot);
-            arkFile.getDefaultClass().addMethod(mthd);
             if (mthd.isExported()) {
                 arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, arkFile, Position_1.LineColPosition.buildFromNode(child, astRoot)));
             }
@@ -126,14 +125,13 @@ function buildArkFile(arkFile, astRoot) {
         else if (ohos_typescript_1.default.isFunctionDeclaration(child)) {
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, arkFile.getDefaultClass(), mthd, astRoot);
-            arkFile.getDefaultClass().addMethod(mthd);
             if (mthd.isExported()) {
                 arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, arkFile, Position_1.LineColPosition.buildFromNode(child, astRoot)));
             }
         }
         else if (ohos_typescript_1.default.isImportEqualsDeclaration(child) ||
             ohos_typescript_1.default.isImportDeclaration(child)) {
-            let importInfos = (0, ArkImportBuilder_1.buildImportInfo)(child, astRoot);
+            let importInfos = (0, ArkImportBuilder_1.buildImportInfo)(child, astRoot, arkFile);
             importInfos === null || importInfos === void 0 ? void 0 : importInfos.forEach((element) => {
                 element.setDeclaringArkFile(arkFile);
                 arkFile.addImportInfo(element);

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

@@ -1,4 +1,5 @@
 import ts from 'ohos-typescript';
 import { ImportInfo } from '../ArkImport';
-export declare function buildImportInfo(node: ts.ImportEqualsDeclaration | ts.ImportDeclaration, sourceFile: ts.SourceFile): ImportInfo[];
+import { ArkFile } from '../ArkFile';
+export declare function buildImportInfo(node: ts.ImportEqualsDeclaration | ts.ImportDeclaration, sourceFile: ts.SourceFile, arkFile: ArkFile): ImportInfo[];
 //# sourceMappingURL=ArkImportBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkImportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkImportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,uBAAuB,GAAG,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,UAAU,EAAE,CAOhI"}
+{"version":3,"file":"ArkImportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkImportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,uBAAuB,GAAG,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAOlJ"}

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

@@ -22,17 +22,18 @@ const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const Position_1 = require("../../base/Position");
 const ArkImport_1 = require("../ArkImport");
 const builderUtils_1 = require("./builderUtils");
-function buildImportInfo(node, sourceFile) {
+const IRUtils_1 = require("../../common/IRUtils");
+function buildImportInfo(node, sourceFile, arkFile) {
     if (ohos_typescript_1.default.isImportDeclaration(node)) {
-        return buildImportDeclarationNode(node, sourceFile);
+        return buildImportDeclarationNode(node, sourceFile, arkFile);
     }
     else if (ohos_typescript_1.default.isImportEqualsDeclaration(node)) {
-        return buildImportEqualsDeclarationNode(node, sourceFile);
+        return buildImportEqualsDeclarationNode(node, sourceFile, arkFile);
     }
     return [];
 }
 exports.buildImportInfo = buildImportInfo;
-function buildImportDeclarationNode(node, sourceFile) {
+function buildImportDeclarationNode(node, sourceFile, arkFile) {
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
     const tsSourceCode = node.getText(sourceFile);
     let importInfos = [];
@@ -40,11 +41,9 @@ function buildImportDeclarationNode(node, sourceFile) {
     if (ohos_typescript_1.default.isStringLiteral(node.moduleSpecifier)) {
         importFrom = node.moduleSpecifier.text;
     }
-    const modifiers = new Set();
+    let modifiers = 0;
     if (node.modifiers) {
-        (0, builderUtils_1.buildModifiers)(node, sourceFile).forEach((modifier) => {
-            modifiers.add(modifier);
-        });
+        modifiers = (0, builderUtils_1.buildModifiers)(node);
     }
     // just like: import '../xxx'
     if (!node.importClause) {
@@ -53,6 +52,7 @@ function buildImportDeclarationNode(node, sourceFile) {
         let importInfo = new ArkImport_1.ImportInfo();
         importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers);
         importInfo.setTsSourceCode(tsSourceCode);
+        IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
         importInfos.push(importInfo);
     }
     //just like: import fs from 'fs'
@@ -62,6 +62,7 @@ function buildImportDeclarationNode(node, sourceFile) {
         let importInfo = new ArkImport_1.ImportInfo();
         importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers);
         importInfo.setTsSourceCode(tsSourceCode);
+        IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
         importInfos.push(importInfo);
     }
     // just like: import {xxx} from './yyy'
@@ -75,12 +76,14 @@ function buildImportDeclarationNode(node, sourceFile) {
                         let importInfo = new ArkImport_1.ImportInfo();
                         importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers, element.propertyName.text);
                         importInfo.setTsSourceCode(tsSourceCode);
+                        IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
                         importInfos.push(importInfo);
                     }
                     else {
                         let importInfo = new ArkImport_1.ImportInfo();
                         importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers);
                         importInfo.setTsSourceCode(tsSourceCode);
+                        IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
                         importInfos.push(importInfo);
                     }
                 }
@@ -96,21 +99,20 @@ function buildImportDeclarationNode(node, sourceFile) {
             let nameBeforeAs = '*';
             importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers, nameBeforeAs);
             importInfo.setTsSourceCode(tsSourceCode);
+            IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
             importInfos.push(importInfo);
         }
     }
     return importInfos;
 }
-function buildImportEqualsDeclarationNode(node, sourceFile) {
+function buildImportEqualsDeclarationNode(node, sourceFile, arkFile) {
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
     const tsSourceCode = node.getText(sourceFile);
     let importInfos = [];
     let importType = 'EqualsImport';
-    const modifiers = new Set();
+    let modifiers = 0;
     if (node.modifiers) {
-        (0, builderUtils_1.buildModifiers)(node, sourceFile).forEach((modifier) => {
-            modifiers.add(modifier);
-        });
+        modifiers = (0, builderUtils_1.buildModifiers)(node);
     }
     if (node.moduleReference && ohos_typescript_1.default.isExternalModuleReference(node.moduleReference) &&
         node.moduleReference.expression && ohos_typescript_1.default.isStringLiteral(node.moduleReference.expression)) {
@@ -119,6 +121,7 @@ function buildImportEqualsDeclarationNode(node, sourceFile) {
         let importInfo = new ArkImport_1.ImportInfo();
         importInfo.build(importClauseName, importType, importFrom, originTsPosition, modifiers);
         importInfo.setTsSourceCode(tsSourceCode);
+        IRUtils_1.IRUtils.setLeadingComments(importInfo, node, sourceFile, arkFile.getScene().getOptions());
         importInfos.push(importInfo);
     }
     return importInfos;

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

@@ -55,6 +55,8 @@ export declare class MethodParameter {
     setArrayElements(arrayElements: ArrayBindingPatternParameter[]): void;
 }
 export declare function buildDefaultConstructor(arkClass: ArkClass): boolean;
-export declare function buildInitMethod(initMethod: ArkMethod, stmtMap: Map<Stmt, Stmt>, thisLocal: Local): void;
+export declare function buildInitMethod(initMethod: ArkMethod, fieldInitializerStmts: Stmt[], thisLocal: Local): void;
 export declare function addInitInConstructor(arkClass: ArkClass): void;
+export declare function isMethodImplementation(node: MethodLikeNode): boolean;
+export declare function checkAndUpdateMethod(method: ArkMethod, cls: ArkClass): void;
 //# sourceMappingURL=ArkMethodBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAa,IAAI,EAAe,MAAM,iBAAiB,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAejC,OAAO,EAAmD,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAQzC,MAAM,MAAM,cAAc,GACtB,EAAE,CAAC,mBAAmB,GACtB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,sBAAsB,GACzB,EAAE,CAAC,aAAa,GAChB,EAAE,CAAC,mBAAmB,GACtB,EAAE,CAAC,kBAAkB,GACrB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,6BAA6B,GAChC,EAAE,CAAC,wBAAwB,GAC3B,EAAE,CAAC,gBAAgB,CAAC;AAExB,wBAAgB,iCAAiC,CAAC,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EACxC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,QAWvG;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAkDtK;AA0DD,qBAAa,6BAA6B;IACtC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,QAAQ,CAAkB;;IAK3B,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,MAAM;IAIpC,UAAU;IAIV,WAAW,CAAC,QAAQ,EAAE,OAAO;CAGvC;AAED,qBAAa,4BAA4B;IACrC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,QAAQ,CAAkB;;IAK3B,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,MAAM;IAIpC,UAAU;IAIV,WAAW,CAAC,QAAQ,EAAE,OAAO;CAGvC;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,aAAa,CAAsC;;IAKpD,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,IAAI;IAIlB,UAAU;IAIV,WAAW,CAAC,QAAQ,EAAE,OAAO;IAI7B,iBAAiB;IAIjB,iBAAiB,CAAC,cAAc,EAAE,OAAO;IAIzC,aAAa,CAAC,OAAO,EAAE,6BAA6B;IAIpD,cAAc;IAId,cAAc,CAAC,WAAW,EAAE,6BAA6B,EAAE;IAI3D,eAAe,CAAC,OAAO,EAAE,4BAA4B;IAIrD,gBAAgB;IAIhB,gBAAgB,CAAC,aAAa,EAAE,4BAA4B,EAAE;CAGxE;AAUD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CA0FnE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,IAAI,CAsBvG;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,QAoBtD"}
+{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"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"}

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

@@ -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.addInitInConstructor = exports.buildInitMethod = exports.buildDefaultConstructor = exports.MethodParameter = exports.ArrayBindingPatternParameter = exports.ObjectBindingPatternParameter = exports.buildArkMethodFromArkClass = exports.buildDefaultArkMethodFromArkClass = void 0;
+exports.checkAndUpdateMethod = exports.isMethodImplementation = exports.addInitInConstructor = exports.buildInitMethod = exports.buildDefaultConstructor = exports.MethodParameter = exports.ArrayBindingPatternParameter = exports.ObjectBindingPatternParameter = exports.buildArkMethodFromArkClass = exports.buildDefaultArkMethodFromArkClass = void 0;
 const Type_1 = require("../../base/Type");
 const BodyBuilder_1 = require("../../common/BodyBuilder");
 const ViewTreeBuilder_1 = require("../../graph/builder/ViewTreeBuilder");
@@ -60,12 +60,15 @@ const Local_1 = require("../../base/Local");
 const TSConst_1 = require("../../common/TSConst");
 const Const_1 = require("../../common/Const");
 const ArkSignatureBuilder_1 = require("./ArkSignatureBuilder");
+const IRUtils_1 = require("../../common/IRUtils");
+const ArkError_1 = require("../../common/ArkError");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkMethodBuilder');
 function buildDefaultArkMethodFromArkClass(declaringClass, mtd, sourceFile, node) {
     mtd.setDeclaringArkClass(declaringClass);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.DEFAULT_ARK_METHOD_NAME, true);
     const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getSignature(), methodSubSignature);
-    mtd.setSignature(methodSignature);
+    mtd.setImplementationSignature(methodSignature);
+    mtd.setLineCol(0);
     const defaultMethodNode = node ? node : sourceFile;
     let bodyBuilder = new BodyBuilder_1.BodyBuilder(mtd.getSignature(), defaultMethodNode, mtd, sourceFile);
     mtd.setBodyBuilder(bodyBuilder);
@@ -74,19 +77,15 @@ exports.buildDefaultArkMethodFromArkClass = buildDefaultArkMethodFromArkClass;
 function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile, declaringMethod) {
     mtd.setDeclaringArkClass(declaringClass);
     if (ohos_typescript_1.default.isFunctionDeclaration(methodNode)) {
-        mtd.setAsteriskToken(methodNode.asteriskToken != undefined);
+        mtd.setAsteriskToken(methodNode.asteriskToken !== undefined);
     }
     mtd.setCode(methodNode.getText(sourceFile));
-    const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, methodNode.getStart(sourceFile));
-    mtd.setLine(line + 1);
-    mtd.setColumn(character + 1);
-    (0, builderUtils_1.buildModifiers)(methodNode, sourceFile).forEach((value) => {
-        mtd.addModifier(value);
-    });
+    mtd.setModifiers((0, builderUtils_1.buildModifiers)(methodNode));
+    mtd.setDecorators((0, builderUtils_1.buildDecorators)(methodNode, sourceFile));
     if (methodNode.typeParameters) {
         mtd.setGenericTypes((0, builderUtils_1.buildTypeParameters)(methodNode.typeParameters, sourceFile, mtd));
     }
-    // build MethodSignature
+    // build methodDeclareSignatures and methodSignature as well as corresponding positions
     const methodName = buildMethodName(methodNode, declaringClass, sourceFile, declaringMethod);
     const methodParameters = [];
     (0, builderUtils_1.buildParameters)(methodNode.parameters, mtd, sourceFile).forEach((parameter) => {
@@ -98,38 +97,39 @@ function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile,
     }
     const methodSubSignature = new ArkSignature_1.MethodSubSignature(methodName, methodParameters, returnType, mtd.isStatic());
     const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getSignature(), methodSubSignature);
-    mtd.setSignature(methodSignature);
+    const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, methodNode.getStart(sourceFile));
+    if (isMethodImplementation(methodNode)) {
+        mtd.setImplementationSignature(methodSignature);
+        mtd.setLine(line + 1);
+        mtd.setColumn(character + 1);
+    }
+    else {
+        mtd.setDeclareSignatures(methodSignature);
+        mtd.setDeclareLinesAndCols([line + 1], [character + 1]);
+    }
     let bodyBuilder = new BodyBuilder_1.BodyBuilder(mtd.getSignature(), methodNode, mtd, sourceFile);
     mtd.setBodyBuilder(bodyBuilder);
     if (mtd.hasBuilderDecorator()) {
         mtd.setViewTree((0, ViewTreeBuilder_1.buildViewTree)(mtd));
     }
     else if (declaringClass.hasComponentDecorator() &&
-        mtd.getSubSignature().toString() == 'build()' &&
-        !mtd.containsModifier('StaticKeyword')) {
+        mtd.getSubSignature().toString() === 'build()' &&
+        !mtd.isStatic()) {
         declaringClass.setViewTree((0, ViewTreeBuilder_1.buildViewTree)(mtd));
     }
+    checkAndUpdateMethod(mtd, declaringClass);
     declaringClass.addMethod(mtd);
+    IRUtils_1.IRUtils.setLeadingComments(mtd, methodNode, sourceFile, mtd.getDeclaringArkFile().getScene().getOptions());
 }
 exports.buildArkMethodFromArkClass = buildArkMethodFromArkClass;
 function buildMethodName(node, declaringClass, sourceFile, declaringMethod) {
     let name = '';
     if (ohos_typescript_1.default.isFunctionDeclaration(node) || ohos_typescript_1.default.isFunctionExpression(node)) {
-        if (node.name) {
-            name = node.name.text;
-        }
-        else {
-            name = buildAnonymousMethodName(node, declaringClass, declaringMethod);
-        }
+        name = node.name ? node.name.text : buildAnonymousMethodName(node, declaringClass);
     }
     else if (ohos_typescript_1.default.isFunctionTypeNode(node)) {
-        if (node.name) {
-            //TODO: check name type
-            name = node.name.getText(sourceFile);
-        }
-        else {
-            name = buildAnonymousMethodName(node, declaringClass, declaringMethod);
-        }
+        //TODO: check name type
+        name = node.name ? node.name.getText(sourceFile) : buildAnonymousMethodName(node, declaringClass);
     }
     else if (ohos_typescript_1.default.isMethodDeclaration(node) || ohos_typescript_1.default.isMethodSignature(node)) {
         if (ohos_typescript_1.default.isIdentifier(node.name)) {
@@ -167,17 +167,21 @@ function buildMethodName(node, declaringClass, sourceFile, declaringMethod) {
         name = 'Set-' + node.name.text;
     }
     else if (ohos_typescript_1.default.isArrowFunction(node)) {
-        name = buildAnonymousMethodName(node, declaringClass, declaringMethod);
+        name = buildAnonymousMethodName(node, declaringClass);
+    }
+    if (declaringMethod !== undefined && !declaringMethod.isDefaultArkMethod()) {
+        name = buildNestedMethodName(name, declaringMethod.getName());
     }
     return name;
 }
-function buildAnonymousMethodName(node, declaringClass, declaringMethod) {
-    let declaringMethodName = '';
-    if (declaringMethod) {
-        declaringMethodName = declaringMethod.getName() + '-';
+function buildAnonymousMethodName(node, declaringClass) {
+    return `${Const_1.ANONYMOUS_METHOD_PREFIX}${declaringClass.getAnonymousMethodNumber()}`;
+}
+function buildNestedMethodName(originName, declaringMethodName) {
+    if (originName.startsWith(Const_1.NAME_PREFIX)) {
+        return `${originName}${Const_1.NAME_DELIMITER}${declaringMethodName}`;
     }
-    const mtdName = 'AnonymousMethod-' + declaringMethodName + declaringClass.getAnonymousMethodNumber();
-    return mtdName;
+    return `${Const_1.NAME_PREFIX}${originName}${Const_1.NAME_DELIMITER}${declaringMethodName}`;
 }
 class ObjectBindingPatternParameter {
     constructor() {
@@ -286,9 +290,9 @@ exports.MethodParameter = MethodParameter;
 function needDefaultConstructorInClass(arkClass) {
     const originClassType = arkClass.getCategory();
     return arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME) == null &&
-        (originClassType == ArkClass_1.ClassCategory.CLASS || originClassType == ArkClass_1.ClassCategory.OBJECT) &&
-        arkClass.getName() != Const_1.DEFAULT_ARK_CLASS_NAME &&
-        !arkClass.getModifiers().has(TSConst_1.DECLARE_KEYWORD);
+        (originClassType === ArkClass_1.ClassCategory.CLASS || originClassType === ArkClass_1.ClassCategory.OBJECT) &&
+        arkClass.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME &&
+        !arkClass.isDeclare();
 }
 function buildDefaultConstructor(arkClass) {
     if (!needDefaultConstructorInClass(arkClass)) {
@@ -320,7 +324,8 @@ function buildDefaultConstructor(arkClass) {
         let returnType = parentConstructor.getReturnType();
         const methodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.CONSTRUCTOR_NAME, methodParameters, returnType, defaultConstructor.isStatic());
         const methodSignature = new ArkSignature_1.MethodSignature(defaultConstructor.getDeclaringArkClass().getSignature(), methodSubSignature);
-        defaultConstructor.setSignature(methodSignature);
+        defaultConstructor.setImplementationSignature(methodSignature);
+        defaultConstructor.setLineCol(0);
         const stmts = [];
         let index = 0;
         const parameterLocals = [];
@@ -343,7 +348,8 @@ function buildDefaultConstructor(arkClass) {
     else {
         const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(TSConst_1.CONSTRUCTOR_NAME);
         const methodSignature = new ArkSignature_1.MethodSignature(defaultConstructor.getDeclaringArkClass().getSignature(), methodSubSignature);
-        defaultConstructor.setSignature(methodSignature);
+        defaultConstructor.setImplementationSignature(methodSignature);
+        defaultConstructor.setLineCol(0);
         if (arkClass.getSuperClass()) {
             const superClass = arkClass.getSuperClass();
             const superMethodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.SUPER_NAME, [], Type_1.UnknownType.getInstance());
@@ -364,19 +370,19 @@ function buildDefaultConstructor(arkClass) {
     cfg.setStartingStmt(startingStmt);
     cfg.setDeclaringMethod(defaultConstructor);
     cfg.getStmts().forEach(s => s.setCfg(cfg));
-    const originalCfg = new Cfg_1.Cfg();
-    defaultConstructor.setBody(new ArkBody_1.ArkBody(locals, originalCfg, cfg, new Map(), new Map()));
+    defaultConstructor.setBody(new ArkBody_1.ArkBody(locals, cfg));
+    checkAndUpdateMethod(defaultConstructor, arkClass);
     arkClass.addMethod(defaultConstructor);
     return true;
 }
 exports.buildDefaultConstructor = buildDefaultConstructor;
-function buildInitMethod(initMethod, stmtMap, thisLocal) {
+function buildInitMethod(initMethod, fieldInitializerStmts, thisLocal) {
     const classType = new Type_1.ClassType(initMethod.getDeclaringArkClass().getSignature());
     const assignStmt = new Stmt_1.ArkAssignStmt(thisLocal, new Ref_1.ArkThisRef(classType));
     const block = new BasicBlock_1.BasicBlock();
     block.addStmt(assignStmt);
     const locals = new Set();
-    for (const stmt of stmtMap.keys()) {
+    for (const stmt of fieldInitializerStmts) {
         block.addStmt(stmt);
         if (stmt.getDef() && stmt.getDef() instanceof Local_1.Local) {
             locals.add(stmt.getDef());
@@ -391,13 +397,13 @@ function buildInitMethod(initMethod, stmtMap, thisLocal) {
     cfg.setStartingStmt(assignStmt);
     cfg.buildDefUseStmt();
     cfg.setDeclaringMethod(initMethod);
-    initMethod.setBody(new ArkBody_1.ArkBody(locals, new Cfg_1.Cfg(), cfg, stmtMap, new Map()));
+    initMethod.setBody(new ArkBody_1.ArkBody(locals, cfg));
 }
 exports.buildInitMethod = buildInitMethod;
 function addInitInConstructor(arkClass) {
     var _a, _b;
     for (const method of arkClass.getMethods(true)) {
-        if (method.getName() == TSConst_1.CONSTRUCTOR_NAME) {
+        if (method.getName() === TSConst_1.CONSTRUCTOR_NAME) {
             const thisLocal = (_a = method.getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().get(TSConst_1.THIS_NAME);
             if (!thisLocal) {
                 continue;
@@ -409,7 +415,7 @@ function addInitInConstructor(arkClass) {
             }
             const firstBlockStmts = [...blocks][0].getStmts();
             let index = 0;
-            if (firstBlockStmts[0].getDef() instanceof Local_1.Local && firstBlockStmts[0].getDef().getName() == TSConst_1.THIS_NAME) {
+            if (firstBlockStmts[0].getDef() instanceof Local_1.Local && firstBlockStmts[0].getDef().getName() === TSConst_1.THIS_NAME) {
                 index = 1;
             }
             firstBlockStmts.splice(index, 0, initInvokeStmt);
@@ -417,3 +423,57 @@ function addInitInConstructor(arkClass) {
     }
 }
 exports.addInitInConstructor = addInitInConstructor;
+function isMethodImplementation(node) {
+    if (ohos_typescript_1.default.isFunctionDeclaration(node) ||
+        ohos_typescript_1.default.isMethodDeclaration(node) ||
+        ohos_typescript_1.default.isConstructorDeclaration(node) ||
+        ohos_typescript_1.default.isGetAccessorDeclaration(node) ||
+        ohos_typescript_1.default.isSetAccessorDeclaration(node) ||
+        ohos_typescript_1.default.isFunctionExpression(node)) {
+        if (node.body !== undefined) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.isMethodImplementation = isMethodImplementation;
+function checkAndUpdateMethod(method, cls) {
+    let presentMethod;
+    if (method.isStatic()) {
+        presentMethod = cls.getStaticMethodWithName(method.getName());
+    }
+    else {
+        presentMethod = cls.getMethodWithName(method.getName());
+    }
+    if (presentMethod === null) {
+        return;
+    }
+    if (method.validate().errCode !== ArkError_1.ArkErrorCode.OK || presentMethod.validate().errCode !== ArkError_1.ArkErrorCode.OK) {
+        return;
+    }
+    const presentDeclareSignatures = presentMethod.getDeclareSignatures();
+    const presentDeclareLineCols = presentMethod.getDeclareLineCols();
+    const presentImplSignature = presentMethod.getImplementationSignature();
+    const newDeclareSignature = method.getDeclareSignatures();
+    const newDeclareLineCols = method.getDeclareLineCols();
+    const newImplSignature = method.getImplementationSignature();
+    if (presentDeclareSignatures !== null && presentImplSignature === null) {
+        if (newDeclareSignature === null || presentMethod.getDeclareSignatureIndex(newDeclareSignature[0]) >= 0) {
+            method.setDeclareSignatures(presentDeclareSignatures);
+            method.setDeclareLineCols(presentDeclareLineCols);
+        }
+        else {
+            method.setDeclareSignatures(presentDeclareSignatures.concat(newDeclareSignature));
+            method.setDeclareLineCols(presentDeclareLineCols.concat(newDeclareLineCols));
+        }
+        return;
+    }
+    if (presentDeclareSignatures === null && presentImplSignature !== null) {
+        if (newImplSignature === null) {
+            method.setImplementationSignature(presentImplSignature);
+            method.setLineCol(presentMethod.getLineCol());
+        }
+        return;
+    }
+}
+exports.checkAndUpdateMethod = checkAndUpdateMethod;

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;AAU/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,QAuDnJ"}

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

@@ -53,14 +53,14 @@ const ArkExportBuilder_1 = require("./ArkExportBuilder");
 const ArkClass_1 = require("../ArkClass");
 const ArkMethod_1 = require("../ArkMethod");
 const ArkSignature_1 = require("../ArkSignature");
+const IRUtils_1 = require("../../common/IRUtils");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkNamespaceBuilder');
 function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
     var _a;
     // modifiers
     if (node.modifiers) {
-        (0, builderUtils_1.buildModifiers)(node, sourceFile).forEach((modifier) => {
-            ns.addModifier(modifier);
-        });
+        ns.setModifiers((0, builderUtils_1.buildModifiers)(node));
+        ns.setDecorators((0, builderUtils_1.buildDecorators)(node, sourceFile));
     }
     if (declaringInstance instanceof ArkFile_1.ArkFile) {
         ns.setDeclaringArkFile(declaringInstance);
@@ -102,6 +102,7 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
     else {
         logger.warn("JSDocNamespaceDeclaration found.");
     }
+    IRUtils_1.IRUtils.setLeadingComments(ns, node, sourceFile, ns.getDeclaringArkFile().getScene().getOptions());
 }
 exports.buildArkNamespace = buildArkNamespace;
 // TODO: check and update
@@ -136,7 +137,6 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
             logger.warn("This is a MethodDeclaration in ArkNamespace.");
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
-            namespace.getDefaultClass().addMethod(mthd);
             if (mthd.isExported()) {
                 namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
             }
@@ -144,7 +144,6 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
         else if (ohos_typescript_1.default.isFunctionDeclaration(child)) {
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
-            namespace.getDefaultClass().addMethod(mthd);
             if (mthd.isExported()) {
                 namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
             }

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

@@ -7,7 +7,8 @@ import { Decorator } from '../../base/Decorator';
 import { MethodParameter } from './ArkMethodBuilder';
 export declare function handleQualifiedName(node: ts.QualifiedName): string;
 export declare function handlePropertyAccessExpression(node: ts.PropertyAccessExpression): string;
-export declare function buildModifiers(node: ts.Node, sourceFile: ts.SourceFile): Set<string | Decorator>;
+export declare function buildDecorators(node: ts.Node, sourceFile: ts.SourceFile): Set<Decorator>;
+export declare function buildModifiers(node: ts.Node): number;
 export declare function buildHeritageClauses(heritageClauses: ts.NodeArray<HeritageClause>): Map<string, string>;
 export declare function buildTypeParameters(typeParameters: ts.NodeArray<TypeParameterDeclaration>, sourceFile: ts.SourceFile, arkInstance: ArkMethod | ArkClass): GenericType[];
 export declare function buildParameters(params: ts.NodeArray<ParameterDeclaration>, arkInstance: ArkMethod | ArkField, sourceFile: ts.SourceFile): MethodParameter[];

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

@@ -1 +1 @@
-{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAIH,WAAW,EAEX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAGH,eAAe,EAElB,MAAM,oBAAoB,CAAC;AAM5B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,CA6ChG;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQvG;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,EAAE,CAmB/G;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,qBA4GvI;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAyBpF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,QAM3F;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAC9E,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAkF9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QA8CjD"}
+{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAIH,WAAW,EAEX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAGH,eAAe,EAElB,MAAM,oBAAoB,CAAC;AAO5B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,CAUxF;AA2BD,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,CAUpD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBvG;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,EAAE,CAmB/G;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,qBA4GvI;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAmCpF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,QAM3F;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAC9E,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAkF9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QA8CjD"}