datagrok-tools 6.7.3 → 6.7.5

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> datagrok-tools@6.7.3 build /home/runner/work/public/public/tools
+> datagrok-tools@6.7.5 build /home/runner/work/public/public/tools
 > node build.js
 
 Successfully compiled 51 files with Babel.

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Datagrok-tools changelog
 
+## 6.7.5 (2026-09-17)
+
+* `grok create` works outside the pnpm workspace and new packages use `@datagrok/build-config` 1.x
+
+## 6.7.4 (2026-09-17)
+
+* `grok create`, `grok publish`, `grok test` and `grok run` work inside the pnpm workspace
+
 ## 6.7.3 (2026-09-17)
 
 * The function-metadata plugin emits decorator roles in camel case again (`fileHandler`, `app`, `viewer`, ...); since 6.7.1 it capitalised them, which broke JS code comparing `options.role` with `DG.FUNC_TYPES`.

package/bin/commands/create.js

@@ -21,17 +21,16 @@ const curFolder = _path.default.basename(curDir);
 const grokDir = _path.default.join(_os.default.homedir(), '.grok');
 const confPath = _path.default.join(grokDir, 'config.yaml');
 const templateDir = _path.default.join(_path.default.dirname(_path.default.dirname(__dirname)), 'package-template');
-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;
-  }
-}
 const confTemplateDir = _path.default.join(_path.default.dirname(_path.default.dirname(__dirname)), 'config-template.yaml');
 const confTemplate = _jsYaml.default.load(_fs.default.readFileSync(confTemplateDir, {
   encoding: 'utf-8'
 }));
 const dependencies = [];
+function apiVersion() {
+  let dir = _path.default.dirname(require.resolve('datagrok-api/dg'));
+  while (!_fs.default.existsSync(_path.default.join(dir, 'package.json'))) dir = _path.default.dirname(dir);
+  return JSON.parse(_fs.default.readFileSync(_path.default.join(dir, 'package.json'), 'utf8')).version;
+}
 function createDirectoryContents(name, friendlyName, config, templateDir, packageDir, ide = '', ts = true, eslint = false, test = false) {
   const filesToCreate = _fs.default.readdirSync(templateDir);
   filesToCreate.forEach(file => {
@@ -62,9 +61,9 @@ function createDirectoryContents(name, friendlyName, config, templateDir, packag
         _package.devDependencies = _package.devDependencies ?? {};
         // Outside the public/ pnpm workspace the template's workspace:/catalog: specifiers mean
         // nothing to npm: pin published ranges and bring the toolchain in as a devDependency.
-        if (!isPnpmWorkspace(packageDir)) {
+        if (!utils.isPnpmWorkspace(packageDir)) {
           const published = {
-            'datagrok-api': `^${require('datagrok-api/package.json').version}`,
+            'datagrok-api': `^${apiVersion()}`,
             '@datagrok-libraries/test': '^1.4.0',
             'rxjs': '^6.5.5',
             'cash-dom': '^8.1.5',
@@ -78,7 +77,7 @@ function createDirectoryContents(name, friendlyName, config, templateDir, packag
             }
           }
           Object.assign(_package.devDependencies, {
-            '@datagrok/build-config': '^0.1.0',
+            '@datagrok/build-config': '^1.0.0',
             'eslint': '^8.57.1',
             '@typescript-eslint/parser': '^8.39.0',
             '@typescript-eslint/eslint-plugin': '^8.39.0',
@@ -216,8 +215,9 @@ function create(args) {
     color.success('Successfully created package ' + name);
     console.log(_entHelpers.help.package(ts));
     console.log(`\nThe package has the following dependencies:\n${dependencies.join(' ')}\n`);
-    console.log('Running `npm install` to get the required dependencies...\n');
-    (0, _child_process.exec)('npm install', {
+    const install = utils.isPnpmWorkspace(packageDir) ? 'pnpm install' : 'npm install';
+    console.log(`Running \`${install}\` to get the required dependencies...\n`);
+    (0, _child_process.exec)(install, {
       cwd: packageDir
     }, (err, stdout, stderr) => {
       if (err) throw err;else console.log(stderr, stdout);

package/bin/commands/help.js

@@ -210,7 +210,7 @@ Options:
 
 --all                  Publish all available packages (run in packages directory)
 --refresh              Publish all available already loaded packages (run in packages directory)
---link                 Link the package to local packages
+--link                 Link the package to local packages (no effect in a pnpm workspace checkout)
 --build                Builds the package (the default; kept for compatibility)
 --skip-build           Upload the existing dist/ without rebuilding
 --release              Publish package as release version
@@ -255,7 +255,7 @@ Options:
 --skip-playwright   Skip the Playwright pass; only run Puppeteer/DG.Test
 --skip-node         Skip the Node (browserless) pass; run all tests in the browser
 --node-only         Run only tests annotated {node: true} headless under Node, no browser
---link  	        Link the package to local utils
+--link  	        Link the package to local utils (no effect in a pnpm workspace checkout)
 --record            Records the test execution process in mp4 format
 --platform          Runs only platform tests (applicable for ApiTests package only)
 --core              Runs package & auto tests & core tests (core tests run only from DevTools package)

package/bin/commands/link.js

@@ -30,18 +30,12 @@ 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)) {
+  if ((0, _utils.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;
   }
@@ -49,7 +43,7 @@ async function link(args) {
   devMode = args.dev ?? false;
   pathMode = args.path ?? false;
   unlink = args.unlink ?? false;
-  let collectedPackages = collectAvaliablePackages(args['repo-only']);
+  const collectedPackages = collectAvaliablePackages(args['repo-only']);
   packagesInRepo = collectedPackages.packagesInRepo;
   packagesOutOfRepo = collectedPackages.packagesOutOfRepo;
   localPackageDependencies = [];
@@ -83,16 +77,13 @@ function collectPackagesData(packagePath = curDir) {
 }
 function collectPacakgeDataFromJsonObject(object) {
   let result = [];
-  for (let dependencyName of Object.keys(object ?? {})) {
+  for (const dependencyName of Object.keys(object ?? {})) {
     if (packagesInRepo[dependencyName]) result = result.concat(parsePackageDependencies(dependencyName, _path.default.dirname(packagesInRepo[dependencyName].path)));else if (packagesOutOfRepo[dependencyName]) result = result.concat(parsePackageDependencies(dependencyName, _path.default.dirname(packagesOutOfRepo[dependencyName].path)));
   }
   return result;
 }
-function toCamelCase(input) {
-  return input.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
-}
 function parsePackageDependencies(dependencyName, pathToLink) {
-  let result = [];
+  const result = [];
   if (!packagesToLink.has(dependencyName)) {
     packagesToLink.add(dependencyName);
     localPackageDependencies.push(new PackageData(pathToLink));
@@ -101,8 +92,8 @@ function parsePackageDependencies(dependencyName, pathToLink) {
   return result;
 }
 function collectAvaliablePackages(noOutLink = false) {
-  let repositoryPackages = collectAvaliablePackagesPathesFromDir(repositoryDir);
-  let commonPakcages = collectAvaliablePackagesPathesFromDir(containerDir, repositoryDir);
+  const repositoryPackages = collectAvaliablePackagesPathesFromDir(repositoryDir);
+  const commonPakcages = collectAvaliablePackagesPathesFromDir(containerDir, repositoryDir);
   const packagesInRepoBaseInfo = parsePackages(repositoryPackages);
   const packagesOutOfRepoBaseInfo = noOutLink ? [] : parsePackages(commonPakcages);
   const packagesInRepo = Object.fromEntries(packagesInRepoBaseInfo.map(({
@@ -127,8 +118,8 @@ function collectAvaliablePackagesPathesFromDir(dir, dirToExclude = '') {
   return res;
 }
 function parsePackages(packagPathes) {
-  let res = packagPathes.map(e => {
-    let packageData = {};
+  const res = packagPathes.map(e => {
+    const packageData = {};
     if (_fs.default.existsSync(e)) {
       packageData.path = e;
       const packageJson = JSON.parse(_fs.default.readFileSync(e, 'utf8'));
@@ -142,7 +133,7 @@ function parsePackages(packagPathes) {
 async function unlinkPackages() {
   const packages = [...localPackageDependencies];
   if (currentPackage) packages.push(currentPackage);
-  for (let packageData of packages) {
+  for (const packageData of packages) {
     if (excludedPackages.includes(packageData.name)) continue;
     if (verbose) console.log(`Package ${packageData.name} is unlinking`);
     const packageJsonPath = _path.default.join(packageData.packagePath, 'package.json');
@@ -154,29 +145,27 @@ async function unlinkPackages() {
   }
 }
 function updateDependenciesToVersion(packageData, dependecyNode) {
-  for (let dependency of packageData.dependencies) {
+  for (const dependency of packageData.dependencies) {
     if (excludedPackages.includes(dependency)) continue;
     if (dependecyNode[dependency] && !versionDependencyRegex.test(dependecyNode[dependency])) {
       const packageToLink = (localPackageDependencies.filter(e => e.name === dependency) ?? [])[0];
-      if (packageToLink) {
-        dependecyNode[dependency] = `^${packagesInRepo[dependency]?.version ?? packagesOutOfRepo[dependency]?.version}`;
-      }
+      if (packageToLink) dependecyNode[dependency] = `^${packagesInRepo[dependency]?.version ?? packagesOutOfRepo[dependency]?.version}`;
     }
   }
   return dependecyNode;
 }
 async function linkPackages() {
   let anyChanges = true;
-  for (let element of excludedPackages) packagesToLink.delete(element);
+  for (const element of excludedPackages) packagesToLink.delete(element);
   if (verbose) {
     console.log('Packages to link:');
     console.log(localPackageDependencies);
   }
   while (anyChanges && packagesToLink.size > 0) {
     anyChanges = false;
-    let mapElements = localPackageDependencies.filter(x => x.dependencies.every(i => !packagesToLink.has(i)) && packagesToLink.has(x.name) && !excludedPackages.includes(x.name));
+    const mapElements = localPackageDependencies.filter(x => x.dependencies.every(i => !packagesToLink.has(i)) && packagesToLink.has(x.name) && !excludedPackages.includes(x.name));
     if (mapElements.length === 0) break;
-    for (let element of mapElements) {
+    for (const element of mapElements) {
       if (verbose) console.log(`Package ${element.name} is linking`);
       if (pathMode) await linkPathMode(element);
       await (0, _utils.runScript)(`npm install`, element.packagePath);
@@ -187,7 +176,7 @@ async function linkPackages() {
     }
     if (anyChanges === false) throw new Error(`There is loop with next packages: ${JSON.stringify(Array.from(packagesToLink)).toString()}`);
   }
-  let names = localPackageDependencies.map(x => x.name);
+  const names = localPackageDependencies.map(x => x.name);
   if (currentPackage && pathMode) await linkPathMode(currentPackage);
   await (0, _utils.runScript)(`npm install`, curDir);
   if (pathMode === false) await (0, _utils.runScript)(`npm link ${names.join(' ')}`, curDir);
@@ -208,7 +197,7 @@ async function linkPathMode(packageData) {
 function updateDependenciesToLocal(packageData, dependecyNode) {
   const backRouteForCont = `../`.repeat(packageData.packagePath.replace(containerDir, '').split(_path.default.sep).length - 1);
   const backRouteForRepo = `../`.repeat(packageData.packagePath.replace(repositoryDir, '').split(_path.default.sep).length - 1);
-  for (let dependency of packageData.dependencies) {
+  for (const dependency of packageData.dependencies) {
     if (excludedPackages.includes(dependency)) continue;
     if (dependecyNode[dependency]) {
       const packageToLink = (localPackageDependencies.filter(e => e.name === dependency) ?? [])[0];
@@ -222,7 +211,7 @@ function updateDependenciesToLocal(packageData, dependecyNode) {
 class PackageData {
   dependencies = [];
   constructor(packagePath) {
-    let packageJsonData = collectPackagesData(packagePath);
+    const packageJsonData = collectPackagesData(packagePath);
     this.name = packageJsonData.name;
     this.packagePath = packagePath;
     this.dependencies = packageJsonData.dependencies;

package/bin/commands/publish.js

@@ -374,7 +374,9 @@ async function processDockerImages(packageName, version, registry, devKey, host,
         result = pushImage(img.imageName, registryTag, registry);
         if (!result) {
           const fallback = await fallbackImage(img, host, devKey, registry, version, contentHash);
-          if (fallback.serverError) color.error(`Cannot resolve fallback: ${fallback.serverError}`);else if (fallback.image) color.warn(`Falling back to ${fallback.image}` + `${fallback.hashMatch === false ? ' (hash mismatch — container will run older code)' : ''}`);else color.error(`No published image available for ${img.imageName}. No container will be available.`);
+          if (fallback.serverError) color.error(`Cannot resolve fallback: ${fallback.serverError}`);else if (fallback.image) {
+            color.warn(`Falling back to ${fallback.image}` + `${fallback.hashMatch === false ? ' (hash mismatch — container will run older code)' : ''}`);
+          } else color.error(`No published image available for ${img.imageName}. No container will be available.`);
           result = fallback;
         }
       } else {
@@ -700,28 +702,24 @@ async function publish(args) {
     }
     color.log('Loading packages:');
     await (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, args.link, args.release);
-  } else {
-    if (args.link) {
-      color.log('Linking');
-      await utils.runScript(`npm install`, curDir);
-      await utils.runScript(`grok link`, curDir);
-      await utils.runScript(`npm run build`, curDir);
-    }
-    return await publishPackage(args);
-  }
+  } else return await publishPackage(args);
   return true;
 }
+
+// --link means nothing inside the pnpm workspace: the root install already linked every in-repo dependency
+async function buildPackage(args) {
+  const workspace = utils.isPnpmWorkspace(curDir);
+  const link = args.link && !workspace;
+  if (!link && (args['skip-build'] || args.rebuild || !_fs.default.existsSync(_path.default.join(curDir, 'src')))) return;
+  color.log(link ? 'Linking and building' : 'Building');
+  if (link || !workspace && !_fs.default.existsSync(_path.default.join(curDir, 'node_modules'))) await utils.runScript('npm install', curDir);
+  if (link) await utils.runScript(`${utils.grokCommand} link`, curDir);
+  await utils.runScript(workspace ? 'pnpm run build' : 'npm run build', curDir);
+}
 async function publishPackage(args) {
   const nArgs = args['_'].length;
-
-  // 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);
-  }
+  await buildPackage(args);
+  if (args['skip-build'] && !args.rebuild && _fs.default.existsSync(_path.default.join(curDir, 'src')) && !_fs.default.existsSync(_path.default.join(curDir, 'dist', 'package.js'))) return color.error('dist/package.js not found: build the package first, or run without --skip-build');
   if (args.debug && args.release) {
     color.error('Incompatible options: --debug and --release');
     return false;
@@ -755,7 +753,9 @@ async function publishPackage(args) {
 
   // Update the developer key
   if (args.key) key = args.key;
-  if (!key && !keypair.keypairFor(url)) return color.warn(`No credentials for ${url}. Run \`grok login ${host}\`, ` + 'or pass a developer key with `--key` (deprecated).');
+  if (!key && !keypair.keypairFor(url)) {
+    return color.warn(`No credentials for ${url}. Run \`grok login ${host}\`, ` + 'or pass a developer key with `--key` (deprecated).');
+  }
 
   // Get the package name
   if (!_fs.default.existsSync(packDir)) return color.error('`package.json` doesn\'t exist');

package/bin/commands/run.js

@@ -39,7 +39,8 @@ function openBrowser(url) {
 }
 const MISSING_MODULE_PATTERNS = ['cannot find module', 'module not found', 'can\'t resolve'];
 async function buildPackage(dir) {
-  const buildCmd = 'npm run build -- --env incremental';
+  const workspace = utils.isPnpmWorkspace(dir);
+  const buildCmd = workspace ? 'pnpm run build' : 'npm run build -- --env incremental';
   const packageJson = JSON.parse(_fs.default.readFileSync(_path.default.join(dir, 'package.json'), 'utf-8'));
   const name = packageJson.friendlyName || packageJson.name;
   console.log(`Building ${name}...`);
@@ -50,9 +51,10 @@ async function buildPackage(dir) {
   } catch (error) {
     const msg = (error?.message ?? '').toLowerCase();
     if (MISSING_MODULE_PATTERNS.some(p => msg.includes(p))) {
-      color.warn('Missing modules detected, running npm install...');
+      const install = workspace ? 'pnpm install --frozen-lockfile' : 'npm install';
+      color.warn(`Missing modules detected, running ${install}...`);
       try {
-        await utils.runScript('npm install', dir, color.isVerbose());
+        await utils.runScript(install, dir, color.isVerbose());
         await utils.runScript(buildCmd, dir, color.isVerbose());
         color.success(`Successfully built ${name}`);
         return true;
@@ -70,7 +72,7 @@ async function buildPackage(dir) {
 async function run(args) {
   color.setVerbose(args.verbose || false);
 
-  // Step 1: Build (skip npm install to preserve npm link; retry with npm install only if needed)
+  // Step 1: Build (skip the install to preserve npm link; retry with an install only if needed)
   const built = await buildPackage(process.cwd());
   if (!built) return false;
 

package/bin/utils/test-utils.js

@@ -251,10 +251,8 @@ async function loadPackage(packageDir, dirName, hostString, skipPublish, skipBui
   if (skipPublish != true) {
     process.stdout.write(`Building and publishing ${dirName}...`);
     try {
-      await utils.runScript(`npm install`, packageDir);
-      if (linkPackage) await utils.runScript(`grok link`, packageDir);
-      if (skipBuild != true) await utils.runScript(`npm run build`, packageDir);
-      await utils.runScript(`grok publish ${hostString}${release ? ' --release' : ''}`, packageDir);
+      const flags = `${release ? ' --release' : ''}${linkPackage ? ' --link' : ''}${skipBuild ? ' --skip-build' : ''}`;
+      await utils.runScript(`${utils.grokCommand} publish ${hostString}${flags}`, packageDir);
     } catch (e) {
       process.stdout.write(' FAILED\n');
       throw e;

package/bin/utils/utils.js

@@ -19,7 +19,7 @@ exports.getScriptDescription = getScriptDescription;
 exports.getScriptInputs = getScriptInputs;
 exports.getScriptName = getScriptName;
 exports.getScriptOutputType = getScriptOutputType;
-exports.headerTags = void 0;
+exports.headerTags = exports.grokCommand = void 0;
 exports.isConnectivityError = isConnectivityError;
 exports.isEmpty = isEmpty;
 exports.isPackageDir = isPackageDir;
@@ -310,6 +310,7 @@ function isPnpmWorkspace(dir) {
     if (_path.default.dirname(d) === d) return false;
   }
 }
+const grokCommand = exports.grokCommand = `"${process.execPath}" "${_path.default.join(__dirname, '..', 'grok.js')}"`;
 async function runScript(script, path, verbose = false) {
   try {
     const {

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/datagrok-ai/public.git"
   },
-  "version": "6.7.3",
+  "version": "6.7.5",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {