datagrok-tools 4.8.4 → 4.10.0

package/README.md

@@ -118,4 +118,4 @@ Read more about package development in [Datagrok's documentation](https://datagr
   save a test run result, add the `--csv` flag (the report will be saved in a
   CSV file in the package folder). You can find more details in [local package testing
   instructions](https://datagrok.ai/help/develop/how-to/test-packages#local-testing).
-- `link` / `unlink` commands are used for public plugins development to (un)link `datagrok-api` and libraries.
+- `link` command is used for public plugins development to link `datagrok-api` and libraries.

package/bin/commands/add.js

@@ -1,62 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.add = add;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _entHelpers = require("../utils/ent-helpers");
-
 var utils = _interopRequireWildcard(require("../utils/utils"));
-
 var color = _interopRequireWildcard(require("../utils/color-utils"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function add(args) {
   var nOptions = Object.keys(args).length - 1;
   var nArgs = args['_'].length;
   if (nArgs < 2 || nArgs > 5 || nOptions > 0) return false;
   var entity = args['_'][1];
   var curDir = process.cwd();
-
   var curFolder = _path["default"].basename(curDir);
-
   var srcDir = _path["default"].join(curDir, 'src');
-
   var jsPath = _path["default"].join(srcDir, 'package.js');
-
   var tsPath = _path["default"].join(srcDir, 'package.ts');
-
   var detectorsPath = _path["default"].join(curDir, 'detectors.js');
-
   var webpackConfigPath = _path["default"].join(curDir, 'webpack.config.js');
-
   var scriptsDir = _path["default"].join(curDir, 'scripts');
-
   var queryDir = _path["default"].join(curDir, 'queries');
-
   var queryPath = _path["default"].join(queryDir, 'queries.sql');
-
   var connectDir = _path["default"].join(curDir, 'connections');
-
   var packagePath = _path["default"].join(curDir, 'package.json');
+  var templateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)));
 
-  var templateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname))); // Package directory check
-
-
+  // Package directory check
   if (!_fs["default"].existsSync(packagePath)) return color.error('`package.json` not found');
-
   try {
     var _package = JSON.parse(_fs["default"].readFileSync(packagePath, {
       encoding: 'utf-8'
@@ -64,172 +41,145 @@ function add(args) {
   } catch (error) {
     color.error("Error while reading ".concat(packagePath, ":"));
     console.error(error);
-  } // TypeScript package check
-
+  }
 
+  // TypeScript package check
   var ts = _fs["default"].existsSync(_path["default"].join(curDir, 'tsconfig.json'));
-
   var packageEntry = ts ? tsPath : jsPath;
   var ext = ts ? '.ts' : '.js';
-
   function validateName(name) {
     if (!/^([A-Za-z])+([A-Za-z\d])*$/.test(name)) {
       return color.error('The name may only include letters and numbers. It cannot start with a digit');
     }
-
     return true;
   }
-
   function insertName(name, data) {
     for (var _i = 0, _arr = ['NAME', 'NAME_TITLECASE', 'NAME_LOWERCASE']; _i < _arr.length; _i++) {
       var repl = _arr[_i];
       data = utils.replacers[repl](data, name);
     }
-
     return data;
   }
-
   function createPackageEntryFile() {
     if (!_fs["default"].existsSync(srcDir)) _fs["default"].mkdirSync(srcDir);
-
     if (!_fs["default"].existsSync(packageEntry)) {
       var _contents = _fs["default"].readFileSync(_path["default"].join(templateDir, 'package-template', 'src', 'package.js'), 'utf8');
-
       _fs["default"].writeFileSync(packageEntry, _contents, 'utf8');
     }
   }
-
   var name;
   var tag;
   var contents;
-
   switch (entity) {
     case 'script':
       if (nArgs < 4 || nArgs > 5) return false;
       var lang = args['_'][2];
       name = args['_'][3];
-
       if (nArgs === 5) {
         tag = args['_'][2];
         lang = args['_'][3];
         name = args['_'][4];
       }
-
       if (!Object.keys(utils.scriptLangExtMap).includes(lang)) {
         color.error("Unsupported language: ".concat(lang));
         console.log('You can add a script in one of the following languages:');
         console.log(Object.keys(utils.scriptLangExtMap).join(', '));
         return false;
-      } // Script name check
-
+      }
 
+      // Script name check
       if (!validateName(name)) return false;
-      if (tag && tag !== 'panel') return color.error('Currently, you can only add the `panel` tag'); // Create the folder `scripts` if it doesn't exist yet
+      if (tag && tag !== 'panel') return color.error('Currently, you can only add the `panel` tag');
 
+      // Create the folder `scripts` if it doesn't exist yet
       if (!_fs["default"].existsSync(scriptsDir)) _fs["default"].mkdirSync(scriptsDir);
-
       var scriptPath = _path["default"].join(scriptsDir, name + '.' + utils.scriptLangExtMap[lang]);
-
       if (_fs["default"].existsSync(scriptPath)) {
         return color.error("The file with the script already exists: ".concat(scriptPath));
-      } // Copy the script template
-
+      }
 
+      // Copy the script template
       var templatePath = _path["default"].join(templateDir, 'script-template');
-
       templatePath = _path["default"].join(templatePath, lang + '.' + utils.scriptLangExtMap[lang]);
       contents = _fs["default"].readFileSync(templatePath, 'utf8');
-
       if (tag) {
         var ind = contents.indexOf('tags: ') + 6;
         contents = contents.slice(0, ind) + 'panel, ' + contents.slice(ind);
       }
+      _fs["default"].writeFileSync(scriptPath, insertName(name, contents), 'utf8');
 
-      _fs["default"].writeFileSync(scriptPath, insertName(name, contents), 'utf8'); // Provide a JS wrapper for the script
-
-
+      // Provide a JS wrapper for the script
       console.log(_entHelpers.help.script(name, curFolder));
       break;
-
     case 'app':
-      if (nArgs !== 3) return false; // App name check
+      if (nArgs !== 3) return false;
 
+      // App name check
       name = args['_'][2];
-      if (!validateName(name)) return false; // Create src/package.js if it doesn't exist yet
+      if (!validateName(name)) return false;
 
-      createPackageEntryFile(); // Add an app template to package.js
+      // Create src/package.js if it doesn't exist yet
+      createPackageEntryFile();
 
+      // Add an app template to package.js
       var app = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'app.js'), 'utf8');
-
       _fs["default"].appendFileSync(packageEntry, insertName(name, app));
-
       console.log(_entHelpers.help.app(name));
       break;
-
     case 'function':
       if (nArgs < 3 || nArgs > 4) return false;
       name = args['_'][2];
-
       if (nArgs === 4) {
         tag = args['_'][2];
         name = args['_'][3];
       }
-
       if (!validateName(name)) return false;
-
       if (tag && tag !== 'panel' && tag !== 'init') {
         return color.error('Currently, you can only add the `panel` or `init` tag');
-      } // Create src/package.js if it doesn't exist yet
-
+      }
 
-      createPackageEntryFile(); // Add a function to package.js
+      // Create src/package.js if it doesn't exist yet
+      createPackageEntryFile();
 
+      // Add a function to package.js
       var filename = tag === 'panel' ? 'panel' + ext : tag === 'init' ? 'init.js' : 'function' + ext;
-
       var func = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', filename), 'utf8');
-
       _fs["default"].appendFileSync(packageEntry, insertName(name, func));
-
       console.log(_entHelpers.help.func(name, tag === 'panel'));
       break;
-
     case 'connection':
       if (nArgs !== 3) return false;
-      name = args['_'][2]; // Connection name check
+      name = args['_'][2];
 
-      if (!validateName(name)) return false; // Create the `connections` folder if it doesn't exist yet
+      // Connection name check
+      if (!validateName(name)) return false;
 
+      // Create the `connections` folder if it doesn't exist yet
       if (!_fs["default"].existsSync(connectDir)) _fs["default"].mkdirSync(connectDir);
-
       var connectPath = _path["default"].join(connectDir, "".concat(name, ".json"));
-
       if (_fs["default"].existsSync(connectPath)) {
         return color.error("The connection file already exists: ".concat(connectPath));
       }
-
       var connectionTemplate = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'connection.json'), 'utf8');
-
       _fs["default"].writeFileSync(connectPath, insertName(name, connectionTemplate), 'utf8');
-
       console.log(_entHelpers.help.connection(name));
       break;
-
     case 'query':
-      if (nArgs !== 3) return false; // Query name check
+      if (nArgs !== 3) return false;
 
+      // Query name check
       name = args['_'][2];
-      if (!validateName(name)) return false; // Create the `queries` folder if it doesn't exist yet
+      if (!validateName(name)) return false;
 
-      if (!_fs["default"].existsSync(queryDir)) _fs["default"].mkdirSync(queryDir); // Add a query to queries.sql
+      // Create the `queries` folder if it doesn't exist yet
+      if (!_fs["default"].existsSync(queryDir)) _fs["default"].mkdirSync(queryDir);
 
+      // Add a query to queries.sql
       var query = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'queries.sql'), 'utf8');
-
       contents = insertName(name, query);
       var connection;
-
       if (_fs["default"].existsSync(connectDir) && _fs["default"].readdirSync(connectDir).length !== 0) {
         var _fs$readdirSync$find;
-
         // Use the name of the first found connection
         connection = (_fs$readdirSync$find = _fs["default"].readdirSync(connectDir).find(function (c) {
           return /.+\.json$/.test(c);
@@ -238,139 +188,107 @@ function add(args) {
         // Create the default connection file
         if (!_fs["default"].existsSync(connectDir)) _fs["default"].mkdirSync(connectDir);
         connection = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'connection.json'), 'utf8');
-
         _fs["default"].writeFileSync(_path["default"].join(connectDir, 'connection.json'), insertName('connection', connection), 'utf8');
-
         connection = 'connection';
       }
-
       contents = contents.replace('#{CONNECTION}', connection);
-
       _fs["default"].appendFileSync(queryPath, contents);
-
       console.log(_entHelpers.help.query(name));
       break;
-
     case 'view':
-      if (nArgs !== 3) return false; // View name check
+      if (nArgs !== 3) return false;
 
+      // View name check
       name = args['_'][2];
       if (!validateName(name)) return false;
-
       if (!name.endsWith('View')) {
         color.warn("For consistency reasons, we recommend postfixing classes with 'View'");
-      } // Create src/package.js if it doesn't exist yet
-
+      }
 
-      createPackageEntryFile(); // Add a new JS file with a view class
+      // Create src/package.js if it doesn't exist yet
+      createPackageEntryFile();
 
+      // Add a new JS file with a view class
       var viewPath = _path["default"].join(srcDir, utils.camelCaseToKebab(name) + ext);
-
       if (_fs["default"].existsSync(viewPath)) {
         return color.error("The view file already exists: ".concat(viewPath));
       }
-
       var viewClass = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'view-class' + ext), 'utf8');
+      _fs["default"].writeFileSync(viewPath, insertName(name, viewClass), 'utf8');
 
-      _fs["default"].writeFileSync(viewPath, insertName(name, viewClass), 'utf8'); // Add a view function to package.js
-
-
+      // Add a view function to package.js
       var view = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'view.js'), 'utf8');
-
       contents = insertName(name, "import {#{NAME}} from './".concat(utils.camelCaseToKebab(name), "';\n"));
       contents += _fs["default"].readFileSync(packageEntry, 'utf8');
       contents += insertName(name, view);
-
       _fs["default"].writeFileSync(packageEntry, contents, 'utf8');
-
       console.log(_entHelpers.help.view(name));
       break;
-
     case 'viewer':
-      if (nArgs !== 3) return false; // Viewer name check
+      if (nArgs !== 3) return false;
 
+      // Viewer name check
       name = args['_'][2];
       if (!validateName(name)) return false;
-
       if (!name.endsWith('Viewer')) {
         color.warn("For consistency reasons, we recommend postfixing classes with 'Viewer'");
-      } // Create src/package.js if it doesn't exist yet
-
+      }
 
-      createPackageEntryFile(); // Add a new JS file with a viewer class
+      // Create src/package.js if it doesn't exist yet
+      createPackageEntryFile();
 
+      // Add a new JS file with a viewer class
       var viewerPath = _path["default"].join(srcDir, utils.camelCaseToKebab(name) + ext);
-
       if (_fs["default"].existsSync(viewerPath)) {
         return color.error("The viewer file already exists: ".concat(viewerPath));
       }
-
       var viewerClass = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'viewer-class' + ext), 'utf8');
+      _fs["default"].writeFileSync(viewerPath, insertName(name, viewerClass), 'utf8');
 
-      _fs["default"].writeFileSync(viewerPath, insertName(name, viewerClass), 'utf8'); // Add a viewer function to package.js
-
-
+      // Add a viewer function to package.js
       var viewer = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'viewer.js'), 'utf8');
-
       contents = insertName(name, "import {#{NAME}} from './".concat(utils.camelCaseToKebab(name), "';\n"));
       contents += _fs["default"].readFileSync(packageEntry, 'utf8');
       contents += insertName(name, viewer);
-
       _fs["default"].writeFileSync(packageEntry, contents, 'utf8');
-
       console.log(_entHelpers.help.viewer(name));
       break;
-
     case 'detector':
       if (nArgs !== 3) return false;
       name = args['_'][2];
-
       if (!_fs["default"].existsSync(detectorsPath)) {
         var temp = _fs["default"].readFileSync(_path["default"].join(templateDir, 'package-template', 'detectors.js'), 'utf8');
-
         temp = utils.replacers['PACKAGE_DETECTORS_NAME'](temp, curFolder);
-
         _fs["default"].writeFileSync(detectorsPath, temp, 'utf8');
       }
-
       var detector = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'sem-type-detector.js'), 'utf8');
-
       contents = _fs["default"].readFileSync(detectorsPath, 'utf8');
       var idx = contents.search(/(?<=PackageDetectors extends DG.Package\s*{\s*(\r\n|\r|\n)).*/);
       if (idx === -1) return color.error('Detectors class not found');
       contents = contents.slice(0, idx) + detector + contents.slice(idx);
-
       for (var _i2 = 0, _arr2 = ['NAME', 'NAME_PREFIX', 'PACKAGE_DETECTORS_NAME']; _i2 < _arr2.length; _i2++) {
         var repl = _arr2[_i2];
         contents = utils.replacers[repl](contents, name);
       }
-
       _fs["default"].writeFileSync(detectorsPath, contents, 'utf8');
-
       console.log(_entHelpers.help.detector(name));
       break;
-
     case 'tests':
       if (!_fs["default"].existsSync(tsPath)) {
         color.error('Only TypeScript packages are supported');
         return false;
       }
-
       if (!_fs["default"].existsSync(webpackConfigPath)) {
         color.error('Webpack configuration not found');
         return false;
       }
-
       var config = _fs["default"].readFileSync(webpackConfigPath, 'utf8');
-
       if (!/(?<=entry:\s*{\s*(\r\n|\r|\n))[^}]*test:/.test(config)) {
         var entryIdx = config.search(/(?<=entry:\s*{\s*(\r\n|\r|\n)).*/);
         if (entryIdx === -1) return color.error('Entry point not found during config parsing');
         var testEntry = "    test: {filename: 'package-test.js', library: " + "{type: 'var', name:`${packageName}_test`}, import: './src/package-test.ts'},";
-
         _fs["default"].writeFileSync(webpackConfigPath, config.slice(0, entryIdx) + testEntry + config.slice(entryIdx), 'utf8');
       }
-
       var packageObj = JSON.parse(_fs["default"].readFileSync(packagePath, 'utf8'));
       Object.assign(packageObj.dependencies, {
         '@datagrok-libraries/utils': 'latest'
@@ -378,27 +296,17 @@ function add(args) {
       Object.assign(packageObj.scripts, {
         'test': 'grok test'
       });
-
       _fs["default"].writeFileSync(packagePath, JSON.stringify(packageObj, null, 2), 'utf8');
-
       var packageTestPath = _path["default"].join(srcDir, 'package-test.ts');
-
       if (!_fs["default"].existsSync(packageTestPath)) _fs["default"].writeFileSync(packageTestPath, _fs["default"].readFileSync(_path["default"].join(templateDir, 'package-template', 'src', 'package-test.ts')));
-
       var testsDir = _path["default"].join(srcDir, 'tests');
-
       if (!_fs["default"].existsSync(testsDir)) _fs["default"].mkdirSync(testsDir);
-
       _fs["default"].writeFileSync(_path["default"].join(testsDir, 'test-examples.ts'), _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'test.ts')));
-
       _fs["default"].writeFileSync(packageTestPath, "import './tests/test-examples';\n" + _fs["default"].readFileSync(packageTestPath));
-
       console.log(_entHelpers.help.test(testsDir));
       break;
-
     default:
       return false;
   }
-
   return true;
 }

package/bin/commands/api.js

@@ -1,80 +1,54 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.api = api;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _ignoreWalk = _interopRequireDefault(require("ignore-walk"));
-
 var utils = _interopRequireWildcard(require("../utils/utils"));
-
 var color = _interopRequireWildcard(require("../utils/color-utils"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function generateQueryWrappers() {
   var curDir = process.cwd();
-
   var queriesDir = _path["default"].join(curDir, 'queries');
-
   if (!_fs["default"].existsSync(queriesDir)) {
     color.warn("Directory ".concat(queriesDir, " not found"));
     console.log('Skipping API generation for queries...');
     return;
   }
-
   var packagePath = _path["default"].join(curDir, 'package.json');
-
   var _package = JSON.parse(_fs["default"].readFileSync(packagePath, {
     encoding: 'utf-8'
   }));
-
   var files = _ignoreWalk["default"].sync({
     path: './queries',
     ignoreFiles: ['.npmignore', '.gitignore']
   });
-
   var wrappers = [];
-
   var _iterator = _createForOfIteratorHelper(files),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var file = _step.value;
       if (!file.endsWith(utils.queryExtension)) continue;
-
       var filepath = _path["default"].join(queriesDir, file);
-
       var script = _fs["default"].readFileSync(filepath, 'utf8');
-
       if (!script) continue;
       var queries = script.split('--end').map(function (q) {
         return q.trim();
       }).filter(function (q) {
         return q.length > 0;
       });
-
       var _iterator2 = _createForOfIteratorHelper(queries),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var q = _step2.value;
@@ -83,7 +57,8 @@ function generateQueryWrappers() {
           var tb = new utils.TemplateBuilder(utils.queryWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package.name);
           var inputs = utils.getScriptInputs(q, utils.commentMap[utils.queryExtension]);
           var outputType = utils.getScriptOutputType(q, utils.commentMap[utils.queryExtension]);
-          tb.replace('PARAMS_OBJECT', inputs).replace('TYPED_PARAMS', inputs) // The query output, if omitted, is a dataframe
+          tb.replace('PARAMS_OBJECT', inputs).replace('TYPED_PARAMS', inputs)
+          // The query output, if omitted, is a dataframe
           .replace('OUTPUT_TYPE', outputType === 'void' ? utils.dgToTsTypeMap['dataframe'] : outputType);
           wrappers.push(tb.build());
         }
@@ -98,52 +73,36 @@ function generateQueryWrappers() {
   } finally {
     _iterator.f();
   }
-
   var srcDir = _path["default"].join(curDir, 'src');
-
   var queryFileName = 'queries-api.ts';
-
   var queryFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, queryFileName);
-
   if (_fs["default"].existsSync(queryFilePath)) {
     color.warn("The file ".concat(queryFilePath, " already exists"));
     console.log('Rewriting its contents...');
   }
-
   var sep = '\n';
-
   _fs["default"].writeFileSync(queryFilePath, utils.dgImports + sep + wrappers.join(sep.repeat(2)) + sep, 'utf8');
-
   color.success("Successfully generated file ".concat(queryFileName).concat(sep));
 }
-
 function generateScriptWrappers() {
   var curDir = process.cwd();
-
   var scriptsDir = _path["default"].join(curDir, 'scripts');
-
   if (!_fs["default"].existsSync(scriptsDir)) {
     color.warn("Directory ".concat(scriptsDir, " not found"));
     console.log('Skipping API generation for scripts...');
     return;
   }
-
   var packagePath = _path["default"].join(curDir, 'package.json');
-
   var _package = JSON.parse(_fs["default"].readFileSync(packagePath, {
     encoding: 'utf-8'
   }));
-
   var files = _ignoreWalk["default"].sync({
     path: './scripts',
     ignoreFiles: ['.npmignore', '.gitignore']
   });
-
   var wrappers = [];
-
   var _iterator3 = _createForOfIteratorHelper(files),
-      _step3;
-
+    _step3;
   try {
     var _loop = function _loop() {
       var file = _step3.value;
@@ -151,11 +110,8 @@ function generateScriptWrappers() {
       if (!utils.scriptExtensions.some(function (ext) {
         return extension = ext, file.endsWith(ext);
       })) return "continue";
-
       var filepath = _path["default"].join(scriptsDir, file);
-
       var script = _fs["default"].readFileSync(filepath, 'utf8');
-
       if (!script) return "continue";
       var name = utils.getScriptName(script, utils.commentMap[extension]);
       if (!name) return "continue";
@@ -165,10 +121,8 @@ function generateScriptWrappers() {
       tb.replace('PARAMS_OBJECT', inputs).replace('TYPED_PARAMS', inputs).replace('OUTPUT_TYPE', outputType);
       wrappers.push(tb.build(1));
     };
-
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var _ret = _loop();
-
       if (_ret === "continue") continue;
     }
   } catch (err) {
@@ -176,35 +130,25 @@ function generateScriptWrappers() {
   } finally {
     _iterator3.f();
   }
-
   var srcDir = _path["default"].join(curDir, 'src');
-
   var funcFileName = 'scripts-api.ts';
-
   var funcFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, funcFileName);
-
   if (_fs["default"].existsSync(funcFilePath)) {
     color.warn("The file ".concat(funcFilePath, " already exists"));
     console.log('Rewriting its contents...');
   }
-
   var sep = '\n';
   var scriptApi = new utils.TemplateBuilder(utils.namespaceTemplate).replace('PACKAGE_NAMESPACE', _package.name).replace('NAME', wrappers.join(sep.repeat(2)));
-
   _fs["default"].writeFileSync(funcFilePath, utils.dgImports + sep + scriptApi.build() + sep, 'utf8');
-
   color.success("Successfully generated file ".concat(funcFileName).concat(sep));
 }
-
 function api(args) {
   var nOptions = Object.keys(args).length - 1;
   if (args['_'].length !== 1 || nOptions > 0) return false;
-
   if (!utils.isPackageDir(process.cwd())) {
     color.error('File `package.json` not found. Run the command from the package directory');
     return false;
   }
-
   generateScriptWrappers();
   generateQueryWrappers();
   return true;