datagrok-tools 4.5.3 → 4.5.6

package/bin/commands/add.js

@@ -356,12 +356,15 @@ function add(args) {
       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";
+        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'
+      });
       Object.assign(packageObj.devDependencies, {
         'jest-html-reporter': '^3.5.0',
         'jest': '^27.0.0',
@@ -381,6 +384,7 @@ 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(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')));

package/bin/commands/create.js

@@ -81,6 +81,7 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
       contents = contents.replace(/#{PACKAGE_DETECTORS_NAME}/g, utils.kebabToCamelCase(name));
       contents = contents.replace(/#{PACKAGE_NAME_LOWERCASE}/g, name.toLowerCase());
       contents = contents.replace(/#{PACKAGE_NAME_LOWERCASE_WORD}/g, name.replace(/-/g, '').toLowerCase());
+      contents = utils.replacers['PACKAGE_NAMESPACE'](contents, name);
       contents = contents.replace(/#{GROK_HOST_ALIAS}/g, config["default"]);
       contents = contents.replace(/#{GROK_HOST}/g, /localhost|127\.0\.0\.1/.test(config['servers'][config["default"]]['url']) ? 'http://localhost:63343/login.html' : new URL(config['servers'][config["default"]]['url']).origin);
 

package/bin/commands/help.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 = "\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\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>\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";
@@ -17,7 +17,6 @@ var help = {
   config: HELP_CONFIG,
   create: HELP_CREATE,
   publish: HELP_PUBLISH,
-  migrate: HELP_MIGRATE,
   help: HELP
 };
 exports.help = help;

package/bin/grok.js

@@ -8,7 +8,6 @@ const commands = {
   config: require('./commands/config').config,
   create: require('./commands/create').create,
   publish: require('./commands/publish').publish,
-  migrate: require('./_deprecated/migrate').migrate
 };
 
 const command = argv['_'][0];

package/package-template/src/__jest__/remote.test.ts

@@ -20,13 +20,13 @@ afterAll(async () => {
 });
 
 it('TEST', async () => {
-  const target_package:string = process.env.TARGET_PACKAGE;
-  console.log(`Testing ${target_package} package`);
+  const targetPackage: string = process.env.targetPackage ?? '#{PACKAGE_NAMESPACE}';
+  console.log(`Testing ${targetPackage} package`);
 
   //console.log(require('root-require')('package.json').version);
-  let r = await page.evaluate((target_package):Promise<object> => {
+  let r = await page.evaluate((targetPackage): Promise<object> => {
     return new Promise<object>((resolve, reject) => {
-      (<any>window).grok.functions.eval(target_package + ':test()').then((df: any) => {
+      (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
         let cStatus = df.columns.byName('success');
         let cMessage = df.columns.byName('result');
         let cCat = df.columns.byName('category');
@@ -41,7 +41,7 @@ it('TEST', async () => {
         resolve({report, failed});
       }).catch((e: any) => reject(e));
     });
-  }, target_package);
+  }, targetPackage);
   // @ts-ignore
   console.log(r.report);
   // @ts-ignore

package/package.json

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