datagrok-tools 4.5.2 → 4.5.3

package/README.md

@@ -74,6 +74,7 @@ Read more about package development in [Datagrok's documentation](https://datagr
   grok add script [tag] <language> <name>
   grok add view <name>
   grok add viewer <name>
+  grok add tests
   ```
 
   In general, entity names follow naming rules for functions. Views and viewers should have class names, we recommend

package/bin/commands/add.js

@@ -40,6 +40,8 @@ function add(args) {
 
   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');
@@ -346,6 +348,45 @@ function add(args) {
       console.log(_entHelpers.help.detector(name));
       break;
 
+    case 'tests':
+      if (!_fs["default"].existsSync(webpackConfigPath) || !_fs["default"].existsSync(tsPath)) 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'},\n";
+
+        _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.devDependencies, {
+        'jest-html-reporter': '^3.5.0',
+        'jest': '^27.0.0',
+        '@types/jest': '^27.0.0',
+        'js-yaml': '^4.1.0',
+        '@types/js-yaml': "^4.0.5",
+        '@types/node-fetch': '^2.6.2',
+        'node-fetch': '^2.6.7'
+      }, ts ? {
+        'ts-jest': '^27.0.0',
+        'puppeteer': '^13.7.0'
+      } : {});
+      Object.assign(packageObj.scripts, {
+        'test': 'jest'
+      });
+
+      _fs["default"].writeFileSync(packagePath, JSON.stringify(packageObj, null, 2), 'utf8');
+
+      if (!_fs["default"].existsSync(_path["default"].join(curDir, 'jest.config.js'))) _fs["default"].writeFileSync(_path["default"].join(curDir, 'jest.config.js'), _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'jest.config.js')));
+      if (!_fs["default"].existsSync(_path["default"].join(srcDir, '__jest__', 'remote.test.ts'))) _fs["default"].writeFileSync(_path["default"].join(srcDir, '__jest__', 'remote.test.ts'), _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'src', '__jest__', 'remote.test.ts')));
+      if (!_fs["default"].existsSync(_path["default"].join(srcDir, '__jest__', 'test-node.ts'))) _fs["default"].writeFileSync(_path["default"].join(srcDir, '__jest__', 'test-node.ts'), _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'src', '__jest__', 'test-node.ts')));
+      if (!_fs["default"].existsSync(_path["default"].join(srcDir, 'package-test.ts'))) _fs["default"].writeFileSync(_path["default"].join(srcDir, 'package-test.ts'), _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'src', 'package-test.ts')));
+      console.log('Run `npm install` to get newly added packages');
+      break;
+
     default:
       return false;
   }

package/bin/commands/help.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.help = void 0;
 var HELP = "\nUsage: grok <command>\n\nDatagrok's package management tool\n\nCommands:\n    add       Add an object template\n    api       Create wrapper functions\n    config    Create and manage config files\n    create    Create a package\n    publish   Upload a package\n    migrate   Switch to `grok` tools\n\nTo get help on a particular command, use:\n    grok <command> --help\n\nRead more about the package development workflow:\nhttps://datagrok.ai/help/develop/develop\n";
-var HELP_ADD = "\nUsage: grok add <entity> <name>\n\nAdd an object template to your package:\n\ngrok add app <name>\ngrok add connection <name>\ngrok add detector <semantic-type-name>\ngrok add function [tag] <name>\ngrok add query <name>\ngrok add script [tag] <language> <name>\ngrok add view <name>\ngrok add viewer <name>\n\nPlease note that entity names may only include letters and numbers\n\nSupported languages for scripts:\njavascript, julia, node, octave, python, r\n\nAvailable tags:\npanel, init\n";
+var HELP_ADD = "\nUsage: grok add <entity> <name>\n\nAdd an object template to your package:\n\ngrok add app <name>\ngrok add connection <name>\ngrok add detector <semantic-type-name>\ngrok add function [tag] <name>\ngrok add query <name>\ngrok add script [tag] <language> <name>\ngrok add view <name>\ngrok add viewer <name>\ngrok add tests\n\nPlease note that entity names may only include letters and numbers\n\nSupported languages for scripts:\njavascript, julia, node, octave, python, r\n\nAvailable tags:\npanel, init\n";
 var HELP_API = "\nUsage: grok api\n\nCreate wrapper functions for package scripts and queries\n";
 var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file\n\nOptions:\n[--reset] [--server] [--alias] [--key]\n\n--reset     Restore the default config file template\n--server    Use to add a server to the config (`grok config add --alias alias --server url --key key`)\n--alias     Use in conjunction with the `server` option to set the server name\n--key       Use in conjunction with the `server` option to set the developer key\n--default   Use in conjunction with the `server` option to set the added server as default\n";
 var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok create         Create a package in the current working directory\ngrok create <name>  Create a package in a folder with the specified name\n\nPlease note that the package name may only include letters, numbers, underscores, or hyphens\n\nOptions:\n[--eslint] [--ide] [--js|--ts] [--jest]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--js        Create a JavaScript package\n--ts        Create a TypeScript package (default)\n--jest      Add a configuration for jest\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.5.2",
+  "version": "4.5.3",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {