@seamapi/cli 0.22.0 → 0.24.0

package/src/lib/context.ts

@@ -1,6 +1,6 @@
 import type { Interactivity } from './args/parse.js'
 import type { ApiBlueprint } from './blueprint/index.js'
-import { type ConfigStore, getConfigStore } from './config/index.js'
+import { type CliConfig, getConfig } from './config/index.js'
 import {
   getEndpointFromEnv,
   getTokenFromEnv,
@@ -32,30 +32,21 @@ export interface AuthContext {
   workspaceIdSource: Exclude<ValueSource, 'default'> | null
 }
 
-export const resolveAuth = (
-  config: ConfigStore = getConfigStore(),
-): AuthContext => {
+export const resolveAuth = (config: CliConfig = getConfig()): AuthContext => {
   const { endpoint: flagEndpoint, workspaceId: flagWorkspaceId } =
     getAuthOverrides()
 
   const envEndpoint = getEndpointFromEnv()
-  // Configs written before the endpoint was called one still hold it under
-  // `server`, so fall back to that key rather than silently resetting them.
-  const storedEndpoint = config.get('endpoint') ?? config.get('server')
-  const endpoint =
-    flagEndpoint ??
-    envEndpoint ??
-    (typeof storedEndpoint === 'string' ? storedEndpoint : null)
+  const storedEndpoint = config.getEndpoint()
+  const endpoint = flagEndpoint ?? envEndpoint ?? storedEndpoint
 
   const envToken = getTokenFromEnv()
   // The token is stored per endpoint, so an overridden endpoint is read with
   // the token belonging to it rather than the one it replaced.
-  const storedToken = readString(
-    config.get(`${endpoint ?? defaultEndpoint}.pat`),
-  )
+  const storedToken = config.getToken(endpoint ?? defaultEndpoint)
 
   const envWorkspaceId = getWorkspaceIdFromEnv()
-  const storedWorkspaceId = readString(config.get('current_workspace_id'))
+  const storedWorkspaceId = config.getWorkspace()
   const workspaceId = flagWorkspaceId ?? envWorkspaceId ?? storedWorkspaceId
 
   return {
@@ -88,7 +79,7 @@ export const resolveAuth = (
  * shape it acts on, and how it may interact with the user.
  */
 export interface CliContext {
-  config: ConfigStore
+  config: CliConfig
   auth: AuthContext
   output: Output
   blueprint: ApiBlueprint
@@ -96,11 +87,3 @@ export interface CliContext {
   /** The Seam API, constructed on first use and shared for the run. */
   api: () => Promise<SeamApi>
 }
-
-const readString = (value: unknown): string | null => {
-  if (typeof value !== 'string') return null
-
-  const trimmedValue = value.trim()
-
-  return trimmedValue === '' ? null : trimmedValue
-}

package/src/lib/interactions/endpoint-selection.ts

@@ -1,11 +1,11 @@
 import { assertMutable, selectEndpoint } from 'lib/auth/operations.js'
-import { getConfigStore } from 'lib/config/index.js'
+import { getConfig } from 'lib/config/index.js'
 import { resolveAuth } from 'lib/context.js'
 import { getOutput } from 'lib/output/get-output.js'
 import { promptAutocomplete } from 'lib/prompt.js'
 
 export async function interactForEndpointSelection() {
-  const config = getConfigStore()
+  const config = getConfig()
   assertMutable(resolveAuth(config), 'endpoint', 'select an endpoint')
 
   const endpoints = ['http://localhost:3020', 'https://connect.getseam.com']

package/src/lib/interactions/index.ts

@@ -14,6 +14,6 @@ export * from './endpoint-selection.js'
 export * from './login.js'
 export * from './resource.js'
 export * from './timestamp.js'
-export * from './use-remote-api-defs.js'
+export * from './use-remote-schema.js'
 export * from './user-identity.js'
 export * from './workspace-id.js'

package/src/lib/interactions/login.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 
 import { assertMutable, storeToken } from 'lib/auth/operations.js'
 import { validateToken } from 'lib/auth/validate-token.js'
-import { getConfigStore } from 'lib/config/index.js'
+import { getConfig } from 'lib/config/index.js'
 import { resolveAuth } from 'lib/context.js'
 import { getOutput } from 'lib/output/get-output.js'
 import { withLoading } from 'lib/output/with-loading.js'
@@ -12,7 +12,7 @@ import { promptText } from 'lib/prompt.js'
 import { interactForWorkspaceId } from './workspace-id.js'
 
 export const interactForLogin = async () => {
-  const config = getConfigStore()
+  const config = getConfig()
   const output = getOutput()
   const auth = resolveAuth(config)
 

package/src/lib/interactions/use-remote-schema.ts

@@ -0,0 +1,22 @@
+import { setUseRemoteSchema } from 'lib/auth/operations.js'
+import { getOutput } from 'lib/output/get-output.js'
+import { promptSelect } from 'lib/prompt.js'
+
+export async function interactForUseRemoteSchema() {
+  const useRemoteSchema = await promptSelect({
+    message: 'Always use the remote schema?',
+    choices: [
+      {
+        label: 'Yes',
+        value: true,
+      },
+      {
+        label: 'No',
+        value: false,
+      },
+    ],
+  })
+
+  setUseRemoteSchema(useRemoteSchema)
+  getOutput().info(`Use remote schema: ${useRemoteSchema}`)
+}

package/src/lib/interactions/workspace-id.ts

@@ -1,14 +1,14 @@
 import { SeamHttpWithoutWorkspace } from '@seamapi/http/connect'
 
 import { assertMutable, selectWorkspace } from 'lib/auth/operations.js'
-import { getConfigStore } from 'lib/config/index.js'
+import { getConfig } from 'lib/config/index.js'
 import { resolveAuth } from 'lib/context.js'
 import { getSeamMultiWorkspace } from 'lib/http/client.js'
 import { withLoading } from 'lib/output/with-loading.js'
 import { promptAutocomplete } from 'lib/prompt.js'
 
 export const interactForWorkspaceId = async (personalAccessToken?: string) => {
-  const config = getConfigStore()
+  const config = getConfig()
 
   // Refuse before prompting: nothing selected here could be stored.
   assertMutable(resolveAuth(config), 'workspaceId', 'select a workspace')

package/src/lib/render/completion/index.ts

@@ -34,7 +34,7 @@ export const renderCompletion = (
  *
  * The loader runs 'seam completion' the first time the shell completes a seam
  * command, so installed completions always match the CLI's current Seam API
- * definitions instead of the definitions packaged at release time. Each shell
+ * schema instead of the schema packaged at release time. Each shell
  * loads its completion file on demand, so the CLI runs once per shell session
  * at first completion, never at shell startup.
  *
@@ -61,7 +61,7 @@ const stubHeader = (shell: CompletionShell): string =>
   `# ${shell} completion loader for the seam command.
 #
 # Generated by @seamapi/cli. Loads completions from the CLI on first use, so
-# they always match the CLI's current Seam API definitions. Requires the seam
+# they always match the CLI's current Seam API schema. Requires the seam
 # command on PATH. Print the underlying script with 'seam completion ${shell}'.`
 
 const stubs: Record<CompletionShell, string> = {

package/src/lib/render/completion/render-bash.ts

@@ -25,7 +25,7 @@ export const renderBashCompletion = (spec: CommandSpec): string => {
 
 const header = `# bash completion for the seam command.
 #
-# Generated by @seamapi/cli from the Seam API definitions.
+# Generated by @seamapi/cli from the Seam API schema.
 # Do not edit: regenerate with 'seam completion bash'.
 #
 # Load it for the current shell with

package/src/lib/render/completion/render-fish.ts

@@ -13,7 +13,7 @@ export const renderFishCompletion = (spec: CommandSpec): string =>
 
 const header = `# fish completion for the seam command.
 #
-# Generated by @seamapi/cli from the Seam API definitions.
+# Generated by @seamapi/cli from the Seam API schema.
 # Do not edit: regenerate with 'seam completion fish'.
 #
 # Install it with

package/src/lib/render/completion/render-zsh.ts

@@ -27,7 +27,7 @@ const header = `#compdef seam
 
 # zsh completion for the seam command.
 #
-# Generated by @seamapi/cli from the Seam API definitions.
+# Generated by @seamapi/cli from the Seam API schema.
 # Do not edit: regenerate with 'seam completion zsh'.
 #
 # Load it for the current shell with

package/src/lib/version.ts

@@ -1,5 +1,5 @@
 // Versions are replaced with generated values when the package is packed.
-const seamapiCliVersion = '0.22.0'
+const seamapiCliVersion = '0.24.0'
 const seamapiBlueprintVersion = '1.5.0'
 
 export { seamapiBlueprintVersion }

package/lib/commands/local/config-use-remote-api-defs.d.ts

@@ -1,2 +0,0 @@
-import type { Command } from '../../commands/registry.js';
-export declare const configUseRemoteApiDefsCommand: Command;

package/lib/commands/local/config-use-remote-api-defs.js

@@ -1,20 +0,0 @@
-import { NonInteractiveError } from '../../errors.js';
-import { interactForUseRemoteApiDefs } from '../../interactions/index.js';
-export const configUseRemoteApiDefsCommand = {
-    definition: {
-        path: ['config', 'use-remote-api-defs'],
-        kind: 'cli',
-        title: 'Choose whether to use the API definitions served by Seam.',
-        description: '',
-        flags: [],
-    },
-    requiresAuth: true,
-    execute: async (_invocation, ctx) => {
-        if (ctx.interactivity === 'non-interactive') {
-            throw new NonInteractiveError('Cannot select whether to use remote API definitions in non-interactive mode');
-        }
-        await interactForUseRemoteApiDefs();
-        return { kind: 'done' };
-    },
-};
-//# sourceMappingURL=config-use-remote-api-defs.js.map

package/lib/commands/local/config-use-remote-api-defs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config-use-remote-api-defs.js","sourceRoot":"","sources":["../../../src/lib/commands/local/config-use-remote-api-defs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAA;AAEvE,MAAM,CAAC,MAAM,6BAA6B,GAAY;IACpD,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC;QACvC,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,2DAA2D;QAClE,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,EAAE;KACV;IACD,YAAY,EAAE,IAAI;IAClB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE;QAClC,IAAI,GAAG,CAAC,aAAa,KAAK,iBAAiB,EAAE,CAAC;YAC5C,MAAM,IAAI,mBAAmB,CAC3B,6EAA6E,CAC9E,CAAA;QACH,CAAC;QACD,MAAM,2BAA2B,EAAE,CAAA;QACnC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}

package/lib/interactions/use-remote-api-defs.d.ts

@@ -1 +0,0 @@
-export declare function interactForUseRemoteApiDefs(): Promise<void>;

package/lib/interactions/use-remote-api-defs.js

@@ -1,21 +0,0 @@
-import { setUseRemoteApiDefs } from '../auth/operations.js';
-import { getOutput } from '../output/get-output.js';
-import { promptSelect } from '../prompt.js';
-export async function interactForUseRemoteApiDefs() {
-    const useRemoteApiDefs = await promptSelect({
-        message: 'Always use remote API Definitions?',
-        choices: [
-            {
-                label: 'Yes',
-                value: true,
-            },
-            {
-                label: 'No',
-                value: false,
-            },
-        ],
-    });
-    setUseRemoteApiDefs(useRemoteApiDefs);
-    getOutput().info(`Use remote API Definitions: ${useRemoteApiDefs}`);
-}
-//# sourceMappingURL=use-remote-api-defs.js.map

package/lib/interactions/use-remote-api-defs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-remote-api-defs.js","sourceRoot":"","sources":["../../src/lib/interactions/use-remote-api-defs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,MAAM,CAAC,KAAK,UAAU,2BAA2B;IAC/C,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC;QAC1C,OAAO,EAAE,oCAAoC;QAC7C,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,IAAI;aACZ;YACD;gBACE,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,KAAK;aACb;SACF;KACF,CAAC,CAAA;IAEF,mBAAmB,CAAC,gBAAgB,CAAC,CAAA;IACrC,SAAS,EAAE,CAAC,IAAI,CAAC,+BAA+B,gBAAgB,EAAE,CAAC,CAAA;AACrE,CAAC"}

package/src/lib/interactions/use-remote-api-defs.ts

@@ -1,22 +0,0 @@
-import { setUseRemoteApiDefs } from 'lib/auth/operations.js'
-import { getOutput } from 'lib/output/get-output.js'
-import { promptSelect } from 'lib/prompt.js'
-
-export async function interactForUseRemoteApiDefs() {
-  const useRemoteApiDefs = await promptSelect({
-    message: 'Always use remote API Definitions?',
-    choices: [
-      {
-        label: 'Yes',
-        value: true,
-      },
-      {
-        label: 'No',
-        value: false,
-      },
-    ],
-  })
-
-  setUseRemoteApiDefs(useRemoteApiDefs)
-  getOutput().info(`Use remote API Definitions: ${useRemoteApiDefs}`)
-}