datagrok-tools 4.4.0 → 4.4.3

package/bin/commands/create.js

@@ -113,12 +113,12 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
 
         if (jest) {
           Object.assign(_package.devDependencies, {
-            'jest': 'latest',
-            'jest-html-reporter': 'latest',
-            '@types/jest': 'latest',
-            'puppeteer': 'latest'
+            'jest-html-reporter': '^3.5.0',
+            'jest': '^27.0.0',
+            '@types/jest': '^27.0.0'
           }, ts ? {
-            'ts-jest': 'latest'
+            'ts-jest': '^27.0.0',
+            'puppeteer': 'latest'
           } : {});
           Object.assign(_package.scripts, {
             'test': 'jest'
@@ -201,6 +201,7 @@ function create(args) {
 
   if (validName) {
     var packageDir = curDir;
+    var repositoryInfo = null;
 
     if (curFolder !== name) {
       packageDir = _path["default"].join(packageDir, name);
@@ -216,6 +217,40 @@ function create(args) {
       return false;
     }
 
+    (0, _child_process.exec)('git rev-parse --is-inside-work-tree', {
+      cwd: packageDir
+    }, function (err) {
+      if (err) return;
+      var repository = {
+        type: 'git'
+      };
+      (0, _child_process.exec)('git config --get remote.origin.url', {
+        cwd: packageDir
+      }, function (err, stdout) {
+        if (err) return;
+        repository.url = stdout.trim();
+        (0, _child_process.exec)('git rev-parse --show-prefix', {
+          cwd: packageDir
+        }, function (err, stdout) {
+          if (err) return;
+          var prefix = stdout.trim();
+          repository.directory = prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
+          if (repository.type && repository.url && repository.directory) repositoryInfo = repository;
+        });
+      });
+    });
+    process.on('beforeExit', function () {
+      if (repositoryInfo) {
+        var packagePath = _path["default"].join(packageDir, 'package.json');
+
+        var p = JSON.parse(_fs["default"].readFileSync(packagePath, 'utf-8'));
+        p.repository = repositoryInfo;
+
+        _fs["default"].writeFileSync(packagePath, JSON.stringify(p, null, '\t'), 'utf-8');
+      }
+
+      process.exit();
+    });
     createDirectoryContents(name, config, templateDir, packageDir, args.ide, args.ts, args.eslint, args.jest);
     console.log(_entHelpers.help["package"](name, args.ts));
     console.log("\nThe package has the following dependencies:\n".concat(dependencies.join(' '), "\n"));

package/package-template/jest.config.js

@@ -0,0 +1,33 @@
+module.exports = {
+  "roots": [
+    "<rootDir>/src"
+  ],
+  "testMatch": [
+    "**/__jest__/**/*.test.+(ts|tsx)"
+  ],
+  moduleFileExtensions: [
+    'ts',
+    'js',
+  ],
+  "transform": {
+    "^.+\\.(ts|tsx)$": "ts-jest"
+  },
+  transformIgnorePatterns: ['^.+\\.js$'],
+  globals: {
+    'ts-jest': {
+      'tsconfig': {
+          "target": "es6",
+          "module": "es2020",
+      }
+    }
+  },
+  reporters: [
+    "default",
+    [
+      "./node_modules/jest-html-reporter",
+      {
+        "includeConsoleLog": true
+      }
+    ]
+  ]
+}

package/package-template/package.json

@@ -7,7 +7,8 @@
   "dependencies": {
     "datagrok-api": "latest",
     "cash-dom": "latest",
-    "dayjs": "latest"
+    "dayjs": "latest",
+    "@datagrok-libraries/utils": "latest"
   },
   "devDependencies": {
     "webpack": "latest",

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

@@ -0,0 +1,49 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import * as utils from './test-node';
+import puppeteer from 'puppeteer';
+
+const P_START_TIMEOUT: number = 100000;
+let browser: puppeteer.Browser;
+let page: puppeteer.Page;
+
+beforeAll(async () => {
+  let out = await utils.getBrowserPage(puppeteer);
+  browser = out.browser;
+  page = out.page;
+}, P_START_TIMEOUT);
+
+afterAll(async () => {
+  await browser.close();
+});
+
+it('TEST', async () => {
+  const target_package:string = process.env.TARGET_PACKAGE;
+  console.log(`Testing ${target_package} package`);
+
+  //console.log(require('root-require')('package.json').version);
+  let r = await page.evaluate((target_package):Promise<object> => {
+    return new Promise<object>((resolve, reject) => {
+      (<any>window).grok.functions.eval(target_package + ':test()').then((df: any) => {
+        let cStatus = df.columns.byName('success');
+        let cMessage = df.columns.byName('result');
+        let cCat = df.columns.byName('category');
+        let cName = df.columns.byName('name');
+        let failed = false;
+        let report = '';
+        for (let i = 0; i < df.rowCount; i++)
+          if (!cStatus.get(i)) {
+            report += `${cCat.get(i)}.${cName.get(i)}: ${cMessage.get(i)}\n`;
+            failed = true;
+          }
+        resolve({report, failed});
+      }).catch((e: any) => reject(e));
+    });
+  }, target_package);
+  // @ts-ignore
+  console.log(r.report);
+  // @ts-ignore
+  expect(r.failed).toBe(false);
+}, 100000);

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

@@ -0,0 +1,96 @@
+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.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');
+    await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 100000});
+  } catch (error) {
+    throw error;
+  }
+  return {browser, page};
+}
+
+
+interface Config {
+  servers: {
+    [alias: string]: {
+      url: string,
+      key: string
+    }
+  },
+  default: string,
+}
+
+interface Indexable { [key: string]: any }

package/package-template/src/package-test.js

@@ -1,7 +1,6 @@
 import * as DG from "datagrok-api/dg";
 import * as grok from "datagrok-api/grok";
 import {runTests} from "@datagrok-libraries/utils/src/test";
-import "./tests/chem-tests";
 
 export let _package = new DG.Package();
 

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

@@ -1,7 +1,6 @@
 import * as DG from "datagrok-api/dg";
 import * as grok from "datagrok-api/grok";
 import {runTests, tests} from '@datagrok-libraries/utils/src/test';
-import "./tests/chem-tests";
 
 export let _package = new DG.Package();
 export {tests}

package/package.json

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