dependencies update

This commit is contained in:
sanex3339
2017-06-10 17:30:16 +03:00
parent 094c87a232
commit a7c6057dbe
4 changed files with 63 additions and 70 deletions
+29 -40
View File
@@ -413,7 +413,6 @@ exports.RandomGeneratorUtils = RandomGeneratorUtils;
"use strict";
var tslib_1 = __webpack_require__(1);
function initializable() {
var initializeMethodKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'initialize';
@@ -425,21 +424,21 @@ function initializable() {
};
var initializeMethod = target[initializeMethodKey];
if (!initializeMethod || typeof initializeMethod !== 'function') {
throw new Error("`" + initializeMethodKey + "` method with initialization logic not found. `@" + decoratorName + "` decorator requires `" + initializeMethodKey + "` method");
throw new Error('`' + initializeMethodKey + '` method with initialization logic not found. `@' + decoratorName + '` decorator requires `' + initializeMethodKey + '` method');
}
var metadataPropertyKey = "_" + propertyKey;
var metadataPropertyKey = '_' + propertyKey;
var propertyDescriptor = Object.getOwnPropertyDescriptor(target, metadataPropertyKey) || descriptor;
var methodDescriptor = Object.getOwnPropertyDescriptor(target, initializeMethodKey) || descriptor;
var originalMethod = methodDescriptor.value;
Object.defineProperty(target, propertyKey, tslib_1.__assign({}, propertyDescriptor, { get: function get() {
Object.defineProperty(target, propertyKey, Object.assign({}, propertyDescriptor, { get: function get() {
if (this[metadataPropertyKey] === undefined) {
throw new Error("Property `" + propertyKey + "` is not initialized! Initialize it first!");
throw new Error('Property `' + propertyKey + '` is not initialized! Initialize it first!');
}
return this[metadataPropertyKey];
}, set: function set(newVal) {
this[metadataPropertyKey] = newVal;
} }));
Object.defineProperty(target, initializeMethodKey, tslib_1.__assign({}, methodDescriptor, { value: function value() {
Object.defineProperty(target, initializeMethodKey, Object.assign({}, methodDescriptor, { value: function value() {
originalMethod.apply(this, arguments);
if (this[propertyKey]) {}
} }));
@@ -2100,7 +2099,7 @@ var JavaScriptObfuscatorInternal = JavaScriptObfuscatorInternal_1 = function ()
}, {
key: "generateCode",
value: function generateCode(sourceCode, astTree) {
var escodegenParams = tslib_1.__assign({}, JavaScriptObfuscatorInternal_1.escodegenParams);
var escodegenParams = Object.assign({}, JavaScriptObfuscatorInternal_1.escodegenParams);
if (this.options.sourceMap) {
escodegenParams.sourceMap = 'sourceMap';
escodegenParams.sourceContent = sourceCode;
@@ -2452,7 +2451,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var tslib_1 = __webpack_require__(1);
var commander = __webpack_require__(123);
var path = __webpack_require__(37);
var SourceMapMode_1 = __webpack_require__(21);
@@ -2497,7 +2495,7 @@ var JavaScriptObfuscatorCLI = function () {
}
inputOptions[option] = this.commands[option];
}
return tslib_1.__assign({}, Default_1.DEFAULT_PRESET, inputOptions);
return Object.assign({}, Default_1.DEFAULT_PRESET, inputOptions);
}
}, {
key: "configureCommands",
@@ -2540,7 +2538,7 @@ var JavaScriptObfuscatorCLI = function () {
key: "processDataWithSourceMap",
value: function processDataWithSourceMap(outputCodePath, options) {
var outputSourceMapPath = CLIUtils_1.CLIUtils.getOutputSourceMapPath(outputCodePath, options.sourceMapFileName || '');
options = tslib_1.__assign({}, options, { sourceMapFileName: path.basename(outputSourceMapPath) });
options = Object.assign({}, options, { sourceMapFileName: path.basename(outputSourceMapPath) });
var obfuscationResult = JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(this.data, options);
CLIUtils_1.CLIUtils.writeFile(outputCodePath, obfuscationResult.getObfuscatedCode());
if (options.sourceMapMode === 'separate' && obfuscationResult.getSourceMap()) {
@@ -3893,7 +3891,7 @@ var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) {
if (this.appendEvent === ObfuscationEvents_1.ObfuscationEvents.AfterObfuscation) {
return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), {
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), Object.assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
return format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), {
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
@@ -3959,7 +3957,7 @@ var SelfDefendingUnicodeNode = function (_AbstractCustomNode_) {
return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SelfDefendingTemplate_1.SelfDefendingTemplate(), {
selfDefendingFunctionName: RandomGeneratorUtils_1.RandomGeneratorUtils.getRandomVariableName(6),
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), Object.assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}]);
@@ -4107,7 +4105,7 @@ var StringArrayCallsWrapper = function (_AbstractCustomNode_) {
decodeNodeTemplate: decodeNodeTemplate,
stringArrayCallsWrapperName: this.stringArrayCallsWrapperName,
stringArrayName: this.stringArrayName
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), Object.assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}, {
key: "getDecodeStringArrayTemplate",
@@ -4288,7 +4286,7 @@ var StringArrayRotateFunctionNode = function (_AbstractCustomNode_) {
stringArrayName: this.stringArrayName,
stringArrayRotateValue: Utils_1.Utils.decToHex(this.stringArrayRotateValue),
whileFunctionName: whileFunctionName
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), Object.assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}]);
@@ -4633,7 +4631,7 @@ var FunctionControlFlowTransformer = FunctionControlFlowTransformer_1 = function
return node;
}
var controlFlowReplacerName = FunctionControlFlowTransformer_1.controlFlowReplacersMap.get(node.type);
return tslib_1.__assign({}, _this3.controlFlowReplacerFactory(controlFlowReplacerName).replace(node, parentNode, controlFlowStorage), { parentNode: parentNode });
return Object.assign({}, _this3.controlFlowReplacerFactory(controlFlowReplacerName).replace(node, parentNode, controlFlowStorage), { parentNode: parentNode });
}
});
}
@@ -4979,8 +4977,6 @@ var MethodDefinitionTransformer_1;
"use strict";
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -5037,17 +5033,11 @@ var TemplateLiteralTransformer = TemplateLiteralTransformer_1 = function (_Abstr
nodes.unshift(Nodes_1.Nodes.getLiteralNode(''));
}
if (nodes.length > 1) {
var _ret = function () {
var root = Nodes_1.Nodes.getBinaryExpressionNode('+', nodes.shift(), nodes.shift());
nodes.forEach(function (node) {
root = Nodes_1.Nodes.getBinaryExpressionNode('+', root, node);
});
return {
v: root
};
}();
if ((typeof _ret === "undefined" ? "undefined" : _typeof(_ret)) === "object") return _ret.v;
var root = Nodes_1.Nodes.getBinaryExpressionNode('+', nodes.shift(), nodes.shift());
nodes.forEach(function (node) {
root = Nodes_1.Nodes.getBinaryExpressionNode('+', root, node);
});
return root;
}
return nodes[0];
}
@@ -6080,7 +6070,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var tslib_1 = __webpack_require__(1);
var Utils_1 = __webpack_require__(8);
var OptionsNormalizer = function () {
@@ -6091,7 +6080,7 @@ var OptionsNormalizer = function () {
_createClass(OptionsNormalizer, null, [{
key: "normalizeOptions",
value: function normalizeOptions(options) {
var normalizedOptions = tslib_1.__assign({}, options);
var normalizedOptions = Object.assign({}, options);
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
@@ -6123,7 +6112,7 @@ var OptionsNormalizer = function () {
key: "controlFlowFlatteningThresholdRule",
value: function controlFlowFlatteningThresholdRule(options) {
if (options.controlFlowFlatteningThreshold === 0) {
options = tslib_1.__assign({}, options, OptionsNormalizer.DISABLED_CONTROL_FLOW_FLATTENING_OPTIONS);
options = Object.assign({}, options, OptionsNormalizer.DISABLED_CONTROL_FLOW_FLATTENING_OPTIONS);
}
return options;
}
@@ -6157,7 +6146,7 @@ var OptionsNormalizer = function () {
}
}
options = tslib_1.__assign({}, options, { domainLock: normalizedDomains });
options = Object.assign({}, options, { domainLock: normalizedDomains });
}
return options;
}
@@ -6165,7 +6154,7 @@ var OptionsNormalizer = function () {
key: "selfDefendingRule",
value: function selfDefendingRule(options) {
if (options.selfDefending) {
options = tslib_1.__assign({}, options, OptionsNormalizer.SELF_DEFENDING_OPTIONS);
options = Object.assign({}, options, OptionsNormalizer.SELF_DEFENDING_OPTIONS);
}
return options;
}
@@ -6176,11 +6165,11 @@ var OptionsNormalizer = function () {
sourceMapBaseUrl = _options.sourceMapBaseUrl;
if (!options.sourceMapFileName) {
options = tslib_1.__assign({}, options, { sourceMapBaseUrl: '' });
options = Object.assign({}, options, { sourceMapBaseUrl: '' });
return options;
}
if (sourceMapBaseUrl && !sourceMapBaseUrl.endsWith('/')) {
options = tslib_1.__assign({}, options, { sourceMapBaseUrl: sourceMapBaseUrl + "/" });
options = Object.assign({}, options, { sourceMapBaseUrl: sourceMapBaseUrl + "/" });
}
return options;
}
@@ -6192,7 +6181,7 @@ var OptionsNormalizer = function () {
if (sourceMapFileName) {
sourceMapFileName = sourceMapFileName.replace(/^\/+/, '').split('.')[0];
options = tslib_1.__assign({}, options, { sourceMapFileName: sourceMapFileName + ".js.map" });
options = Object.assign({}, options, { sourceMapFileName: sourceMapFileName + ".js.map" });
}
return options;
}
@@ -6200,7 +6189,7 @@ var OptionsNormalizer = function () {
key: "stringArrayRule",
value: function stringArrayRule(options) {
if (!options.stringArray) {
options = tslib_1.__assign({}, options, OptionsNormalizer.DISABLED_STRING_ARRAY_OPTIONS);
options = Object.assign({}, options, OptionsNormalizer.DISABLED_STRING_ARRAY_OPTIONS);
}
return options;
}
@@ -6208,7 +6197,7 @@ var OptionsNormalizer = function () {
key: "stringArrayEncodingRule",
value: function stringArrayEncodingRule(options) {
if (options.stringArrayEncoding === true) {
options = tslib_1.__assign({}, options, OptionsNormalizer.STRING_ARRAY_ENCODING_OPTIONS);
options = Object.assign({}, options, OptionsNormalizer.STRING_ARRAY_ENCODING_OPTIONS);
}
return options;
}
@@ -6216,7 +6205,7 @@ var OptionsNormalizer = function () {
key: "stringArrayThresholdRule",
value: function stringArrayThresholdRule(options) {
if (options.stringArrayThreshold === 0) {
options = tslib_1.__assign({}, options, OptionsNormalizer.DISABLED_STRING_ARRAY_OPTIONS);
options = Object.assign({}, options, OptionsNormalizer.DISABLED_STRING_ARRAY_OPTIONS);
}
return options;
}
@@ -6386,7 +6375,7 @@ var StackTraceAnalyzer = StackTraceAnalyzer_1 = function () {
if (!calleeData) {
return;
}
stackTraceData.push(tslib_1.__assign({}, calleeData, { stackTrace: _this2.analyzeRecursive(calleeData.callee.body) }));
stackTraceData.push(Object.assign({}, calleeData, { stackTrace: _this2.analyzeRecursive(calleeData.callee.body) }));
});
}
}], [{
+7 -8
View File
@@ -19,7 +19,7 @@
"javascript-obfuscator": "./bin/javascript-obfuscator.js"
},
"dependencies": {
"chance": "1.0.4",
"chance": "1.0.6",
"class-validator": "0.6.8",
"commander": "2.9.0",
"escodegen": "1.8.1",
@@ -28,10 +28,10 @@
"inversify": "3.1.0",
"lodash": "4.17.4",
"mkdirp": "0.5.1",
"reflect-metadata": "0.1.9",
"reflect-metadata": "0.1.10",
"source-map-support": "0.4.11",
"string-template": "1.0.0",
"tslib": "1.5.0"
"tslib": "1.6.0"
},
"devDependencies": {
"@types/chai": "3.4.35",
@@ -41,13 +41,13 @@
"@types/esprima": "2.1.33",
"@types/estraverse": "0.0.6",
"@types/estree": "0.0.34",
"@types/lodash": "4.14.52",
"@types/lodash": "4.14.53",
"@types/mkdirp": "0.3.29",
"@types/mocha": "2.2.39",
"@types/node": "7.0.5",
"@types/sinon": "1.16.35",
"@types/string-template": "1.0.2",
"awesome-typescript-loader": "3.0.4",
"awesome-typescript-loader": "3.0.7",
"babel-cli": "6.23.0",
"babel-loader": "6.3.2",
"babel-plugin-array-includes": "2.0.3",
@@ -60,7 +60,7 @@
"ts-node": "2.1.0",
"tslint": "4.4.2",
"tslint-loader": "3.4.2",
"typescript": "2.1.6",
"typescript": "2.2.0",
"webpack": "2.2.1",
"webpack-node-externals": "1.5.4"
},
@@ -84,8 +84,7 @@
"test:removeTmpDir": "scripts/test-remove-tmp-dir",
"test": "scripts/test",
"tslint": "scripts/tslint",
"travis": "scripts/travis",
"trevor": "scripts/trevor"
"travis": "scripts/travis"
},
"author": {
"name": "Timofey Kachalov"
-3
View File
@@ -1,3 +0,0 @@
#!/bin/bash
trevor
+27 -19
View File
@@ -36,9 +36,9 @@
version "0.0.34"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.34.tgz#aa7af69a3a91922171ee411b3c9d8f6beb4af321"
"@types/lodash@4.14.52":
version "4.14.52"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.52.tgz#de5c7ab14da1289733233c9b0ec6f9e377db90f5"
"@types/lodash@4.14.53":
version "4.14.53"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.53.tgz#c81ee7f2a551f92fb8692a2f6766d0430ccce9eb"
"@types/mkdirp@0.3.29":
version "0.3.29"
@@ -215,13 +215,13 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
awesome-typescript-loader@3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.0.4.tgz#71391f1fc10eec1fed561adf8a99289813ff2063"
awesome-typescript-loader@3.0.7:
version "3.0.7"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.0.7.tgz#6ac5c356bb503cbd92b051b0c21dac74e2716ec9"
dependencies:
colors "^1.1.2"
enhanced-resolve "^3.1.0"
loader-utils "^0.2.16"
loader-utils "^1.0.2"
lodash "^4.17.4"
mkdirp "^0.5.1"
object-assign "^4.1.1"
@@ -873,9 +873,9 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
chance@1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.4.tgz#2dbc3ea6ad0541f7f965bd0af25d1ca275c853c4"
chance@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.6.tgz#4734f62d02b738cdc2882d8b5d41f89af49e7bfd"
check-error@^1.0.1:
version "1.0.2"
@@ -1960,6 +1960,14 @@ loader-utils@^0.2.16, loader-utils@^0.2.7:
json5 "^0.5.0"
object-assign "^4.0.1"
loader-utils@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.0.2.tgz#a9f923c865a974623391a8602d031137fad74830"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"
lodash._baseassign@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -2510,9 +2518,9 @@ readdirp@^2.0.0:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"
reflect-metadata@0.1.9:
version "0.1.9"
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.9.tgz#987238dc87a516895fe457f130435ffbd763a4d4"
reflect-metadata@0.1.10:
version "0.1.10"
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
regenerate@^1.2.1:
version "1.3.2"
@@ -2908,9 +2916,9 @@ tsconfig@^5.0.2:
strip-bom "^2.0.0"
strip-json-comments "^2.0.0"
tslib@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.5.0.tgz#3bb50f871e5fdf9a4555a9ff237b730860048fea"
tslib@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.6.0.tgz#cf36c93e02ae86a20fc131eae511162b869a6652"
tslint-loader@3.4.2:
version "3.4.2"
@@ -2961,9 +2969,9 @@ type-detect@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.0.tgz#62053883542a321f2f7b25746dc696478b18ff6b"
typescript@2.1.6:
version "2.1.6"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.6.tgz#40c7e6e9e5da7961b7718b55505f9cac9487a607"
typescript@2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.0.tgz#626f2fc70087d2480f21ebb12c1888288c8614e3"
uglify-js@^2.6, uglify-js@^2.7.5:
version "2.7.5"