datagrok-tools 4.1.20 → 4.3.0

package/bin/commands/create.js

@@ -123,6 +123,8 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
       }
 
       if (file === 'package.js' && ts) copyFilePath = _path["default"].join(packageDir, 'package.ts');
+      if (file === 'package-test.js' && ts) return false;
+      if (file === 'package-test.ts' && !ts) return false;
       if (file === 'tsconfig.json' && !ts) return false;
       if (file === 'ts.webpack.config.js') return false;
 

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') && !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/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/package-template/.eslintrc.json

@@ -29,7 +29,10 @@
     "brace-style": [
       "error",
       "1tbs",
-      { "allowSingleLine": true }
-    ]
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "block-spacing": 2
   }
-}
+}

package/package-template/package.json

@@ -14,9 +14,16 @@
     "webpack-cli": "latest"
   },
   "scripts": {
-    "debug-#{PACKAGE_NAME_LOWERCASE}": "grok publish --rebuild",
-    "release-#{PACKAGE_NAME_LOWERCASE}": "grok publish --rebuild --release",
+    "link-all": "",
+    "debug-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish ",
+    "release-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish --release",
     "build-#{PACKAGE_NAME_LOWERCASE}": "webpack",
     "build": "webpack"
-  }
+  },
+  "canEdit": [
+    "Developers"
+  ],
+  "canView": [
+    "All users"
+  ]
 }

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

@@ -0,0 +1,13 @@
+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();
+
+//name: test
+//output: dataframe result
+export async function test() {
+  let data = await runTests();
+  return DG.DataFrame.fromObjects(data);
+}

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

@@ -0,0 +1,14 @@
+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}
+
+//name: test
+//output: dataframe result
+export async function test(): Promise<DG.DataFrame> {
+  let data = await runTests();
+  return DG.DataFrame.fromObjects(data)!;
+}

package/package-template/src/package.js

@@ -1,11 +1,11 @@
-/* Do not change these import lines to match external modules in webpack configuration */
-import * as grok from 'datagrok-api/grok';
-import * as ui from 'datagrok-api/ui';
-import * as DG from 'datagrok-api/dg';
-
-export const _package = new DG.Package();
-
-//name: test
-export function test() {
-  grok.shell.info(_package.webRoot);
-}
+/* Do not change these import lines to match external modules in webpack configuration */
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+export const _package = new DG.Package();
+
+//name: info
+export function info() {
+  grok.shell.info(_package.webRoot);
+}

package/package-template/ts.webpack.config.js

@@ -1,34 +1,36 @@
-const path = require('path');
-
-module.exports = {
-  mode: 'development',
-  entry: {
-    package: './src/package.ts'
-  },
-  resolve: {
-    extensions: ['.wasm', '.mjs', '.js', '.json', '.ts', '.tsx'],
-  },
-  module: {
-    rules: [
-      { test: /\.tsx?$/, loader: 'ts-loader' }
-    ],
-  },
-  devtool: 'inline-source-map',
-  externals: {
-    'datagrok-api/dg': 'DG',
-    'datagrok-api/grok': 'grok',
-    'datagrok-api/ui': 'ui',
-    'openchemlib/full.js': 'OCL',
-    'rxjs': 'rxjs',
-    'rxjs/operators': 'rxjs.operators',
-    'cash-dom': '$',
-    'dayjs': 'dayjs',
-    'wu': 'wu',
-  },
-  output: {
-    filename: '[name].js',
-    library: '#{PACKAGE_NAME_LOWERCASE_WORD}',
-    libraryTarget: 'var',
-    path: path.resolve(__dirname, 'dist'),
-  },
-};
+const path = require('path');
+const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
+
+module.exports = {
+  mode: 'development',
+  entry: {
+    test: {filename: 'package-test.js', library: {type: 'var', name:`${packageName}_test`}, import: './src/package-test.ts'},
+    package: './src/package.ts'
+  },
+  resolve: {
+    extensions: ['.wasm', '.mjs', '.js', '.json', '.ts', '.tsx'],
+  },
+  module: {
+    rules: [
+      { test: /\.tsx?$/, loader: 'ts-loader' }
+    ],
+  },
+  devtool: 'inline-source-map',
+  externals: {
+    'datagrok-api/dg': 'DG',
+    'datagrok-api/grok': 'grok',
+    'datagrok-api/ui': 'ui',
+    'openchemlib/full.js': 'OCL',
+    'rxjs': 'rxjs',
+    'rxjs/operators': 'rxjs.operators',
+    'cash-dom': '$',
+    'dayjs': 'dayjs',
+    'wu': 'wu',
+  },
+  output: {
+    filename: '[name].js',
+    library: packageName,
+    libraryTarget: 'var',
+    path: path.resolve(__dirname, 'dist'),
+  },
+};

package/package-template/tsconfig.json

@@ -1,71 +1,71 @@
-{
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es6",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "es2020",                             /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    "lib": ["es2020", "dom"],                       /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                             /* Allow javascript files to be compiled. */
-    // "checkJs": true,                             /* Report errors in .js files. */
-    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
-    // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                           /* Generates corresponding '.map' file. */
-    // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    // "outDir": "./",                              /* Redirect output structure to the directory. */
-    // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                           /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
-    // "removeComments": true,                      /* Do not emit comments to output. */
-    // "noEmit": true,                              /* Do not emit outputs. */
-    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,                  /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                                 /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                    /* Enable strict null checks. */
-    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
-    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
-    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",                     /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                             /* List of folders to include type definitions from. */
-    // "types": [],                                 /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": false,                          /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
-  }
-}
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                         /* Enable incremental compilation */
+    "target": "es6",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "es2020",                             /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "lib": ["es2020", "dom"],                       /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                             /* Allow javascript files to be compiled. */
+    // "checkJs": true,                             /* Report errors in .js files. */
+    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+    // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                           /* Generates corresponding '.map' file. */
+    // "outFile": "./",                             /* Concatenate and emit output to single file. */
+    // "outDir": "./",                              /* Redirect output structure to the directory. */
+    // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                           /* Enable project compilation */
+    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
+    // "removeComments": true,                      /* Do not emit comments to output. */
+    // "noEmit": true,                              /* Do not emit outputs. */
+    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,                  /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                                 /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                    /* Enable strict null checks. */
+    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
+    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
+    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
+    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
+
+    /* Module Resolution Options */
+    "moduleResolution": "node",                     /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                             /* List of folders to include type definitions from. */
+    // "types": [],                                 /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": false,                          /* Skip type checking of declaration files. */
+    "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
+  }
+}

package/package-template/webpack.config.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
 
 module.exports = {
   mode: 'development',
@@ -19,7 +20,7 @@ module.exports = {
   },
   output: {
     filename: '[name].js',
-    library: '#{PACKAGE_NAME_LOWERCASE_WORD}',
+    library: packageName,
     libraryTarget: 'var',
     path: path.resolve(__dirname, 'dist'),
   },

package/package.json

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