datagrok-tools 4.12.17 → 4.12.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.json +43 -0
- package/bin/_deprecated/migrate.js +9 -9
- package/bin/_deprecated/upload.js +36 -36
- package/bin/commands/add.js +16 -29
- package/bin/commands/api.js +22 -21
- package/bin/commands/check.js +10 -12
- package/bin/commands/config.js +120 -140
- package/bin/commands/create.js +6 -11
- package/bin/commands/help.js +11 -5
- package/bin/commands/init.js +11 -13
- package/bin/commands/link.js +6 -7
- package/bin/commands/publish.js +220 -226
- package/bin/commands/test.js +178 -184
- package/bin/grok.js +3 -3
- package/bin/utils/color-utils.js +5 -10
- package/bin/utils/ent-helpers.js +2 -3
- package/bin/utils/func-generation.js +19 -20
- package/bin/utils/test-utils.js +140 -150
- package/bin/utils/utils.js +20 -41
- package/bin/validators/config-validator.js +1 -3
- package/package-template/ts.webpack.config.js +3 -3
- package/package-template/webpack.config.js +1 -1
- package/package.json +26 -21
- package/plugins/func-gen-plugin.js +12 -12
- package/script-template/node.js +1 -1
package/bin/utils/test-utils.js
CHANGED
|
@@ -14,6 +14,7 @@ exports.getWebUrl = getWebUrl;
|
|
|
14
14
|
exports.recorderConfig = void 0;
|
|
15
15
|
exports.runWithTimeout = runWithTimeout;
|
|
16
16
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
17
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
18
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
18
19
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
20
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
@@ -22,18 +23,17 @@ var _os = _interopRequireDefault(require("os"));
|
|
|
22
23
|
var _path = _interopRequireDefault(require("path"));
|
|
23
24
|
var _jsYaml = _interopRequireDefault(require("js-yaml"));
|
|
24
25
|
var utils = _interopRequireWildcard(require("../utils/utils"));
|
|
25
|
-
function _getRequireWildcardCache(
|
|
26
|
-
function _interopRequireWildcard(
|
|
26
|
+
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); }
|
|
27
|
+
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; }
|
|
27
28
|
var fetch = require('node-fetch');
|
|
28
29
|
var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
|
|
29
30
|
var confPath = _path["default"].join(grokDir, 'config.yaml');
|
|
30
|
-
var defaultLaunchParameters = {
|
|
31
|
+
var defaultLaunchParameters = exports.defaultLaunchParameters = {
|
|
31
32
|
args: ['--disable-dev-shm-usage', '--disable-features=site-per-process', '--window-size=1920,1080'],
|
|
32
33
|
ignoreHTTPSErrors: true,
|
|
33
34
|
headless: 'new',
|
|
34
35
|
protocolTimeout: 0
|
|
35
36
|
};
|
|
36
|
-
exports.defaultLaunchParameters = defaultLaunchParameters;
|
|
37
37
|
function getToken(_x, _x2) {
|
|
38
38
|
return _getToken.apply(this, arguments);
|
|
39
39
|
}
|
|
@@ -41,30 +41,28 @@ function _getToken() {
|
|
|
41
41
|
_getToken = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(url, key) {
|
|
42
42
|
var response, json;
|
|
43
43
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
44
|
-
while (1) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return _context2.stop();
|
|
67
|
-
}
|
|
44
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
45
|
+
case 0:
|
|
46
|
+
_context2.next = 2;
|
|
47
|
+
return fetch("".concat(url, "/users/login/dev/").concat(key), {
|
|
48
|
+
method: 'POST'
|
|
49
|
+
});
|
|
50
|
+
case 2:
|
|
51
|
+
response = _context2.sent;
|
|
52
|
+
_context2.next = 5;
|
|
53
|
+
return response.json();
|
|
54
|
+
case 5:
|
|
55
|
+
json = _context2.sent;
|
|
56
|
+
if (!(json.isSuccess == true)) {
|
|
57
|
+
_context2.next = 10;
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
return _context2.abrupt("return", json.token);
|
|
61
|
+
case 10:
|
|
62
|
+
throw new Error('Unable to login to server. Check your dev key');
|
|
63
|
+
case 11:
|
|
64
|
+
case "end":
|
|
65
|
+
return _context2.stop();
|
|
68
66
|
}
|
|
69
67
|
}, _callee2);
|
|
70
68
|
}));
|
|
@@ -77,26 +75,24 @@ function _getWebUrl() {
|
|
|
77
75
|
_getWebUrl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(url, token) {
|
|
78
76
|
var response, json;
|
|
79
77
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
80
|
-
while (1) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
return _context3.stop();
|
|
99
|
-
}
|
|
78
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
79
|
+
case 0:
|
|
80
|
+
_context3.next = 2;
|
|
81
|
+
return fetch("".concat(url, "/admin/plugins/admin/settings"), {
|
|
82
|
+
headers: {
|
|
83
|
+
Authorization: token
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
case 2:
|
|
87
|
+
response = _context3.sent;
|
|
88
|
+
_context3.next = 5;
|
|
89
|
+
return response.json();
|
|
90
|
+
case 5:
|
|
91
|
+
json = _context3.sent;
|
|
92
|
+
return _context3.abrupt("return", json.settings.webRoot);
|
|
93
|
+
case 7:
|
|
94
|
+
case "end":
|
|
95
|
+
return _context3.stop();
|
|
100
96
|
}
|
|
101
97
|
}, _callee3);
|
|
102
98
|
}));
|
|
@@ -114,7 +110,7 @@ function getDevKey(hostKey) {
|
|
|
114
110
|
if (_url.endsWith('/')) _url = _url.slice(0, -1);
|
|
115
111
|
if (_url in urls) key = config['servers'][urls[_url]]['key'];
|
|
116
112
|
} catch (error) {
|
|
117
|
-
if (config['servers'][host] == null) throw "Unknown server alias. Please add it to ".concat(confPath);
|
|
113
|
+
if (config['servers'][host] == null) throw new Error("Unknown server alias. Please add it to ".concat(confPath));
|
|
118
114
|
url = config['servers'][host]['url'];
|
|
119
115
|
key = config['servers'][host]['key'];
|
|
120
116
|
}
|
|
@@ -138,78 +134,76 @@ function _getBrowserPage() {
|
|
|
138
134
|
page,
|
|
139
135
|
_args4 = arguments;
|
|
140
136
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
141
|
-
while (1) {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
return
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
return _context4.stop();
|
|
212
|
-
}
|
|
137
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
138
|
+
case 0:
|
|
139
|
+
params = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : defaultLaunchParameters;
|
|
140
|
+
url = (_process$env$HOST = process.env.HOST) !== null && _process$env$HOST !== void 0 ? _process$env$HOST : '';
|
|
141
|
+
cfg = getDevKey(url);
|
|
142
|
+
url = cfg.url;
|
|
143
|
+
key = cfg.key;
|
|
144
|
+
_context4.next = 7;
|
|
145
|
+
return getToken(url, key);
|
|
146
|
+
case 7:
|
|
147
|
+
token = _context4.sent;
|
|
148
|
+
_context4.next = 10;
|
|
149
|
+
return getWebUrl(url, token);
|
|
150
|
+
case 10:
|
|
151
|
+
url = _context4.sent;
|
|
152
|
+
console.log("Using web root: ".concat(url));
|
|
153
|
+
_context4.next = 14;
|
|
154
|
+
return puppeteer.launch(params);
|
|
155
|
+
case 14:
|
|
156
|
+
browser = _context4.sent;
|
|
157
|
+
_context4.next = 17;
|
|
158
|
+
return browser.newPage();
|
|
159
|
+
case 17:
|
|
160
|
+
page = _context4.sent;
|
|
161
|
+
_context4.next = 20;
|
|
162
|
+
return page.setViewport({
|
|
163
|
+
width: 1920,
|
|
164
|
+
height: 1080
|
|
165
|
+
});
|
|
166
|
+
case 20:
|
|
167
|
+
page.setDefaultNavigationTimeout(0);
|
|
168
|
+
_context4.next = 23;
|
|
169
|
+
return page["goto"]("".concat(url, "/oauth/"));
|
|
170
|
+
case 23:
|
|
171
|
+
_context4.next = 25;
|
|
172
|
+
return page.setCookie({
|
|
173
|
+
name: 'auth',
|
|
174
|
+
value: token
|
|
175
|
+
});
|
|
176
|
+
case 25:
|
|
177
|
+
_context4.next = 27;
|
|
178
|
+
return page.evaluate(function (token) {
|
|
179
|
+
window.localStorage.setItem('auth', token);
|
|
180
|
+
}, token);
|
|
181
|
+
case 27:
|
|
182
|
+
_context4.next = 29;
|
|
183
|
+
return page["goto"](url);
|
|
184
|
+
case 29:
|
|
185
|
+
_context4.prev = 29;
|
|
186
|
+
_context4.next = 32;
|
|
187
|
+
return page.waitForFunction(function () {
|
|
188
|
+
return document.querySelector('.grok-preloader') == null;
|
|
189
|
+
}, {
|
|
190
|
+
timeout: 3600000
|
|
191
|
+
});
|
|
192
|
+
case 32:
|
|
193
|
+
_context4.next = 37;
|
|
194
|
+
break;
|
|
195
|
+
case 34:
|
|
196
|
+
_context4.prev = 34;
|
|
197
|
+
_context4.t0 = _context4["catch"](29);
|
|
198
|
+
throw _context4.t0;
|
|
199
|
+
case 37:
|
|
200
|
+
return _context4.abrupt("return", {
|
|
201
|
+
browser: browser,
|
|
202
|
+
page: page
|
|
203
|
+
});
|
|
204
|
+
case 38:
|
|
205
|
+
case "end":
|
|
206
|
+
return _context4.stop();
|
|
213
207
|
}
|
|
214
208
|
}, _callee4, null, [[29, 34]]);
|
|
215
209
|
}));
|
|
@@ -220,29 +214,27 @@ function runWithTimeout(timeout, f) {
|
|
|
220
214
|
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
|
|
221
215
|
var timeoutId, resolveValue;
|
|
222
216
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
223
|
-
while (1) {
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
return _context.stop();
|
|
245
|
-
}
|
|
217
|
+
while (1) switch (_context.prev = _context.next) {
|
|
218
|
+
case 0:
|
|
219
|
+
timeoutId = setTimeout(function () {
|
|
220
|
+
return reject(new Error("Timeout exceeded: ".concat(timeout, " ms")));
|
|
221
|
+
}, timeout);
|
|
222
|
+
_context.prev = 1;
|
|
223
|
+
_context.next = 4;
|
|
224
|
+
return f();
|
|
225
|
+
case 4:
|
|
226
|
+
resolveValue = _context.sent;
|
|
227
|
+
clearTimeout(timeoutId);
|
|
228
|
+
resolve(resolveValue);
|
|
229
|
+
_context.next = 12;
|
|
230
|
+
break;
|
|
231
|
+
case 9:
|
|
232
|
+
_context.prev = 9;
|
|
233
|
+
_context.t0 = _context["catch"](1);
|
|
234
|
+
reject(_context.t0);
|
|
235
|
+
case 12:
|
|
236
|
+
case "end":
|
|
237
|
+
return _context.stop();
|
|
246
238
|
}
|
|
247
239
|
}, _callee, null, [[1, 9]]);
|
|
248
240
|
}));
|
|
@@ -255,15 +247,14 @@ function exitWithCode(code) {
|
|
|
255
247
|
console.log("Exiting with code ".concat(code));
|
|
256
248
|
process.exit(code);
|
|
257
249
|
}
|
|
258
|
-
var TestContext = function TestContext(catchUnhandled, report) {
|
|
250
|
+
var TestContext = exports.TestContext = /*#__PURE__*/(0, _createClass2["default"])(function TestContext(catchUnhandled, report) {
|
|
259
251
|
(0, _classCallCheck2["default"])(this, TestContext);
|
|
260
252
|
(0, _defineProperty2["default"])(this, "catchUnhandled", true);
|
|
261
253
|
(0, _defineProperty2["default"])(this, "report", false);
|
|
262
254
|
if (catchUnhandled !== undefined) this.catchUnhandled = catchUnhandled;
|
|
263
255
|
if (report !== undefined) this.report = report;
|
|
264
|
-
};
|
|
265
|
-
exports.
|
|
266
|
-
var recorderConfig = {
|
|
256
|
+
});
|
|
257
|
+
var recorderConfig = exports.recorderConfig = {
|
|
267
258
|
followNewTab: true,
|
|
268
259
|
fps: 25,
|
|
269
260
|
ffmpeg_Path: null,
|
|
@@ -279,5 +270,4 @@ var recorderConfig = {
|
|
|
279
270
|
color: 'black'
|
|
280
271
|
}
|
|
281
272
|
// aspectRatio: '16:9',
|
|
282
|
-
};
|
|
283
|
-
exports.recorderConfig = recorderConfig;
|
|
273
|
+
};
|
package/bin/utils/utils.js
CHANGED
|
@@ -30,7 +30,7 @@ var _fs = _interopRequireDefault(require("fs"));
|
|
|
30
30
|
var _path = _interopRequireDefault(require("path"));
|
|
31
31
|
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; } } }; }
|
|
32
32
|
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); }
|
|
33
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
33
|
+
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; }
|
|
34
34
|
function isEmpty(dir) {
|
|
35
35
|
return _fs["default"].readdirSync(dir).length === 0;
|
|
36
36
|
}
|
|
@@ -68,9 +68,7 @@ function removeScope(name) {
|
|
|
68
68
|
}
|
|
69
69
|
function mapURL(conf) {
|
|
70
70
|
var urls = {};
|
|
71
|
-
for (var server in conf['servers'])
|
|
72
|
-
urls[conf['servers'][server]['url']] = server;
|
|
73
|
-
}
|
|
71
|
+
for (var server in conf['servers']) urls[conf['servers'][server]['url']] = server;
|
|
74
72
|
return urls;
|
|
75
73
|
}
|
|
76
74
|
function friendlyNameToName(s) {
|
|
@@ -97,7 +95,7 @@ function friendlyNameToName(s) {
|
|
|
97
95
|
}
|
|
98
96
|
return out;
|
|
99
97
|
}
|
|
100
|
-
var replacers = {
|
|
98
|
+
var replacers = exports.replacers = {
|
|
101
99
|
NAME: function NAME(s, name) {
|
|
102
100
|
return s.replace(/#{NAME}/g, name);
|
|
103
101
|
},
|
|
@@ -136,8 +134,7 @@ var replacers = {
|
|
|
136
134
|
}).join(', '));
|
|
137
135
|
}
|
|
138
136
|
};
|
|
139
|
-
exports.
|
|
140
|
-
var TemplateBuilder = /*#__PURE__*/function () {
|
|
137
|
+
var TemplateBuilder = exports.TemplateBuilder = /*#__PURE__*/function () {
|
|
141
138
|
function TemplateBuilder(template) {
|
|
142
139
|
(0, _classCallCheck2["default"])(this, TemplateBuilder);
|
|
143
140
|
(0, _defineProperty2["default"])(this, "template", void 0);
|
|
@@ -163,10 +160,9 @@ var TemplateBuilder = /*#__PURE__*/function () {
|
|
|
163
160
|
}]);
|
|
164
161
|
return TemplateBuilder;
|
|
165
162
|
}();
|
|
166
|
-
exports.TemplateBuilder = TemplateBuilder;
|
|
167
163
|
(0, _defineProperty2["default"])(TemplateBuilder, "sep", '\n');
|
|
168
164
|
(0, _defineProperty2["default"])(TemplateBuilder, "indentSize", 2);
|
|
169
|
-
var scriptLangExtMap = {
|
|
165
|
+
var scriptLangExtMap = exports.scriptLangExtMap = {
|
|
170
166
|
javascript: 'js',
|
|
171
167
|
julia: 'jl',
|
|
172
168
|
node: 'js',
|
|
@@ -174,8 +170,7 @@ var scriptLangExtMap = {
|
|
|
174
170
|
python: 'py',
|
|
175
171
|
r: 'R'
|
|
176
172
|
};
|
|
177
|
-
exports.
|
|
178
|
-
var commentMap = {
|
|
173
|
+
var commentMap = exports.commentMap = {
|
|
179
174
|
'.js': '//',
|
|
180
175
|
'.jl': '#',
|
|
181
176
|
'.m': '#',
|
|
@@ -183,17 +178,12 @@ var commentMap = {
|
|
|
183
178
|
'.R': '#',
|
|
184
179
|
'.sql': '--'
|
|
185
180
|
};
|
|
186
|
-
exports.
|
|
187
|
-
var
|
|
188
|
-
exports.queryExtension = queryExtension;
|
|
189
|
-
var scriptExtensions = ['.jl', '.m', '.py', '.R'];
|
|
190
|
-
exports.scriptExtensions = scriptExtensions;
|
|
181
|
+
var queryExtension = exports.queryExtension = '.sql';
|
|
182
|
+
var scriptExtensions = exports.scriptExtensions = ['.jl', '.m', '.py', '.R'];
|
|
191
183
|
function checkScriptLocation(filepath) {
|
|
192
184
|
if (!(filepath.startsWith('scripts/') || filepath.startsWith('projects/') || filepath.startsWith('dockerfiles/')) && scriptExtensions.some(function (ext) {
|
|
193
185
|
return filepath.endsWith(ext);
|
|
194
|
-
}))
|
|
195
|
-
return false;
|
|
196
|
-
}
|
|
186
|
+
})) return false;
|
|
197
187
|
return true;
|
|
198
188
|
}
|
|
199
189
|
;
|
|
@@ -213,7 +203,7 @@ function getParam(name, script) {
|
|
|
213
203
|
return match ? (_match$2 = match[1]) === null || _match$2 === void 0 ? void 0 : _match$2.trim() : null;
|
|
214
204
|
}
|
|
215
205
|
;
|
|
216
|
-
var dgToTsTypeMap = {
|
|
206
|
+
var dgToTsTypeMap = exports.dgToTsTypeMap = {
|
|
217
207
|
"int": 'number',
|
|
218
208
|
"double": 'number',
|
|
219
209
|
bigint: 'bigint',
|
|
@@ -224,19 +214,12 @@ var dgToTsTypeMap = {
|
|
|
224
214
|
column_list: 'string[]',
|
|
225
215
|
file: 'DG.FileInfo'
|
|
226
216
|
};
|
|
227
|
-
exports.
|
|
228
|
-
var
|
|
229
|
-
exports.
|
|
230
|
-
var
|
|
231
|
-
exports.
|
|
232
|
-
var
|
|
233
|
-
exports.paramRegex = paramRegex;
|
|
234
|
-
var nameAnnRegex = /\/\/\s*(name[^:]*): ([^\n\r\[\{]+)/;
|
|
235
|
-
exports.nameAnnRegex = nameAnnRegex;
|
|
236
|
-
var nameRegex = /(?:|static|export\s+function|export\s+async\s+function)\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?)\).*/;
|
|
237
|
-
exports.nameRegex = nameRegex;
|
|
238
|
-
var absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');
|
|
239
|
-
exports.absUrlRegex = absUrlRegex;
|
|
217
|
+
var propertyTypes = exports.propertyTypes = ['bool', 'int', 'double', 'string', 'datetime', 'object', 'column', 'dataframe', 'bitset', 'cell', 'string_list', 'map'];
|
|
218
|
+
var headerTags = exports.headerTags = ['name', 'description', 'help-url', 'input', 'output', 'tags', 'sample', 'language', 'returns', 'test', 'sidebar', 'condition', 'top-menu', 'environment', 'require', 'editor-for', 'schedule', 'reference', 'editor', 'meta'];
|
|
219
|
+
var paramRegex = exports.paramRegex = new RegExp("//\\s*(".concat(headerTags.join('|'), "\\.[^:]*): *([^\\s\\[\\{]+) ?([^\\s\\[\\{]+)?"));
|
|
220
|
+
var nameAnnRegex = exports.nameAnnRegex = /\/\/\s*(name[^:]*): ([^\n\r\[\{]+)/;
|
|
221
|
+
var nameRegex = exports.nameRegex = /(?:|static|export\s+function|export\s+async\s+function)\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?)\).*/;
|
|
222
|
+
var absUrlRegex = exports.absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');
|
|
240
223
|
function getScriptOutputType(script) {
|
|
241
224
|
var comment = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#';
|
|
242
225
|
var regex = new RegExp("".concat(comment, "\\s*output:\\s?([a-z_]+)\\s*"));
|
|
@@ -269,11 +252,7 @@ function getScriptInputs(script) {
|
|
|
269
252
|
return inputs;
|
|
270
253
|
}
|
|
271
254
|
;
|
|
272
|
-
var dgImports = "import * as grok from 'datagrok-api/grok';\nimport * as DG from 'datagrok-api/dg';\n\n";
|
|
273
|
-
exports.
|
|
274
|
-
var
|
|
275
|
-
exports.
|
|
276
|
-
var queryWrapperTemplate = "export async function #{FUNC_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n return await grok.data.query('#{PACKAGE_NAMESPACE}:#{FUNC_NAME}', #{PARAMS_OBJECT});\n}";
|
|
277
|
-
exports.queryWrapperTemplate = queryWrapperTemplate;
|
|
278
|
-
var namespaceTemplate = "export namespace #{PACKAGE_NAMESPACE} {\n#{NAME}\n}";
|
|
279
|
-
exports.namespaceTemplate = namespaceTemplate;
|
|
255
|
+
var dgImports = exports.dgImports = "import * as grok from 'datagrok-api/grok';\nimport * as DG from 'datagrok-api/dg';\n\n";
|
|
256
|
+
var scriptWrapperTemplate = exports.scriptWrapperTemplate = "export async function #{FUNC_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n return await grok.functions.call('#{PACKAGE_NAMESPACE}:#{FUNC_NAME}', #{PARAMS_OBJECT});\n}";
|
|
257
|
+
var queryWrapperTemplate = exports.queryWrapperTemplate = "export async function #{FUNC_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n return await grok.data.query('#{PACKAGE_NAMESPACE}:#{FUNC_NAME}', #{PARAMS_OBJECT});\n}";
|
|
258
|
+
var namespaceTemplate = exports.namespaceTemplate = "export namespace #{PACKAGE_NAMESPACE} {\n#{NAME}\n}";
|
|
@@ -44,8 +44,6 @@ function validateConf(config) {
|
|
|
44
44
|
if (hasDefault) {
|
|
45
45
|
vr.value = true;
|
|
46
46
|
vr.message = '';
|
|
47
|
-
} else
|
|
48
|
-
vr.message += "The default server \"".concat(defaultServer, "\" is not in the server list.");
|
|
49
|
-
}
|
|
47
|
+
} else vr.message += "The default server \"".concat(defaultServer, "\" is not in the server list.");
|
|
50
48
|
return vr;
|
|
51
49
|
}
|
|
@@ -5,15 +5,15 @@ const packageName = path.parse(require('./package.json').name).name.toLowerCase(
|
|
|
5
5
|
module.exports = {
|
|
6
6
|
mode: 'development',
|
|
7
7
|
entry: {
|
|
8
|
-
test: {filename: 'package-test.js', library: {type: 'var', name
|
|
9
|
-
package: './src/package.ts'
|
|
8
|
+
test: {filename: 'package-test.js', library: {type: 'var', name: `${packageName}_test`}, import: './src/package-test.ts'},
|
|
9
|
+
package: './src/package.ts',
|
|
10
10
|
},
|
|
11
11
|
resolve: {
|
|
12
12
|
extensions: ['.wasm', '.mjs', '.ts', '.json', '.js', '.tsx'],
|
|
13
13
|
},
|
|
14
14
|
module: {
|
|
15
15
|
rules: [
|
|
16
|
-
{
|
|
16
|
+
{test: /\.tsx?$/, loader: 'ts-loader'},
|
|
17
17
|
],
|
|
18
18
|
},
|
|
19
19
|
plugins: [
|
package/package.json
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "datagrok-tools",
|
|
3
|
-
"version": "4.12.
|
|
3
|
+
"version": "4.12.19",
|
|
4
4
|
"description": "Utility to upload and publish packages to Datagrok",
|
|
5
5
|
"homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@babel/parser": "^7.
|
|
8
|
-
"@babel/runtime": "^7.
|
|
9
|
-
"@babel/traverse": "^7.
|
|
7
|
+
"@babel/parser": "^7.23.6",
|
|
8
|
+
"@babel/runtime": "^7.23.8",
|
|
9
|
+
"@babel/traverse": "^7.23.7",
|
|
10
10
|
"archiver": "^4.0.2",
|
|
11
11
|
"archiver-promise": "^1.0.0",
|
|
12
12
|
"fs": "latest",
|
|
13
|
-
"ignore-walk": "^3.0.
|
|
14
|
-
"inquirer": "^7.
|
|
13
|
+
"ignore-walk": "^3.0.4",
|
|
14
|
+
"inquirer": "^7.3.3",
|
|
15
15
|
"js-yaml": "^4.1.0",
|
|
16
|
-
"minimist": "^1.2.
|
|
17
|
-
"node-fetch": "^2.
|
|
16
|
+
"minimist": "^1.2.8",
|
|
17
|
+
"node-fetch": "^2.7.0",
|
|
18
18
|
"node-recursive-directory": "^1.2.0",
|
|
19
|
-
"os": "^0.1.
|
|
19
|
+
"os": "^0.1.2",
|
|
20
20
|
"path": "^0.12.7",
|
|
21
|
-
"puppeteer": "^20.
|
|
21
|
+
"puppeteer": "^20.9.0",
|
|
22
22
|
"puppeteer-screen-recorder": "^2.1.2"
|
|
23
23
|
},
|
|
24
24
|
"scripts": {
|
|
@@ -41,17 +41,22 @@
|
|
|
41
41
|
]
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@babel/cli": "^7.
|
|
45
|
-
"@babel/core": "^7.
|
|
46
|
-
"@babel/plugin-proposal-decorators": "^7.
|
|
47
|
-
"@babel/plugin-transform-runtime": "^7.
|
|
48
|
-
"@babel/preset-env": "^7.
|
|
44
|
+
"@babel/cli": "^7.23.4",
|
|
45
|
+
"@babel/core": "^7.23.7",
|
|
46
|
+
"@babel/plugin-proposal-decorators": "^7.23.7",
|
|
47
|
+
"@babel/plugin-transform-runtime": "^7.23.7",
|
|
48
|
+
"@babel/preset-env": "^7.23.8",
|
|
49
49
|
"@babel/preset-typescript": "7.15.0",
|
|
50
|
-
"@types/ignore-walk": "^4.0.
|
|
51
|
-
"@types/inquirer": "^8.
|
|
52
|
-
"@types/js-yaml": "^4.0.
|
|
53
|
-
"@types/node": "^16.
|
|
54
|
-
"
|
|
55
|
-
"
|
|
50
|
+
"@types/ignore-walk": "^4.0.3",
|
|
51
|
+
"@types/inquirer": "^8.2.10",
|
|
52
|
+
"@types/js-yaml": "^4.0.9",
|
|
53
|
+
"@types/node": "^16.18.70",
|
|
54
|
+
"@typescript-eslint/eslint-plugin": "^5.62.0",
|
|
55
|
+
"@typescript-eslint/parser": "^5.62.0",
|
|
56
|
+
"eslint": "^8.56.0",
|
|
57
|
+
"eslint-config-google": "^0.14.0",
|
|
58
|
+
"typescript": "^5.3.3",
|
|
59
|
+
"webpack": "^5.89.0",
|
|
60
|
+
"webpack-cli": "^5.1.4"
|
|
56
61
|
}
|
|
57
62
|
}
|