datagrok-tools 4.13.14 → 4.13.15

package/CHANGELOG.md

@@ -1,13 +1,25 @@
 # Datagrok-tools changelog
 
 
-## 4.13.13 (2024-08-09)
+## 4.13.16 (2024-08-23)
+
+### Features
+
+* Grok link fixes
+
+## 4.13.15 (2024-08-21)
+
+### Features
+
+* Grok link updated to link all dependent libs 
+
+## 4.13.14 (2024-08-09)
 
 ### Features
 
 * Timeout update for test runs up to 1 hour
 
-## 4.13.12 (2024-08-09)
+## 4.13.13 (2024-08-09)
 
 ### Features
 

package/bin/commands/link.js

@@ -1,191 +1,220 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.link = link;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _child_process = require("child_process");
-var utils = _interopRequireWildcard(require("../utils/utils"));
-var color = _interopRequireWildcard(require("../utils/color-utils"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+var _util = require("util");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable valid-jsdoc */
+var execAsync = (0, _util.promisify)(_child_process.exec);
+var repositoryDirNameRegex = new RegExp('\\public$');
 var curDir = process.cwd();
-var repositoryDir = _path["default"].dirname(_path["default"].dirname(curDir));
+var devMode = false;
+var repositoryDir = curDir;
+var localPackageDependencies;
+var packagesToLink;
+while (repositoryDir.length > 0) {
+  if (repositoryDirNameRegex.test(repositoryDir)) break;
+  repositoryDir = _path["default"].dirname(repositoryDir);
+}
+var apiDir = _path["default"].join(repositoryDir, 'js-api');
+var libDir = _path["default"].join(repositoryDir, 'libraries');
+var packageDir = _path["default"].join(repositoryDir, 'packages');
 var apiPackageName = 'datagrok-api';
-var libScope = '@datagrok-libraries';
-var paths = (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, apiPackageName, _path["default"].join(repositoryDir, 'js-api')), libScope, _path["default"].join(repositoryDir, 'libraries'));
-var packageDependencies = {};
-
-/** Links local packages. */
-function link(args) {
-  var nOptions = Object.keys(args).length - 1;
-  if (nOptions > 1 || args['_'].length > 1 || nOptions === 1 && !args.local && !args.npm) return false;
-  var local = args.npm ? false : true; // args.local is default
-
-  if (!utils.isPackageDir(curDir)) {
-    color.error('File `package.json` not found. Run the command from the package directory');
-    return false;
-  }
-  for (var _i = 0, _Object$values = Object.values(paths); _i < _Object$values.length; _i++) {
-    var p = _Object$values[_i];
-    if (!_fs["default"].existsSync(p)) {
-      color.error("Directory ".concat(p, " not found. Run the command from the public package repository"));
-      return false;
-    }
-  }
-  var dependencies = readDependencies(curDir);
-  if (local) {
-    var _link = function _link(packagePath) {
-      var packageJsonPath = _path["default"].join(packagePath, 'package.json');
-      var json = JSON.parse(_fs["default"].readFileSync(packageJsonPath, 'utf-8'));
-      json.scripts['link-all'] = generateLinkScript(packagePath, packageHierarchy);
-      json.scripts['build-all'] = generateBuildScript(packagePath, packageHierarchy);
-      _fs["default"].writeFileSync(packageJsonPath, JSON.stringify(json, null, 2), 'utf-8');
-      (0, _child_process.exec)('npm install && npm link && npm run link-all', {
-        cwd: packagePath
-      }, function (err, stdout, stderr) {
-        if (err) throw err;else console.log(stderr, stdout);
-      });
-    };
-    var packageHierarchy = getHierarchy(curDir);
-    packageHierarchy.forEach(function (packageName) {
-      return _link(getPackagePath(packageName));
-    });
-    _link(curDir);
-  } else {
-    runScript(curDir, 'npm install', dependencies, {
-      dirMessage: 'Unlinking local packages in ',
-      successMessage: 'Local packages have been successfully unlinked.'
-    });
-  }
-  return true;
+var libName = '@datagrok-libraries/';
+var packageName = '@datagrok/';
+function link(_x) {
+  return _link.apply(this, arguments);
+}
+function _link() {
+  _link = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(args) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          localPackageDependencies = [];
+          packagesToLink = new Set();
+          if (args.dev !== undefined) devMode = args.dev;
+          collectPackagesData(curDir);
+          _context.next = 6;
+          return linkPackages();
+        case 6:
+          return _context.abrupt("return", true);
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _link.apply(this, arguments);
 }
-function readDependencies(packagePath) {
-  if (packagePath in packageDependencies) return packageDependencies[packagePath];
-  var fileContent = _fs["default"].readFileSync(_path["default"].join(packagePath, 'package.json'), 'utf-8');
-  var json = JSON.parse(fileContent);
-  var libs = {};
-  for (var dep in json.dependencies) {
-    if (dep === apiPackageName || dep.startsWith("".concat(libScope, "/"))) libs[dep] = json.dependencies[dep];
+function collectPackagesData() {
+  var packagePath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : curDir;
+  var packageJsonPath = _path["default"].join(packagePath, 'package.json');
+  var json = JSON.parse(_fs["default"].readFileSync(packageJsonPath, 'utf-8'));
+  var result = [];
+  result = result.concat(collectPacakgeDataFromJsonObject(json.dependencies));
+  if (devMode) result = result.concat(collectPacakgeDataFromJsonObject(json.devDependencies));
+  console.log(JSON.stringify(result).toString());
+  return result;
+}
+function collectPacakgeDataFromJsonObject(object) {
+  var result = [];
+  for (var _i = 0, _Object$keys = Object.keys(object); _i < _Object$keys.length; _i++) {
+    var dependencyName = _Object$keys[_i];
+    var nameSplitted = dependencyName.split('/');
+    if (dependencyName === apiPackageName) result = result.concat(parsePackageDependencies(dependencyName, apiDir));else if (dependencyName.includes(libName)) result = result.concat(parsePackageDependencies(dependencyName, _path["default"].join(libDir, nameSplitted[nameSplitted.length - 1])));else if (dependencyName.includes(packageName)) result = result.concat(parsePackageDependencies(dependencyName, _path["default"].join(packageDir, toCamelCase(nameSplitted[nameSplitted.length - 1]))));
   }
-  packageDependencies[packagePath] = libs;
-  return libs;
+  return result;
 }
-function getPackagePath(packageName) {
-  return packageName === apiPackageName ? paths[packageName] : _path["default"].join(paths[libScope], packageName.split('/')[1]);
+function toCamelCase(input) {
+  return input.split('-').map(function (word) {
+    return word.charAt(0).toUpperCase() + word.slice(1);
+  }).join('');
 }
-
-/** Forms a hierarchy to understand in which order packages should be linked. */
-function getHierarchy(packageDir) {
-  var hierarchy = [];
-  var dependencies = Object.keys(readDependencies(packageDir));
-  var cachedHierarchy = {};
-  for (var _i2 = 0, _dependencies = dependencies; _i2 < _dependencies.length; _i2++) {
-    var _cachedHierarchy$depP;
-    var dep = _dependencies[_i2];
-    var idx = hierarchy.indexOf(dep);
-    if (idx === -1) idx = hierarchy.push(dep) - 1;
-    var depPath = getPackagePath(dep);
-    var internalHierarchy = (_cachedHierarchy$depP = cachedHierarchy[depPath]) !== null && _cachedHierarchy$depP !== void 0 ? _cachedHierarchy$depP : getHierarchy(depPath);
-    if (!(depPath in cachedHierarchy)) cachedHierarchy[depPath] = internalHierarchy;
-    var _iterator = _createForOfIteratorHelper(internalHierarchy),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var internalDep = _step.value;
-        var depIdx = hierarchy.indexOf(internalDep);
-        if (depIdx === -1) {
-          // Insert the internal dependency before the main package
-          hierarchy.splice(idx, 0, internalDep);
-          idx++;
-        } else if (depIdx > idx) {
-          // Remove the internal dependency from the list and place it before the main package
-          // (doesn't affect the order of same-level libraries, their order is arbitrary)
-          hierarchy.splice(depIdx, 1);
-          idx = hierarchy.indexOf(dep);
-          hierarchy.splice(idx, 0, internalDep);
-          idx++;
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
+function parsePackageDependencies(dependencyName, pathToLink) {
+  var result = [];
+  if (!packagesToLink.has(dependencyName)) {
+    packagesToLink.add(dependencyName);
+    localPackageDependencies.push(new PackageData(dependencyName, pathToLink));
   }
-  return hierarchy;
+  result.push(dependencyName);
+  return result;
 }
-
-/** Executes a script for a package and its dependencies with messages on the current progress. */
-function runScript(packageDir, script, dependencies) {
-  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  (0, _child_process.exec)(script, {
-    cwd: packageDir
-  }, function (err, stdout, stderr) {
-    if (options.dirMessage) console.log("".concat(options.dirMessage).concat(_path["default"].basename(packageDir)));
-    if (options.callback) options.callback(packageDir);
-    if (err) throw err;else {
-      console.log(stderr, stdout);
-      var _loop = function _loop() {
-        var depPath = getPackagePath(dep);
-        (0, _child_process.exec)(script, {
-          cwd: depPath
-        }, function (err, stdout, stderr) {
-          if (options.dirMessage) console.log("".concat(options.dirMessage).concat(_path["default"].basename(depPath)));
-          if (options.callback) options.callback(depPath);
-          if (err) throw err;else console.log(stderr, stdout);
-        });
-      };
-      for (var dep in dependencies) {
-        _loop();
+function linkPackages() {
+  return _linkPackages.apply(this, arguments);
+}
+function _linkPackages() {
+  _linkPackages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var anyChanges, mapElements, _iterator, _step, element, names;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          anyChanges = true;
+        case 1:
+          if (!(anyChanges && packagesToLink.size > 0)) {
+            _context2.next = 31;
+            break;
+          }
+          anyChanges = false;
+          mapElements = localPackageDependencies.filter(function (x) {
+            return x.dependencies.every(function (i) {
+              return !packagesToLink.has(i);
+            }) && packagesToLink.has(x.name);
+          });
+          _iterator = _createForOfIteratorHelper(mapElements);
+          _context2.prev = 5;
+          _iterator.s();
+        case 7:
+          if ((_step = _iterator.n()).done) {
+            _context2.next = 19;
+            break;
+          }
+          element = _step.value;
+          _context2.next = 11;
+          return runScript("npm install", element.packagePath);
+        case 11:
+          _context2.next = 13;
+          return runScript("npm link ".concat(element.dependencies.join(' ')), element.packagePath);
+        case 13:
+          _context2.next = 15;
+          return runScript("npm link", element.packagePath);
+        case 15:
+          packagesToLink["delete"](element.name);
+          anyChanges = true;
+        case 17:
+          _context2.next = 7;
+          break;
+        case 19:
+          _context2.next = 24;
+          break;
+        case 21:
+          _context2.prev = 21;
+          _context2.t0 = _context2["catch"](5);
+          _iterator.e(_context2.t0);
+        case 24:
+          _context2.prev = 24;
+          _iterator.f();
+          return _context2.finish(24);
+        case 27:
+          if (!(anyChanges === false)) {
+            _context2.next = 29;
+            break;
+          }
+          throw new Error("There is loop with next packages: ".concat(JSON.stringify(Array.from(packagesToLink)).toString()));
+        case 29:
+          _context2.next = 1;
+          break;
+        case 31:
+          names = localPackageDependencies.map(function (x) {
+            return x.name;
+          });
+          _context2.next = 34;
+          return runScript("npm install", curDir);
+        case 34:
+          _context2.next = 36;
+          return runScript("npm link ".concat(names.join(' ')), curDir);
+        case 36:
+        case "end":
+          return _context2.stop();
       }
-      // if (options.successMessage)
-      //   setTimeout(() => color.success(options.successMessage!), 5000);
-    }
-  });
+    }, _callee2, null, [[5, 21, 24, 27]]);
+  }));
+  return _linkPackages.apply(this, arguments);
 }
-
-/** Generates a package script to build all dependencies using the provided hierarchy. */
-function generateBuildScript(packagePath, hierarchy) {
-  var dependencies = Object.keys(readDependencies(packagePath));
-  var packageNames = hierarchy.filter(function (p) {
-    return dependencies.includes(p);
-  });
-  var prefix = "./".concat(_path["default"].relative(packagePath, repositoryDir).split(_path["default"].sep).join('/'), "/");
-  var script = '';
-  var _iterator2 = _createForOfIteratorHelper(packageNames),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var packageName = _step2.value;
-      script += "npm --prefix ".concat(prefix).concat(packageName === apiPackageName ? 'js-api' : "libraries/".concat(packageName.split('/')[1]), " run build && ");
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  return "".concat(script ? script : '', "npm run build");
+function runScript(_x2, _x3) {
+  return _runScript.apply(this, arguments);
 }
-
-/** Generates a package script to link all dependencies using the provided hierarchy. */
-function generateLinkScript(packagePath, hierarchy) {
-  var dependencies = Object.keys(readDependencies(packagePath));
-  var packageNames = hierarchy.filter(function (p) {
-    return dependencies.includes(p);
-  });
-  for (var _i3 = 0, _dependencies2 = dependencies; _i3 < _dependencies2.length; _i3++) {
-    var dep = _dependencies2[_i3];
-    if (!packageNames.includes(dep)) color.error("Hierarchy does not include package ".concat(dep));
-  }
-  var script = "npm link".concat(packageNames.length ? ' ' + packageNames.join(' ') : '');
-  return script;
-}
+function _runScript() {
+  _runScript = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(script, path) {
+    var _yield$execAsync, stdout, stderr;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
+          _context3.next = 3;
+          return execAsync(script, {
+            cwd: path
+          });
+        case 3:
+          _yield$execAsync = _context3.sent;
+          stdout = _yield$execAsync.stdout;
+          stderr = _yield$execAsync.stderr;
+          if (stderr) {
+            console.error("Error: ".concat(stderr));
+          } else {
+            // console.log(`Output: ${stdout}`);
+          }
+          _context3.next = 12;
+          break;
+        case 9:
+          _context3.prev = 9;
+          _context3.t0 = _context3["catch"](0);
+          console.error("Execution failed: ".concat(_context3.t0.message));
+        case 12:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 9]]);
+  }));
+  return _runScript.apply(this, arguments);
+}
+var PackageData = /*#__PURE__*/(0, _createClass2["default"])(function PackageData(name, packagePath) {
+  (0, _classCallCheck2["default"])(this, PackageData);
+  (0, _defineProperty2["default"])(this, "name", void 0);
+  (0, _defineProperty2["default"])(this, "packagePath", void 0);
+  (0, _defineProperty2["default"])(this, "dependencies", []);
+  this.name = name;
+  this.packagePath = packagePath;
+  this.dependencies = collectPackagesData(packagePath);
+});

package/bin/grok.js

@@ -18,12 +18,12 @@ const commands = {
 
 const command = argv['_'][0];
 if (command in commands) {
-  try {
-    if (!commands[command](argv)) {
+  try { 
+    if (!commands[command](argv)) { 
       console.log(help[command]);
       exitWithCode(1);
     }
-  } catch (err) {
+  } catch (err) { 
     console.error(err);
     console.log(help[command]);
     exitWithCode(1);

package/package.json

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