arkanalyzer 1.0.86 → 1.0.87

package/lib/core/base/Type.js

@@ -23,8 +23,46 @@ const TSConst_1 = require("../common/TSConst");
  * @category core/base/type
  */
 class Type {
+    /** True if this type can contain other types and thus participate in cycles */
+    canParticipateInCycle() {
+        return false;
+    }
+    /**
+     * Returns a short display name for this type when used as a cycle back-reference.
+     * Override in named types (AliasType, ClassType, GenericType, UnclearReferenceType)
+     * to return the type name; default returns UNKNOWN_KEYWORD for anonymous types.
+     */
+    getDisplayNameForCycle() {
+        return TSConst_1.UNKNOWN_KEYWORD;
+    }
     toString() {
-        return this.getTypeString();
+        return this.toStringWithVisited(new Set());
+    }
+    /**
+     * Converts type to string with cycle detection. Use when recursing into child types.
+     * Only container types are tracked in visited. We add on enter and remove on leave
+     * so that the same type in different branches (e.g. UnionType(A|B) where both use
+     * NumberType) is not falsely detected as a cycle.
+     * When a cycle is detected, returns the type's display name (e.g. A for AliasType)
+     * instead of a generic placeholder.
+     * @internal Package-internal use only. Prefer toString() for public API.
+     * @param visited Set of container types in the recursion path; omitted or undefined uses a new empty set (same root semantics as {@link toString}).
+     */
+    toStringWithVisited(visited = new Set()) {
+        if (this.canParticipateInCycle() && visited.has(this)) {
+            return this.getDisplayNameForCycle();
+        }
+        if (this.canParticipateInCycle()) {
+            visited.add(this);
+        }
+        try {
+            return this.getTypeString(visited);
+        }
+        finally {
+            if (this.canParticipateInCycle()) {
+                visited.delete(this);
+            }
+        }
     }
 }
 exports.Type = Type;
@@ -39,7 +77,7 @@ class AnyType extends Type {
     constructor() {
         super();
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return TSConst_1.ANY_KEYWORD;
     }
 }
@@ -56,7 +94,7 @@ class UnknownType extends Type {
     constructor() {
         super();
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return TSConst_1.UNKNOWN_KEYWORD;
     }
 }
@@ -67,6 +105,12 @@ UnknownType.INSTANCE = new UnknownType();
  * @category core/base/type
  */
 class UnclearReferenceType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
+    getDisplayNameForCycle() {
+        return this.name;
+    }
     constructor(name, genericTypes = []) {
         super();
         this.name = name;
@@ -78,10 +122,10 @@ class UnclearReferenceType extends Type {
     getGenericTypes() {
         return this.genericTypes;
     }
-    getTypeString() {
+    getTypeString(visited = new Set()) {
         let str = this.name;
         if (this.genericTypes.length > 0) {
-            str += '<' + this.genericTypes.join(',') + '>';
+            str += '<' + this.genericTypes.map(t => t.toStringWithVisited(visited)).join(',') + '>';
         }
         return str;
     }
@@ -99,7 +143,7 @@ class PrimitiveType extends Type {
     getName() {
         return this.name;
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return this.name;
     }
 }
@@ -138,6 +182,10 @@ class BigIntType extends PrimitiveType {
 }
 exports.BigIntType = BigIntType;
 BigIntType.INSTANCE = new BigIntType();
+/**
+ * StringType type
+ * @category core/base/type
+ */
 class StringType extends PrimitiveType {
     constructor() {
         super(TSConst_1.STRING_KEYWORD);
@@ -149,7 +197,7 @@ class StringType extends PrimitiveType {
 exports.StringType = StringType;
 StringType.INSTANCE = new StringType();
 /**
- * null type
+ * Null type in TS/ArkTS, and it also refers to nullptr in Cxx.
  * @category core/base/type
  */
 class NullType extends PrimitiveType {
@@ -188,7 +236,7 @@ class LiteralType extends PrimitiveType {
     getLiteralName() {
         return this.literalName;
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return this.literalName.toString();
     }
 }
@@ -200,6 +248,9 @@ LiteralType.FALSE = new LiteralType(false);
  * @category core/base/type
  */
 class UnionType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
     constructor(types, currType = UnknownType.getInstance()) {
         super();
         this.types = [...types];
@@ -214,14 +265,14 @@ class UnionType extends Type {
     setCurrType(newType) {
         this.currType = newType;
     }
-    getTypeString() {
-        let typesString = [];
+    getTypeString(visited = new Set()) {
+        const typesString = [];
         this.getTypes().forEach(t => {
             if (t instanceof UnionType || t instanceof IntersectionType) {
-                typesString.push(`(${t.toString()})`);
+                typesString.push(`(${t.toStringWithVisited(visited)})`);
             }
             else {
-                typesString.push(t.toString());
+                typesString.push(t.toStringWithVisited(visited));
             }
         });
         return typesString.join('|');
@@ -246,6 +297,9 @@ exports.UnionType = UnionType;
  * @category core/base/type
  */
 class IntersectionType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
     constructor(types) {
         super();
         this.types = [...types];
@@ -253,14 +307,14 @@ class IntersectionType extends Type {
     getTypes() {
         return this.types;
     }
-    getTypeString() {
-        let typesString = [];
+    getTypeString(visited = new Set()) {
+        const typesString = [];
         this.getTypes().forEach(t => {
             if (t instanceof UnionType || t instanceof IntersectionType) {
-                typesString.push(`(${t.toString()})`);
+                typesString.push(`(${t.toStringWithVisited(visited)})`);
             }
             else {
-                typesString.push(t.toString());
+                typesString.push(t.toStringWithVisited(visited));
             }
         });
         return typesString.join('&');
@@ -278,12 +332,16 @@ class VoidType extends Type {
     constructor() {
         super();
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return TSConst_1.VOID_KEYWORD;
     }
 }
 exports.VoidType = VoidType;
 VoidType.INSTANCE = new VoidType();
+/**
+ * NeverType type
+ * @category core/base/type
+ */
 class NeverType extends Type {
     static getInstance() {
         return this.INSTANCE;
@@ -291,7 +349,7 @@ class NeverType extends Type {
     constructor() {
         super();
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return TSConst_1.NEVER_KEYWORD;
     }
 }
@@ -302,6 +360,9 @@ NeverType.INSTANCE = new NeverType();
  * @category core/base/type
  */
 class FunctionType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
     constructor(methodSignature, realGenericTypes) {
         super();
         this.methodSignature = methodSignature;
@@ -313,8 +374,14 @@ class FunctionType extends Type {
     getRealGenericTypes() {
         return this.realGenericTypes;
     }
-    getTypeString() {
-        return this.methodSignature.toString();
+    getTypeString(visited = new Set()) {
+        const sig = this.methodSignature.getMethodSubSignature();
+        const classStr = this.methodSignature.getDeclaringClassSignature().toString();
+        const paramStrs = sig.getParameterTypes()
+            .map(t => t ? t.toStringWithVisited(visited) : UnknownType.getInstance().toString())
+            .join(', ');
+        const methodPart = (sig.isStatic() ? '[static]' : '') + sig.getMethodName() + '(' + paramStrs + ')';
+        return classStr + '.' + methodPart;
     }
 }
 exports.FunctionType = FunctionType;
@@ -330,16 +397,22 @@ class ClosureType extends FunctionType {
     getLexicalEnv() {
         return this.lexicalEnv;
     }
-    getTypeString() {
-        return 'closures: ' + super.getTypeString();
+    getTypeString(visited = new Set()) {
+        return 'closures: ' + super.getTypeString(visited);
     }
 }
 exports.ClosureType = ClosureType;
 /**
- * type of an object
+ * type of object
  * @category core/base/type
  */
 class ClassType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
+    getDisplayNameForCycle() {
+        return this.classSignature.toString();
+    }
     constructor(classSignature, realGenericTypes) {
         super();
         this.classSignature = classSignature;
@@ -357,12 +430,10 @@ class ClassType extends Type {
     setRealGenericTypes(types) {
         this.realGenericTypes = types;
     }
-    getTypeString() {
-        var _a;
+    getTypeString(visited = new Set()) {
         let temp = this.classSignature.toString();
-        let generic = (_a = this.realGenericTypes) === null || _a === void 0 ? void 0 : _a.join(',');
-        if (generic) {
-            temp += `<${generic}>`;
+        if (this.realGenericTypes && this.realGenericTypes.length > 0) {
+            temp += `<${this.realGenericTypes.map(t => t.toStringWithVisited(visited)).join(',')}>`;
         }
         return temp;
     }
@@ -382,6 +453,9 @@ exports.ClassType = ClassType;
  ```
  */
 class ArrayType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
     constructor(baseType, dimension) {
         super();
         this.baseType = baseType;
@@ -406,16 +480,18 @@ class ArrayType extends Type {
     getReadonlyFlag() {
         return this.readonlyFlag;
     }
-    getTypeString() {
+    getTypeString(visited = new Set()) {
         const strs = [];
         if (this.getReadonlyFlag()) {
             strs.push('readonly ');
         }
-        if (this.baseType instanceof UnionType || this.baseType instanceof IntersectionType) {
-            strs.push('(' + this.baseType.toString() + ')');
-        }
-        else if (this.baseType) {
-            strs.push(this.baseType.toString());
+        if (this.baseType) {
+            if (this.baseType instanceof UnionType || this.baseType instanceof IntersectionType) {
+                strs.push('(' + this.baseType.toStringWithVisited(visited) + ')');
+            }
+            else {
+                strs.push(this.baseType.toStringWithVisited(visited));
+            }
         }
         for (let i = 0; i < this.dimension; i++) {
             strs.push('[]');
@@ -438,6 +514,9 @@ exports.ArrayType = ArrayType;
  ```
  */
 class TupleType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
     constructor(types) {
         super();
         this.types = types;
@@ -451,11 +530,12 @@ class TupleType extends Type {
     getReadonlyFlag() {
         return this.readonlyFlag;
     }
-    getTypeString() {
+    getTypeString(visited = new Set()) {
+        const typesStr = this.types.map(t => t.toStringWithVisited(visited)).join(', ');
         if (this.getReadonlyFlag()) {
-            return 'readonly [' + this.types.join(', ') + ']';
+            return 'readonly [' + typesStr + ']';
         }
-        return '[' + this.types.join(', ') + ']';
+        return '[' + typesStr + ']';
     }
 }
 exports.TupleType = TupleType;
@@ -478,6 +558,12 @@ exports.TupleType = TupleType;
  ```
  */
 class AliasType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
+    getDisplayNameForCycle() {
+        return this.name;
+    }
     constructor(name, originalType, signature, genericTypes) {
         super();
         this.name = name;
@@ -494,12 +580,15 @@ class AliasType extends Type {
     getOriginalType() {
         return this.originalType;
     }
-    getTypeString() {
-        var _a, _b, _c;
-        let res = this.getSignature().toString();
-        let generic = (_b = (_a = this.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.join(',')) !== null && _b !== void 0 ? _b : (_c = this.getGenericTypes()) === null || _c === void 0 ? void 0 : _c.join(',');
-        if (generic) {
-            res += `<${generic}>`;
+    getTypeString(visited = new Set()) {
+        let res = this.getSignature().toString(visited);
+        const realGeneric = this.getRealGenericTypes();
+        const generic = this.getGenericTypes();
+        if (realGeneric && realGeneric.length > 0) {
+            res += `<${realGeneric.map(t => t.toStringWithVisited(visited)).join(',')}>`;
+        }
+        else if (generic && generic.length > 0) {
+            res += `<${generic.map(gt => gt.toStringWithVisited(visited)).join(',')}>`;
         }
         return res;
     }
@@ -550,6 +639,12 @@ class AliasType extends Type {
 }
 exports.AliasType = AliasType;
 class GenericType extends Type {
+    canParticipateInCycle() {
+        return true;
+    }
+    getDisplayNameForCycle() {
+        return this.name;
+    }
     constructor(name, defaultType, constraint) {
         super();
         this.index = 0;
@@ -579,13 +674,13 @@ class GenericType extends Type {
         var _a;
         return (_a = this.index) !== null && _a !== void 0 ? _a : 0;
     }
-    getTypeString() {
+    getTypeString(visited = new Set()) {
         let str = this.name;
         if (this.constraint) {
-            str += ' extends ' + this.constraint.toString();
+            str += ' extends ' + this.constraint.toStringWithVisited(visited);
         }
         if (this.defaultType) {
-            str += ' = ' + this.defaultType.toString();
+            str += ' = ' + this.defaultType.toStringWithVisited(visited);
         }
         return str;
     }
@@ -599,7 +694,7 @@ class AnnotationType extends Type {
     getOriginType() {
         return this.originType;
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return this.originType;
     }
 }
@@ -647,7 +742,7 @@ class LexicalEnvType extends Type {
     addClosure(closure) {
         this.closures.push(closure);
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return `[${this.getClosures().join(', ')}]`;
     }
 }
@@ -664,7 +759,7 @@ class EnumValueType extends Type {
     getConstant() {
         return this.constant;
     }
-    getTypeString() {
+    getTypeString(_visited) {
         return this.signature.toString();
     }
 }

package/lib/core/common/ArkError.d.ts

@@ -1,15 +1,39 @@
 export declare enum ArkErrorCode {
     OK = 0,
-    CLASS_INSTANCE_FIELD_UNDEFINDED = -1,
+    CLASS_INSTANCE_FIELD_UNDEFINED = -1,
     BB_MORE_THAN_ONE_BRANCH_RET_STMT = -2,
     BB_BRANCH_RET_STMT_NOT_AT_END = -3,
     CFG_NOT_FOUND_START_BLOCK = -4,
     CFG_HAS_UNREACHABLE_BLOCK = -5,
     METHOD_SIGNATURE_UNDEFINED = -6,
-    METHOD_SIGNATURE_LINE_UNMATCHED = -7
+    METHOD_SIGNATURE_LINE_UNMATCHED = -7,
+    /** CLI: invalid flag value or unsupported option */
+    CLI_INVALID_OPTION = -8,
+    /** CLI: method reference matches more than one method */
+    CLI_AMBIGUOUS_METHOD_REF = -9,
+    /** CLI: entry method could not be resolved */
+    CLI_ENTRY_METHOD_NOT_FOUND = -10
 }
 export interface ArkError {
     errCode: ArkErrorCode;
     errMsg?: string;
 }
+/**
+ * Error thrown by ArkAnalyzer when reporting a structured {@link ArkError}.
+ * Static helpers produce unified console text for operators.
+ */
+export declare class ArkAnalyzerError extends Error {
+    readonly arkError: ArkError;
+    constructor(arkError: ArkError);
+    getErrCode(): number;
+    toString(): string;
+    /** Resolve numeric {@link ArkErrorCode} to its enum member name for display. */
+    private static getArkErrorCodeName;
+    /**
+     * Human-readable stderr format for operators:
+     * `arkanalyzer: error: [<code>] (<errCode>) <message>`
+     * Multi-line `errMsg` is printed on following lines, each prefixed with `arkanalyzer: error: | `.
+     */
+    private static formatArkErrorConsole;
+}
 //# sourceMappingURL=ArkError.d.ts.map

package/lib/core/common/ArkError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkError.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkError.ts"],"names":[],"mappings":"AAeA,oBAAY,YAAY;IACpB,EAAE,IAAI;IACN,+BAA+B,KAAK;IACpC,gCAAgC,KAAK;IACrC,6BAA6B,KAAK;IAClC,yBAAyB,KAAK;IAC9B,yBAAyB,KAAK;IAC9B,0BAA0B,KAAK;IAC/B,+BAA+B,KAAK;CACvC;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"ArkError.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkError.ts"],"names":[],"mappings":"AAeA,oBAAY,YAAY;IACpB,EAAE,IAAI;IACN,8BAA8B,KAAK;IACnC,gCAAgC,KAAK;IACrC,6BAA6B,KAAK;IAClC,yBAAyB,KAAK;IAC9B,yBAAyB,KAAK;IAC9B,0BAA0B,KAAK;IAC/B,+BAA+B,KAAK;IACpC,oDAAoD;IACpD,kBAAkB,KAAK;IACvB,yDAAyD;IACzD,wBAAwB,KAAK;IAC7B,8CAA8C;IAC9C,0BAA0B,MAAM;CACnC;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACvC,SAAgB,QAAQ,EAAE,QAAQ,CAAC;gBAEvB,QAAQ,EAAE,QAAQ;IAO9B,UAAU,IAAI,MAAM;IAIX,QAAQ,IAAI,MAAM;IAI3B,gFAAgF;IAChF,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAKlC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;CAmBvC"}

package/lib/core/common/ArkError.js

@@ -14,15 +14,69 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkErrorCode = void 0;
+exports.ArkAnalyzerError = exports.ArkErrorCode = void 0;
 var ArkErrorCode;
 (function (ArkErrorCode) {
     ArkErrorCode[ArkErrorCode["OK"] = 0] = "OK";
-    ArkErrorCode[ArkErrorCode["CLASS_INSTANCE_FIELD_UNDEFINDED"] = -1] = "CLASS_INSTANCE_FIELD_UNDEFINDED";
+    ArkErrorCode[ArkErrorCode["CLASS_INSTANCE_FIELD_UNDEFINED"] = -1] = "CLASS_INSTANCE_FIELD_UNDEFINED";
     ArkErrorCode[ArkErrorCode["BB_MORE_THAN_ONE_BRANCH_RET_STMT"] = -2] = "BB_MORE_THAN_ONE_BRANCH_RET_STMT";
     ArkErrorCode[ArkErrorCode["BB_BRANCH_RET_STMT_NOT_AT_END"] = -3] = "BB_BRANCH_RET_STMT_NOT_AT_END";
     ArkErrorCode[ArkErrorCode["CFG_NOT_FOUND_START_BLOCK"] = -4] = "CFG_NOT_FOUND_START_BLOCK";
     ArkErrorCode[ArkErrorCode["CFG_HAS_UNREACHABLE_BLOCK"] = -5] = "CFG_HAS_UNREACHABLE_BLOCK";
     ArkErrorCode[ArkErrorCode["METHOD_SIGNATURE_UNDEFINED"] = -6] = "METHOD_SIGNATURE_UNDEFINED";
     ArkErrorCode[ArkErrorCode["METHOD_SIGNATURE_LINE_UNMATCHED"] = -7] = "METHOD_SIGNATURE_LINE_UNMATCHED";
+    /** CLI: invalid flag value or unsupported option */
+    ArkErrorCode[ArkErrorCode["CLI_INVALID_OPTION"] = -8] = "CLI_INVALID_OPTION";
+    /** CLI: method reference matches more than one method */
+    ArkErrorCode[ArkErrorCode["CLI_AMBIGUOUS_METHOD_REF"] = -9] = "CLI_AMBIGUOUS_METHOD_REF";
+    /** CLI: entry method could not be resolved */
+    ArkErrorCode[ArkErrorCode["CLI_ENTRY_METHOD_NOT_FOUND"] = -10] = "CLI_ENTRY_METHOD_NOT_FOUND";
 })(ArkErrorCode = exports.ArkErrorCode || (exports.ArkErrorCode = {}));
+/**
+ * Error thrown by ArkAnalyzer when reporting a structured {@link ArkError}.
+ * Static helpers produce unified console text for operators.
+ */
+class ArkAnalyzerError extends Error {
+    constructor(arkError) {
+        var _a;
+        super((_a = arkError.errMsg) !== null && _a !== void 0 ? _a : `ArkErrorCode(${arkError.errCode})`);
+        this.name = 'ArkAnalyzerError';
+        this.arkError = arkError;
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+    getErrCode() {
+        return this.arkError.errCode;
+    }
+    toString() {
+        return ArkAnalyzerError.formatArkErrorConsole(this.arkError);
+    }
+    /** Resolve numeric {@link ArkErrorCode} to its enum member name for display. */
+    static getArkErrorCodeName(errCode) {
+        const name = ArkErrorCode[errCode];
+        return typeof name === 'string' ? name : `UNKNOWN_${errCode}`;
+    }
+    /**
+     * Human-readable stderr format for operators:
+     * `arkanalyzer: error: [<code>] (<errCode>) <message>`
+     * Multi-line `errMsg` is printed on following lines, each prefixed with `arkanalyzer: error: | `.
+     */
+    static formatArkErrorConsole(arkError) {
+        var _a;
+        const code = ArkAnalyzerError.getArkErrorCodeName(arkError.errCode);
+        const errCode = arkError.errCode;
+        const message = (_a = arkError.errMsg) !== null && _a !== void 0 ? _a : '';
+        const head = `arkanalyzer: error: [${code}] (${errCode})`;
+        if (!message) {
+            return head;
+        }
+        if (!message.includes('\n')) {
+            return `${head} ${message}`;
+        }
+        const body = message
+            .split('\n')
+            .map((line) => `arkanalyzer: error: | ${line}`)
+            .join('\n');
+        return `${head}\n${body}`;
+    }
+}
+exports.ArkAnalyzerError = ArkAnalyzerError;

package/lib/core/common/ArkIRTransformer.d.ts

@@ -1,4 +1,4 @@
-import { BinaryOperator, UnaryOperator } from '../base/Expr';
+import { AliasTypeExpr, BinaryOperator, UnaryOperator } from '../base/Expr';
 import { GlobalRef } from '../base/Ref';
 import { Value } from '../base/Value';
 import * as ts from 'ohos-typescript';
@@ -7,6 +7,7 @@ import { ArkAliasTypeDefineStmt, Stmt } from '../base/Stmt';
 import { AliasType } from '../base/Type';
 import { ArkMethod } from '../model/ArkMethod';
 import { FullPosition } from '../base/Position';
+import { ArkValueTransformer } from './ArkValueTransformer';
 export type ValueAndStmts = {
     value: Value;
     valueOriginalPositions: FullPosition[];
@@ -22,12 +23,12 @@ export declare class ArkIRTransformer {
     static readonly DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT: string;
     static readonly DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT: string;
     static readonly DUMMY_CONDITIONAL_OPERATOR_END_STMT: string;
-    private sourceFile;
-    private declaringMethod;
-    private inBuilderMethod;
-    private builderMethodContextFlag;
-    private stmtsHaveOriginalText;
-    private arkValueTransformer;
+    protected sourceFile: ts.SourceFile;
+    protected declaringMethod: ArkMethod;
+    protected inBuilderMethod: boolean;
+    protected builderMethodContextFlag: boolean;
+    protected stmtsHaveOriginalText: Set<Stmt>;
+    protected arkValueTransformer: ArkValueTransformer;
     constructor(sourceFile: ts.SourceFile, declaringMethod: ArkMethod);
     getLocals(): Set<Local>;
     getGlobals(): Map<string, GlobalRef> | null;
@@ -36,8 +37,8 @@ export declare class ArkIRTransformer {
     prebuildStmts(): Stmt[];
     tsNodeToStmts(node: ts.Node): Stmt[];
     tsNodeToValueAndStmts(node: ts.Node): ValueAndStmts;
-    private functionDeclarationToStmts;
-    private classDeclarationToStmts;
+    protected functionDeclarationToStmts(functionDeclarationNode: ts.FunctionDeclaration): Stmt[];
+    protected classDeclarationToStmts(node: ts.ClassDeclaration): Stmt[];
     private parameterPropertyToStmts;
     private parameterToStmts;
     private returnStatementToStmts;
@@ -46,7 +47,7 @@ export declare class ArkIRTransformer {
     private addInvokeStmts;
     private shouldGenerateExtraAssignStmt;
     private typeAliasDeclarationToStmts;
-    private generateAliasTypeExpr;
+    protected generateAliasTypeExpr(rightOp: ts.TypeNode, aliasType: AliasType): AliasTypeExpr;
     private resolveImportTypeNode;
     switchStatementToValueAndStmts(switchStatement: ts.SwitchStatement): ValueAndStmts[];
     private forStatementToStmts;

package/lib/core/common/ArkIRTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkIRTransformer.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkIRTransformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ArkIRTransformer.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkIRTransformer.ts"],"names":[],"mappings":"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"}

package/lib/core/common/ArkIRTransformer.js

@@ -267,7 +267,7 @@ class ArkIRTransformer {
         if (paramLocal === undefined) {
             return stmts;
         }
-        const { value: paramInitValue, valueOriginalPositions: paramInitPositions, stmts: paramInitStmts, } = this.tsNodeToValueAndStmts(paramNode.initializer);
+        const { value: paramInitValue, valueOriginalPositions: paramInitPositions, stmts: paramInitStmts } = this.tsNodeToValueAndStmts(paramNode.initializer);
         stmts.push(...paramInitStmts);
         const ifStmt = new Stmt_1.ArkIfStmt(new Expr_1.ArkConditionExpr(paramLocal, ValueUtil_1.ValueUtil.getUndefinedConst(), Expr_1.RelationalBinaryOperator.Equality));
         ifStmt.setOperandOriginalPositions([Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT]);