datagrok-tools 5.1.8 → 5.1.9

package/bin/commands/test.js

@@ -62,7 +62,6 @@ async function test(args) {
     encoding: 'utf-8'
   }));
   isArgsValid(args);
-  utils.setHost(args.host, config);
 
   // If running from a core Dart library directory, delegate to DevTools package
   if (!args.package) {
@@ -76,7 +75,8 @@ async function test(args) {
         color.error(`Run 'grok test --category="${category}"' from 'public/packages/DevTools' instead.`);
         process.exit(1);
       }
-      color.info(`Detected core library directory. Delegating to DevTools with category: "${category}"`);
+      const hostAlias = args.host ?? config.default;
+      color.info(`Detected core library directory. Delegating to DevTools with category: "${category}"${hostAlias ? ` (host: ${hostAlias})` : ''}`);
       const cmdArgs = ['test', `--category=${category}`];
       if (args.host) cmdArgs.push(`--host=${args.host}`);
       if (args.test) cmdArgs.push(`--test=${args.test}`);
@@ -94,6 +94,13 @@ async function test(args) {
       if (args.debug) cmdArgs.push('--debug');
       if (args['ci-cd']) cmdArgs.push('--ci-cd');
       if (args['no-retry']) cmdArgs.push('--no-retry');
+      if (!args['skip-publish']) {
+        const isDevToolsOnServer = await testUtils.isPackageOnServer(args.host ?? '', 'DevTools');
+        if (isDevToolsOnServer) {
+          cmdArgs.push('--skip-publish');
+          if (!args['skip-build']) cmdArgs.push('--skip-build');
+        }
+      }
       const grokScript = _path.default.resolve(__dirname, '..', 'grok.js');
       const result = (0, _child_process.spawnSync)(process.execPath, [grokScript, ...cmdArgs], {
         cwd: devToolsDir,
@@ -102,13 +109,14 @@ async function test(args) {
       process.exit(result.status ?? 1);
     }
   }
+  utils.setHost(args.host, config, true);
   let packageJsonData = undefined;
   if (!args.package) packageJsonData = JSON.parse(_fs.default.readFileSync(_path.default.join(curDir, 'package.json'), {
     encoding: 'utf-8'
   }));
   const packageName = args.package ? utils.kebabToCamelCase(args.package) : utils.kebabToCamelCase(utils.removeScope(packageJsonData.name));
   const packagesDir = _path.default.basename(curDir) === 'packages' ? curDir : _path.default.dirname(curDir);
-  console.log('Environment variable `TARGET_PACKAGE` is set to', packageName);
+  console.log(`HOST: ${process.env.HOST}, TARGET_PACKAGE: ${packageName}`);
   if (args.platform && packageName !== 'ApiTests') color.warn('--platform flag can only be used in the ApiTests package');
   // if (args.core && packageName !== 'DevTools')
   //   color.warn('--core flag can only be used in the DevTools package');

package/bin/utils/test-utils.js

@@ -15,6 +15,7 @@ exports.getDevKey = getDevKey;
 exports.getToken = getToken;
 exports.getWebUrl = getWebUrl;
 exports.getWebUrlFromPage = getWebUrlFromPage;
+exports.isPackageOnServer = isPackageOnServer;
 exports.loadPackage = loadPackage;
 exports.loadPackages = loadPackages;
 exports.loadTestsList = loadTestsList;
@@ -59,6 +60,24 @@ async function getToken(url, key) {
   const json = await response.json();
   if (json.isSuccess == true) return json.token;else throw new Error('Unable to login to server. Check your dev key');
 }
+async function isPackageOnServer(hostKey, packageName) {
+  try {
+    const {
+      url,
+      key
+    } = getDevKey(hostKey);
+    const token = await getToken(url, key);
+    const response = await fetch(`${url}/packages/published/current`, {
+      headers: {
+        Authorization: token
+      }
+    });
+    const packages = await response.json();
+    return Array.isArray(packages) && packages.some(p => p.name?.toLowerCase() === packageName.toLowerCase());
+  } catch {
+    return false;
+  }
+}
 async function getWebUrl(url, token) {
   const response = await fetch(`${url}/admin/plugins/admin/settings`, {
     headers: {

package/bin/utils/utils.js

@@ -280,18 +280,18 @@ async function runScript(script, path, verbose = false) {
     throw new Error(output);
   }
 }
-function setHost(host, configFile) {
+function setHost(host, configFile, quiet = false) {
   if (host) {
     if (host in configFile.servers) {
       process.env.HOST = host;
-      console.log('Environment variable `HOST` is set to', host);
+      if (!quiet) console.log('Environment variable `HOST` is set to', host);
     } else {
       console.error(`Unknown server alias. Please add it to Config File`);
       return false;
     }
   } else if (configFile.default) {
     process.env.HOST = configFile.default;
-    console.log('Environment variable `HOST` is set to', configFile.default);
+    if (!quiet) console.log('Environment variable `HOST` is set to', configFile.default);
   }
 }
 async function runAll(packagesDir, command, options, packagesToLoad = ['all']) {

package/package.json

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