datagrok-tools 4.14.51 → 4.14.53

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;
@@ -207,7 +205,7 @@ async function processPackage(debug, rebuild, host, devKey, packageName, suffix)
 }
 async function publish(args) {
   console.log('publish');
-  if (!args['skip-check'] && !args['all']) (0, _check.check)({
+  if (args['skip-check'] && !args['all']) (0, _check.check)({
     _: ['check']
   });
   config = _jsYaml.default.load(_fs.default.readFileSync(confPath, {
@@ -218,7 +216,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,12 +224,14 @@ 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 {
@@ -244,15 +244,10 @@ 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) {
+  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.debug && args.release) {
     color.error('Incompatible options: --debug and --release');

package/bin/utils/func-generation.js

@@ -150,7 +150,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     const functionName = (input.options?.name ? input?.options?.name : ` ${input.name?.replaceAll('.', '')}`)?.trim();
 
     // eslint-disable-next-line max-len
-    s += comment + 'input: ' + type + ' ' + functionName + (input.defaultValue !== undefined ? `= ${input.defaultValue}` : '') + ' ' + options.replaceAll('"', '\'') + sep;
+    s += comment + 'input: ' + type + ' ' + functionName + (input.defaultValue !== undefined ? `= ${input.defaultValue}` : '') + ' ' + options + sep;
   }
   if (data.outputs) {
     for (const output of data.outputs) {

package/package.json

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

package/plugins/func-gen-plugin.js

@@ -12,6 +12,7 @@ const {
   typesToAnnotation,
   dgAnnotationTypes,
   decoratorOptionToAnnotation,
+  inputOptionsNames,
 } = require('../bin/utils/func-generation');
 
 const {api} = require('../bin/commands/api');
@@ -20,30 +21,6 @@ const baseImport = 'import * as DG from \'datagrok-api/dg\';\n';
 // eslint-disable-next-line max-len
 const annotationForGeneratedFile = `/**\nThis file is auto-generated by the webpack command.\nIf you notice any changes, please push them to the repository.\nDo not edit this file manually.\n*/\n`;
 
-
-const inputOptionsNames = [
-  'semType',
-  'category',
-  'optional',
-  'editor',
-  'nullable',
-  'separators',
-  'choices',
-  'format',
-  'min',
-  'max',
-  'caption',
-  'description',
-  'initialValue',
-  'viewer',
-  'units',
-  'optionsType',
-  'step',
-  'meta.url',
-  'metaUrl',
-];
-
-
 class FuncGeneratorPlugin {
   constructor(options = {outputPath: './src/package.g.ts'}) {
     this.options = options;