datagrok-tools 4.12.22 → 4.12.24

package/README.md

@@ -83,6 +83,8 @@ Read more about package development in [Datagrok's documentation](https://datagr
 - `api` creates wrapper functions for package scripts and queries. The output is stored in files `/src/scripts-api.ts`
   and `/src/queries-api.ts` respectively.
 - `publish` uploads a package to the specified server (pass either a URL or a server alias from the `config.yaml` file).
+Additionally, you can use placeholders in JSON files under the `/connections` folder to substitute environment variables.
+For more information on configuring connections, refer to the [Connections](https://datagrok.ai/help/develop#connections) article.
 
   ```shell
   cd <package-name>

package/bin/commands/check.js

@@ -488,6 +488,7 @@ function checkChangelog(packagePath, json) {
   var v1 = (_h2$0$match = h2[0].match(regex)) === null || _h2$0$match === void 0 ? void 0 : _h2$0$match[1];
   var v2 = (_h2$ = h2[1]) === null || _h2$ === void 0 || (_h2$ = _h2$.match(regex)) === null || _h2$ === void 0 ? void 0 : _h2$[1];
   if (v1 !== json.version && v2 !== json.version) warnings.push("Latest package version (".concat(json.version, ") is not in CHANGELOG\n"));
+  if (warnings.length) warnings.push('Changelog guideline: https://datagrok.ai/help/develop/dev-process/changelog-policy#changelog-guideline');
   return warnings;
 }
 function warn(warnings) {

package/bin/commands/publish.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.processPackage = processPackage;
 exports.publish = publish;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _archiverPromise = _interopRequireDefault(require("archiver-promise"));
 var _fs = _interopRequireDefault(require("fs"));
@@ -21,10 +22,10 @@ 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; }
+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; } // @ts-ignore
 // @ts-ignore
-
-// @ts-ignore
-
 var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var confTemplateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'config-template.yaml');
@@ -39,7 +40,7 @@ function processPackage(_x, _x2, _x3, _x4, _x5, _x6) {
 }
 function _processPackage() {
   _processPackage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(debug, rebuild, host, devKey, packageName, suffix) {
-    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, packageFilePath, json, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, packageWarnings, changelogWarnings, uploadPromise, log;
+    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, packageFilePath, json, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, packageWarnings, changelogWarnings, reg, errs, uploadPromise, log;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -144,6 +145,8 @@ function _processPackage() {
           changelogWarnings = (0, _check.checkChangelog)(curDir, json);
           contentValidationLog += changelogWarnings.join('\n') + (packageWarnings.length ? '\n' : '');
           console.log("Checks finished in ".concat(Date.now() - checkStart, " ms"));
+          reg = new RegExp(/\${(\w*)}/g);
+          errs = [];
           files.forEach(function (file) {
             var fullPath = file;
             var relativePath = _path["default"].relative(curDir, fullPath);
@@ -166,11 +169,48 @@ function _processPackage() {
               console.log("Skipping ".concat(canonicalRelativePath));
               return;
             }
+            if (canonicalRelativePath.startsWith('connections/')) {
+              var f = _fs["default"].readFileSync(fullPath, {
+                encoding: 'utf-8'
+              });
+              var matches = (0, _toConsumableArray2["default"])(f.matchAll(reg));
+              var _iterator = _createForOfIteratorHelper(matches),
+                _step;
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  var m = _step.value;
+                  var envVar = process.env[m[1]];
+                  if (!envVar) {
+                    errs.push("".concat(canonicalRelativePath, ": cannot find environment variable \"").concat(m[1], "\""));
+                    continue;
+                  }
+                  f = f.replace(m[0], envVar);
+                }
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+              zip.append(f, {
+                name: relativePath
+              });
+              console.log("Adding ".concat(canonicalRelativePath, "..."));
+              return;
+            }
             zip.append(_fs["default"].createReadStream(fullPath), {
               name: relativePath
             });
             console.log("Adding ".concat(canonicalRelativePath, "..."));
           });
+          if (!errs.length) {
+            _context3.next = 55;
+            break;
+          }
+          errs.forEach(function (e) {
+            return color.error(e);
+          });
+          return _context3.abrupt("return", 1);
+        case 55:
           zip.append(JSON.stringify(localTimestamps), {
             name: 'timestamps.json'
           });
@@ -215,40 +255,41 @@ function _processPackage() {
           })["catch"](function (error) {
             console.error(error);
           });
-          _context3.next = 56;
+          _context3.next = 61;
           return zip.finalize();
-        case 56:
-          _context3.prev = 56;
-          _context3.next = 59;
+        case 61:
+          _context3.prev = 61;
+          _context3.next = 64;
           return uploadPromise;
-        case 59:
+        case 64:
           log = _context3.sent;
           _fs["default"].unlinkSync('zip');
           if (!(log['#type'] === 'ApiError')) {
-            _context3.next = 67;
+            _context3.next = 73;
             break;
           }
           color.error(log['message']);
           console.error(log['innerMessage']);
+          console.log(log);
           return _context3.abrupt("return", 1);
-        case 67:
+        case 73:
           console.log(log);
           color.warn(contentValidationLog);
-        case 69:
-          _context3.next = 75;
+        case 75:
+          _context3.next = 81;
           break;
-        case 71:
-          _context3.prev = 71;
-          _context3.t1 = _context3["catch"](56);
+        case 77:
+          _context3.prev = 77;
+          _context3.t1 = _context3["catch"](61);
           console.error(_context3.t1);
           return _context3.abrupt("return", 1);
-        case 75:
+        case 81:
           return _context3.abrupt("return", 0);
-        case 76:
+        case 82:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 14], [56, 71]]);
+    }, _callee3, null, [[3, 14], [61, 77]]);
   }));
   return _processPackage.apply(this, arguments);
 }

package/package.json

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