arkanalyzer 1.0.6 → 1.0.8

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

@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTypeFromPreStr = exports.tsNode2Type = exports.buildReturnType = exports.buildGenericType = exports.buildParameters = exports.buildTypeParameters = exports.buildHeritageClauses = exports.buildModifiers = exports.handlePropertyAccessExpression = exports.handleQualifiedName = void 0;
+exports.buildTypeFromPreStr = exports.tsNode2Type = exports.buildReturnType = exports.buildGenericType = exports.buildParameters = exports.buildTypeParameters = exports.buildHeritageClauses = exports.buildModifiers = exports.buildDecorators = exports.handlePropertyAccessExpression = exports.handleQualifiedName = void 0;
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const Type_1 = require("../../base/Type");
 const TypeInference_1 = require("../../common/TypeInference");
@@ -52,6 +52,7 @@ const Decorator_1 = require("../../base/Decorator");
 const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
 const ArkClassBuilder_1 = require("./ArkClassBuilder");
 const Builtin_1 = require("../../common/Builtin");
+const ArkBaseModel_1 = require("../ArkBaseModel");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'builderUtils');
 function handleQualifiedName(node) {
     let right = node.right.text;
@@ -69,7 +70,7 @@ exports.handleQualifiedName = handleQualifiedName;
 function handlePropertyAccessExpression(node) {
     let right = node.name.text;
     let left = '';
-    if (ohos_typescript_1.default.SyntaxKind[node.expression.kind] == 'Identifier') {
+    if (ohos_typescript_1.default.SyntaxKind[node.expression.kind] === 'Identifier') {
         left = node.expression.text;
     }
     else if (ohos_typescript_1.default.isStringLiteral(node.expression)) {
@@ -82,50 +83,46 @@ function handlePropertyAccessExpression(node) {
     return propertyAccessExpressionName;
 }
 exports.handlePropertyAccessExpression = handlePropertyAccessExpression;
-function buildModifiers(node, sourceFile) {
-    var _a;
-    let modifiers = new Set();
-    function parseModifier(modifier) {
-        if (ohos_typescript_1.default.SyntaxKind[modifier.kind] == 'FirstContextualKeyword') {
-            modifiers.add('AbstractKeyword');
-        }
-        else if (ohos_typescript_1.default.isDecorator(modifier)) {
-            if (modifier.expression) {
-                let kind = '';
-                let param = '';
-                if (ohos_typescript_1.default.isIdentifier(modifier.expression)) {
-                    kind = modifier.expression.text;
-                }
-                else if (ohos_typescript_1.default.isCallExpression(modifier.expression)) {
-                    if (ohos_typescript_1.default.isIdentifier(modifier.expression.expression)) {
-                        kind = modifier.expression.expression.text;
-                    }
-                    if (modifier.expression.arguments.length > 0) {
-                        const arg = modifier.expression.arguments[0];
-                        if (ohos_typescript_1.default.isArrowFunction(arg)) {
-                            const body = arg.body;
-                            if (ohos_typescript_1.default.isIdentifier(body)) {
-                                param = body.text;
-                            }
-                        }
-                    }
-                }
-                const decorator = new Decorator_1.Decorator(kind);
-                decorator.setContent(modifier.expression.getText(sourceFile));
-                if (param != '') {
-                    decorator.setParam(param);
-                }
-                modifiers.add(decorator);
-            }
+function buildDecorators(node, sourceFile) {
+    let decorators = new Set();
+    ohos_typescript_1.default.getAllDecorators(node).forEach((decoratorNode) => {
+        let decorator = parseDecorator(decoratorNode);
+        if (decorator) {
+            decorator.setContent(decoratorNode.expression.getText(sourceFile));
+            decorators.add(decorator);
         }
-        else {
-            modifiers.add(ohos_typescript_1.default.SyntaxKind[modifier.kind]);
+    });
+    return decorators;
+}
+exports.buildDecorators = buildDecorators;
+function parseDecorator(node) {
+    if (!node.expression) {
+        return undefined;
+    }
+    let expression = node.expression;
+    if (ohos_typescript_1.default.isIdentifier(expression)) {
+        return new Decorator_1.Decorator(expression.text);
+    }
+    if (!ohos_typescript_1.default.isCallExpression(expression) || !ohos_typescript_1.default.isIdentifier(expression.expression)) {
+        return undefined;
+    }
+    let decorator = new Decorator_1.Decorator(expression.expression.text);
+    if (expression.arguments.length > 0) {
+        const arg = expression.arguments[0];
+        if (ohos_typescript_1.default.isArrowFunction(arg) && ohos_typescript_1.default.isIdentifier(arg.body)) {
+            decorator.setParam(arg.body.text);
         }
     }
+    return decorator;
+}
+function buildModifiers(node) {
+    var _a;
+    let modifiers = 0;
     if (ohos_typescript_1.default.canHaveModifiers(node)) {
-        (_a = ohos_typescript_1.default.getModifiers(node)) === null || _a === void 0 ? void 0 : _a.forEach(parseModifier);
+        (_a = ohos_typescript_1.default.getModifiers(node)) === null || _a === void 0 ? void 0 : _a.forEach((modifier) => {
+            modifiers |= (0, ArkBaseModel_1.modifierKind2Enum)(modifier.kind);
+        });
     }
-    ohos_typescript_1.default.getAllDecorators(node).forEach(parseModifier);
     return modifiers;
 }
 exports.buildModifiers = buildModifiers;
@@ -133,7 +130,20 @@ function buildHeritageClauses(heritageClauses) {
     let heritageClausesMap = new Map();
     heritageClauses === null || heritageClauses === void 0 ? void 0 : heritageClauses.forEach((heritageClause) => {
         heritageClause.types.forEach((type) => {
-            heritageClausesMap.set(type.getText(), ohos_typescript_1.default.SyntaxKind[heritageClause.token]);
+            let heritageClauseName = '';
+            if (type.typeArguments) {
+                heritageClauseName = type.getText();
+            }
+            else if (ohos_typescript_1.default.isIdentifier(type.expression)) {
+                heritageClauseName = type.expression.text;
+            }
+            else if (ohos_typescript_1.default.isPropertyAccessExpression(type.expression)) {
+                heritageClauseName = handlePropertyAccessExpression(type.expression);
+            }
+            else {
+                heritageClauseName = type.getText();
+            }
+            heritageClausesMap.set(heritageClauseName, ohos_typescript_1.default.SyntaxKind[heritageClause.token]);
         });
     });
     return heritageClausesMap;
@@ -275,7 +285,17 @@ function buildGenericType(type, arkInstance) {
         if (!gType) {
             gType = (_b = arkInstance.getDeclaringArkClass().getGenericsTypes()) === null || _b === void 0 ? void 0 : _b.find(f => f.getName() === typeName);
         }
-        return gType !== null && gType !== void 0 ? gType : urType;
+        if (gType) {
+            return gType;
+        }
+        const types = urType.getGenericTypes();
+        for (let i = 0; i < types.length; i++) {
+            const mayType = types[i];
+            if (mayType instanceof Type_1.UnclearReferenceType) {
+                types[i] = replace(mayType);
+            }
+        }
+        return urType;
     }
     if (type instanceof Type_1.UnclearReferenceType) {
         return replace(type);

package/lib/index.d.ts

@@ -36,7 +36,7 @@ export { ValueUtil } from './core/common/ValueUtil';
 export { VisibleValue, Scope } from './core/common/VisibleValue';
 export { DataflowProblem, FlowFunction } from './core/dataflow/DataflowProblem';
 export { DataflowResult } from './core/dataflow/DataflowResult';
-export { DataflowSolver, factEqual } from './core/dataflow/DataflowSolver';
+export { DataflowSolver } from './core/dataflow/DataflowSolver';
 export { Edge, PathEdgePoint, PathEdge } from './core/dataflow/Edge';
 export { Fact } from './core/dataflow/Fact';
 export { TiantAnalysisChecker, TiantAnalysisSolver } from './core/dataflow/TiantAnalysis';
@@ -67,6 +67,7 @@ export { SourceNamespace as SourceNamespacePrinter } from './save/source/SourceN
 export { SourceFilePrinter } from './save/source/SourceFilePrinter';
 export { JsonPrinter } from './save/JsonPrinter';
 export { GraphPrinter } from './save/GraphPrinter';
+export { ViewTreePrinter } from './save/ViewTreePrinter';
 export * from './transformer/StaticSingleAssignmentFormer';
 export * from './utils/callGraphUtils';
 export * from './utils/entryMethodUtils';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACvG,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAG9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,cAAc,iCAAiC,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAGvE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACrE,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAGtG,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0CAA0C,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3G,OAAO,EAAE,YAAY,IAAI,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,cAAc,4CAA4C,CAAC;AAG3D,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}

package/lib/index.js

@@ -28,8 +28,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DominanceTree = exports.DominanceFinder = exports.Cfg = exports.BasicBlock = exports.UndefinedVariableSolver = exports.UndefinedVariableChecker = exports.TiantAnalysisSolver = exports.TiantAnalysisChecker = exports.Fact = exports.PathEdge = exports.PathEdgePoint = exports.Edge = exports.factEqual = exports.DataflowSolver = exports.DataflowResult = exports.DataflowProblem = exports.Scope = exports.VisibleValue = exports.ValueUtil = exports.TypeInference = exports.StmtUseReplacer = exports.RefUseReplacer = exports.IRUtils = exports.ExprUseReplacer = exports.DummyMainCreater = exports.ModelUtils = exports.FullPosition = exports.LineColPosition = exports.Local = exports.DefUseChain = exports.Decorator = exports.Constant = exports.DiffPTData = exports.PtsSet = exports.PointerAnalysisConfig = exports.PointerAnalysis = exports.PagBuilder = exports.CSFuncID = exports.DummyCallCreator = exports.KLimitedContextSensitive = exports.CallGraphBuilder = exports.BaseGraph = exports.BaseNode = exports.BaseEdge = exports.CGStat = exports.PAGStat = exports.PTAStat = exports.RapidTypeAnalysis = exports.ClassHierarchyAnalysis = exports.AbstractAnalysis = void 0;
-exports.GraphPrinter = exports.JsonPrinter = exports.SourceFilePrinter = exports.SourceNamespacePrinter = exports.SourceClassPrinter = exports.SourceMethodPrinter = exports.DotFilePrinter = exports.DotNamespacePrinter = exports.DotClassPrinter = exports.DotMethodPrinter = exports.PrinterBuilder = exports.Printer = exports.Scene = exports.SceneConfig = exports.ArkBody = exports.ImportInfo = exports.ExportInfo = exports.ArkField = exports.ArkMethod = exports.ArkClass = exports.ArkNamespace = exports.ArkFile = void 0;
+exports.ArkFile = exports.DominanceTree = exports.DominanceFinder = exports.Cfg = exports.BasicBlock = exports.UndefinedVariableSolver = exports.UndefinedVariableChecker = exports.TiantAnalysisSolver = exports.TiantAnalysisChecker = exports.Fact = exports.PathEdge = exports.PathEdgePoint = exports.Edge = exports.DataflowSolver = exports.DataflowResult = exports.DataflowProblem = exports.Scope = exports.VisibleValue = exports.ValueUtil = exports.TypeInference = exports.StmtUseReplacer = exports.RefUseReplacer = exports.IRUtils = exports.ExprUseReplacer = exports.DummyMainCreater = exports.ModelUtils = exports.FullPosition = exports.LineColPosition = exports.Local = exports.DefUseChain = exports.Decorator = exports.Constant = exports.DiffPTData = exports.PtsSet = exports.PointerAnalysisConfig = exports.PointerAnalysis = exports.PagBuilder = exports.CSFuncID = exports.DummyCallCreator = exports.KLimitedContextSensitive = exports.CallGraphBuilder = exports.BaseGraph = exports.BaseNode = exports.BaseEdge = exports.CGStat = exports.PAGStat = exports.PTAStat = exports.RapidTypeAnalysis = exports.ClassHierarchyAnalysis = exports.AbstractAnalysis = void 0;
+exports.ViewTreePrinter = exports.GraphPrinter = exports.JsonPrinter = exports.SourceFilePrinter = exports.SourceNamespacePrinter = exports.SourceClassPrinter = exports.SourceMethodPrinter = exports.DotFilePrinter = exports.DotNamespacePrinter = exports.DotClassPrinter = exports.DotMethodPrinter = exports.PrinterBuilder = exports.Printer = exports.Scene = exports.SceneConfig = exports.ArkBody = exports.ImportInfo = exports.ExportInfo = exports.ArkField = exports.ArkMethod = exports.ArkClass = exports.ArkNamespace = void 0;
 // callgraph/algorithm
 var AbstractAnalysis_1 = require("./callgraph/algorithm/AbstractAnalysis");
 Object.defineProperty(exports, "AbstractAnalysis", { enumerable: true, get: function () { return AbstractAnalysis_1.AbstractAnalysis; } });
@@ -112,7 +112,6 @@ var DataflowResult_1 = require("./core/dataflow/DataflowResult");
 Object.defineProperty(exports, "DataflowResult", { enumerable: true, get: function () { return DataflowResult_1.DataflowResult; } });
 var DataflowSolver_1 = require("./core/dataflow/DataflowSolver");
 Object.defineProperty(exports, "DataflowSolver", { enumerable: true, get: function () { return DataflowSolver_1.DataflowSolver; } });
-Object.defineProperty(exports, "factEqual", { enumerable: true, get: function () { return DataflowSolver_1.factEqual; } });
 var Edge_1 = require("./core/dataflow/Edge");
 Object.defineProperty(exports, "Edge", { enumerable: true, get: function () { return Edge_1.Edge; } });
 Object.defineProperty(exports, "PathEdgePoint", { enumerable: true, get: function () { return Edge_1.PathEdgePoint; } });
@@ -179,6 +178,8 @@ var JsonPrinter_1 = require("./save/JsonPrinter");
 Object.defineProperty(exports, "JsonPrinter", { enumerable: true, get: function () { return JsonPrinter_1.JsonPrinter; } });
 var GraphPrinter_1 = require("./save/GraphPrinter");
 Object.defineProperty(exports, "GraphPrinter", { enumerable: true, get: function () { return GraphPrinter_1.GraphPrinter; } });
+var ViewTreePrinter_1 = require("./save/ViewTreePrinter");
+Object.defineProperty(exports, "ViewTreePrinter", { enumerable: true, get: function () { return ViewTreePrinter_1.ViewTreePrinter; } });
 // transformer
 __exportStar(require("./transformer/StaticSingleAssignmentFormer"), exports);
 // utils

package/lib/save/ArkStream.js

@@ -31,7 +31,7 @@ class ArkCodeBuffer {
         return this;
     }
     writeSpace(s) {
-        if (s.length == 0) {
+        if (s.length === 0) {
             return this;
         }
         this.write(s);

package/lib/save/DotPrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DotPrinter.d.ts","sourceRoot":"","sources":["../../src/save/DotPrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,OAAO;IACzC,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;gBAEL,MAAM,EAAE,SAAS,EAAE,OAAO,GAAE,OAAe;IAMhD,IAAI,IAAI,MAAM;IAmBd,YAAY,IAAI,MAAM;IAoB7B,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAQ9C,OAAO,CAAC,WAAW;IAuBnB,OAAO,CAAC,eAAe;CAO1B;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO;IACxC,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAE,OAAe;IAM5C,IAAI,IAAI,MAAM;IAoBd,YAAY,IAAI,MAAM;CAmBhC;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,OAAO;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;gBAEL,EAAE,EAAE,YAAY,EAAE,OAAO,GAAE,OAAe;IAM/C,IAAI,IAAI,MAAM;IAoBd,YAAY,IAAI,MAAM;CAkBhC;AAED;;GAEG;AACH,qBAAa,cAAe,SAAQ,OAAO;IACvC,OAAO,EAAE,OAAO,CAAC;gBAEL,OAAO,EAAE,OAAO;IAKrB,IAAI,IAAI,MAAM;IAqBd,YAAY,IAAI,MAAM;CAqBhC"}
+{"version":3,"file":"DotPrinter.d.ts","sourceRoot":"","sources":["../../src/save/DotPrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,OAAO;IACzC,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;gBAEL,MAAM,EAAE,SAAS,EAAE,OAAO,GAAE,OAAe;IAMhD,IAAI,IAAI,MAAM;IAmBd,YAAY,IAAI,MAAM;IAI7B,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAQ9C,OAAO,CAAC,WAAW;IAuBnB,OAAO,CAAC,eAAe;CAO1B;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO;IACxC,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAE,OAAe;IAM5C,IAAI,IAAI,MAAM;IAoBd,YAAY,IAAI,MAAM;CAmBhC;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,OAAO;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;gBAEL,EAAE,EAAE,YAAY,EAAE,OAAO,GAAE,OAAe;IAM/C,IAAI,IAAI,MAAM;IAoBd,YAAY,IAAI,MAAM;CAkBhC;AAED;;GAEG;AACH,qBAAa,cAAe,SAAQ,OAAO;IACvC,OAAO,EAAE,OAAO,CAAC;gBAEL,OAAO,EAAE,OAAO;IAKrB,IAAI,IAAI,MAAM;IAqBd,YAAY,IAAI,MAAM;CAqBhC"}

package/lib/save/DotPrinter.js

@@ -44,21 +44,7 @@ class DotMethodPrinter extends Printer_1.Printer {
         return this.printer.toString();
     }
     dumpOriginal() {
-        this.printer.clear();
-        if (this.nesting) {
-            this.printer.writeIndent().writeLine(`subgraph "cluster_Original_${this.method.getSignature()}" {`);
-        }
-        else {
-            this.printer.writeIndent().writeLine(`digraph "${this.method.getSignature()}" {`);
-        }
-        this.printer.incIndent();
-        this.printer.writeIndent().writeLine(`label="${this.method.getSignature()}_original";`);
-        let blocks = this.method.getOriginalCfg().getBlocks();
-        let prefix = `NodeOriginal${this.stringHashCode(this.method.getSignature().toString())}`;
-        this.printBlocks(blocks, prefix);
-        this.printer.decIndent();
-        this.printer.writeIndent().writeLine('}');
-        return this.printer.toString();
+        return '';
     }
     stringHashCode(name) {
         let hashCode = 0;

package/lib/save/GraphPrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphPrinter.d.ts","sourceRoot":"","sources":["../../src/save/GraphPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAY,WAAW,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6CpC,qBAAa,YAAY,CAAC,SAAS,SAAS,WAAW,CAAE,SAAQ,OAAO;IACpE,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAG,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAa;gBAE5B,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM;IAQ7B,UAAU,CAAC,CAAC,EAAE,MAAM;IAIpB,IAAI,IAAI,MAAM;IAMd,YAAY,IAAI,MAAM;IAItB,UAAU,IAAI,IAAI;IAMlB,UAAU,IAAI,IAAI;IAmClB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAQ/B,WAAW,IAAI,IAAI;IAanB,WAAW,IAAI,IAAI;CAG7B"}
+{"version":3,"file":"GraphPrinter.d.ts","sourceRoot":"","sources":["../../src/save/GraphPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAY,WAAW,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+CpC,qBAAa,YAAY,CAAC,SAAS,SAAS,WAAW,CAAE,SAAQ,OAAO;IACpE,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAG,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAa;gBAE5B,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM;IAQ7B,UAAU,CAAC,CAAC,EAAE,MAAM;IAIpB,IAAI,IAAI,MAAM;IAMd,YAAY,IAAI,MAAM;IAItB,UAAU,IAAI,IAAI;IAMlB,UAAU,IAAI,IAAI;IAmClB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAQ/B,WAAW,IAAI,IAAI;IAanB,WAAW,IAAI,IAAI;CAG7B"}

package/lib/save/GraphPrinter.js

@@ -54,6 +54,8 @@ function escapeStr(input) {
                 str = str.substring(0, i) + '\\' + str[i] + str.substring(i + 1);
                 ++i;
                 break;
+            default:
+                ;
         }
     }
     return str;
@@ -103,7 +105,7 @@ class GraphPrinter extends Printer_1.Printer {
         }
         for (let node of itor) {
             let nodeAttr = node.getDotAttr();
-            if (nodeAttr == '') {
+            if (nodeAttr === '') {
                 continue;
             }
             let nodeLabel = escapeStr(node.getDotLabel());
@@ -115,7 +117,7 @@ class GraphPrinter extends Printer_1.Printer {
     }
     writeEdge(edge) {
         let edgeAttr = edge.getDotAttr();
-        if (edgeAttr == '') {
+        if (edgeAttr === '') {
             return;
         }
         this.printer.writeLine(`\tNode${edge.getSrcID()} -> Node${edge.getDstID()}[${edgeAttr}]`);

package/lib/save/JsonPrinter.js

@@ -61,7 +61,7 @@ class JsonPrinter extends Printer_1.Printer {
         var _a;
         return {
             signature: this.serializeClassSignature(cls.getSignature()),
-            modifiers: Array.from(cls.getModifiers()),
+            modifiers: cls.getModifiers(),
             typeParameters: (_a = cls.getGenericsTypes()) === null || _a === void 0 ? void 0 : _a.map((type) => this.serializeType(type)),
             superClassName: cls.getSuperClassName(),
             implementedInterfaceNames: cls.getImplementedInterfaceNames(),
@@ -72,7 +72,7 @@ class JsonPrinter extends Printer_1.Printer {
     serializeField(field) {
         return {
             signature: this.serializeFieldSignature(field.getSignature()),
-            modifiers: Array.from(field.getModifiers()),
+            modifiers: field.getModifiers(),
             questionToken: field.getQuestionToken(),
             exclamationToken: field.getExclamationToken(),
         };
@@ -81,7 +81,7 @@ class JsonPrinter extends Printer_1.Printer {
         var _a;
         return {
             signature: this.serializeMethodSignature(method.getSignature()),
-            modifiers: Array.from(method.getModifiers()),
+            modifiers: method.getModifiers(),
             typeParameters: ((_a = method.getGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(type => this.serializeType(type))) || [],
             body: this.serializeMethodBody(method.getBody()),
         };
@@ -108,7 +108,7 @@ class JsonPrinter extends Printer_1.Printer {
             importType: importInfo.getImportType(),
             importFrom: importInfo.getFrom(),
             nameBeforeAs: importInfo.getNameBeforeAs(),
-            modifiers: Array.from(importInfo.getModifiers()),
+            modifiers: importInfo.getModifiers(),
             originTsPosition: this.serializeLineColPosition(importInfo.getOriginTsPosition()),
         };
     }
@@ -119,7 +119,7 @@ class JsonPrinter extends Printer_1.Printer {
             exportFrom: exportInfo.getFrom(),
             nameBeforeAs: exportInfo.getNameBeforeAs(),
             isDefault: exportInfo.isDefault(),
-            modifiers: Array.from(exportInfo.getModifiers()),
+            modifiers: exportInfo.getModifiers(),
             originTsPosition: this.serializeLineColPosition(exportInfo.getOriginTsPosition()),
         };
     }

package/lib/save/ViewTreePrinter.d.ts

@@ -0,0 +1,16 @@
+import { ViewTree } from '../core/graph/ViewTree';
+import { Printer } from './Printer';
+export declare class ViewTreePrinter extends Printer {
+    private viewTree;
+    private dupCnt;
+    constructor(viewTree: ViewTree);
+    dump(): string;
+    dumpOriginal(): string;
+    private walk;
+    private escapeDotLabel;
+    private writeNode;
+    private writeNodeStateValues;
+    private writeNodeAttributes;
+    private writeNodeSignature;
+}
+//# sourceMappingURL=ViewTreePrinter.d.ts.map

package/lib/save/ViewTreePrinter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewTreePrinter.d.ts","sourceRoot":"","sources":["../../src/save/ViewTreePrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAgB,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,eAAgB,SAAQ,OAAO;IACxC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,QAAQ;IAMvB,IAAI,IAAI,MAAM;IAcd,YAAY,IAAI,MAAM;IAI7B,OAAO,CAAC,IAAI;IAcZ,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,SAAS;IAwCjB,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,kBAAkB;CAY7B"}

package/lib/save/ViewTreePrinter.js

@@ -0,0 +1,130 @@
+"use strict";
+/*
+ * Copyright (c) 2024 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ViewTreePrinter = void 0;
+const EtsConst_1 = require("../core/common/EtsConst");
+const Printer_1 = require("./Printer");
+const DOT_FILE_HEADER = `digraph G {
+    graph [nodesep=0.1]
+    node [shape=box]
+    edge [arrowhead=vee]
+`;
+class ViewTreePrinter extends Printer_1.Printer {
+    constructor(viewTree) {
+        super();
+        this.viewTree = viewTree;
+        this.dupCnt = 0;
+    }
+    dump() {
+        this.printer.clear();
+        let root = this.viewTree.getRoot();
+        if (!root) {
+            return this.printer.toString();
+        }
+        this.printer.write(DOT_FILE_HEADER);
+        this.walk(root, root.parent);
+        this.printer.write('}');
+        return this.printer.toString();
+    }
+    dumpOriginal() {
+        return '';
+    }
+    walk(item, parent, map = new Map()) {
+        let skipChildren = this.writeNode(item, parent, map);
+        if (skipChildren) {
+            return;
+        }
+        for (const child of item.children) {
+            this.walk(child, item, map);
+        }
+    }
+    escapeDotLabel(content) {
+        const MAX_LABEL_LEN = 64;
+        const PRE_FIX_LEN = 5;
+        let label = content.join('|');
+        if (label.length > MAX_LABEL_LEN) {
+            return (label.substring(0, PRE_FIX_LEN) + '...' + label.substring(label.length - MAX_LABEL_LEN + PRE_FIX_LEN));
+        }
+        return label;
+    }
+    writeNode(item, parent, map) {
+        let id = `Node${map.size}`;
+        let hasSameNode = map.has(item) || map.has(item.signature);
+        if (hasSameNode) {
+            id = `${id}_${this.dupCnt++}`;
+            this.printer.write(`    ${id} [label="${item.name}" style=filled color="green"]\n`);
+        }
+        else {
+            this.printer.write(`    ${id} [label="${item.name}"]\n`);
+        }
+        if (parent) {
+            this.printer.write(`    ${map.get(parent)} -> ${id}\n`);
+        }
+        this.writeNodeStateValues(item, id);
+        this.writeNodeAttributes(item, id);
+        this.writeNodeSignature(item, id);
+        if (map.get(item)) {
+            this.printer.write(`    {rank="same"; ${id};${map.get(item)};}\n`);
+            this.printer.write(`    ${id} -> ${map.get(item)}[style=dotted]\n`);
+            return true;
+        }
+        else if (map.get(item.signature)) {
+            this.printer.write(`    {rank="same"; ${id};${map.get(item.signature)};}\n`);
+            this.printer.write(`    ${id} -> ${map.get(item.signature)}[style=dotted]\n`);
+            return true;
+        }
+        map.set(item, id);
+        if (item.signature && !map.has(item.signature)) {
+            map.set(item.signature, id);
+        }
+        return false;
+    }
+    writeNodeStateValues(item, id) {
+        if (item.stateValues.size > 0) {
+            let stateValuesId = `${id}val`;
+            let content = [];
+            item.stateValues.forEach((value) => {
+                content.push(value.getName());
+            });
+            this.printer.write(`    ${stateValuesId} [shape=ellipse label="StateValues\n ${this.escapeDotLabel(content)}" fontsize=10 height=.1 style=filled color=".7 .3 1.0" ]\n`);
+            this.printer.write(`    ${id} -> ${stateValuesId}\n`);
+        }
+    }
+    writeNodeAttributes(item, id) {
+        if (item.attributes.size > 0) {
+            let attributesId = `${id}attributes`;
+            let content = [];
+            for (const [key, _] of item.attributes) {
+                if (key !== EtsConst_1.COMPONENT_POP_FUNCTION) {
+                    content.push(key);
+                }
+            }
+            if (content.length > 0) {
+                this.printer.write(`    ${attributesId} [shape=ellipse label="property|Event\n${this.escapeDotLabel(content)}" fontsize=10 height=.1 style=filled color=".7 .3 1.0" ]\n`);
+                this.printer.write(`    ${id} -> ${attributesId}\n`);
+            }
+        }
+    }
+    writeNodeSignature(item, id) {
+        if (item.signature) {
+            let signatureId = `${id}signature`;
+            let content = [item.signature.toString()];
+            this.printer.write(`    ${signatureId} [shape=ellipse label="signature\n${this.escapeDotLabel(content)}" fontsize=10 height=.1 style=filled color=".7 .3 1.0" ]\n`);
+            this.printer.write(`    ${id} -> ${signatureId}\n`);
+        }
+    }
+}
+exports.ViewTreePrinter = ViewTreePrinter;

package/lib/save/source/SourceBase.d.ts

@@ -24,8 +24,8 @@ export declare abstract class SourceBase extends Printer implements Dump, Transf
     transTemp2Code(temp: Local): string;
     isInBuilderMethod(): boolean;
     abstract getLine(): number;
-    protected printDecorator(modifiers: Set<string | Decorator>): void;
-    protected modifiersToString(modifiers: Set<string | Decorator>): string;
+    protected printDecorator(docorator: Decorator[]): void;
+    protected modifiersToString(modifiers: number): string;
     protected resolveKeywordType(keywordStr: string): string;
     protected resolveMethodName(name: string): string;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SourceBase.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,WAAW,IAAI;IACjB,OAAO,IAAI,MAAM,CAAC;IAClB,IAAI,IAAI,MAAM,CAAC;CAClB;AAED,8BAAsB,UAClB,SAAQ,OACR,YAAW,IAAI,EAAE,kBAAkB;IAEnC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;gBAElB,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW;IAKjD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,UAAU,IAAI,OAAO;IAIrB,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAIvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,UAAU,IAAI,aAAa;IAI3B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAInC,iBAAiB,IAAI,OAAO;aAInB,OAAO,IAAI,MAAM;IAEjC,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI;IAQlE,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM;IAWvE,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAmBxD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAYpD"}
+{"version":3,"file":"SourceBase.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,MAAM,WAAW,IAAI;IACjB,OAAO,IAAI,MAAM,CAAC;IAClB,IAAI,IAAI,MAAM,CAAC;CAClB;AAED,8BAAsB,UAClB,SAAQ,OACR,YAAW,IAAI,EAAE,kBAAkB;IAEnC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;gBAElB,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW;IAKjD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,UAAU,IAAI,OAAO;IAIrB,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAIvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,UAAU,IAAI,aAAa;IAI3B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAInC,iBAAiB,IAAI,OAAO;aAInB,OAAO,IAAI,MAAM;IAEjC,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI;IAMtD,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtD,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAmBxD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAYpD"}

package/lib/save/source/SourceBase.js

@@ -15,8 +15,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceBase = void 0;
-const Decorator_1 = require("../../core/base/Decorator");
 const Printer_1 = require("../Printer");
+const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
 class SourceBase extends Printer_1.Printer {
     constructor(arkFile, indent = '') {
         super(indent);
@@ -44,20 +44,13 @@ class SourceBase extends Printer_1.Printer {
     isInBuilderMethod() {
         return this.inBuilder;
     }
-    printDecorator(modifiers) {
-        modifiers.forEach((value) => {
-            if (value instanceof Decorator_1.Decorator) {
-                this.printer.writeIndent().writeLine(`@${value.getContent()}`);
-            }
+    printDecorator(docorator) {
+        docorator.forEach((value) => {
+            this.printer.writeIndent().writeLine(`@${value.getContent()}`);
         });
     }
     modifiersToString(modifiers) {
-        let modifiersStr = [];
-        modifiers.forEach((value) => {
-            if (!(value instanceof Decorator_1.Decorator)) {
-                modifiersStr.push(this.resolveKeywordType(value));
-            }
-        });
+        let modifiersStr = (0, ArkBaseModel_1.modifiers2stringArray)(modifiers);
         return modifiersStr.join(' ');
     }
     resolveKeywordType(keywordStr) {
@@ -65,7 +58,7 @@ class SourceBase extends Printer_1.Printer {
         let types = [];
         for (let keyword of keywordStr.split('|')) {
             keyword = keyword.trim();
-            if (keyword.length == 0) {
+            if (keyword.length === 0) {
                 continue;
             }
             if (keyword.endsWith('Keyword')) {

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

@@ -1 +1 @@
-{"version":3,"file":"SourceBody.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBody.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAyD,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAGnG,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EASH,UAAU,EAIV,kBAAkB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,qBAAa,UAAW,YAAW,kBAAkB;IACjD,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,QAAQ,CAAO;gBAEJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO;IAcxE,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI7B,iBAAiB,IAAI,OAAO;IAG5B,iBAAiB,IAAI,OAAO;IAGrB,UAAU,IAAI,OAAO;IAIrB,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAQvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAI/B,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAIrC,aAAa,IAAI,UAAU;IAI3B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI7C,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IASnC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAInC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,UAAU,IAAI,aAAa;IAI3B,IAAI,IAAI,MAAM;IAKrB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,UAAU;IASX,QAAQ,IAAI,UAAU,EAAE;IAQxB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IASvC,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;CAqCnB;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,KAAK,EAAE,IAAI,EAAE;IAKzB,KAAK,IAAI,IAAI;IAIb,OAAO,IAAI,OAAO;IAIlB,IAAI,IAAI,IAAI;IAUZ,QAAQ,IAAI,IAAI;CAOnB"}
+{"version":3,"file":"SourceBody.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBody.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAA2C,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EASH,UAAU,EAIV,kBAAkB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkB7D,qBAAa,UAAW,YAAW,kBAAkB;IACjD,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,QAAQ,CAAO;gBAEJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO;IAcxE,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI7B,iBAAiB,IAAI,OAAO;IAG5B,iBAAiB,IAAI,OAAO;IAGrB,UAAU,IAAI,OAAO;IAIrB,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAQvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAI/B,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAIrC,aAAa,IAAI,UAAU;IAI3B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI7C,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IASnC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAInC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,UAAU,IAAI,aAAa;IAI3B,IAAI,IAAI,MAAM;IAKrB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,UAAU;IASX,QAAQ,IAAI,UAAU,EAAE;IAQxB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IASvC,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;CAqCnB;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,KAAK,EAAE,IAAI,EAAE;IAKzB,KAAK,IAAI,IAAI;IAIb,OAAO,IAAI,OAAO;IAIlB,IAAI,IAAI,IAAI;IAUZ,QAAQ,IAAI,IAAI;CAOnB"}