arkanalyzer 1.0.87 → 1.0.88

package/lib/core/model/ArkMetadata.js

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumInitTypeUserMetadata = exports.CommentsMetadata = exports.ArkMetadata = exports.ArkMetadataKind = void 0;
+exports.EnumInitTypeUserMetadata = exports.JSDocMetadata = exports.CommentsMetadata = exports.ArkMetadata = exports.ArkMetadataKind = void 0;
 var ArkMetadataKind;
 (function (ArkMetadataKind) {
     ArkMetadataKind[ArkMetadataKind["LEADING_COMMENTS"] = 0] = "LEADING_COMMENTS";
     ArkMetadataKind[ArkMetadataKind["TRAILING_COMMENTS"] = 1] = "TRAILING_COMMENTS";
-    ArkMetadataKind[ArkMetadataKind["ENUM_INIT_TYPE_USER"] = 2] = "ENUM_INIT_TYPE_USER";
+    ArkMetadataKind[ArkMetadataKind["JSDOC"] = 2] = "JSDOC";
+    ArkMetadataKind[ArkMetadataKind["ENUM_INIT_TYPE_USER"] = 3] = "ENUM_INIT_TYPE_USER";
 })(ArkMetadataKind = exports.ArkMetadataKind || (exports.ArkMetadataKind = {}));
 /**
  * ArkMetadata
@@ -54,6 +55,31 @@ class CommentsMetadata {
     }
 }
 exports.CommentsMetadata = CommentsMetadata;
+class JSDocMetadata {
+    constructor(description, params, tags = [], returns = [], throws = []) {
+        this.description = description;
+        this.params = params;
+        this.tags = tags;
+        this.returns = returns;
+        this.throws = throws;
+    }
+    getDescription() {
+        return this.description;
+    }
+    getParams() {
+        return this.params;
+    }
+    getTags() {
+        return this.tags;
+    }
+    getReturns() {
+        return this.returns;
+    }
+    getThrows() {
+        return this.throws;
+    }
+}
+exports.JSDocMetadata = JSDocMetadata;
 class EnumInitTypeUserMetadata {
     constructor(originTypeUser) {
         this.originTypeUser = originTypeUser;

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

@@ -0,0 +1,21 @@
+import ts from 'ohos-typescript';
+import { SceneOptions } from '../../../Config';
+import { Stmt } from '../../base/Stmt';
+import { ArkBaseModel } from '../ArkBaseModel';
+import { CommentsMetadata, JSDocMetadata } from '../ArkMetadata';
+export declare class ArkMetadataBuilder {
+    private static readonly PARAM_TAG_REGEX;
+    private static readonly RETURNS_TAG_REGEX;
+    private static readonly THROWS_TAG_REGEX;
+    private static readonly GENERIC_TAG_REGEX;
+    static setComments(metadata: Stmt | ArkBaseModel, node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): void;
+    static getCommentsMetadata(node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions, isLeading: boolean): CommentsMetadata;
+    static getJSDocMetadata(node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): JSDocMetadata[];
+    private static parseJSDocContent;
+    private static parseJSDocLine;
+    private static tryParseParam;
+    private static tryParseReturns;
+    private static tryParseThrows;
+    private static tryParseGenericTag;
+}
+//# sourceMappingURL=ArkMetadataBuilder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ArkMetadataBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkMetadataBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAgC,gBAAgB,EAAE,aAAa,EAAiE,MAAM,gBAAgB,CAAC;AAG9J,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAA+D;IACtG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAkD;IAC3F,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAgD;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAwB;WAEnD,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;WAiBjH,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB;WAwB1H,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,aAAa,EAAE;IAmBhH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAmBhC,OAAO,CAAC,MAAM,CAAC,cAAc;IA4B7B,OAAO,CAAC,MAAM,CAAC,aAAa;IAa5B,OAAO,CAAC,MAAM,CAAC,eAAe;IAY9B,OAAO,CAAC,MAAM,CAAC,cAAc;IAY7B,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAUpC"}

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

@@ -0,0 +1,160 @@
+"use strict";
+/*
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArkMetadataBuilder = void 0;
+const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
+const Position_1 = require("../../base/Position");
+const ArkMetadata_1 = require("../ArkMetadata");
+class ArkMetadataBuilder {
+    static setComments(metadata, node, sourceFile, options) {
+        const leadingCommentsMetadata = this.getCommentsMetadata(node, sourceFile, options, true);
+        if (leadingCommentsMetadata.getComments().length > 0) {
+            metadata.setMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS, leadingCommentsMetadata);
+        }
+        const trailingCommentsMetadata = this.getCommentsMetadata(node, sourceFile, options, false);
+        if (trailingCommentsMetadata.getComments().length > 0) {
+            metadata.setMetadata(ArkMetadata_1.ArkMetadataKind.TRAILING_COMMENTS, trailingCommentsMetadata);
+        }
+        const jsDocMetadatas = this.getJSDocMetadata(node, sourceFile, options);
+        if (jsDocMetadatas.length > 0) {
+            metadata.setMetadata(ArkMetadata_1.ArkMetadataKind.JSDOC, jsDocMetadatas);
+        }
+    }
+    static getCommentsMetadata(node, sourceFile, options, isLeading) {
+        const comments = [];
+        if ((isLeading && !options.enableLeadingComments) || (!isLeading && !options.enableTrailingComments)) {
+            return new ArkMetadata_1.CommentsMetadata(comments);
+        }
+        const commentRanges = (isLeading ? ohos_typescript_1.default.getLeadingCommentRanges(sourceFile.text, node.pos) : ohos_typescript_1.default.getTrailingCommentRanges(sourceFile.text, node.end)) || [];
+        const getPosition = (pos, end) => {
+            const start = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, pos);
+            const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, end);
+            return new Position_1.FullPosition(start.line + 1, start.character + 1, endPos.line + 1, endPos.character + 1);
+        };
+        for (const range of commentRanges) {
+            comments.push({
+                content: sourceFile.text.substring(range.pos, range.end).replace(/\r\n/g, '\n'),
+                position: getPosition(range.pos, range.end),
+            });
+        }
+        return new ArkMetadata_1.CommentsMetadata(comments);
+    }
+    static getJSDocMetadata(node, sourceFile, options) {
+        if (!options.enableJSDoc) {
+            return [];
+        }
+        const commentRanges = ohos_typescript_1.default.getLeadingCommentRanges(sourceFile.text, node.pos) || [];
+        const jsDocContents = commentRanges
+            .map(range => sourceFile.text.substring(range.pos, range.end).replace(/\r\n/g, '\n'))
+            .filter(content => content.startsWith('/**'));
+        if (jsDocContents.length === 0) {
+            return [];
+        }
+        const jsDocMetadatas = [];
+        for (const jsDocContent of jsDocContents) {
+            jsDocMetadatas.push(this.parseJSDocContent(jsDocContent));
+        }
+        return jsDocMetadatas;
+    }
+    static parseJSDocContent(content) {
+        const normalizedLines = content
+            .split('\n')
+            .map(line => line.replace(/^\s*\/\*\*?/, '').replace(/\*\/\s*$/, '').replace(/^\s*\*\s?/, '').trim());
+        const descriptionLines = [];
+        const params = [];
+        const tags = [];
+        const returns = [];
+        const throws = [];
+        for (const line of normalizedLines) {
+            this.parseJSDocLine(line, descriptionLines, params, returns, throws, tags);
+        }
+        const description = descriptionLines.join('\n').trim();
+        return new ArkMetadata_1.JSDocMetadata(description, params, tags, returns, throws);
+    }
+    static parseJSDocLine(line, descriptionLines, params, returns, throws, tags) {
+        if (!line) {
+            return;
+        }
+        if (!line.startsWith('@')) {
+            descriptionLines.push(line);
+            return;
+        }
+        if (this.tryParseParam(line, params)) {
+            return;
+        }
+        if (this.tryParseReturns(line, returns)) {
+            return;
+        }
+        if (this.tryParseThrows(line, throws)) {
+            return;
+        }
+        this.tryParseGenericTag(line, tags);
+    }
+    static tryParseParam(line, params) {
+        const match = line.match(ArkMetadataBuilder.PARAM_TAG_REGEX);
+        if (!match) {
+            return false;
+        }
+        params.push({
+            name: match[2],
+            type: match[1].trim(),
+            description: match[3].trim(),
+        });
+        return true;
+    }
+    static tryParseReturns(line, returns) {
+        var _a;
+        const match = line.match(ArkMetadataBuilder.RETURNS_TAG_REGEX);
+        if (!match) {
+            return false;
+        }
+        returns.push({
+            type: (_a = match[1]) === null || _a === void 0 ? void 0 : _a.trim(),
+            description: match[2].trim(),
+        });
+        return true;
+    }
+    static tryParseThrows(line, throws) {
+        var _a;
+        const match = line.match(ArkMetadataBuilder.THROWS_TAG_REGEX);
+        if (!match) {
+            return false;
+        }
+        throws.push({
+            type: (_a = match[1]) === null || _a === void 0 ? void 0 : _a.trim(),
+            description: match[2].trim(),
+        });
+        return true;
+    }
+    static tryParseGenericTag(line, tags) {
+        const match = line.match(ArkMetadataBuilder.GENERIC_TAG_REGEX);
+        if (!match) {
+            return;
+        }
+        tags.push({
+            name: match[1],
+            description: match[2].trim(),
+        });
+    }
+}
+exports.ArkMetadataBuilder = ArkMetadataBuilder;
+ArkMetadataBuilder.PARAM_TAG_REGEX = /^@param\s+\{\s*([^}]+?)\s*\}\s+([^\s-]+)\s*(?:-\s*)?(.*)$/;
+ArkMetadataBuilder.RETURNS_TAG_REGEX = /^@returns?\s*(?:\{\s*([^}]+?)\s*\})?\s*(.*)$/;
+ArkMetadataBuilder.THROWS_TAG_REGEX = /^@throws\s*(?:\{\s*([^}]+?)\s*\})?\s*(.*)$/;
+ArkMetadataBuilder.GENERIC_TAG_REGEX = /^@([^\s]+)\s*(.*)$/;

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":"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"}
+{"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

@@ -161,7 +161,7 @@ function buildMethodName(node, declaringClass, sourceFile, declaringMethod) {
         name = TSConst_1.CONSTRUCTOR_NAME;
     }
     else if (ohos_typescript_1.default.isConstructSignatureDeclaration(node)) {
-        name = 'construct-signature';
+        name = Const_1.CONSTRUCT_SIGNATURE_NAME;
     }
     else if (ohos_typescript_1.default.isCallSignatureDeclaration(node)) {
         name = Const_1.CALL_SIGNATURE_NAME;
@@ -301,7 +301,8 @@ 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.isDefaultArkClass() &&
+        !arkClass.isLibraryClass() &&
         !arkClass.isDeclare());
 }
 exports.needDefaultConstructorInClass = needDefaultConstructorInClass;
@@ -323,10 +324,10 @@ function recursivelyCheckAndBuildSuperConstructor(arkClass, visited = new Set())
 }
 function buildDefaultConstructor(arkClass, visited = new Set()) {
     var _a;
+    recursivelyCheckAndBuildSuperConstructor(arkClass, visited);
     if (!needDefaultConstructorInClass(arkClass)) {
         return false;
     }
-    recursivelyCheckAndBuildSuperConstructor(arkClass, visited);
     const defaultConstructor = new ArkMethod_1.ArkMethod();
     defaultConstructor.setDeclaringArkClass(arkClass);
     defaultConstructor.setCode('');
@@ -487,41 +488,48 @@ function updateMethodSignaturesAndLineCols(method, presentMethod) {
 }
 exports.updateMethodSignaturesAndLineCols = updateMethodSignaturesAndLineCols;
 function replaceSuper2Constructor(constructor) {
-    var _a, _b;
+    var _a, _b, _c;
     if (constructor.getName() !== TSConst_1.CONSTRUCTOR_NAME) {
         return;
     }
+    const startingBlock = (_a = constructor.getBody()) === null || _a === void 0 ? void 0 : _a.getCfg().getStartingBlock();
+    if (startingBlock === undefined) {
+        return;
+    }
+    let superInvokeStmt = null;
+    for (const stmt of startingBlock.getStmts()) {
+        if (stmt instanceof Stmt_1.ArkInvokeStmt) {
+            let invokeExpr = stmt.getInvokeExpr();
+            const methodSignature = invokeExpr.getMethodSignature();
+            if (methodSignature.getMethodSubSignature().getMethodName() === TSConst_1.SUPER_NAME) {
+                superInvokeStmt = stmt;
+                break;
+            }
+        }
+    }
+    if (!superInvokeStmt) {
+        return;
+    }
+    // If there are superInvokeStmt, then there must have constructor of its super class.
     const superClass = constructor.getDeclaringArkClass().getSuperClass();
     if (superClass === null) {
+        logger.error(`Can not find super class for class ${constructor.getDeclaringArkClass().getSignature().toString()}`);
         return;
     }
-    const superConstructor = superClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
+    const superConstructor = (_b = superClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME)) !== null && _b !== void 0 ? _b : superClass.getMethodWithName(Const_1.CONSTRUCT_SIGNATURE_NAME);
     if (superConstructor === null) {
         if (needDefaultConstructorInClass(superClass)) {
             logger.error(`Can not find constructor method for class ${superClass.getSignature().toString()}`);
         }
         return;
     }
-    const startingBlock = (_a = constructor.getBody()) === null || _a === void 0 ? void 0 : _a.getCfg().getStartingBlock();
-    if (startingBlock === undefined) {
+    let base = (_c = constructor.getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().get(TSConst_1.THIS_NAME);
+    if (base === undefined) {
+        logger.error(`Can not find local this in constructor method ${constructor.getSignature().toString()}`);
         return;
     }
-    for (const stmt of startingBlock.getStmts()) {
-        if (stmt instanceof Stmt_1.ArkInvokeStmt) {
-            let invokeExpr = stmt.getInvokeExpr();
-            const methodSignature = invokeExpr.getMethodSignature();
-            if (methodSignature.getMethodSubSignature().getMethodName() !== TSConst_1.SUPER_NAME) {
-                continue;
-            }
-            let base = (_b = constructor.getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().get(TSConst_1.THIS_NAME);
-            if (base === undefined) {
-                logger.error(`Can not find local this in constructor method ${constructor.getSignature().toString()}`);
-                return;
-            }
-            const newInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(base, superConstructor.getSignature(), invokeExpr.getArgs());
-            stmt.replaceInvokeExpr(newInvokeExpr);
-            return;
-        }
-    }
+    const newInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(base, superConstructor.getSignature(), superInvokeStmt.getInvokeExpr().getArgs());
+    superInvokeStmt.replaceInvokeExpr(newInvokeExpr);
+    return;
 }
 exports.replaceSuper2Constructor = replaceSuper2Constructor;

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiApi.d.ts

@@ -0,0 +1,8 @@
+export interface AstJsonDumpRequest {
+    sourceFile: string;
+    outputFile: string;
+    ccJsonPath?: string;
+    includeDirs?: string[];
+}
+export declare function dumpAstJson(request: AstJsonDumpRequest, cwd: string, llvmPath?: string): number;
+//# sourceMappingURL=napiApi.d.ts.map

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiApi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"napiApi.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/ast/astJsonNapi/napiApi.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA6BD,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAqB/F"}

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiApi.js

@@ -0,0 +1,90 @@
+"use strict";
+/*
+ * Copyright (c) 2026 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dumpAstJson = void 0;
+const path = __importStar(require("node:path"));
+const logger_1 = __importStar(require("../../../../utils/logger"));
+const astUtils_1 = require("../astUtils");
+const napiRunner_1 = require("./napiRunner");
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'astJsonDumper');
+function buildRunEnv(llvmPath) {
+    var _a;
+    const out = Object.assign({}, process.env);
+    if (!llvmPath) {
+        return out;
+    }
+    const sep = path.delimiter;
+    const cur = (_a = out.PATH) !== null && _a !== void 0 ? _a : '';
+    if (!cur.split(sep).includes(llvmPath)) {
+        out.PATH = cur.length === 0 ? llvmPath : cur + sep + llvmPath;
+    }
+    return out;
+}
+function buildAstJsonArgv(request) {
+    const argv = [request.sourceFile, '-o', request.outputFile];
+    if (request.ccJsonPath) {
+        argv.push('-p', request.ccJsonPath);
+    }
+    if (request.includeDirs && request.includeDirs.length > 0) {
+        request.includeDirs.forEach((dir) => {
+            argv.push(`--extra-arg-before=-I${dir}`);
+        });
+    }
+    return argv;
+}
+function dumpAstJson(request, cwd, llvmPath) {
+    const argv = buildAstJsonArgv(request);
+    logger.info('================================================================');
+    logger.info(`[Debug] CWD: ${cwd}`);
+    logger.info(`[Debug] astJsonDumper args: ${JSON.stringify(argv)}`);
+    logger.info('================================================================');
+    if (!(0, astUtils_1.isAstJsonDumperAvailable)()) {
+        logger.error('[Debug] astJsonDumper backend is unavailable.');
+        return -1;
+    }
+    const env = buildRunEnv(llvmPath);
+    const code = (0, napiRunner_1.runAstJsonArgv)(argv, { cwd, env });
+    if (code !== 0) {
+        logger.error(`[Debug] astJsonDumper exited with code ${code}`);
+        return code;
+    }
+    logger.info('[Debug] astJsonDumper finished successfully.');
+    return 0;
+}
+exports.dumpAstJson = dumpAstJson;

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiRunner.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+interface AstJsonRunContext {
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+}
+export declare function runAstJsonArgv(argv: string[], context: AstJsonRunContext): number;
+export {};
+//# sourceMappingURL=napiRunner.d.ts.map

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiRunner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"napiRunner.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/ast/astJsonNapi/napiRunner.ts"],"names":[],"mappings":";AAyBA,UAAU,iBAAiB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;CAC1B;AA+JD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAEjF"}

package/lib/frontend/cppFrontend/ast/astJsonNapi/napiRunner.js

@@ -0,0 +1,183 @@
+"use strict";
+/*
+ * Copyright (c) 2026 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAstJsonArgv = void 0;
+const node_child_process_1 = require("node:child_process");
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const logger_1 = __importStar(require("../../../../utils/logger"));
+const astUtils_1 = require("../astUtils");
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'astJsonDumper');
+let selectedRunArgv = null;
+function startNewAstJsonWorker(addonAbsolutePath, onExit) {
+    var _a, _b;
+    const workerPath = path.join(__dirname, 'napiWorker.cjs');
+    const proc = (0, node_child_process_1.fork)(workerPath, [addonAbsolutePath], {
+        serialization: 'advanced',
+        stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+    });
+    (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
+        const text = chunk.toString();
+        if (text.trim().length > 0) {
+            logger.info(`[Debug] astJsonDumper worker stdout:\n${text}`);
+        }
+    });
+    (_b = proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
+        const text = chunk.toString();
+        if (text.trim().length > 0) {
+            logger.error(`[Debug] astJsonDumper worker stderr:\n${text}`);
+        }
+    });
+    proc.on('exit', (code, signal) => {
+        onExit(proc, code, signal);
+    });
+    return proc;
+}
+function awaitWorkerArgvReply(proc, workerStillCurrent, disposeOnSendFail, context, argv) {
+    const state = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 2));
+    try {
+        proc.send({
+            type: 'run',
+            argv,
+            cwd: context.cwd,
+            envPath: context.env.PATH,
+            state: state.buffer,
+        });
+    }
+    catch (error) {
+        logger.error('[Debug] Failed to send astJsonDumper request to worker:', error);
+        disposeOnSendFail(proc);
+        return -1;
+    }
+    while (Atomics.load(state, 0) === 0) {
+        Atomics.wait(state, 0, 0, 1000);
+        if (!workerStillCurrent() || proc.exitCode !== null || proc.killed) {
+            logger.error('[Debug] astJsonDumper worker exited before replying.');
+            return -1;
+        }
+    }
+    return Atomics.load(state, 1);
+}
+function createPersistentWorkerRunner(addonAbsolutePath) {
+    let worker = null;
+    const disposeWorker = (proc) => {
+        if (worker === proc) {
+            worker = null;
+        }
+        if (proc.exitCode === null && !proc.killed) {
+            proc.kill();
+        }
+    };
+    const ensureWorker = () => {
+        if (worker && worker.exitCode === null && !worker.killed) {
+            return worker;
+        }
+        const proc = startNewAstJsonWorker(addonAbsolutePath, (exitedProc, code, signal) => {
+            if (worker === exitedProc) {
+                worker = null;
+            }
+            logger.warn(`[Debug] astJsonDumper worker exited (code=${code}, signal=${signal}).`);
+        });
+        worker = proc;
+        return proc;
+    };
+    return (context, ...argv) => {
+        const proc = ensureWorker();
+        return awaitWorkerArgvReply(proc, () => worker === proc, disposeWorker, context, argv);
+    };
+}
+function logSpawnSyncFailure(result) {
+    if (result.stdout) {
+        logger.error(`[Debug] child stdout:\n${result.stdout}`);
+    }
+    if (result.stderr) {
+        logger.error(`[Debug] child stderr:\n${result.stderr}`);
+    }
+    logger.error(`[Debug] astJsonDumper child exited with code ${result.status}`);
+    return -1;
+}
+function runArgvInSubprocess(context, ...argv) {
+    const addonPath = (0, astUtils_1.getAstJsonDumperNodePath)();
+    const childScript = 'const addon = require(process.argv[1]); ' +
+        'const rc = addon.runArgv(process.argv.slice(2)); ' +
+        "process.exitCode = typeof rc === 'number' ? rc : 1;";
+    const quoted = ['-e', childScript, addonPath, ...argv]
+        .map((arg) => (arg.includes(' ') ? `"${arg}"` : arg))
+        .join(' ');
+    logger.info('================================================================');
+    logger.info(`[Debug] CWD: ${context.cwd}`);
+    logger.info(`[Debug] astJsonDumper.node: ${addonPath}`);
+    logger.info(`[Debug] CMD: "${process.execPath}" ${quoted}`);
+    logger.info('================================================================');
+    if (!fs.existsSync(addonPath)) {
+        logger.error(`[Debug] Missing addon: ${addonPath}`);
+        return -1;
+    }
+    const result = (0, node_child_process_1.spawnSync)(process.execPath, ['-e', childScript, addonPath, ...argv], {
+        stdio: ['inherit', 'pipe', 'pipe'],
+        encoding: 'utf-8',
+        env: context.env,
+        cwd: context.cwd,
+    });
+    if (result.status !== 0) {
+        return logSpawnSyncFailure(result);
+    }
+    return 0;
+}
+function shouldIsolateRuns() {
+    if (process.env.ARKANALYZER_AST_JSON_SUBPROCESS === '1') {
+        return true;
+    }
+    if (process.env.ARKANALYZER_AST_JSON_SUBPROCESS === '0') {
+        return false;
+    }
+    return process.env.VITEST === 'true';
+}
+function getRunArgv() {
+    if (!selectedRunArgv) {
+        selectedRunArgv = shouldIsolateRuns()
+            ? runArgvInSubprocess
+            : createPersistentWorkerRunner((0, astUtils_1.getAstJsonDumperNodePath)());
+    }
+    return selectedRunArgv;
+}
+function runAstJsonArgv(argv, context) {
+    return getRunArgv()(context, ...argv);
+}
+exports.runAstJsonArgv = runAstJsonArgv;