datagrok-tools 4.5.8 → 4.5.9

package/bin/commands/add.js

@@ -50,7 +50,9 @@ function add(args) {
 
   var connectDir = _path["default"].join(curDir, 'connections');
 
-  var packagePath = _path["default"].join(curDir, 'package.json'); // Package directory check
+  var packagePath = _path["default"].join(curDir, 'package.json');
+
+  var templateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname))); // Package directory check
 
 
   if (!_fs["default"].existsSync(packagePath)) return color.error('`package.json` not found');
@@ -91,7 +93,7 @@ function add(args) {
     if (!_fs["default"].existsSync(srcDir)) _fs["default"].mkdirSync(srcDir);
 
     if (!_fs["default"].existsSync(packageEntry)) {
-      var _contents = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'src', 'package.js'), 'utf8');
+      var _contents = _fs["default"].readFileSync(_path["default"].join(templateDir, 'package-template', 'src', 'package.js'), 'utf8');
 
       _fs["default"].writeFileSync(packageEntry, _contents, 'utf8');
     }
@@ -133,7 +135,7 @@ function add(args) {
       } // Copy the script template
 
 
-      var templatePath = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), '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');
@@ -157,7 +159,7 @@ function add(args) {
 
       createPackageEntryFile(); // Add an app template to package.js
 
-      var app = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'app.js'), 'utf8');
+      var app = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'app.js'), 'utf8');
 
       _fs["default"].appendFileSync(packageEntry, insertName(name, app));
 
@@ -184,7 +186,7 @@ function add(args) {
 
       var filename = tag === 'panel' ? 'panel' + ext : tag === 'init' ? 'init.js' : 'function' + ext;
 
-      var func = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', filename), 'utf8');
+      var func = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', filename), 'utf8');
 
       _fs["default"].appendFileSync(packageEntry, insertName(name, func));
 
@@ -205,7 +207,7 @@ function add(args) {
         return color.error("The connection file already exists: ".concat(connectPath));
       }
 
-      var connectionTemplate = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'connection.json'), 'utf8');
+      var connectionTemplate = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'connection.json'), 'utf8');
 
       _fs["default"].writeFileSync(connectPath, insertName(name, connectionTemplate), 'utf8');
 
@@ -220,7 +222,7 @@ function add(args) {
 
       if (!_fs["default"].existsSync(queryDir)) _fs["default"].mkdirSync(queryDir); // Add a query to queries.sql
 
-      var query = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'queries.sql'), 'utf8');
+      var query = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'queries.sql'), 'utf8');
 
       contents = insertName(name, query);
       var connection;
@@ -235,7 +237,7 @@ function add(args) {
       } else {
         // Create the default connection file
         if (!_fs["default"].existsSync(connectDir)) _fs["default"].mkdirSync(connectDir);
-        connection = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'connection.json'), 'utf8');
+        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');
 
@@ -268,12 +270,12 @@ function add(args) {
         return color.error("The view file already exists: ".concat(viewPath));
       }
 
-      var viewClass = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'view-class' + ext), 'utf8');
+      var viewClass = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'view-class' + ext), 'utf8');
 
       _fs["default"].writeFileSync(viewPath, insertName(name, viewClass), 'utf8'); // Add a view function to package.js
 
 
-      var view = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'view.js'), 'utf8');
+      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');
@@ -303,12 +305,12 @@ function add(args) {
         return color.error("The viewer file already exists: ".concat(viewerPath));
       }
 
-      var viewerClass = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'viewer-class' + ext), 'utf8');
+      var viewerClass = _fs["default"].readFileSync(_path["default"].join(templateDir, 'entity-template', 'viewer-class' + ext), 'utf8');
 
       _fs["default"].writeFileSync(viewerPath, insertName(name, viewerClass), 'utf8'); // Add a viewer function to package.js
 
 
-      var viewer = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'viewer.js'), 'utf8');
+      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');
@@ -324,14 +326,14 @@ function add(args) {
       name = args['_'][2];
 
       if (!_fs["default"].existsSync(detectorsPath)) {
-        var temp = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template', 'detectors.js'), 'utf8');
+        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(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'sem-type-detector.js'), '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)).*/);
@@ -349,7 +351,15 @@ function add(args) {
       break;
 
     case 'tests':
-      if (!_fs["default"].existsSync(webpackConfigPath) || !_fs["default"].existsSync(tsPath)) return false;
+      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');
 
@@ -383,12 +393,24 @@ function add(args) {
 
       _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(curDir, 'jest.config.js'))) _fs["default"].writeFileSync(_path["default"].join(curDir, 'jest.config.js'), _fs["default"].readFileSync(_path["default"].join(templateDir, 'package-template', 'jest.config.js')));
       if (!_fs["default"].existsSync(_path["default"].join(srcDir, '__jest__'))) _fs["default"].mkdirSync(_path["default"].join(srcDir, '__jest__'));
-      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');
+      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(templateDir, '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(templateDir, 'package-template', 'src', '__jest__', 'test-node.ts')));
+
+      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:

package/bin/commands/config.js

@@ -175,12 +175,14 @@ function config(args) {
       url: args.server,
       key: args.key
     };
-    color.success('Successfully added the server.');
+    color.success("Successfully added the server to ".concat(confPath, "."));
     console.log("Use this command to deploy packages: grok publish ".concat(args.alias));
 
     if (args["default"]) {
       config["default"] = args.alias;
     }
+
+    return true;
   }
 
   console.log("Your config file (".concat(confPath, "):"));

package/bin/utils/ent-helpers.js

@@ -19,7 +19,7 @@ var detector = function detector(semType) {
 
 var func = function func(funcName) {
   var isPanel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return "\nThe function ".concat(funcName, " has been added successfully\n") + 'Read more at https://datagrok.ai/help/overview/functions/function' + (isPanel ? ',\nhttps://datagrok.ai/help/develop/how-to/add-info-panel\n' : '\n') + 'See examples at https://public.datagrok.ai/functions' + (isPanel ? ',\nhttps://public.datagrok.ai/js/samples/functions/info-panels/info-panels' : '');
+  return "\nThe function ".concat(funcName, " has been added successfully\n") + 'Read more at https://datagrok.ai/help/datagrok/functions/function' + (isPanel ? ',\nhttps://datagrok.ai/help/develop/how-to/add-info-panel\n' : '\n') + 'See examples at https://public.datagrok.ai/functions' + (isPanel ? ',\nhttps://public.datagrok.ai/js/samples/functions/info-panels/info-panels' : '');
 };
 
 var query = function query(queryName) {
@@ -42,6 +42,10 @@ var _package = function _package(ts) {
   return ts ? '' : 'Consider TypeScript as a language for package development, to start over, run `grok create` with the `--ts` flag\n' + 'Likely next steps: `grok add` to add functionality, `grok publish` to upload the package';
 };
 
+var test = function test(dir) {
+  return "Tests have been added successfully to ".concat(dir, "\nRun 'npm install' to get newly added packages\nRead more about package testing at https://datagrok.ai/help/develop/how-to/test-packages");
+};
+
 var help = {
   app: app,
   connection: connection,
@@ -51,6 +55,7 @@ var help = {
   script: script,
   view: view,
   viewer: viewer,
-  "package": _package
+  "package": _package,
+  test: test
 };
 exports.help = help;

package/entity-template/test.ts

@@ -0,0 +1,12 @@
+import { category, expect, test } from '@datagrok-libraries/utils/src/test';
+
+
+category('Examples', () => {
+  test('Success', async () => {
+    expect(1, 1);
+  });
+
+  test('Fail', () => {
+    throw 'Exception';
+  });
+});

package/package.json

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