datagrok-tools 5.1.9 → 6.0.0

package/bin/grok.js

@@ -10,6 +10,7 @@ const commands = {
   api: require('./commands/api').api,
   build: require('./commands/build').build,
   check: require('./commands/check').check,
+  claude: require('./commands/claude').claude,
   config: require('./commands/config').config,
   create: require('./commands/create').create,
   init: require('./commands/init').init,
@@ -32,9 +33,24 @@ if (command in commands) {
     } else if (argv.all && onPackageCommandNames.includes(command)) {
       runAllCommand(process.cwd(),
         `grok ${process.argv.slice(2).join(' ')}`.replace('--all', ''), {});
-    } else if (!commands[command](argv)) {
-      console.log(help[command]);
-      exitWithCode(1);
+    } else {
+      const result = commands[command](argv);
+      if (result && typeof result.then === 'function') {
+        result.then((ok) => {
+          if (!ok) {
+            console.log(help[command]);
+            exitWithCode(1);
+          }
+        }).catch((err) => {
+          console.error(err);
+          console.log(help[command]);
+          exitWithCode(255);
+        });
+      }
+      else if (!result) {
+        console.log(help[command]);
+        exitWithCode(1);
+      }
     }
   } catch (err) {
     console.error(err);

package/bin/utils/func-generation.js

@@ -460,7 +460,7 @@ const reservedDecorators = exports.reservedDecorators = {
   },
   model: {
     metadata: {
-      tags: [FUNC_TYPES.MODEL],
+      role: FUNC_TYPES.MODEL,
       inputs: [],
       outputs: []
     },

package/package-template/package.json

@@ -10,6 +10,7 @@
     "@datagrok-libraries/utils": "^4.6.5"
   },
   "devDependencies": {
+    "datagrok-tools": "^5.1.5",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },

package/package-template/ts.webpack.config.js

@@ -1,28 +1,7 @@
 const path = require('path');
-const {execSync} = require('child_process');
+const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
 const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
 
-function getDatagrokTools() {
-  const pluginPath = 'datagrok-tools/plugins/func-gen-plugin';
-  try {
-    return require(pluginPath);
-  } catch (e) {
-    try {
-      const globalPath = execSync('npm root -g').toString().trim();
-      return require(path.join(globalPath, pluginPath));
-    } catch (globalErr) {
-      console.error('\n' + '='.repeat(60));
-      console.error('ERROR: datagrok-tools not found!');
-      console.error('To fix this, please install the tools globally by running:');
-      console.error('\n    npm install -g datagrok-tools\n');
-      console.error('='.repeat(60) + '\n');
-      process.exit(1);
-    }
-  }
-}
-
-const FuncGeneratorPlugin = getDatagrokTools();
-
 module.exports = {
   cache: {
     type: 'filesystem',

package/package-template/webpack.config.js

@@ -1,27 +1,6 @@
 const path = require('path');
-const {execSync} = require('child_process');
 const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
-
-function getDatagrokTools() {
-  const pluginPath = 'datagrok-tools/plugins/func-gen-plugin';
-  try {
-    return require(pluginPath);
-  } catch (e) {
-    try {
-      const globalPath = execSync('npm root -g').toString().trim();
-      return require(path.join(globalPath, pluginPath));
-    } catch (globalErr) {
-      console.error('\n' + '='.repeat(60));
-      console.error('ERROR: datagrok-tools not found!');
-      console.error('To fix this, please install the tools globally by running:');
-      console.error('\n    npm install -g datagrok-tools\n');
-      console.error('='.repeat(60) + '\n');
-      process.exit(1);
-    }
-  }
-}
-
-const FuncGeneratorPlugin = getDatagrokTools();
+const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
 module.exports = {
   cache: {
     type: 'filesystem',

package/package.json

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