datagrok-tools 4.12.26 → 4.13.0

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark'];
+  var commandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -32,10 +32,6 @@ function test(args) {
   if (nArgs > 1 || options.length > commandOptions.length || options.length > 0 && !options.every(function (op) {
     return commandOptions.includes(op);
   })) return false;
-  if (!utils.isPackageDir(curDir)) {
-    color.error('File `package.json` not found. Run the command from the package directory');
-    return false;
-  }
   if (!_fs["default"].existsSync(confPath)) {
     color.error("File `".concat(confPath, "` not found. Run `grok config` to set up the config file"));
     return false;
@@ -55,16 +51,25 @@ function test(args) {
     process.env.HOST = config["default"];
     console.log('Environment variable `HOST` is set to', config["default"]);
   }
-  var packageData = JSON.parse(_fs["default"].readFileSync(_path["default"].join(curDir, 'package.json'), {
-    encoding: 'utf-8'
-  }));
-  if (packageData.name) {
-    process.env.TARGET_PACKAGE = utils.kebabToCamelCase(utils.removeScope(packageData.name));
-    console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
+  if (args["package"]) {
+    process.env.TARGET_PACKAGE = utils.kebabToCamelCase(args["package"]);
   } else {
-    color.error('Invalid package name. Set the `name` field in `package.json`');
-    return false;
+    if (!utils.isPackageDir(curDir)) {
+      color.error('File `package.json` not found. Run the command from the package directory or specify plugin using \'--package\' option');
+      return false;
+    } else {
+      var packageData = JSON.parse(_fs["default"].readFileSync(_path["default"].join(curDir, 'package.json'), {
+        encoding: 'utf-8'
+      }));
+      if (packageData.name) {
+        process.env.TARGET_PACKAGE = utils.kebabToCamelCase(packageData.name);
+      } else {
+        color.error('Invalid package name. Set the `name` field in `package.json`');
+        return false;
+      }
+    }
   }
+  console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
   if (args.platform && process.env.TARGET_PACKAGE !== 'ApiTests') {
     color.error('--platform flag can only be used in the ApiTests package');
     return false;
@@ -73,11 +78,17 @@ function test(args) {
     color.error('--core flag can only be used in the DevTools package');
     return false;
   }
-  if (args['skip-build']) {
-    if (args['skip-publish']) test();else publish(test);
-  } else build(args['skip-publish'] ? test : function () {
-    return publish(test);
-  });
+  if (args['skip-publish'] || args["package"]) {
+    test();
+  } else {
+    if (args['skip-build']) {
+      publish(test);
+    } else {
+      build(function () {
+        return publish(test);
+      });
+    }
+  }
   function build(callback) {
     (0, _child_process.exec)('npm run build', function (err, stdout, stderr) {
       color.info("Building package...");
@@ -140,31 +151,38 @@ function test(args) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return testUtils.runWithTimeout(timeout, /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _process$env$TARGET_P;
-        var consoleLog, targetPackage, r;
+        var consoleLogOutputDir, addLogsToFile, targetPackage, r;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              consoleLog = '';
+              addLogsToFile = function _addLogsToFile(msg) {
+                _fs["default"].appendFileSync(consoleLogOutputDir, "".concat(msg));
+              };
+              consoleLogOutputDir = './test-console-output.log';
+              _context2.next = 4;
+              return page.exposeFunction("addLogsToFile", addLogsToFile);
+            case 4:
               if (!options.record) {
-                _context2.next = 7;
+                _context2.next = 11;
                 break;
               }
-              _context2.next = 4;
+              _fs["default"].writeFileSync(consoleLogOutputDir, "");
+              _context2.next = 8;
               return recorder.start('./test-record.mp4');
-            case 4:
+            case 8:
               page.on('console', function (msg) {
-                return consoleLog += "CONSOLE LOG ENTRY: ".concat(msg.text(), "\n");
+                addLogsToFile("CONSOLE LOG ENTRY: ".concat(msg.text(), "\n"));
               });
               page.on('pageerror', function (error) {
-                consoleLog += "CONSOLE LOG ERROR: ".concat(error.message, "\n");
+                addLogsToFile("CONSOLE LOG ERROR: ".concat(error.message, "\n"));
               });
               page.on('response', function (response) {
-                consoleLog += "CONSOLE LOG REQUEST: ".concat(response.status(), ", ").concat(response.url(), "\n");
+                addLogsToFile("CONSOLE LOG REQUEST: ".concat(response.status(), ", ").concat(response.url(), "\n"));
               });
-            case 7:
+            case 11:
               targetPackage = (_process$env$TARGET_P = process.env.TARGET_PACKAGE) !== null && _process$env$TARGET_P !== void 0 ? _process$env$TARGET_P : '#{PACKAGE_NAMESPACE}';
               console.log("Testing ".concat(targetPackage, " package...\n"));
-              _context2.next = 11;
+              _context2.next = 15;
               return page.evaluate(function (targetPackage, options, testContext) {
                 if (options.benchmark) window.DG.Test.isInBenchmark = true;
                 return new Promise(function (resolve, reject) {
@@ -191,7 +209,7 @@ function test(args) {
                     };
                     if (df == null) {
                       failed = true;
-                      failReport = "Fail reason: No package tests found".concat(options.path ? " for path \"".concat(options.path, "\"") : '');
+                      failReport = "Fail reason: No package tests found".concat(options.path ? ' for path "' + options.path + '"' : '');
                       resolve({
                         failReport: failReport,
                         skipReport: skipReport,
@@ -234,34 +252,33 @@ function test(args) {
                       countReport: countReport
                     });
                   })["catch"](function (e) {
-                    var stack = window.DG.Logger.translateStackTrace(e.stack);
-                    resolve({
-                      failReport: "".concat(e.message, "\n").concat(stack),
-                      skipReport: '',
-                      passReport: '',
-                      failed: true,
-                      csv: '',
-                      countReport: {
-                        skip: 0,
-                        pass: 0
-                      }
+                    var stack = window.DG.Logger.translateStackTrace(e.stack).then(function () {
+                      resolve({
+                        failReport: "".concat(e.message, "\n").concat(stack),
+                        skipReport: '',
+                        passReport: '',
+                        failed: true,
+                        csv: '',
+                        countReport: {
+                          skip: 0,
+                          pass: 0
+                        }
+                      });
                     });
                   });
                 });
               }, targetPackage, options, new testUtils.TestContext(options.catchUnhandled, options.report));
-            case 11:
+            case 15:
               r = _context2.sent;
               if (!options.record) {
-                _context2.next = 16;
+                _context2.next = 19;
                 break;
               }
-              _context2.next = 15;
+              _context2.next = 19;
               return recorder.stop();
-            case 15:
-              _fs["default"].writeFileSync('./test-console-output.log', consoleLog);
-            case 16:
+            case 19:
               return _context2.abrupt("return", r);
-            case 17:
+            case 20:
             case "end":
               return _context2.stop();
           }

package/package-template/ts.webpack.config.js

@@ -3,6 +3,9 @@ const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
 const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
 
 module.exports = {
+  cache: {
+    type: 'filesystem',
+  },
   mode: 'development',
   entry: {
     test: {filename: 'package-test.js', library: {type: 'var', name: `${packageName}_test`}, import: './src/package-test.ts'},
@@ -13,7 +16,7 @@ module.exports = {
   },
   module: {
     rules: [
-      {test: /\.tsx?$/, loader: 'ts-loader'},
+      {test: /\.tsx?$/, loader: 'ts-loader', options: {allowTsInNodeModules: true}},
     ],
   },
   plugins: [

package/package-template/tsconfig.json

@@ -65,7 +65,7 @@
     "emitDecoratorMetadata": true,                  /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "skipLibCheck": false,                          /* Skip type checking of declaration files. */
+    "skipLibCheck": true,                          /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
   }
 }

package/package-template/webpack.config.js

@@ -2,7 +2,10 @@ const path = require('path');
 const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
 
 module.exports = {
-  mode: 'development',
+  cache: {
+    type: 'filesystem',
+  },
+  mode: 'production',
   entry: {
     package: './src/package.js',
   },

package/package.json

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