datagrok-tools 6.7.0 → 6.7.1

package/bin/commands/link.js

@@ -30,11 +30,21 @@ while (_path.default.dirname(dirStep) !== dirStep) {
   }
   dirStep = _path.default.dirname(dirStep);
 }
+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;
+  }
+}
 let verbose = false;
 let pathMode = false;
 let devMode = false;
 let unlink = false;
 async function link(args) {
+  if (isPnpmWorkspace(curDir)) {
+    console.log('This checkout is a pnpm workspace: in-repo dependencies are linked by `pnpm install` ' + '(workspace:^), and `grok link` is not needed. Run `pnpm install` at the repository root.');
+    return true;
+  }
   verbose = args.verbose ?? false;
   devMode = args.dev ?? false;
   pathMode = args.path ?? false;

package/bin/commands/publish.js

@@ -526,7 +526,10 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
     includeEmpty: false,
     follow: true
   });
-  const isWebpack = _fs.default.existsSync('webpack.config.js');
+
+  // A bundled package ships dist/package.js: built by webpack (legacy) or by `grok build`
+  // (rspack via @datagrok/build-config, which needs no config file at all).
+  const isWebpack = _fs.default.existsSync('webpack.config.js') || _fs.default.existsSync('rspack.config.js') || _fs.default.existsSync('dist/package.js') || _fs.default.existsSync(_path.default.join(curDir, 'src', 'package.ts'));
   if (!rebuild && isWebpack) {
     if (_fs.default.existsSync('dist/package.js')) {
       const distFiles = await (0, _ignoreWalk.default)({
@@ -550,12 +553,6 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
   const json = JSON.parse(_fs.default.readFileSync(packageFilePath, {
     encoding: 'utf-8'
   }));
-  if (isWebpack) {
-    const webpackConfigPath = _path.default.join(curDir, 'webpack.config.js');
-    const content = _fs.default.readFileSync(webpackConfigPath, {
-      encoding: 'utf-8'
-    });
-  }
   const funcFiles = jsTsFiles.filter(f => packageFiles.includes(f));
   color.log(`Checks finished in ${Date.now() - checkStart} ms`);
   const reg = new RegExp(/\${(\w*)}/g);
@@ -692,12 +689,14 @@ async function publish(args) {
 }
 async function publishPackage(args) {
   const nArgs = args['_'].length;
-  if (!args.link) {
-    if (args.build || args.rebuild) {
-      color.log('Building');
-      await utils.runScript('npm install', curDir, false);
-      await utils.runScript('npm run build', curDir, false);
-    }
+
+  // A bundled package is built locally before upload unless --skip-build. Inside the pnpm
+  // workspace the install already happened at the root; standalone packages install first.
+  if (!args.link && !args['skip-build'] && !args.rebuild && _fs.default.existsSync(_path.default.join(curDir, 'src'))) {
+    color.log('Building');
+    const workspace = utils.isPnpmWorkspace(curDir);
+    if (!workspace && !_fs.default.existsSync(_path.default.join(curDir, 'node_modules'))) await utils.runScript('npm install', curDir, false);
+    await utils.runScript(workspace ? 'pnpm run build' : 'npm run build', curDir, false);
   }
   if (args.debug && args.release) {
     color.error('Incompatible options: --debug and --release');

package/bin/commands/setup.js

@@ -0,0 +1,139 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setup = setup;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _child_process = require("child_process");
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+var _build = require("./build");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * `grok setup`: one command to get (or keep) a public/ checkout ready to build.
+ *   1. Node 20+ (22 recommended); pnpm through corepack, at the version package.json pins.
+ *   2. Removes per-package node_modules left by the npm era and stray package-lock.json files.
+ *   3. `pnpm install` at the workspace root.
+ *   4. Reports a global `grok` older than the workspace one (`--global` updates it).
+ * `--check` only reports.
+ */
+async function setup(args) {
+  const root = (0, _build.findWorkspaceRoot)(process.cwd());
+  if (!root) {
+    color.error('Not inside the public/ workspace (no pnpm-workspace.yaml above the current directory).');
+    return false;
+  }
+  const check = !!args.check;
+  const rootPkg = JSON.parse(_fs.default.readFileSync(_path.default.join(root, 'package.json'), 'utf8'));
+  const pinnedPnpm = (rootPkg.packageManager || 'pnpm@10').split('@')[1];
+  let ok = true;
+
+  // 1. Node and pnpm
+  const nodeMajor = parseInt(process.versions.node.split('.')[0], 10);
+  if (nodeMajor < 20) {
+    color.error(`Node ${process.versions.node}: 20 or later is required (22 recommended).`);
+    return false;
+  }
+  color.info(`Node ${process.versions.node}`);
+  let pnpmVersion = run('pnpm', ['--version']);
+  if (pnpmVersion !== pinnedPnpm) {
+    color.warn(`pnpm ${pnpmVersion || 'not found'}; the workspace pins ${pinnedPnpm}.`);
+    if (!check) {
+      if (run('corepack', ['--version']) === null) color.warn('corepack not found: `npm install -g corepack`, then rerun `grok setup`.');else {
+        (0, _child_process.spawnSync)('corepack', ['enable'], {
+          stdio: 'inherit',
+          shell: true
+        });
+        (0, _child_process.spawnSync)('corepack', ['prepare', `pnpm@${pinnedPnpm}`, '--activate'], {
+          stdio: 'inherit',
+          shell: true
+        });
+        pnpmVersion = run('pnpm', ['--version']);
+      }
+    }
+  }
+  if (pnpmVersion === pinnedPnpm) color.info(`pnpm ${pnpmVersion}`);else ok = false;
+
+  // 2. leftovers from the npm era
+  const projectDirs = ['js-api', 'tools', 'build-config'].map(d => _path.default.join(root, d));
+  for (const group of ['packages', 'libraries']) for (const d of _fs.default.readdirSync(_path.default.join(root, group))) projectDirs.push(_path.default.join(root, group, d));
+  const staleModules = projectDirs.filter(d => isLegacyNodeModules(_path.default.join(d, 'node_modules')));
+  const staleLocks = projectDirs.map(d => _path.default.join(d, 'package-lock.json')).filter(f => _fs.default.existsSync(f));
+  if (staleModules.length || staleLocks.length) {
+    color.warn(`${staleModules.length} per-package node_modules from npm and ${staleLocks.length} package-lock.json file(s)` + (check ? ' would be removed' : ': removing'));
+    if (!check) {
+      for (const d of staleModules) _fs.default.rmSync(_path.default.join(d, 'node_modules'), {
+        recursive: true,
+        force: true
+      });
+      for (const f of staleLocks) _fs.default.rmSync(f, {
+        force: true
+      });
+    }
+  } else color.info('no npm-era leftovers');
+
+  // 3. install
+  if (!check && pnpmVersion === pinnedPnpm) {
+    color.log('pnpm install ...');
+    const r = (0, _child_process.spawnSync)('pnpm', ['install', '--frozen-lockfile'], {
+      stdio: 'inherit',
+      cwd: root,
+      shell: true
+    });
+    if (r.status !== 0) {
+      color.warn('frozen install failed (lockfile out of date?): retrying without --frozen-lockfile');
+      if ((0, _child_process.spawnSync)('pnpm', ['install'], {
+        stdio: 'inherit',
+        cwd: root,
+        shell: true
+      }).status !== 0) {
+        color.error('pnpm install failed');
+        return false;
+      }
+    }
+  }
+
+  // 4. the global grok
+  const workspaceGrok = JSON.parse(_fs.default.readFileSync(_path.default.join(root, 'tools', 'package.json'), 'utf8')).version;
+  // datagrok-tools before 6.6 has no --version and prints its usage instead
+  const raw = run('grok', ['--version']);
+  const globalGrok = raw === null ? null : /^\d+\.\d+\.\d+/.test(raw) ? raw : 'older than 6.6';
+  if (globalGrok && globalGrok !== workspaceGrok) {
+    color.warn(`global grok ${globalGrok}; the workspace has ${workspaceGrok}` + (args.global && !check ? ': updating' : ' (run `npm install -g datagrok-tools@' + workspaceGrok + '`, or `grok setup --global`)'));
+    if (args.global && !check) (0, _child_process.spawnSync)('npm', ['install', '-g', `datagrok-tools@${workspaceGrok}`], {
+      stdio: 'inherit',
+      shell: true
+    });
+  } else if (globalGrok) color.info(`grok ${globalGrok}`);
+  if (ok && !check) color.success('Ready: `grok build` in any package, `grok build --all` for everything.');
+  return ok;
+}
+
+/** npm's node_modules holds real directories; pnpm's per-package one holds only symlinks (and .bin). */
+function isLegacyNodeModules(dir) {
+  if (!_fs.default.existsSync(dir)) return false;
+  for (const e of _fs.default.readdirSync(dir, {
+    withFileTypes: true
+  })) {
+    if (e.name === '.bin' || e.name === '.cache' || e.name.startsWith('.')) continue;
+    const p = _path.default.join(dir, e.name);
+    if (e.isSymbolicLink()) continue;
+    if (e.isDirectory() && e.name.startsWith('@')) {
+      if (_fs.default.readdirSync(p, {
+        withFileTypes: true
+      }).some(s => s.isDirectory() && !s.isSymbolicLink())) return true;
+      continue;
+    }
+    if (e.isDirectory()) return true;
+  }
+  return false;
+}
+function run(cmd, args) {
+  const r = (0, _child_process.spawnSync)(cmd, args, {
+    encoding: 'utf8',
+    shell: true
+  });
+  return r.status === 0 ? r.stdout.trim().split(/\r?\n/).pop() || '' : null;
+}

package/bin/commands/tsc.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tsc = tsc;
+var _child_process = require("child_process");
+var _toolchain = require("../utils/toolchain");
+/**
+ * `grok tsc ...` runs the workspace TypeScript compiler (the one `@datagrok/build-config` pins) with the
+ * given arguments, so package scripts never depend on a locally installed `tsc`. After an emitting run
+ * in a library, the assets its sources import are mirrored into dist/.
+ */
+async function tsc(args) {
+  const cwd = process.cwd();
+  const extra = process.argv.slice(process.argv.indexOf('tsc') + 1);
+  const emitting = !extra.includes('--noEmit');
+  if (emitting) (0, _toolchain.ensureLibraryExports)(cwd);
+  const r = (0, _child_process.spawnSync)(process.execPath, [(0, _toolchain.toolchain)(cwd).tsc, ...extra], {
+    stdio: 'inherit',
+    cwd
+  });
+  if (r.status !== 0) return false;
+  if (emitting) (0, _toolchain.copyLibraryAssets)(cwd);
+  return true;
+}

package/bin/grok.js

@@ -9,32 +9,45 @@ const argv = require('minimist')(process.argv.slice(2), {
 // test.ts / playwright-runner.ts never fired and `--no-retry` was silently ignored
 // (Playwright kept retrying failed specs). Normalize back to the flag the commands read.
 if (argv.retry === false) argv['no-retry'] = true;
-const help = require('./commands/help').help;
+// The help texts are a large module; load them only when one is printed.
+let _help;
+const help = new Proxy({}, {get: (_, key) => (_help ??= require('./commands/help').help)[key]});
 const runAllCommand = require('./utils/utils').runAll;
 
+// Each command module is loaded only when invoked: loading all of them (puppeteer, ts-morph,
+// archiver, inquirer) used to cost ~6 s of start-up on every `grok api` / `grok check`.
+const lazy = (file, name) => (args) => require(`./commands/${file}`)[name](args);
 const commands = {
-  add: require('./commands/add').add,
-  api: require('./commands/api').api,
-  build: require('./commands/build').build,
-  check: require('./commands/check').check,
-  claude: require('./commands/claude').claude,
-  config: require('./commands/config').config,
-  create: require('./commands/create').create,
-  'docker-gen': require('./commands/docker-gen').dockerGen,
-  init: require('./commands/init').init,
-  link: require('./commands/link').link,
-  login: require('./commands/login').login,
-  publish: require('./commands/publish').publish,
-  report: require('./commands/report').report,
-  run: require('./commands/run').run,
-  test: require('./commands/test').test,
-  testall: require('./commands/test-all').testAll,
-  stresstest: require('./commands/stress-tests').stressTests,
-  migrate: require('./commands/migrate').migrate,
-  server: require('./commands/server').server,
-  s: require('./commands/server').server,
+  add: lazy('add', 'add'),
+  api: lazy('api', 'api'),
+  build: lazy('build', 'build'),
+  check: lazy('check', 'check'),
+  claude: lazy('claude', 'claude'),
+  config: lazy('config', 'config'),
+  create: lazy('create', 'create'),
+  'docker-gen': lazy('docker-gen', 'dockerGen'),
+  init: lazy('init', 'init'),
+  link: lazy('link', 'link'),
+  login: lazy('login', 'login'),
+  publish: lazy('publish', 'publish'),
+  report: lazy('report', 'report'),
+  run: lazy('run', 'run'),
+  test: lazy('test', 'test'),
+  tsc: lazy('tsc', 'tsc'),
+  testall: lazy('test-all', 'testAll'),
+  stresstest: lazy('stress-tests', 'stressTests'),
+  migrate: lazy('migrate', 'migrate'),
+  server: lazy('server', 'server'),
+  s: lazy('server', 'server'),
+  setup: lazy('setup', 'setup'),
 };
 
+// `--version` is a string option (grok publish --version 1.10), so a bare `grok --version` parses as ''.
+if (argv._.length === 0 && ('version' in argv && argv.version === '' || argv.v === true)) {
+  console.log(require('../package.json').version);
+  process.exit(0);
+}
+
 const onPackageCommandNames = ['api', 'check', 'link', 'publish', 'test'];
 
 // A machine-readable run prints its error as JSON on stderr (server.ts) and nothing else:

package/bin/utils/toolchain.js

@@ -0,0 +1,121 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.copyLibraryAssets = copyLibraryAssets;
+exports.ensureLibraryExports = ensureLibraryExports;
+exports.toolchain = toolchain;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+/**
+ * The shared toolchain (`@datagrok/build-config`: rspack factory, TypeScript) as seen from `dir`:
+ * the workspace root's copy inside public/, the package's own devDependency in a standalone package.
+ */
+function toolchain(dir) {
+  let pkgJson;
+  try {
+    pkgJson = require.resolve('@datagrok/build-config/package.json', {
+      paths: [dir]
+    });
+  } catch {
+    throw new Error('@datagrok/build-config is not installed: run `pnpm install` at the root of public/, ' + 'or add it as a devDependency of a standalone package');
+  }
+  const buildConfigDir = _path.default.dirname(pkgJson);
+  const tsPkg = require.resolve('typescript/package.json', {
+    paths: [buildConfigDir]
+  });
+  return {
+    buildConfig: require(buildConfigDir),
+    buildConfigDir,
+    tsc: _path.default.join(_path.default.dirname(tsPkg), 'bin', 'tsc')
+  };
+}
+const ASSET = /\.(css|scss|wasm|js|mjs|cjs|json|png|jpe?g|gif|svg|txt|csv|md|html|sdf|mol)$/i;
+
+/**
+ * A library's dist/ must be self-contained: the css, wasm, json and plain-js files its sources
+ * import relative to themselves are mirrored next to the compiled output. A .js next to a .ts of
+ * the same name is a stale in-place compile, not an asset.
+ */
+function copyLibraryAssets(dir) {
+  if (!_fs.default.existsSync(_path.default.join(dir, 'dist'))) return 0;
+  let n = 0;
+  const walk = rel => {
+    for (const e of _fs.default.readdirSync(_path.default.join(dir, rel), {
+      withFileTypes: true
+    })) {
+      if (e.name === 'node_modules' || e.name === 'dist' || e.name.startsWith('.')) continue;
+      const r = rel ? `${rel}/${e.name}` : e.name;
+      if (e.isDirectory()) walk(r);else if (rel && ASSET.test(e.name) && e.name !== 'package.json' && !isCompiledSibling(dir, r)) {
+        const to = _path.default.join(dir, 'dist', r);
+        _fs.default.mkdirSync(_path.default.dirname(to), {
+          recursive: true
+        });
+        const from = _path.default.join(dir, r);
+        if (!_fs.default.existsSync(to) || _fs.default.statSync(to).mtimeMs < _fs.default.statSync(from).mtimeMs) {
+          _fs.default.copyFileSync(from, to);
+          n++;
+        }
+      }
+    }
+  };
+  walk('');
+  if (n) console.log(`copied ${n} asset file(s) into dist/`);
+  return n;
+}
+
+/**
+ * Keeps a library's package.json `exports` in step with its source tree. A library that ships dist/
+ * has an `exports` map ending in the `./*` wildcard; the wildcard cannot resolve a directory import
+ * (`@datagrok-libraries/bio/src/trees`), so every directory with an index.ts needs an explicit entry.
+ * Adds the missing ones and leaves everything else (hand-written entries, the wildcards, entries for
+ * directories that no longer exist) untouched. Packages without the wildcard are not managed.
+ */
+function ensureLibraryExports(dir) {
+  const pj = _path.default.join(dir, 'package.json');
+  const p = JSON.parse(_fs.default.readFileSync(pj, 'utf8'));
+  const ex = p.exports;
+  if (!ex || typeof ex !== 'object' || !ex['./*']) return false;
+  const indexDirs = new Set();
+  const walk = (d, rel) => {
+    for (const e of _fs.default.readdirSync(d, {
+      withFileTypes: true
+    })) {
+      if (e.name === 'node_modules' || e.name === 'dist' || e.name.startsWith('.')) continue;
+      const r = rel ? `${rel}/${e.name}` : e.name;
+      if (e.isDirectory()) walk(_path.default.join(d, e.name), r);else if (e.name === 'index.ts' && rel) indexDirs.add(rel);
+    }
+  };
+  walk(dir, '');
+  // Add-only: hand-written entries (aliases such as js-api's "./u2core") are never touched.
+  const next = {
+    ...ex
+  };
+  let changed = false;
+  for (const rel of [...indexDirs].sort()) {
+    const key = `./${rel}`;
+    if (!(key in next)) {
+      next[key] = {
+        types: `./dist/${rel}/index.d.ts`,
+        default: `./dist/${rel}/index.js`
+      };
+      changed = true;
+    }
+  }
+  if (!changed) return false;
+  // wildcards last: exports are matched by specificity, but keeping them last reads better
+  const wild = ['./*.js', './*'].filter(k => k in next);
+  const ordered = {};
+  for (const [k, v] of Object.entries(next)) if (!wild.includes(k)) ordered[k] = v;
+  for (const k of wild) ordered[k] = next[k];
+  p.exports = ordered;
+  _fs.default.writeFileSync(pj, JSON.stringify(p, null, 2) + '\n');
+  console.log(`package.json exports updated for ${_path.default.basename(dir)}`);
+  return true;
+}
+function isCompiledSibling(dir, rel) {
+  const m = rel.match(/^(.*)\.(js|mjs|cjs)$/);
+  return !!m && ['.ts', '.tsx'].some(e => _fs.default.existsSync(_path.default.join(dir, m[1] + e)));
+}

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.1",
   "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"
   }
-}
+}