Selaa lähdekoodia

Updated readme and changelog. Removed some dead code.

sanex3339 5 vuotta sitten
vanhempi
commit
e36138d40d

+ 1 - 0
CHANGELOG.md

@@ -15,6 +15,7 @@ v0.25.0
 * Fixed a bunch of conflicts between generated identifier names. Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/550. Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/549
 * Prevented transformation of object keys in sequence expression that has `super` call
 * Support of output directory paths with a dot symbol
+* Changed `--output` logic. Now `--output` value can describe if it's a file or a directory path. Check README.md for more info
 
 v0.24.6
 ---

+ 2 - 0
README.md

@@ -212,6 +212,8 @@ Usage:
 ```sh
 javascript-obfuscator input_file_name.js [options]
 javascript-obfuscator input_file_name.js --output output_file_name.js [options]
+javascript-obfuscator input_file_name.js --output output_folder_name [options]
+javascript-obfuscator input_folder_name --output output_folder_name [options]
 ```
 
 Obfuscation of single input file with `.js` extension.

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/index.browser.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/index.cli.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/index.js


+ 3 - 3
package.json

@@ -42,7 +42,7 @@
     "reflect-metadata": "0.1.13",
     "source-map-support": "0.5.16",
     "string-template": "1.0.0",
-    "tslib": "1.11.0"
+    "tslib": "1.11.1"
   },
   "devDependencies": {
     "@types/chai": "4.2.9",
@@ -71,14 +71,14 @@
     "eslint-plugin-prefer-arrow": "1.1.7",
     "eslint-plugin-unicorn": "16.1.1",
     "fork-ts-checker-notifier-webpack-plugin": "2.0.0",
-    "fork-ts-checker-webpack-plugin": "4.0.4",
+    "fork-ts-checker-webpack-plugin": "4.0.5",
     "mocha": "7.1.0",
     "nyc": "15.0.0",
     "pjson": "1.0.9",
     "pre-commit": "1.2.2",
     "rimraf": "3.0.2",
     "sinon": "9.0.0",
-    "threads": "1.2.0",
+    "threads": "1.3.0",
     "ts-loader": "6.2.1",
     "ts-node": "6.1.0",
     "typescript": "3.8.2",

+ 1 - 1
src/analyzers/calls-graph-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts

@@ -79,7 +79,7 @@ export class ObjectExpressionCalleeDataExtractor extends AbstractCalleeDataExtra
         memberExpression: ESTree.MemberExpression
     ): TObjectMembersCallsChain {
         // first step: processing memberExpression `property` property
-        if (NodeGuards.isIdentifierNode(memberExpression.property) && memberExpression.computed === false) {
+        if (NodeGuards.isIdentifierNode(memberExpression.property) && !memberExpression.computed) {
             currentChain.unshift(memberExpression.property.name);
         } else if (
             NodeGuards.isLiteralNode(memberExpression.property) &&

+ 0 - 58
src/enums/JSFuck.ts

@@ -1,58 +0,0 @@
-export enum JSFuck {
-    False = '![]',
-    True = '!![]',
-
-    a = '(false+"")[1]',
-    b = '([]["entries"]()+"")[2]',
-    c = '([]["fill"]+"")[3]',
-    d = '(undefined+"")[2]',
-    e = '(true+"")[3]',
-    f = '(false+"")[0]',
-    g = '(false+[0]+String)[20]',
-    h = '(+(101))["toString"](21)[1]',
-    i = '([false]+undefined)[10]',
-    j = '([]["entries"]()+"")[3]',
-    k = '(+(20))["toString"](21)',
-    l = '(false+"")[2]',
-    m = '(Number+"")[11]',
-    n = '(undefined+"")[1]',
-    o = '(true+[]["fill"])[10]',
-    p = '(+(211))["toString"](31)[1]',
-    q = '(+(212))["toString"](31)[1]',
-    r = '(true+"")[1]',
-    s = '(false+"")[3]',
-    t = '(true+"")[0]',
-    u = '(undefined+"")[0]',
-    v = '(+(31))["toString"](32)',
-    w = '(+(32))["toString"](33)',
-    x = '(+(101))["toString"](34)[1]',
-    y = '(NaN+[Infinity])[10]',
-    z = '(+(35))["toString"](36)',
-
-    A = '(+[]+Array)[10]',
-    B = '(+[]+Boolean)[10]',
-    C = 'Function("return escape")()(("")["italics"]())[2]',
-    D = 'Function("return escape")()([]["fill"])["slice"]("-1")',
-    E = '(RegExp+"")[12]',
-    F = '(+[]+Function)[10]',
-    G = '(false+Function("return Date")()())[30]',
-    H = '\'H\'',
-    I = '(Infinity+"")[0]',
-    J = '\'J\'',
-    K = '\'K\'',
-    L = '\'L\'',
-    M = '(true+Function("return Date")()())[30]',
-    N = '(NaN+"")[0]',
-    O = '(NaN+Function("return{}")())[11]',
-    P = '\'P\'',
-    Q = '\'Q\'',
-    R = '(+[]+RegExp)[10]',
-    S = '(+[]+String)[10]',
-    T = '(NaN+Function("return Date")()())[30]',
-    U = '(NaN+Function("return{}")()["toString"]["call"]())[11]',
-    V = '\'V\'',
-    W = '\'W\'',
-    X = '\'X\'',
-    Y = '\'Y\'',
-    Z = '\'Z\'',
-}

+ 0 - 24
src/node/NodeFactory.ts

@@ -303,30 +303,6 @@ export class NodeFactory {
         };
     }
 
-    /**
-     * @param {Expression} key
-     * @param {FunctionExpression} value
-     * @param {"constructor" | "method" | "get" | "set"} kind
-     * @param {boolean} computed
-     * @returns {MethodDefinition}
-     */
-    public static methodDefinitionNode (
-        key: ESTree.Expression,
-        value: ESTree.FunctionExpression,
-        kind: 'constructor' | 'method' | 'get' | 'set',
-        computed: boolean,
-    ): ESTree.MethodDefinition {
-        return {
-            type: NodeType.MethodDefinition,
-            key,
-            value,
-            kind,
-            computed,
-            static: false,
-            metadata: { ignoredNode: false }
-        };
-    }
-
     /**
      * @param {Property[]} properties
      * @returns {ObjectExpression}

+ 0 - 3
src/types/node-transformers/TReplaceableIdentifiers.ts

@@ -1,3 +0,0 @@
-import * as ESTree from 'estree';
-
-export type TReplaceableIdentifiers = Map <ESTree.Node, Map <string, ESTree.Identifier[]>>;

+ 0 - 3
src/types/node-transformers/TReplaceableIdentifiersNames.ts

@@ -1,3 +0,0 @@
-import * as ESTree from 'estree';
-
-export type TReplaceableIdentifiersNames = Map <string, ESTree.Identifier[]>;

+ 0 - 5
src/types/node/TimportSpecifier.ts

@@ -1,5 +0,0 @@
-import * as ESTree from 'estree';
-
-export type TImportSpecifier = ESTree.ImportSpecifier
-    | ESTree.ImportDefaultSpecifier
-    | ESTree.ImportNamespaceSpecifier;

+ 17 - 17
yarn.lock

@@ -2208,10 +2208,10 @@ [email protected]:
   dependencies:
     node-notifier "^6.0.0"
 
[email protected].4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.0.4.tgz#ba1be68d63dcf509f6d1b08fb8e19efb6d7e8a96"
-  integrity sha512-6IEqHH6s+tv5sho5d3dn7dfcnbjKHwfqL74kRfpAP2e8MCHuMh5ixtYrbdfPO4Zat3S5gwULOoVArjK3HMwNdA==
[email protected].5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.0.5.tgz#1982b464cb8a44d224940a95a0d075c8bbd700bf"
+  integrity sha512-7juf7VGQ4GD7beQI2vsHlWME4H7cabXn4+zYzvWTOYQUjn3L+3tWQe8j9KnVOpdCf+1PoSvYMRT2A2kltfGLtQ==
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^2.4.1"
@@ -3781,10 +3781,10 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-observable-fns@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/observable-fns/-/observable-fns-0.5.0.tgz#9b71bb3e1a6ac9840b3922b67de0092773230177"
-  integrity sha512-BWmxvFppAKRWWTYns+yW3RaoXLTkSVF1cnLNe06opO4/C4VVfZgRkwSEBLOAA6bcTNM1zDDRz2T+l52cPNuaZQ==
+observable-fns@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/observable-fns/-/observable-fns-0.5.1.tgz#9b56478690dd0fa8603e3a7e7d2975d88bca0904"
+  integrity sha512-wf7g4Jpo1Wt2KIqZKLGeiuLOEMqpaOZ5gJn7DmSdqXgTdxRwSdBhWegQQpPteQ2gZvzCKqNNpwb853wcpA0j7A==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -5041,15 +5041,15 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-threads@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/threads/-/threads-1.2.0.tgz#f8a7a70aa355f003cccf894f85d55ff0bb87436b"
-  integrity sha512-QGHWxkLA+5IYe+Z1d/uhfYk+AbproPFAZoW48vrd+1N3MP37+e4wsyntpwhSixlY42dGtqRgP4b/Fqy/D6QBEQ==
+threads@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/threads/-/threads-1.3.0.tgz#24e2ccd5f50c9df39ffedd61fba2c798c38886f8"
+  integrity sha512-Z/sUxUDfwaNoDERcorYK+sGANn9i4PwMVAYdpCfpTiOmcNrLygb2c5BmQgizOnsPqXtXNlaRZRCNUr5h/eT8/Q==
   dependencies:
     callsites "^3.1.0"
     debug "^4.1.1"
     is-observable "^1.1.0"
-    observable-fns "^0.5.0"
+    observable-fns "^0.5.1"
   optionalDependencies:
     tiny-worker ">= 2"
 
@@ -5161,10 +5161,10 @@ [email protected]:
     source-map-support "^0.5.6"
     yn "^2.0.0"
 
[email protected].0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc"
-  integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==
[email protected].1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
 
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä