arkanalyzer 1.0.85 → 1.0.87

package/lib/save/json/JsonSerialization.js

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeStmt = exports.serializeValue = exports.serializeConstant = exports.serializeLocal = exports.serializeBasicBlock = exports.serializeCfg = exports.serializeAliasTypeSignature = exports.serializeMethodSignature = exports.serializeFieldSignature = exports.serializeClassSignature = exports.serializeNamespaceSignature = exports.serializeFileSignature = exports.serializeType = exports.serializeLineColPosition = exports.serializeDecorator = exports.serializeExportInfo = exports.serializeImportInfo = exports.serializeMethodParameter = exports.serializeMethodBody = exports.serializeMethod = exports.serializeField = exports.serializeClass = exports.serializeNamespace = exports.serializeArkFile = exports.serializeArkScene = void 0;
+exports.serializeStmt = exports.serializeValue = exports.serializeConstant = exports.serializeType = exports.serializeLocal = exports.serializeBasicBlock = exports.serializeCfg = exports.serializeAliasTypeSignature = exports.serializeMethodSignature = exports.serializeFieldSignature = exports.serializeClassSignature = exports.serializeNamespaceSignature = exports.serializeFileSignature = exports.serializeLineColPosition = exports.serializeDecorator = exports.serializeExportInfo = exports.serializeImportInfo = exports.serializeMethodParameter = exports.serializeMethodBody = exports.serializeMethod = exports.serializeField = exports.serializeClass = exports.serializeNamespace = exports.serializeArkFile = exports.serializeArkScene = void 0;
 const __1 = require("../..");
 const JsonDto_1 = require("./JsonDto");
+const Expr_1 = require("../../frontend/cppFrontend/base/Expr");
+const Type_1 = require("../../frontend/cppFrontend/base/Type");
 function serializeArkScene(scene) {
     return {
         files: scene.getFiles().map(f => serializeArkFile(f)),
@@ -128,150 +130,6 @@ function serializeLineColPosition(position) {
     };
 }
 exports.serializeLineColPosition = serializeLineColPosition;
-function serializeType(type) {
-    var _a, _b, _c;
-    if (type === undefined) {
-        throw new Error('Type is undefined');
-    }
-    if (type instanceof __1.AnyType) {
-        return (0, JsonDto_1.polymorphic)('AnyType', {});
-    }
-    else if (type instanceof __1.UnknownType) {
-        return (0, JsonDto_1.polymorphic)('UnknownType', {});
-    }
-    else if (type instanceof __1.VoidType) {
-        return (0, JsonDto_1.polymorphic)('VoidType', {});
-    }
-    else if (type instanceof __1.NeverType) {
-        return (0, JsonDto_1.polymorphic)('NeverType', {});
-    }
-    else if (type instanceof __1.UnionType) {
-        return (0, JsonDto_1.polymorphic)('UnionType', {
-            types: type.getTypes().map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.IntersectionType) {
-        return (0, JsonDto_1.polymorphic)('IntersectionType', {
-            types: type.getTypes().map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.TupleType) {
-        return (0, JsonDto_1.polymorphic)('TupleType', {
-            types: type.getTypes().map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.BooleanType) {
-        return (0, JsonDto_1.polymorphic)('BooleanType', {});
-    }
-    else if (type instanceof __1.NumberType) {
-        return (0, JsonDto_1.polymorphic)('NumberType', {});
-    }
-    else if (type instanceof __1.BigIntType) {
-        return (0, JsonDto_1.polymorphic)('BigIntType', {});
-    }
-    else if (type instanceof __1.StringType) {
-        return (0, JsonDto_1.polymorphic)('StringType', {});
-    }
-    else if (type instanceof __1.NullType) {
-        return (0, JsonDto_1.polymorphic)('NullType', {});
-    }
-    else if (type instanceof __1.UndefinedType) {
-        return (0, JsonDto_1.polymorphic)('UndefinedType', {});
-    }
-    else if (type instanceof __1.LiteralType) {
-        return (0, JsonDto_1.polymorphic)('LiteralType', {
-            literal: type.getLiteralName(),
-        });
-    }
-    else if (type instanceof __1.ClassType) {
-        return (0, JsonDto_1.polymorphic)('ClassType', {
-            signature: serializeClassSignature(type.getClassSignature()),
-            typeParameters: (_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.FunctionType) {
-        if (type.getMethodSignature().getMethodSubSignature().getReturnType() === type) {
-            // Handle recursive function types.
-            // This is a workaround for the issue where the function type refers to itself,
-            // which can cause infinite recursion during serialization.
-            // In this case, we return a simple FunctionType without a signature.
-            console.warn('Detected recursive function type, replacing return type with UnknownType');
-            const sig = type.getMethodSignature();
-            const sub = sig.getMethodSubSignature();
-            const sig2 = new __1.MethodSignature(sig.getDeclaringClassSignature(), new __1.MethodSubSignature(sub.getMethodName(), sub.getParameters(), __1.UnknownType.getInstance(), sub.isStatic()));
-            return (0, JsonDto_1.polymorphic)('FunctionType', {
-                signature: serializeMethodSignature(sig2),
-                typeParameters: (_b = type.getRealGenericTypes()) === null || _b === void 0 ? void 0 : _b.map(type => serializeType(type)),
-            });
-        }
-        return (0, JsonDto_1.polymorphic)('FunctionType', {
-            signature: serializeMethodSignature(type.getMethodSignature()),
-            typeParameters: (_c = type.getRealGenericTypes()) === null || _c === void 0 ? void 0 : _c.map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.ArrayType) {
-        return (0, JsonDto_1.polymorphic)('ArrayType', {
-            elementType: serializeType(type.getBaseType()),
-            dimensions: type.getDimension(),
-        });
-    }
-    else if (type instanceof __1.UnclearReferenceType) {
-        return (0, JsonDto_1.polymorphic)('UnclearReferenceType', {
-            name: type.getName(),
-            typeParameters: type.getGenericTypes().map(type => serializeType(type)),
-        });
-    }
-    else if (type instanceof __1.AliasType) {
-        return (0, JsonDto_1.polymorphic)('AliasType', {
-            name: type.getName(),
-            originalType: serializeType(type.getOriginalType()),
-            signature: serializeAliasTypeSignature(type.getSignature()),
-        });
-    }
-    else if (type instanceof __1.GenericType) {
-        const constraint = type.getConstraint();
-        const defaultType = type.getDefaultType();
-        return (0, JsonDto_1.polymorphic)('GenericType', {
-            name: type.getName(),
-            constraint: constraint && serializeType(constraint),
-            defaultType: defaultType && serializeType(defaultType),
-        });
-    }
-    else if (type instanceof __1.AnnotationNamespaceType) {
-        return (0, JsonDto_1.polymorphic)('AnnotationNamespaceType', {
-            originType: type.getOriginType(),
-            namespaceSignature: serializeNamespaceSignature(type.getNamespaceSignature()),
-        });
-    }
-    else if (type instanceof __1.AnnotationTypeQueryType) {
-        return (0, JsonDto_1.polymorphic)('AnnotationTypeQueryType', {
-            originType: type.getOriginType(),
-        });
-    }
-    else if (type instanceof __1.LexicalEnvType) {
-        const m = type.getNestedMethod();
-        const s = m.getMethodSubSignature();
-        const sig = new __1.MethodSignature(m.getDeclaringClassSignature(), new __1.MethodSubSignature(s.getMethodName(), [], __1.UnknownType.getInstance()));
-        return (0, JsonDto_1.polymorphic)('LexicalEnvType', {
-            // method: serializeMethodSignature(type.getNestedMethod()),
-            method: serializeMethodSignature(sig),
-            closures: type.getClosures().map(closure => serializeLocal(closure)),
-        });
-    }
-    else if (type instanceof __1.EnumValueType) {
-        return (0, JsonDto_1.polymorphic)('EnumValueType', {
-            signature: serializeClassSignature(type.getFieldSignature().getDeclaringSignature()),
-            name: type.getFieldSignature().getFieldName(),
-        });
-    }
-    // Fallback for unhandled type cases
-    console.info(`Unhandled Type: ${type.constructor.name} (${type.toString()})`);
-    return {
-        kind: type.constructor.name,
-        text: type.toString(),
-    };
-}
-exports.serializeType = serializeType;
 function serializeFileSignature(file) {
     return {
         projectName: file.getProjectName(),
@@ -363,6 +221,180 @@ function serializeLocal(local) {
     };
 }
 exports.serializeLocal = serializeLocal;
+function trySerializeCxxSignType(type) {
+    if (type instanceof Type_1.CxxIntType) {
+        return (0, JsonDto_1.polymorphic)('CxxIntType', { signType: type.getSignType().toString() });
+    }
+    if (type instanceof Type_1.CxxShortType) {
+        return (0, JsonDto_1.polymorphic)('CxxShortType', { signType: type.getSignType().toString() });
+    }
+    if (type instanceof Type_1.CxxLongType) {
+        return (0, JsonDto_1.polymorphic)('CxxLongType', { signType: type.getSignType().toString() });
+    }
+    if (type instanceof Type_1.CxxLongLongType) {
+        return (0, JsonDto_1.polymorphic)('CxxLongLongType', { signType: type.getSignType().toString() });
+    }
+    if (type instanceof Type_1.CxxSizeTType) {
+        return (0, JsonDto_1.polymorphic)('CxxSizeTType', { signType: type.getSignType().toString() });
+    }
+    return undefined;
+}
+function trySerializeCxxBitWidthType(type) {
+    if (type instanceof Type_1.CxxFloatType) {
+        return (0, JsonDto_1.polymorphic)('CxxFloatType', { bitWidth: type.getBitWith() });
+    }
+    if (type instanceof Type_1.CxxDoubleType) {
+        return (0, JsonDto_1.polymorphic)('CxxDoubleType', { bitWidth: type.getBitWith() });
+    }
+    if (type instanceof Type_1.CxxLongDoubleType) {
+        return (0, JsonDto_1.polymorphic)('CxxLongDoubleType', { bitWidth: type.getBitWith() });
+    }
+    return undefined;
+}
+function serializeFunctionTypeDto(type, active) {
+    var _a, _b;
+    if (type.getMethodSignature().getMethodSubSignature().getReturnType() === type) {
+        // Recursive function type: avoid infinite recursion by stubbing return type.
+        console.warn('Detected recursive function type, replacing return type with UnknownType');
+        const sig = type.getMethodSignature();
+        const sub = sig.getMethodSubSignature();
+        const sig2 = new __1.MethodSignature(sig.getDeclaringClassSignature(), new __1.MethodSubSignature(sub.getMethodName(), sub.getParameters(), __1.UnknownType.getInstance(), sub.isStatic()));
+        return (0, JsonDto_1.polymorphic)('FunctionType', {
+            signature: serializeMethodSignature(sig2),
+            typeParameters: (_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(t => serializeType(t, active)),
+        });
+    }
+    return (0, JsonDto_1.polymorphic)('FunctionType', {
+        signature: serializeMethodSignature(type.getMethodSignature()),
+        typeParameters: (_b = type.getRealGenericTypes()) === null || _b === void 0 ? void 0 : _b.map(t => serializeType(t, active)),
+    });
+}
+const TYPE_SERIALIZERS = [
+    (type, active) => (type instanceof __1.AnyType ? (0, JsonDto_1.polymorphic)('AnyType', {}) : undefined),
+    (type, active) => (type instanceof __1.UnknownType ? (0, JsonDto_1.polymorphic)('UnknownType', {}) : undefined),
+    (type, active) => (type instanceof __1.VoidType ? (0, JsonDto_1.polymorphic)('VoidType', {}) : undefined),
+    (type, active) => (type instanceof __1.NeverType ? (0, JsonDto_1.polymorphic)('NeverType', {}) : undefined),
+    (type, active) => type instanceof __1.UnionType
+        ? (0, JsonDto_1.polymorphic)('UnionType', { types: type.getTypes().map(t => serializeType(t, active)) })
+        : undefined,
+    (type, active) => type instanceof __1.IntersectionType
+        ? (0, JsonDto_1.polymorphic)('IntersectionType', { types: type.getTypes().map(t => serializeType(t, active)) })
+        : undefined,
+    (type, active) => type instanceof __1.TupleType
+        ? (0, JsonDto_1.polymorphic)('TupleType', { types: type.getTypes().map(t => serializeType(t, active)) })
+        : undefined,
+    (type, active) => trySerializeCxxSignType(type),
+    (type, active) => trySerializeCxxBitWidthType(type),
+    (type, active) => (type instanceof Type_1.CxxCharType ? (0, JsonDto_1.polymorphic)('CxxCharType', { text: type.toString() }) : undefined),
+    (type, active) => (type instanceof Type_1.CxxWcharType ? (0, JsonDto_1.polymorphic)('CxxWcharType', { text: type.toString() }) : undefined),
+    (type, active) => type instanceof Type_1.PointerType
+        ? (0, JsonDto_1.polymorphic)('PointerType', { baseType: serializeType(type.getBaseType(), active) })
+        : undefined,
+    (type, active) => type instanceof Type_1.SmartPointerType
+        ? (0, JsonDto_1.polymorphic)('SmartPointerType', { baseType: serializeType(type.getBaseType(), active) })
+        : undefined,
+    (type, active) => type instanceof Type_1.ReferenceType
+        ? (0, JsonDto_1.polymorphic)('ReferenceType', { baseType: serializeType(type.getBaseType(), active) })
+        : undefined,
+    (type, active) => (type instanceof Type_1.Thread ? (0, JsonDto_1.polymorphic)('Thread', { text: type.toString() }) : undefined),
+    (type, active) => (type instanceof Type_1.TypeInfo ? (0, JsonDto_1.polymorphic)('TypeInfo', { name: type.toString() }) : undefined),
+    (type, active) => (type instanceof __1.BooleanType ? (0, JsonDto_1.polymorphic)('BooleanType', {}) : undefined),
+    (type, active) => (type instanceof __1.NumberType ? (0, JsonDto_1.polymorphic)('NumberType', {}) : undefined),
+    (type, active) => (type instanceof __1.BigIntType ? (0, JsonDto_1.polymorphic)('BigIntType', {}) : undefined),
+    (type, active) => (type instanceof __1.StringType ? (0, JsonDto_1.polymorphic)('StringType', {}) : undefined),
+    (type, active) => (type instanceof __1.NullType ? (0, JsonDto_1.polymorphic)('NullType', {}) : undefined),
+    (type, active) => (type instanceof __1.UndefinedType ? (0, JsonDto_1.polymorphic)('UndefinedType', {}) : undefined),
+    (type, active) => type instanceof __1.LiteralType ? (0, JsonDto_1.polymorphic)('LiteralType', { literal: type.getLiteralName() }) : undefined,
+    (type, active) => {
+        var _a;
+        return type instanceof __1.ClassType
+            ? (0, JsonDto_1.polymorphic)('ClassType', {
+                signature: serializeClassSignature(type.getClassSignature()),
+                typeParameters: (_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(t => serializeType(t, active)),
+            })
+            : undefined;
+    },
+    (type, active) => (type instanceof __1.FunctionType ? serializeFunctionTypeDto(type, active) : undefined),
+    (type, active) => type instanceof __1.ArrayType
+        ? (0, JsonDto_1.polymorphic)('ArrayType', {
+            elementType: serializeType(type.getBaseType(), active),
+            dimensions: type.getDimension(),
+        })
+        : undefined,
+    (type, active) => type instanceof __1.UnclearReferenceType
+        ? (0, JsonDto_1.polymorphic)('UnclearReferenceType', {
+            name: type.getName(),
+            typeParameters: type.getGenericTypes().map(t => serializeType(t, active)),
+        })
+        : undefined,
+    (type, active) => type instanceof __1.AliasType
+        ? (0, JsonDto_1.polymorphic)('AliasType', {
+            name: type.getName(),
+            originalType: serializeType(type.getOriginalType(), active),
+            signature: serializeAliasTypeSignature(type.getSignature()),
+        })
+        : undefined,
+    (type, active) => {
+        if (!(type instanceof __1.GenericType)) {
+            return undefined;
+        }
+        const constraint = type.getConstraint();
+        const defaultType = type.getDefaultType();
+        return (0, JsonDto_1.polymorphic)('GenericType', {
+            name: type.getName(),
+            constraint: constraint && serializeType(constraint, active),
+            defaultType: defaultType && serializeType(defaultType, active),
+        });
+    },
+    (type, active) => type instanceof __1.AnnotationNamespaceType
+        ? (0, JsonDto_1.polymorphic)('AnnotationNamespaceType', {
+            originType: type.getOriginType(),
+            namespaceSignature: serializeNamespaceSignature(type.getNamespaceSignature()),
+        })
+        : undefined,
+    (type, active) => type instanceof __1.AnnotationTypeQueryType
+        ? (0, JsonDto_1.polymorphic)('AnnotationTypeQueryType', { originType: type.getOriginType() })
+        : undefined,
+    (type, active) => {
+        if (!(type instanceof __1.LexicalEnvType)) {
+            return undefined;
+        }
+        const m = type.getNestedMethod();
+        const s = m.getMethodSubSignature();
+        const sig = new __1.MethodSignature(m.getDeclaringClassSignature(), new __1.MethodSubSignature(s.getMethodName(), [], __1.UnknownType.getInstance()));
+        return (0, JsonDto_1.polymorphic)('LexicalEnvType', {
+            method: serializeMethodSignature(sig),
+            closures: type.getClosures().map(closure => serializeLocal(closure)),
+        });
+    },
+    (type, active) => type instanceof __1.EnumValueType
+        ? (0, JsonDto_1.polymorphic)('EnumValueType', {
+            signature: serializeClassSignature(type.getFieldSignature().getDeclaringSignature()),
+            name: type.getFieldSignature().getFieldName(),
+        })
+        : undefined,
+];
+function serializeType(type, activeTypeSerialization = new WeakSet()) {
+    if (type === undefined) {
+        throw new Error('Type is undefined');
+    }
+    if (activeTypeSerialization.has(type)) {
+        return (0, JsonDto_1.polymorphic)('UnknownType', {});
+    }
+    activeTypeSerialization.add(type);
+    for (const serialize of TYPE_SERIALIZERS) {
+        const dto = serialize(type, activeTypeSerialization);
+        if (dto !== undefined) {
+            return dto;
+        }
+    }
+    console.info(`Unhandled Type: ${type.constructor.name} (${type.toString()})`);
+    return {
+        kind: type.constructor.name,
+        text: type.toString(),
+    };
+}
+exports.serializeType = serializeType;
 function serializeConstant(constant) {
     let value = constant.getValue();
     if (constant.getType() instanceof __1.NumberType) {
@@ -525,6 +557,64 @@ function serializeValue(value) {
             field: serializeFieldSignature(value.getFieldSignature()),
         });
     }
+    else if (value instanceof Expr_1.ArkCxxDeleteArrayExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxDeleteArrayExpr', {
+            field: serializeValue(value.getField()),
+            type: serializeType(value.getType()),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxNewArrayExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxNewArrayExpr', {
+            baseType: serializeType(value.getBaseType()),
+            size: serializeValue(value.getSize()),
+            elementsNumber: value.getElementsNumber(),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxInitArrayExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxInitArrayExpr', {
+            op: serializeValue(value.getOp()),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxUnaryExpr) {
+        let op = value.getOp();
+        if (op instanceof __1.Type) {
+            return (0, JsonDto_1.polymorphic)('ArkCxxUnaryExpr', {
+                op: serializeType(op),
+            });
+        }
+        return (0, JsonDto_1.polymorphic)('ArkCxxUnaryExpr', {
+            op: serializeValue(op),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxCastExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxCastExpr', {
+            cxxCastType: value.getCxxCastType(),
+        });
+    }
+    else if (value instanceof Expr_1.ArkTypeIdExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkTypeIdExpr', {
+            op: serializeValue(value.getOp()),
+        });
+    }
+    else if (value instanceof Expr_1.ArkNoExpectExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkNoExpectExpr', {
+            op: serializeValue(value.getOp()),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxFolderExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxFolderExpr', {
+            arg: serializeValue(value.getArg()),
+            op: value.getOp(),
+        });
+    }
+    else if (value instanceof Expr_1.ArkCxxNormalBinOpExpr) {
+        return (0, JsonDto_1.polymorphic)('ArkCxxNormalBinOpExpr', {
+            op1: serializeValue(value.getOp1()),
+            op2: serializeValue(value.getOp2()),
+            type: serializeType(value.getType()),
+            operator: value.getOperator(),
+        });
+    }
     // Fallback for unhandled value types
     console.info(`Unhandled Value: ${value.constructor.name} (${value.toString()})`);
     return {

package/lib/save/source/SourceTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAyB,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAU7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAEvD,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM;IA+B7F,OAAO,CAAC,kBAAkB;IAuCnB,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA8BxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAUpD,OAAO,CAAC,YAAY;IA4Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA0BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,OAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAqBxF,OAAO,CAAC,aAAa;IA4Bd,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA+DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}
+{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAyB,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAU7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAEvD,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM;IA+B7F,OAAO,CAAC,kBAAkB;IAuCnB,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA8BxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAQpD,OAAO,CAAC,YAAY;IA4Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA0BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,OAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAqBxF,OAAO,CAAC,aAAa;IA4Bd,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA+DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}

package/lib/save/source/SourceTransformer.js

@@ -184,9 +184,6 @@ class SourceTransformer {
         if (value.getType().toString() === 'string') {
             return `'${PrinterUtils_1.PrinterUtils.escape(value.getValue())}'`;
         }
-        else if (value.getType().toString() === TSConst_1.BIGINT_KEYWORD) {
-            return `${value.getValue()}n`;
-        }
         else {
             return value.getValue();
         }

package/lib/utils/CxxSceneUtils.d.ts

@@ -0,0 +1,11 @@
+import { ArkFile } from '../core/model/ArkFile';
+export declare class CxxSceneUtils {
+    static puncture(cxxModulePath: string, tsFile: ArkFile): void;
+    private static processApiDefine;
+    private static findPropDesc;
+    private static processPropDesc;
+    private static getDeclaredAssignStmt;
+    private static getUsedStmts;
+    private static mergeMethod;
+}
+//# sourceMappingURL=CxxSceneUtils.d.ts.map

package/lib/utils/CxxSceneUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CxxSceneUtils.d.ts","sourceRoot":"","sources":["../../src/utils/CxxSceneUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAkBhD,qBAAa,aAAa;WACR,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAqBpE,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAsB/B,OAAO,CAAC,MAAM,CAAC,YAAY;IAU3B,OAAO,CAAC,MAAM,CAAC,eAAe;IAmC9B,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAUpC,OAAO,CAAC,MAAM,CAAC,YAAY;IAO3B,OAAO,CAAC,MAAM,CAAC,WAAW;CAa7B"}

package/lib/utils/CxxSceneUtils.js

@@ -0,0 +1,178 @@
+"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 __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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CxxSceneUtils = void 0;
+const path_1 = __importDefault(require("path"));
+const ArkSignature_1 = require("../core/model/ArkSignature");
+const ModelUtils_1 = require("../core/common/ModelUtils");
+const Stmt_1 = require("../core/base/Stmt");
+const ArkMethod_1 = require("../core/model/ArkMethod");
+const Constant_1 = require("../core/base/Constant");
+const Local_1 = require("../core/base/Local");
+const Ref_1 = require("../core/base/Ref");
+const ArkField_1 = require("../core/model/ArkField");
+const Type_1 = require("../core/base/Type");
+const TSConst_1 = require("../core/common/TSConst");
+const logger_1 = __importStar(require("./logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkValueTransformer');
+class CxxSceneUtils {
+    static puncture(cxxModulePath, tsFile) {
+        var _a;
+        const fileName = path_1.default.relative(tsFile.getProjectDir(), path_1.default.join(cxxModulePath, '../../napi_init.cpp'));
+        const initFile = tsFile.getScene().getFile(new ArkSignature_1.FileSignature(tsFile.getProjectName(), fileName));
+        if (!initFile) {
+            return;
+        }
+        const ts2cxxFuncMap = initFile.getDefaultClass().getTs2cxxFuncMap();
+        const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(initFile);
+        for (const method of methods) {
+            const stmts = (_a = method.getCfg()) === null || _a === void 0 ? void 0 : _a.getStmts();
+            if (!stmts) {
+                continue;
+            }
+            for (const stmt of stmts) {
+                if (stmt instanceof Stmt_1.ArkInvokeStmt) {
+                    this.processApiDefine(stmt, tsFile, ts2cxxFuncMap);
+                }
+            }
+        }
+    }
+    static processApiDefine(stmt, tsFile, ts2cxxFuncMap) {
+        const invokeExpr = stmt.getInvokeExpr();
+        const methodName = invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName();
+        const clsConstant = invokeExpr.getArg(1);
+        if (methodName === 'napi_define_class' && clsConstant instanceof Constant_1.Constant) {
+            const tsClass = tsFile.getClassWithName(clsConstant.getValue());
+            if (!tsClass) {
+                return;
+            }
+            const props = invokeExpr.getArg(6);
+            this.findPropDesc(props, ts2cxxFuncMap, tsClass);
+            const arkMethods = ts2cxxFuncMap.get(clsConstant.getValue());
+            if ((arkMethods === null || arkMethods === void 0 ? void 0 : arkMethods.length) === 1) {
+                this.mergeMethod(TSConst_1.CONSTRUCTOR_NAME, tsClass, arkMethods[0]);
+            }
+        }
+        else if (methodName === 'napi_define_properties') {
+            const tsClass = tsFile.getDefaultClass();
+            const props = invokeExpr.getArg(3);
+            this.findPropDesc(props, ts2cxxFuncMap, tsClass);
+        }
+    }
+    static findPropDesc(props, ts2cxxFuncMap, tsClass) {
+        var _a, _b;
+        (_b = this.getUsedStmts((_a = this.getDeclaredAssignStmt(props)) === null || _a === void 0 ? void 0 : _a.getRightOp())) === null || _b === void 0 ? void 0 : _b.forEach(x => {
+            var _a;
+            if (x instanceof Stmt_1.ArkAssignStmt && x.getLeftOp() instanceof Ref_1.ArkArrayRef) {
+                (_a = this.getUsedStmts(x.getRightOp())) === null || _a === void 0 ? void 0 : _a.forEach(s => {
+                    this.processPropDesc(s, ts2cxxFuncMap, tsClass);
+                });
+            }
+        });
+    }
+    static processPropDesc(s, ts2cxxFuncMap, tsClass) {
+        let constant;
+        if (s instanceof Stmt_1.ArkInvokeStmt) {
+            // This scenario corresponds to the registration of class objects
+            constant = s.getInvokeExpr().getArg(0);
+        }
+        else if (s instanceof Stmt_1.ArkAssignStmt && s.getLeftOp() instanceof Ref_1.ArkArrayRef) {
+            // The registration scenario is a structure aggregation scenario, where the syntax tree does not contain a construct,
+            // and each unit is expressed using an aggregation expression
+            let rightOp = s.getRightOp();
+            if (rightOp.getName().startsWith('%')) {
+                const declaringStmt = rightOp.getDeclaringStmt();
+                if (declaringStmt instanceof Stmt_1.ArkAssignStmt) {
+                    rightOp = declaringStmt.getRightOp();
+                }
+            }
+            try {
+                // Due to the order of type definitions, type judgment cannot be performed here,
+                // so try+assertion is used to avoid runtime errors
+                constant = rightOp.getElements()[0];
+            }
+            catch (e) {
+                logger.info('This is Unknow scene');
+            }
+        }
+        if (constant instanceof Constant_1.Constant) {
+            const tsMtdName = constant.getValue();
+            const arkMethods = ts2cxxFuncMap.get(tsMtdName);
+            if ((arkMethods === null || arkMethods === void 0 ? void 0 : arkMethods.length) === 1) {
+                this.mergeMethod(tsMtdName, tsClass, arkMethods[0]);
+            }
+            else if ((arkMethods === null || arkMethods === void 0 ? void 0 : arkMethods.length) === 2) {
+                this.mergeMethod('Get-' + tsMtdName, tsClass, arkMethods[0]);
+                this.mergeMethod('Set-' + tsMtdName, tsClass, arkMethods[1]);
+            }
+        }
+    }
+    static getDeclaredAssignStmt(value) {
+        if (value instanceof Local_1.Local) {
+            const declaringStmt = value.getDeclaringStmt();
+            if (declaringStmt instanceof Stmt_1.ArkAssignStmt) {
+                return declaringStmt;
+            }
+        }
+        return undefined;
+    }
+    static getUsedStmts(value) {
+        if (value instanceof Local_1.Local) {
+            return value.getUsedStmts();
+        }
+        return undefined;
+    }
+    static mergeMethod(tsMtdName, tsClass, cppMtd) {
+        let tsMtd = ModelUtils_1.ModelUtils.findArkModel(tsMtdName, tsClass);
+        if (tsMtd instanceof Local_1.Local || tsMtd instanceof ArkField_1.ArkField) {
+            const type = tsMtd.getType();
+            if (type instanceof Type_1.FunctionType) {
+                tsMtd = tsClass.getDeclaringArkFile().getScene().getMethod(type.getMethodSignature());
+            }
+        }
+        if (tsMtd instanceof ArkMethod_1.ArkMethod && cppMtd.getBody()) {
+            tsMtd.setImplementationSignature(cppMtd.getSignature());
+            tsMtd.setBody(cppMtd.getBody());
+        }
+    }
+}
+exports.CxxSceneUtils = CxxSceneUtils;

package/lib/utils/FileUtils.d.ts

@@ -7,15 +7,14 @@ export declare class FileUtils {
     static getIndexFileName(srcPath: string): string;
     static isDirectory(srcPath: string): boolean;
     static isAbsolutePath(path: string): boolean;
-    static generateModuleMap(ohPkgContentMap: Map<string, {
-        [k: string]: unknown;
-    }>): Map<string, ModulePath>;
     static getFileLanguage(file: string, fileTags?: Map<string, Language>): Language;
 }
-export declare class ModulePath {
-    path: string;
-    main: string;
-    constructor(path: string, main: string);
-}
 export declare function getFileRecursively(srcDir: string, fileName: string, visited?: Set<string>): string;
+/**
+ * Try to combine each source path in the array with the relative path, returning the first absolute path that exists.
+ * @param srcPathList Source path array (absolute or relative paths)
+ * @param relativePath The relative path to concatenate
+ * @returns The first concatenated absolute path that exists; otherwise returns an empty string
+ */
+export declare function getFileAbsPath(srcPathList: string[], relativePath: string): string;
 //# sourceMappingURL=FileUtils.d.ts.map

package/lib/utils/FileUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGhC;WAEY,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WAUrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;WAkClG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAgB1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA2BrH"}
+{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAOjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGhC;WAEY,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WAUrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAmB1F;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA2BrH;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAclF"}