datagrok-tools 4.8.0 → 4.8.2

package/bin/commands/check.js

@@ -13,6 +13,8 @@ exports.checkImportStatements = checkImportStatements;
 exports.checkPackageFile = checkPackageFile;
 exports.extractExternals = extractExternals;
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -99,17 +101,22 @@ function check(args) {
 
     var isWebpack = _fs["default"].existsSync(webpackConfigPath);
 
+    var externals = null;
+
     if (isWebpack) {
       var content = _fs["default"].readFileSync(webpackConfigPath, {
         encoding: 'utf-8'
       });
 
-      var externals = extractExternals(content);
+      externals = extractExternals(content);
       if (externals) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkImportStatements(packagePath, jsTsFiles, externals)));
     }
 
     warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkFuncSignatures(packagePath, funcFiles)));
-    warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath)));
+    warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath, {
+      isWebpack: isWebpack,
+      externals: externals
+    })));
 
     if (warnings.length) {
       console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
@@ -121,12 +128,12 @@ function check(args) {
 }
 
 function extractExternals(config) {
-  var externalsRegex = /(?<=externals\s*:\s*)(\{[\S\s]*?\})/;
+  var externalsRegex = /(?<=externals)\s*:\s*(\{[\S\s]*?\})/;
   var match = config.match(externalsRegex);
 
   if (match) {
-    // Replace single quotes and a trailing comma to make a string JSON-like
-    var externalStr = match[1].replace(/'/g, '"').replace(/(?<=[\S\s]),(?=\s*\})/, '');
+    // Replace single quotes, comments, and a trailing comma to make a string JSON-like
+    var externalStr = match[1].replace(/'/g, '"').replace(/\/\/.*(\r\n|\r|\n)/, '').replace(/(?<=[\S\s]),(?=\s*\})/, '');
 
     try {
       var externals = JSON.parse(externalStr);
@@ -142,9 +149,9 @@ function extractExternals(config) {
 function checkImportStatements(packagePath, files, externals) {
   var modules = [];
 
-  for (var key in externals) {
-    modules.push(key);
-    if (key.includes('/')) modules.push(key.split('/', 1)[0]);
+  for (var _key in externals) {
+    modules.push(_key);
+    if (_key.includes('/')) modules.push(_key.split('/', 1)[0]);
   }
 
   var importRegex = new RegExp("^(?!\\/{2})\\s*import\\s+.*(".concat(modules.join('|'), ").*(?=\\s+?)"), 'g');
@@ -402,7 +409,25 @@ function checkFuncSignatures(packagePath, files) {
   return warnings;
 }
 
-function checkPackageFile(packagePath) {
+var sharedLibExternals = {
+  'common/html2canvas.min.js': {
+    'exceljs': 'ExcelJS'
+  },
+  'common/exceljs.min.js': {
+    'html2canvas': 'html2canvas'
+  },
+  'common/ngl_viewer/ngl.js': {
+    'NGL': 'NGL'
+  },
+  'common/openchemlib-full.js': {
+    'openchemlib/full': 'OCL'
+  },
+  'common/codemirror/codemirror.js': {
+    'codemirror': 'CodeMirror'
+  }
+};
+
+function checkPackageFile(packagePath, options) {
   var warnings = [];
 
   var packageFilePath = _path["default"].join(packagePath, 'package.json');
@@ -440,7 +465,30 @@ function checkPackageFile(packagePath) {
       for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
         var source = _step7.value;
         if (typeof source !== 'string') warnings.push("File \"package.json\": Only file paths and URLs are allowed in sources. Modify the source ".concat(source));
-        if (source.startsWith('common/') || utils.absUrlRegex.test(source)) continue;
+        if (utils.absUrlRegex.test(source)) continue;
+
+        if (source.startsWith('common/')) {
+          if (options !== null && options !== void 0 && options.isWebpack && source.endsWith('.js')) {
+            if (options !== null && options !== void 0 && options.externals) {
+              if (source in sharedLibExternals) {
+                var _Object$entries$ = (0, _slicedToArray2["default"])(Object.entries(sharedLibExternals[source])[0], 2),
+                    _lib = _Object$entries$[0],
+                    name = _Object$entries$[1];
+
+                if (!(_lib in options.externals && options.externals[_lib] === name)) {
+                  warnings.push("Webpack config parsing: Consider adding source \"".concat(source, "\" to webpack externals:\n") + "'".concat(_lib, "': '").concat(name, "'\n"));
+                }
+              } else {
+                warnings.push("File \"package.json\": source \"".concat(source, "\" not in the list of shared libraries"));
+              }
+            } else {
+              warnings.push('Webpack config parsing: External modules not found.\n' + "Consider adding source \"".concat(source, "\" to webpack externals") + (source in sharedLibExternals ? ':\n' + "'".concat(Object.keys(sharedLibExternals[source])[0], "': '").concat(Object.values(sharedLibExternals[source])[0], "'\n") : ''));
+            }
+          }
+
+          continue;
+        }
+
         if (source.startsWith('src/') && _fs["default"].existsSync(_path["default"].join(packagePath, 'webpack.config.js'))) warnings.push('File "package.json": Sources cannot include files from the \`src/\` directory. ' + "Move file ".concat(source, " to another folder."));
         if (!_fs["default"].existsSync(_path["default"].join(packagePath, source))) warnings.push("Source ".concat(source, " not found in the package."));
       }

package/bin/commands/link.js

@@ -121,16 +121,15 @@ function link(args) {
           var lib = _step2.value;
 
           if ("".concat(libScope, "/").concat(lib.name) in dependencies) {
-            if (lib.isSymbolicLink()) {
-              console.log("Package \"".concat(lib.name, "\" is linked. Skipping..."));
-            } else {
-              console.log("Linking \"".concat(lib.name, "\"..."));
-              (0, _child_process.exec)('npm install && npm run build && npm link', {
-                cwd: _path["default"].join(paths[libScope], lib.name)
-              }, function (err, stdout, stderr) {
-                if (err) throw err;else console.log(stderr, stdout);
-              });
-            }
+            var libPath = _path["default"].join(paths[libScope], lib.name);
+
+            var isLinked = lib.isSymbolicLink();
+            console.log(isLinked ? "Package \"".concat(lib.name, "\" is linked. Updating dependencies and running the build script...") : "Linking \"".concat(lib.name, "\"..."));
+            (0, _child_process.exec)(isLinked ? 'npm update && npm run build' : 'npm install && npm run build && npm link', {
+              cwd: libPath
+            }, function (err, stdout, stderr) {
+              if (err) throw err;else console.log(stderr, stdout);
+            });
           }
         }
       } catch (err) {
@@ -145,43 +144,38 @@ function link(args) {
         return m.name === 'utils';
       }), 1)[0];
 
-      if (utilsModule.isSymbolicLink()) {
-        console.log("Package \"".concat(utilsModule.name, "\" is linked. Skipping..."));
-      } else {
-        console.log("Linking \"".concat(utilsModule.name, "\"..."));
-        (0, _child_process.exec)('npm install && npm run build && npm link', {
-          cwd: _path["default"].join(paths[libScope], 'utils')
-        }, function (err, stdout, stderr) {
-          if (err) throw err;else {
-            console.log(stderr, stdout);
-            f();
-          }
-        });
-      }
-    } else {
-      f();
-    }
-  }
+      var libPath = _path["default"].join(paths[libScope], 'utils');
 
-  if (apiModule != null) {
-    if (apiModule.isSymbolicLink()) {
-      console.log("Package \"".concat(apiModule.name, "\" is linked. Skipping..."));
-      installLibs(libs);
-    } else {
-      console.log("Linking \"".concat(apiModule.name, "\"..."));
-      (0, _child_process.exec)("npm install && npm run build && npm link", {
-        cwd: paths[apiPackageName]
+      var isLinked = utilsModule.isSymbolicLink();
+      console.log(isLinked ? "Package \"".concat(utilsModule.name, "\" is linked. Updating dependencies and running the build script...") : "Linking \"".concat(utilsModule.name, "\"..."));
+      (0, _child_process.exec)(isLinked ? 'npm update && npm run build' : 'npm install && npm run build && npm link', {
+        cwd: libPath
       }, function (err, stdout, stderr) {
         if (err) throw err;else {
           console.log(stderr, stdout);
-          installLibs(libs);
-          var packageNames = Object.keys(dependencies).join(' ');
-          (0, _child_process.exec)("npm link ".concat(packageNames));
+          f();
         }
       });
+    } else {
+      f();
     }
   }
 
+  if (apiModule != null) {
+    var isLinked = apiModule.isSymbolicLink();
+    console.log(isLinked ? "Package \"".concat(apiModule.name, "\" is linked. Updating dependencies and running the build script...") : "Linking \"".concat(apiModule.name, "\"..."));
+    (0, _child_process.exec)(isLinked ? "npm update && npm run build" : "npm install && npm run build && npm link", {
+      cwd: paths[apiPackageName]
+    }, function (err, stdout, stderr) {
+      if (err) throw err;else {
+        console.log(stderr, stdout);
+        installLibs(libs);
+        var packageNames = Object.keys(dependencies).join(' ');
+        (0, _child_process.exec)("npm link ".concat(packageNames));
+      }
+    });
+  }
+
   return true;
 }
 /** Unlinks local packages and runs `npm i`. */

package/bin/commands/test.js

@@ -138,21 +138,28 @@ function test(args) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
+                _context.prev = 0;
+                _context.next = 3;
                 return testUtils.getBrowserPage(_puppeteer["default"], params);
 
-              case 2:
+              case 3:
                 out = _context.sent;
                 browser = out.browser;
                 page = out.page;
-                return _context.abrupt("return", 'Initialization completed.');
+                _context.next = 11;
+                break;
 
-              case 6:
+              case 8:
+                _context.prev = 8;
+                _context.t0 = _context["catch"](0);
+                throw _context.t0;
+
+              case 11:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee);
+        }, _callee, null, [[0, 8]]);
       })));
     }
 
@@ -235,21 +242,31 @@ function test(args) {
     }
 
     (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-      var initMessage, r;
+      var r;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.next = 2;
+              _context3.prev = 0;
+              _context3.next = 3;
               return init(P_START_TIMEOUT);
 
-            case 2:
-              initMessage = _context3.sent;
-              console.log(initMessage);
-              _context3.next = 6;
-              return runTest(7200000);
+            case 3:
+              color.success('Initialization completed.');
+              _context3.next = 10;
+              break;
 
             case 6:
+              _context3.prev = 6;
+              _context3.t0 = _context3["catch"](0);
+              color.error('Initialization failed.');
+              throw _context3.t0;
+
+            case 10:
+              _context3.next = 12;
+              return runTest(7200000);
+
+            case 12:
               r = _context3.sent;
 
               if (r.csv && args.csv) {
@@ -272,19 +289,19 @@ function test(args) {
 
 
               if (!(browser != null)) {
-                _context3.next = 14;
+                _context3.next = 20;
                 break;
               }
 
-              _context3.next = 14;
+              _context3.next = 20;
               return browser.close();
 
-            case 14:
+            case 20:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[0, 6]]);
     }))();
   }
 

package/bin/utils/test-utils.js

@@ -266,20 +266,28 @@ function runWithTimeout(timeout, f) {
               timeoutId = setTimeout(function () {
                 return reject("Timeout exceeded: ".concat(timeout, " ms"));
               }, timeout);
-              _context.next = 3;
+              _context.prev = 1;
+              _context.next = 4;
               return f();
 
-            case 3:
+            case 4:
               resolveValue = _context.sent;
               clearTimeout(timeoutId);
               resolve(resolveValue);
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](1);
+              reject(_context.t0);
 
-            case 6:
+            case 12:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee);
+      }, _callee, null, [[1, 9]]);
     }));
 
     return function (_x6, _x7) {

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

@@ -27,6 +27,7 @@ module.exports = {
     'dayjs': 'dayjs',
     'wu': 'wu',
     'exceljs': 'ExcelJS',
+    'html2canvas': 'html2canvas',
   },
   output: {
     filename: '[name].js',

package/package.json

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