@graphcommerce/cli 9.0.0-canary.99 → 9.0.1-canary.0

package/package.json

@@ -2,49 +2,42 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.99",
+  "version": "9.0.1-canary.0",
   "scripts": {
-    "dev": "tsc --preserveWatchOutput --watch",
-    "build": "tsc",
-    "prepack": "tsc"
+    "dev": "pkgroll --watch",
+    "build": "pkgroll",
+    "prepack": "pkgroll"
   },
-  "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
+  "type": "module",
   "bin": {
-    "gql-gen": "dist/bin/codegen.js",
-    "gql-mesh": "dist/bin/mesh.js",
+    "gc-gql-codegen": "dist/bin/codegen.js",
+    "gc-mesh": "dist/bin/mesh.js",
     "graphcommerce": "dist/bin/graphcommerce.js",
-    "graphql-code-generator": "dist/bin/codegen.js",
-    "graphql-codegen": "dist/bin/codegen.js",
-    "graphql-mesh": "dist/bin/mesh.js",
-    "is-monorepo": "dist/bin/is-monorepo.js",
-    "mesh": "dist/bin/mesh.js"
+    "is-monorepo": "dist/bin/is-monorepo.js"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "5.0.2",
-    "@graphql-mesh/cli": "latest",
-    "@graphql-mesh/cross-helpers": "latest",
-    "@graphql-mesh/runtime": "latest",
-    "@graphql-mesh/store": "latest",
-    "@graphql-mesh/types": "latest",
-    "@graphql-mesh/utils": "latest",
-    "@graphql-tools/utils": "^10.3.2",
+    "@graphql-codegen/cli": "5.0.3",
     "cosmiconfig": "^8.3.6",
     "detect-package-manager": "^3.0.2",
-    "graphql-codegen-typescript-validation-schema": "^0.15.0",
+    "dotenv": "16.4.7",
+    "graphql": "^16.10.0",
+    "graphql-codegen-typescript-validation-schema": "^0.17.0",
     "graphql-tag": "^2.12.6",
-    "rimraf": "^5.0.9",
-    "tslib": "^2.6.3",
-    "tsx": "^4.16.2"
+    "rimraf": "^5.0.10",
+    "tslib": "^2.8.1",
+    "tsx": "^4.19.2",
+    "yaml": "2.6.1"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.99",
-    "@graphcommerce/hygraph-cli": "^9.0.0-canary.99",
-    "@graphcommerce/next-config": "^9.0.0-canary.99",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.99",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.99",
-    "graphql": "^16.7.1",
+    "@graphcommerce/eslint-config-pwa": "^9.0.1-canary.0",
+    "@graphcommerce/graphql-mesh": "^9.0.1-canary.0",
+    "@graphcommerce/hygraph-cli": "^9.0.1-canary.0",
+    "@graphcommerce/next-config": "^9.0.1-canary.0",
+    "@graphcommerce/prettier-config-pwa": "^9.0.1-canary.0",
+    "@graphcommerce/typescript-config-pwa": "^9.0.1-canary.0",
+    "@graphql-mesh/cli": "*",
+    "@graphql-mesh/types": "*",
+    "@graphql-mesh/utils": "*",
     "react": "^18.2.0"
   },
   "sideEffects": false,
@@ -57,5 +50,8 @@
     "parserOptions": {
       "project": "./tsconfig.json"
     }
+  },
+  "devDependencies": {
+    "pkgroll": "^2.5.1"
   }
 }

package/src/bin/codegen.ts

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
+
 /* eslint-disable import/no-extraneous-dependencies */
-import fs from 'node:fs/promises'
-import path from 'node:path'
 import { packageRoots, resolveDependenciesSync } from '@graphcommerce/next-config'
-import { runCli, cliError, loadCodegenConfig } from '@graphql-codegen/cli'
-import { Types } from '@graphql-codegen/plugin-helpers'
+import { cliError, loadCodegenConfig, runCli } from '@graphql-codegen/cli'
+import type { Types } from '@graphql-codegen/plugin-helpers'
 import dotenv from 'dotenv'
+import fs from 'node:fs/promises'
+import path from 'node:path'
 import { rimraf } from 'rimraf'
 import yaml from 'yaml'
 
@@ -14,7 +15,7 @@ const [, , cmd] = process.argv
 dotenv.config()
 
 const root = process.cwd()
-const configLocation = path.join(root, `._tmp_codegen.yml`)
+const configLocation = path.join(root, '._tmp_codegen.yml')
 
 async function cleanup() {
   try {

package/src/bin/graphcommerce.ts

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 
 const commands = {
+  codegen: () => import('@graphcommerce/next-config').then((m) => m.codegen),
   'codegen-config': () => import('@graphcommerce/next-config').then((m) => m.generateConfig),
+  'copy-files': () => import('@graphcommerce/next-config').then((m) => m.copyFiles),
   'codegen-interceptors': () =>
     import('@graphcommerce/next-config').then((m) => m.codegenInterceptors),
   'export-config': () => import('@graphcommerce/next-config').then((m) => m.exportConfig),

package/src/bin/is-monorepo.ts

@@ -1,44 +1,64 @@
 #!/usr/bin/env node
-
-import { ChildProcess, spawn } from 'node:child_process'
-import { isMonorepo } from '@graphcommerce/next-config'
+import type { ChildProcess } from 'node:child_process'
+import { spawn } from 'node:child_process'
+import path from 'node:path'
+import { findParentPath } 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}`)
+
 /**
- * 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 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)
 })

package/src/bin/mesh.ts

@@ -1,30 +1,32 @@
-#!/usr/bin/env node
 /* eslint-disable import/no-extraneous-dependencies */
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import { exit } from 'node:process'
+import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
 import {
   loadConfig,
   packageRoots,
   replaceConfigInString,
   resolveDependenciesSync,
+  sig,
 } from '@graphcommerce/next-config'
-import { graphqlMesh, DEFAULT_CLI_PARAMS, GraphQLMeshCLIParams } from '@graphql-mesh/cli'
-import { Logger, YamlConfig } from '@graphql-mesh/types'
-import { Handler } from '@graphql-mesh/types/typings/config'
-import { DefaultLogger } from '@graphql-mesh/utils'
+import type { GraphQLMeshCLIParams } from '@graphql-mesh/cli'
+import { DEFAULT_CLI_PARAMS, graphqlMesh } from '@graphql-mesh/cli'
+import type { Logger, YamlConfig } from '@graphql-mesh/types'
+import { DefaultLogger, fileURLToPath } from '@graphql-mesh/utils'
 import dotenv from 'dotenv'
-import type { OmitIndexSignature, Entries } from 'type-fest'
+import 'tsx/cjs'
+import 'tsx/esm'
+import type { Entries, OmitIndexSignature } from 'type-fest'
 import yaml from 'yaml'
 import { findConfig } from '../utils/findConfig'
-import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
-// eslint-disable-next-line import/no-unresolved
-import 'tsx/cjs' // support importing typescript configs in CommonJS
-// eslint-disable-next-line import/no-unresolved
-import 'tsx/esm' // support importing typescript configs in ESM
 
 dotenv.config()
 
+function resolvePath(pathStr: string) {
+  return fileURLToPath(import.meta.resolve(pathStr))
+}
+
 export function handleFatalError(e: Error, logger: Logger = new DefaultLogger('◈')) {
   logger.error(e.stack || e.message)
   // eslint-disable-next-line no-console
@@ -33,7 +35,7 @@ export function handleFatalError(e: Error, logger: Logger = new DefaultLogger('
 }
 
 const root = process.cwd()
-const meshDir = path.dirname(require.resolve('@graphcommerce/graphql-mesh'))
+const meshDir = path.dirname(resolvePath('@graphcommerce/graphql-mesh'))
 const relativePath = path.join(path.relative(meshDir, root), '/')
 
 const cliParams: GraphQLMeshCLIParams = {
@@ -41,7 +43,7 @@ const cliParams: GraphQLMeshCLIParams = {
   playgroundTitle: 'GraphCommerce® Mesh',
 }
 
-const tmpMesh = `_tmp_mesh`
+const tmpMesh = '_tmp_mesh'
 const tmpMeshLocation = path.join(root, `.${tmpMesh}rc.yml`)
 
 async function cleanup() {
@@ -60,12 +62,14 @@ const main = async () => {
   const baseConf = (await findConfig({})) as YamlConfig.Config
   const graphCommerce = loadConfig(root)
 
-  // eslint-disable-next-line global-require
-  // @ts-ignore Might not exist
-  const { meshConfig } = (await import('@graphcommerce/graphql-mesh/meshConfig.interceptor')) as {
-    meshConfig: typeof meshConfigBase
+  const meshConfigf = (await import(
+    '@graphcommerce/graphql-mesh/meshConfig.interceptor'
+  )) as unknown as {
+    default: {
+      meshConfig: typeof meshConfigBase
+    }
   }
-  const conf = meshConfig(baseConf, graphCommerce)
+  const conf = meshConfigf.default.meshConfig(baseConf, graphCommerce)
 
   // We're configuring a custom fetch function
   conf.customFetch = '@graphcommerce/graphql-mesh/customFetch'
@@ -76,12 +80,12 @@ const main = async () => {
   conf.additionalResolvers = conf.additionalResolvers?.map((additionalResolver) => {
     if (typeof additionalResolver !== 'string') return additionalResolver
     if (additionalResolver.startsWith('@'))
-      return path.relative(root, require.resolve(additionalResolver))
+      return path.relative(root, resolvePath(additionalResolver))
 
     return additionalResolver
   })
 
-  type DefinedHandler = OmitIndexSignature<Handler>
+  type DefinedHandler = OmitIndexSignature<YamlConfig.Handler>
 
   conf.sources = conf.sources.map((source) => {
     const definedHandlers = Object.entries(source.handler) as Entries<DefinedHandler>
@@ -92,10 +96,7 @@ const main = async () => {
           if (key === 'openapi' && value) {
             const openapi = value as NonNullable<DefinedHandler['openapi']>
             if (openapi.source.startsWith('@')) {
-              return [
-                key,
-                { ...openapi, source: path.relative(root, require.resolve(openapi.source)) },
-              ]
+              return [key, { ...openapi, source: path.relative(root, resolvePath(openapi.source)) }]
             }
           }
 
@@ -111,7 +112,7 @@ const main = async () => {
     Array.isArray(conf.additionalTypeDefs) ? conf.additionalTypeDefs : [conf.additionalTypeDefs]
   ).map((additionalTypeDef) => {
     if (typeof additionalTypeDef === 'string' && additionalTypeDef.startsWith('@'))
-      return path.relative(root, require.resolve(additionalTypeDef))
+      return path.relative(root, resolvePath(additionalTypeDef))
 
     return additionalTypeDef
   })
@@ -126,13 +127,24 @@ const main = async () => {
   const packages = [...deps.values()].filter((p) => p !== '.')
 
   const mV = graphCommerce.magentoVersion ?? 246
+  sig()
+
   packageRoots(packages).forEach((r) => {
-    const alsoScan = [245, 246, 247, 248, 249, 250, 251, 252, 253, 254]
+    conf.additionalTypeDefs.push(`${r}/*/schema/**/*.graphqls`)
+
+    const scanVersions = [245, 246, 247, 248, 249, 250, 251, 252, 253, 254]
       .filter((v) => v > mV)
       .map((v) => `${r}/*/schema-${v}/**/*.graphqls`)
 
-    conf.additionalTypeDefs.push(`${r}/*/schema/**/*.graphqls`)
-    conf.additionalTypeDefs.push(...alsoScan)
+    conf.additionalTypeDefs.push(...scanVersions)
+
+    if (globalThis.gcl?.includes(atob('QGdyYXBoY29tbWVyY2UvYWRvYmUtY29tbWVyY2U='))) {
+      conf.additionalTypeDefs.push(`${r}/*/schema-ac/**/*.graphqls`)
+      const scanVersionAC = [245, 246, 247, 248, 249, 250, 251, 252, 253, 254]
+        .filter((v) => v > mV)
+        .map((v) => `${r}/*/schema-ac-${v}/**/*.graphqls`)
+      conf.additionalTypeDefs.push(...scanVersionAC)
+    }
   })
 
   if (!conf.serve) conf.serve = {}

package/src/utils/findConfig.ts

@@ -1,8 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import path from 'path'
-import { ConfigProcessOptions } from '@graphql-mesh/config'
-import { defaultImportFn, loadYaml, DefaultLogger } from '@graphql-mesh/utils'
+import type { ConfigProcessOptions } from '@graphql-mesh/config'
+import { DefaultLogger, defaultImportFn, loadYaml } from '@graphql-mesh/utils'
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig'
+import path from 'path'
 
 function customLoader(
   ext: 'json' | 'yaml' | 'js',

package/tsconfig.json

@@ -15,6 +15,8 @@
     "outDir": "dist",
     "sourceMap": false,
     "noLib": false,
-    "strict": true
+    "strict": true,
+    "moduleResolution": "Bundler",
+    "module": "ESNext"
   }
 }

package/dist/index.js

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

package/dist/utils/findConfig.js

@@ -1,71 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfig = findConfig;
-/* eslint-disable import/no-extraneous-dependencies */
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("@graphql-mesh/utils");
-const cosmiconfig_1 = require("cosmiconfig");
-function customLoader(ext, importFn = utils_1.defaultImportFn, initialLoggerPrefix = '🕸️  Mesh') {
-    const logger = new utils_1.DefaultLogger(initialLoggerPrefix).child('config');
-    // eslint-disable-next-line consistent-return
-    function loader(filepath, content) {
-        if (process.env) {
-            // eslint-disable-next-line no-param-reassign
-            content = content.replace(/\$\{(.*?)\}/g, (_, variable) => {
-                let varName = variable;
-                let defaultValue = '';
-                if (variable.includes(':')) {
-                    const spl = variable.split(':');
-                    varName = spl.shift();
-                    defaultValue = spl.join(':');
-                }
-                return process.env[varName] || defaultValue;
-            });
-        }
-        if (ext === 'json') {
-            return cosmiconfig_1.defaultLoaders['.json'](filepath, content);
-        }
-        if (ext === 'yaml') {
-            return (0, utils_1.loadYaml)(filepath, content, logger);
-        }
-        if (ext === 'js') {
-            return importFn(filepath);
-        }
-    }
-    return loader;
-}
-async function findConfig(options) {
-    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix } = options || {};
-    const dir = path_1.default.isAbsolute(configDir) ? configDir : path_1.default.join(process.cwd(), configDir);
-    const explorer = (0, cosmiconfig_1.cosmiconfig)(configName, {
-        searchPlaces: [
-            'package.json',
-            `.${configName}rc`,
-            `.${configName}rc.json`,
-            `.${configName}rc.yaml`,
-            `.${configName}rc.yml`,
-            `.${configName}rc.js`,
-            `.${configName}rc.ts`,
-            `.${configName}rc.cjs`,
-            `${configName}.config.js`,
-            `${configName}.config.cjs`,
-        ],
-        loaders: {
-            '.json': customLoader('json', options?.importFn, initialLoggerPrefix),
-            '.yaml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
-            '.yml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
-            '.js': customLoader('js', options?.importFn, initialLoggerPrefix),
-            '.ts': customLoader('js', options?.importFn, initialLoggerPrefix),
-            noExt: customLoader('yaml', options?.importFn, initialLoggerPrefix),
-        },
-    });
-    const results = await explorer.search(dir);
-    if (!results) {
-        throw new Error(`No ${configName} config file found in "${dir}"!`);
-    }
-    const { config } = results;
-    return config;
-}