datagrok-tools 4.6.2 → 4.6.4

package/bin/commands/check.js

@@ -124,7 +124,7 @@ function checkImportStatements(packagePath, files, externals) {
     if (key.includes('/')) modules.push(key.split('/', 1)[0]);
   }
 
-  var importRegex = new RegExp("import\\s+.*(".concat(modules.join('|'), ").*(?=\\s+?)"), 'g');
+  var importRegex = new RegExp("^(?!\\/{2})\\s*import\\s+.*(".concat(modules.join('|'), ").*(?=\\s+?)"), 'g');
   var validImportRegex = new RegExp("import\\s+.*(".concat(Object.keys(externals).join('|'), ")['\"]{1}"));
   var warnings = [];
 

package/bin/commands/config.js

@@ -216,7 +216,7 @@ function config(args) {
             answers = _context.sent;
 
             if (!answers['edit-config']) {
-              _context.next = 23;
+              _context.next = 24;
               break;
             }
 
@@ -263,25 +263,27 @@ function config(args) {
 
           case 21:
             defaultServer = _context.sent;
-            config["default"] = defaultServer['default-server']; // fs.writeFileSync(confPath, yaml.dump(config));
+            config["default"] = defaultServer['default-server'];
 
-          case 23:
-            _context.next = 30;
+            _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));
+
+          case 24:
+            _context.next = 31;
             break;
 
-          case 25:
-            _context.prev = 25;
+          case 26:
+            _context.prev = 26;
             _context.t2 = _context["catch"](0);
             color.error('The file is corrupted. Please run `grok config --reset` to restore the default template');
             console.error(_context.t2);
             return _context.abrupt("return", false);
 
-          case 30:
+          case 31:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 25]]);
+    }, _callee, null, [[0, 26]]);
   }))();
 
   _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));

package/bin/commands/create.js

@@ -115,6 +115,9 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
         }
 
         if (jest) {
+          Object.assign(_package.dependencies, {
+            '@datagrok-libraries/utils': 'latest'
+          });
           Object.assign(_package.devDependencies, {
             'jest-html-reporter': '^3.5.0',
             'jest': '^27.0.0',

package/package-template/src/__jest__/remote.test.ts

@@ -39,31 +39,39 @@ it('TEST', async () => {
   const targetPackage: string = process.env.TARGET_PACKAGE ?? '#{PACKAGE_NAMESPACE}';
   console.log(`Testing ${targetPackage} package`);
 
-  let r = await page.evaluate((targetPackage): Promise<object> => {
+  let r = await page.evaluate((targetPackage):Promise<object> => {
     return new Promise<object>((resolve, reject) => {
       (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
         const cStatus = df.columns.byName('success');
+        const cSkipped = df.columns.byName('skipped');
         const cMessage = df.columns.byName('result');
         const cCat = df.columns.byName('category');
         const cName = df.columns.byName('name');
         const cTime = df.columns.byName('ms');
         let failed = false;
+        let skipReport = '';
         let passReport = '';
         let failReport = '';
         for (let i = 0; i < df.rowCount; i++) {
           if (cStatus.get(i)) {
-            passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+            if (cSkipped.get(i)) {
+              skipReport += `Test result : Skipped : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+            } else {
+              passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+            }
           } else {
             failed = true;
             failReport += `Test result : Failed : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
           }
         }
-        resolve({failReport, passReport, failed});
+        resolve({failReport, skipReport, passReport, failed});
       }).catch((e: any) => reject(e));
     });
   }, targetPackage);
   // @ts-ignore
   console.log(r.passReport);
   // @ts-ignore
+  console.log(r.skipReport);
+  // @ts-ignore
   expect(r.failed).checkOutput(false, r.failReport);
-}, 3600000);
+}, 7200000);

package/package.json

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