datagrok-tools 4.14.21 → 4.14.23

package/bin/commands/check.js

@@ -35,6 +35,7 @@ function check(args) {
   }
 }
 function runChecks(packagePath, soft = false) {
+  if (packagePath.includes(`${_path.default.sep}node_modules${_path.default.sep}`)) return true;
   const files = _ignoreWalk.default.sync({
     path: packagePath,
     ignoreFiles: ['.npmignore', '.gitignore']

package/bin/utils/utils.js

@@ -109,7 +109,7 @@ const replacers = exports.replacers = {
   FUNC_NAME_LOWERCASE: (s, name) => s.replace(/#{FUNC_NAME_LOWERCASE}/g, friendlyNameToName(name, false)),
   PARAMS_OBJECT: (s, params) => s.replace(/#{PARAMS_OBJECT}/g, params.length ? `{ ${params.map(p => p.name).join(', ')} }` : `{}`),
   OUTPUT_TYPE: (s, type) => s.replace(/#{OUTPUT_TYPE}/g, type),
-  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type}`).join(', '))
+  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type} ${p.nullable ? '| null' : ''}`).join(', '))
 };
 class TemplateBuilder {
   static sep = '\n';
@@ -194,10 +194,25 @@ const nameAnnRegex = exports.nameAnnRegex = /\s*(name[^:]*): ([^\n\r\[\{]+)/;
 const nameRegex = exports.nameRegex = /(?:|(?:static)(?:export )(?:async ))\s+function\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?).*/;
 const absUrlRegex = exports.absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');
 function getScriptOutputType(script, comment = '#') {
-  const regex = new RegExp(`${comment}\\s*output:\\s?([a-z_]+)\\s*`);
-  const match = script.match(regex);
-  if (!match) return 'void';
-  return dgToTsTypeMap[match[1]] || 'any';
+  const regex = /\s*output:\s?([a-z_]+)\s*([^\s]*)/g;
+  const matches = script.matchAll(regex);
+  if (!matches) return 'void';
+  let resType = 'void';
+  let firstItemName = '';
+  let wasSecond = false;
+  for (let match of matches) {
+    if (resType === 'void') {
+      resType = dgToTsTypeMap[match[1]];
+      firstItemName = match[2];
+    } else {
+      if (!wasSecond) {
+        resType = `${firstItemName}: ${resType}`;
+        wasSecond = true;
+      }
+      resType = [resType, `${match[2]}: ${dgToTsTypeMap[match[1]]}`].join(', ');
+    }
+  }
+  return wasSecond ? `{${resType}}` : resType;
 }
 ;
 function getScriptInputs(script, comment = '#') {
@@ -205,12 +220,14 @@ function getScriptInputs(script, comment = '#') {
   const inputs = [];
   for (const match of script.matchAll(regex)) {
     const isOptional = /isOptional\s*:\s*true/.test(match[0]) || /optional\s*:\s*true/.test(match[0]);
+    const nullable = /nullable\s*:\s*true/.test(match[0]);
     const type = dgToTsTypeMap[match[1]] || 'any';
     const name = match[2];
     inputs.push({
       type,
       name,
-      isOptional
+      isOptional,
+      nullable
     });
   }
   return inputs;

package/package.json

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