arkanalyzer 1.0.89 → 1.0.91

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

@@ -48,6 +48,7 @@ const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkClass_1 = require("../ArkClass");
 const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
 const builderUtils_1 = require("./builderUtils");
+const StringUtils_1 = require("../../common/StringUtils");
 const ArkFieldBuilder_1 = require("./ArkFieldBuilder");
 const ArkIRTransformer_1 = require("../../common/ArkIRTransformer");
 const Stmt_1 = require("../../base/Stmt");
@@ -90,10 +91,9 @@ function buildNormalArkClassFromArkMethod(clsNode, cls, sourceFile, declaringMet
 exports.buildNormalArkClassFromArkMethod = buildNormalArkClassFromArkMethod;
 function buildNormalArkClassFromArkFile(clsNode, arkFile, cls, sourceFile, declaringMethod) {
     cls.setDeclaringArkFile(arkFile);
-    cls.setCode(clsNode.getText(sourceFile));
     const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getStart(sourceFile));
-    cls.setLine(line + 1);
-    cls.setColumn(character + 1);
+    const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getEnd());
+    cls.setOriginFullPosition(new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1));
     buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod);
     arkFile.addArkClass(cls);
 }
@@ -101,10 +101,9 @@ exports.buildNormalArkClassFromArkFile = buildNormalArkClassFromArkFile;
 function buildNormalArkClassFromArkNamespace(clsNode, arkNamespace, cls, sourceFile, declaringMethod) {
     cls.setDeclaringArkNamespace(arkNamespace);
     cls.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
-    cls.setCode(clsNode.getText(sourceFile));
     const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getStart(sourceFile));
-    cls.setLine(line + 1);
-    cls.setColumn(character + 1);
+    const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getEnd());
+    cls.setOriginFullPosition(new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1));
     buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod);
     arkNamespace.addArkClass(cls);
 }
@@ -156,7 +155,7 @@ function init4InstanceInitMethod(cls) {
     methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
     const methodSignature = new ArkSignature_1.MethodSignature(instanceInit.getDeclaringArkClass().getSignature(), methodSubSignature);
     instanceInit.setImplementationSignature(methodSignature);
-    instanceInit.setLineCol(0);
+    instanceInit.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     (0, ArkMethodBuilder_1.checkAndUpdateMethod)(instanceInit, cls);
     cls.addMethod(instanceInit);
     cls.setInstanceInitMethod(instanceInit);
@@ -171,7 +170,7 @@ function init4StaticInitMethod(cls) {
     methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
     const methodSignature = new ArkSignature_1.MethodSignature(staticInit.getDeclaringArkClass().getSignature(), methodSubSignature);
     staticInit.setImplementationSignature(methodSignature);
-    staticInit.setLineCol(0);
+    staticInit.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     (0, ArkMethodBuilder_1.checkAndUpdateMethod)(staticInit, cls);
     cls.addMethod(staticInit);
     cls.setStaticInitMethod(staticInit);
@@ -179,7 +178,7 @@ function init4StaticInitMethod(cls) {
 exports.init4StaticInitMethod = init4StaticInitMethod;
 function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     var _a;
-    const className = genClassName(clsNode.name ? clsNode.name.text : '', cls, declaringMethod);
+    const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
     const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
     cls.setSignature(classSignature);
     if (clsNode.typeParameters) {
@@ -197,7 +196,7 @@ function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
 }
 function buildClass2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     var _a;
-    const className = genClassName(clsNode.name ? clsNode.name.text : '', cls, declaringMethod);
+    const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
     const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
     cls.setSignature(classSignature);
     if (clsNode.typeParameters) {
@@ -228,7 +227,7 @@ function initHeritage(heritageClauses, cls) {
 }
 function buildInterface2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     var _a;
-    const className = genClassName(clsNode.name ? clsNode.name.text : '', cls, declaringMethod);
+    const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
     const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
     cls.setSignature(classSignature);
     if (clsNode.typeParameters) {
@@ -244,7 +243,7 @@ function buildInterface2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
 }
 function buildEnum2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     var _a;
-    const className = genClassName(clsNode.name ? clsNode.name.text : '', cls, declaringMethod);
+    const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
     const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
     cls.setSignature(classSignature);
     cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
@@ -278,11 +277,7 @@ function buildObjectLiteralExpression2ArkClass(clsNode, cls, sourceFile, declari
     const instanceFieldInitializerStmts = [];
     clsNode.properties.forEach(property => {
         if (ohos_typescript_1.default.isPropertyAssignment(property) || ohos_typescript_1.default.isShorthandPropertyAssignment(property) || ohos_typescript_1.default.isSpreadAssignment(property)) {
-            const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(property, sourceFile, cls);
-            if (ohos_typescript_1.default.isPropertyAssignment(property)) {
-                getInitStmts(instanceIRTransformer, arkField, property.initializer);
-                arkField.getInitializer().forEach(stmt => instanceFieldInitializerStmts.push(stmt));
-            }
+            (0, ArkFieldBuilder_1.buildProperty2ArkField)(property, sourceFile, cls);
         }
         else {
             let arkMethod = new ArkMethod_1.ArkMethod();
@@ -302,7 +297,12 @@ function genClassName(declaringName, cls, declaringMethod) {
         const num = declaringArkNamespace ? declaringArkNamespace.getAnonymousClassNumber() : cls.getDeclaringArkFile().getAnonymousClassNumber();
         declaringName = Const_1.ANONYMOUS_CLASS_PREFIX + num;
     }
-    const suffix = declaringMethod ? `${Const_1.ANONYMOUS_CLASS_DELIMITER}${declaringMethod.getDeclaringArkClass().getName()}${Const_1.NESTED_CLASS_METHOD_DELIMITER}${declaringMethod.getName()}` : '';
+    let suffix = '';
+    if (declaringMethod) {
+        const methodClass = declaringMethod.getDeclaringArkClass().getName();
+        const methodName = declaringMethod.getName();
+        suffix = `${Const_1.ANONYMOUS_CLASS_DELIMITER}${methodClass}${Const_1.NESTED_CLASS_METHOD_DELIMITER}${methodName}`;
+    }
     return declaringName + suffix;
 }
 function buildArkClassMembers(clsNode, cls, sourceFile) {
@@ -340,7 +340,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
                 return;
             }
             if (!instanceIRTransformer) {
-                console.log(clsNode.getText(sourceFile));
+                console.log((0, StringUtils_1.cloneText)(clsNode.getText(sourceFile)));
             }
             getInitStmts(instanceIRTransformer, arkField, member.initializer);
             arkField.getInitializer().forEach(stmt => instanceInitStmts.push(stmt));
@@ -363,7 +363,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
             logger.trace('Skip these members.');
         }
         else {
-            logger.warn(`Please contact developers to support new member in class: ${cls.getSignature().toString()}, member: ${member.getText()}!`);
+            logger.warn(`Please contact developers to support new member in class: ${cls.getSignature().toString()}, member: ${(0, StringUtils_1.cloneText)(member.getText())}!`);
         }
     });
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
@@ -406,7 +406,7 @@ function buildParameterProperty2ArkField(params, cls, sourceFile) {
     params.forEach(parameter => {
         let fieldName;
         if (ohos_typescript_1.default.isIdentifier(parameter.name)) {
-            fieldName = parameter.name.text;
+            fieldName = (0, StringUtils_1.cloneText)(parameter.name.text);
         }
         else if (ohos_typescript_1.default.isObjectBindingPattern(parameter.name)) {
             logger.warn(`Need to support param property with ObjectBindingPattern node type: ${cls.getSignature().toString()}!`);
@@ -425,9 +425,8 @@ function buildParameterProperty2ArkField(params, cls, sourceFile) {
         }
         let field = new ArkField_1.ArkField();
         field.setDeclaringArkClass(cls);
-        field.setCode(parameter.getText(sourceFile));
         field.setCategory(ArkField_1.FieldCategory.PARAMETER_PROPERTY);
-        field.setOriginPosition(Position_1.LineColPosition.buildFromNode(parameter, sourceFile));
+        field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(parameter, sourceFile));
         let fieldType;
         if (parameter.type) {
             fieldType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(parameter.type, sourceFile, field), field);
@@ -452,15 +451,13 @@ function buildStaticBlocksForClass(clsNode, cls, sourceFile) {
             const staticBlockMethod = new ArkMethod_1.ArkMethod();
             staticBlockMethod.setDeclaringArkClass(cls);
             staticBlockMethod.setIsGeneratedFlag(true);
-            staticBlockMethod.setCode(member.getText(sourceFile));
+            staticBlockMethod.setImplOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
             const methodName = Const_1.STATIC_BLOCK_METHOD_NAME_PREFIX + staticInitBlockId++;
             const methodSubSignature = new ArkSignature_1.MethodSubSignature(methodName, [], Type_1.VoidType.getInstance(), true);
             const methodSignature = new ArkSignature_1.MethodSignature(cls.getSignature(), methodSubSignature);
             staticBlockMethodSignatures.push(methodSignature);
             staticBlockMethod.setImplementationSignature(methodSignature);
-            const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, member.getStart(sourceFile));
-            staticBlockMethod.setLine(line + 1);
-            staticBlockMethod.setColumn(character + 1);
+            staticBlockMethod.setImplOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
             let bodyBuilder = new BodyBuilder_1.BodyBuilder(staticBlockMethod.getSignature(), member, staticBlockMethod, sourceFile);
             staticBlockMethod.setBodyBuilder(bodyBuilder);
             cls.addMethod(staticBlockMethod);
@@ -469,53 +466,68 @@ function buildStaticBlocksForClass(clsNode, cls, sourceFile) {
     return staticBlockMethodSignatures;
 }
 function getInitStmts(transformer, field, initNode, enumFieldInfo) {
-    let initValue;
-    let initPositions;
     const stmts = [];
+    const { initValue, initPositions } = processInitValue(transformer, field, initNode, enumFieldInfo, stmts);
+    if (!initValue) {
+        return;
+    }
+    const fieldRef = new Ref_1.ArkInstanceFieldRef(transformer.getThisLocal(), field.getSignature());
+    const fieldRefPositions = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
+    const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
+    assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
+    stmts.push(assignStmt);
+    setFieldInitPositionInfo(field, stmts, initValue);
+}
+function processInitValue(transformer, field, initNode, enumFieldInfo, stmts) {
+    let initValue;
+    let initPositions = [];
     if (initNode) {
         let initStmts = [];
         ({ value: initValue, valueOriginalPositions: initPositions, stmts: initStmts } = transformer.tsNodeToValueAndStmts(initNode));
-        initStmts.forEach(stmt => stmts.push(stmt));
+        initStmts.forEach(stmt => stmts === null || stmts === void 0 ? void 0 : stmts.push(stmt));
         if (IRUtils_1.IRUtils.moreThanOneAddress(initValue)) {
             ({ value: initValue, valueOriginalPositions: initPositions, stmts: initStmts } = transformer.generateAssignStmtForValue(initValue, initPositions));
-            initStmts.forEach(stmt => stmts.push(stmt));
+            initStmts.forEach(stmt => stmts === null || stmts === void 0 ? void 0 : stmts.push(stmt));
         }
         if (enumFieldInfo !== undefined) {
-            if (initValue instanceof Constant_1.NumberConstant) {
-                enumFieldInfo.curValue = parseFloat(initValue.getValue()) + 1;
-                enumFieldInfo.isCurValueValid = true;
-            }
-            else {
-                enumFieldInfo.lastFieldName = field.getName();
-                enumFieldInfo.isCurValueValid = false;
-            }
+            updateEnumFieldInfoFromValue(field, initValue, enumFieldInfo);
         }
     }
     else if (enumFieldInfo !== undefined) {
-        if (enumFieldInfo.isCurValueValid) {
-            initValue = ValueUtil_1.ValueUtil.getOrCreateNumberConst(enumFieldInfo.curValue);
-            enumFieldInfo.curValue += 1;
-        }
-        else {
-            initValue = new Expr_1.ArkNormalBinopExpr(new Local_1.Local(enumFieldInfo.lastFieldName), ValueUtil_1.ValueUtil.getOrCreateNumberConst(1), Expr_1.NormalBinaryOperator.Addition);
-            enumFieldInfo.lastFieldName = field.getName();
-        }
+        initValue = createEnumInitValue(field, enumFieldInfo);
         initPositions = [Position_1.FullPosition.DEFAULT];
         field.setMetadata(ArkMetadata_1.ArkMetadataKind.ENUM_INIT_TYPE_USER, new ArkMetadata_1.EnumInitTypeUserMetadata(false));
     }
+    return { initValue, initPositions };
+}
+function updateEnumFieldInfoFromValue(field, initValue, enumFieldInfo) {
+    if (initValue instanceof Constant_1.NumberConstant) {
+        enumFieldInfo.curValue = parseFloat(initValue.getValue()) + 1;
+        enumFieldInfo.isCurValueValid = true;
+    }
     else {
-        return;
+        enumFieldInfo.lastFieldName = field.getName();
+        enumFieldInfo.isCurValueValid = false;
     }
-    const fieldRef = new Ref_1.ArkInstanceFieldRef(transformer.getThisLocal(), field.getSignature());
-    const fieldRefPositions = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
-    const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
-    assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
-    stmts.push(assignStmt);
-    const fieldSourceCode = field.getCode();
-    const fieldOriginPosition = field.getOriginPosition();
+}
+function createEnumInitValue(field, enumFieldInfo) {
+    if (enumFieldInfo.isCurValueValid) {
+        const initValue = ValueUtil_1.ValueUtil.getOrCreateNumberConst(enumFieldInfo.curValue);
+        enumFieldInfo.curValue += 1;
+        return initValue;
+    }
+    else {
+        const initValue = new Expr_1.ArkNormalBinopExpr(new Local_1.Local(enumFieldInfo.lastFieldName), ValueUtil_1.ValueUtil.getOrCreateNumberConst(1), Expr_1.NormalBinaryOperator.Addition);
+        enumFieldInfo.lastFieldName = field.getName();
+        return initValue;
+    }
+}
+function setFieldInitPositionInfo(field, stmts, initValue) {
+    const fieldOriginPosition = field.getOriginFullPosition();
     for (const stmt of stmts) {
-        stmt.setOriginPositionInfo(fieldOriginPosition);
-        stmt.setOriginalText(fieldSourceCode);
+        if (!stmt.getOriginFullPosition()) {
+            stmt.setOriginFullPosition(fieldOriginPosition);
+        }
     }
     field.setInitializer(stmts);
     if (field.getType() instanceof Type_1.UnknownType) {

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

@@ -1,10 +1,10 @@
 import ts from 'ohos-typescript';
-import { LineColPosition } from '../../base/Position';
+import { FullPosition } from '../../base/Position';
 import { ArkExport, ExportInfo, FromInfo } from '../ArkExport';
 import { ArkFile } from '../ArkFile';
 import { ArkNamespace } from '../ArkNamespace';
 export { buildExportInfo, buildExportAssignment, buildExportDeclaration };
-declare function buildExportInfo(arkInstance: ArkExport, arkFile: ArkFile, line: LineColPosition): ExportInfo;
+declare function buildExportInfo(arkInstance: ArkExport, arkFile: ArkFile, position: FullPosition): ExportInfo;
 export declare function buildDefaultExportInfo(im: FromInfo, file: ArkFile, arkExport?: ArkExport): ExportInfo;
 declare function buildExportDeclaration(node: ts.ExportDeclaration, sourceFile: ts.SourceFile, arkFile: ArkFile): ExportInfo[];
 declare function buildExportAssignment(node: ts.ExportAssignment, sourceFile: ts.SourceFile, arkFile: ArkFile): ExportInfo[];

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

@@ -1 +1 @@
-{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAQ1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,GAAG,UAAU,CAepG;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAOrG;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAiDrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAsCnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,EAAE,CAmB5J;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAgBxI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}
+{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAQ1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAG,UAAU,CAerG;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAOrG;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAgDrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAoCnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,EAAE,CAiB5J;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAcxI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}

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

@@ -22,6 +22,7 @@ const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const Position_1 = require("../../base/Position");
 const ArkExport_1 = require("../ArkExport");
 const builderUtils_1 = require("./builderUtils");
+const StringUtils_1 = require("../../common/StringUtils");
 const TSConst_1 = require("../../common/TSConst");
 const ArkBaseModel_1 = require("../ArkBaseModel");
 const IRUtils_1 = require("../../common/IRUtils");
@@ -31,7 +32,7 @@ let tempIndex = 0;
 function getTempAll() {
     return `${TSConst_1.TEMP_EXPORT_ALL_PREFIX}${tempIndex++}`;
 }
-function buildExportInfo(arkInstance, arkFile, line) {
+function buildExportInfo(arkInstance, arkFile, position) {
     let exportClauseName;
     if (arkInstance instanceof ArkBaseModel_1.ArkBaseModel && arkInstance.isDefault()) {
         exportClauseName = TSConst_1.DEFAULT;
@@ -44,7 +45,7 @@ function buildExportInfo(arkInstance, arkFile, line) {
         .exportClauseType(arkInstance.getExportType())
         .modifiers(arkInstance.getModifiers())
         .arkExport(arkInstance)
-        .originTsPosition(line)
+        .originFullPosition(position)
         .declaringArkFile(arkFile)
         .build();
 }
@@ -60,11 +61,10 @@ function buildDefaultExportInfo(im, file, arkExport) {
 }
 exports.buildDefaultExportInfo = buildDefaultExportInfo;
 function buildExportDeclaration(node, sourceFile, arkFile) {
-    const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
-    const tsSourceCode = node.getText(sourceFile);
+    const originFullPosition = Position_1.FullPosition.buildFromNode(node, sourceFile);
     let exportFrom = '';
     if (node.moduleSpecifier && ohos_typescript_1.default.isStringLiteral(node.moduleSpecifier)) {
-        exportFrom = node.moduleSpecifier.text;
+        exportFrom = (0, StringUtils_1.cloneText)(node.moduleSpecifier.text);
     }
     let modifiers = 0;
     if (node.isTypeOnly) {
@@ -79,14 +79,14 @@ function buildExportDeclaration(node, sourceFile, arkFile) {
                 modifier |= ArkBaseModel_1.ModifierType.TYPE;
             }
             let builder = new ArkExport_1.ExportInfo.Builder()
-                .exportClauseType(ArkExport_1.ExportType.UNKNOWN).exportClauseName(element.name.text)
-                .tsSourceCode(tsSourceCode).exportFrom(exportFrom).originTsPosition(originTsPosition)
+                .exportClauseType(ArkExport_1.ExportType.UNKNOWN).exportClauseName((0, StringUtils_1.cloneText)(element.name.text))
+                .exportFrom(exportFrom).originFullPosition(originFullPosition)
                 .declaringArkFile(arkFile)
                 .setLeadingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), true))
                 .setTrailingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), false))
                 .modifiers(modifier);
             if (element.propertyName && ohos_typescript_1.default.isIdentifier(element.propertyName)) {
-                builder.nameBeforeAs(element.propertyName.text);
+                builder.nameBeforeAs((0, StringUtils_1.cloneText)(element.propertyName.text));
             }
             exportInfos.push(builder.build());
         });
@@ -94,14 +94,14 @@ function buildExportDeclaration(node, sourceFile, arkFile) {
     }
     let builder1 = new ArkExport_1.ExportInfo.Builder()
         .exportClauseType(ArkExport_1.ExportType.UNKNOWN).nameBeforeAs(TSConst_1.ALL)
-        .modifiers(modifiers).tsSourceCode(tsSourceCode)
+        .modifiers(modifiers)
         .exportFrom(exportFrom).declaringArkFile(arkFile)
         .setLeadingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), true))
         .setTrailingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), false))
-        .originTsPosition(originTsPosition);
+        .originFullPosition(originFullPosition);
     if (node.exportClause && ohos_typescript_1.default.isNamespaceExport(node.exportClause) && ohos_typescript_1.default.isIdentifier(node.exportClause.name)) {
         // just like: export * as xx from './yy'
-        exportInfos.push(builder1.exportClauseName(node.exportClause.name.text).build());
+        exportInfos.push(builder1.exportClauseName((0, StringUtils_1.cloneText)(node.exportClause.name.text)).build());
     }
     else if (!node.exportClause && node.moduleSpecifier) {
         // just like: export * from './yy'
@@ -116,8 +116,7 @@ function buildExportAssignment(node, sourceFile, arkFile) {
     if (!node.expression) {
         return exportInfos;
     }
-    const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
-    const tsSourceCode = node.getText(sourceFile);
+    const originFullPosition = Position_1.FullPosition.buildFromNode(node, sourceFile);
     let modifiers = (0, builderUtils_1.buildModifiers)(node);
     if (isKeyword(node.getChildren(sourceFile), ohos_typescript_1.default.SyntaxKind.DefaultKeyword) || node.isExportEquals) {
         modifiers |= ArkBaseModel_1.ModifierType.DEFAULT;
@@ -125,8 +124,7 @@ function buildExportAssignment(node, sourceFile, arkFile) {
     let exportInfo = new ArkExport_1.ExportInfo.Builder()
         .exportClauseType(ArkExport_1.ExportType.UNKNOWN)
         .modifiers(modifiers)
-        .tsSourceCode(tsSourceCode)
-        .originTsPosition(originTsPosition)
+        .originFullPosition(originFullPosition)
         .declaringArkFile(arkFile)
         .exportClauseName(TSConst_1.DEFAULT)
         .setLeadingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), true))
@@ -137,11 +135,11 @@ function buildExportAssignment(node, sourceFile, arkFile) {
     }
     if (ohos_typescript_1.default.isIdentifier(node.expression)) {
         // just like: export default xx
-        exportInfo.nameBeforeAs(node.expression.text);
+        exportInfo.nameBeforeAs((0, StringUtils_1.cloneText)(node.expression.text));
     }
     else if (ohos_typescript_1.default.isAsExpression(node.expression)) {
         // just like: export default xx as YY
-        exportInfo.nameBeforeAs(node.expression.expression.getText(sourceFile));
+        exportInfo.nameBeforeAs((0, StringUtils_1.cloneText)(node.expression.expression.getText(sourceFile)));
     }
     exportInfos.push(exportInfo.build());
     return exportInfos;
@@ -155,16 +153,14 @@ exports.buildExportAssignment = buildExportAssignment;
  */
 function buildExportVariableStatement(node, sourceFile, arkFile, namespace) {
     let exportInfos = [];
-    const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
+    const originFullPosition = Position_1.FullPosition.buildFromNode(node, sourceFile);
     const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node) : 0;
-    const tsSourceCode = node.getText(sourceFile);
     node.declarationList.declarations.forEach(dec => {
         const exportInfoBuilder = new ArkExport_1.ExportInfo.Builder()
-            .exportClauseName(dec.name.getText(sourceFile))
+            .exportClauseName((0, StringUtils_1.cloneText)(dec.name.getText(sourceFile)))
             .exportClauseType(ArkExport_1.ExportType.LOCAL)
             .modifiers(modifiers)
-            .tsSourceCode(tsSourceCode)
-            .originTsPosition(originTsPosition)
+            .originFullPosition(originFullPosition)
             .declaringArkFile(arkFile);
         if (namespace) {
             exportInfoBuilder.declaringArkNamespace(namespace);
@@ -182,16 +178,14 @@ exports.buildExportVariableStatement = buildExportVariableStatement;
  */
 function buildExportTypeAliasDeclaration(node, sourceFile, arkFile) {
     let exportInfos = [];
-    const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
+    const originFullPosition = Position_1.FullPosition.buildFromNode(node, sourceFile);
     let modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node) : 0;
     modifiers |= ArkBaseModel_1.ModifierType.TYPE;
-    const tsSourceCode = node.getText(sourceFile);
     const exportInfo = new ArkExport_1.ExportInfo.Builder()
-        .exportClauseName(node.name.text)
+        .exportClauseName((0, StringUtils_1.cloneText)(node.name.text))
         .exportClauseType(ArkExport_1.ExportType.TYPE)
-        .tsSourceCode(tsSourceCode)
         .modifiers(modifiers)
-        .originTsPosition(originTsPosition)
+        .originFullPosition(originFullPosition)
         .declaringArkFile(arkFile)
         .build();
     exportInfos.push(exportInfo);

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;AAUzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GAAG,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EACpJ,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,GAAG,EAAE,QAAQ,GACd,QAAQ,CAoDV;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,CAmBjI;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CA+B7H"}
+{"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;AAWzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GAAG,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EACpJ,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,GAAG,EAAE,QAAQ,GACd,QAAQ,CAmDV;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,CAkBjI;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CA8B7H"}

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

@@ -45,6 +45,7 @@ const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkField_1 = require("../ArkField");
 const logger_1 = __importStar(require("../../../utils/logger"));
 const builderUtils_1 = require("./builderUtils");
+const StringUtils_1 = require("../../common/StringUtils");
 const ArkSignature_1 = require("../ArkSignature");
 const Type_1 = require("../../base/Type");
 const Position_1 = require("../../base/Position");
@@ -54,31 +55,30 @@ const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER,
 function buildProperty2ArkField(member, sourceFile, cls) {
     let field = new ArkField_1.ArkField();
     field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
-    field.setCode(member.getText(sourceFile));
     field.setDeclaringArkClass(cls);
-    field.setOriginPosition(Position_1.LineColPosition.buildFromNode(member, sourceFile));
-    let fieldName = member.getText(sourceFile);
+    field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
+    let fieldName = (0, StringUtils_1.cloneText)(member.getText(sourceFile));
     if (member.name && ohos_typescript_1.default.isComputedPropertyName(member.name)) {
         if (ohos_typescript_1.default.isIdentifier(member.name.expression)) {
-            fieldName = member.name.expression.text;
+            fieldName = (0, StringUtils_1.cloneText)(member.name.expression.text);
         }
         else if (ohos_typescript_1.default.isPropertyAccessExpression(member.name.expression)) {
             fieldName = (0, builderUtils_1.handlePropertyAccessExpression)(member.name.expression);
         }
         else {
-            logger.warn(`Other property expression type found: ${member.name.expression.getText()}!`);
+            logger.warn(`Other property expression type found: ${(0, StringUtils_1.cloneText)(member.name.expression.getText())}!`);
         }
     }
     else if (member.name && (ohos_typescript_1.default.isIdentifier(member.name) || ohos_typescript_1.default.isLiteralExpression(member.name))) {
-        fieldName = member.name.text;
+        fieldName = (0, StringUtils_1.cloneText)(member.name.text);
     }
     else if (member.name && ohos_typescript_1.default.isPrivateIdentifier(member.name)) {
-        let propertyName = member.name.text;
+        let propertyName = (0, StringUtils_1.cloneText)(member.name.text);
         fieldName = propertyName.substring(1);
         field.addModifier(ArkBaseModel_1.ModifierType.PRIVATE);
     }
     else {
-        logger.warn(`Other type of property name found: ${member.getText()}!`);
+        logger.warn(`Other type of property name found: ${(0, StringUtils_1.cloneText)(member.getText())}!`);
     }
     let fieldType = Type_1.UnknownType.getInstance();
     if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {
@@ -107,15 +107,14 @@ function buildProperty2ArkField(member, sourceFile, cls) {
 exports.buildProperty2ArkField = buildProperty2ArkField;
 function buildIndexSignature2ArkField(member, sourceFile, cls) {
     const field = new ArkField_1.ArkField();
-    field.setCode(member.getText(sourceFile));
     field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
     field.setDeclaringArkClass(cls);
-    field.setOriginPosition(Position_1.LineColPosition.buildFromNode(member, sourceFile));
+    field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
     if (member.modifiers) {
         let modifier = (0, builderUtils_1.buildModifiers)(member);
         field.addModifier(modifier);
     }
-    const fieldName = '[' + member.parameters[0].getText(sourceFile) + ']';
+    const fieldName = '[' + (0, StringUtils_1.cloneText)(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);
@@ -127,23 +126,22 @@ function buildGetAccessor2ArkField(member, mthd, sourceFile) {
     let cls = mthd.getDeclaringArkClass();
     let field = new ArkField_1.ArkField();
     field.setDeclaringArkClass(cls);
-    field.setCode(member.getText(sourceFile));
     field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
-    field.setOriginPosition(Position_1.LineColPosition.buildFromNode(member, sourceFile));
-    let fieldName = member.getText(sourceFile);
+    field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
+    let fieldName = (0, StringUtils_1.cloneText)(member.getText(sourceFile));
     if (ohos_typescript_1.default.isIdentifier(member.name) || ohos_typescript_1.default.isLiteralExpression(member.name)) {
-        fieldName = member.name.text;
+        fieldName = (0, StringUtils_1.cloneText)(member.name.text);
     }
     else if (ohos_typescript_1.default.isComputedPropertyName(member.name)) {
         if (ohos_typescript_1.default.isIdentifier(member.name.expression)) {
-            let propertyName = member.name.expression.text;
+            let propertyName = (0, StringUtils_1.cloneText)(member.name.expression.text);
             fieldName = propertyName;
         }
         else if (ohos_typescript_1.default.isPropertyAccessExpression(member.name.expression)) {
             fieldName = (0, builderUtils_1.handlePropertyAccessExpression)(member.name.expression);
         }
         else if (ohos_typescript_1.default.isLiteralExpression(member.name.expression)) {
-            fieldName = member.name.expression.text;
+            fieldName = (0, StringUtils_1.cloneText)(member.name.expression.text);
         }
         else {
             logger.warn('Other type of computed property name found!');

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

@@ -7,4 +7,23 @@ export declare const notStmtOrExprKind: string[];
  * @returns
  */
 export declare function buildArkFileFromFile(absoluteFilePath: string, projectDir: string, arkFile: ArkFile, projectName: string): void;
+/**
+ * Lightweight entry of building ImportInfo/ExportInfo on ArkFile without building ArkClass/ArkMethod/ArkNamespace/ArkBody.
+ *
+ * @param arkFile
+ * @returns
+ */
+export declare function buildImportExportInfoFromFile(arkFile: ArkFile): void;
+/**
+ * Signatures-only upgrade entry: builds ArkClass/ArkMethod/ArkNamespace signatures on top of an
+ * ArkFile whose ImportInfo/ExportInfo were already populated (e.g. by {@link buildImportExportInfoFromFile}).
+ *
+ * Unlike {@link buildArkFileFromFile}, this function calls {@link buildArkFile} with
+ * `skipImportExport = true`, so existing import/export data is preserved and not re-parsed. This
+ * avoids duplicating `export *` re-export entries whose temp clause keys are process-level
+ * auto-increment values that cannot be overwritten by `Map.set`.
+ *
+ * @param arkFile - The ArkFile to upgrade. Must already have filePath set.
+ */
+export declare function buildArkFileSignaturesFromFile(arkFile: ArkFile): void;
 //# sourceMappingURL=ArkFileBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAwB/C,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAoB9H"}
+{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAyB/C,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CA0B9H;AAiHD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWpE;AAgCD;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAcrE"}