datagrok-tools 5.1.5 → 5.1.7

package/bin/commands/test.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.test = test;
+var _child_process = require("child_process");
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
@@ -24,12 +25,78 @@ 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;
+}
+
+/**
+ * Traverses up from startDir to find the git repository root (.git directory).
+ */
+function findGitRoot(startDir) {
+  let current = startDir;
+  while (true) {
+    if (_fs.default.existsSync(_path.default.join(current, '.git'))) return current;
+    const parent = _path.default.dirname(current);
+    if (parent === current) return undefined;
+    current = parent;
+  }
+}
 async function test(args) {
   const config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
     encoding: 'utf-8'
   }));
   isArgsValid(args);
   utils.setHost(args.host, config);
+
+  // If running from a core Dart library directory, delegate to DevTools package
+  if (!args.package) {
+    const detectedCategory = detectDartLibraryCategory();
+    if (detectedCategory) {
+      const category = args.category ?? detectedCategory;
+      const gitRoot = findGitRoot(curDir);
+      const devToolsDir = gitRoot ? _path.default.join(gitRoot, 'public', 'packages', 'DevTools') : undefined;
+      if (!devToolsDir || !_fs.default.existsSync(devToolsDir)) {
+        color.error(`Cannot run core tests from this directory: DevTools package not found.`);
+        color.error(`Run 'grok test --category="${category}"' from 'public/packages/DevTools' instead.`);
+        process.exit(1);
+      }
+      color.info(`Detected core library directory. Delegating to DevTools with category: "${category}"`);
+      const cmdArgs = ['test', `--category=${category}`];
+      if (args.host) cmdArgs.push(`--host=${args.host}`);
+      if (args.test) cmdArgs.push(`--test=${args.test}`);
+      if (args.csv) cmdArgs.push('--csv');
+      if (args.gui) cmdArgs.push('--gui');
+      if (args.verbose) cmdArgs.push('--verbose');
+      if (args.benchmark) cmdArgs.push('--benchmark');
+      if (args['stress-test']) cmdArgs.push('--stress-test');
+      if (args['skip-build']) cmdArgs.push('--skip-build');
+      if (args['skip-publish']) cmdArgs.push('--skip-publish');
+      if (args.link) cmdArgs.push('--link');
+      if (args.record) cmdArgs.push('--record');
+      if (args.catchUnhandled) cmdArgs.push('--catchUnhandled');
+      if (args.report) cmdArgs.push('--report');
+      if (args.debug) cmdArgs.push('--debug');
+      if (args['ci-cd']) cmdArgs.push('--ci-cd');
+      if (args['no-retry']) cmdArgs.push('--no-retry');
+      const grokScript = _path.default.resolve(__dirname, '..', 'grok.js');
+      const result = (0, _child_process.spawnSync)(process.execPath, [grokScript, ...cmdArgs], {
+        cwd: devToolsDir,
+        stdio: 'inherit'
+      });
+      process.exit(result.status ?? 1);
+    }
+  }
   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.7",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {