datagrok-tools 4.7.0 → 4.7.1

package/{package-template/src/__jest__ → __jest__}/remote.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import * as utils from './test-node';
+import * as utils from '../bin/utils/test-utils';
 import puppeteer from 'puppeteer';
 
 const P_START_TIMEOUT: number = 3600000;
@@ -16,7 +16,7 @@ beforeAll(async () => {
 }, P_START_TIMEOUT);
 
 afterAll(async () => {
-  await browser.close();
+  await browser?.close();
 });
 
 expect.extend({
@@ -42,16 +42,23 @@ it('TEST', async () => {
   let r = await page.evaluate((targetPackage):Promise<object> => {
     return new Promise<object>((resolve, reject) => {
       (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
+        let failed = false;
+        let skipReport = '';
+        let passReport = '';
+        let failReport = '';
+
+        if (df == null) {
+          failed = true;
+          failReport = 'Fail reason: No package tests found';
+          resolve({failReport, skipReport, passReport, failed});
+        }
+
         const cStatus = df.columns.byName('success');
         const cSkipped = df.columns.byName('skipped');
         const cMessage = df.columns.byName('result');
         const cCat = df.columns.byName('category');
         const cName = df.columns.byName('name');
         const cTime = df.columns.byName('ms');
-        let failed = false;
-        let skipReport = '';
-        let passReport = '';
-        let failReport = '';
         for (let i = 0; i < df.rowCount; i++) {
           if (cStatus.get(i)) {
             if (cSkipped.get(i)) {

package/bin/commands/create.js

@@ -118,20 +118,8 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
           Object.assign(_package.dependencies, {
             '@datagrok-libraries/utils': 'latest'
           });
-          Object.assign(_package.devDependencies, {
-            'jest-html-reporter': '^3.5.0',
-            'jest': '^27.0.0',
-            '@types/jest': '^27.0.0',
-            'js-yaml': '^4.1.0',
-            '@types/js-yaml': "^4.0.5",
-            '@types/node-fetch': '^2.6.2',
-            'node-fetch': '^2.6.7'
-          }, ts ? {
-            'ts-jest': '^27.0.0',
-            'puppeteer': '^13.7.0'
-          } : {});
           Object.assign(_package.scripts, {
-            'test': 'jest'
+            'test': 'grok test'
           });
         } // Save module names for installation prompt
 
@@ -152,9 +140,6 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
       if (file === 'package-test.ts' && !ts) return false;
       if (file === 'tsconfig.json' && !ts) return false;
       if (file === 'ts.webpack.config.js') return false;
-      if (file === 'remote.test.ts' && (!ts || !jest)) return false;
-      if (file === 'test-node.ts' && (!ts || !jest)) return false;
-      if (file === 'jest.config.js' && !jest) return false;
 
       if (file === '.eslintrc.json') {
         if (!eslint) return false;

package/bin/commands/test.js

@@ -71,6 +71,7 @@ function test(args) {
   var fullName = packageData.friendlyName || packageData.fullName;
 
   if (fullName) {
+    fullName = utils.kebabToCamelCase(fullName);
     process.env.TARGET_PACKAGE = fullName;
     console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
   } else {
@@ -78,18 +79,27 @@ function test(args) {
     return false;
   }
 
-  color.info("Publishing package \"".concat(process.env.TARGET_PACKAGE, "\" to ").concat(process.env.HOST, "..."));
-  (0, _child_process.exec)("grok publish ".concat(process.platform === 'win32' ? '%HOST%' : '${HOST}'), function (err, stdout, stderr) {
+  color.info("Building package...");
+  (0, _child_process.exec)('npm run build', function (err, stdout, stderr) {
     if (err) throw err;else {
       console.log(stdout);
-      color.error(stderr);
+      color.warn(stderr);
     }
-    color.info('Starting tests...');
-    (0, _child_process.exec)('npm run test', function (err, stdout, stderr) {
+    color.info("Publishing package \"".concat(process.env.TARGET_PACKAGE, "\" to ").concat(process.env.HOST, "..."));
+    (0, _child_process.exec)("grok publish ".concat(process.platform === 'win32' ? '%HOST%' : '${HOST}'), function (err, stdout, stderr) {
       if (err) throw err;else {
         console.log(stdout);
-        console.log(stderr);
+        color.warn(stderr);
       }
+      color.info('Starting tests...');
+      (0, _child_process.exec)('npm run test', {
+        cwd: _path["default"].dirname(_path["default"].dirname(__dirname))
+      }, function (err, stdout, stderr) {
+        if (err) throw err;else {
+          console.log(stdout);
+          console.log(stderr);
+        }
+      });
     });
   });
   return true;

package/bin/utils/test-utils.js

@@ -0,0 +1,242 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getBrowserPage = getBrowserPage;
+exports.getDevKey = getDevKey;
+exports.getToken = getToken;
+exports.getWebUrl = getWebUrl;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _os = _interopRequireDefault(require("os"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _jsYaml = _interopRequireDefault(require("js-yaml"));
+
+var utils = _interopRequireWildcard(require("../utils/utils"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var fetch = require('node-fetch');
+
+var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
+
+var confPath = _path["default"].join(grokDir, 'config.yaml');
+
+function getToken(_x, _x2) {
+  return _getToken.apply(this, arguments);
+}
+
+function _getToken() {
+  _getToken = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url, key) {
+    var response, json;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return fetch("".concat(url, "/users/login/dev/").concat(key), {
+              method: 'POST'
+            });
+
+          case 2:
+            response = _context.sent;
+            _context.next = 5;
+            return response.json();
+
+          case 5:
+            json = _context.sent;
+
+            if (!(json.isSuccess == true)) {
+              _context.next = 10;
+              break;
+            }
+
+            return _context.abrupt("return", json.token);
+
+          case 10:
+            throw 'Unable to login to server. Check your dev key';
+
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getToken.apply(this, arguments);
+}
+
+function getWebUrl(_x3, _x4) {
+  return _getWebUrl.apply(this, arguments);
+}
+
+function _getWebUrl() {
+  _getWebUrl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(url, token) {
+    var response, json;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return fetch("".concat(url, "/admin/plugins/admin/settings"), {
+              headers: {
+                Authorization: token
+              }
+            });
+
+          case 2:
+            response = _context2.sent;
+            _context2.next = 5;
+            return response.json();
+
+          case 5:
+            json = _context2.sent;
+            return _context2.abrupt("return", json.settings.webRoot);
+
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _getWebUrl.apply(this, arguments);
+}
+
+function getDevKey(hostKey) {
+  var config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, 'utf8'));
+
+  var host = hostKey == '' ? config["default"] : hostKey;
+  host = host.trim();
+  var urls = utils.mapURL(config);
+  var key = '';
+  var url = '';
+
+  try {
+    var _url = new URL(host).href;
+    if (_url.endsWith('/')) _url = _url.slice(0, -1);
+    if (_url in urls) key = config['servers'][urls[_url]]['key'];
+  } catch (error) {
+    if (config['servers'][host] == null) throw "Unknown server alias. Please add it to ".concat(confPath);
+    url = config['servers'][host]['url'];
+    key = config['servers'][host]['key'];
+  }
+
+  return {
+    url: url,
+    key: key
+  };
+}
+
+function getBrowserPage(_x5) {
+  return _getBrowserPage.apply(this, arguments);
+}
+
+function _getBrowserPage() {
+  _getBrowserPage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(puppeteer) {
+    var _process$env$HOST;
+
+    var url, cfg, key, token, browser, page;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            url = (_process$env$HOST = process.env.HOST) !== null && _process$env$HOST !== void 0 ? _process$env$HOST : '';
+            cfg = getDevKey(url);
+            url = cfg.url;
+            key = cfg.key;
+            _context3.next = 6;
+            return getToken(url, key);
+
+          case 6:
+            token = _context3.sent;
+            _context3.next = 9;
+            return getWebUrl(url, token);
+
+          case 9:
+            url = _context3.sent;
+            console.log("Using web root: ".concat(url));
+            _context3.next = 13;
+            return puppeteer.launch({
+              args: ['--disable-dev-shm-usage', '--disable-features=site-per-process'],
+              ignoreHTTPSErrors: true
+            });
+
+          case 13:
+            browser = _context3.sent;
+            _context3.next = 16;
+            return browser.newPage();
+
+          case 16:
+            page = _context3.sent;
+            _context3.next = 19;
+            return page.setDefaultNavigationTimeout(0);
+
+          case 19:
+            _context3.next = 21;
+            return page["goto"]("".concat(url, "/oauth/"));
+
+          case 21:
+            _context3.next = 23;
+            return page.setCookie({
+              name: 'auth',
+              value: token
+            });
+
+          case 23:
+            _context3.next = 25;
+            return page.evaluate(function (token) {
+              window.localStorage.setItem('auth', token);
+            }, token);
+
+          case 25:
+            _context3.next = 27;
+            return page["goto"](url);
+
+          case 27:
+            _context3.prev = 27;
+            _context3.next = 30;
+            return page.waitForFunction(function () {
+              return document.querySelector('.grok-preloader') == null;
+            }, {
+              timeout: 3600000
+            });
+
+          case 30:
+            _context3.next = 35;
+            break;
+
+          case 32:
+            _context3.prev = 32;
+            _context3.t0 = _context3["catch"](27);
+            throw _context3.t0;
+
+          case 35:
+            return _context3.abrupt("return", {
+              browser: browser,
+              page: page
+            });
+
+          case 36:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3, null, [[27, 32]]);
+  }));
+  return _getBrowserPage.apply(this, arguments);
+}

package/entity-template/connection.json

@@ -11,7 +11,7 @@
         "password": "#{PASSWORD}"
       }
     },
-    "dataSource": "PostgreSQL",
+    "dataSource": "PostgresDart",
     "description": "#{DB_NAME} db",
     "tags": ["demo"]
 }

package/{package-template/jest.config.js → jest.config.js}

@@ -1,7 +1,4 @@
 module.exports = {
-  "roots": [
-    "<rootDir>/src"
-  ],
   "testMatch": [
     "**/__jest__/**/*.test.+(ts|tsx)"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -10,17 +10,22 @@
     "fs": "latest",
     "ignore-walk": "^3.0.3",
     "inquirer": "^7.1.0",
+    "jest": "^27.0.0",
+    "jest-html-reporter": "^3.5.0",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.5",
     "node-fetch": "^2.6.0",
     "node-recursive-directory": "^1.2.0",
     "os": "^0.1.1",
-    "path": "^0.12.7"
+    "path": "^0.12.7",
+    "puppeteer": "^13.7.0",
+    "ts-jest": "^27.0.0"
   },
   "scripts": {
     "link": "npm link",
     "prepublishOnly": "babel bin --extensions .ts -d bin",
-    "babel": "babel bin --extensions .ts -d bin"
+    "babel": "babel bin --extensions .ts -d bin",
+    "test": "jest"
   },
   "bin": {
     "datagrok-upload": "./bin/_deprecated/upload.js",
@@ -43,6 +48,7 @@
     "@babel/preset-typescript": "7.15.0",
     "@types/ignore-walk": "^4.0.0",
     "@types/inquirer": "^8.1.3",
+    "@types/jest": "^27.0.0",
     "@types/js-yaml": "^4.0.4",
     "@types/node": "^16.11.6",
     "webpack": "^4.43.0",

package/package-template/src/__jest__/test-node.ts

@@ -1,97 +0,0 @@
-import * as path from "path";
-import * as os from "os";
-import * as fs from "fs";
-// @ts-ignore
-import * as yaml from 'js-yaml';
-const fetch = require('node-fetch');
-
-export async function getToken(url: string, key: string) {
-  let response = await fetch(`${url}/users/login/dev/${key}`, {method: 'POST'});
-  let json = await response.json();
-  if (json.isSuccess == true)
-    return json.token;
-  else
-    throw 'Unable to login to server. Check your dev key';
-}
-
-export async function getWebUrl(url: string, token: string) {
-  let response = await fetch(`${url}/admin/plugins/admin/settings`, {headers: {Authorization: token}});
-  let json = await response.json();
-  return json.settings.webRoot;
-}
-
-const grokDir = path.join(os.homedir(), '.grok');
-const confPath = path.join(grokDir, 'config.yaml');
-
-function mapURL(conf: Config): Indexable {
-  let urls: Indexable = {};
-  for (let server in conf.servers) {
-    urls[conf['servers'][server]['url']] = conf['servers'][server];
-  }
-  return urls;
-}
-
-export function getDevKey(hostKey: string): {url: string, key: string} {
-  let config = yaml.load(fs.readFileSync(confPath, 'utf8')) as any;
-  let host = hostKey == '' ? config.default : hostKey;
-  host = host.trim();
-  let urls = mapURL(config);
-  let key = '';
-  let url = '';
-  try {
-    let url = new URL(host).href;
-    if (url.endsWith('/')) url = url.slice(0, -1);
-    if (url in urls) key = config['servers'][urls[url]]['key'];
-  } catch (error) {
-    if (config['servers'][host] == null)
-      throw `Unknown server alias. Please add it to ${confPath}`;
-    url = config['servers'][host]['url'];
-    key = config['servers'][host]['key'];
-  }
-  return {url, key};
-}
-
-export async function getBrowserPage(puppeteer: any): Promise<{browser: any, page: any}> {
-  let url:string = process.env.HOST ?? '';
-  let cfg = getDevKey(url);
-  url = cfg.url;
-
-  let key = cfg.key;
-  let token = await getToken(url, key);
-  url = await getWebUrl(url, token);
-  console.log(`Using web root: ${url}`);
-
-  let browser = await puppeteer.launch({
-    args: ['--disable-dev-shm-usage', '--disable-features=site-per-process'],
-    ignoreHTTPSErrors: true,
-  });
-
-  let page = await browser.newPage();
-  await page.setDefaultNavigationTimeout(0);
-  await page.goto(`${url}/oauth/`);
-  await page.setCookie({name: 'auth', value: token});
-  await page.evaluate((token: any) => {
-    window.localStorage.setItem('auth', token);
-  }, token);
-  await page.goto(url);
-  try {
-//    await page.waitForSelector('.grok-preloader', { timeout: 1800000 });
-    await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 3600000});
-  } catch (error) {
-    throw error;
-  }
-  return {browser, page};
-}
-
-
-interface Config {
-  servers: {
-    [alias: string]: {
-      url: string,
-      key: string
-    }
-  },
-  default: string,
-}
-
-interface Indexable { [key: string]: any }