refactor: track input on context

Author: jasonkuhrt

src/layers/6_client/Settings/Config.ts

@@ -4,7 +4,6 @@ import type { TransportHttp, TransportMemory } from '../../../requestPipeline/Tr
 import type { GlobalRegistry } from '../../../types/GlobalRegistry/GlobalRegistry.js'
 import type { SchemaDrivenDataMap } from '../../../types/SchemaDrivenDataMap/__.js'
 import type { TransportHttpInput } from '../transportHttp/request.js'
-import type { InputStatic } from './Input.js'
 
 export type OutputChannel = 'throw' | 'return'
 
@@ -107,10 +106,6 @@ export interface TransportConfigMemory {
 }
 
 export type Config = {
-  /**
-   * The initial input that was given to derive this config.
-   */
-  initialInput: InputStatic
   name: GlobalRegistry.ClientNames // todo remove? it is in context
   output: OutputConfig
   schemaMap: SchemaDrivenDataMap | null

src/layers/6_client/Settings/InputToConfig.ts

@@ -8,7 +8,6 @@ import type { InputOutputEnvelopeLonghand, InputStatic, URLInput } from './Input
 
 // dprint-ignore
 export type NormalizeInput<$Input extends InputStatic> = {
-  initialInput: $Input
   name: HandleName<$Input>
   schemaMap: ConfigManager.OrDefault<$Input['schemaMap'], null>
   transport: HandleTransport<$Input>
@@ -50,7 +49,6 @@ export const inputToConfig = <$Input extends InputStatic>(
   const transport = handleTransport(input)
 
   return {
-    initialInput: input,
     // todo fixme: passes before generation
     // eslint-disable-next-line
     // @ts-ignore

src/layers/6_client/chainExtensions/with.ts

@@ -22,10 +22,12 @@ export interface With<$Args extends Chain.Extension.Parameters<With_>> {
     // @ts-ignore Passes after generation
   ) => Chain.Definition.MaterializeWithNewContext<
     $Args['chain'],
-    ConfigManager.SetAtPath<
+    ConfigManager.SetProperties<
       $Args['context'],
-      ['config'],
-      NormalizeInput<$Args['context']['config']['initialInput'] & $Input>
+      {
+        input: $Args['context']['input'] & $Input
+        config: NormalizeInput<$Args['context']['input'] & $Input>
+      }
     >
   >
 }

src/layers/6_client/client.ts

@@ -48,7 +48,7 @@ export const create: Create = (input) => {
     name: input.name ?? `default`, // todo import from shared constants
     extensions: [],
     scalars: Schema.Scalar.Registry.empty,
-    retry: null,
+    // retry: null,
     input,
   })
   return createWithContext(initialContext)

src/layers/6_client/clientPrefilled.ts

@@ -17,7 +17,7 @@ export const createPrefilled: CreatePrefilled = (name, schemaMap, scalars, schem
       name,
       extensions: [],
       scalars,
-      retry: null,
+      // retry: null,
       input: {
         schema: schemaUrl,
         // eslint-disable-next-line

src/layers/6_client/context.ts

@@ -1,5 +1,5 @@
-import type { Anyware } from '../../lib/anyware/__.js'
-import type { RequestPipeline } from '../../requestPipeline/__.js'
+// import type { Anyware } from '../../lib/anyware/__.js'
+// import type { RequestPipeline } from '../../requestPipeline/__.js'
 import type { Schema } from '../../types/Schema/__.js'
 import type { Extension } from './extension/extension.js'
 import type { Config } from './Settings/Config.js'
@@ -8,9 +8,12 @@ import { inputToConfig } from './Settings/InputToConfig.js'
 
 export interface Context {
   name: string
+  /**
+   * The initial input that was given to derive the config.
+   */
   input: InputStatic
   config: Config
-  retry: Anyware.Extension2<RequestPipeline.Core, { retrying: true }> | null
+  // retry: Anyware.Extension2<RequestPipeline.Core, { retrying: true }> | null
   extensions: Extension[]
   scalars: Schema.Scalar.Registry
   typeHooks: {

src/layers/6_client/gql/gql.ts

@@ -75,7 +75,7 @@ export const gqlProperties = Chain.Extension.create<Gql_>((_, context) => {
 
           const result = await RequestPipeline.anyware.run({
             initialInput,
-            retryingExtension: context.retry as any,
+            // retryingExtension: context.retry as any,
             extensions: context.extensions.filter(_ => _.onRequest !== undefined).map(_ => _.onRequest!) as any,
           })
 

src/layers/6_client/requestMethods/requestMethods.ts

@@ -139,7 +139,7 @@ const executeDocument = async (
 
   const result = await RequestPipeline.anyware.run({
     initialInput,
-    retryingExtension: state.retry as any,
+    // retryingExtension: state.retry as any,
     extensions: state.extensions.filter(_ => _.onRequest !== undefined).map(_ => _.onRequest!) as any,
   })