From 95a19e3b841c1f40e66db15de18f8202982f006c Mon Sep 17 00:00:00 2001
From: zhangchen168 <zhangchen168@huawei.com>
Date: Sun, 3 Sep 2023 19:25:30 +0800
Subject: [PATCH] Update the ohos-typescript

Issue: https://gitee.com/openharmony/third_party_typescript/issues/I6LJEX

Signed-off-by: zhangchen168 <zhangchen168@huawei.com>
Change-Id: I043fe81024a9a8cbbaebc910c55e05de5986ad0d
---
 arkguard/package.json                                     | 8 ++++----
 arkguard/scripts/grammarTestScript.js                     | 2 +-
 arkguard/src/ArkObfuscator.ts                             | 4 ++--
 arkguard/src/common/ApiExtractor.ts                       | 4 ++--
 arkguard/src/transformers/TransformPlugin.ts              | 2 +-
 arkguard/src/transformers/TransformerManager.ts           | 2 +-
 .../src/transformers/layout/DisableConsoleTransformer.ts  | 4 ++--
 .../src/transformers/layout/DisableHilogTransformer.ts    | 4 ++--
 arkguard/src/transformers/layout/SimplifyTransformer.ts   | 4 ++--
 .../transformers/rename/RenameIdentifierTransformer.ts    | 4 ++--
 .../transformers/rename/RenamePropertiesTransformer.ts    | 4 ++--
 .../transformers/rename/ShorthandPropertyTransformer.ts   | 4 ++--
 arkguard/src/utils/NodeUtils.ts                           | 4 ++--
 arkguard/src/utils/OhsUtil.ts                             | 4 ++--
 arkguard/src/utils/ScopeAnalyzer.ts                       | 4 ++--
 arkguard/src/utils/SourceMapUtil.ts                       | 4 ++--
 arkguard/src/utils/TransformUtil.ts                       | 4 ++--
 arkguard/src/utils/TypeUtils.ts                           | 4 ++--
 arkguard/test/ut/utils/TransformUtil.spec.ts              | 2 +-
 arkguard/test/ut/utils/TypeUtils.spec.ts                  | 2 +-
 20 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/arkguard/package.json b/arkguard/package.json
index ca3d370beb..87fbcf1285 100644
--- a/arkguard/package.json
+++ b/arkguard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arkguard",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "An obfuscator tools for open harmony apps.",
   "bin": {
     "arkguard": "bin/secharmony"
@@ -9,10 +9,10 @@
   "types": "lib/ArkObfuscator.d.ts",
   "scripts": {
     "clean": "rm -rf lib/*",
-    "build": "npm run clean && node node_modules/typescript/lib/tsc.js",
+    "build": "npm run clean && node node_modules/ohos-typescript/lib/tsc.js",
     "test": "npm run test:ut && npm run test:grammar",
-    "test:ut": "node ./node_modules/mocha/bin/mocha --require ts-node/register ./test/ut/**/*.ts",
-    "test:grammar": "rm -rf test/local && node --loader=ts-node/esm ./src/cli/SecHarmony.ts ./test/grammar --config-path ./scripts/grammarTestConfig.json && node ./scripts/grammarTestScript.js"
+    "test:ut": "TS_NODE_COMPILER=ohos-typescript node ./node_modules/mocha/bin/mocha --require ts-node/register ./test/ut/**/*.ts",
+    "test:grammar": "rm -rf test/local && TS_NODE_COMPILER=ohos-typescript node --loader=ts-node/esm ./src/cli/SecHarmony.ts ./test/grammar --config-path ./scripts/grammarTestConfig.json && node ./scripts/grammarTestScript.js"
   },
   "repository": {
     "type": "git",
diff --git a/arkguard/scripts/grammarTestScript.js b/arkguard/scripts/grammarTestScript.js
index e173f279ef..e35cd7a0d1 100644
--- a/arkguard/scripts/grammarTestScript.js
+++ b/arkguard/scripts/grammarTestScript.js
@@ -6,7 +6,7 @@ const testDirectory = path.resolve('./test/local');
 
 function runTest(filePath) {
   try {
-    const command = `node ./node_modules/ts-node/dist/bin.js ${filePath}`;
+    const command = `TS_NODE_COMPILER=ohos-typescript node ./node_modules/ts-node/dist/bin.js ${filePath}`;
     execSync(command);
     return true;
   } catch (error) {
diff --git a/arkguard/src/ArkObfuscator.ts b/arkguard/src/ArkObfuscator.ts
index 9d8af3cfee..3ee345bf9f 100644
--- a/arkguard/src/ArkObfuscator.ts
+++ b/arkguard/src/ArkObfuscator.ts
@@ -19,7 +19,7 @@ import {
   ScriptTarget,
   transform,
   createObfTextSingleLineWriter,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   CompilerOptions,
@@ -32,7 +32,7 @@ import type {
   SourceMapGenerator,
   TransformationResult,
   TransformerFactory,
-} from 'typescript';
+} from "ohos-typescript";
 
 import * as fs from 'fs';
 import path from 'path';
diff --git a/arkguard/src/common/ApiExtractor.ts b/arkguard/src/common/ApiExtractor.ts
index c8c9754a69..b62e5fb58f 100644
--- a/arkguard/src/common/ApiExtractor.ts
+++ b/arkguard/src/common/ApiExtractor.ts
@@ -17,7 +17,7 @@ import type {
   ModifiersArray,
   Node,
   SourceFile
-} from 'typescript';
+} from "ohos-typescript";
 
 import {
   createSourceFile,
@@ -42,7 +42,7 @@ import {
   isStringLiteral,
   ScriptTarget,
   SyntaxKind,
-} from 'typescript';
+} from "ohos-typescript";
 
 import fs from 'fs';
 import path from 'path';
diff --git a/arkguard/src/transformers/TransformPlugin.ts b/arkguard/src/transformers/TransformPlugin.ts
index f4d43dc606..7bff139160 100644
--- a/arkguard/src/transformers/TransformPlugin.ts
+++ b/arkguard/src/transformers/TransformPlugin.ts
@@ -14,7 +14,7 @@
  */
 
 import type {IOptions} from '../configs/IOptions';
-import type {Node, TransformerFactory} from 'typescript';
+import type {Node, TransformerFactory} from "ohos-typescript";
 
 export interface TransformPlugin {
   name: string;
diff --git a/arkguard/src/transformers/TransformerManager.ts b/arkguard/src/transformers/TransformerManager.ts
index dee28a04e9..afbe76df30 100644
--- a/arkguard/src/transformers/TransformerManager.ts
+++ b/arkguard/src/transformers/TransformerManager.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import type {Node, TransformerFactory} from 'typescript';
+import type {Node, TransformerFactory} from "ohos-typescript";
 import {lstatSync, readdirSync} from 'fs';
 import {join, resolve} from 'path';
 
diff --git a/arkguard/src/transformers/layout/DisableConsoleTransformer.ts b/arkguard/src/transformers/layout/DisableConsoleTransformer.ts
index ee1b5fe02d..6720977a24 100644
--- a/arkguard/src/transformers/layout/DisableConsoleTransformer.ts
+++ b/arkguard/src/transformers/layout/DisableConsoleTransformer.ts
@@ -24,7 +24,7 @@ import {
   isSourceFile,
   setParentRecursive,
   visitEachChild
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   Block,
@@ -36,7 +36,7 @@ import type {
   TransformationContext,
   Transformer,
   TransformerFactory
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {IOptions} from '../../configs/IOptions';
 import type {TransformPlugin} from '../TransformPlugin';
diff --git a/arkguard/src/transformers/layout/DisableHilogTransformer.ts b/arkguard/src/transformers/layout/DisableHilogTransformer.ts
index 7b9193acfd..3d2b8a40fd 100644
--- a/arkguard/src/transformers/layout/DisableHilogTransformer.ts
+++ b/arkguard/src/transformers/layout/DisableHilogTransformer.ts
@@ -24,7 +24,7 @@ import {
   isSourceFile,
   setParentRecursive,
   visitEachChild
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   Block,
@@ -36,7 +36,7 @@ import type {
   TransformationContext,
   Transformer,
   TransformerFactory
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {IOptions} from '../../configs/IOptions';
 import type {TransformPlugin} from '../TransformPlugin';
diff --git a/arkguard/src/transformers/layout/SimplifyTransformer.ts b/arkguard/src/transformers/layout/SimplifyTransformer.ts
index b40c612eab..f69a890431 100644
--- a/arkguard/src/transformers/layout/SimplifyTransformer.ts
+++ b/arkguard/src/transformers/layout/SimplifyTransformer.ts
@@ -24,7 +24,7 @@ import {
   SyntaxKind,
   visitEachChild,
   isStringLiteral,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   ExpressionStatement,
@@ -40,7 +40,7 @@ import type {
   SourceFile,
   Block,
   Expression
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {IOptions} from '../../configs/IOptions';
 import type {TransformPlugin} from '../TransformPlugin';
diff --git a/arkguard/src/transformers/rename/RenameIdentifierTransformer.ts b/arkguard/src/transformers/rename/RenameIdentifierTransformer.ts
index 412928c20a..e8061d4ba4 100644
--- a/arkguard/src/transformers/rename/RenameIdentifierTransformer.ts
+++ b/arkguard/src/transformers/rename/RenameIdentifierTransformer.ts
@@ -22,7 +22,7 @@ import {
   isSourceFile,
   setParentRecursive,
   visitEachChild,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   Identifier,
@@ -33,7 +33,7 @@ import type {
   Transformer,
   TransformerFactory,
   TypeChecker
-} from 'typescript';
+} from "ohos-typescript";
 
 import {
   createScopeManager,
diff --git a/arkguard/src/transformers/rename/RenamePropertiesTransformer.ts b/arkguard/src/transformers/rename/RenamePropertiesTransformer.ts
index 2b9097bfe7..ab710ce159 100644
--- a/arkguard/src/transformers/rename/RenamePropertiesTransformer.ts
+++ b/arkguard/src/transformers/rename/RenamePropertiesTransformer.ts
@@ -29,7 +29,7 @@ import {
   setParentRecursive,
   visitEachChild,
   isStringLiteral
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   ComputedPropertyName,
@@ -43,7 +43,7 @@ import type {
   ClassExpression,
   StructDeclaration,
   PropertyName
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {IOptions} from '../../configs/IOptions';
 import type {INameObfuscationOption} from '../../configs/INameObfuscationOption';
diff --git a/arkguard/src/transformers/rename/ShorthandPropertyTransformer.ts b/arkguard/src/transformers/rename/ShorthandPropertyTransformer.ts
index 4cd2f3ab06..e4a2a983de 100644
--- a/arkguard/src/transformers/rename/ShorthandPropertyTransformer.ts
+++ b/arkguard/src/transformers/rename/ShorthandPropertyTransformer.ts
@@ -20,7 +20,7 @@ import {
   isShorthandPropertyAssignment,
   setParentRecursive,
   visitEachChild
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   BindingElement,
@@ -29,7 +29,7 @@ import type {
   TransformationContext,
   Transformer,
   TransformerFactory
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {INameObfuscationOption} from '../../configs/INameObfuscationOption';
 import type {TransformPlugin} from '../TransformPlugin';
diff --git a/arkguard/src/utils/NodeUtils.ts b/arkguard/src/utils/NodeUtils.ts
index 11d24da200..ca659e06f0 100644
--- a/arkguard/src/utils/NodeUtils.ts
+++ b/arkguard/src/utils/NodeUtils.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import type {Expression, Node, ObjectBindingPattern} from 'typescript';
+import type {Expression, Node, ObjectBindingPattern} from "ohos-typescript";
 import {
   isBindingElement,
   isCallExpression,
@@ -33,7 +33,7 @@ import {
   isQualifiedName,
   isSetAccessor,
   isVariableDeclaration
-} from 'typescript';
+} from "ohos-typescript";
 
 export class NodeUtils {
   public static isPropertyDeclarationNode(node: Node): boolean {
diff --git a/arkguard/src/utils/OhsUtil.ts b/arkguard/src/utils/OhsUtil.ts
index 2588197cf1..a3e2155fd3 100644
--- a/arkguard/src/utils/OhsUtil.ts
+++ b/arkguard/src/utils/OhsUtil.ts
@@ -33,7 +33,7 @@ import {
   SyntaxKind,
   isExpressionStatement,
   isClassExpression,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   ClassDeclaration,
@@ -50,7 +50,7 @@ import type {
   Statement,
   StructDeclaration,
   TypeAliasDeclaration,
-} from 'typescript';
+} from "ohos-typescript";
 
 import {OhPackType} from './TransformUtil';
 
diff --git a/arkguard/src/utils/ScopeAnalyzer.ts b/arkguard/src/utils/ScopeAnalyzer.ts
index abb71ec030..b1c6fc3833 100644
--- a/arkguard/src/utils/ScopeAnalyzer.ts
+++ b/arkguard/src/utils/ScopeAnalyzer.ts
@@ -22,7 +22,7 @@ import {
   isIdentifier,
   isMethodDeclaration,
   SyntaxKind
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   BreakOrContinueStatement,
@@ -50,7 +50,7 @@ import type {
   TypeAliasDeclaration,
   TypeChecker,
   TypeElement
-} from 'typescript';
+} from "ohos-typescript";
 
 import {NodeUtils} from './NodeUtils';
 import {isViewPUBasedClass} from './OhsUtil';
diff --git a/arkguard/src/utils/SourceMapUtil.ts b/arkguard/src/utils/SourceMapUtil.ts
index d709e0681c..57ea8d2354 100644
--- a/arkguard/src/utils/SourceMapUtil.ts
+++ b/arkguard/src/utils/SourceMapUtil.ts
@@ -16,7 +16,7 @@
 import {
   createCompilerHost,
   createSourceMapGenerator,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   CompilerHost,
@@ -24,7 +24,7 @@ import type {
   EmitHost,
   SourceMapGenerator,
   SourceMapGeneratorOptions,
-} from 'typescript';
+} from "ohos-typescript";
 
 /**
  * create sourcemap generator use api of typescript
diff --git a/arkguard/src/utils/TransformUtil.ts b/arkguard/src/utils/TransformUtil.ts
index c951f5f1f1..dd7de22f33 100644
--- a/arkguard/src/utils/TransformUtil.ts
+++ b/arkguard/src/utils/TransformUtil.ts
@@ -21,7 +21,7 @@ import {
   isIdentifier,
   SyntaxKind,
   visitEachChild
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   CommentRange,
@@ -29,7 +29,7 @@ import type {
   Node,
   SourceFile,
   TransformationContext 
-} from 'typescript';
+} from "ohos-typescript";
 
 /**
  * collect exist identifier names in current source file
diff --git a/arkguard/src/utils/TypeUtils.ts b/arkguard/src/utils/TypeUtils.ts
index eb47772956..539b0902c5 100644
--- a/arkguard/src/utils/TypeUtils.ts
+++ b/arkguard/src/utils/TypeUtils.ts
@@ -19,7 +19,7 @@ import {
   createProgram,
   createSourceFile,
   ScriptTarget,
-} from 'typescript';
+} from "ohos-typescript";
 
 import type {
   CompilerHost,
@@ -28,7 +28,7 @@ import type {
   Program,
   SourceFile,
   TypeChecker,
-} from 'typescript';
+} from "ohos-typescript";
 
 import path from 'path';
 
diff --git a/arkguard/test/ut/utils/TransformUtil.spec.ts b/arkguard/test/ut/utils/TransformUtil.spec.ts
index b6894521ae..844ea2d90b 100644
--- a/arkguard/test/ut/utils/TransformUtil.spec.ts
+++ b/arkguard/test/ut/utils/TransformUtil.spec.ts
@@ -15,7 +15,7 @@
 
 import {before} from 'mocha';
 import {assert} from 'chai';
-import {createSourceFile, ScriptTarget, SourceFile} from 'typescript';
+import {createSourceFile, ScriptTarget, SourceFile} from 'ohos-typescript';
 
 import {collectExistNames, OhPackType} from '../../../src/utils/TransformUtil';
 import {findOhImportStatement} from '../../../src/utils/OhsUtil';
diff --git a/arkguard/test/ut/utils/TypeUtils.spec.ts b/arkguard/test/ut/utils/TypeUtils.spec.ts
index aabf679eb5..ac14fff5bf 100644
--- a/arkguard/test/ut/utils/TypeUtils.spec.ts
+++ b/arkguard/test/ut/utils/TypeUtils.spec.ts
@@ -15,7 +15,7 @@
 
 import {assert} from 'chai';
 import {before, describe} from 'mocha';
-import {createSourceFile, ScriptTarget, SourceFile} from 'typescript';
+import {createSourceFile, ScriptTarget, SourceFile} from 'ohos-typescript';
 
 import {TypeUtils} from '../../../src/utils/TypeUtils';
 
-- 
Gitee