apollo-conn-gen 0.8.3 → 0.10.0

package/dist/cli/oas.js

@@ -38,6 +38,7 @@ async function main(sourceFile, opts) {
         postName: opts.postName,
         mapper: mapper,
         skipOptionalArgs: opts.skipOptionalArgs,
+        inferEntityResolvers: opts.inferEntityResolvers,
     });
     await gen.visit();
     let pathSet = Array.from(gen.paths.values());
@@ -86,6 +87,7 @@ program
     .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)
     .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)
     .option('--skip-optional-args', 'Skip optional arguments in queries', false)
+    .option('--infer-entity-resolvers', 'Infer entity resolvers and emit @key / entity: true', false)
     .parse(process.argv);
 const source = program.args[0];
 main(source, program.opts()).then(() => console.log('done'));

package/dist/cli/oas.js.map

@@ -1 +1 @@
-{"version":3,"file":"oas.js","sourceRoot":"","sources":["../../src/cli/oas.ts"],"names":[],"mappings":"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","sourcesContent":["import { Command } from 'commander';\nimport { DEFAULT_VERSIONS } from '../versions.js';\nimport { generateFromSelection, promptForSelection } from './oas-helpers/index.js';\nimport { OasGen } from '../oas/oasGen.js';\nimport { RulesLoader, OpNameMapper, MapRules, Mapper } from '../oas/mapper/index.js';\n\nconst originalConsole = Object.assign(\n  {\n    log: console.log,\n  },\n  console,\n);\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction loadRules(opts: any): Mapper | undefined {\n  let mapper;\n  if (opts.transformRules) {\n    try {\n      const rules = RulesLoader.fromFile(opts.transformRules);\n      mapper = OpNameMapper.fromRules(rules);\n    } catch (error) {\n      console.error(`Error loading transform rules: ${error}`);\n      return undefined;\n    }\n  } else if (opts.postName) {\n    // Backward compatibility with legacy --post-name\n    mapper = OpNameMapper.fromPattern(opts.postName);\n  }\n\n  return mapper;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\nasync function main(sourceFile: string, opts: any): Promise<void> {\n  console.log = () => {};\n\n  const mapper = loadRules(opts);\n\n  const gen = await OasGen.fromFile(sourceFile, {\n    ...opts,\n    consolidateUnions: true,\n    showParentInSelections: false,\n    federationVersion: opts.federationVersion,\n    connectorSpecVersion: opts.connectorSpecVersion,\n    postName: opts.postName,\n    mapper: mapper,\n    skipOptionalArgs: opts.skipOptionalArgs,\n  });\n\n  await gen.visit();\n\n  let pathSet = Array.from(gen.paths.values());\n  if (opts.loadSelections) {\n    generateFromSelection(opts, gen);\n    return;\n  }\n\n  if (opts.grep !== '*') {\n    const regex = new RegExp(opts.grep, 'ig');\n    pathSet = pathSet.filter((p) => regex.test(p.path()));\n  }\n\n  if (opts.listPaths) {\n    pathSet.forEach((path) => console.info(path.path()));\n    return;\n  }\n\n  let paths: string[];\n  if (opts.skipSelection) {\n    paths = pathSet.map((p) => p.path() + '>**');\n  } else {\n    paths = await promptForSelection(gen, opts, pathSet);\n  }\n\n  if (opts.verbose) console = originalConsole;\n\n  console.info(gen.generateSchema(paths));\n\n  if (opts.printSelections) {\n    console.info('# --------------- Selections -----------------');\n    console.info(gen.selections);\n    console.info('# --------------- Paths -----------------');\n    console.info('paths =', JSON.stringify(paths, null, 2));\n  }\n}\n\nconst program = new Command();\nprogram\n  .version('0.0.1')\n  .argument('<source>', 'source spec (yaml or json)')\n  .option('-i --skip-validation', 'Skip validation step', false)\n  .option('-n --skip-selection', 'Generate all [filtered] paths without prompting for a selection', false)\n  .option('-l --list-paths', 'Only list the paths that can be generated', false)\n  .option('-g --grep <regex>', 'Filter the list of paths with the passed expression', '*')\n  .option('-p --page-size <num>', 'Number of rows to display in selection mode', '10')\n  .option('-s --load-selections <file>', 'Load a JSON file with field selections (other options are ignored)')\n  .option('-v --verbose', 'Log all messages from generator')\n  .option('-m --print-selections', 'Print selections from generator')\n  .option('-t --transform-rules <file>', 'Load transform rules from a JSON file to apply multiple name transformations')\n  .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)\n  .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)\n  .option('--skip-optional-args', 'Skip optional arguments in queries', false)\n  .parse(process.argv);\n\nconst source = program.args[0];\nmain(source, program.opts()).then(() => console.log('done'));\n"]}
+{"version":3,"file":"oas.js","sourceRoot":"","sources":["../../src/cli/oas.ts"],"names":[],"mappings":"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","sourcesContent":["import { Command } from 'commander';\nimport { DEFAULT_VERSIONS } from '../versions.js';\nimport { generateFromSelection, promptForSelection } from './oas-helpers/index.js';\nimport { OasGen } from '../oas/oasGen.js';\nimport { RulesLoader, OpNameMapper, MapRules, Mapper } from '../oas/mapper/index.js';\n\nconst originalConsole = Object.assign(\n  {\n    log: console.log,\n  },\n  console,\n);\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction loadRules(opts: any): Mapper | undefined {\n  let mapper;\n  if (opts.transformRules) {\n    try {\n      const rules = RulesLoader.fromFile(opts.transformRules);\n      mapper = OpNameMapper.fromRules(rules);\n    } catch (error) {\n      console.error(`Error loading transform rules: ${error}`);\n      return undefined;\n    }\n  } else if (opts.postName) {\n    // Backward compatibility with legacy --post-name\n    mapper = OpNameMapper.fromPattern(opts.postName);\n  }\n\n  return mapper;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\nasync function main(sourceFile: string, opts: any): Promise<void> {\n  console.log = () => {};\n\n  const mapper = loadRules(opts);\n\n  const gen = await OasGen.fromFile(sourceFile, {\n    ...opts,\n    consolidateUnions: true,\n    showParentInSelections: false,\n    federationVersion: opts.federationVersion,\n    connectorSpecVersion: opts.connectorSpecVersion,\n    postName: opts.postName,\n    mapper: mapper,\n    skipOptionalArgs: opts.skipOptionalArgs,\n    inferEntityResolvers: opts.inferEntityResolvers,\n  });\n\n  await gen.visit();\n\n  let pathSet = Array.from(gen.paths.values());\n  if (opts.loadSelections) {\n    generateFromSelection(opts, gen);\n    return;\n  }\n\n  if (opts.grep !== '*') {\n    const regex = new RegExp(opts.grep, 'ig');\n    pathSet = pathSet.filter((p) => regex.test(p.path()));\n  }\n\n  if (opts.listPaths) {\n    pathSet.forEach((path) => console.info(path.path()));\n    return;\n  }\n\n  let paths: string[];\n  if (opts.skipSelection) {\n    paths = pathSet.map((p) => p.path() + '>**');\n  } else {\n    paths = await promptForSelection(gen, opts, pathSet);\n  }\n\n  if (opts.verbose) console = originalConsole;\n\n  console.info(gen.generateSchema(paths));\n\n  if (opts.printSelections) {\n    console.info('# --------------- Selections -----------------');\n    console.info(gen.selections);\n    console.info('# --------------- Paths -----------------');\n    console.info('paths =', JSON.stringify(paths, null, 2));\n  }\n}\n\nconst program = new Command();\nprogram\n  .version('0.0.1')\n  .argument('<source>', 'source spec (yaml or json)')\n  .option('-i --skip-validation', 'Skip validation step', false)\n  .option('-n --skip-selection', 'Generate all [filtered] paths without prompting for a selection', false)\n  .option('-l --list-paths', 'Only list the paths that can be generated', false)\n  .option('-g --grep <regex>', 'Filter the list of paths with the passed expression', '*')\n  .option('-p --page-size <num>', 'Number of rows to display in selection mode', '10')\n  .option('-s --load-selections <file>', 'Load a JSON file with field selections (other options are ignored)')\n  .option('-v --verbose', 'Log all messages from generator')\n  .option('-m --print-selections', 'Print selections from generator')\n  .option('-t --transform-rules <file>', 'Load transform rules from a JSON file to apply multiple name transformations')\n  .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)\n  .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)\n  .option('--skip-optional-args', 'Skip optional arguments in queries', false)\n  .option('--infer-entity-resolvers', 'Infer entity resolvers and emit @key / entity: true', false)\n  .parse(process.argv);\n\nconst source = program.args[0];\nmain(source, program.opts()).then(() => console.log('done'));\n"]}

package/dist/json/walker/jsonGen.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import _ from 'lodash';
-import { DEFAULT_VERSIONS } from '../../versions.js';
+import { DEFAULT_VERSIONS, validateVersionOptions } from '../../versions.js';
 import { ConnectorWriter, JsonArray, JsonContext, JsonObj, JsonScalar, StringWriter } from '../index.js';
 import { trace, warn } from './log/trace.js';
 import { sanitiseField } from './naming.js';
@@ -16,6 +16,7 @@ export class JsonGen {
             connectorSpecVersion: DEFAULT_VERSIONS.connectorSpecVersion,
             ...options,
         };
+        validateVersionOptions(this.options);
     }
     getContext() {
         return this.context;

package/dist/json/walker/jsonGen.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsonGen.js","sourceRoot":"","sources":["../../../src/json/walker/jsonGen.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport _ from 'lodash';\nimport { DEFAULT_VERSIONS } from '../../versions.js';\nimport { ConnectorWriter, JsonArray, JsonContext, JsonObj, JsonScalar, JsonType, StringWriter } from '../index.js';\nimport { trace, warn } from './log/trace.js';\nimport { sanitiseField } from './naming.js';\n\nexport interface JsonGenOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n  rootType?: string;\n  baseURL?: string;\n  relativePath?: string;\n  queryField?: string;\n  verbose?: boolean;\n}\n\nexport class JsonGen {\n  private readonly context: JsonContext;\n  private readonly options: JsonGenOptions;\n\n  // Private constructor\n  private constructor(options: JsonGenOptions = {}) {\n    this.context = new JsonContext();\n    this.context.verbose = options.verbose ?? false;\n    this.options = {\n      federationVersion: DEFAULT_VERSIONS.federationVersion,\n      connectorSpecVersion: DEFAULT_VERSIONS.connectorSpecVersion,\n      ...options,\n    };\n  }\n\n  public getContext(): JsonContext {\n    return this.context;\n  }\n\n  public static new(options?: JsonGenOptions): JsonGen {\n    return new JsonGen(options);\n  }\n\n  // Factory method from a JSON string\n  public static fromReader(json: string, options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    walker.walkJson(json);\n    return walker;\n  }\n\n  public static fromJsons(jsons: string[], options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    for (const json of jsons) {\n      walker.walkJson(json);\n    }\n    return walker;\n  }\n\n  public generateSchema(): string {\n    const writer = new StringWriter();\n    ConnectorWriter.write(this, writer, this.options);\n    return writer.flush();\n  }\n\n  // Writes selection using a given Writer\n  public writeSelection(indent: number = 6): string {\n    const writer = new StringWriter();\n    this.context.setIndent(indent);\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      root.select(this.context, writer);\n    }\n\n    return writer.flush();\n  }\n\n  // Writes all types in order using the provided Writer\n  public writeTypes(): string {\n    const writer = new StringWriter();\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      const orderedSet = new Set<JsonType>();\n      this.writeType(root, orderedSet);\n\n      const generatedSet = new Map<string, JsonType>();\n      orderedSet.forEach((t) => {\n        // Assumes t is an Obj\n        const obj = t as unknown as JsonObj;\n        let typeName = obj.getType();\n        if (generatedSet.has(typeName)) {\n          // If same type, skip generation\n          if (_.isEqual(obj, generatedSet.get(typeName))) {\n            return;\n          }\n          obj.setType(JsonGen.generateNewObjType(generatedSet, t, typeName));\n          typeName = obj.getType();\n        }\n        t.write(this.context, writer);\n        generatedSet.set(typeName, t);\n      });\n    }\n\n    return writer.flush();\n  }\n\n  // Recursive helper to order types\n  private writeType(type: JsonType, orderedSet: Set<JsonType>): void {\n    if (type instanceof JsonObj) {\n      // Traverse children first\n      for (const child of Array.from((type as JsonObj).getFields().values())) {\n        this.writeType(child, orderedSet);\n      }\n      orderedSet.add(type);\n    } else if (type instanceof JsonArray) {\n      const arrayType = (type as JsonArray).getArrayType();\n      if (arrayType) {\n        this.writeType(arrayType, orderedSet);\n      }\n    }\n  }\n\n  // Walk the JSON provided as a string\n  public walkJson(json: string): void {\n    const rootElement = JSON.parse(json);\n    const rootName = (this.options.rootType ?? 'root').replace(/^\\[|]$/g, '');\n    this.walkElement(this.context, null, rootName, rootElement);\n    trace(this.context, '   [walkSource]', 'types found: ' + this.context.getTypes().length);\n  }\n\n  // Walk an element in the JSON tree\n  private walkElement(context: JsonContext, parent: JsonType | null, name: string, element: any): JsonType {\n    trace(context, '-> [walkElement]', 'in: ' + name);\n    let result: JsonType;\n\n    if (typeof element === 'object' && !Array.isArray(element) && element !== null) {\n      // JSON object\n      result = this.walkObject(context, parent, name, element);\n      context.store(result);\n    } else if (Array.isArray(element)) {\n      result = this.walkArray(context, parent, name, element);\n    } else if (typeof element === 'string' || typeof element === 'number' || typeof element === 'boolean') {\n      result = this.walkPrimitive(context, parent, name, element);\n    } else if (element === null) {\n      // we'll treat null as a string\n      result = this.walkPrimitive(context, parent, name, 'string');\n    } else {\n      throw new Error(\"Cannot yet handle '\" + name + \"' of type \" + typeof element);\n    }\n\n    trace(context, '<- [walkElement]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON object\n  private walkObject(context: JsonContext, parent: JsonType | null, name: string, object: any): JsonObj {\n    trace(context, '-> [walkObject]', 'in: ' + name);\n    const result = new JsonObj(name, parent);\n    const fieldSet = Object.keys(object);\n    trace(context, '  [walkObject]', 'fieldSet: ' + fieldSet);\n\n    for (const field of fieldSet) {\n      trace(context, '  [walkObject]', 'field: ' + field);\n      const childElement = object[field];\n      const type = this.walkElement(context, result, field, childElement);\n      result.add(field, type);\n    }\n\n    trace(context, '<- [walkObject]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON array\n  private walkArray(context: JsonContext, parent: JsonType | null, name: string, array: any[]): JsonArray {\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    const result = new JsonArray(name, parent);\n    if (array.length > 0) {\n      const firstElement = array[0];\n      const arrayType = this.walkElement(context, parent, name, firstElement);\n      result.setArrayType(arrayType);\n    } else {\n      warn(context, '   [walkArray]', \"Array is empty -- cannot derive type for field '\" + name + \"'\");\n    }\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    return result;\n  }\n\n  // Walk a primitive JSON value\n  private walkPrimitive(_context: JsonContext, parent: JsonType | null, name: string, primitive: any): JsonScalar {\n    let result: JsonScalar;\n    if (typeof primitive === 'string') {\n      result = new JsonScalar(name, parent, 'String');\n    } else if (typeof primitive === 'boolean') {\n      result = new JsonScalar(name, parent, 'Boolean');\n    } else if (typeof primitive === 'number') {\n      result = new JsonScalar(name, parent, 'Int');\n    } else {\n      throw new Error('Cannot yet handle primitive: ' + primitive);\n    }\n    return result;\n  }\n\n  // Utility method for naming conflict resolution\n  private static generateNewObjType(generatedSet: Map<string, JsonType>, t: JsonType, typeName: string): string {\n    let newName: string;\n    let type: JsonType | null = t;\n    do {\n      const parent: JsonType | null = type.getParent();\n      const parentName = parent === null ? '' : sanitiseField(parent.getName()).replace(/^\\w/, (c) => c.toUpperCase());\n      const thisName = sanitiseField(typeName).replace(/^\\w/, (c) => c.toUpperCase());\n      newName = parentName + thisName;\n      type = parent;\n    } while (type !== null && generatedSet.has(newName));\n    return newName;\n  }\n}\n"]}
+{"version":3,"file":"jsonGen.js","sourceRoot":"","sources":["../../../src/json/walker/jsonGen.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport _ from 'lodash';\nimport { DEFAULT_VERSIONS, validateVersionOptions } from '../../versions.js';\nimport { ConnectorWriter, JsonArray, JsonContext, JsonObj, JsonScalar, JsonType, StringWriter } from '../index.js';\nimport { trace, warn } from './log/trace.js';\nimport { sanitiseField } from './naming.js';\n\nexport interface JsonGenOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n  rootType?: string;\n  baseURL?: string;\n  relativePath?: string;\n  queryField?: string;\n  verbose?: boolean;\n}\n\nexport class JsonGen {\n  private readonly context: JsonContext;\n  private readonly options: JsonGenOptions;\n\n  // Private constructor\n  private constructor(options: JsonGenOptions = {}) {\n    this.context = new JsonContext();\n    this.context.verbose = options.verbose ?? false;\n    this.options = {\n      federationVersion: DEFAULT_VERSIONS.federationVersion,\n      connectorSpecVersion: DEFAULT_VERSIONS.connectorSpecVersion,\n      ...options,\n    };\n    validateVersionOptions(this.options);\n  }\n\n  public getContext(): JsonContext {\n    return this.context;\n  }\n\n  public static new(options?: JsonGenOptions): JsonGen {\n    return new JsonGen(options);\n  }\n\n  // Factory method from a JSON string\n  public static fromReader(json: string, options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    walker.walkJson(json);\n    return walker;\n  }\n\n  public static fromJsons(jsons: string[], options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    for (const json of jsons) {\n      walker.walkJson(json);\n    }\n    return walker;\n  }\n\n  public generateSchema(): string {\n    const writer = new StringWriter();\n    ConnectorWriter.write(this, writer, this.options);\n    return writer.flush();\n  }\n\n  // Writes selection using a given Writer\n  public writeSelection(indent: number = 6): string {\n    const writer = new StringWriter();\n    this.context.setIndent(indent);\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      root.select(this.context, writer);\n    }\n\n    return writer.flush();\n  }\n\n  // Writes all types in order using the provided Writer\n  public writeTypes(): string {\n    const writer = new StringWriter();\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      const orderedSet = new Set<JsonType>();\n      this.writeType(root, orderedSet);\n\n      const generatedSet = new Map<string, JsonType>();\n      orderedSet.forEach((t) => {\n        // Assumes t is an Obj\n        const obj = t as unknown as JsonObj;\n        let typeName = obj.getType();\n        if (generatedSet.has(typeName)) {\n          // If same type, skip generation\n          if (_.isEqual(obj, generatedSet.get(typeName))) {\n            return;\n          }\n          obj.setType(JsonGen.generateNewObjType(generatedSet, t, typeName));\n          typeName = obj.getType();\n        }\n        t.write(this.context, writer);\n        generatedSet.set(typeName, t);\n      });\n    }\n\n    return writer.flush();\n  }\n\n  // Recursive helper to order types\n  private writeType(type: JsonType, orderedSet: Set<JsonType>): void {\n    if (type instanceof JsonObj) {\n      // Traverse children first\n      for (const child of Array.from((type as JsonObj).getFields().values())) {\n        this.writeType(child, orderedSet);\n      }\n      orderedSet.add(type);\n    } else if (type instanceof JsonArray) {\n      const arrayType = (type as JsonArray).getArrayType();\n      if (arrayType) {\n        this.writeType(arrayType, orderedSet);\n      }\n    }\n  }\n\n  // Walk the JSON provided as a string\n  public walkJson(json: string): void {\n    const rootElement = JSON.parse(json);\n    const rootName = (this.options.rootType ?? 'root').replace(/^\\[|]$/g, '');\n    this.walkElement(this.context, null, rootName, rootElement);\n    trace(this.context, '   [walkSource]', 'types found: ' + this.context.getTypes().length);\n  }\n\n  // Walk an element in the JSON tree\n  private walkElement(context: JsonContext, parent: JsonType | null, name: string, element: any): JsonType {\n    trace(context, '-> [walkElement]', 'in: ' + name);\n    let result: JsonType;\n\n    if (typeof element === 'object' && !Array.isArray(element) && element !== null) {\n      // JSON object\n      result = this.walkObject(context, parent, name, element);\n      context.store(result);\n    } else if (Array.isArray(element)) {\n      result = this.walkArray(context, parent, name, element);\n    } else if (typeof element === 'string' || typeof element === 'number' || typeof element === 'boolean') {\n      result = this.walkPrimitive(context, parent, name, element);\n    } else if (element === null) {\n      // we'll treat null as a string\n      result = this.walkPrimitive(context, parent, name, 'string');\n    } else {\n      throw new Error(\"Cannot yet handle '\" + name + \"' of type \" + typeof element);\n    }\n\n    trace(context, '<- [walkElement]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON object\n  private walkObject(context: JsonContext, parent: JsonType | null, name: string, object: any): JsonObj {\n    trace(context, '-> [walkObject]', 'in: ' + name);\n    const result = new JsonObj(name, parent);\n    const fieldSet = Object.keys(object);\n    trace(context, '  [walkObject]', 'fieldSet: ' + fieldSet);\n\n    for (const field of fieldSet) {\n      trace(context, '  [walkObject]', 'field: ' + field);\n      const childElement = object[field];\n      const type = this.walkElement(context, result, field, childElement);\n      result.add(field, type);\n    }\n\n    trace(context, '<- [walkObject]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON array\n  private walkArray(context: JsonContext, parent: JsonType | null, name: string, array: any[]): JsonArray {\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    const result = new JsonArray(name, parent);\n    if (array.length > 0) {\n      const firstElement = array[0];\n      const arrayType = this.walkElement(context, parent, name, firstElement);\n      result.setArrayType(arrayType);\n    } else {\n      warn(context, '   [walkArray]', \"Array is empty -- cannot derive type for field '\" + name + \"'\");\n    }\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    return result;\n  }\n\n  // Walk a primitive JSON value\n  private walkPrimitive(_context: JsonContext, parent: JsonType | null, name: string, primitive: any): JsonScalar {\n    let result: JsonScalar;\n    if (typeof primitive === 'string') {\n      result = new JsonScalar(name, parent, 'String');\n    } else if (typeof primitive === 'boolean') {\n      result = new JsonScalar(name, parent, 'Boolean');\n    } else if (typeof primitive === 'number') {\n      result = new JsonScalar(name, parent, 'Int');\n    } else {\n      throw new Error('Cannot yet handle primitive: ' + primitive);\n    }\n    return result;\n  }\n\n  // Utility method for naming conflict resolution\n  private static generateNewObjType(generatedSet: Map<string, JsonType>, t: JsonType, typeName: string): string {\n    let newName: string;\n    let type: JsonType | null = t;\n    do {\n      const parent: JsonType | null = type.getParent();\n      const parentName = parent === null ? '' : sanitiseField(parent.getName()).replace(/^\\w/, (c) => c.toUpperCase());\n      const thisName = sanitiseField(typeName).replace(/^\\w/, (c) => c.toUpperCase());\n      newName = parentName + thisName;\n      type = parent;\n    } while (type !== null && generatedSet.has(newName));\n    return newName;\n  }\n}\n"]}

package/dist/json/walker/naming.js

@@ -21,7 +21,13 @@ function lowerFirst(s) {
     return _.lowerFirst(s);
 }
 export function genParamName(param) {
-    return lowerFirst(capitaliseParts(param, '[\\-_\\.:]'));
+    // Split on any run of non-alphanumeric characters, camelCase the parts, then guarantee
+    // a valid GraphQL identifier: non-empty and not starting with a digit.
+    const camel = lowerFirst(capitaliseParts(param || '', '[^A-Za-z0-9]+'));
+    if (camel.length === 0) {
+        return '_';
+    }
+    return /^[0-9]/.test(camel) ? '_' + camel : camel;
 }
 // Private helper; not exported.
 function formatPath(path, parameters) {
@@ -45,17 +51,10 @@ export function sanitiseFieldForSelect(name) {
     if (sanitised === name && !isProtected(name)) {
         return sanitised;
     }
-    else {
-        const needsQuotes = /.*[:_\-.].*/.test(fieldName) || name.startsWith('@') || isProtected(name);
-        let builder = sanitised + ': ';
-        if (needsQuotes) {
-            builder += '"' + (name.startsWith('@') ? name : fieldName) + '"';
-        }
-        else {
-            builder += name.startsWith('@') ? name : fieldName;
-        }
-        return builder;
-    }
+    // Alias: safe GraphQL field <- original JSON key, always quoted (it is not a bare
+    // identifier — covers spaces, `$`, `%`, leading digits, etc.).
+    const original = name.startsWith('@') ? name : fieldName;
+    return `${sanitised}: "${original}"`;
 }
 export function upperFirst(s) {
     if (!s)

package/dist/json/walker/naming.js.map

@@ -1 +1 @@
-{"version":3,"file":"naming.js","sourceRoot":"","sources":["../../../src/json/walker/naming.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Utility functions for name manipulation.\n */\nimport _ from 'lodash';\n\nconst PROTECTED_NAMES = ['$'];\n\nfunction capitaliseParts(cleanedPath: string, splitChar: string): string {\n  // Split the string using a regular expression based on splitChar.\n  const parts = cleanedPath.split(new RegExp(splitChar));\n  let formattedPath = '';\n  for (const part of parts) {\n    if (part) {\n      // Capitalize the first letter of each part\n      formattedPath += upperFirst(part);\n    }\n  }\n  return formattedPath;\n}\n\nfunction lowerFirst(s: string): string {\n  if (!s) return s;\n  return _.lowerFirst(s);\n}\n\nexport function genParamName(param: string): string {\n  return lowerFirst(capitaliseParts(param, '[\\\\-_\\\\.:]'));\n}\n\n// Private helper; not exported.\nfunction formatPath(path: string, parameters: string[]): string {\n  if (!path || path.length === 0) {\n    return path;\n  }\n  // Remove parameters enclosed in `{}`.\n  const cleanedPath = path.replace(/\\{[^}]*\\}/g, parameters.join(''));\n  // First, capitalize parts split by \"[:\\-\\.]+\".\n  const interim = capitaliseParts(cleanedPath, '[:\\\\-\\\\.]+');\n  // Then, split by \"/\" and capitalize each part.\n  return capitaliseParts(interim, '/');\n}\n\nexport function sanitiseField(name: string): string {\n  const fieldName = name.startsWith('@') ? name.substring(1) : name;\n  return genParamName(fieldName);\n}\n\nexport function sanitiseFieldForSelect(name: string): string {\n  const fieldName = name.startsWith('@') ? name.substring(1) : name;\n  const sanitised = genParamName(fieldName);\n  if (sanitised === name && !isProtected(name)) {\n    return sanitised;\n  } else {\n    const needsQuotes = /.*[:_\\-.].*/.test(fieldName) || name.startsWith('@') || isProtected(name);\n    let builder = sanitised + ': ';\n    if (needsQuotes) {\n      builder += '\"' + (name.startsWith('@') ? name : fieldName) + '\"';\n    } else {\n      builder += name.startsWith('@') ? name : fieldName;\n    }\n    return builder;\n  }\n}\n\nexport function upperFirst(s: string): string {\n  if (!s) return s;\n  return _.upperFirst(s);\n}\n\nexport function genArrayItems(name: string): string {\n  return upperFirst(genParamName(name)) + 'Item';\n}\n\nexport function isProtected(name: string): boolean {\n  return PROTECTED_NAMES.includes(name);\n}\n"]}
+{"version":3,"file":"naming.js","sourceRoot":"","sources":["../../../src/json/walker/naming.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Utility functions for name manipulation.\n */\nimport _ from 'lodash';\n\nconst PROTECTED_NAMES = ['$'];\n\nfunction capitaliseParts(cleanedPath: string, splitChar: string): string {\n  // Split the string using a regular expression based on splitChar.\n  const parts = cleanedPath.split(new RegExp(splitChar));\n  let formattedPath = '';\n  for (const part of parts) {\n    if (part) {\n      // Capitalize the first letter of each part\n      formattedPath += upperFirst(part);\n    }\n  }\n  return formattedPath;\n}\n\nfunction lowerFirst(s: string): string {\n  if (!s) return s;\n  return _.lowerFirst(s);\n}\n\nexport function genParamName(param: string): string {\n  // Split on any run of non-alphanumeric characters, camelCase the parts, then guarantee\n  // a valid GraphQL identifier: non-empty and not starting with a digit.\n  const camel = lowerFirst(capitaliseParts(param || '', '[^A-Za-z0-9]+'));\n  if (camel.length === 0) {\n    return '_';\n  }\n  return /^[0-9]/.test(camel) ? '_' + camel : camel;\n}\n\n// Private helper; not exported.\nfunction formatPath(path: string, parameters: string[]): string {\n  if (!path || path.length === 0) {\n    return path;\n  }\n  // Remove parameters enclosed in `{}`.\n  const cleanedPath = path.replace(/\\{[^}]*\\}/g, parameters.join(''));\n  // First, capitalize parts split by \"[:\\-\\.]+\".\n  const interim = capitaliseParts(cleanedPath, '[:\\\\-\\\\.]+');\n  // Then, split by \"/\" and capitalize each part.\n  return capitaliseParts(interim, '/');\n}\n\nexport function sanitiseField(name: string): string {\n  const fieldName = name.startsWith('@') ? name.substring(1) : name;\n  return genParamName(fieldName);\n}\n\nexport function sanitiseFieldForSelect(name: string): string {\n  const fieldName = name.startsWith('@') ? name.substring(1) : name;\n  const sanitised = genParamName(fieldName);\n  if (sanitised === name && !isProtected(name)) {\n    return sanitised;\n  }\n  // Alias: safe GraphQL field <- original JSON key, always quoted (it is not a bare\n  // identifier — covers spaces, `$`, `%`, leading digits, etc.).\n  const original = name.startsWith('@') ? name : fieldName;\n  return `${sanitised}: \"${original}\"`;\n}\n\nexport function upperFirst(s: string): string {\n  if (!s) return s;\n  return _.upperFirst(s);\n}\n\nexport function genArrayItems(name: string): string {\n  return upperFirst(genParamName(name)) + 'Item';\n}\n\nexport function isProtected(name: string): boolean {\n  return PROTECTED_NAMES.includes(name);\n}\n"]}

package/dist/oas/generator/typesCollector.d.ts

@@ -6,4 +6,6 @@ export declare class TypesCollector {
     expanded: string[];
     constructor(gen: OasGen);
     collect(selection: string[]): void;
+    private collectReachable;
+    private findSelectedFieldNode;
 }

package/dist/oas/generator/typesCollector.js

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import { Composed } from '../nodes/comp.js';
-import { Prop, PropArray, Scalar, T } from '../nodes/internal.js';
+import { Prop, PropArray, PropCircRef, PropEn, Scalar, T } from '../nodes/internal.js';
+import { Naming } from '../utils/naming.js';
 export class TypesCollector {
     gen;
     types = new Map();
@@ -18,7 +19,7 @@ export class TypesCollector {
             let i = 0;
             const parts = path.split('>');
             do {
-                const part = parts[i].replace(/#\/c\/s/g, '#/components/schemas');
+                const part = Naming.expandRef(parts[i]);
                 if (part === '*') {
                     // remove the current path from the expanded array
                     expanded = expanded.filter((s) => s !== path);
@@ -45,15 +46,6 @@ export class TypesCollector {
                 collection = Array.from(current.children.values()) || Array.from(current.props.values()) || [];
                 i++;
             } while (i < parts.length);
-            // optional hook -- if the type in question has deps, add them here
-            const deps = _.invoke(current, 'dependencies', [this.gen.context]);
-            if (deps) {
-                deps
-                    .filter((i) => !pendingTypes.has(i.id))
-                    .forEach((i) => {
-                    pendingTypes.set(i.id, i);
-                });
-            }
             if (current && !(current instanceof Scalar)) {
                 const parentType = T.findNonPropParent(current);
                 if (!pendingTypes.has(parentType.id)) {
@@ -68,19 +60,122 @@ export class TypesCollector {
                 });
             }
         }
+        // One operation can reach the same schema through several routes, and each route builds its
+        // own node for it. Cycle detection (#10) removes a field from a node when that field would
+        // loop back to an ancestor of ITS route — so two nodes for the same schema can end up with
+        // different fields. Only one of them is written to the output schema (the first one found),
+        // but the connector selection is assembled from ALL routes: it can ask for a field the
+        // written node doesn't have, and composition fails (SELECTED_FIELD_NOT_FOUND).
+        //
+        // e.g. (confluence, one op): `Space` is reached twice —
+        //   via Content: its `history` field was removed (history loops back to Content)
+        //   via Results: `history` kept — and that route's selection asks for it
+        //
+        // The routes are already spelled out in `expanded`, so for each removed field we look for a
+        // selection path carrying the real field under the same type id, walk that path to its node,
+        // and tell the writer to emit that version of the field (context.sdlPropOverrides — the TYPE
+        // DEFINITION only; selections are left alone, each route keeps its own "field removed"
+        // comment. Putting the field back into props re-created the loop cycle detection had just
+        // broken: rover CIRCULAR_REFERENCE). Because the replacement comes FROM the selection, a
+        // field nobody selects is never added (CONNECTORS_UNRESOLVED_FIELD, test_040 AdobeCommerce).
+        // see docs/issues.md #13
+        const context = this.gen.context;
+        for (const kept of pendingTypes.values()) {
+            kept.props.forEach((prop, name) => {
+                if (!(prop instanceof PropCircRef)) {
+                    return;
+                }
+                const donor = this.findSelectedFieldNode(kept, name, expanded);
+                if (donor) {
+                    let overrides = context.sdlPropOverrides.get(kept);
+                    if (!overrides) {
+                        overrides = new Map();
+                        context.sdlPropOverrides.set(kept, overrides);
+                    }
+                    overrides.set(name, donor);
+                }
+            });
+        }
         // first pass is to consolidate all Composed & Union nodes
         const composed = Array.from(pendingTypes.values())
             .filter((t) => t instanceof Composed)
             .map((t) => t);
-        const context = this.gen.context;
         for (const comp of composed) {
             if (!comp.visited)
                 comp.visit(context);
             comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));
         }
+        // keep exactly the types the written schema references: confluence emitted `Label` with
+        // nothing selecting it, box dropped `Folder--Mini` while still referencing it. see #26
+        const reachable = this.collectReachable(expanded);
+        for (const [id, type] of Array.from(pendingTypes.entries())) {
+            if (!reachable.has(type)) {
+                pendingTypes.delete(id);
+            }
+        }
+        for (const type of reachable) {
+            if (!pendingTypes.has(type.id)) {
+                pendingTypes.set(type.id, type);
+            }
+        }
         this.types = pendingTypes;
         this.expanded = expanded;
     }
+    // Every type the written schema will point at, walked over each node's own dependencies()
+    // from the selected operations' result/body. e.g. `getUser: User` + `User.address: Address`
+    // reaches { User, Address }. see #26
+    collectReachable(expanded) {
+        const context = this.gen.context;
+        const opIds = new Set(expanded.map((p) => p.split('>')[0]));
+        const queue = [];
+        for (const op of this.gen.paths.values()) {
+            if (opIds.has(op.id)) {
+                const roots = [_.get(op, 'resultType'), _.get(op, 'body')];
+                queue.push(...roots.filter((n) => !!n));
+            }
+        }
+        const visited = new Set();
+        while (queue.length > 0) {
+            const node = queue.pop();
+            if (visited.has(node)) {
+                continue;
+            }
+            // every container was expanded by the collect loop before this walk — an unvisited one
+            // means a missed reference, and writing it would silently truncate the schema. Enums are
+            // exempt: they are complete at construction and their visit() only registers the name.
+            // dependencies() implementations must stay read-only: no visit(), no context stack. #26
+            if (!node.visited && T.isContainer(node)) {
+                throw new Error(`collectReachable: unvisited type ${node.id} — the collect walk missed a reference`);
+            }
+            visited.add(node);
+            queue.push(...node.dependencies(context, expanded));
+        }
+        return new Set(Array.from(visited).filter(T.isEmittable));
+    }
+    // A selection path that carries the real `name` field under this type id (`>obj:type:X>prop:…:name>`),
+    // walked to its node — the un-removed version of a field this node lost to a cycle cut. see #13
+    findSelectedFieldNode(kept, name, expanded) {
+        // selection paths abbreviate component refs (`path()` writes `#/c/s`); match that form
+        const marker = `>${Naming.abbreviateRef(kept.id)}>`;
+        for (const sel of expanded) {
+            const at = sel.indexOf(marker);
+            if (at < 0) {
+                continue;
+            }
+            const segment = sel.slice(at + marker.length).split('>')[0];
+            const isRealProp = segment.startsWith('prop:') && !segment.startsWith('prop:circular-ref');
+            if (!isRealProp || !(segment.endsWith(':' + name) || segment.endsWith(':#' + name))) {
+                continue;
+            }
+            const donorPath = sel.slice(0, at + marker.length + segment.length);
+            const stack = new PathsCollector(this.gen).collectPaths(donorPath, Array.from(this.gen.paths.values()));
+            const donor = stack[stack.length - 1];
+            if (donor && !(donor instanceof PropCircRef)) {
+                return donor;
+            }
+        }
+        return undefined;
+    }
 }
 class PathsCollector {
     gen;
@@ -109,7 +204,7 @@ class PathsCollector {
         let i = 0;
         const parts = path.split('>');
         do {
-            const part = parts[i].replace(/#\/c\/s/g, '#/components/schemas');
+            const part = Naming.expandRef(parts[i]);
             current = collection.find((t) => t.id === part);
             if (!current) {
                 throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());
@@ -135,6 +230,16 @@ class PathsCollector {
                 if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {
                     newSelection.add(child.path());
                 }
+                else if (child instanceof PropEn) {
+                    // enum props are leaves too — without this, `>**` silently drops every enum field
+                    // (slack's `ok`-only stubs collapsed to zero types). see docs/issues.md #24
+                    newSelection.add(child.path());
+                }
+                else if (child instanceof PropCircRef) {
+                    // a cut cycle is a leaf: include its path so the commented field is emitted (in both the
+                    // SDL and the selection) instead of silently dropped. see docs/issues.md #10
+                    newSelection.add(child.path());
+                }
                 else {
                     this.gen.expand(child);
                 }

package/dist/oas/generator/typesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"typesCollector.js","sourceRoot":"","sources":["../../../src/oas/generator/typesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { Composed } from '../nodes/comp.js';\nimport { IType, Prop, PropArray, Scalar, T } from '../nodes/internal.js';\nimport { OasGen } from '../oasGen.js';\n\nexport class TypesCollector {\n  types: Map<string, IType> = new Map();\n  expanded: string[] = [];\n\n  constructor(private gen: OasGen) {}\n\n  public collect(selection: string[]): void {\n    const pendingTypes: Map<string, IType> = new Map();\n    let expanded: string[] = new PathsCollector(this.gen).collectExpandedPaths(selection);\n\n    for (const path of expanded) {\n      let collection = Array.from(this.gen.paths.values());\n      let current: IType | undefined;\n      let last: IType | undefined;\n\n      let i = 0;\n      const parts = path.split('>');\n      do {\n        const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n        if (part === '*') {\n          // remove the current path from the expanded array\n          expanded = expanded.filter((s) => s !== path);\n\n          if (current && current instanceof Composed) {\n            current!.consolidate(expanded);\n          }\n\n          // add all the props from the current node and exit loop\n          current?.props.forEach((child) => {\n            if (T.isLeaf(child)) {\n              expanded.push(child.path());\n            }\n          });\n          break;\n        }\n\n        current = collection.find((t) => t.id === part);\n        if (!current) {\n          const tree = T.print(last!.ancestors()[0]);\n\n          // let's collect the possible paths so we don't have to debug\n          throw new Error(\n            'Could not find type: ' + part + ' from ' + path + '\\nlast:\\n' + last?.pathToRoot() + '\\ntree: ' + tree,\n          );\n        }\n\n        // make sure we expand it before we move on to the next part\n        this.gen.expand(current);\n        last = current;\n\n        collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n        i++;\n      } while (i < parts.length);\n\n      // optional hook -- if the type in question has deps, add them here\n      const deps: IType[] = _.invoke(current, 'dependencies', [this.gen.context]);\n      if (deps) {\n        deps\n          .filter((i) => !pendingTypes.has(i.id))\n          .forEach((i) => {\n            pendingTypes.set(i.id, i);\n          });\n      }\n\n      if (current && !(current instanceof Scalar)) {\n        const parentType = T.findNonPropParent(current as IType);\n        if (!pendingTypes.has(parentType.id)) {\n          pendingTypes.set(parentType.id, parentType);\n        }\n\n        // add all ancestors (of the parent of the prop) that are containers so they are generated accordingly\n        parentType\n          .ancestors()\n          .filter((t) => !pendingTypes.has(t.id) && T.isContainer(t))\n          .forEach((dep) => {\n            pendingTypes.set(dep.id, dep);\n          });\n      }\n    }\n\n    // first pass is to consolidate all Composed & Union nodes\n    const composed: Array<Composed> = Array.from(pendingTypes.values())\n      .filter((t) => t instanceof Composed)\n      .map((t) => t as Composed);\n\n    const context = this.gen.context!;\n    for (const comp of composed) {\n      if (!comp.visited) comp.visit(context);\n      comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));\n    }\n\n    this.types = pendingTypes;\n    this.expanded = expanded;\n  }\n}\n\nclass PathsCollector {\n  constructor(private gen: OasGen) {}\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static progressiveSplits(input: string): string[] {\n    const parts = input.split('>');\n    const results: string[] = [];\n    for (let i = 1; i <= parts.length; i++) {\n      results.push(parts.slice(0, i).join('>'));\n    }\n    return results;\n  }\n\n  public collectPaths(path: string, collection: IType[]): IType[] {\n    const stack: IType[] = [];\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());\n      }\n\n      // make sure we expand it before we move on to the next part\n      this.gen.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      stack.push(current);\n      i++;\n    } while (i < parts.length);\n\n    return stack;\n  }\n\n  public collectExpandedPaths(selection: string[]) {\n    const newSelection = new Set<string>();\n    const expands = selection.filter((p) => p.endsWith('>**'));\n    const filtered = expands.map((p) => p.replace('>**', ''));\n\n    const paths = Array.from(this.gen.paths.values());\n    const nodes = filtered.map((p) => this.collectPaths(p, paths));\n\n    nodes.forEach((stack) => {\n      const root = _.last(stack)!;\n      T.traverse(root, (child) => {\n        if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {\n          newSelection.add(child.path());\n        } else {\n          this.gen.expand(child);\n        }\n      });\n    });\n\n    // finally remove the expanded paths from the selection\n    return [...newSelection, ...selection.filter((p) => !expands.includes(p))];\n  }\n}\n"]}
+{"version":3,"file":"typesCollector.js","sourceRoot":"","sources":["../../../src/oas/generator/typesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { Composed } from '../nodes/comp.js';\nimport { IType, Prop, PropArray, PropCircRef, PropEn, Scalar, T } from '../nodes/internal.js';\nimport { OasGen } from '../oasGen.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class TypesCollector {\n  types: Map<string, IType> = new Map();\n  expanded: string[] = [];\n\n  constructor(private gen: OasGen) {}\n\n  public collect(selection: string[]): void {\n    const pendingTypes: Map<string, IType> = new Map();\n    let expanded: string[] = new PathsCollector(this.gen).collectExpandedPaths(selection);\n\n    for (const path of expanded) {\n      let collection = Array.from(this.gen.paths.values());\n      let current: IType | undefined;\n      let last: IType | undefined;\n\n      let i = 0;\n      const parts = path.split('>');\n      do {\n        const part = Naming.expandRef(parts[i]);\n        if (part === '*') {\n          // remove the current path from the expanded array\n          expanded = expanded.filter((s) => s !== path);\n\n          if (current && current instanceof Composed) {\n            current!.consolidate(expanded);\n          }\n\n          // add all the props from the current node and exit loop\n          current?.props.forEach((child) => {\n            if (T.isLeaf(child)) {\n              expanded.push(child.path());\n            }\n          });\n          break;\n        }\n\n        current = collection.find((t) => t.id === part);\n        if (!current) {\n          const tree = T.print(last!.ancestors()[0]);\n\n          // let's collect the possible paths so we don't have to debug\n          throw new Error(\n            'Could not find type: ' + part + ' from ' + path + '\\nlast:\\n' + last?.pathToRoot() + '\\ntree: ' + tree,\n          );\n        }\n\n        // make sure we expand it before we move on to the next part\n        this.gen.expand(current);\n        last = current;\n\n        collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n        i++;\n      } while (i < parts.length);\n\n      if (current && !(current instanceof Scalar)) {\n        const parentType = T.findNonPropParent(current as IType);\n        if (!pendingTypes.has(parentType.id)) {\n          pendingTypes.set(parentType.id, parentType);\n        }\n\n        // add all ancestors (of the parent of the prop) that are containers so they are generated accordingly\n        parentType\n          .ancestors()\n          .filter((t) => !pendingTypes.has(t.id) && T.isContainer(t))\n          .forEach((dep) => {\n            pendingTypes.set(dep.id, dep);\n          });\n      }\n    }\n\n    // One operation can reach the same schema through several routes, and each route builds its\n    // own node for it. Cycle detection (#10) removes a field from a node when that field would\n    // loop back to an ancestor of ITS route — so two nodes for the same schema can end up with\n    // different fields. Only one of them is written to the output schema (the first one found),\n    // but the connector selection is assembled from ALL routes: it can ask for a field the\n    // written node doesn't have, and composition fails (SELECTED_FIELD_NOT_FOUND).\n    //\n    // e.g. (confluence, one op): `Space` is reached twice —\n    //   via Content: its `history` field was removed (history loops back to Content)\n    //   via Results: `history` kept — and that route's selection asks for it\n    //\n    // The routes are already spelled out in `expanded`, so for each removed field we look for a\n    // selection path carrying the real field under the same type id, walk that path to its node,\n    // and tell the writer to emit that version of the field (context.sdlPropOverrides — the TYPE\n    // DEFINITION only; selections are left alone, each route keeps its own \"field removed\"\n    // comment. Putting the field back into props re-created the loop cycle detection had just\n    // broken: rover CIRCULAR_REFERENCE). Because the replacement comes FROM the selection, a\n    // field nobody selects is never added (CONNECTORS_UNRESOLVED_FIELD, test_040 AdobeCommerce).\n    // see docs/issues.md #13\n    const context = this.gen.context!;\n    for (const kept of pendingTypes.values()) {\n      kept.props.forEach((prop, name) => {\n        if (!(prop instanceof PropCircRef)) {\n          return;\n        }\n        const donor = this.findSelectedFieldNode(kept, name, expanded);\n        if (donor) {\n          let overrides = context.sdlPropOverrides.get(kept);\n          if (!overrides) {\n            overrides = new Map();\n            context.sdlPropOverrides.set(kept, overrides);\n          }\n          overrides.set(name, donor);\n        }\n      });\n    }\n\n    // first pass is to consolidate all Composed & Union nodes\n    const composed: Array<Composed> = Array.from(pendingTypes.values())\n      .filter((t) => t instanceof Composed)\n      .map((t) => t as Composed);\n\n    for (const comp of composed) {\n      if (!comp.visited) comp.visit(context);\n      comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));\n    }\n\n    // keep exactly the types the written schema references: confluence emitted `Label` with\n    // nothing selecting it, box dropped `Folder--Mini` while still referencing it. see #26\n    const reachable = this.collectReachable(expanded);\n    for (const [id, type] of Array.from(pendingTypes.entries())) {\n      if (!reachable.has(type)) {\n        pendingTypes.delete(id);\n      }\n    }\n    for (const type of reachable) {\n      if (!pendingTypes.has(type.id)) {\n        pendingTypes.set(type.id, type);\n      }\n    }\n\n    this.types = pendingTypes;\n    this.expanded = expanded;\n  }\n\n  // Every type the written schema will point at, walked over each node's own dependencies()\n  // from the selected operations' result/body. e.g. `getUser: User` + `User.address: Address`\n  // reaches { User, Address }. see #26\n  private collectReachable(expanded: string[]): Set<IType> {\n    const context = this.gen.context!;\n    const opIds = new Set(expanded.map((p) => p.split('>')[0]));\n\n    const queue: IType[] = [];\n    for (const op of this.gen.paths.values()) {\n      if (opIds.has(op.id)) {\n        const roots = [_.get(op, 'resultType'), _.get(op, 'body')] as Array<IType | undefined>;\n        queue.push(...roots.filter((n): n is IType => !!n));\n      }\n    }\n\n    const visited = new Set<IType>();\n    while (queue.length > 0) {\n      const node = queue.pop()!;\n      if (visited.has(node)) {\n        continue;\n      }\n      // every container was expanded by the collect loop before this walk — an unvisited one\n      // means a missed reference, and writing it would silently truncate the schema. Enums are\n      // exempt: they are complete at construction and their visit() only registers the name.\n      // dependencies() implementations must stay read-only: no visit(), no context stack. #26\n      if (!node.visited && T.isContainer(node)) {\n        throw new Error(`collectReachable: unvisited type ${node.id} — the collect walk missed a reference`);\n      }\n      visited.add(node);\n      queue.push(...node.dependencies(context, expanded));\n    }\n\n    return new Set(Array.from(visited).filter(T.isEmittable));\n  }\n\n  // A selection path that carries the real `name` field under this type id (`>obj:type:X>prop:…:name>`),\n  // walked to its node — the un-removed version of a field this node lost to a cycle cut. see #13\n  private findSelectedFieldNode(kept: IType, name: string, expanded: string[]): IType | undefined {\n    // selection paths abbreviate component refs (`path()` writes `#/c/s`); match that form\n    const marker = `>${Naming.abbreviateRef(kept.id)}>`;\n    for (const sel of expanded) {\n      const at = sel.indexOf(marker);\n      if (at < 0) {\n        continue;\n      }\n      const segment = sel.slice(at + marker.length).split('>')[0];\n      const isRealProp = segment.startsWith('prop:') && !segment.startsWith('prop:circular-ref');\n      if (!isRealProp || !(segment.endsWith(':' + name) || segment.endsWith(':#' + name))) {\n        continue;\n      }\n      const donorPath = sel.slice(0, at + marker.length + segment.length);\n      const stack = new PathsCollector(this.gen).collectPaths(donorPath, Array.from(this.gen.paths.values()));\n      const donor = stack[stack.length - 1];\n      if (donor && !(donor instanceof PropCircRef)) {\n        return donor;\n      }\n    }\n    return undefined;\n  }\n}\n\nclass PathsCollector {\n  constructor(private gen: OasGen) {}\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static progressiveSplits(input: string): string[] {\n    const parts = input.split('>');\n    const results: string[] = [];\n    for (let i = 1; i <= parts.length; i++) {\n      results.push(parts.slice(0, i).join('>'));\n    }\n    return results;\n  }\n\n  public collectPaths(path: string, collection: IType[]): IType[] {\n    const stack: IType[] = [];\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = Naming.expandRef(parts[i]);\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());\n      }\n\n      // make sure we expand it before we move on to the next part\n      this.gen.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      stack.push(current);\n      i++;\n    } while (i < parts.length);\n\n    return stack;\n  }\n\n  public collectExpandedPaths(selection: string[]) {\n    const newSelection = new Set<string>();\n    const expands = selection.filter((p) => p.endsWith('>**'));\n    const filtered = expands.map((p) => p.replace('>**', ''));\n\n    const paths = Array.from(this.gen.paths.values());\n    const nodes = filtered.map((p) => this.collectPaths(p, paths));\n\n    nodes.forEach((stack) => {\n      const root = _.last(stack)!;\n      T.traverse(root, (child) => {\n        if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {\n          newSelection.add(child.path());\n        } else if (child instanceof PropEn) {\n          // enum props are leaves too — without this, `>**` silently drops every enum field\n          // (slack's `ok`-only stubs collapsed to zero types). see docs/issues.md #24\n          newSelection.add(child.path());\n        } else if (child instanceof PropCircRef) {\n          // a cut cycle is a leaf: include its path so the commented field is emitted (in both the\n          // SDL and the selection) instead of silently dropped. see docs/issues.md #10\n          newSelection.add(child.path());\n        } else {\n          this.gen.expand(child);\n        }\n      });\n    });\n\n    // finally remove the expanded paths from the selection\n    return [...newSelection, ...selection.filter((p) => !expands.includes(p))];\n  }\n}\n"]}

package/dist/oas/io/operationWriter.d.ts

@@ -8,6 +8,8 @@ export declare class OperationWriter {
     writeQuery(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void;
     writeMutations(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void;
     writeConnector(context: OasContext, writer: Writer, type: IType, selection: string[]): void;
+    private writeErrors;
+    private hasDocumentedErrors;
     private requestMethod;
     private writeSelection;
     private writeBodySelection;

package/dist/oas/io/operationWriter.js

@@ -1,5 +1,7 @@
 import _ from 'lodash';
 import { Naming } from '../utils/naming.js';
+import { DEFAULT_VERSIONS, meetsMinimum } from '../../versions.js';
+import { warn } from '../log/trace.js';
 export class OperationWriter {
     gen;
     constructor(gen) {
@@ -45,13 +47,43 @@ export class OperationWriter {
             this.writeSelection(context, writer, _.get(op, 'resultType'), selection);
         }
         writer.write(spacing).write('"""\n');
+        this.writeErrors(context, writer, op, indent);
         spacing = ' '.repeat(indent + 4);
         writer.write(spacing).write(')\n');
     }
+    // R4 (opt-in): emit `errors: { extensions: """statusCode: $status""" }` to surface the HTTP status
+    // in the GraphQL error extensions, for operations that document HTTP error responses. errors is a
+    // connect v0.2+ feature; below that we skip with a logged downgrade rather than emit invalid output.
+    writeErrors(context, writer, op, indent) {
+        if (!context.generateOptions?.emitConnectorErrors || !this.hasDocumentedErrors(op)) {
+            return;
+        }
+        const version = this.gen.options.connectorSpecVersion || DEFAULT_VERSIONS.connectorSpecVersion;
+        if (!meetsMinimum(version, 'v0.2')) {
+            warn(context, '[errors]', `@connect(errors:) requires connect v0.2, but target is ${version} — not emitted for ${op.verb} ${op.operation.path}`);
+            return;
+        }
+        const outer = ' '.repeat(indent + 6);
+        const inner = ' '.repeat(indent + 6);
+        writer
+            .write(outer)
+            .write('errors: { extensions: """\n')
+            .write(inner)
+            .write('statusCode: $status\n')
+            .write(outer)
+            .write('""" }\n');
+    }
+    // True when the operation documents an HTTP error response. Accepts both concrete numeric statuses
+    // (4xx/5xx) and the OAS range keys `4XX`/`5XX` (case-insensitive). The `default` key is excluded —
+    // it also covers 2xx/3xx, so it is not specifically an error indicator.
+    hasDocumentedErrors(op) {
+        return op.operation.getResponseStatusCodes().some((code) => /^[45](\d\d|XX)$/i.test(code));
+    }
     requestMethod(context, writer, op, selection, indent) {
-        // replace every {elem} in the path for {$args.elem}
+        // template each {elem} as {$args.<sanitised>} (the arg name), not the raw OAS key. see docs/issues.md #2
         const verb = op.verb;
-        writer.write(`{ ${verb}: `).write('"' + op.operation.path.replace(/\{([a-zA-Z0-9]+)\}/g, '{$args.$1}') + '"');
+        const templatedPath = op.operation.path.replace(/\{([^}]+)\}/g, (_m, name) => `{$args.${Naming.genParamName(name)}}`);
+        writer.write(`{ ${verb}: `).write('"' + templatedPath + '"');
         if (op.params.length > 0) {
             // we now include all query params, not just required ones. if they are not set,
             // then the connectors will not include them in the request.