datagrok-tools 4.7.2-beta.2 → 4.7.2

package/bin/_deprecated/upload.js

@@ -1,162 +1,162 @@
-#!/usr/bin/env node
-const argv = require('minimist')(process.argv.slice(2));
-const getFiles = require('node-recursive-directory');
-const fs = require('fs');
-const fetch = require('node-fetch');
-const path = require('path');
-const archiver = require('archiver-promise');
-const walk = require('ignore-walk')
-
-// The script is no longer supported
-console.log(`\`datagrok-upload\` is not available, please use \`grok publish\` instead.
-Run \`grok migrate\` to convert your scripts in \`package.json\` and to copy your keys to \`config.yaml\``);
-console.log(`Exiting with code 1`);
-process.exit(1);
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-
-let mode = argv['_'][1];
-let host = argv['_'][0];
-let rebuild = argv['_'].includes('rebuild');
-
-if (mode !== 'debug' && mode !== 'deploy')
-  return console.log('Mode must be either debug or deploy');
-
-let debug = mode === 'debug';
-
-let keys = {
-  [host]: ''
-};
-
-//get key from keys file
-if (fs.existsSync('upload.keys.json')) {
-  keys = JSON.parse(fs.readFileSync('upload.keys.json'));
-} else {
-  fs.writeFileSync('upload.keys.json', JSON.stringify(keys));
-}
-let devKey = keys[host];
-if (devKey === undefined) {
-  devKey = '';
-  keys[host] = devKey;
-  fs.writeFileSync('upload.keys.json', JSON.stringify(keys));
-}
-
-if (devKey === '')
-  return console.log('Empty developer key. See upload.keys.json file.');
-
-
-//check if package.json exists, get package name
-let packageName = '';
-if (!fs.existsSync('package.json'))
-  return console.log('package.js doesn\'t exists');
-else {
-  let packageJson = JSON.parse(fs.readFileSync('package.json'));
-  packageName = packageJson['name'];
-}
-
-process.on('beforeExit', async () => {
-  let code = 0;
-  try {
-    code = await processPackage()
-
-  } catch (err) {
-    console.log(err);
-    code = 1;
-  }
-  console.log(`Exiting with code ${code}`);
-  process.exit(code);
-});
-
-async function processPackage() {
-//get server timestamps
-  let timestamps = {};
-  if (debug) {
-    try {
-      timestamps = await (await fetch(`${host}/packages/dev/${devKey}/${packageName}/timestamps`)).json();
-      if (timestamps['#type'] === 'ApiError') {
-        console.log(timestamps.message);
-        return 1;
-      }
-    } catch (error) {
-      console.log(error);
-      return 1;
-    }
-  }
-
-  let zip = archiver('zip', {store: false});
-
-//gather files
-  let localTimestamps = {};
-  let files = await walk({
-    path: '.',
-    ignoreFiles: ['.npmignore', '.gitignore'],
-    includeEmpty: true,
-    follow: true
-  });
-
-  if (!rebuild) {
-    const distFiles = await walk({
-      path: './dist',
-      ignoreFiles: [],
-      includeEmpty: true,
-      follow: true
-    });
-    distFiles.forEach((df) => {
-      files.push(`dist/${df}`);
-    })
-  }
-  files.forEach((file) => {
-    let fullPath = file;
-    let relativePath = path.relative(process.cwd(), fullPath);
-    let canonicalRelativePath = relativePath.replace(/\\/g, '/');
-    if (canonicalRelativePath.includes('/.'))
-      return;
-    if (canonicalRelativePath.startsWith('.'))
-      return;
-    if (relativePath.startsWith('node_modules'))
-      return;
-    if (relativePath.startsWith('dist') && rebuild)
-      return;
-    if (relativePath.startsWith('upload.keys.json'))
-      return;
-    if (relativePath === 'zip')
-      return;
-    let t = fs.statSync(fullPath).mtime.toUTCString();
-    localTimestamps[canonicalRelativePath] = t;
-    if (debug && timestamps[canonicalRelativePath] === t) {
-      console.log(`Skipping ${canonicalRelativePath}`);
-      return;
-    }
-    zip.append(fs.createReadStream(fullPath), {name: relativePath});
-    console.log(`Adding ${relativePath}...`);
-  });
-  zip.append(JSON.stringify(localTimestamps), {name: 'timestamps.json'});
-
-//upload
-  let uploadPromise = new Promise((resolve, reject) => {
-      fetch(`${host}/packages/dev/${devKey}/${packageName}?debug=${debug.toString()}&rebuild=${rebuild.toString()}`, {
-        method: 'POST',
-        body: zip
-      }).then(body => body.json()).then(j => resolve(j)).catch(err => {
-        reject(err);
-      });
-    }
-  )
-  await zip.finalize();
-
-  try {
-    let log = await uploadPromise;
-
-    fs.unlinkSync('zip');
-    if (log['#type'] === 'ApiError') {
-      console.log(log['message']);
-      console.log(log['innerMessage']);
-      return 1;
-    } else
-      console.log(log);
-  } catch (error) {
-    console.log(error);
-    return 1;
-  }
-  return 0;
+#!/usr/bin/env node
+const argv = require('minimist')(process.argv.slice(2));
+const getFiles = require('node-recursive-directory');
+const fs = require('fs');
+const fetch = require('node-fetch');
+const path = require('path');
+const archiver = require('archiver-promise');
+const walk = require('ignore-walk')
+
+// The script is no longer supported
+console.log(`\`datagrok-upload\` is not available, please use \`grok publish\` instead.
+Run \`grok migrate\` to convert your scripts in \`package.json\` and to copy your keys to \`config.yaml\``);
+console.log(`Exiting with code 1`);
+process.exit(1);
+
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+
+let mode = argv['_'][1];
+let host = argv['_'][0];
+let rebuild = argv['_'].includes('rebuild');
+
+if (mode !== 'debug' && mode !== 'deploy')
+  return console.log('Mode must be either debug or deploy');
+
+let debug = mode === 'debug';
+
+let keys = {
+  [host]: ''
+};
+
+//get key from keys file
+if (fs.existsSync('upload.keys.json')) {
+  keys = JSON.parse(fs.readFileSync('upload.keys.json'));
+} else {
+  fs.writeFileSync('upload.keys.json', JSON.stringify(keys));
+}
+let devKey = keys[host];
+if (devKey === undefined) {
+  devKey = '';
+  keys[host] = devKey;
+  fs.writeFileSync('upload.keys.json', JSON.stringify(keys));
+}
+
+if (devKey === '')
+  return console.log('Empty developer key. See upload.keys.json file.');
+
+
+//check if package.json exists, get package name
+let packageName = '';
+if (!fs.existsSync('package.json'))
+  return console.log('package.js doesn\'t exists');
+else {
+  let packageJson = JSON.parse(fs.readFileSync('package.json'));
+  packageName = packageJson['name'];
+}
+
+process.on('beforeExit', async () => {
+  let code = 0;
+  try {
+    code = await processPackage()
+
+  } catch (err) {
+    console.log(err);
+    code = 1;
+  }
+  console.log(`Exiting with code ${code}`);
+  process.exit(code);
+});
+
+async function processPackage() {
+//get server timestamps
+  let timestamps = {};
+  if (debug) {
+    try {
+      timestamps = await (await fetch(`${host}/packages/dev/${devKey}/${packageName}/timestamps`)).json();
+      if (timestamps['#type'] === 'ApiError') {
+        console.log(timestamps.message);
+        return 1;
+      }
+    } catch (error) {
+      console.log(error);
+      return 1;
+    }
+  }
+
+  let zip = archiver('zip', {store: false});
+
+//gather files
+  let localTimestamps = {};
+  let files = await walk({
+    path: '.',
+    ignoreFiles: ['.npmignore', '.gitignore'],
+    includeEmpty: true,
+    follow: true
+  });
+
+  if (!rebuild) {
+    const distFiles = await walk({
+      path: './dist',
+      ignoreFiles: [],
+      includeEmpty: true,
+      follow: true
+    });
+    distFiles.forEach((df) => {
+      files.push(`dist/${df}`);
+    })
+  }
+  files.forEach((file) => {
+    let fullPath = file;
+    let relativePath = path.relative(process.cwd(), fullPath);
+    let canonicalRelativePath = relativePath.replace(/\\/g, '/');
+    if (canonicalRelativePath.includes('/.'))
+      return;
+    if (canonicalRelativePath.startsWith('.'))
+      return;
+    if (relativePath.startsWith('node_modules'))
+      return;
+    if (relativePath.startsWith('dist') && rebuild)
+      return;
+    if (relativePath.startsWith('upload.keys.json'))
+      return;
+    if (relativePath === 'zip')
+      return;
+    let t = fs.statSync(fullPath).mtime.toUTCString();
+    localTimestamps[canonicalRelativePath] = t;
+    if (debug && timestamps[canonicalRelativePath] === t) {
+      console.log(`Skipping ${canonicalRelativePath}`);
+      return;
+    }
+    zip.append(fs.createReadStream(fullPath), {name: relativePath});
+    console.log(`Adding ${relativePath}...`);
+  });
+  zip.append(JSON.stringify(localTimestamps), {name: 'timestamps.json'});
+
+//upload
+  let uploadPromise = new Promise((resolve, reject) => {
+      fetch(`${host}/packages/dev/${devKey}/${packageName}?debug=${debug.toString()}&rebuild=${rebuild.toString()}`, {
+        method: 'POST',
+        body: zip
+      }).then(body => body.json()).then(j => resolve(j)).catch(err => {
+        reject(err);
+      });
+    }
+  )
+  await zip.finalize();
+
+  try {
+    let log = await uploadPromise;
+
+    fs.unlinkSync('zip');
+    if (log['#type'] === 'ApiError') {
+      console.log(log['message']);
+      console.log(log['innerMessage']);
+      return 1;
+    } else
+      console.log(log);
+  } catch (error) {
+    console.log(error);
+    return 1;
+  }
+  return 0;
 }

package/bin/commands/link.js

@@ -34,9 +34,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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; }
 
-/**
- * Link: api > utils > other libs - npm install, npm run build, npm link
- * Unlink: npm install in the package and its dependencies, npm unlink
+/**
+ * Link: api > utils > other libs - npm install, npm run build, npm link
+ * Unlink: npm install in the package and its dependencies, npm unlink
  */
 var apiPackageName = 'datagrok-api';
 var libScope = '@datagrok-libraries';
@@ -63,7 +63,7 @@ function link(args) {
     console.log('Running `npm install` to get the required dependencies...\n');
     (0, _child_process.exec)('npm install', function (err, stdout, stderr) {
       if (err) throw err;else console.log(stderr, stdout);
-    }); // todo: wait for completion or ask running the command prior to grok link ?
+    });
   } // The order should start with js-api, then libraries/utils, then other libraries
 
 

package/bin/grok.js

@@ -1,29 +1,29 @@
-#!/usr/bin/env node
-const argv = require('minimist')(process.argv.slice(2), {alias: {k: 'key'}});
-const help = require('./commands/help').help;
-
-const commands = {
-  add: require('./commands/add').add,
-  api: require('./commands/api').api,
-  check: require('./commands/check').check,
-  config: require('./commands/config').config,
-  create: require('./commands/create').create,
-  link: require('./commands/link').link,
-  unlink: require('./commands/link').unlink,
-  publish: require('./commands/publish').publish,
-  test: require('./commands/test').test,
-};
-
-const command = argv['_'][0];
-if (command in commands) {
-  try {
-    if (!commands[command](argv)) {
-      console.log(help[command]);
-    }
-  } catch (err) {
-    console.error(err);
-    console.log(help[command]);
-  }
-} else {
-  console.log(help.help);
-}
+#!/usr/bin/env node
+const argv = require('minimist')(process.argv.slice(2), {alias: {k: 'key'}});
+const help = require('./commands/help').help;
+
+const commands = {
+  add: require('./commands/add').add,
+  api: require('./commands/api').api,
+  check: require('./commands/check').check,
+  config: require('./commands/config').config,
+  create: require('./commands/create').create,
+  link: require('./commands/link').link,
+  unlink: require('./commands/link').unlink,
+  publish: require('./commands/publish').publish,
+  test: require('./commands/test').test,
+};
+
+const command = argv['_'][0];
+if (command in commands) {
+  try {
+    if (!commands[command](argv)) {
+      console.log(help[command]);
+    }
+  } catch (err) {
+    console.error(err);
+    console.log(help[command]);
+  }
+} else {
+  console.log(help.help);
+}

package/bin/utils/test-utils.js

@@ -245,12 +245,12 @@ function _getBrowserPage() {
 function runWithTimeout(timeout, f) {
   return new Promise( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
-      var resolveValue;
+      var timeoutId, resolveValue;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              setTimeout(function () {
+              timeoutId = setTimeout(function () {
                 return reject("Timeout exceeded: ".concat(timeout, " ms"));
               }, timeout);
               _context.next = 3;
@@ -258,9 +258,10 @@ function runWithTimeout(timeout, f) {
 
             case 3:
               resolveValue = _context.sent;
+              clearTimeout(timeoutId);
               resolve(resolveValue);
 
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }

package/config-template.yaml

@@ -1,11 +1,11 @@
-servers:
-  dev:
-    url: 'https://dev.datagrok.ai/api'
-    key: ''
-  public:
-    url: 'https://public.datagrok.ai/api'
-    key: ''
-  local:
-    url: 'http://127.0.0.1:8080/api'
-    key: ''
-default: 'public'
+servers:
+  dev:
+    url: 'https://dev.datagrok.ai/api'
+    key: ''
+  public:
+    url: 'https://public.datagrok.ai/api'
+    key: ''
+  local:
+    url: 'http://127.0.0.1:8080/api'
+    key: ''
+default: 'public'

package/entity-template/app.js

@@ -1,6 +1,6 @@
-
-//name: #{NAME}
-//tags: app
-export function #{NAME}() {
-  grok.shell.info('Hello!');
-}
+
+//name: #{NAME}
+//tags: app
+export function #{NAME}() {
+  grok.shell.info('Hello!');
+}

package/entity-template/connection.json

@@ -1,17 +1,17 @@
-{
-    "name": "#{NAME}",
-    "#type": "DataConnection",
-    "parameters": {
-      "server": "#{GROK_DB_SERVER}",
-      "db": "#{DB_NAME}"
-    },
-    "credentials" : {
-      "parameters": {
-        "login": "#{LOGIN}",
-        "password": "#{PASSWORD}"
-      }
-    },
-    "dataSource": "PostgresDart",
-    "description": "#{DB_NAME} db",
-    "tags": ["demo"]
-}
+{
+    "name": "#{NAME}",
+    "#type": "DataConnection",
+    "parameters": {
+      "server": "#{GROK_DB_SERVER}",
+      "db": "#{DB_NAME}"
+    },
+    "credentials" : {
+      "parameters": {
+        "login": "#{LOGIN}",
+        "password": "#{PASSWORD}"
+      }
+    },
+    "dataSource": "PostgresDart",
+    "description": "#{DB_NAME} db",
+    "tags": ["demo"]
+}

package/entity-template/function.js

@@ -1,9 +1,9 @@
-
-//name: #{NAME}
-//input: string name
-//output: string greeting
-export function #{NAME}(name) {
-  let greeting = 'Hello, ' + name;
-  grok.shell.info(greeting);
-  return greeting;
-}
+
+//name: #{NAME}
+//input: string name
+//output: string greeting
+export function #{NAME}(name) {
+  let greeting = 'Hello, ' + name;
+  grok.shell.info(greeting);
+  return greeting;
+}

package/entity-template/function.ts

@@ -1,9 +1,9 @@
-
-//name: #{NAME}
-//input: string name
-//output: string greeting
-export function #{NAME}(name: string) {
-  let greeting = 'Hello, ' + name;
-  grok.shell.info(greeting);
-  return greeting;
-}
+
+//name: #{NAME}
+//input: string name
+//output: string greeting
+export function #{NAME}(name: string) {
+  let greeting = 'Hello, ' + name;
+  grok.shell.info(greeting);
+  return greeting;
+}

package/entity-template/init.js

@@ -1,4 +1,4 @@
-
-//tags: init
-export async function #{NAME}() {
-}
+
+//tags: init
+export async function #{NAME}() {
+}

package/entity-template/panel.js

@@ -1,11 +1,11 @@
-
-//name: #{NAME}
-//description: Creates an info panel
-//tags: panel
-//input: string smiles {semType: Molecule}
-//output: widget result
-//condition: true
-export function #{NAME}(smiles) {
-  let mol = ui.div(grok.chem.svgMol(smiles));
-  return DG.Widget.fromRoot(mol);
-}
+
+//name: #{NAME}
+//description: Creates an info panel
+//tags: panel
+//input: string smiles {semType: Molecule}
+//output: widget result
+//condition: true
+export function #{NAME}(smiles) {
+  let mol = ui.div(grok.chem.svgMol(smiles));
+  return DG.Widget.fromRoot(mol);
+}

package/entity-template/panel.ts

@@ -1,11 +1,11 @@
-
-//name: #{NAME}
-//description: Creates an info panel
-//tags: panel
-//input: string smiles {semType: Molecule}
-//output: widget result
-//condition: true
-export function #{NAME}(smiles: string) {
-  let mol = ui.div(grok.chem.svgMol(smiles));
-  return DG.Widget.fromRoot(mol);
-}
+
+//name: #{NAME}
+//description: Creates an info panel
+//tags: panel
+//input: string smiles {semType: Molecule}
+//output: widget result
+//condition: true
+export function #{NAME}(smiles: string) {
+  let mol = ui.div(grok.chem.svgMol(smiles));
+  return DG.Widget.fromRoot(mol);
+}

package/entity-template/queries.sql

@@ -1,7 +1,7 @@
-
---name: #{NAME}
---connection: #{CONNECTION}
---input: int id
---output: dataframe result
-select * from country where id = @id
---end
+
+--name: #{NAME}
+--connection: #{CONNECTION}
+--input: int id
+--output: dataframe result
+select * from country where id = @id
+--end

package/entity-template/sem-type-detector.js

@@ -1,11 +1,11 @@
-
-  //tags: semTypeDetector
-  //input: column col
-  //output: string semType
-  detect#{PACKAGE_DETECTORS_NAME}(col) {
-    if (col.name.startsWith('#{NAME_PREFIX}')) {
-      col.semType = '#{NAME}';
-      return col.semType;
-    }
-    return null;
-  }
+
+  //tags: semTypeDetector
+  //input: column col
+  //output: string semType
+  detect#{PACKAGE_DETECTORS_NAME}(col) {
+    if (col.name.startsWith('#{NAME_PREFIX}')) {
+      col.semType = '#{NAME}';
+      return col.semType;
+    }
+    return null;
+  }