diff --git a/arkguard/package.json b/arkguard/package.json index ca3d370bebd7ac7d7838cec2ab8855f77acc5493..87fbcf1285ff22debf09cdea3952be7ed8244f84 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 e173f279ef0297911e091ff2fce927eba19a0765..e35cd7a0d1c39b2a6a236be4346a3f4ab9818b55 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 9d8af3cfee537c8692879b07c1bd3429adea0821..3ee345bf9f20227a73998f16c4ce4f8d5a2242ec 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 c8c9754a69cb0e45076bc1635b356ea5cdbe9f6c..b62e5fb58fe726715cd362e91a48ad42d3e3a487 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 f4d43dc606847051d56401be24b55185948aafc9..7bff1391608701d94232adb4e028c50a3babc69b 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 dee28a04e99eb8c1b31fbe16eba06a99ac023e84..afbe76df30fa504228b74b294e846b831d5cfb45 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 ee1b5fe02daf0a439f0a6c72611f5caf47fc5da3..6720977a24580c8ce398b66ff6a94dad6e6c3d26 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 7b9193acfdbfb4ce2786cdbbca5da0d64d92d9a5..3d2b8a40fdff1ad646515ba62797a1dd6ea676e9 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 b40c612eab7b329b6eb19bfafd5df6c6ec4a1ca0..f69a890431704a94449d7e9d77cceded2af94880 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 412928c20a72f7ce6c44618ab1b818d8138972ab..e8061d4ba484a37164f4c313ecea25e43286eb1d 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 2b9097bfe7f45dabf8a13f2caf9d40cc8b3ae16c..ab710ce159d90e5bfc22b2845c444a77ca1d0894 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 4cd2f3ab06f9e9f29f7cb69dfc194b2a7c983abe..e4a2a983deefd54e8c5ee339f69918b2e3352502 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 11d24da2002733fdd1c2c39da1352c91ffc3ed47..ca659e06f01850b203ec4cde56f962d1c3d7598d 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 2588197cf1e76e08057472a0e95051dd11b523ab..a3e2155fd383f66b2f37f9447c92294dc8ea4eb5 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 abb71ec030c5887759faf3f644d82e7b58105a3b..b1c6fc3833278d4c6b80cc9add85c9e71fc4c4d4 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 d709e0681c07e83b34cab548f80332d5a9ef3b10..57ea8d2354cffa3e04739ab61ab6fa929c466b28 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 c951f5f1f1aac7c48a30af73387874cf15f949f6..dd7de22f33bb632d18ba4bb3eee5942ad8f4e0f6 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 eb477729561c661174ddaecef2b70cf279d8d3b7..539b0902c54a0617d61defea2f74bd18dea2c1b8 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 b6894521aee35df5234ac1b5fff703eca8907605..844ea2d90b9844219cbb366fa231f0833adf8906 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 aabf679eb54eda4b4fc61c159d06f4383ad641f3..ac14fff5bfbad29f8ab7bcda74751376ab5c772b 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';