* @gradecam/tsenum replaced with an internal implementation

* Optimized performance of `ExpressionStatementsMergeTransformer` when `simplify` option is enabled
This commit is contained in:
sanex
2020-10-11 14:06:50 +03:00
parent b463f774c8
commit 381fd18177
28 changed files with 312 additions and 121 deletions
@@ -1,9 +1,9 @@
import { assert } from 'chai';
import { TypeFromEnum } from '@gradecam/tsenum';
import { TDictionary } from '../../../src/types/TDictionary';
import { TInputOptions } from '../../../src/types/options/TInputOptions';
import { TOptionsPreset } from '../../../src/types/options/TOptionsPreset';
import { TTypeFromEnum } from '../../../src/types/utils/TTypeFromEnym';
import { IObfuscatedCode } from '../../../src/interfaces/source-code/IObfuscatedCode';
@@ -921,12 +921,12 @@ describe('JavaScriptObfuscator', () => {
const samplesCount: number = 30;
let areCollisionsExists: boolean = false;
let obfuscateFunc: (identifierNamesGenerator: TypeFromEnum<typeof IdentifierNamesGenerator>) => string;
let obfuscateFunc: (identifierNamesGenerator: TTypeFromEnum<typeof IdentifierNamesGenerator>) => string;
before(() => {
const code: string = readFileAsString(__dirname + '/fixtures/custom-nodes-identifier-names-collision.js');
obfuscateFunc = (identifierNamesGenerator: TypeFromEnum<typeof IdentifierNamesGenerator>) => {
obfuscateFunc = (identifierNamesGenerator: TTypeFromEnum<typeof IdentifierNamesGenerator>) => {
const obfuscatedCode = JavaScriptObfuscator.obfuscate(
code,
{
@@ -945,7 +945,7 @@ describe('JavaScriptObfuscator', () => {
[
IdentifierNamesGenerator.DictionaryIdentifierNamesGenerator,
IdentifierNamesGenerator.MangledIdentifierNamesGenerator
].forEach((identifierNamesGenerator: TypeFromEnum<typeof IdentifierNamesGenerator>) => {
].forEach((identifierNamesGenerator: TTypeFromEnum<typeof IdentifierNamesGenerator>) => {
for (let i = 0; i < samplesCount; i++) {
try {
eval(obfuscateFunc(identifierNamesGenerator));
@@ -209,7 +209,7 @@ describe('JavaScriptObfuscator runtime eval', function () {
`
${getEnvironmentCode()}
${obfuscatedCode}
module.exports.obfuscate('var foo = 1;').getObfuscatedCode();
module.exports.JavaScriptObfuscator.obfuscate('var foo = 1;').getObfuscatedCode();
`,
evaluationTimeout
)
@@ -1,10 +1,11 @@
import 'reflect-metadata';
import { TypeFromEnum } from '@gradecam/tsenum';
import { ServiceIdentifiers } from '../../../src/container/ServiceIdentifiers';
import { assert } from 'chai';
import { TTypeFromEnum } from '../../../src/types/utils/TTypeFromEnym';
import { IInversifyContainerFacade } from '../../../src/interfaces/container/IInversifyContainerFacade';
import { IObfuscatedCode } from '../../../src/interfaces/source-code/IObfuscatedCode';
@@ -24,7 +25,7 @@ function getObfuscatedCode (
sourceMap: string,
sourceMapBaseUrl: string,
sourceMapFileName: string,
sourceMapMode: TypeFromEnum<typeof SourceMapMode>
sourceMapMode: TTypeFromEnum<typeof SourceMapMode>
): IObfuscatedCode {
const inversifyContainerFacade: IInversifyContainerFacade = new InversifyContainerFacade();