refactor cli-kit to vertical slices of shopify product domains

bin/get-graphql-schemas.js

@@ -56,7 +56,7 @@ const schemas = [
     owner: 'shop',
     repo: 'world',
     pathToFile: 'areas/core/shopify/db/graphql/admin_schema_unstable_public.graphql',
-    localPath: './packages/cli-kit/src/cli/api/graphql/admin/admin_schema.graphql',
+    localPath: './packages/cli-kit/src/admin/graphql/admin_schema.graphql',
     usesLfs: true,
   },
   {

configurations/vite.config.ts

@@ -72,7 +72,7 @@ export const aliases = (packagePath: string) => {
     {
       find: /@shopify\/cli-kit\/(.+)/,
       replacement: (importedModule: string) => {
-        return path.join(packagePath, `../cli-kit/src/public/${importedModule.replace('@shopify/cli-kit/', '')}`)
+        return path.join(packagePath, `../cli-kit/src/${importedModule.replace('@shopify/cli-kit/', '')}`)
       },
     },
     {find: '@shopify/cli-kit', replacement: path.join(packagePath, '../cli-kit/src/index')},

graphql.config.ts

@@ -1,20 +1,26 @@
+function graphqlBasePath(name: string, project: string): string {
+  if (project === 'cli-kit') {
+    // cli-kit uses domain-based structure: src/admin/graphql/
+    return `./packages/cli-kit/src/admin/graphql`
+  }
+  return `./packages/${project}/src/cli/api/graphql/${name}`
+}
+
 function projectFactory(name: string, schemaName: string, project: string = 'app') {
+  const basePath = graphqlBasePath(name, project)
   return {
-    schema: `./packages/${project}/src/cli/api/graphql/${name}/${schemaName}`,
-    documents: [
-      `./packages/${project}/src/cli/api/graphql/${name}/queries/**/*.graphql`,
-      `./packages/${project}/src/cli/api/graphql/${name}/mutations/**/*.graphql`,
-    ],
+    schema: `${basePath}/${schemaName}`,
+    documents: [`${basePath}/queries/**/*.graphql`, `${basePath}/mutations/**/*.graphql`],
     extensions: {
       codegen: {
         generates: {
-          [`./packages/${project}/src/cli/api/graphql/${name}/generated/types.d.ts`]: {
+          [`${basePath}/generated/types.d.ts`]: {
             plugins: [
               {'graphql-codegen-typescript-operation-types': {enumsAsTypes: true, useTypeImports: true}},
               {
                 add: {
                   content:
-                    "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any, tsdoc/syntax, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries  */\nimport {JsonMapType} from '@shopify/cli-kit/node/toml'",
+                    "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any, tsdoc/syntax, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries  */\nimport {JsonMapType} from '@shopify/cli-kit/shared/node/toml'",
                 },
               },
             ],
@@ -29,13 +35,13 @@ function projectFactory(name: string, schemaName: string, project: string = 'app
               },
             },
           },
-          [`./packages/${project}/src/cli/api/graphql/${name}/generated/`]: {
+          [`${basePath}/generated/`]: {
             preset: 'near-operation-file',
             plugins: [
               {
                 add: {
                   content:
-                    "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/node/toml'",
+                    "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/shared/node/toml'",
                 },
               },
               {

packages/app/src/cli/api/admin-as-app.test.ts

@@ -1,10 +1,10 @@
 import {adminAsAppRequestDoc} from './admin-as-app.js'
-import {graphqlRequestDoc} from '@shopify/cli-kit/node/api/graphql'
-import {AdminSession} from '@shopify/cli-kit/node/session'
+import {graphqlRequestDoc} from '@shopify/cli-kit/shared/node/api/graphql'
+import {AdminSession} from '@shopify/cli-kit/identity/session'
 import {describe, test, expect, vi, beforeEach} from 'vitest'
 import {TypedDocumentNode} from '@graphql-typed-document-node/core'
 
-vi.mock('@shopify/cli-kit/node/api/graphql')
+vi.mock('@shopify/cli-kit/shared/node/api/graphql')
 
 describe('adminAsAppRequestDoc', () => {
   const mockSession: AdminSession = {

packages/app/src/cli/api/admin-as-app.ts

@@ -1,6 +1,6 @@
-import {graphqlRequestDoc} from '@shopify/cli-kit/node/api/graphql'
-import {adminUrl} from '@shopify/cli-kit/node/api/admin'
-import {AdminSession} from '@shopify/cli-kit/node/session'
+import {graphqlRequestDoc} from '@shopify/cli-kit/shared/node/api/graphql'
+import {adminUrl} from '@shopify/cli-kit/admin/api'
+import {AdminSession} from '@shopify/cli-kit/identity/session'
 import {Variables} from 'graphql-request'
 import {TypedDocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/admin/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-dev/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/app-dev/queries/dev-session-update.graphql

@@ -1,5 +1,10 @@
 mutation DevSessionUpdate($appId: String!, $assetsUrl: String, $manifest: JSON, $inheritedModuleUids: [String!]!) {
-  devSessionUpdate(appId: $appId, assetsUrl: $assetsUrl, manifest: $manifest, inheritedModuleUids: $inheritedModuleUids) {
+  devSessionUpdate(
+    appId: $appId
+    assetsUrl: $assetsUrl
+    manifest: $manifest
+    inheritedModuleUids: $inheritedModuleUids
+  ) {
     userErrors {
       message
       on

packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/create-app.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/release-version.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import * as Types from './types.js'
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 

packages/app/src/cli/api/graphql/app-management/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/app-management/queries/app-versions.graphql

@@ -15,7 +15,7 @@ query AppVersions($appId: ID!) {
           createdBy
           metadata {
             message
-              versionTag
+            versionTag
           }
         }
       }

packages/app/src/cli/api/graphql/app-management/queries/apps.graphql

@@ -6,9 +6,9 @@ query listApps($query: String) {
         key
         activeRelease {
           id
-            version {
-              name
-            }
+          version {
+            name
+          }
         }
       }
     }

packages/app/src/cli/api/graphql/bulk-operations/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-cancel.graphql

@@ -20,4 +20,3 @@ mutation BulkOperationCancel($id: ID!) {
     }
   }
 }
-

packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-mutation.graphql

@@ -1,8 +1,4 @@
-mutation BulkOperationRunMutation(
-  $mutation: String!
-  $stagedUploadPath: String!
-  $clientIdentifier: String
-) {
+mutation BulkOperationRunMutation($mutation: String!, $stagedUploadPath: String!, $clientIdentifier: String) {
   bulkOperationRunMutation(
     mutation: $mutation
     stagedUploadPath: $stagedUploadPath
@@ -26,4 +22,3 @@ mutation BulkOperationRunMutation(
     }
   }
 }
-

packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-query.graphql

@@ -1,7 +1,5 @@
 mutation BulkOperationRunQuery($query: String!) {
-  bulkOperationRunQuery(
-    query: $query
-  ) {
+  bulkOperationRunQuery(query: $query) {
     bulkOperation {
       type
       completedAt
@@ -20,4 +18,3 @@ mutation BulkOperationRunQuery($query: String!) {
     }
   }
 }
-

packages/app/src/cli/api/graphql/bulk-operations/mutations/staged-uploads-create.graphql

@@ -14,4 +14,3 @@ mutation StagedUploadsCreate($input: [StagedUploadInput!]!) {
     }
   }
 }
-

packages/app/src/cli/api/graphql/business-platform-destinations/queries/user-info.graphql

@@ -2,7 +2,7 @@ query UserInfo {
   currentUserAccount {
     uuid
     email
-    organizations(first: 2){
+    organizations(first: 2) {
       nodes {
         name
       }

packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/business-platform-organizations/queries/provision_shop_access.graphql

@@ -1,6 +1,6 @@
 mutation ProvisionShopAccess($input: OrganizationUserProvisionShopAccessInput!) {
   organizationUserProvisionShopAccess(organizationUserProvisionShopAccessInput: $input) {
-    success,
+    success
     userErrors {
       message
     }

packages/app/src/cli/api/graphql/current_account_info.ts

@@ -1,7 +1,7 @@
 import {CurrentAccountInfoQuery} from './partners/generated/current-account-info.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
-import {AccountInfo} from '@shopify/cli-kit/node/session'
-import {AbortError} from '@shopify/cli-kit/node/error'
+import {AccountInfo} from '@shopify/cli-kit/identity/session'
+import {AbortError} from '@shopify/cli-kit/shared/node/error'
 
 export type CurrentAccountInfoSchema = CurrentAccountInfoQuery
 

packages/app/src/cli/api/graphql/partners/generated/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any  */
-import {JsonMapType} from '@shopify/cli-kit/node/toml'
+import {JsonMapType} from '@shopify/cli-kit/shared/node/toml'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>

packages/app/src/cli/api/graphql/partners/queries/dev-stores-by-org.graphql

@@ -1,17 +1,17 @@
 query DevStoresByOrg($id: ID!) {
-    organizations(id: $id, first: 1) {
-      nodes {
-        id
-        stores(first: 500, archived: false, type: [DEVELOPMENT, MANAGED, PLUS_SANDBOX]) {
-          nodes {
-            shopId
-            link
-            shopDomain
-            shopName
-            transferDisabled
-            convertableToPartnerTest
-          }
+  organizations(id: $id, first: 1) {
+    nodes {
+      id
+      stores(first: 500, archived: false, type: [DEVELOPMENT, MANAGED, PLUS_SANDBOX]) {
+        nodes {
+          shopId
+          link
+          shopDomain
+          shopName
+          transferDisabled
+          convertableToPartnerTest
         }
       }
     }
+  }
 }

packages/app/src/cli/api/graphql/webhooks/queries/cli-testing.graphql

@@ -1,5 +1,19 @@
-mutation CliTesting($address: String!, $apiKey: String, $apiVersion: String!, $deliveryMethod: String!, $sharedSecret: String!, $topic: String!) {
-  cliTesting(address: $address, apiKey: $apiKey, apiVersion: $apiVersion, deliveryMethod: $deliveryMethod, sharedSecret: $sharedSecret, topic: $topic) {
+mutation CliTesting(
+  $address: String!
+  $apiKey: String
+  $apiVersion: String!
+  $deliveryMethod: String!
+  $sharedSecret: String!
+  $topic: String!
+) {
+  cliTesting(
+    address: $address
+    apiKey: $apiKey
+    apiVersion: $apiVersion
+    deliveryMethod: $deliveryMethod
+    sharedSecret: $sharedSecret
+    topic: $topic
+  ) {
     headers
     samplePayload
     success

packages/app/src/cli/commands/app/app-logs/sources.ts

@@ -2,7 +2,7 @@ import {appFlags} from '../../../flags.js'
 import {linkedAppContext} from '../../../services/app-context.js'
 import {sources} from '../../../services/app-logs/sources.js'
 import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js'
-import {globalFlags} from '@shopify/cli-kit/node/cli'
+import {globalFlags} from '@shopify/cli-kit/shared/node/cli'
 
 export default class Sources extends AppLinkedCommand {
   static summary = 'Print out a list of sources that may be used with the logs command.'

packages/app/src/cli/commands/app/build.ts

@@ -3,8 +3,8 @@ import build from '../../services/build.js'
 import {localAppContext} from '../../services/app-context.js'
 import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../utilities/app-unlinked-command.js'
 import {Flags} from '@oclif/core'
-import {globalFlags} from '@shopify/cli-kit/node/cli'
-import {addPublicMetadata} from '@shopify/cli-kit/node/metadata'
+import {globalFlags} from '@shopify/cli-kit/shared/node/cli'
+import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata'
 
 export default class Build extends AppUnlinkedCommand {
   static summary = 'Build the app, including extensions.'

packages/app/src/cli/commands/app/bulk/cancel.ts

@@ -4,8 +4,8 @@ import {prepareAppStoreContext} from '../../../utilities/execute-command-helpers
 import {cancelBulkOperation} from '../../../services/bulk-operations/cancel-bulk-operation.js'
 import {normalizeBulkOperationId} from '../../../services/bulk-operations/bulk-operation-status.js'
 import {Flags} from '@oclif/core'
-import {globalFlags} from '@shopify/cli-kit/node/cli'
-import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
+import {globalFlags} from '@shopify/cli-kit/shared/node/cli'
+import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn'
 
 export default class BulkCancel extends AppLinkedCommand {
   static summary = 'Cancel a bulk operation.'

packages/app/src/cli/commands/app/bulk/execute.ts

@@ -2,7 +2,7 @@ import {appFlags, bulkOperationFlags} from '../../../flags.js'
 import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js'
 import {executeBulkOperation} from '../../../services/bulk-operations/execute-bulk-operation.js'
 import {prepareExecuteContext} from '../../../utilities/execute-command-helpers.js'
-import {globalFlags} from '@shopify/cli-kit/node/cli'
+import {globalFlags} from '@shopify/cli-kit/shared/node/cli'
 
 export default class BulkExecute extends AppLinkedCommand {
   static summary = 'Execute bulk operations.'