datagrok-tools 6.7.0 → 6.7.2

package/bin/utils/utils.js

@@ -23,6 +23,7 @@ exports.headerTags = void 0;
 exports.isConnectivityError = isConnectivityError;
 exports.isEmpty = isEmpty;
 exports.isPackageDir = isPackageDir;
+exports.isPnpmWorkspace = isPnpmWorkspace;
 exports.isValidCron = isValidCron;
 exports.jsExtention = void 0;
 exports.kebabToCamelCase = kebabToCamelCase;
@@ -301,6 +302,14 @@ function isConnectivityError(error) {
   const msg = (error?.message ?? '').toLowerCase() + ' ' + (error?.code ?? '').toLowerCase();
   return ['econnrefused', 'enotfound', 'etimedout', 'eai_again', 'econnreset', 'fetch failed', 'network error'].some(token => msg.includes(token));
 }
+
+/** True when `dir` is inside a pnpm workspace (a pnpm-workspace.yaml in it or above it). */
+function isPnpmWorkspace(dir) {
+  for (let d = _path.default.resolve(dir);; d = _path.default.dirname(d)) {
+    if (_fs.default.existsSync(_path.default.join(d, 'pnpm-workspace.yaml'))) return true;
+    if (_path.default.dirname(d) === d) return false;
+  }
+}
 async function runScript(script, path, verbose = false) {
   try {
     const {

package/package-template/.vscode/tasks.json

@@ -3,7 +3,7 @@
   "tasks": [
     {
       "type": "shell",
-      "command": "cmd.exe /c 'call webpack && call grok publish #{GROK_HOST_ALIAS}'",
+      "command": "cmd.exe /c 'call pnpm run build && call grok publish #{GROK_HOST_ALIAS}'",
       "label": "rebuild"
     }
   ]

package/package-template/package.json

@@ -4,21 +4,16 @@
   "version": "0.0.1",
   "description": "#{PACKAGE_NAME} package",
   "dependencies": {
-    "datagrok-api": "^1.26.0",
-    "cash-dom": "^8.1.5",
-    "dayjs": "^1.11.13",
-    "@datagrok-libraries/test": "^1.1.0"
-  },
-  "devDependencies": {
-    "datagrok-tools": "^5.1.5",
-    "webpack": "^5.95.0",
-    "webpack-cli": "^5.1.4"
+    "datagrok-api": "workspace:^",
+    "cash-dom": "catalog:",
+    "dayjs": "catalog:",
+    "rxjs": "catalog:",
+    "@datagrok-libraries/test": "workspace:^"
   },
   "scripts": {
-    "debug-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish",
-    "release-#{PACKAGE_NAME_LOWERCASE}": "webpack && grok publish --release",
-    "build-#{PACKAGE_NAME_LOWERCASE}": "webpack",
-    "build": "grok api && grok check --soft && webpack",
+    "build": "grok build",
+    "typecheck": "grok tsc --noEmit -p tsconfig.json",
+    "lint": "eslint --ext .ts,.tsx src",
     "test": "grok test"
   },
   "canEdit": [
@@ -27,4 +22,4 @@
   "canView": [
     "All users"
   ]
-}
+}

package/package-template/tsconfig.json

@@ -1,71 +1,4 @@
 {
-  "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": ["ES2022", "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": "bundler",                  /* Specify how TypeScript looks up a file from a given module specifier. Use 'bundler' for webpack/rollup/etc. */
-    // "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": true,                          /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true,        /* Disallow inconsistently-cased references to the same file. */
-  }
+  "extends": "@datagrok/build-config/tsconfig.base.json",
+  "include": ["src"]
 }

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/datagrok-ai/public.git"
   },
-  "version": "6.7.0",
+  "version": "6.7.2",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -16,7 +16,6 @@
     "adm-zip": "^0.6.0",
     "ajv": "^8.20.0",
     "archiver": "^7.0.1",
-    "datagrok-api": "^1.27.6",
     "estraverse": "^5.3.0",
     "glob": "^13.0.6",
     "ignore-walk": "^6.0.5",
@@ -26,20 +25,9 @@
     "node-fetch": "^2.7.0",
     "papaparse": "^5.5.3",
     "puppeteer": "^24.15.0",
-    "ts-morph": "^28.0.0"
-  },
-  "scripts": {
-    "link": "npm link",
-    "prepublishOnly": "node build.js",
-    "babel": "node build.js",
-    "build": "node build.js",
-    "update:ivp-parser": "esbuild plugins/ivp-parser.entry.mjs --bundle --format=cjs --platform=node --alias:diff-grok=../libraries/compute-utils/node_modules/diff-grok --outfile=plugins/ivp-parser.bundle.cjs",
-    "debug-source-map": "node build.js --source-maps",
-    "test": "vitest run --project unit",
-    "test:server": "vitest run --project unit bin/__tests__/node-dapi bin/__tests__/server bin/__tests__/migrate bin/__tests__/keypair",
-    "test:watch": "vitest --project unit",
-    "test:integration": "vitest run --project integration",
-    "test:all": "vitest run"
+    "ts-morph": "^28.0.0",
+    "@babel/generator": "^7.29.0",
+    "datagrok-api": "^1.27.11"
   },
   "bin": {
     "datagrok-upload": "./bin/_deprecated/upload.js",
@@ -94,5 +82,17 @@
     "archiver-utils": {
       "glob": "$glob"
     }
+  },
+  "scripts": {
+    "link": "npm link",
+    "babel": "node build.js",
+    "build": "node build.js",
+    "update:ivp-parser": "esbuild plugins/ivp-parser.entry.mjs --bundle --format=cjs --platform=node --alias:diff-grok=../libraries/compute-utils/node_modules/diff-grok --outfile=plugins/ivp-parser.bundle.cjs",
+    "debug-source-map": "node build.js --source-maps",
+    "test": "vitest run --project unit",
+    "test:server": "vitest run --project unit bin/__tests__/node-dapi bin/__tests__/server bin/__tests__/migrate bin/__tests__/keypair",
+    "test:watch": "vitest --project unit",
+    "test:integration": "vitest run --project integration",
+    "test:all": "vitest run"
   }
-}
+}

package/plugins/func-gen-plugin.js

@@ -1,8 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 
-const tsParser = require('@typescript-eslint/typescript-estree');
-const generate = require('@babel/generator').default;
+// Loaded on first use: the parser and generator cost ~0.3 s, and the plugin is instantiated by every
+// bundle whether or not a file changed.
+let _tsParser; let _generate;
+const tsParser = {parse: (...a) => (_tsParser ??= require('@typescript-eslint/typescript-estree')).parse(...a)};
+const generate = (...a) => (_generate ??= require('@babel/generator').default)(...a);
 
 const {
   reservedDecorators,
@@ -15,9 +18,11 @@ const {
   inputOptionsNames,
 } = require('../bin/utils/func-generation');
 
-const {toCamelCase} = require('../bin/commands/migrate');
+// Not imported from commands/migrate: that module loads ts-morph (~1.5 s) at require time.
+const toCamelCase = (s) => s.split('-').map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join('');
 
-const {api} = require('../bin/commands/api');
+let _api;
+const api = (...a) => (_api ??= require('../bin/commands/api').api)(...a);
 
 // Prebuilt CJS bundle of diff-grok's IVP parser (`getIVP` + a couple constants), tree-shaken
 // to exclude the script-code generator. Regenerate with `npm run update:ivp-parser`.

package/turbo.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "dependsOn": []
+    }
+  }
+}

package/package-template/.eslintrc.json

@@ -1,38 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2022": true
-  },
-  "extends": [
-    "google"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 12,
-    "sourceType": "module"
-  },
-  "rules": {
-    "indent": [
-      "error",
-      2
-    ],
-    "max-len": [
-      "error",
-      120
-    ],
-    "require-jsdoc": "off",
-    "spaced-comment": "off",
-    "linebreak-style": "off",
-    "curly": [
-      "error",
-      "multi-or-nest"
-    ],
-    "brace-style": [
-      "error",
-      "1tbs",
-      {
-        "allowSingleLine": true
-      }
-    ],
-    "block-spacing": 2
-  }
-}

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

@@ -1,46 +0,0 @@
-const path = require('path');
-const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
-const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
-
-module.exports = {
-  cache: {
-    type: 'filesystem',
-  },
-  mode: 'development',
-  entry: {
-    test: {filename: 'package-test.js', library: {type: 'var', name: `${packageName}_test`}, import: './src/package-test.ts'},
-    package: './src/package.ts',
-  },
-  resolve: {
-    symlinks: false,
-    extensions: ['.wasm', '.mjs', '.ts', '.json', '.js', '.tsx'],
-  },
-  module: {
-    rules: [
-      {test: /\.tsx?$/, loader: 'ts-loader', options: {allowTsInNodeModules: true}},
-    ],
-  },
-  plugins: [
-    new FuncGeneratorPlugin({outputPath: './src/package.g.ts'}),
-  ],
-  devtool: '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',
-    'exceljs': 'ExcelJS',
-    'html2canvas': 'html2canvas',
-  },
-  output: {
-    filename: '[name].js',
-    library: packageName,
-    libraryTarget: 'var',
-    path: path.resolve(__dirname, 'dist'),
-  },
-};

package/package-template/webpack.config.js

@@ -1,35 +0,0 @@
-const path = require('path');
-const packageName = path.parse(require('./package.json').name).name.toLowerCase().replace(/-/g, '');
-const FuncGeneratorPlugin = require('datagrok-tools/plugins/func-gen-plugin');
-module.exports = {
-  cache: {
-    type: 'filesystem',
-  },
-  mode: 'production',
-  entry: {
-    package: './src/package.js',
-  },
-  devtool: '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',
-    'exceljs': 'ExcelJS',
-    'html2canvas': 'html2canvas',
-  },
-  output: {
-    filename: '[name].js',
-    library: packageName,
-    libraryTarget: 'var',
-    path: path.resolve(__dirname, 'dist'),
-  },
-  plugins: [
-    new FuncGeneratorPlugin({outputPath: './src/package.g.ts'}),
-  ],
-};