datagrok-tools 4.14.52 → 4.14.54

package/bin/commands/help.js

@@ -110,11 +110,13 @@ Uploads a package
 Checks for errors before publishing — the package won't be published if there are any.
 
 Options:
-[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix] [--all] [--refresh] [--link]
+[--all] [--refresh] [--link] [--build] [--release] [--skip-check] 
 
---all             Publish all available packages 
---refresh         Publish all available already loaded packages 
---link  	        Link the package to local utils
+--all             Publish all available packages(run in packages directory)
+--refresh         Publish all available already loaded packages(run in packages directory)
+--link  	        Link the package to local packages
+--build  	        Builds the package
+--release         Publish package as release version
 --skip-check      Skip check stage 
 
 Running \`grok publish\` is the same as running \`grok publish defaultHost --build --debug\`
@@ -134,7 +136,7 @@ const HELP_TEST = `
 Usage: grok test
 
 Options:
-[--package] [--category] [--test] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link] [--catchUnhandled] [--report] [--record] [--verbose] [--platform] [--benchmark] [--stress-test] --[debug]
+[--package] [--category] [--test] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link] [--catchUnhandled] [--report] [--record] [--verbose] [--platform] [--benchmark] [--stress-test] [--debug] [--all]
 
 --package           Specify a package name to run tests for
 --category          Specify a category name to run tests for
@@ -154,6 +156,7 @@ Options:
 --core              Runs package & auto tests & core tests (core tests run only from DevTools package)
 --benchmark   	    Runs tests in benchmark mode
 --stress-test       Runs shuffled stress-test only
+--all               Runs tests for all available packages(run in packages directory)
  
 Run package tests
 
@@ -204,6 +207,7 @@ Options:
 --repo-only         Links packages only from the current repository
 --unlink            Unlinks packages and sets last versions instead of local path in package.json dependencies 
 --verbose           Prints detailed information about linked packages  
+--all               Links all available packages(run in packages directory)
 `;
 
 // const HELP_MIGRATE = `

package/bin/commands/publish.js

@@ -195,10 +195,8 @@ async function processPackage(debug, rebuild, host, devKey, packageName, suffix)
       console.error(log['innerMessage']);
       console.log(log);
       return 1;
-    } else {
-      console.log(log);
-      // color.warn(contentValidationLog);
-    }
+    } else console.log(log);
+    // color.warn(contentValidationLog);
   } catch (error) {
     console.error(error);
     return 1;
@@ -206,8 +204,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, suffix)
   return 0;
 }
 async function publish(args) {
-  console.log('publish');
-  if (!args['skip-check'] && !args['all']) (0, _check.check)({
+  if (!args['skip-check'] && !args['all'] && !args['refresh']) (0, _check.check)({
     _: ['check']
   });
   config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
@@ -218,7 +215,7 @@ async function publish(args) {
     let host = config.default;
     if (args['_'].length === 2) host = args['_'][1];
     utils.setHost(host, config);
-    let baseUrl = config['servers'][host]['url'];
+    const baseUrl = config['servers'][host]['url'];
     let url = process.env.HOST ?? '';
     const cfg = (0, _testUtils.getDevKey)(url);
     url = cfg.url;
@@ -226,16 +223,19 @@ async function publish(args) {
     const token = await (0, _testUtils.getToken)(url, key);
     url = `${baseUrl}/packages/published/current`;
     let packagesToLoad = ['all'];
-    if (args.refresh) packagesToLoad = (await (await (0, _nodeFetch.default)(url, {
-      method: 'GET',
-      headers: {
-        'Authorization': token // Attach cookies here
-      }
-    })).json()).map(item => item.name);
+    if (args.refresh) {
+      packagesToLoad = (await (await (0, _nodeFetch.default)(url, {
+        method: 'GET',
+        headers: {
+          'Authorization': token // Attach cookies here
+        }
+      })).json()).map(item => item.name);
+    }
     console.log('Loading packages:');
     await (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, args.link, args.release);
   } else {
     if (args.link) {
+      console.log('Linking');
       await utils.runScript(`npm install`, curDir);
       await utils.runScript(`grok link`, curDir);
       await utils.runScript(`npm run build`, curDir);
@@ -244,21 +244,19 @@ async function publish(args) {
   }
 }
 async function publishPackage(args) {
-  const nOptions = Object.keys(args).length - 1;
   const nArgs = args['_'].length;
-  if (nArgs > 2 || nOptions > 5) return false;
-  if (!Object.keys(args).slice(1).every(option => ['build', 'rebuild', 'debug', 'release', 'k', 'key', 'suffix'].includes(option))) return false;
-  if (args.build && args.rebuild) {
-    utils.runScript('npm install', curDir, false);
-    utils.runScript('npm run build', curDir, false);
-    color.error('Incompatible options: --build and --rebuild');
-    return false;
+  if (!args.link) {
+    if (args.build || args.rebuild) {
+      console.log('Building');
+      utils.runScript('npm install', curDir, false);
+      utils.runScript('npm run build', curDir, false);
+    }
   }
   if (args.debug && args.release) {
     color.error('Incompatible options: --debug and --release');
     return false;
   }
-
+  console.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));

package/bin/utils/func-generation.js

@@ -143,7 +143,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
       isArray = true;
     }
     const annotationType = typesToAnnotation[type ?? ''];
-    if (input?.options?.type) type = input?.options?.type;else if (annotationType) {
+    if (input?.options?.type || input?.options?.options?.type) type = input?.options?.type ?? input?.options?.options?.type;else if (annotationType) {
       if (isArray) type = `list<${annotationType}>`;else type = annotationType;
     } else type = 'dynamic';
     const options = input?.options?.options ? buildStringOfOptions(input.options ?? {}) : '';
@@ -184,13 +184,15 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   return s;
 }
 const inputOptionsNames = exports.inputOptionsNames = ['semType', 'category', 'optional', 'editor', 'nullable', 'separators', 'choices', 'format', 'min', 'max', 'caption', 'description', 'initialValue', 'viewer', 'units', 'type', 'optionsType', 'step', 'meta.url', 'metaUrl'];
+const nonquotedValues = ['true', 'false'];
 function buildStringOfOptions(input) {
   const optionsInString = [];
   const opt = input.options ?? {};
   let defaultValue = '';
+  if (opt['initialValue'] && /[A-Za-z]/.test(opt['initialValue']) && !opt['initialValue'].includes('\'') && !opt['initialValue'].includes('"') && !nonquotedValues.includes(opt['initialValue'])) opt['initialValue'] = `'${opt['initialValue']}'`;
   if (opt['initialValue']) defaultValue = `= ${opt['initialValue']}`;
   for (const [key, value] of Object.entries(opt)) {
-    if (key === 'initialValue') continue;
+    if (key === 'initialValue' || key === 'name' || key === 'type' && !input?.options?.key) continue;
     let val = value;
     let option = key;
     option = decoratorOptionToAnnotation.get(option) ?? option;
@@ -198,7 +200,7 @@ function buildStringOfOptions(input) {
     optionsInString.push(`${option}: ${val}`);
   }
   const optString = optionsInString.length > 0 ? `{ ${optionsInString.join('; ')} }` : '';
-  return `${defaultValue} ${optString}`;
+  return defaultValue ? `${defaultValue} ${optString}` : `${optString}`;
 }
 const reservedDecorators = exports.reservedDecorators = {
   viewer: {

package/bin/utils/utils.js

@@ -296,7 +296,6 @@ async function runAll(packagesDir, command, options, packagesToLoad = ['all']) {
         console.log(`${packagePath}: ${commandToRun} - Finished`);
       } catch (e) {
         console.log(`${packagePath}: ${commandToRun} - Error`);
-        break;
       }
     }
   }

package/package-template/package.json

@@ -7,10 +7,10 @@
     "datagrok-api": "^1.26.0",
     "cash-dom": "^8.1.5",
     "dayjs": "^1.11.13",
-    "@datagrok-libraries/utils": "^4.6.0"
+    "@datagrok-libraries/utils": "^4.6.5"
   },
   "devDependencies": {
-    "datagrok-tools": "^4.14.48",
+    "datagrok-tools": "^4.14.53",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },

package/package-template/src/package.js

@@ -2,6 +2,7 @@
 import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
+export * from './package.g';
 
 export const _package = new DG.Package();
 

package/package.json

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