@graphcommerce/cli 1.0.10 → 4.30.0-canary.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @graphcommerce/cli
 
+## 4.30.0-canary.1
+
+### Patch Changes
+
+- [`abb15ef4a`](https://github.com/graphcommerce-org/graphcommerce/commit/abb15ef4a79b12eddb32cc006e5d1d31dd06ac2d) Thanks [@paales](https://github.com/paales)! - Added canary releases to GraphCommerce
+
+## 4.30.0-canary.0
+
+### Minor Changes
+
+- [#1613](https://github.com/graphcommerce-org/graphcommerce/pull/1613) [`1ef81efa2`](https://github.com/graphcommerce-org/graphcommerce/commit/1ef81efa238b2e79312ab35c6829abec266e4ad1) Thanks [@paales](https://github.com/paales)! - All codegen files that need to be scanned will be handled by a new resolveDependenciesSync method
+
+- [#1613](https://github.com/graphcommerce-org/graphcommerce/pull/1613) [`da20e4e72`](https://github.com/graphcommerce-org/graphcommerce/commit/da20e4e72ca3f29216592e0ecfb59c0e44bcbe20) Thanks [@paales](https://github.com/paales)! - Created an is-monorepo command to exectute scripts based if they are in the monorepo or in a project
+
+### Patch Changes
+
+- [#1613](https://github.com/graphcommerce-org/graphcommerce/pull/1613) [`6c1c69ca4`](https://github.com/graphcommerce-org/graphcommerce/commit/6c1c69ca45ea1c8737cc7dcdc341fe5d825ed380) Thanks [@paales](https://github.com/paales)! - Refactor next-config to also use the new resolveDependenciesSync by exposing withGraphCommerce
+
 ## 1.0.10
 
 ### Patch Changes

package/bin/codegen.ts

@@ -1,15 +1,91 @@
 #!/usr/bin/env node
-
-import { runCli, cliError } from '@graphql-codegen/cli'
+/* eslint-disable import/no-extraneous-dependencies */
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { resolveDependenciesSync } from '@graphcommerce/next-config'
+import { runCli, cliError, loadCodegenConfig } from '@graphql-codegen/cli'
+import { Types } from '@graphql-codegen/plugin-helpers'
+import rimraf from 'rimraf'
+import yaml from 'yaml'
 
 const [, , cmd] = process.argv
 
-// console.log(process.argv)
+const root = process.cwd()
+const configLocation = path.join(root, `._tmp_codegen.yml`)
 
-runCli(cmd)
-  .then((result) => {
-    process.exit(result)
-  })
-  .catch((error) => {
-    cliError(error)
+async function cleanup() {
+  try {
+    await fs.stat(configLocation).then((r) => {
+      if (r.isFile()) return fs.unlink(configLocation)
+      return undefined
+    })
+  } catch (e) {
+    // ignore
+  }
+  return undefined
+}
+
+function appendDocumentLocations(
+  conf: Types.ConfiguredOutput,
+  packages: string[],
+): Types.ConfiguredOutput {
+  const documents = Array.isArray(conf.documents) ? conf.documents : [conf.documents]
+  documents.push(...packages.map((p) => `${p}/**/*.graphql`))
+
+  return conf
+}
+
+async function main() {
+  // Make sure we dont already have a --config or -c cli argument as we're going to override it.
+  if (process.argv.includes('--config') || process.argv.includes('-c')) {
+    throw Error('--config or -c argument is not supported, modify codegen.yml to make changes')
+  }
+
+  const packages = [...resolveDependenciesSync().values()].filter((p) => p !== '.')
+
+  // Detect if we're operating in the monorepo environment or in an installation
+  const isMono = !!packages.find((p) => p.startsWith('../..'))
+
+  // Load the current codegen.yml
+  // Todo: implement loading with a custom --config or -c here.
+  const conf = await loadCodegenConfig({ configFilePath: root })
+
+  // Get a a list of all generates configurations.
+  const generates = Object.entries(conf.config.generates)
+
+  let extension: string | undefined
+
+  // Find the file extension used for the generated graphql files and cleanup if not used anymore.
+  generates.forEach(([, gen]) => {
+    if (Array.isArray(gen)) return
+    if (gen.presetConfig?.extension) extension = gen.presetConfig.extension
   })
+  if (extension) rimraf(path.join(root, `**/*${extension}`), console.error)
+
+  // - Prepend the all targets with ../../ if we're running in a monorepo setup.
+  // - Append all the Graphcommerce packages to the configuration
+  conf.config.generates = Object.fromEntries(
+    generates.map(([generateTarget, generateConf]) => [
+      isMono ? `../../${generateTarget}` : generateTarget,
+      Array.isArray(generateConf) ? generateConf : appendDocumentLocations(generateConf, packages),
+    ]),
+  )
+
+  // Reexport the mesh to is can be used by codegen
+  await fs.writeFile(configLocation, yaml.stringify(conf.config))
+
+  // Append the new cli argument
+  process.argv.push('--config')
+  process.argv.push(configLocation)
+
+  // Run the cli
+  const result = await runCli(cmd)
+  await cleanup()
+  process.exit(result)
+}
+
+main().catch((e) => {
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  cleanup()
+  cliError(e)
+})

package/bin/graphcommerce.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+process.exit(1)

package/bin/is-monorepo.ts

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+
+import { ChildProcess, spawn } from 'node:child_process'
+import { isMonorepo } from '@graphcommerce/next-config'
+import { detect } from 'detect-package-manager'
+
+/**
+ * Executes a command dependening if we're running in a monorepo or not Usage:
+ *
+ *     is-monorepo '[pkgrun] run my-script' '[pkgrun] run my-other-script'
+ *
+ * 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`.
+ */
+async function main() {
+  const isMono = isMonorepo()
+  const command = isMono ? process.argv.slice(2)[0] : process.argv.slice(2)[1]
+
+  let packageManager = 'yarn'
+  try {
+    packageManager = await detect({ cwd: isMono ? `../..` : `.` })
+  } catch {
+    console.error('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: ChildProcess = spawn(cmd, args, { shell: true, stdio: 'inherit' })
+
+  childProcess.on('exit', (code) => {
+    process.exit(code ?? 0)
+  })
+}
+
+main().catch((error) => {
+  console.error(error)
+  process.exit(1)
+})

package/bin/mesh.ts

@@ -4,12 +4,13 @@
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import { exit } from 'node:process'
+import { isMonorepo } from '@graphcommerce/next-config'
 import { graphqlMesh, DEFAULT_CLI_PARAMS, GraphQLMeshCLIParams } from '@graphql-mesh/cli'
 import { Logger, YamlConfig } from '@graphql-mesh/types'
 import { DefaultLogger } from '@graphql-mesh/utils'
 import dotenv from 'dotenv'
 import yaml from 'yaml'
-import { findConfig } from '../mesh/findConfig'
+import { findConfig } from '../utils/findConfig'
 
 dotenv.config()
 
@@ -24,14 +25,12 @@ const root = process.cwd()
 const meshDir = path.dirname(require.resolve('@graphcommerce/graphql-mesh'))
 const relativePath = path.join(path.relative(meshDir, root), '/')
 
-const isMonoRepo = relativePath.startsWith(`..${path.sep}..${path.sep}examples`)
-
 const cliParams: GraphQLMeshCLIParams = {
   ...DEFAULT_CLI_PARAMS,
   playgroundTitle: 'GraphCommerce® Mesh',
 }
 
-const tmpMesh = `_tmp_mesh_${Math.random().toString(36).substring(2, 15)}`
+const tmpMesh = `_tmp_codegen`
 const tmpMeshLocation = path.join(root, `.${tmpMesh}rc.yml`)
 
 async function cleanup() {
@@ -71,7 +70,7 @@ const main = async () => {
 
   // Scan the current working directory to also read all graphqls files.
   conf.additionalTypeDefs.push('**/*.graphqls')
-  if (isMonoRepo) {
+  if (isMonorepo()) {
     conf.additionalTypeDefs.push('../../packages/**/*.graphqls')
     conf.additionalTypeDefs.push('../../packagesDev/**/*.graphqls')
   } else {
@@ -98,4 +97,7 @@ const main = async () => {
 process.on('SIGINT', cleanup)
 process.on('SIGTERM', cleanup)
 
-main().catch((e) => handleFatalError(e, new DefaultLogger(DEFAULT_CLI_PARAMS.initialLoggerPrefix)))
+main().catch((e) => {
+  cleanup()
+  return handleFatalError(e, new DefaultLogger(DEFAULT_CLI_PARAMS.initialLoggerPrefix))
+})

package/dist/bin/codegen.js

@@ -1,13 +1,78 @@
 #!/usr/bin/env node
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable import/no-extraneous-dependencies */
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const next_config_1 = require("@graphcommerce/next-config");
 const cli_1 = require("@graphql-codegen/cli");
+const rimraf_1 = __importDefault(require("rimraf"));
+const yaml_1 = __importDefault(require("yaml"));
 const [, , cmd] = process.argv;
-// console.log(process.argv)
-(0, cli_1.runCli)(cmd)
-    .then((result) => {
+const root = process.cwd();
+const configLocation = node_path_1.default.join(root, `._tmp_codegen.yml`);
+async function cleanup() {
+    try {
+        await promises_1.default.stat(configLocation).then((r) => {
+            if (r.isFile())
+                return promises_1.default.unlink(configLocation);
+            return undefined;
+        });
+    }
+    catch (e) {
+        // ignore
+    }
+    return undefined;
+}
+function appendDocumentLocations(conf, packages) {
+    const documents = Array.isArray(conf.documents) ? conf.documents : [conf.documents];
+    documents.push(...packages.map((p) => `${p}/**/*.graphql`));
+    return conf;
+}
+async function main() {
+    // Make sure we dont already have a --config or -c cli argument as we're going to override it.
+    if (process.argv.includes('--config') || process.argv.includes('-c')) {
+        throw Error('--config or -c argument is not supported, modify codegen.yml to make changes');
+    }
+    const packages = [...(0, next_config_1.resolveDependenciesSync)().values()].filter((p) => p !== '.');
+    // Detect if we're operating in the monorepo environment or in an installation
+    const isMono = !!packages.find((p) => p.startsWith('../..'));
+    // Load the current codegen.yml
+    // Todo: implement loading with a custom --config or -c here.
+    const conf = await (0, cli_1.loadCodegenConfig)({ configFilePath: root });
+    // Get a a list of all generates configurations.
+    const generates = Object.entries(conf.config.generates);
+    let extension;
+    // Find the file extension used for the generated graphql files and cleanup if not used anymore.
+    generates.forEach(([, gen]) => {
+        if (Array.isArray(gen))
+            return;
+        if (gen.presetConfig?.extension)
+            extension = gen.presetConfig.extension;
+    });
+    if (extension)
+        (0, rimraf_1.default)(node_path_1.default.join(root, `**/*${extension}`), console.error);
+    // - Prepend the all targets with ../../ if we're running in a monorepo setup.
+    // - Append all the Graphcommerce packages to the configuration
+    conf.config.generates = Object.fromEntries(generates.map(([generateTarget, generateConf]) => [
+        isMono ? `../../${generateTarget}` : generateTarget,
+        Array.isArray(generateConf) ? generateConf : appendDocumentLocations(generateConf, packages),
+    ]));
+    // Reexport the mesh to is can be used by codegen
+    await promises_1.default.writeFile(configLocation, yaml_1.default.stringify(conf.config));
+    // Append the new cli argument
+    process.argv.push('--config');
+    process.argv.push(configLocation);
+    // Run the cli
+    const result = await (0, cli_1.runCli)(cmd);
+    await cleanup();
     process.exit(result);
-})
-    .catch((error) => {
-    (0, cli_1.cliError)(error);
+}
+main().catch((e) => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    cleanup();
+    (0, cli_1.cliError)(e);
 });

package/dist/bin/graphcommerce.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+"use strict";
+process.exit(1);

package/dist/bin/is-monorepo.js

@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_child_process_1 = require("node:child_process");
+const next_config_1 = require("@graphcommerce/next-config");
+const detect_package_manager_1 = require("detect-package-manager");
+/**
+ * Executes a command dependening if we're running in a monorepo or not Usage:
+ *
+ *     is-monorepo '[pkgrun] run my-script' '[pkgrun] run my-other-script'
+ *
+ * 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`.
+ */
+async function main() {
+    const isMono = (0, next_config_1.isMonorepo)();
+    const command = isMono ? process.argv.slice(2)[0] : process.argv.slice(2)[1];
+    let packageManager = 'yarn';
+    try {
+        packageManager = await (0, detect_package_manager_1.detect)({ cwd: isMono ? `../..` : `.` });
+    }
+    catch {
+        console.error('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 = (0, node_child_process_1.spawn)(cmd, args, { shell: true, stdio: 'inherit' });
+    childProcess.on('exit', (code) => {
+        process.exit(code ?? 0);
+    });
+}
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});

package/dist/bin/mesh.js

@@ -10,11 +10,12 @@ exports.handleFatalError = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = require("node:process");
+const next_config_1 = require("@graphcommerce/next-config");
 const cli_1 = require("@graphql-mesh/cli");
 const utils_1 = require("@graphql-mesh/utils");
 const dotenv_1 = __importDefault(require("dotenv"));
 const yaml_1 = __importDefault(require("yaml"));
-const findConfig_1 = require("../mesh/findConfig");
+const findConfig_1 = require("../utils/findConfig");
 dotenv_1.default.config();
 function handleFatalError(e, logger = new utils_1.DefaultLogger('◈')) {
     logger.error(e.stack || e.message);
@@ -27,12 +28,11 @@ exports.handleFatalError = handleFatalError;
 const root = process.cwd();
 const meshDir = node_path_1.default.dirname(require.resolve('@graphcommerce/graphql-mesh'));
 const relativePath = node_path_1.default.join(node_path_1.default.relative(meshDir, root), '/');
-const isMonoRepo = relativePath.startsWith(`..${node_path_1.default.sep}..${node_path_1.default.sep}examples`);
 const cliParams = {
     ...cli_1.DEFAULT_CLI_PARAMS,
     playgroundTitle: 'GraphCommerce® Mesh',
 };
-const tmpMesh = `_tmp_mesh_${Math.random().toString(36).substring(2, 15)}`;
+const tmpMesh = `_tmp_codegen`;
 const tmpMeshLocation = node_path_1.default.join(root, `.${tmpMesh}rc.yml`);
 async function cleanup() {
     try {
@@ -67,7 +67,7 @@ const main = async () => {
     });
     // Scan the current working directory to also read all graphqls files.
     conf.additionalTypeDefs.push('**/*.graphqls');
-    if (isMonoRepo) {
+    if ((0, next_config_1.isMonorepo)()) {
         conf.additionalTypeDefs.push('../../packages/**/*.graphqls');
         conf.additionalTypeDefs.push('../../packagesDev/**/*.graphqls');
     }
@@ -86,4 +86,7 @@ const main = async () => {
 };
 process.on('SIGINT', cleanup);
 process.on('SIGTERM', cleanup);
-main().catch((e) => handleFatalError(e, new utils_1.DefaultLogger(cli_1.DEFAULT_CLI_PARAMS.initialLoggerPrefix)));
+main().catch((e) => {
+    cleanup();
+    return handleFatalError(e, new utils_1.DefaultLogger(cli_1.DEFAULT_CLI_PARAMS.initialLoggerPrefix));
+});

package/dist/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/index.ts

@@ -0,0 +1 @@
+export {}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "1.0.10",
+  "version": "4.30.0-canary.1",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -10,25 +10,33 @@
     "build": "tsc --outDir dist",
     "prepack": "yarn build"
   },
+  "main": "dist/index.js",
   "bin": {
     "mesh": "dist/bin/mesh.js",
     "gql-mesh": "dist/bin/mesh.js",
     "graphql-mesh": "dist/bin/mesh.js",
     "gql-gen": "dist/bin/codegen.js",
     "graphql-codegen": "dist/bin/codegen.js",
-    "graphql-code-generator": "dist/bin/codegen.js"
+    "graphql-code-generator": "dist/bin/codegen.js",
+    "is-monorepo": "dist/bin/is-monorepo.js",
+    "graphcommerce": "dist/bin/graphcommerce.js"
   },
   "dependencies": {
+    "@graphcommerce/next-config": "4.30.0-canary.1",
     "@graphql-codegen/cli": "2.11.8",
     "@graphql-mesh/cli": "0.76.2",
     "@graphql-mesh/types": "0.80.2",
-    "@graphql-mesh/utils": "0.40.0"
+    "@graphql-mesh/utils": "0.40.0",
+    "cosmiconfig": "^7.0.1",
+    "detect-package-manager": "^2.0.1",
+    "rimraf": "^3.0.2"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.10",
-    "@graphcommerce/prettier-config-pwa": "^4.0.6",
-    "@graphcommerce/typescript-config-pwa": "^4.0.4",
+    "@graphcommerce/eslint-config-pwa": "^4.1.11-canary.0",
+    "@graphcommerce/prettier-config-pwa": "^4.0.7-canary.0",
+    "@graphcommerce/typescript-config-pwa": "^4.0.5-canary.0",
     "@playwright/test": "^1.21.1",
+    "@types/rimraf": "^3.0.2",
     "typescript": "4.7.4"
   },
   "sideEffects": false,

package/tsconfig.json

@@ -1,6 +1,13 @@
 {
   "exclude": ["**/node_modules", "**/.*/"],
   "include": ["**/*.ts", "**/*.tsx"],
+  "files": [
+    "bin/codegen.ts",
+    "bin/mesh.ts",
+    "bin/graphcommerce.ts",
+    "bin/is-monorepo.ts",
+    "index.ts"
+  ],
   "extends": "@graphcommerce/typescript-config-pwa/node.json",
   "compilerOptions": {
     "noEmit": false,