datagrok-tools 4.14.32 → 4.14.34

package/bin/commands/test.js

@@ -129,7 +129,7 @@ async function runTesting(args) {
       let testsLeft = [];
       let testsToReproduce = [];
       for (let testData of organized) {
-        if (!r.verbosePassed.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseSkipped.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test}`) && !new RegExp(`${testData.params.category.trim()}[^\\n]*: (before|after)`).test(r.verboseFailed)) testsLeft.push(testData);
+        if (!r.verbosePassed.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseSkipped.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test}`) && !new RegExp(`${testUtils.escapeRegex(testData.params.category.trim())}[^\n]*: *?(before|after)(\\(\\))?`).test(r.verboseFailed)) testsLeft.push(testData);
         if (r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test} :  Error:`)) {
           testsToReproduce.push(testData);
         }

package/bin/utils/test-utils.js

@@ -8,6 +8,7 @@ exports.TestContext = void 0;
 exports.addColumnToCsv = addColumnToCsv;
 exports.addLogsToFile = addLogsToFile;
 exports.defaultLaunchParameters = void 0;
+exports.escapeRegex = escapeRegex;
 exports.exitWithCode = exitWithCode;
 exports.getBrowserPage = getBrowserPage;
 exports.getDevKey = getDevKey;
@@ -549,4 +550,7 @@ async function addColumnToCsv(csv, columnName, defaultValue) {
     }
   });
   return result;
+}
+function escapeRegex(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.32",
+  "version": "4.14.34",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -30,7 +30,8 @@
     "link": "npm link",
     "prepublishOnly": "babel bin --extensions .ts -d bin",
     "babel": "babel bin --extensions .ts -d bin",
-    "build": "babel bin --extensions .ts -d bin"
+    "build": "babel bin --extensions .ts -d bin",
+    "debug-source-map": "babel bin --extensions .ts -d bin --source-maps true"
   },
   "bin": {
     "datagrok-upload": "./bin/_deprecated/upload.js",

package/plugins/func-gen-plugin.js

@@ -347,26 +347,32 @@ class FuncGeneratorPlugin {
 
   _readReturnType(annotation) {
     let resultType = 'dynamic';
+    let nodeAnnotation = annotation;
     let isArray = false; 
+    if (nodeAnnotation?.type === 'TSUnionType' && 
+      nodeAnnotation?.types?.length === 2 && 
+      nodeAnnotation?.types?.some((e)=> e?.type === 'TSNullKeyword')) 
+      nodeAnnotation = nodeAnnotation.types.filter((e)=> e.type !== 'TSNullKeyword')[0];
+    
+
     if (
-      annotation &&
-      annotation.type !== 'TSUnionType' &&
-      annotation.type !== 'TSIntersectionType'
+      nodeAnnotation &&
+      nodeAnnotation.type !== 'TSUnionType' &&
+      nodeAnnotation.type !== 'TSIntersectionType'
     ) {
-      
-      if (annotation.typeName || annotation.type === 'TSTypeReference') {
+      if (nodeAnnotation.typeName || nodeAnnotation.type === 'TSTypeReference') {
         resultType =
-          annotation.typeName?.right?.name ?? annotation.typeName?.name;
-      } else if (annotation.type !== 'TSArrayType') 
-        resultType = this._getTypeNameFromNode(annotation);
-      else if (annotation.elementType.type !== 'TSTypeReference') {
+          nodeAnnotation.typeName?.right?.name ?? nodeAnnotation.typeName?.name;
+      } else if (nodeAnnotation.type !== 'TSArrayType') 
+        resultType = this._getTypeNameFromNode(nodeAnnotation);
+      else if (nodeAnnotation.elementType.type !== 'TSTypeReference') {
         isArray = true;
-        resultType = this._getTypeNameFromNode(annotation?.elementType);
+        resultType = this._getTypeNameFromNode(nodeAnnotation?.elementType);
       } else {
         isArray = true;
         resultType =
-          annotation?.elementType?.typeName?.name ||
-          annotation?.elementType?.typeName?.right?.name;
+          nodeAnnotation?.elementType?.typeName?.name ||
+          nodeAnnotation?.elementType?.typeName?.right?.name;
       } 
     }
     resultType = typesToAnnotation[resultType];