datagrok-tools 5.1.5 → 5.1.6

package/bin/commands/test.js

@@ -24,12 +24,35 @@ const grokDir = _path.default.join(_os.default.homedir(), '.grok');
 const confPath = _path.default.join(grokDir, 'config.yaml');
 const consoleLogOutputDir = _path.default.join(curDir, 'test-console-output.log');
 const csvReportDir = _path.default.join(curDir, 'test-report.csv');
+
+/**
+ * Detects if the current directory is within a Dart library folder (d4, xamgle, ddt, dml)
+ * and returns the appropriate test category to use.
+ * @returns The category string (e.g., "Core: d4") or undefined if not in a recognized Dart folder
+ */
+function detectDartLibraryCategory() {
+  const normalizedPath = curDir.replace(/\\/g, '/');
+  if (normalizedPath.includes('/d4/') || normalizedPath.endsWith('/d4')) return 'Core: d4';
+  if (normalizedPath.includes('/xamgle/') || normalizedPath.endsWith('/xamgle')) return 'Core: xamgle';
+  if (normalizedPath.includes('/ddt/') || normalizedPath.endsWith('/ddt')) return 'Core: ddt';
+  if (normalizedPath.includes('/dml/') || normalizedPath.endsWith('/dml')) return 'Core: dml';
+  return undefined;
+}
 async function test(args) {
   const config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
     encoding: 'utf-8'
   }));
   isArgsValid(args);
   utils.setHost(args.host, config);
+
+  // Auto-detect category based on current directory if not specified
+  if (!args.category) {
+    const detectedCategory = detectDartLibraryCategory();
+    if (detectedCategory) {
+      args.category = detectedCategory;
+      color.info(`Detected Dart library directory, using category: "${detectedCategory}"`);
+    }
+  }
   let packageJsonData = undefined;
   if (!args.package) packageJsonData = JSON.parse(_fs.default.readFileSync(_path.default.join(curDir, 'package.json'), {
     encoding: 'utf-8'

package/bin/utils/func-generation.js

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

package/package-template/package.json

@@ -10,7 +10,6 @@
     "@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,7 +1,28 @@
 const path = require('path');
-const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
+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();
+
 module.exports = {
   cache: {
     type: 'filesystem',

package/package-template/webpack.config.js

@@ -1,6 +1,27 @@
 const path = require('path');
+const {execSync} = require('child_process');
 const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
-const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
+
+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.json

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