datagrok-tools 5.1.4 → 5.1.6

package/bin/commands/check.js

@@ -20,13 +20,12 @@ var utils = _interopRequireWildcard(require("../utils/utils"));
 var color = _interopRequireWildcard(require("../utils/color-utils"));
 var testUtils = _interopRequireWildcard(require("../utils/test-utils"));
 var _const = require("../utils/const");
-var _child_process = require("child_process");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const warns = ['Latest package version', 'Datagrok API version should contain'];
 const forbiddenNames = ['function', 'class', 'export'];
 const namesInFiles = new Map();
 function check(args) {
-  color.setVerbose(args.verbose || args.v || false);
+  if (args.verbose !== undefined || args.v !== undefined) color.setVerbose(args.verbose || args.v || false);
   const curDir = args._.length == 2 ? args._[1] : process.cwd();
   if (args.recursive) return runChecksRec(curDir, args.soft ?? false);else {
     if (!utils.isPackageDir(curDir)) {
@@ -456,23 +455,8 @@ function checkSourceMap(packagePath) {
     // Check if dist files exist
     const distPackage = _path.default.join(packagePath, 'dist', 'package.js');
     const distPackageTest = _path.default.join(packagePath, 'dist', 'package-test.js');
-    let missingFiles = [distPackage, distPackageTest].filter(f => !_fs.default.existsSync(f));
-
-    // If any dist files are missing, try to build automatically
-    if (missingFiles.length > 0) {
-      try {
-        (0, _child_process.execSync)('npm run build', {
-          cwd: packagePath,
-          stdio: 'inherit'
-        });
-      } catch (e) {
-        console.warn('Build failed:', e);
-      }
-
-      // Recheck dist files after build
-      missingFiles = [distPackage, distPackageTest].filter(f => !_fs.default.existsSync(f));
-      missingFiles.forEach(f => warnings.push(`${_path.default.relative(packagePath, f)} file doesnt exist even after build`));
-    }
+    const missingFiles = [distPackage, distPackageTest].filter(f => !_fs.default.existsSync(f));
+    missingFiles.forEach(f => warnings.push(`${_path.default.relative(packagePath, f)} file doesnt exist. Run 'npm run build' first.`));
   }
   return warnings;
 }

package/bin/commands/publish.js

@@ -184,9 +184,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
 async function publish(args) {
   color.setVerbose(args.verbose || args.v || false);
   if (!args['skip-check'] && !args['all'] && !args['refresh']) (0, _check.check)({
-    _: ['check'],
-    verbose: args.verbose,
-    v: args.v
+    _: ['check']
   });
   config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
     encoding: 'utf-8'

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

@@ -2,7 +2,7 @@
   "name": "#{PACKAGE_NAME_LOWERCASE}",
   "friendlyName": "#{PACKAGE_NAME}",
   "version": "0.0.1",
-  "description": "",
+  "description": "#{PACKAGE_NAME} package",
   "dependencies": {
     "datagrok-api": "^1.26.0",
     "cash-dom": "^8.1.5",
@@ -10,7 +10,6 @@
     "@datagrok-libraries/utils": "^4.6.5"
   },
   "devDependencies": {
-    "datagrok-tools": "^4.14.53",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },
@@ -18,7 +17,7 @@
     "debug-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish",
     "release-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish --release",
     "build-#{PACKAGE_NAME_LOWERCASE}": "webpack",
-    "build": "grok api && grok check && webpack",
+    "build": "grok api && grok check --soft && webpack",
     "test": "grok test"
   },
   "canEdit": [

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.4",
+  "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": {