datagrok-tools 5.1.3 → 5.1.5

package/bin/commands/api.js

@@ -21,15 +21,9 @@ const funcFilePath = _path.default.join(_fs.default.existsSync(srcDir) ? srcDir
 const packagePath = _path.default.join(curDir, 'package.json');
 const names = new Set();
 let _package = {};
-function generateQueryWrappers(verbose) {
+function generateQueryWrappers() {
   const queriesDir = _path.default.join(curDir, 'queries');
-  if (!_fs.default.existsSync(queriesDir)) {
-    if (verbose) {
-      color.warn(`Directory ${queriesDir} not found`);
-      console.log('Skipping API generation for queries...');
-    }
-    return;
-  }
+  if (!_fs.default.existsSync(queriesDir)) return;
   const files = _ignoreWalk.default.sync({
     path: './queries',
     ignoreFiles: ['.npmignore', '.gitignore']
@@ -53,18 +47,12 @@ function generateQueryWrappers(verbose) {
       wrappers.push(tb.build(1));
     }
   }
-  saveWrappersToFile('queries', wrappers, verbose);
+  saveWrappersToFile('queries', wrappers);
 }
-function generateScriptWrappers(verbose) {
+function generateScriptWrappers() {
   const scriptsDir = _path.default.join(curDir, 'scripts');
   const pythonDir = _fs.default.existsSync(srcDir) ? _path.default.join(srcDir, 'python') : _path.default.join(curDir, 'python');
-  if (!_fs.default.existsSync(scriptsDir)) {
-    if (verbose) {
-      color.warn(`Directory ${scriptsDir} not found`);
-      console.log('Skipping API generation for scripts...');
-    }
-    return;
-  }
+  if (!_fs.default.existsSync(scriptsDir)) return;
   const wrappers = [];
   for (let dir of [scriptsDir, pythonDir]) {
     if (!_fs.default.existsSync(dir)) continue;
@@ -89,9 +77,9 @@ function generateScriptWrappers(verbose) {
       wrappers.push(tb.build(1));
     }
   }
-  saveWrappersToFile('scripts', wrappers, verbose);
+  saveWrappersToFile('scripts', wrappers);
 }
-function generateFunctionWrappers(verbose) {
+function generateFunctionWrappers() {
   let filesToParse = packageFuncDirs.map(e => _path.default.join(curDir, 'src', e)).filter(e => _fs.default.existsSync(e));
   const annotaionRegex = /(?:\/\/[^\n]*\n)+export[^{]*/g;
   const nameRegex = /\s*export(?:\sasync)?\s*function\s*([^\s(]*)/;
@@ -113,20 +101,16 @@ function generateFunctionWrappers(verbose) {
       wrappers.push(tb.build(1));
     }
   }
-  saveWrappersToFile('funcs', wrappers, verbose);
+  saveWrappersToFile('funcs', wrappers);
 }
-function saveWrappersToFile(namespaceName, wrappers, verbose) {
+function saveWrappersToFile(namespaceName, wrappers) {
   if (wrappers.length === 0) return;
-  if (!_fs.default.existsSync(funcFilePath)) createApiFile(verbose);
+  if (!_fs.default.existsSync(funcFilePath)) createApiFile();
   const scriptApi = new utils.TemplateBuilder(utils.namespaceTemplate).replace('PACKAGE_NAMESPACE', namespaceName).replace('NAME', wrappers.join(sep.repeat(2)));
   _fs.default.appendFileSync(funcFilePath, sep + scriptApi.build() + sep);
-  if (verbose) color.success(`Successfully generated file ${apiFile}${sep}`);
+  color.log(`Successfully generated file ${apiFile}${sep}`, 'success');
 }
-function createApiFile(verbose) {
-  if (_fs.default.existsSync(funcFilePath) && verbose) {
-    color.warn(`The file ${funcFilePath} already exists`);
-    console.log('Rewriting its contents...');
-  }
+function createApiFile() {
   _fs.default.writeFileSync(funcFilePath, annotationForApiFile + utils.dgImports + sep, 'utf8');
 }
 function checkNameColision(name) {
@@ -134,7 +118,7 @@ function checkNameColision(name) {
   names.add(name);
 }
 function api(args) {
-  const verbose = args.verbose || args.v || false;
+  color.setVerbose(args.verbose || args.v || false);
   _package = JSON.parse(_fs.default.readFileSync(packagePath, {
     encoding: 'utf-8'
   }));
@@ -145,9 +129,9 @@ function api(args) {
     color.error('File `package.json` not found. Run the command from the package directory');
     return false;
   }
-  createApiFile(verbose);
-  generateScriptWrappers(verbose);
-  generateQueryWrappers(verbose);
-  generateFunctionWrappers(verbose);
+  createApiFile();
+  generateScriptWrappers();
+  generateQueryWrappers();
+  generateFunctionWrappers();
   return true;
 }

package/bin/commands/check.js

@@ -20,23 +20,22 @@ 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) {
-  const verbose = 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, verbose);else {
+  if (args.recursive) return runChecksRec(curDir, args.soft ?? false);else {
     if (!utils.isPackageDir(curDir)) {
       color.error('File `package.json` not found. Run the command from the package directory');
       return false;
     }
-    return runChecks(curDir, args.soft ?? false, false, verbose);
+    return runChecks(curDir, args.soft ?? false, false);
   }
 }
-function runChecks(packagePath, soft = false, noExit = false, verbose = false) {
+function runChecks(packagePath, soft = false, noExit = false) {
   if (packagePath.includes(`${_path.default.sep}node_modules${_path.default.sep}`)) return true;
   const files = _ignoreWalk.default.sync({
     path: packagePath,
@@ -90,10 +89,10 @@ function runChecks(packagePath, soft = false, noExit = false, verbose = false) {
     if (soft || json.version.startsWith('0') || errors.every(w => warns.some(ww => w.includes(ww)))) return true;
     if (noExit) return false;else testUtils.exitWithCode(1);
   }
-  if (verbose) console.log(`Checking package ${_path.default.basename(packagePath)}...\t\t\t\u2713 OK`);
+  color.log(`Checking package ${_path.default.basename(packagePath)}...\t\t\t\u2713 OK`);
   return true;
 }
-function runChecksRec(dir, soft = false, verbose = false) {
+function runChecksRec(dir, soft = false) {
   const files = _fs.default.readdirSync(dir);
   let allPassed = true;
   for (const file of files) {
@@ -101,11 +100,11 @@ function runChecksRec(dir, soft = false, verbose = false) {
     const stats = _fs.default.statSync(filepath);
     if (stats.isDirectory()) {
       if (utils.isPackageDir(filepath)) {
-        const passed = runChecks(filepath, soft, true, verbose);
+        const passed = runChecks(filepath, soft, true);
         allPassed = allPassed && passed;
       } else {
         if (file !== 'node_modules' && !file.startsWith('.')) {
-          const passed = runChecksRec(_path.default.join(dir, file), soft, verbose);
+          const passed = runChecksRec(_path.default.join(dir, file), soft);
           allPassed = allPassed && passed;
         }
       }
@@ -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

@@ -35,9 +35,8 @@ let curDir = process.cwd();
 const packDir = _path.default.join(curDir, 'package.json');
 const packageFiles = ['src/package.ts', 'src/detectors.ts', 'src/package.js', 'src/detectors.js', 'src/package-test.ts', 'src/package-test.js', 'package.js', 'detectors.js'];
 let config;
-async function processPackage(debug, rebuild, host, devKey, packageName, dropDb, suffix, hostAlias, verbose = false) {
+async function processPackage(debug, rebuild, host, devKey, packageName, dropDb, suffix, hostAlias) {
   // Get the server timestamps
-  verbose = verbose || false;
   let timestamps = {};
   let url = `${host}/packages/dev/${devKey}/${packageName}`;
   if (debug) {
@@ -49,7 +48,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
       }
     } catch (error) {
       if (utils.isConnectivityError(error)) color.error(`Server is possibly offline: ${host}`);
-      if (verbose) console.error(error);
+      if (color.isVerbose()) console.error(error);
       return 1;
     }
   }
@@ -84,7 +83,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
       rebuild = true;
     }
   }
-  if (verbose) console.log('Starting package checks...');
+  color.log('Starting package checks...');
   const checkStart = Date.now();
   const jsTsFiles = files.filter(f => !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts')));
   const packageFilePath = _path.default.join(curDir, 'package.json');
@@ -98,7 +97,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
     });
   }
   const funcFiles = jsTsFiles.filter(f => packageFiles.includes(f));
-  if (verbose) console.log(`Checks finished in ${Date.now() - checkStart} ms`);
+  color.log(`Checks finished in ${Date.now() - checkStart} ms`);
   const reg = new RegExp(/\${(\w*)}/g);
   const errs = [];
   files.forEach(file => {
@@ -117,7 +116,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
     const t = _fs.default.statSync(fullPath).mtime.toUTCString();
     localTimestamps[canonicalRelativePath] = t;
     if (debug && timestamps[canonicalRelativePath] === t) {
-      if (verbose) console.log(`Skipping ${canonicalRelativePath}`);
+      color.log(`Skipping ${canonicalRelativePath}`);
       return;
     }
     if (canonicalRelativePath.startsWith('connections/')) {
@@ -136,13 +135,13 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
       zip.append(f, {
         name: relativePath
       });
-      if (verbose) console.log(`Adding ${canonicalRelativePath}...`);
+      color.log(`Adding ${canonicalRelativePath}...`);
       return;
     }
     zip.append(_fs.default.createReadStream(fullPath), {
       name: relativePath
     });
-    if (verbose) console.log(`Adding ${canonicalRelativePath}...`);
+    color.log(`Adding ${canonicalRelativePath}...`);
   });
   if (errs.length) {
     errs.forEach(e => color.error(e));
@@ -171,22 +170,21 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
         console.log(log);
         return 1;
       } else {
-        if (verbose) console.log(log);
+        if (color.isVerbose()) console.log(log);
         color.success(`✓ Published to ${hostAlias || new URL(host).hostname}`);
       }
     }
   } catch (error) {
     if (utils.isConnectivityError(error)) color.error(`Server is possibly offline: ${url}`);
-    if (verbose) console.error(error);
+    if (color.isVerbose()) console.error(error);
     return 1;
   }
   return 0;
 }
 async function publish(args) {
-  const verbose = args.verbose || args.v || false;
+  color.setVerbose(args.verbose || args.v || false);
   if (!args['skip-check'] && !args['all'] && !args['refresh']) (0, _check.check)({
-    _: ['check'],
-    verbose: verbose
+    _: ['check']
   });
   config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
     encoding: 'utf-8'
@@ -212,23 +210,23 @@ async function publish(args) {
         }
       })).json()).map(item => item.name);
     }
-    if (verbose) console.log('Loading packages:');
+    color.log('Loading packages:');
     await (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, args.link, args.release);
   } else {
     if (args.link) {
-      if (verbose) console.log('Linking');
+      color.log('Linking');
       await utils.runScript(`npm install`, curDir);
       await utils.runScript(`grok link`, curDir);
       await utils.runScript(`npm run build`, curDir);
     }
-    await publishPackage(args, verbose);
+    await publishPackage(args);
   }
 }
-async function publishPackage(args, verbose) {
+async function publishPackage(args) {
   const nArgs = args['_'].length;
   if (!args.link) {
     if (args.build || args.rebuild) {
-      if (verbose) console.log('Building');
+      color.log('Building');
       await utils.runScript('npm install', curDir, false);
       await utils.runScript('npm run build', curDir, false);
     }
@@ -237,7 +235,7 @@ async function publishPackage(args, verbose) {
     color.error('Incompatible options: --debug and --release');
     return false;
   }
-  if (verbose) console.log('Publishing...');
+  color.log('Publishing...');
   // Create `config.yaml` if it doesn't exist yet
   if (!_fs.default.existsSync(grokDir)) _fs.default.mkdirSync(grokDir);
   if (!_fs.default.existsSync(confPath)) _fs.default.writeFileSync(confPath, _jsYaml.default.dump(confTemplate));
@@ -286,12 +284,12 @@ async function publishPackage(args, verbose) {
         if (!args.suffix && stdout) args.suffix = stdout.toString().substring(0, 8);
       });
       await utils.delay(100);
-      code = await processPackage(!args.release, Boolean(args.rebuild), url, key, packageName, args.dropDb ?? false, args.suffix, host, verbose);
+      code = await processPackage(!args.release, Boolean(args.rebuild), url, key, packageName, args.dropDb ?? false, args.suffix, host);
     } catch (error) {
       console.error(error);
       code = 1;
     }
-    if (verbose) console.log(`Exiting with code ${code}`);
+    color.log(`Exiting with code ${code}`);
     process.exit(code);
   });
   return true;

package/bin/utils/color-utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.warn = exports.success = exports.info = exports.fail = exports.error = void 0;
+exports.isVerbose = exports.info = exports.fail = exports.error = void 0;
+exports.log = log;
+exports.warn = exports.success = exports.setVerbose = void 0;
 const error = s => console.log('\x1b[31m%s\x1b[0m', s);
 exports.error = error;
 const info = s => console.log('\x1b[32m%s\x1b[0m', s);
@@ -11,4 +13,33 @@ exports.info = info;
 const warn = s => console.log('\x1b[33m%s\x1b[0m', s);
 exports.warn = warn;
 const success = exports.success = info;
-const fail = exports.fail = error;
+const fail = exports.fail = error;
+let verbose = false;
+const setVerbose = value => verbose = value;
+exports.setVerbose = setVerbose;
+const isVerbose = () => verbose;
+exports.isVerbose = isVerbose;
+/** Logs a message only when verbose mode is enabled
+ * @param {string} s - The message to log
+ * @param {LogType} type - The type of the message, which determines its color. Defaults to 'plain'.
+ */
+function log(s, type = 'plain') {
+  if (!verbose) return;
+  switch (type) {
+    case 'fail':
+    case 'error':
+      error(s);
+      break;
+    case 'warn':
+      warn(s);
+      break;
+    case 'success':
+    case 'info':
+      info(s);
+      break;
+    case 'plain':
+    default:
+      console.log(s);
+      break;
+  }
+}

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,7 @@
     "@datagrok-libraries/utils": "^4.6.5"
   },
   "devDependencies": {
-    "datagrok-tools": "^4.14.53",
+    "datagrok-tools": "^5.1.5",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },
@@ -18,7 +18,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.json

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