jscrambler 8.0.0 → 9.0.0-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # jscrambler
 
+## 9.0.0-alpha.0
+
+### Major Changes
+
+- [20aa311]: Remove reference to unnecessary lib fs-extra in cli.
+  This library was making it harder than necessary to use this package in non-node contexts, but
+  removing it was a breaking change since it was unnecessarily exported in one of the files.
+  Since we're doing a breaking change anyway, this is a good opportunity to get rid of it.
+  This is only a breaking change for libraries that were importing sub-files from `jscrambler` directly.
+- [21f7b05]: Make CLI compatible with newer API, drop compatibility with older ones.
+
+## 8.0.1
+
+### Patch Changes
+
+- [56e65d9]: Added async behaviour to delete protection on success.
+
 ## 8.0.0
 
 ### Major Changes

package/dist/index.js

@@ -482,7 +482,7 @@ var _default = exports.default = {
 
       // change this to have the variable that checks if the protection is to be removed
       if (deleteProtectionOnSuccess) {
-        _this.removeProtection(client, protection._id, applicationId).then(() => {
+        await _this.removeProtection(client, protection._id, applicationId).then(() => {
           if (debug) {
             console.log('Protection has been successful and will now be deleted');
           }
@@ -756,7 +756,7 @@ var _default = exports.default = {
     if (typeof destCallback === 'function') {
       destCallback(download, filesDest);
     } else {
-      (0, _zip.outputFileSync)(_path.default.join(filesDest, "".concat(protectionId, "_symbolTable.json")), download);
+      await _promises.default.writeFile(_path.default.join(filesDest, "".concat(protectionId, "_symbolTable.json")), download);
     }
   },
   /**

package/dist/mutations.js

@@ -178,36 +178,11 @@ function createApplicationProtection(applicationId) {
   let fragments = _fragments;
   let options = _options;
   [options, fragments] = (0, _cleanupInputFields.default)(args, fragments, options);
-  if (!args.some(f => f.name === 'options')) {
-    const {
-      bail,
-      randomizationSeed
-    } = options;
-    return {
-      query: "\n      mutation ".concat(mutationName, " ($applicationId: String!, $bail: Boolean, $randomizationSeed: String) {\n        ").concat(mutationName, " (applicationId: $applicationId, bail: $bail, randomizationSeed: $randomizationSeed) {\n          ").concat(fragments, "\n        }\n      }\n    "),
-      params: {
-        applicationId,
-        bail,
-        randomizationSeed
-      }
-    };
-  }
-
-  // Check if createApplicationProtection supports "data" argument
-  if (args.some(arg => arg.name === 'data')) {
-    return {
-      query: "\n        mutation ".concat(mutationName, " ($applicationId: String!, $data: ").concat(mutationInputType, ") {\n          ").concat(mutationName, " (applicationId: $applicationId, data: $data) {\n            ").concat(fragments, "\n          }\n        }\n      "),
-      params: {
-        applicationId,
-        data: options
-      }
-    };
-  }
   return {
-    query: "\n      mutation ".concat(mutationName, " ($applicationId: String!, $options: JSON) {\n        ").concat(mutationName, " (applicationId: $applicationId, options: $options) {\n          ").concat(fragments, "\n        }\n      }\n    "),
+    query: "\n      mutation ".concat(mutationName, " ($applicationId: String!, $data: ").concat(mutationInputType, ") {\n        ").concat(mutationName, " (applicationId: $applicationId, data: $data) {\n          ").concat(fragments, "\n        }\n      }\n    "),
     params: {
       applicationId,
-      options
+      data: options
     }
   };
 }

package/dist/utils.js

@@ -10,7 +10,6 @@ exports.isJavascriptFile = isJavascriptFile;
 exports.validateNProtections = validateNProtections;
 var _glob = _interopRequireDefault(require("glob"));
 var _fs = _interopRequireDefault(require("fs"));
-var _fsExtra = require("fs-extra");
 var _path = require("path");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -76,11 +75,11 @@ function concatenate(scriptObject, cwd, path, buffer) {
       source,
       type
     } = scriptObject;
-    if (!(0, _fsExtra.existsSync)(source)) {
+    if (!_fs.default.existsSync(source)) {
       throw new Error('Provided script file does not exist');
     }
-    const fileContent = (0, _fsExtra.readFileSync)(target);
-    const scriptContent = (0, _fsExtra.readFileSync)(source);
+    const fileContent = _fs.default.readFileSync(target);
+    const scriptContent = _fs.default.readFileSync(source);
     const concatContent = type === APPEND_JS_TYPE ? handleScriptConcatenation(fileContent, scriptContent) : handleScriptConcatenation(scriptContent, fileContent);
     buffer = Buffer.from(concatContent, 'utf-8');
   }

package/dist/zip.js

@@ -3,35 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "outputFileSync", {
-  enumerable: true,
-  get: function () {
-    return _fsExtra.outputFileSync;
-  }
-});
 exports.unzip = unzip;
 exports.zip = zip;
 exports.zipSources = zipSources;
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _lodash = _interopRequireDefault(require("lodash.size"));
-var _temp = _interopRequireDefault(require("temp"));
 var _jszip = _interopRequireDefault(require("jszip"));
-var _fsExtra = require("fs-extra");
+var fs = _interopRequireWildcard(require("fs/promises"));
 var _path2 = require("path");
-var _q = require("q");
 var _util = require("util");
 var _utils = require("./utils");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // TODO Replace `sync` functions with async versions
 
 const debug = !!process.env.DEBUG;
-
-// ./zip.js module is excluded from browser-like environments. We take advantage of that here.
-
 async function zip(files, cwd, runBeforeProtection) {
   debug && console.log('Zipping files', (0, _util.inspect)(files));
-  const deferred = (0, _q.defer)();
   // Flag to detect if any file was added to the zip archive
   let hasFiles = false;
   // Sanitize `cwd`
@@ -41,61 +31,58 @@ async function zip(files, cwd, runBeforeProtection) {
   // If it's already a zip file
   if (files.length === 1 && /^.*\.zip$/.test(files[0])) {
     hasFiles = true;
-    const zip = new _jszip.default();
-    let zipFile = (0, _fsExtra.readFileSync)(files[0]);
-    zipFile = await zip.loadAsync(zipFile);
-    deferred.resolve(zipFile);
-  } else {
-    const zip = new _jszip.default();
-    for (let i = 0, l = files.length; i < l; ++i) {
-      // Sanitise path
-      if (typeof files[i] === 'string') {
-        files[i] = (0, _path2.normalize)(files[i]);
-        if (files[i].indexOf('../') === 0) {
-          files[i] = (0, _path2.resolve)(files[i]);
-        }
-      }
-      // Bypass unwanted patterns from `files`
-      if (/.*\.(git|hg)(\/.*|$)/.test(files[i].path || files[i])) {
-        continue;
-      }
-      let buffer, name;
-      let sPath;
-      if (cwd && files[i].indexOf && files[i].indexOf(cwd) !== 0) {
-        sPath = (0, _path2.join)(cwd, files[i]);
-      } else {
-        sPath = files[i];
+    const zipFile = new _jszip.default();
+    const zipFileData = await fs.readFile(files[0]);
+    return await zipFile.loadAsync(zipFileData);
+  }
+  const zipFile = new _jszip.default();
+  for (let i = 0, l = files.length; i < l; ++i) {
+    // Sanitise path
+    if (typeof files[i] === 'string') {
+      files[i] = (0, _path2.normalize)(files[i]);
+      if (files[i].indexOf('../') === 0) {
+        files[i] = (0, _path2.resolve)(files[i]);
       }
-      // If buffer
-      if (files[i].contents) {
-        name = (0, _path2.relative)(files[i].cwd, files[i].path);
-        buffer = files[i].contents;
-      } else if (!(0, _fsExtra.statSync)(sPath).isDirectory()) {
-        // Else if it's a path and not a directory
-        if (cwd && files[i].indexOf && files[i].indexOf(cwd) === 0) {
-          name = files[i].substring(cwd.length);
-        } else {
-          name = files[i];
-        }
-        buffer = (0, _fsExtra.readFileSync)(sPath);
-        runBeforeProtection.map(element => {
-          buffer = (0, _utils.concatenate)(element, cwd, sPath, buffer);
-        });
+    }
+    // Bypass unwanted patterns from `files`
+    if (/.*\.(git|hg)(\/.*|$)/.test(files[i].path || files[i])) {
+      continue;
+    }
+    let buffer, name;
+    let sPath;
+    if (cwd && files[i].indexOf && files[i].indexOf(cwd) !== 0) {
+      sPath = (0, _path2.join)(cwd, files[i]);
+    } else {
+      sPath = files[i];
+    }
+    // If buffer
+    if (files[i].contents) {
+      name = (0, _path2.relative)(files[i].cwd, files[i].path);
+      buffer = files[i].contents;
+    } else if (!(await fs.stat(sPath)).isDirectory()) {
+      // Else if it's a path and not a directory
+      if (cwd && files[i].indexOf && files[i].indexOf(cwd) === 0) {
+        name = files[i].substring(cwd.length);
       } else {
-        // Else if it's a directory path
-        zip.folder(sPath);
-      }
-      if (name) {
-        hasFiles = true;
-        zip.file(name, buffer);
+        name = files[i];
       }
+      buffer = fs.readFile(sPath);
+      runBeforeProtection.map(element => {
+        buffer = (0, _utils.concatenate)(element, cwd, sPath, buffer);
+      });
+    } else {
+      // Else if it's a directory path
+      zipFile.folder(sPath);
     }
-    if (!hasFiles) {
-      throw new Error('No source files found. If you intend to send a whole directory sufix your path with "**" (e.g. ./my-directory/**)');
+    if (name) {
+      hasFiles = true;
+      zipFile.file(name, buffer);
     }
-    deferred.resolve(zip);
   }
-  return deferred.promise;
+  if (!hasFiles) {
+    throw new Error('No source files found. If you intend to send a whole directory sufix your path with "**" (e.g. ./my-directory/**)');
+  }
+  return zipFile;
 }
 function zipSources(sources) {
   const zipFile = new _jszip.default();
@@ -124,6 +111,8 @@ async function unzip(zipFile, dest) {
   await zip.loadAsync(zipFile);
   const _size = (0, _lodash.default)(zip.files);
   const results = [];
+
+  // eslint-disable-next-line no-restricted-syntax
   for (const file in zip.files) {
     if (!zip.files[file].dir) {
       const buffer = await zip.file(file).async('nodebuffer');
@@ -141,15 +130,22 @@ async function unzip(zipFile, dest) {
         const lastDestChar = dest[dest.length - 1];
         if (_size === 1 && lastDestChar !== '/' && lastDestChar !== '\\') {
           destPath = dest;
+          const parentPath = (0, _path2.dirname)(destPath);
+          await fs.mkdir(parentPath, {
+            recursive: true
+          });
         } else {
           let _file = file;
           // Deal with win path join c:\dest\:c\src
           if (isWinAbsolutePath(_file)) {
             _file = parseWinAbsolutePath(_file).path;
           }
+          await fs.mkdir(dest, {
+            recursive: true
+          });
           destPath = (0, _path2.join)(dest, _file);
         }
-        (0, _fsExtra.outputFileSync)(destPath, buffer);
+        await fs.outputFile(destPath, buffer);
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jscrambler",
   "description": "Jscrambler API client.",
-  "version": "8.0.0",
+  "version": "9.0.0-alpha.0",
   "homepage": "https://github.com/jscrambler/jscrambler",
   "author": "Jscrambler <support@jscrambler.com>",
   "repository": {
@@ -26,7 +26,6 @@
     "commander": "^2.8.1",
     "core-js": "^3.16.4",
     "filesize-parser": "1.5.0",
-    "fs-extra": "^10.1.0",
     "glob": "^8.1.0",
     "http-proxy-agent": "^4.0.1",
     "jszip": "^3.7.1",