datagrok-tools 4.1.20 → 4.2.0

package/bin/commands/publish.js

@@ -56,7 +56,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, distFiles, contentValidationLog, uploadPromise, log;
+    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, uploadPromise, log;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -108,25 +108,26 @@ function _processPackage() {
             _context3.next = 22;
             return (0, _ignoreWalk["default"])({
               path: '.',
-              ignoreFiles: ['.npmignore', '.gitignore'],
+              ignoreFiles: ['.npmignore', '.gitignore', '.grokignore'],
               includeEmpty: false,
               follow: true
             });
 
           case 22:
             files = _context3.sent;
+            isWebpack = _fs["default"].existsSync('webpack.config.js');
 
-            if (!(!rebuild && _fs["default"].existsSync('webpack.config.js'))) {
-              _context3.next = 35;
+            if (!(!rebuild && isWebpack)) {
+              _context3.next = 36;
               break;
             }
 
             if (!_fs["default"].existsSync('dist/package.js')) {
-              _context3.next = 31;
+              _context3.next = 32;
               break;
             }
 
-            _context3.next = 27;
+            _context3.next = 28;
             return (0, _ignoreWalk["default"])({
               path: './dist',
               ignoreFiles: [],
@@ -134,21 +135,21 @@ function _processPackage() {
               follow: true
             });
 
-          case 27:
+          case 28:
             distFiles = _context3.sent;
             distFiles.forEach(function (df) {
               files.push("dist/".concat(df));
             });
-            _context3.next = 35;
+            _context3.next = 36;
             break;
 
-          case 31:
+          case 32:
             console.log("File 'dist/package.js' not found. Building the package on the server side...");
             console.log("Next time, please build your package locally with Webpack beforehand");
             console.log("or run `grok publish` with the `--rebuild` option");
             rebuild = true;
 
-          case 35:
+          case 36:
             contentValidationLog = '';
             files.forEach(function (file) {
               var fullPath = file;
@@ -160,6 +161,11 @@ function _processPackage() {
               if (canonicalRelativePath.startsWith('.')) return;
               if (relativePath.startsWith('node_modules')) return;
               if (relativePath.startsWith('dist') && rebuild) return;
+
+              if (relativePath.startsWith('src') && !rebuild && isWebpack) {
+                if (!relativePath.startsWith('src/package')) return;
+              }
+
               if (relativePath.startsWith('upload.keys.json')) return;
               if (relativePath === 'zip') return;
 
@@ -230,21 +236,21 @@ function _processPackage() {
             })["catch"](function (error) {
               console.error(error);
             });
-            _context3.next = 43;
+            _context3.next = 44;
             return zip.finalize();
 
-          case 43:
-            _context3.prev = 43;
-            _context3.next = 46;
+          case 44:
+            _context3.prev = 44;
+            _context3.next = 47;
             return uploadPromise;
 
-          case 46:
+          case 47:
             log = _context3.sent;
 
             _fs["default"].unlinkSync('zip');
 
             if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 54;
+              _context3.next = 55;
               break;
             }
 
@@ -252,29 +258,29 @@ function _processPackage() {
             console.log(log['innerMessage']);
             return _context3.abrupt("return", 1);
 
-          case 54:
+          case 55:
             console.log(log);
             console.log(contentValidationLog);
 
-          case 56:
-            _context3.next = 62;
+          case 57:
+            _context3.next = 63;
             break;
 
-          case 58:
-            _context3.prev = 58;
-            _context3.t1 = _context3["catch"](43);
+          case 59:
+            _context3.prev = 59;
+            _context3.t1 = _context3["catch"](44);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
 
-          case 62:
+          case 63:
             return _context3.abrupt("return", 0);
 
-          case 63:
+          case 64:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[3, 14], [43, 58]]);
+    }, _callee3, null, [[3, 14], [44, 59]]);
   }));
   return _processPackage.apply(this, arguments);
 }

package/bin/grok.js

@@ -1,26 +1,26 @@
-#!/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,
-  config: require('./commands/config').config,
-  create: require('./commands/create').create,
-  publish: require('./commands/publish').publish,
-  migrate: require('./_deprecated/migrate').migrate
-};
-
-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,
+  config: require('./commands/config').config,
+  create: require('./commands/create').create,
+  publish: require('./commands/publish').publish,
+  migrate: require('./_deprecated/migrate').migrate
+};
+
+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/utils.js

@@ -261,13 +261,7 @@ var dgToTsTypeMap = {
   dataframe: 'DG.DataFrame',
   column: 'DG.Column',
   column_list: 'string[]',
-  file: 'DG.FileInfo' // graphics: '',
-  // datetime: '',
-  // blob: '',
-  // map: '',
-  // list: '',
-  //'list<T>'
-
+  file: 'DG.FileInfo'
 };
 exports.dgToTsTypeMap = dgToTsTypeMap;
 

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": "PostgreSQL",
-    "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": "PostgreSQL",
+    "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;
+  }

package/entity-template/view-class.js

@@ -1,60 +1,60 @@
-import * as grok from 'datagrok-api/grok';
-import * as ui from 'datagrok-api/ui';
-import * as DG from 'datagrok-api/dg';
-
-// A sample class from the Notebooks package:
-// https://github.com/datagrok-ai/public/tree/master/packages/Notebooks
-// This class defines a new view for Jupyter Notebooks.
-export class #{NAME} extends DG.ViewBase {
-  constructor(params, path) {
-    super(params, path);
-    this.TYPE = 'Notebook';
-    this.PATH = '/notebook';
-  }
-
-  // Override basic methods
-  get type() {
-    return this.TYPE;
-  }
-
-  get helpUrl() {
-    return '/help/develop/jupyter-notebook.md';
-  }
-
-  get name() {
-    return 'Notebook';
-  }
-
-  get path() {
-    return `${this.PATH}/${this.notebookId}`;
-  }
-
-  // Icon
-  getIcon() {
-    let img = document.createElement('img');
-    img.src = '/images/entities/jupyter.png';
-    img.height = 18;
-    img.width = 18;
-    return img;
-  }
-
-  // View state serialization/deserialization
-  saveStateMap() {
-    return {'notebookId': this.notebookId};
-  }
-
-  loadStateMap(stateMap) {
-    open(stateMap['notebookId']);
-  }
-
-  // URL path handler
-  handlePath(path) {
-    let id = path.replace(`${this.PATH}/`, '');
-    open(id);
-  }
-
-  // URL path checker
-  acceptsPath(path) {
-    return path.startsWith(this.PATH);
-  }
-}
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+// A sample class from the Notebooks package:
+// https://github.com/datagrok-ai/public/tree/master/packages/Notebooks
+// This class defines a new view for Jupyter Notebooks.
+export class #{NAME} extends DG.ViewBase {
+  constructor(params, path) {
+    super(params, path);
+    this.TYPE = 'Notebook';
+    this.PATH = '/notebook';
+  }
+
+  // Override basic methods
+  get type() {
+    return this.TYPE;
+  }
+
+  get helpUrl() {
+    return '/help/develop/jupyter-notebook.md';
+  }
+
+  get name() {
+    return 'Notebook';
+  }
+
+  get path() {
+    return `${this.PATH}/${this.notebookId}`;
+  }
+
+  // Icon
+  getIcon() {
+    let img = document.createElement('img');
+    img.src = '/images/entities/jupyter.png';
+    img.height = 18;
+    img.width = 18;
+    return img;
+  }
+
+  // View state serialization/deserialization
+  saveStateMap() {
+    return {'notebookId': this.notebookId};
+  }
+
+  loadStateMap(stateMap) {
+    open(stateMap['notebookId']);
+  }
+
+  // URL path handler
+  handlePath(path) {
+    let id = path.replace(`${this.PATH}/`, '');
+    open(id);
+  }
+
+  // URL path checker
+  acceptsPath(path) {
+    return path.startsWith(this.PATH);
+  }
+}

package/entity-template/view-class.ts

@@ -1,64 +1,64 @@
-import * as grok from 'datagrok-api/grok';
-import * as ui from 'datagrok-api/ui';
-import * as DG from 'datagrok-api/dg';
-
-// A sample class from the Notebooks package:
-// https://github.com/datagrok-ai/public/tree/master/packages/Notebooks
-// This class defines a new view for Jupyter Notebooks.
-export class #{NAME} extends DG.ViewBase {
-  TYPE: string;
-  PATH: string;
-  notebookId: any;
-
-  constructor(params: object | null, path: string) {
-    super(params, path);
-    this.TYPE = 'Notebook';
-    this.PATH = '/notebook';
-  }
-
-  // Override basic methods
-  get type() {
-    return this.TYPE;
-  }
-
-  get helpUrl() {
-    return '/help/compute/jupyter-notebook.md';
-  }
-
-  get name() {
-    return 'Notebook';
-  }
-
-  get path() {
-    return `${this.PATH}/${this.notebookId}`;
-  }
-
-  // Icon
-  getIcon() {
-    let img = document.createElement('img');
-    img.src = '/images/entities/jupyter.png';
-    img.height = 18;
-    img.width = 18;
-    return img;
-  }
-
-  // View state serialization/deserialization
-  saveStateMap() {
-    return {'notebookId': this.notebookId};
-  }
-
-  loadStateMap(stateMap: { [x: string]: string }) {
-    open(stateMap['notebookId']);
-  }
-
-  // URL path handler
-  handlePath(path: string) {
-    let id = path.replace(`${this.PATH}/`, '');
-    open(id);
-  }
-
-  // URL path checker
-  acceptsPath(path: string) {
-    return path.startsWith(this.PATH);
-  }
-}
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+// A sample class from the Notebooks package:
+// https://github.com/datagrok-ai/public/tree/master/packages/Notebooks
+// This class defines a new view for Jupyter Notebooks.
+export class #{NAME} extends DG.ViewBase {
+  TYPE: string;
+  PATH: string;
+  notebookId: any;
+
+  constructor(params: object | null, path: string) {
+    super(params, path);
+    this.TYPE = 'Notebook';
+    this.PATH = '/notebook';
+  }
+
+  // Override basic methods
+  get type() {
+    return this.TYPE;
+  }
+
+  get helpUrl() {
+    return '/help/compute/jupyter-notebook.md';
+  }
+
+  get name() {
+    return 'Notebook';
+  }
+
+  get path() {
+    return `${this.PATH}/${this.notebookId}`;
+  }
+
+  // Icon
+  getIcon() {
+    let img = document.createElement('img');
+    img.src = '/images/entities/jupyter.png';
+    img.height = 18;
+    img.width = 18;
+    return img;
+  }
+
+  // View state serialization/deserialization
+  saveStateMap() {
+    return {'notebookId': this.notebookId};
+  }
+
+  loadStateMap(stateMap: { [x: string]: string }) {
+    open(stateMap['notebookId']);
+  }
+
+  // URL path handler
+  handlePath(path: string) {
+    let id = path.replace(`${this.PATH}/`, '');
+    open(id);
+  }
+
+  // URL path checker
+  acceptsPath(path: string) {
+    return path.startsWith(this.PATH);
+  }
+}