From 85672b5537ce32bc0964332140f70a53b7a0ed60 Mon Sep 17 00:00:00 2001
From: sanex3339 <sanex3339@yandex.ru>
Date: Thu, 19 Apr 2018 19:03:45 +0300
Subject: [PATCH] Some structure changes related to configs

---
 CHANGELOG.md                                  |  2 +-
 README.md                                     |  2 +-
 dist/{index.web.js => index.browser.js}       |  2 +-
 scripts/test-compile                          |  2 +-
 scripts/tslint                                |  2 +-
 scripts/watch                                 |  2 +-
 scripts/webpack-dev                           |  2 +-
 scripts/webpack-prod                          |  2 +-
 src/tsconfig.browser.json                     |  9 +++++++
 src/tsconfig.node.json                        | 17 +++++++++++++
 test/tsconfig.test.json                       | 14 +++++++++++
 tsconfig.json                                 | 16 +++---------
 tsconfig.test.json                            | 25 -------------------
 tsconfig.web.json                             | 24 ------------------
 ...eb.config.js => webpack.browser.config.js} |  6 ++---
 ...bpack.config.js => webpack.node.config.js} |  3 ++-
 16 files changed, 56 insertions(+), 74 deletions(-)
 rename dist/{index.web.js => index.browser.js} (99%)
 create mode 100644 src/tsconfig.browser.json
 create mode 100644 src/tsconfig.node.json
 create mode 100644 test/tsconfig.test.json
 delete mode 100644 tsconfig.test.json
 delete mode 100644 tsconfig.web.json
 rename webpack/{webpack.web.config.js => webpack.browser.config.js} (89%)
 rename webpack/{webpack.config.js => webpack.node.config.js} (93%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5560ce0e2..7f3a19be1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Change Log
 ===
 v0.17.0
 ---
-* **Web version**: Added web version dist
+* **Browser version**: Added browser version dist
 * Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/252
 * Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/247
 
diff --git a/README.md b/README.md
index 44bdc9f1a..f756e51df 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ $ npm install --save-dev javascript-obfuscator
 Add `<script>` tag with package:
 
 ```html
-<script src="./node_modules/javascript-obfuscator/dist/index.web.js">
+<script src="./node_modules/javascript-obfuscator/dist/index.browser.js">
 ```
 
 or require package from CDN:
diff --git a/dist/index.web.js b/dist/index.browser.js
similarity index 99%
rename from dist/index.web.js
rename to dist/index.browser.js
index 7a3db21c3..ee94c31ec 100644
--- a/dist/index.web.js
+++ b/dist/index.browser.js
@@ -51,4 +51,4 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 var n;!function(n){!function(r){var i="object"==typeof t?t:"object"==typeof self?self:"object"==typeof this?this:Function("return this;")(),a=o(n);function o(e,t){return function(n,r){"function"!=typeof e[n]&&Object.defineProperty(e,n,{configurable:!0,writable:!0,value:r}),t&&t(n,r)}}void 0===i.Reflect?i.Reflect=n:a=o(i.Reflect,a),function(t){var n=Object.prototype.hasOwnProperty,r="function"==typeof Symbol,i=r&&void 0!==Symbol.toPrimitive?Symbol.toPrimitive:"@@toPrimitive",a=r&&void 0!==Symbol.iterator?Symbol.iterator:"@@iterator",o="function"==typeof Object.create,s={__proto__:[]}instanceof Array,u=!o&&!s,c={create:o?function(){return k(Object.create(null))}:s?function(){return k({__proto__:null})}:function(){return k({})},has:u?function(e,t){return n.call(e,t)}:function(e,t){return t in e},get:u?function(e,t){return n.call(e,t)?e[t]:void 0}:function(e,t){return e[t]}},l=Object.getPrototypeOf(Function),d="object"==typeof e&&e.env&&"true"===e.env.REFLECT_METADATA_USE_MAP_POLYFILL,f=d||"function"!=typeof Map||"function"!=typeof Map.prototype.entries?function(){var e={},t=[],n=function(){function e(e,t,n){this._index=0,this._keys=e,this._values=t,this._selector=n}return e.prototype["@@iterator"]=function(){return this},e.prototype[a]=function(){return this},e.prototype.next=function(){var e=this._index;if(e>=0&&e<this._keys.length){var n=this._selector(this._keys[e],this._values[e]);return e+1>=this._keys.length?(this._index=-1,this._keys=t,this._values=t):this._index++,{value:n,done:!1}}return{value:void 0,done:!0}},e.prototype.throw=function(e){throw this._index>=0&&(this._index=-1,this._keys=t,this._values=t),e},e.prototype.return=function(e){return this._index>=0&&(this._index=-1,this._keys=t,this._values=t),{value:e,done:!0}},e}();return function(){function t(){this._keys=[],this._values=[],this._cacheKey=e,this._cacheIndex=-2}return Object.defineProperty(t.prototype,"size",{get:function(){return this._keys.length},enumerable:!0,configurable:!0}),t.prototype.has=function(e){return this._find(e,!1)>=0},t.prototype.get=function(e){var t=this._find(e,!1);return t>=0?this._values[t]:void 0},t.prototype.set=function(e,t){var n=this._find(e,!0);return this._values[n]=t,this},t.prototype.delete=function(t){var n=this._find(t,!1);if(n>=0){for(var r=this._keys.length,i=n+1;i<r;i++)this._keys[i-1]=this._keys[i],this._values[i-1]=this._values[i];return this._keys.length--,this._values.length--,t===this._cacheKey&&(this._cacheKey=e,this._cacheIndex=-2),!0}return!1},t.prototype.clear=function(){this._keys.length=0,this._values.length=0,this._cacheKey=e,this._cacheIndex=-2},t.prototype.keys=function(){return new n(this._keys,this._values,r)},t.prototype.values=function(){return new n(this._keys,this._values,i)},t.prototype.entries=function(){return new n(this._keys,this._values,o)},t.prototype["@@iterator"]=function(){return this.entries()},t.prototype[a]=function(){return this.entries()},t.prototype._find=function(e,t){return this._cacheKey!==e&&(this._cacheIndex=this._keys.indexOf(this._cacheKey=e)),this._cacheIndex<0&&t&&(this._cacheIndex=this._keys.length,this._keys.push(e),this._values.push(void 0)),this._cacheIndex},t}();function r(e,t){return e}function i(e,t){return t}function o(e,t){return[e,t]}}():Map,p=d||"function"!=typeof Set||"function"!=typeof Set.prototype.entries?function(){function e(){this._map=new f}return Object.defineProperty(e.prototype,"size",{get:function(){return this._map.size},enumerable:!0,configurable:!0}),e.prototype.has=function(e){return this._map.has(e)},e.prototype.add=function(e){return this._map.set(e,e),this},e.prototype.delete=function(e){return this._map.delete(e)},e.prototype.clear=function(){this._map.clear()},e.prototype.keys=function(){return this._map.keys()},e.prototype.values=function(){return this._map.values()},e.prototype.entries=function(){return this._map.entries()},e.prototype["@@iterator"]=function(){return this.keys()},e.prototype[a]=function(){return this.keys()},e}():Set,h=new(d||"function"!=typeof WeakMap?function(){var e=16,t=c.create(),r=i();return function(){function e(){this._key=i()}return e.prototype.has=function(e){var t=a(e,!1);return void 0!==t&&c.has(t,this._key)},e.prototype.get=function(e){var t=a(e,!1);return void 0!==t?c.get(t,this._key):void 0},e.prototype.set=function(e,t){var n=a(e,!0);return n[this._key]=t,this},e.prototype.delete=function(e){var t=a(e,!1);return void 0!==t&&delete t[this._key]},e.prototype.clear=function(){this._key=i()},e}();function i(){var e;do{e="@@WeakMap@@"+s()}while(c.has(t,e));return t[e]=!0,e}function a(e,t){if(!n.call(e,r)){if(!t)return;Object.defineProperty(e,r,{value:c.create()})}return e[r]}function o(e,t){for(var n=0;n<t;++n)e[n]=255*Math.random()|0;return e}function s(){var t=function(e){if("function"==typeof Uint8Array)return"undefined"!=typeof crypto?crypto.getRandomValues(new Uint8Array(e)):"undefined"!=typeof msCrypto?msCrypto.getRandomValues(new Uint8Array(e)):o(new Uint8Array(e),e);return o(new Array(e),e)}(e);t[6]=79&t[6]|64,t[8]=191&t[8]|128;for(var n="",r=0;r<e;++r){var i=t[r];4!==r&&6!==r&&8!==r||(n+="-"),i<16&&(n+="0"),n+=i.toString(16).toLowerCase()}return n}}():WeakMap);function m(e,t,n){var r=h.get(e);if(S(r)){if(!n)return;r=new f,h.set(e,r)}var i=r.get(t);if(S(i)){if(!n)return;i=new f,r.set(t,i)}return i}function g(e,t,n){var r=m(t,n,!1);return!S(r)&&!!r.has(e)}function y(e,t,n){var r=m(t,n,!1);if(!S(r))return r.get(e)}function v(e,t,n,r){var i=m(n,r,!0);i.set(e,t)}function b(e,t){var n=[],r=m(e,t,!1);if(S(r))return n;for(var i=r.keys(),o=function(e){var t=F(e,a);if(!D(t))throw new TypeError;var n=t.call(e);if(!E(n))throw new TypeError;return n}(i),s=0;;){var u=T(o);if(!u)return n.length=s,n;var c=u.value;try{n[s]=c}catch(e){try{M(o)}finally{throw e}}s++}}function C(e){if(null===e)return 1;switch(typeof e){case"undefined":return 0;case"boolean":return 2;case"string":return 3;case"symbol":return 4;case"number":return 5;case"object":return null===e?1:6;default:return 6}}function S(e){return void 0===e}function A(e){return null===e}function E(e){return"object"==typeof e?null!==e:"function"==typeof e}function N(e,t){switch(C(e)){case 0:case 1:case 2:case 3:case 4:case 5:return e}var n=3===t?"string":5===t?"number":"default",r=F(e,i);if(void 0!==r){var a=r.call(e,n);if(E(a))throw new TypeError;return a}return function(e,t){if("string"===t){var n=e.toString;if(D(n)){var r=n.call(e);if(!E(r))return r}var i=e.valueOf;if(D(i)){var r=i.call(e);if(!E(r))return r}}else{var i=e.valueOf;if(D(i)){var r=i.call(e);if(!E(r))return r}var a=e.toString;if(D(a)){var r=a.call(e);if(!E(r))return r}}throw new TypeError}(e,"default"===n?"number":n)}function _(e){var t=N(e,3);return"symbol"==typeof t?t:function(e){return""+e}(t)}function I(e){return Array.isArray?Array.isArray(e):e instanceof Object?e instanceof Array:"[object Array]"===Object.prototype.toString.call(e)}function D(e){return"function"==typeof e}function x(e){return"function"==typeof e}function F(e,t){var n=e[t];if(void 0!==n&&null!==n){if(!D(n))throw new TypeError;return n}}function T(e){var t=e.next();return!t.done&&t}function M(e){var t=e.return;t&&t.call(e)}function w(e){var t=Object.getPrototypeOf(e);if("function"!=typeof e||e===l)return t;if(t!==l)return t;var n=e.prototype,r=n&&Object.getPrototypeOf(n);if(null==r||r===Object.prototype)return t;var i=r.constructor;return"function"!=typeof i?t:i===e?t:i}function k(e){return e.__=void 0,delete e.__,e}t("decorate",function(e,t,n,r){if(S(n)){if(!I(e))throw new TypeError;if(!x(t))throw new TypeError;return function(e,t){for(var n=e.length-1;n>=0;--n){var r=e[n],i=r(t);if(!S(i)&&!A(i)){if(!x(i))throw new TypeError;t=i}}return t}(e,t)}if(!I(e))throw new TypeError;if(!E(t))throw new TypeError;if(!E(r)&&!S(r)&&!A(r))throw new TypeError;return A(r)&&(r=void 0),n=_(n),function(e,t,n,r){for(var i=e.length-1;i>=0;--i){var a=e[i],o=a(t,n,r);if(!S(o)&&!A(o)){if(!E(o))throw new TypeError;r=o}}return r}(e,t,n,r)}),t("metadata",function(e,t){return function(n,r){if(!E(n))throw new TypeError;if(!S(r)&&!function(e){switch(C(e)){case 3:case 4:return!0;default:return!1}}(r))throw new TypeError;v(e,t,n,r)}}),t("defineMetadata",function(e,t,n,r){if(!E(n))throw new TypeError;S(r)||(r=_(r));return v(e,t,n,r)}),t("hasMetadata",function(e,t,n){if(!E(t))throw new TypeError;S(n)||(n=_(n));return function e(t,n,r){var i=g(t,n,r);if(i)return!0;var a=w(n);if(!A(a))return e(t,a,r);return!1}(e,t,n)}),t("hasOwnMetadata",function(e,t,n){if(!E(t))throw new TypeError;S(n)||(n=_(n));return g(e,t,n)}),t("getMetadata",function(e,t,n){if(!E(t))throw new TypeError;S(n)||(n=_(n));return function e(t,n,r){var i=g(t,n,r);if(i)return y(t,n,r);var a=w(n);if(!A(a))return e(t,a,r);return}(e,t,n)}),t("getOwnMetadata",function(e,t,n){if(!E(t))throw new TypeError;S(n)||(n=_(n));return y(e,t,n)}),t("getMetadataKeys",function(e,t){if(!E(e))throw new TypeError;S(t)||(t=_(t));return function e(t,n){var r=b(t,n);var i=w(t);if(null===i)return r;var a=e(i,n);if(a.length<=0)return r;if(r.length<=0)return a;var o=new p;var s=[];for(var u=0,c=r;u<c.length;u++){var l=c[u],d=o.has(l);d||(o.add(l),s.push(l))}for(var f=0,h=a;f<h.length;f++){var l=h[f],d=o.has(l);d||(o.add(l),s.push(l))}return s}(e,t)}),t("getOwnMetadataKeys",function(e,t){if(!E(e))throw new TypeError;S(t)||(t=_(t));return b(e,t)}),t("deleteMetadata",function(e,t,n){if(!E(t))throw new TypeError;S(n)||(n=_(n));var r=m(t,n,!1);if(S(r))return!1;if(!r.delete(e))return!1;if(r.size>0)return!0;var i=h.get(t);return i.delete(n),i.size>0||(h.delete(t),!0)})}(a)}()}(n||(n={}))}).call(this,n(178),n(125))},function(e,t,n){var r=n(25);r(r.S+r.F*!n(34),"Object",{defineProperty:n(32).f})},function(e,t,n){n(508);var r=n(16).Object;e.exports=function(e,t,n){return r.defineProperty(e,t,n)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(74);e.exports=r.JavaScriptObfuscator}]);
-//# sourceMappingURL=index.web.js.map
\ No newline at end of file
+//# sourceMappingURL=index.browser.js.map
\ No newline at end of file
diff --git a/scripts/test-compile b/scripts/test-compile
index 196ac677e..a1d2b040f 100755
--- a/scripts/test-compile
+++ b/scripts/test-compile
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-$(yarn bin)/tsc -p tsconfig.test.json &&
+$(yarn bin)/tsc -p test/tsconfig.test.json &&
 $(yarn bin)/babel test-tmp --out-dir test-tmp --source-maps inline &&
 rsync -a --prune-empty-dirs --include '*/' --include '*.js' --include '*.json' --exclude '*' test/ test-tmp/test/
diff --git a/scripts/tslint b/scripts/tslint
index 966192f81..1084dc776 100755
--- a/scripts/tslint
+++ b/scripts/tslint
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-$(yarn bin)/tslint src/**/*.ts --project tsconfig.json
\ No newline at end of file
+$(yarn bin)/tslint src/**/*.ts --project src/tsconfig.node.json
\ No newline at end of file
diff --git a/scripts/watch b/scripts/watch
index 38bf17d7c..1f8891549 100755
--- a/scripts/watch
+++ b/scripts/watch
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-$(yarn bin)/webpack --config webpack/webpack.config.js --mode development --watch
\ No newline at end of file
+$(yarn bin)/webpack --config webpack/webpack.node.config.js --mode development --watch
\ No newline at end of file
diff --git a/scripts/webpack-dev b/scripts/webpack-dev
index 3340ffbcb..61164aef8 100755
--- a/scripts/webpack-dev
+++ b/scripts/webpack-dev
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-$(yarn bin)/webpack --config webpack/webpack.config.js --mode production
\ No newline at end of file
+$(yarn bin)/webpack --config webpack/webpack.node.config.js --mode production
\ No newline at end of file
diff --git a/scripts/webpack-prod b/scripts/webpack-prod
index 20633adc0..6bc4fc303 100755
--- a/scripts/webpack-prod
+++ b/scripts/webpack-prod
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-$(yarn bin)/webpack --config webpack/webpack.config.js --config webpack/webpack.web.config.js --mode production
\ No newline at end of file
+$(yarn bin)/webpack --config webpack/webpack.node.config.js --config webpack/webpack.browser.config.js --mode production
\ No newline at end of file
diff --git a/src/tsconfig.browser.json b/src/tsconfig.browser.json
new file mode 100644
index 000000000..ba627a8be
--- /dev/null
+++ b/src/tsconfig.browser.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+  },
+  "exclude": [
+    "../test"
+  ]
+}
\ No newline at end of file
diff --git a/src/tsconfig.node.json b/src/tsconfig.node.json
new file mode 100644
index 000000000..f752b9ba1
--- /dev/null
+++ b/src/tsconfig.node.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "importHelpers": true,
+    "noEmitHelpers": true,
+    "sourceMap": true,
+    "plugins": [
+      {
+        "name": "tslint-language-service",
+        "ignoreDefinitionFiles": true
+      }
+    ]
+  },
+  "exclude": [
+    "../test"
+  ]
+}
\ No newline at end of file
diff --git a/test/tsconfig.test.json b/test/tsconfig.test.json
new file mode 100644
index 000000000..01323ca85
--- /dev/null
+++ b/test/tsconfig.test.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../test-tmp",
+    "noEmitHelpers": true,
+    "importHelpers": true,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "noImplicitAny": true,
+  },
+  "include": [
+    "../**/*"
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 982d469a4..59121eae7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,30 +2,20 @@
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "importHelpers": true,
     "lib": [
       "es2017",
       "dom"
     ],
+    "target": "es2017",
     "module": "commonjs",
     "esModuleInterop": true,
-    "noEmitHelpers": true,
     "noImplicitThis": false,
     "noUnusedLocals": true,
     "removeComments": true,
-    "sourceMap": true,
-    "strict": true,
-    "target": "es2017",
-    "plugins": [
-      {
-        "name": "tslint-language-service",
-        "ignoreDefinitionFiles": true
-      }
-    ]
+    "strict": true
   },
   "exclude": [
-    "node_modules",
-    "test"
+    "node_modules"
   ],
   "compileOnSave": false,
   "buildOnSave": false
diff --git a/tsconfig.test.json b/tsconfig.test.json
deleted file mode 100644
index 83dbc5bb3..000000000
--- a/tsconfig.test.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "test-tmp",
-    "target": "es2017",
-    "lib": [
-      "es2017",
-      "dom"
-    ],
-    "noEmitHelpers": true,
-    "importHelpers": true,
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "removeComments": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": true
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}
diff --git a/tsconfig.web.json b/tsconfig.web.json
deleted file mode 100644
index 4e6e31bc3..000000000
--- a/tsconfig.web.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": [
-      "es2017",
-      "dom"
-    ],
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "noImplicitThis": false,
-    "noUnusedLocals": true,
-    "removeComments": true,
-    "sourceMap": true,
-    "strict": true,
-    "target": "es2017"
-  },
-  "exclude": [
-    "node_modules",
-    "test"
-  ],
-  "compileOnSave": false,
-  "buildOnSave": false
-}
\ No newline at end of file
diff --git a/webpack/webpack.web.config.js b/webpack/webpack.browser.config.js
similarity index 89%
rename from webpack/webpack.web.config.js
rename to webpack/webpack.browser.config.js
index 7f019ede3..81325473d 100644
--- a/webpack/webpack.web.config.js
+++ b/webpack/webpack.browser.config.js
@@ -18,11 +18,11 @@ module.exports = {
                 test: /\.ts(x?)$/,
                 loader: 'awesome-typescript-loader',
                 query: {
+                    configFileName: 'src/tsconfig.browser.json',
                     useBabel: true,
                     babelCore: '@babel/core',
                     useCache: true,
-                    forceIsolatedModules: true,
-                    configFileName: 'tsconfig.web.json'
+                    forceIsolatedModules: true
                 }
             }
         ]
@@ -45,7 +45,7 @@ module.exports = {
     output: {
         libraryTarget: 'var',
         library: 'JavaScriptObfuscator',
-        filename: 'index.web.js'
+        filename: 'index.browser.js'
     },
     performance: {
         hints: false
diff --git a/webpack/webpack.config.js b/webpack/webpack.node.config.js
similarity index 93%
rename from webpack/webpack.config.js
rename to webpack/webpack.node.config.js
index a901aa49c..84da5c2cb 100644
--- a/webpack/webpack.config.js
+++ b/webpack/webpack.node.config.js
@@ -23,6 +23,7 @@ module.exports = {
                 test: /\.ts(x?)$/,
                 loader: 'awesome-typescript-loader',
                 query: {
+                    configFileName: 'src/tsconfig.node.json',
                     useBabel: true,
                     babelCore: '@babel/core',
                     useCache: true,
@@ -51,7 +52,7 @@ module.exports = {
         new CheckerPlugin(),
         new TSLintPlugin({
             files: ['./src/**/*.ts'],
-            project: './tsconfig.json',
+            project: './src/tsconfig.node.json',
             exclude: []
         })
     ],