npm - arkanalyzer - Versions diffs - 1.0.93 → 1.0.95 - Mend

arkanalyzer 1.0.93 → 1.0.95

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (78) hide show

package/lib/core/model/ArkExport.js CHANGED Viewed

@@ -19,7 +19,6 @@ const Position_1 = require("../base/Position");
 const TSConst_1 = require("../common/TSConst");
 const ArkBaseModel_1 = require("./ArkBaseModel");
 const ArkMetadata_1 = require("./ArkMetadata");
-const StringUtils_1 = require("../common/StringUtils");
 var ExportType;
 (function (ExportType) {
     ExportType[ExportType["NAME_SPACE"] = 0] = "NAME_SPACE";
@@ -107,7 +106,7 @@ class ExportInfo extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCode !== undefined) {
             return this.sourceCode;
         }
-        const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.originFullPosition);
+        const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.originFullPosition);
         if (code !== undefined) {
             this.sourceCode = code;
             return code;

package/lib/core/model/ArkField.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAwD,MAAM,gBAAgB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;~~AAGrC~~,oBAAY,aAAa;IACrB,oBAAoB,IAAI;IACxB,mBAAmB,IAAI;IACvB,8BAA8B,IAAI;IAClC,iBAAiB,IAAI;IACrB,kBAAkB,IAAI;IACtB,WAAW,IAAI;IACf,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACzB;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,KAA2B,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAA8B,CAAC;AAE/D;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,cAAc,CAAY;IAElC,OAAO,CAAC,cAAc,CAAkB;IACxC,+EAA+E;IAC/E,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B,OAAO,CAAC,WAAW,CAAc;;IAMjC;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,oBAAoB,IAAI,QAAQ;IAIhC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,GAAG,IAAI;IAI3D;;;;OAIG;IACI,OAAO,IAAI,MAAM;IAYxB;;;OAGG;IACI,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAInC;;OAEG;IACI,eAAe,IAAI,IAAI;IAIvB,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,OAAO,IAAI,MAAM;IAIjB,OAAO,IAAI,IAAI;IAIf,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAInD;;;OAGG;IACI,cAAc,IAAI,IAAI,EAAE;IAIxB,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI;IAIzC,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAQ9C,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAQpD,gBAAgB,IAAI,OAAO;IAI3B,mBAAmB,IAAI,OAAO;IAIrC;;;OAGG;IACI,iBAAiB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IASzD;;;OAGG;IACI,iBAAiB,IAAI,eAAe;IAI3C;;;OAGG;IACI,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI1D;;;OAGG;IACI,qBAAqB,IAAI,YAAY;IAIrC,QAAQ,IAAI,QAAQ;IAKpB,QAAQ,IAAI,OAAO;IAcnB,kBAAkB,IAAI,IAAI;CAKpC"}
1	+ {"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAwD,MAAM,gBAAgB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,oBAAY,aAAa;IACrB,oBAAoB,IAAI;IACxB,mBAAmB,IAAI;IACvB,8BAA8B,IAAI;IAClC,iBAAiB,IAAI;IACrB,kBAAkB,IAAI;IACtB,WAAW,IAAI;IACf,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACzB;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,KAA2B,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAA8B,CAAC;AAE/D;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,cAAc,CAAY;IAElC,OAAO,CAAC,cAAc,CAAkB;IACxC,+EAA+E;IAC/E,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B,OAAO,CAAC,WAAW,CAAc;;IAMjC;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,oBAAoB,IAAI,QAAQ;IAIhC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,GAAG,IAAI;IAI3D;;;;OAIG;IACI,OAAO,IAAI,MAAM;IAYxB;;;OAGG;IACI,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAInC;;OAEG;IACI,eAAe,IAAI,IAAI;IAIvB,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,OAAO,IAAI,MAAM;IAIjB,OAAO,IAAI,IAAI;IAIf,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAInD;;;OAGG;IACI,cAAc,IAAI,IAAI,EAAE;IAIxB,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI;IAIzC,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAQ9C,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAQpD,gBAAgB,IAAI,OAAO;IAI3B,mBAAmB,IAAI,OAAO;IAIrC;;;OAGG;IACI,iBAAiB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IASzD;;;OAGG;IACI,iBAAiB,IAAI,eAAe;IAI3C;;;OAGG;IACI,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI1D;;;OAGG;IACI,qBAAqB,IAAI,YAAY;IAIrC,QAAQ,IAAI,QAAQ;IAKpB,QAAQ,IAAI,OAAO;IAcnB,kBAAkB,IAAI,IAAI;CAKpC"}

package/lib/core/model/ArkField.js CHANGED Viewed

@@ -18,7 +18,6 @@ exports.ArkField = exports.FIELD_CATEGORY_MASK = exports.FIELD_CATEGORY_SHIFT =
 const Position_1 = require("../base/Position");
 const ArkClass_1 = require("./ArkClass");
 const ArkBaseModel_1 = require("./ArkBaseModel");
-const StringUtils_1 = require("../common/StringUtils");
 var FieldCategory;
 (function (FieldCategory) {
     FieldCategory[FieldCategory["PROPERTY_DECLARATION"] = 0] = "PROPERTY_DECLARATION";
@@ -70,7 +69,7 @@ class ArkField extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCode !== undefined) {
             return this.sourceCode;
         }
-        const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkClass().getDeclaringArkFile().getCode(), this.originFullPosition);
+        const code = this.getDeclaringArkClass().getDeclaringArkFile().getSourceTextByFullPosition(this.originFullPosition);
         if (code !== undefined) {
             this.sourceCode = code;
             return code;

package/lib/core/model/ArkFile.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import { ImportInfo } from './ArkImport';
 import { ArkClass } from './ArkClass';
 import { ArkNamespace } from './ArkNamespace';
 import { ClassSignature, FileSignature, NamespaceSignature } from './ArkSignature';
+import { FullPosition } from '../base/Position';
 import { ts } from '../../index';
 export declare const notStmtOrExprKind: string[];
 export declare enum Language {
@@ -25,6 +26,8 @@ export declare class ArkFile {
     private projectDir;
     /** Cached source text of this file, lazily loaded from the file system. */
     private sourceCode?;
+    /** Cached line-start offsets for {@link sourceCode}; invalidated when code changes. */
+    private lineStarts?;
     private defaultClass;
     private namespaces;
     private classes;
@@ -82,6 +85,15 @@ export declare class ArkFile {
      * @returns the codes of file, or undefined if the file cannot be read.
      */
     getCode(): string;
+    /**
+     * Returns cached absolute offsets of each line start in {@link getCode}.
+     * Built once per source text and reused by position-based source extraction.
+     */
+    getLineStarts(): number[];
+    /**
+     * Extracts a source slice by full position using the cached {@link getLineStarts} map.
+     */
+    getSourceTextByFullPosition(position: FullPosition | undefined): string | undefined;
     /**
      * Clears the cached source text, forcing re-read from file system on next getCode call.
      */

package/lib/core/model/ArkFile.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArkFile.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkFile.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAa,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAuB,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;~~AAGxG~~,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAMjC,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AAEF,oBAAY,QAAQ;IAChB,UAAU,IAAI;IACd,QAAQ,IAAI;IACZ,QAAQ,IAAI;IACZ,UAAU,IAAI;IACd,GAAG,IAAI;IACP,GAAG,IAAI;IACP,OAAO,KAAK;CACf;AAED;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,gBAAgB,CAAc;IACtC,OAAO,CAAC,UAAU,CAAc;IAChC,2EAA2E;IAC3E,OAAO,CAAC,UAAU,CAAC,CAAS;~~IAE5B~~,OAAO,CAAC,YAAY,CAAY;IAGhC,OAAO,CAAC,UAAU,CAA8D;IAChF,OAAO,CAAC,OAAO,CAAsD;IAErE,OAAO,CAAC,aAAa,CAA0D;IAC/E,OAAO,CAAC,aAAa,CAA0D;IAE/E,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,SAAS,CAAC,CAAY;IAE9B,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,kBAAkB,CAAY;IAEtC,OAAO,CAAC,oBAAoB,CAAa;IAEzC,OAAO,CAAC,wBAAwB,CAAa;IAE7C,OAAO,CAAC,GAAG,CAA8B;gBAE7B,QAAQ,EAAE,QAAQ;IAI9B;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAI5C;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIjB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAInC;;;;;OAKG;IACI,QAAQ,IAAI,KAAK;IAIjB,cAAc,IAAI,WAAW,GAAG,SAAS;IAIzC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAI9C,YAAY,IAAI,SAAS,GAAG,SAAS;IAIrC,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIxC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIvC,aAAa,IAAI,MAAM;IAI9B;;;;;;;;;OASG;IACI,WAAW,IAAI,MAAM;IAIrB,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAI3C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;~~IAIlC~~;;;;OAIG;IACI,OAAO,IAAI,MAAM;~~IAcxB~~;;OAEG;IACI,eAAe,IAAI,IAAI;~~IAIvB~~,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAmB1D,eAAe,IAAI,QAAQ;IAI3B,eAAe,CAAC,YAAY,EAAE,QAAQ,GAAG,IAAI;IAI7C,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAKzE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIhE,aAAa,IAAI,YAAY,EAAE;IAItC;;;;OAIG;IACI,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAKzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAiB3D,OAAO,CAAC,oBAAoB;IAerB,UAAU,IAAI,QAAQ,EAAE;IAIxB,YAAY,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAIlD;;;;OAIG;IACI,cAAc,IAAI,UAAU,EAAE;IAe9B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAI3C,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAIjD,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO;IAMjD,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAM3C,cAAc,IAAI,UAAU,EAAE;IAUrC;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACI,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAyBrD,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAIzD,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ5D,cAAc,IAAI,MAAM;IAIxB,aAAa,IAAI,MAAM,GAAG,SAAS;IAInC,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzD,qBAAqB,IAAI,MAAM,EAAE;IAIxC;;;OAGG;IACI,gBAAgB,IAAI,aAAa;IAIjC,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAIpD,6BAA6B,IAAI,YAAY,EAAE;IAS/C,uBAAuB,IAAI,MAAM;IAIjC,2BAA2B,IAAI,MAAM;IAIrC,MAAM,IAAI,EAAE,CAAC,UAAU,GAAG,IAAI;IAI9B,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,GAAG,IAAI;IAIzC,kBAAkB,IAAI,IAAI;CAgBpC"}
1	+ {"version":3,"file":"ArkFile.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkFile.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkFile.js CHANGED Viewed

@@ -46,6 +46,7 @@ const ArkNamespace_1 = require("./ArkNamespace");
 const ArkSignature_1 = require("./ArkSignature");
 const TSConst_1 = require("../common/TSConst");
 const Const_1 = require("../common/Const");
+const StringUtils_1 = require("../common/StringUtils");
 const SdkUtils_1 = require("../common/SdkUtils");
 const logger_1 = __importStar(require("../../utils/logger"));
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFile');
@@ -159,6 +160,7 @@ class ArkFile {
     }
     setCode(code) {
         this.sourceCode = code;
+        this.lineStarts = undefined;
     }
     /**
      * Returns the codes of file as a **string.**
@@ -172,6 +174,7 @@ class ArkFile {
         try {
             const sourceText = fs_1.default.readFileSync(this.absoluteFilePath, 'utf8');
             this.sourceCode = sourceText;
+            this.lineStarts = undefined;
             return this.sourceCode;
         }
         catch (error) {
@@ -179,11 +182,28 @@ class ArkFile {
             return '';
         }
     }
+    /**
+     * Returns cached absolute offsets of each line start in {@link getCode}.
+     * Built once per source text and reused by position-based source extraction.
+     */
+    getLineStarts() {
+        if (this.lineStarts === undefined) {
+            this.lineStarts = (0, StringUtils_1.buildLineStarts)(this.getCode());
+        }
+        return this.lineStarts;
+    }
+    /**
+     * Extracts a source slice by full position using the cached {@link getLineStarts} map.
+     */
+    getSourceTextByFullPosition(position) {
+        return (0, StringUtils_1.extractSourceTextByFullPosition)(this.getCode(), position, this.getLineStarts());
+    }
     /**
      * Clears the cached source text, forcing re-read from file system on next getCode call.
      */
     clearSourceCode() {
         this.sourceCode = undefined;
+        this.lineStarts = undefined;
     }
     addArkClass(arkClass, originName) {
         const name = originName !== null && originName !== void 0 ? originName : arkClass.getName();

package/lib/core/model/ArkImport.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArkImport.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkImport.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,EAAE,YAAY,EAA4B,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;~~AAG9C~~;;;GAGG;AACH,eAAO,MAAM,iBAAiB,KAA2B,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAA2B,CAAC;AAEzD;;;;GAIG;AACH,oBAAY,UAAU;IAClB,oFAAoF;IACpF,WAAW,IAAI;IACf,kDAAkD;IAClD,iBAAiB,IAAI;IACrB,6BAA6B;IAC7B,oBAAoB,IAAI;IACxB,gCAAgC;IAChC,gBAAgB,IAAI;IACpB,6BAA6B;IAC7B,aAAa,IAAI;IACjB,kFAAkF;IAClF,iBAAiB,IAAI;CACxB;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,YAAa,YAAW,QAAQ;IAC5D,OAAO,CAAC,gBAAgB,CAAc;IACtC,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAAW;IAEnC,2EAA2E;IAC3E,OAAO,CAAC,kBAAkB,CAAgB;IAC1C;gFAC4E;IAC5E,OAAO,CAAC,sBAAsB,CAAC,CAAe;IAC9C,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAoB;;IAM3C;;OAEG;IACI,WAAW,IAAI,QAAQ;IAI9B;;;;;;;;OAQG;IACI,KAAK,CACR,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,YAAY,EAChC,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,sBAAsB,CAAC,EAAE,YAAY,GACtC,IAAI;IAYA,aAAa,IAAI,MAAM;IAI9B;;;;;OAKG;IACI,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAYtC,aAAa,IAAI,UAAU,GAAG,IAAI,GAAG,SAAS;IAI9C,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;IAIlD,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAIpD,mBAAmB,IAAI,OAAO;IAI9B,mBAAmB,IAAI,MAAM;IAI7B,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAI1D;;;;;OAKG;IACI,gBAAgB,IAAI,UAAU;IAIrC;;;;OAIG;IACI,gBAAgB,CAAC,aAAa,EAAE,UAAU,GAAG,IAAI;IAIxD;;;;OAIG;IACI,aAAa,IAAI,MAAM;IAkB9B;;;;OAIG;IACI,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAwBvC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIvC,eAAe,IAAI,MAAM,GAAG,SAAS;IAIrC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAI9D;;;OAGG;IACI,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,GAAG,IAAI;IASnE;;;OAGG;IACI,mBAAmB,IAAI,eAAe;IAO7C;;;OAGG;IACI,qBAAqB,CAAC,kBAAkB,EAAE,YAAY,GAAG,IAAI;IAIpE;;;OAGG;IACI,qBAAqB,IAAI,YAAY;IAI5C;;;OAGG;IACI,yBAAyB,CAAC,sBAAsB,EAAE,YAAY,GAAG,IAAI;IAI5E;;;;OAIG;IACI,yBAAyB,IAAI,YAAY,GAAG,SAAS;IAI5D;;;OAGG;IACI,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAGnD;;;;OAIG;IACI,eAAe,IAAI,MAAM;IAYhC;;OAEG;IACI,eAAe,IAAI,IAAI;IAIvB,OAAO,IAAI,MAAM,GAAG,SAAS;IAI7B,SAAS,IAAI,OAAO;IAOpB,QAAQ,IAAI,QAAQ;IAIpB,kBAAkB,IAAI,IAAI;CAKpC"}
1	+ {"version":3,"file":"ArkImport.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkImport.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkImport.js CHANGED Viewed

@@ -20,7 +20,6 @@ const Position_1 = require("../base/Position");
 const ModelUtils_1 = require("../common/ModelUtils");
 const ModelUtils_2 = require("../../frontend/cppFrontend/common/ModelUtils");
 const ArkBaseModel_1 = require("./ArkBaseModel");
-const StringUtils_1 = require("../common/StringUtils");
 /**
  * Shift amount for import type encoding in ImportInfo tags field.
  * Uses CLASS_SPECIFIC_TAG_SHIFT as the base offset for class-specific properties.
@@ -263,7 +262,7 @@ class ImportInfo extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCode !== undefined) {
             return this.sourceCode;
         }
-        const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.originFullPosition);
+        const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.originFullPosition);
         if (code !== undefined) {
             this.sourceCode = code;
             return code;

package/lib/core/model/ArkMethod.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArkMethod.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMethod.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAc,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAgC,iBAAiB,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,EAAgB,WAAW,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqC,OAAO,EAAc,MAAM,kBAAkB,CAAC;AACxG,OAAO,EAAE,YAAY,EAA8B,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAgB,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAC;~~AAKtF~~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"}
1	+ {"version":3,"file":"ArkMethod.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMethod.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkMethod.js CHANGED Viewed

@@ -25,7 +25,6 @@ const Position_1 = require("../base/Position");
 const ArkBaseModel_1 = require("./ArkBaseModel");
 const ArkError_1 = require("../common/ArkError");
 const TSConst_1 = require("../common/TSConst");
-const StringUtils_1 = require("../common/StringUtils");
 const Type_2 = require("../../frontend/cppFrontend/base/Type");
 const ModelUtils_1 = require("../common/ModelUtils");
 exports.arkMethodNodeKind = [
@@ -71,14 +70,14 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
             return this.sourceCode;
         }
         if (this.implOriginFullPosition !== undefined) {
-            const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.implOriginFullPosition);
+            const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.implOriginFullPosition);
             if (code !== undefined) {
                 this.sourceCode = code;
             }
             return code;
         }
         if (this.declareOriginFullPositions && this.declareOriginFullPositions.length > 0) {
-            const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.declareOriginFullPositions[0]);
+            const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.declareOriginFullPositions[0]);
             if (code !== undefined) {
                 this.sourceCode = code;
             }

package/lib/core/model/ArkNamespace.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAuB,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;~~AAK9C~~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"}
1	+ {"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkNamespace.js CHANGED Viewed

@@ -22,7 +22,6 @@ const Position_1 = require("../base/Position");
 const ArkBaseModel_1 = require("./ArkBaseModel");
 const Const_1 = require("../common/Const");
 const SdkUtils_1 = require("../common/SdkUtils");
-const StringUtils_1 = require("../common/StringUtils");
 /**
  * @category core/model
  */
@@ -95,9 +94,9 @@ class ArkNamespace extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCodes !== undefined) {
             return this.sourceCodes;
         }
-        const fileCode = this.getDeclaringArkFile().getCode();
+        const file = this.getDeclaringArkFile();
         const codes = this.originFullPositions
-            .map(position => (0, StringUtils_1.extractSourceTextByFullPosition)(fileCode, position))
+            .map(position => file.getSourceTextByFullPosition(position))
             .filter((code) => code !== undefined);
         this.sourceCodes = codes;
         return codes;

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

@@ -530,12 +530,13 @@ function createEnumInitValue(field, enumFieldInfo) {
 }
 function setFieldInitPositionInfo(field, stmts, initValue) {
     const fieldOriginPosition = field.getOriginFullPosition();
-    for (const stmt of stmts) {
+    const fieldInitStmts = stmts.filter(stmt => !(stmt instanceof ArkIRTransformer_1.DummyStmt));
+    for (const stmt of fieldInitStmts) {
         if (!stmt.getOriginFullPosition()) {
             stmt.setOriginFullPosition(fieldOriginPosition);
         }
     }
-    field.setInitializer(stmts);
+    field.setInitializer(fieldInitStmts);
     if (field.getType() instanceof Type_1.UnknownType) {
         field.getSignature().setType(initValue.getType());
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "files": [
     "lib",
     "config"

package/lib/node_modules/ohos-typescript/README.OpenSource DELETED Viewed

@@ -1,11 +0,0 @@
-[
-  {
-    "Name": "typescript",
-    "License": "Apache-2.0",
-    "License File": "LICENSE",
-    "Version Number": "4.9.5",
-    "Owner": "lihong67@huawei.com",
-    "Upstream URL": "https://github.com/Microsoft/TypeScript.git",
-    "Description": "TypeScript is a language for application scale JavaScript development."
-  }
-]

package/lib/node_modules/ohos-typescript/README.md DELETED Viewed

@@ -1,81 +0,0 @@
-# TypeScript
-[![GitHub Actions CI](https://github.com/microsoft/TypeScript/workflows/CI/badge.svg)](https://github.com/microsoft/TypeScript/actions?query=workflow%3ACI)
-[![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
-[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
-[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
-[TypeScript](https://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types to JavaScript that support tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](https://www.typescriptlang.org/play/), and stay up to date via [our blog](https://blogs.msdn.microsoft.com/typescript) and [Twitter account](https://twitter.com/typescript).
-Find others who are using TypeScript at [our community page](https://www.typescriptlang.org/community/).
-## Installing
-For the latest stable version:
-```bash
-npm install -g typescript
-```
-For our nightly builds:
-```bash
-npm install -g typescript@next
-```
-## Contribute
-There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md) to TypeScript.
-* [Submit bugs](https://github.com/microsoft/TypeScript/issues) and help us verify fixes as they are checked in.
-* Review the [source code changes](https://github.com/microsoft/TypeScript/pulls).
-* Engage with other TypeScript users and developers on [StackOverflow](https://stackoverflow.com/questions/tagged/typescript).
-* Help each other in the [TypeScript Community Discord](https://discord.gg/typescript).
-* Join the [#typescript](https://twitter.com/search?q=%23TypeScript) discussion on Twitter.
-* [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md).
-* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
- [pdf](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/main/doc/spec-ARCHIVED.md)).
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see
-the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com)
-with any additional questions or comments.
-## Documentation
-*  [TypeScript in 5 minutes](https://www.typescriptlang.org/docs/handbook/typescript-in-5-minutes.html)
-*  [Programming handbook](https://www.typescriptlang.org/docs/handbook/intro.html)
-*  [Homepage](https://www.typescriptlang.org/)
-## Roadmap
-For details on our planned features and future direction please refer to our [roadmap](https://github.com/microsoft/TypeScript/wiki/Roadmap).
-## Changes
-We made the following code modifications to support the ETS development paradigm.
-### October 2021
-* [x] Support custom component `struct` syntax, and add `StructDeclaration` and `EtsComponentExpression` node type.
-### November 2021
-* [x] Support `gotoDefinition` for custom component name and arguments.
-* [x] Support completion of lifecycle for `StructDeclaration` type.
-* [x] Support `@Builder` decorator for function and method.
-### January 2022
-* [x] Optimize eTS language support.
-* [x] Support `@BuilderParam` decorator and custom container lambda syntax.
-* [x] Add jsDoc and displayParts info in `getCompletionAtPosition` interface.
-* [x] Support eTS language ScriptKind and Extension.
-* [x] Add `PropertyAccessExpressionConditionCheck` for eTS.
-### February 2022
-* [x] Support `@Styles` decorator and related syntax.
-* [x] Add check for `struct` name contain reserved tag name.
-* [x] Support `stateStyles` property.
-* [x] Performance optimization for eTS completion.
-* [x] Support `@Extend` and `@Styles` decorators for function.

package/lib/node_modules/ohos-typescript/SECURITY.md DELETED Viewed

@@ -1,41 +0,0 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
-## Security
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
-## Reporting Security Issues
-**Please do not report security vulnerabilities through public GitHub issues.**
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-This information will help us triage your report more quickly.
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
-## Preferred Languages
-We prefer all communications to be in English.
-## Policy
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
-<!-- END MICROSOFT SECURITY.MD BLOCK -->