@graphcommerce/cli 9.0.0-canary.107 → 9.0.0-canary.108

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @graphcommerce/cli
 
+## 9.0.0-canary.108
+
 ## 9.0.0-canary.107
 
 ## 9.0.0-canary.106

package/dist/bin/is-monorepo.js

@@ -1,26 +1,43 @@
 #!/usr/bin/env node
-import { isMonorepo } from '@graphcommerce/next-config';
-import { detect } from 'detect-package-manager';
 import { spawn } from 'node:child_process';
+import 'node:fs';
+import path from 'node:path';
+import { findParentPath } from '@graphcommerce/next-config';
+import { detect } from 'detect-package-manager';
 
+const debug = process.env.DEBUG === "1";
+const log = (message) => debug && console.log(`is-monorepo: ${message}`);
+const logError = (message) => console.error(`is-monorepo: ${message}`);
 async function main() {
-  const isMono = isMonorepo();
-  const command = isMono ? process.argv.slice(2)[0] : process.argv.slice(2)[1];
+  const parentPath = findParentPath(process.cwd());
+  const command = parentPath ? process.argv.slice(2)[0] : process.argv.slice(2)[1];
+  if (!command) {
+    logError("No command provided");
+    process.exit(1);
+  }
   let packageManager = "yarn";
   try {
-    packageManager = await detect({ cwd: isMono ? "../.." : "." });
+    packageManager = await detect({ cwd: "." });
   } catch {
-    console.error("Could not detect package manager, defaulting to yarn");
+    log("Could not detect package manager, defaulting to yarn");
   }
-  const commandArray = command.split(" ").map((arg) => arg.replace("[pkgrun]", `${packageManager} run`));
-  if (isMono) commandArray.unshift("cd", "../..", "&&");
-  const [cmd, ...args] = commandArray;
-  const childProcess = spawn(cmd, args, { shell: true, stdio: "inherit" });
+  const relativePath = parentPath ? `cd ${path.relative(process.cwd(), parentPath)}/` : "cd .";
+  const commandArray = command.split(" ").map(
+    (arg) => arg.replace("[pkgrun]", `${packageManager}${packageManager === "npm" ? " run" : ""}`)
+  );
+  log(`Command: ${commandArray.join(" ")}`);
+  const finalCommand = `${relativePath} && ${commandArray.join(" ")}`;
+  log(`Executing: ${finalCommand}`);
+  const childProcess = spawn(finalCommand, [], { shell: true, stdio: "inherit" });
   childProcess.on("exit", (code) => {
     process.exit(code ?? 0);
   });
 }
-main().catch((error) => {
-  console.error(error);
+main().catch((err) => {
+  if (err instanceof Error) {
+    logError(err.message);
+  } else {
+    logError("An unknown error occurred");
+  }
   process.exit(1);
 });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.107",
+  "version": "9.0.0-canary.108",
   "scripts": {
     "dev": "pkgroll --watch",
     "build": "pkgroll",
@@ -31,8 +31,8 @@
     "cosmiconfig": "^8.3.6",
     "detect-package-manager": "^3.0.2",
     "dotenv": "16.4.5",
-    "graphql": "^16.7.1",
-    "graphql-codegen-typescript-validation-schema": "^0.16.0",
+    "graphql": "^16.9.0",
+    "graphql-codegen-typescript-validation-schema": "^0.17.0",
     "graphql-tag": "^2.12.6",
     "rimraf": "^5.0.10",
     "tslib": "^2.7.0",
@@ -40,12 +40,12 @@
     "yaml": "2.5.1"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.107",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.107",
-    "@graphcommerce/hygraph-cli": "^9.0.0-canary.107",
-    "@graphcommerce/next-config": "^9.0.0-canary.107",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.107",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.107",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.108",
+    "@graphcommerce/graphql-mesh": "^9.0.0-canary.108",
+    "@graphcommerce/hygraph-cli": "^9.0.0-canary.108",
+    "@graphcommerce/next-config": "^9.0.0-canary.108",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.108",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.108",
     "react": "^18.2.0"
   },
   "sideEffects": false,

package/src/bin/is-monorepo.ts

@@ -1,44 +1,88 @@
 #!/usr/bin/env node
-import { isMonorepo } from '@graphcommerce/next-config'
-import { detect } from 'detect-package-manager'
 import type { ChildProcess } from 'node:child_process'
 import { spawn } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
+import { findParentPath, isMonorepo } from '@graphcommerce/next-config'
+import { detect } from 'detect-package-manager'
+
+const debug = process.env.DEBUG === '1'
+// eslint-disable-next-line no-console
+const log = (message: string) => debug && console.log(`is-monorepo: ${message}`)
+const logError = (message: string) => console.error(`is-monorepo: ${message}`)
+
+/** Find the nearest parent directory containing a @graphcommerce/* package */
+function findRootDir(startDir: string): string | null {
+  // Start from the parent directory to find a parent @graphcommerce package
+  let currentDir = path.dirname(startDir)
+  log(`Looking for parent packages starting from: ${currentDir}`)
+
+  while (currentDir !== path.parse(currentDir).root) {
+    try {
+      const packageJson = JSON.parse(fs.readFileSync(path.join(currentDir, 'package.json'), 'utf8'))
+      if (packageJson.name.startsWith('@graphcommerce/')) {
+        log(`Found root directory at: ${currentDir}`)
+        return currentDir
+      }
+    } catch {
+      // Continue if package.json doesn't exist or can't be parsed
+    }
+    currentDir = path.dirname(currentDir)
+  }
+
+  return null
+}
 
 /**
- * Executes a command dependening if we're running in a monorepo or not Usage:
+ * Executes a command depending if we're running in a monorepo or not. Usage: is-monorepo '[pkgrun]
+ * run my-script' '[pkgrun] run my-other-script'
  *
- *     is-monorepo '[pkgrun] run my-script' '[pkgrun] run my-other-script'
+ * The [pkgrun] placeholder will be replaced with the detected package manager:
  *
- * We're using the `[pkgrun]` placeholder to replace it with the package manager we're using. For
- * example, if we're using `yarn` it will replace `[pkgrun]` with `yarn`. If we're using `npm` it
- * will replace `[pkgrun]` with `npm run`.
+ * - Yarn -> 'yarn'
+ * - Npm -> 'npm run'
  */
 async function main() {
-  const isMono = isMonorepo()
-  const command = isMono ? process.argv.slice(2)[0] : process.argv.slice(2)[1]
+  // const isMono = isMonorepo()
+  const parentPath = findParentPath(process.cwd())
+
+  const command = parentPath ? process.argv.slice(2)[0] : process.argv.slice(2)[1]
+
+  if (!command) {
+    logError('No command provided')
+    process.exit(1)
+  }
 
   let packageManager = 'yarn'
   try {
-    packageManager = await detect({ cwd: isMono ? '../..' : '.' })
+    packageManager = await detect({ cwd: '.' })
   } catch {
-    console.error('Could not detect package manager, defaulting to yarn')
+    log('Could not detect package manager, defaulting to yarn')
   }
 
+  const relativePath = parentPath ? `cd ${path.relative(process.cwd(), parentPath)}/` : 'cd .'
   const commandArray = command
     .split(' ')
-    .map((arg) => arg.replace('[pkgrun]', `${packageManager} run`))
+    .map((arg) =>
+      arg.replace('[pkgrun]', `${packageManager}${packageManager === 'npm' ? ' run' : ''}`),
+    )
+  log(`Command: ${commandArray.join(' ')}`)
 
-  if (isMono) commandArray.unshift('cd', '../..', '&&')
+  const finalCommand = `${relativePath} && ${commandArray.join(' ')}`
+  log(`Executing: ${finalCommand}`)
 
-  const [cmd, ...args] = commandArray
-  const childProcess: ChildProcess = spawn(cmd, args, { shell: true, stdio: 'inherit' })
+  const childProcess: ChildProcess = spawn(finalCommand, [], { shell: true, stdio: 'inherit' })
 
   childProcess.on('exit', (code) => {
     process.exit(code ?? 0)
   })
 }
 
-main().catch((error) => {
-  console.error(error)
+main().catch((err: unknown) => {
+  if (err instanceof Error) {
+    logError(err.message)
+  } else {
+    logError('An unknown error occurred')
+  }
   process.exit(1)
 })