apollo-conn-gen 0.10.0 → 0.11.0

package/dist/cli/oas.js

@@ -31,7 +31,6 @@ async function main(sourceFile, opts) {
     const mapper = loadRules(opts);
     const gen = await OasGen.fromFile(sourceFile, {
         ...opts,
-        consolidateUnions: true,
         showParentInSelections: false,
         federationVersion: opts.federationVersion,
         connectorSpecVersion: opts.connectorSpecVersion,

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    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"]}
+{"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    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/oas/generator/typesCollector.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { Composed } from '../nodes/comp.js';
-import { Prop, PropArray, PropCircRef, PropEn, Scalar, T } from '../nodes/internal.js';
+import { Prop, PropArray, PropCircRef, PropEn, PropObj, Scalar, T } from '../nodes/internal.js';
 import { Naming } from '../utils/naming.js';
 export class TypesCollector {
     gen;
@@ -244,6 +244,18 @@ class PathsCollector {
                     this.gen.expand(child);
                 }
             });
+            // an op whose expansion found nothing selectable still has fields to write when its only
+            // content is a free-form JSON object (asana: `data: $ref EmptyResponse` -> `data: JSON`,
+            // emitted as an EMPTY invalid type before) — take those fields as the leaves. Scoped to
+            // otherwise-empty ops on purpose: doing it everywhere diverged the selections of types
+            // shared across connectors. see docs/issues.md #32
+            if (!Array.from(newSelection).some((p) => p.startsWith(root.path()))) {
+                T.traverse(root, (child) => {
+                    if (child instanceof PropObj && _.isEmpty(child.obj?.props)) {
+                        newSelection.add(child.path());
+                    }
+                });
+            }
         });
         // finally remove the expanded paths from the selection
         return [...newSelection, ...selection.filter((p) => !expands.includes(p))];

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

@@ -1 +1 @@
-{"version":3,"file":"typesCollector.js","sourceRoot":"","sources":["../../../src/oas/generator/typesCollector.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAS,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,cAAc;IAIL;IAHpB,KAAK,GAAuB,IAAI,GAAG,EAAE,CAAC;IACtC,QAAQ,GAAa,EAAE,CAAC;IAExB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,OAAO,CAAC,SAAmB;QAChC,MAAM,YAAY,GAAuB,IAAI,GAAG,EAAE,CAAC;QACnD,IAAI,QAAQ,GAAa,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAEtF,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACrD,IAAI,OAA0B,CAAC;YAC/B,IAAI,IAAuB,CAAC;YAE5B,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,GAAG,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACjB,kDAAkD;oBAClD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;oBAE9C,IAAI,OAAO,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;wBAC3C,OAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACjC,CAAC;oBAED,wDAAwD;oBACxD,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/B,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACpB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;wBAC9B,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM;gBACR,CAAC;gBAED,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;gBAChD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,IAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE3C,6DAA6D;oBAC7D,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,GAAG,IAAI,CACxG,CAAC;gBACJ,CAAC;gBAED,4DAA4D;gBAC5D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzB,IAAI,GAAG,OAAO,CAAC;gBAEf,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;gBACjG,CAAC,EAAE,CAAC;YACN,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE;YAE3B,IAAI,OAAO,IAAI,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,EAAE,CAAC;gBAC5C,MAAM,UAAU,GAAG,CAAC,CAAC,iBAAiB,CAAC,OAAgB,CAAC,CAAC;gBACzD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;oBACrC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;gBAC9C,CAAC;gBAED,sGAAsG;gBACtG,UAAU;qBACP,SAAS,EAAE;qBACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;qBAC1D,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACf,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;QAED,4FAA4F;QAC5F,2FAA2F;QAC3F,2FAA2F;QAC3F,4FAA4F;QAC5F,uFAAuF;QACvF,+EAA+E;QAC/E,EAAE;QACF,wDAAwD;QACxD,iFAAiF;QACjF,yEAAyE;QACzE,EAAE;QACF,4FAA4F;QAC5F,6FAA6F;QAC7F,6FAA6F;QAC7F,uFAAuF;QACvF,0FAA0F;QAC1F,yFAAyF;QACzF,6FAA6F;QAC7F,yBAAyB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAQ,CAAC;QAClC,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,CAAC,EAAE,CAAC;oBACnC,OAAO;gBACT,CAAC;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC/D,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACnD,IAAI,CAAC,SAAS,EAAE,CAAC;wBACf,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;wBACtB,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAChD,CAAC;oBACD,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,0DAA0D;QAC1D,MAAM,QAAQ,GAAoB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;aAChE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,QAAQ,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAa,CAAC,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;QAED,wFAAwF;QACxF,uFAAuF;QACvF,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAClD,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,0FAA0F;IAC1F,4FAA4F;IAC5F,qCAAqC;IAC7B,gBAAgB,CAAC,QAAkB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAQ,CAAC;QAClC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5D,MAAM,KAAK,GAAY,EAAE,CAAC;QAC1B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAA6B,CAAC;gBACvF,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAS,CAAC;QACjC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;YAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,uFAAuF;YACvF,yFAAyF;YACzF,uFAAuF;YACvF,wFAAwF;YACxF,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,EAAE,wCAAwC,CAAC,CAAC;YACvG,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,uGAAuG;IACvG,gGAAgG;IACxF,qBAAqB,CAAC,IAAW,EAAE,IAAY,EAAE,QAAkB;QACzE,uFAAuF;QACvF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAC3F,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;gBACpF,SAAS;YACX,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YACpE,MAAM,KAAK,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxG,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACtC,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,YAAY,WAAW,CAAC,EAAE,CAAC;gBAC7C,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,MAAM,cAAc;IACE;IAApB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,MAAM,CAAC,iBAAiB,CAAC,IAAW;QACzC,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,OAAO,MAAM,YAAY,IAAI,EAAE,CAAC;YAC9B,MAAM,GAAG,MAAM,CAAC,MAAO,CAAC;QAC1B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,KAAa;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,UAAmB;QACnD,MAAM,KAAK,GAAY,EAAE,CAAC;QAC1B,IAAI,OAA0B,CAAC;QAC/B,IAAI,IAAuB,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,GAAG,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAExC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;YAChD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;YACtG,CAAC;YAED,4DAA4D;YAC5D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,GAAG,OAAO,CAAC;YAEf,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;YAEjG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,CAAC,EAAE,CAAC;QACN,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE;QAE3B,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,oBAAoB,CAAC,SAAmB;QAC7C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAE/D,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;YAC5B,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;gBACzB,IAAI,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,YAAY,SAAS,IAAI,KAAK,CAAC,KAAK,YAAY,MAAM,CAAC,EAAE,CAAC;oBAC3F,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjC,CAAC;qBAAM,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;oBACnC,kFAAkF;oBAClF,4EAA4E;oBAC5E,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjC,CAAC;qBAAM,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;oBACxC,yFAAyF;oBACzF,6EAA6E;oBAC7E,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,uDAAuD;QACvD,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF","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"]}
+{"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, PropObj, 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      // an op whose expansion found nothing selectable still has fields to write when its only\n      // content is a free-form JSON object (asana: `data: $ref EmptyResponse` -> `data: JSON`,\n      // emitted as an EMPTY invalid type before) — take those fields as the leaves. Scoped to\n      // otherwise-empty ops on purpose: doing it everywhere diverged the selections of types\n      // shared across connectors. see docs/issues.md #32\n      if (!Array.from(newSelection).some((p) => p.startsWith(root.path()))) {\n        T.traverse(root, (child) => {\n          if (child instanceof PropObj && _.isEmpty(child.obj?.props)) {\n            newSelection.add(child.path());\n          }\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.js

@@ -42,8 +42,8 @@ export class OperationWriter {
         writer.write(spacing).write('source: "api"\n').write(spacing).write('http: ');
         this.requestMethod(context, writer, op, selection, indent);
         writer.write('\n').write(spacing).write('selection: """\n');
-        if (_.has(op, 'resultType')) {
-            // scalar types don't need to be generated?
+        // truthiness, not _.has — the declared-but-unset field is still an own property. #33
+        if (_.get(op, 'resultType')) {
             this.writeSelection(context, writer, _.get(op, 'resultType'), selection);
         }
         writer.write(spacing).write('"""\n');

package/dist/oas/io/operationWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"operationWriter.js","sourceRoot":"","sources":["../../../src/oas/io/operationWriter.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { OasContext } from '../oasContext.js';\nimport { OasGen } from '../oasGen.js';\nimport { Body, IType, Op, Param, Type } from '../nodes/internal.js';\nimport { Naming } from '../utils/naming.js';\nimport { Writer } from './writer.js';\nimport { DEFAULT_VERSIONS, meetsMinimum } from '../../versions.js';\nimport { warn } from '../log/trace.js';\n\nexport class OperationWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeQuery(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Query {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeMutations(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Mutation {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeConnector(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    const indent = 0;\n    const op = type as unknown as Op; // assume type is GetOp\n    let spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write('@connect(\\n');\n\n    spacing = ' '.repeat(indent + 6);\n    writer.write(spacing).write('source: \"api\"\\n').write(spacing).write('http: ');\n\n    this.requestMethod(context, writer, op, selection, indent);\n\n    writer.write('\\n').write(spacing).write('selection: \"\"\"\\n');\n\n    if (_.has(op, 'resultType')) {\n      // scalar types don't need to be generated?\n      this.writeSelection(context, writer, _.get(op, 'resultType') as Type, selection);\n    }\n\n    writer.write(spacing).write('\"\"\"\\n');\n\n    this.writeErrors(context, writer, op, indent);\n\n    spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write(')\\n');\n  }\n\n  // R4 (opt-in): emit `errors: { extensions: \"\"\"statusCode: $status\"\"\" }` to surface the HTTP status\n  // in the GraphQL error extensions, for operations that document HTTP error responses. errors is a\n  // connect v0.2+ feature; below that we skip with a logged downgrade rather than emit invalid output.\n  private writeErrors(context: OasContext, writer: Writer, op: Op, indent: number): void {\n    if (!context.generateOptions?.emitConnectorErrors || !this.hasDocumentedErrors(op)) {\n      return;\n    }\n\n    const version = this.gen.options.connectorSpecVersion || DEFAULT_VERSIONS.connectorSpecVersion;\n    if (!meetsMinimum(version, 'v0.2')) {\n      warn(\n        context,\n        '[errors]',\n        `@connect(errors:) requires connect v0.2, but target is ${version} — not emitted for ${op.verb} ${op.operation.path}`,\n      );\n      return;\n    }\n\n    const outer = ' '.repeat(indent + 6);\n    const inner = ' '.repeat(indent + 6);\n    writer\n      .write(outer)\n      .write('errors: { extensions: \"\"\"\\n')\n      .write(inner)\n      .write('statusCode: $status\\n')\n      .write(outer)\n      .write('\"\"\" }\\n');\n  }\n\n  // True when the operation documents an HTTP error response. Accepts both concrete numeric statuses\n  // (4xx/5xx) and the OAS range keys `4XX`/`5XX` (case-insensitive). The `default` key is excluded —\n  // it also covers 2xx/3xx, so it is not specifically an error indicator.\n  private hasDocumentedErrors(op: Op): boolean {\n    return op.operation.getResponseStatusCodes().some((code: string) => /^[45](\\d\\d|XX)$/i.test(code));\n  }\n\n  private requestMethod(context: OasContext, writer: Writer, op: Op, selection: string[], indent: number): void {\n    // template each {elem} as {$args.<sanitised>} (the arg name), not the raw OAS key. see docs/issues.md #2\n    const verb = op.verb;\n    const templatedPath = op.operation.path.replace(\n      /\\{([^}]+)\\}/g,\n      (_m, name) => `{$args.${Naming.genParamName(name)}}`,\n    );\n    writer.write(`{ ${verb}: `).write('\"' + templatedPath + '\"');\n\n    if (op.params.length > 0) {\n      // we now include all query params, not just required ones. if they are not set,\n      // then the connectors will not include them in the request.\n      let queryParams = op.params.filter((p: Param) => {\n        return p.parameter.in && p.parameter.in.toLowerCase() === 'query';\n      });\n\n      // Skip optional params if skipOptionalArgs is true\n      if (context.generateOptions?.skipOptionalArgs) {\n        queryParams = queryParams.filter((p: Param) => p.required);\n      }\n\n      if (queryParams.length > 0) {\n        writer.write('\\n');\n        let spacing = ' '.repeat(6);\n\n        writer.write(spacing).write(`queryParams: \"\"\"\\n`);\n        spacing = ' '.repeat(8);\n        writer.write(spacing).write(`$args {\\n`);\n        spacing = ' '.repeat(10);\n        for (const p of queryParams) {\n          writer.write(spacing).write(`\"${p.name}\": ${Naming.genParamName(p.name)}\\n`);\n        }\n        spacing = ' '.repeat(8);\n        writer.write(spacing).write('}\\n');\n        spacing = ' '.repeat(6);\n        writer.write(spacing).write('\"\"\"\\n');\n      }\n\n      const headers = op.operation.getParameters().filter((p) => p.in && p.in.toLowerCase() === 'header');\n\n      if (headers.length > 0) {\n        let spacing = ' '.repeat(6);\n        writer.write(spacing + 'headers: [\\n');\n        spacing = ' '.repeat(8);\n\n        for (const p of headers) {\n          let value: string | null = null;\n\n          if (p.example != null) {\n            value = p.example.toString();\n          }\n\n          if (p.examples && Object.keys(p.examples).length > 0) {\n            value = Object.keys(p.examples).join(',');\n          }\n\n          if (value == null) {\n            value = '<placeholder>';\n          }\n\n          writer.write(spacing + `{ name: \"${p.name}\", value: \"${value}\" }\\n`);\n        }\n\n        spacing = ' '.repeat(6);\n        writer.write(spacing + ']');\n      }\n    }\n\n    if (_.has(op, 'body')) {\n      const body = op.body as Body;\n      this.writeBodySelection(context, writer, body, selection);\n    }\n\n    writer.write('}');\n  }\n\n  private writeSelection(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    context.indent = 6;\n    type.select(context, writer, selection);\n  }\n\n  private writeBodySelection(context: OasContext, writer: Writer, body: Body, selection: string[]): void {\n    writer.write(',\\n');\n    context.indent = 6;\n    if (body) {\n      body.select(context, writer, selection);\n    }\n  }\n}\n"]}
+{"version":3,"file":"operationWriter.js","sourceRoot":"","sources":["../../../src/oas/io/operationWriter.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAIvB,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,MAAM,OAAO,eAAe;IACN;IAApB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,UAAU,CAAC,OAAmB,EAAE,MAAc,EAAE,SAA6B,EAAE,SAAmB;QACvG,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO;QAE7B,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACtD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAEM,cAAc,CAAC,OAAmB,EAAE,MAAc,EAAE,SAA6B,EAAE,SAAmB;QAC3G,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO;QAE7B,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACtD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAEM,cAAc,CAAC,OAAmB,EAAE,MAAc,EAAE,IAAW,EAAE,SAAmB;QACzF,MAAM,MAAM,GAAG,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,IAAqB,CAAC,CAAC,uBAAuB;QACzD,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE3C,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE9E,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAE3D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE5D,qFAAqF;QACrF,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,YAAY,CAAS,EAAE,SAAS,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9C,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,mGAAmG;IACnG,kGAAkG;IAClG,qGAAqG;IAC7F,WAAW,CAAC,OAAmB,EAAE,MAAc,EAAE,EAAM,EAAE,MAAc;QAC7E,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,mBAAmB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC;YACnF,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,IAAI,gBAAgB,CAAC,oBAAoB,CAAC;QAC/F,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YACnC,IAAI,CACF,OAAO,EACP,UAAU,EACV,0DAA0D,OAAO,sBAAsB,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CACtH,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM;aACH,KAAK,CAAC,KAAK,CAAC;aACZ,KAAK,CAAC,6BAA6B,CAAC;aACpC,KAAK,CAAC,KAAK,CAAC;aACZ,KAAK,CAAC,uBAAuB,CAAC;aAC9B,KAAK,CAAC,KAAK,CAAC;aACZ,KAAK,CAAC,SAAS,CAAC,CAAC;IACtB,CAAC;IAED,mGAAmG;IACnG,mGAAmG;IACnG,wEAAwE;IAChE,mBAAmB,CAAC,EAAM;QAChC,OAAO,EAAE,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrG,CAAC;IAEO,aAAa,CAAC,OAAmB,EAAE,MAAc,EAAE,EAAM,EAAE,SAAmB,EAAE,MAAc;QACpG,yGAAyG;QACzG,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;QACrB,MAAM,aAAa,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAC7C,cAAc,EACd,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CACrD,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC,CAAC;QAE7D,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,gFAAgF;YAChF,4DAA4D;YAC5D,IAAI,WAAW,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAQ,EAAE,EAAE;gBAC9C,OAAO,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;YACpE,CAAC,CAAC,CAAC;YAEH,mDAAmD;YACnD,IAAI,OAAO,CAAC,eAAe,EAAE,gBAAgB,EAAE,CAAC;gBAC9C,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACnB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAE5B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAClD,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACzC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzB,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;oBAC5B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/E,CAAC;gBACD,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACnC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;YAED,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,CAAC;YAEpG,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5B,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC;gBACvC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;oBACxB,IAAI,KAAK,GAAkB,IAAI,CAAC;oBAEhC,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;wBACtB,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC/B,CAAC;oBAED,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACrD,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC5C,CAAC;oBAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;wBAClB,KAAK,GAAG,eAAe,CAAC;oBAC1B,CAAC;oBAED,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,IAAI,cAAc,KAAK,OAAO,CAAC,CAAC;gBACvE,CAAC;gBAED,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,EAAE,CAAC,IAAY,CAAC;YAC7B,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAEO,cAAc,CAAC,OAAmB,EAAE,MAAc,EAAE,IAAW,EAAE,SAAmB;QAC1F,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC;IAEO,kBAAkB,CAAC,OAAmB,EAAE,MAAc,EAAE,IAAU,EAAE,SAAmB;QAC7F,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF","sourcesContent":["import _ from 'lodash';\nimport { OasContext } from '../oasContext.js';\nimport { OasGen } from '../oasGen.js';\nimport { Body, IType, Op, Param, Type } from '../nodes/internal.js';\nimport { Naming } from '../utils/naming.js';\nimport { Writer } from './writer.js';\nimport { DEFAULT_VERSIONS, meetsMinimum } from '../../versions.js';\nimport { warn } from '../log/trace.js';\n\nexport class OperationWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeQuery(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Query {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeMutations(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Mutation {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeConnector(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    const indent = 0;\n    const op = type as unknown as Op; // assume type is GetOp\n    let spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write('@connect(\\n');\n\n    spacing = ' '.repeat(indent + 6);\n    writer.write(spacing).write('source: \"api\"\\n').write(spacing).write('http: ');\n\n    this.requestMethod(context, writer, op, selection, indent);\n\n    writer.write('\\n').write(spacing).write('selection: \"\"\"\\n');\n\n    // truthiness, not _.has — the declared-but-unset field is still an own property. #33\n    if (_.get(op, 'resultType')) {\n      this.writeSelection(context, writer, _.get(op, 'resultType') as Type, selection);\n    }\n\n    writer.write(spacing).write('\"\"\"\\n');\n\n    this.writeErrors(context, writer, op, indent);\n\n    spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write(')\\n');\n  }\n\n  // R4 (opt-in): emit `errors: { extensions: \"\"\"statusCode: $status\"\"\" }` to surface the HTTP status\n  // in the GraphQL error extensions, for operations that document HTTP error responses. errors is a\n  // connect v0.2+ feature; below that we skip with a logged downgrade rather than emit invalid output.\n  private writeErrors(context: OasContext, writer: Writer, op: Op, indent: number): void {\n    if (!context.generateOptions?.emitConnectorErrors || !this.hasDocumentedErrors(op)) {\n      return;\n    }\n\n    const version = this.gen.options.connectorSpecVersion || DEFAULT_VERSIONS.connectorSpecVersion;\n    if (!meetsMinimum(version, 'v0.2')) {\n      warn(\n        context,\n        '[errors]',\n        `@connect(errors:) requires connect v0.2, but target is ${version} — not emitted for ${op.verb} ${op.operation.path}`,\n      );\n      return;\n    }\n\n    const outer = ' '.repeat(indent + 6);\n    const inner = ' '.repeat(indent + 6);\n    writer\n      .write(outer)\n      .write('errors: { extensions: \"\"\"\\n')\n      .write(inner)\n      .write('statusCode: $status\\n')\n      .write(outer)\n      .write('\"\"\" }\\n');\n  }\n\n  // True when the operation documents an HTTP error response. Accepts both concrete numeric statuses\n  // (4xx/5xx) and the OAS range keys `4XX`/`5XX` (case-insensitive). The `default` key is excluded —\n  // it also covers 2xx/3xx, so it is not specifically an error indicator.\n  private hasDocumentedErrors(op: Op): boolean {\n    return op.operation.getResponseStatusCodes().some((code: string) => /^[45](\\d\\d|XX)$/i.test(code));\n  }\n\n  private requestMethod(context: OasContext, writer: Writer, op: Op, selection: string[], indent: number): void {\n    // template each {elem} as {$args.<sanitised>} (the arg name), not the raw OAS key. see docs/issues.md #2\n    const verb = op.verb;\n    const templatedPath = op.operation.path.replace(\n      /\\{([^}]+)\\}/g,\n      (_m, name) => `{$args.${Naming.genParamName(name)}}`,\n    );\n    writer.write(`{ ${verb}: `).write('\"' + templatedPath + '\"');\n\n    if (op.params.length > 0) {\n      // we now include all query params, not just required ones. if they are not set,\n      // then the connectors will not include them in the request.\n      let queryParams = op.params.filter((p: Param) => {\n        return p.parameter.in && p.parameter.in.toLowerCase() === 'query';\n      });\n\n      // Skip optional params if skipOptionalArgs is true\n      if (context.generateOptions?.skipOptionalArgs) {\n        queryParams = queryParams.filter((p: Param) => p.required);\n      }\n\n      if (queryParams.length > 0) {\n        writer.write('\\n');\n        let spacing = ' '.repeat(6);\n\n        writer.write(spacing).write(`queryParams: \"\"\"\\n`);\n        spacing = ' '.repeat(8);\n        writer.write(spacing).write(`$args {\\n`);\n        spacing = ' '.repeat(10);\n        for (const p of queryParams) {\n          writer.write(spacing).write(`\"${p.name}\": ${Naming.genParamName(p.name)}\\n`);\n        }\n        spacing = ' '.repeat(8);\n        writer.write(spacing).write('}\\n');\n        spacing = ' '.repeat(6);\n        writer.write(spacing).write('\"\"\"\\n');\n      }\n\n      const headers = op.operation.getParameters().filter((p) => p.in && p.in.toLowerCase() === 'header');\n\n      if (headers.length > 0) {\n        let spacing = ' '.repeat(6);\n        writer.write(spacing + 'headers: [\\n');\n        spacing = ' '.repeat(8);\n\n        for (const p of headers) {\n          let value: string | null = null;\n\n          if (p.example != null) {\n            value = p.example.toString();\n          }\n\n          if (p.examples && Object.keys(p.examples).length > 0) {\n            value = Object.keys(p.examples).join(',');\n          }\n\n          if (value == null) {\n            value = '<placeholder>';\n          }\n\n          writer.write(spacing + `{ name: \"${p.name}\", value: \"${value}\" }\\n`);\n        }\n\n        spacing = ' '.repeat(6);\n        writer.write(spacing + ']');\n      }\n    }\n\n    if (_.has(op, 'body')) {\n      const body = op.body as Body;\n      this.writeBodySelection(context, writer, body, selection);\n    }\n\n    writer.write('}');\n  }\n\n  private writeSelection(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    context.indent = 6;\n    type.select(context, writer, selection);\n  }\n\n  private writeBodySelection(context: OasContext, writer: Writer, body: Body, selection: string[]): void {\n    writer.write(',\\n');\n    context.indent = 6;\n    if (body) {\n      body.select(context, writer, selection);\n    }\n  }\n}\n"]}

package/dist/oas/nodes/comp.js

@@ -168,14 +168,7 @@ export class Composed extends Type {
         trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);
     }
     add(child) {
-        let name = child.name;
-        let idx = 0;
-        // TODO: this should not be applicable to Refs
-        while (this.children.some((c) => c.name === name)) {
-            name = `${child.name}:${++idx}`;
-        }
-        child.name = name;
-        return super.add(child);
+        return super.add(this.withUniqueName(child));
     }
     updateName() {
         let name = this.name;

package/dist/oas/nodes/comp.js.map

@@ -1 +1 @@
-{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, IType, Prop, ReferenceObject, Res, T, Type } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Composed extends Type {\n  // R2: GraphQL interface this member implements (a shared allOf base of a discriminated\n  // oneOf). When set, generate() appends `implements <Base>`. Set by promoteInterfaces.\n  public implementsInterface?: string;\n\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  get id(): string {\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[comp] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', '   in composed schema: ' + this.name);\n    }\n\n    // a PropComp-named inline allOf (#7) that clashes with a stored type of a different class\n    // must rename — otherwise the same type name is defined twice. see docs/issues.md #22\n    if (this.parent instanceof Prop && T.collidesAcrossNodeClasses(this, context)) {\n      T.resolveNameConflict(this, context);\n    }\n\n    const composedSchema = this.schema;\n\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type and should be handled elsewhere\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    if (this.schema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // Definition and reference must agree: references emit genTypeName(name), so the definition\n        // does too (upperFirst(getRefName) kept separators: `Billing_historyResponse` vs the\n        // reference's `BillingHistoryResponse`). Mirrors obj.ts. see docs/issues.md #15, #6\n        const sanitised = Naming.genTypeName(this.name);\n        const refName = Naming.getRefName(this.name);\n        writer.write(this.kind + ' ');\n        writer.write(sanitised === refName ? refName : sanitised);\n        writer.write(this.nameSuffix());\n        // R2: a promoted member implements the shared base interface.\n        if (this.implementsInterface) {\n          writer.write(` implements ${this.implementsInterface}`);\n        }\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  // the selected props, once the allOf members are folded in (same shape select writes)\n  dependencies(_context: OasContext, selection: string[]): IType[] {\n    if (this.schema.allOf != null && !this.consolidated) {\n      this.consolidate(selection);\n    }\n    return this.selectedProps(selection);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const tree = T.print(this);\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      ids.add(node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      // skip metadata-only allOf members (they contribute no fields). see docs/issues.md #5\n      if (Factory.isEmptySchema(allOfItemSchema as SchemaObject)) {\n        trace(context, '   [composed::all-of]', `skipping empty allOf member #${i}`);\n        continue;\n      }\n\n      const type = Factory.fromSchema(context, this, allOfItemSchema as SchemaObject);\n      this.add(type);\n\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    const tree = T.print(this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  add(child: IType): IType {\n    let name = child.name;\n    let idx = 0;\n\n    // TODO: this should not be applicable to Refs\n    while (this.children.some((c) => c.name === name)) {\n      name = `${child.name}:${++idx}`;\n    }\n\n    child.name = name;\n    return super.add(child);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    if (!name) {\n      if (this.parent instanceof Res) {\n        const op = this.parent!.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      } else if (this.schema?.allOf?.length === 1) {\n        // single member: adopt its ref name (avoids an unusable '[inline:…]' name). see docs/issues.md #7\n        name = _.get(this.schema?.allOf[0], '$ref') as string;\n      } else if (this.parent instanceof Prop) {\n        // emitted inline allOf-property type needs a real name, not '[inline:…]'. see docs/issues.md #7\n        name = Naming.genTypeName(Naming.getRefName(this.parent.name));\n      } else {\n        // consolidated allOf member: keep the '[inline:…]' id that selection paths reference. issue #7\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n}\n"]}
+{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, IType, Prop, ReferenceObject, Res, T, Type } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Composed extends Type {\n  // R2: GraphQL interface this member implements (a shared allOf base of a discriminated\n  // oneOf). When set, generate() appends `implements <Base>`. Set by promoteInterfaces.\n  public implementsInterface?: string;\n\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  get id(): string {\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[comp] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', '   in composed schema: ' + this.name);\n    }\n\n    // a PropComp-named inline allOf (#7) that clashes with a stored type of a different class\n    // must rename — otherwise the same type name is defined twice. see docs/issues.md #22\n    if (this.parent instanceof Prop && T.collidesAcrossNodeClasses(this, context)) {\n      T.resolveNameConflict(this, context);\n    }\n\n    const composedSchema = this.schema;\n\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type and should be handled elsewhere\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    if (this.schema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // Definition and reference must agree: references emit genTypeName(name), so the definition\n        // does too (upperFirst(getRefName) kept separators: `Billing_historyResponse` vs the\n        // reference's `BillingHistoryResponse`). Mirrors obj.ts. see docs/issues.md #15, #6\n        const sanitised = Naming.genTypeName(this.name);\n        const refName = Naming.getRefName(this.name);\n        writer.write(this.kind + ' ');\n        writer.write(sanitised === refName ? refName : sanitised);\n        writer.write(this.nameSuffix());\n        // R2: a promoted member implements the shared base interface.\n        if (this.implementsInterface) {\n          writer.write(` implements ${this.implementsInterface}`);\n        }\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  // the selected props, once the allOf members are folded in (same shape select writes)\n  dependencies(_context: OasContext, selection: string[]): IType[] {\n    if (this.schema.allOf != null && !this.consolidated) {\n      this.consolidate(selection);\n    }\n    return this.selectedProps(selection);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const tree = T.print(this);\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      ids.add(node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      // skip metadata-only allOf members (they contribute no fields). see docs/issues.md #5\n      if (Factory.isEmptySchema(allOfItemSchema as SchemaObject)) {\n        trace(context, '   [composed::all-of]', `skipping empty allOf member #${i}`);\n        continue;\n      }\n\n      const type = Factory.fromSchema(context, this, allOfItemSchema as SchemaObject);\n      this.add(type);\n\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    const tree = T.print(this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  add(child: IType): IType {\n    return super.add(this.withUniqueName(child));\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    if (!name) {\n      if (this.parent instanceof Res) {\n        const op = this.parent!.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      } else if (this.schema?.allOf?.length === 1) {\n        // single member: adopt its ref name (avoids an unusable '[inline:…]' name). see docs/issues.md #7\n        name = _.get(this.schema?.allOf[0], '$ref') as string;\n      } else if (this.parent instanceof Prop) {\n        // emitted inline allOf-property type needs a real name, not '[inline:…]'. see docs/issues.md #7\n        name = Naming.genTypeName(Naming.getRefName(this.parent.name));\n      } else {\n        // consolidated allOf member: keep the '[inline:…]' id that selection paths reference. issue #7\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n}\n"]}

package/dist/oas/nodes/factory.d.ts

@@ -17,11 +17,12 @@ export declare class Factory {
     /** True when a schema carries no renderable content (metadata only). see docs/issues.md #5 */
     static isEmptySchema(schema: SchemaObject | ReferenceObject): boolean;
     /**
-     * True for an object with no declared fields: no shape keyword except (at most) a boolean
-     * `additionalProperties` (`{}`, `{ additionalProperties: false }`, …). A real map
-     * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19
+     * True for an object with no declared fields: no shape keyword except (at most) an explicit
+     * object `type` and a boolean `additionalProperties` (`{}`, `{ additionalProperties: false }`,
+     * `{ type: object, properties: {} }` — googlebooks `Empty`). A real map
+     * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19, #31
      */
-    private static isShapelessObject;
+    static isShapelessObject(schema: SchemaObject): boolean;
     private static createScalarType;
     private static createContainerType;
     private static isMapSchema;

package/dist/oas/nodes/factory.js

@@ -103,14 +103,16 @@ export class Factory {
         return Factory.SHAPE_KEYWORDS.every((k) => s[k] == null) && _.isEmpty(s.properties);
     }
     /**
-     * True for an object with no declared fields: no shape keyword except (at most) a boolean
-     * `additionalProperties` (`{}`, `{ additionalProperties: false }`, …). A real map
-     * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19
+     * True for an object with no declared fields: no shape keyword except (at most) an explicit
+     * object `type` and a boolean `additionalProperties` (`{}`, `{ additionalProperties: false }`,
+     * `{ type: object, properties: {} }` — googlebooks `Empty`). A real map
+     * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19, #31
      */
     static isShapelessObject(schema) {
         const s = schema;
-        const noShape = ['$ref', 'type', 'enum', 'items', 'allOf', 'oneOf', 'anyOf'].every((k) => s[k] == null);
-        return noShape && _.isEmpty(s.properties) && typeof s.additionalProperties !== 'object';
+        const noShape = ['$ref', 'enum', 'items', 'allOf', 'oneOf', 'anyOf'].every((k) => s[k] == null);
+        const objectOrUntyped = s.type == null || s.type === 'object';
+        return noShape && objectOrUntyped && _.isEmpty(s.properties) && typeof s.additionalProperties !== 'object';
     }
     static createScalarType(schema, parent) {
         const typeStr = schema?.type;

package/dist/oas/nodes/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/oas/nodes/factory.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Arr,\n  Body,\n  CircularRef,\n  Composed,\n  Delete,\n  En,\n  Get,\n  IType,\n  Map,\n  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropMap,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\n  RefCircRef,\n  Res,\n  Scalar,\n  T,\n  Union,\n  PropEn,\n} from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { ParameterObject, SchemaObject } from 'oas/types';\nimport { OpenAPIV3 } from 'openapi-types';\nimport _ from 'lodash';\nimport { warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { GqlUtils } from '../utils/gql.js';\nimport { Naming } from '../utils/naming.js';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\n\nexport class Factory {\n  public static createGet(name: string, op: Operation): Get {\n    return new Get(name, op);\n  }\n\n  public static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType {\n    let result: IType | null = null;\n    let schema: SchemaObject | ReferenceObject | undefined = inputSchema;\n    let ref: string | undefined;\n\n    // resolve first if reference\n    if ('$ref' in schema) {\n      // result = new Ref(parent, schema.$ref as string, schema as ReferenceObject);\n      ref = schema?.$ref;\n      if (ref) schema = context.lookupRef(ref) as SchemaObject;\n    }\n\n    if (!schema) throw new Error('Unknown or undefined schema');\n    const schemaObj: SchemaObject = schema as SchemaObject;\n    // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23\n    this.normalizeTypeArray(schemaObj);\n\n    // Cycle cut (see docs/issues.md #10): a recursive schema can only close through a component `$ref`,\n    // and `lookupRef` returns the same `SchemaObject` instance for a given ref. So if this resolved ref's\n    // schema is already on the expansion path (an ancestor was built from it), re-entering would recurse\n    // forever / emit a circular connector selection. Stop with a `RefCircRef` sentinel (commented in both\n    // SDL and selection, traversal-terminating) instead of building + lazily expanding the recursion.\n    const cyclic = ref ? this.cyclicAncestor(parent, schemaObj) : undefined;\n    if (cyclic) {\n      return this.fromRefCircRef(parent, cyclic, ref!);\n    }\n\n    // implied array: `items` present even without an explicit `type: array`. see docs/issues.md #4\n    if (_.get(schemaObj, 'items') && (schemaObj.type === 'array' || schemaObj.type == null)) {\n      result = this.createArrayType(parent, schemaObj, context);\n    }\n    // array case\n    else if (\n      schemaObj?.type === 'object' ||\n      schemaObj?.oneOf ||\n      schemaObj?.allOf ||\n      schemaObj?.anyOf ||\n      !_.isEmpty(schemaObj.properties)\n    ) {\n      result = this.createContainerType(parent, schemaObj, ref);\n    }\n    // a shapeless object (nothing but a boolean `additionalProperties`, or `{}`) declares no fields:\n    // fall back to the JSON scalar — NOT an empty Obj, which generate() would skip, dangling the\n    // reference. see docs/issues.md #19\n    else if (this.isShapelessObject(schemaObj)) {\n      result = new Scalar(parent, 'JSON', schemaObj);\n    }\n    // scalar\n    else {\n      result = this.createScalarType(schemaObj, parent);\n    }\n\n    // we could not infer a proper type\n    if (result == null) {\n      throw new Error(`Not yet implemented for ${JSON.stringify(schemaObj)}`);\n    }\n\n    return result;\n  }\n\n  /**\n   * OAS 3.1 type arrays (`type: [\"string\",\"null\"]`) collapse to their first non-null entry:\n   * GraphQL fields are nullable by default, so the \"null\" disjunct adds nothing. Normalized\n   * in place (idempotent; `lookupRef` shares schema instances, so every reader sees it).\n   * see docs/issues.md #23\n   */\n  private static normalizeTypeArray(schema: SchemaObject): void {\n    const s = schema as Record<string, unknown>;\n    if (Array.isArray(s.type)) {\n      const real = (s.type as unknown[]).filter((t) => t && t !== 'null');\n      s.type = real[0];\n    }\n  }\n\n  // every member is a legal GraphQL enum value once trimmed (TMF637 ships `'aborted '`): a bare\n  // identifier that isn't a boolean/null literal. Anything else (numbers, \"+1\", \"fast-forward\",\n  // true) has no enum form. see #24\n  private static isGqlEnum(schema: SchemaObject): boolean {\n    const VALID_ENUM_VALUE = /^[_A-Za-z][_0-9A-Za-z]*$/;\n    const RESERVED = new Set(['true', 'false', 'null']);\n    return _.every(schema.enum, (value) => {\n      if (typeof value !== 'string') return false;\n      const trimmed = value.trim();\n      return VALID_ENUM_VALUE.test(trimmed) && !RESERVED.has(trimmed);\n    });\n  }\n\n  // Keywords that give a schema a renderable GraphQL shape; a schema with none is metadata-only. #5\n  private static readonly SHAPE_KEYWORDS = [\n    '$ref',\n    'type',\n    'enum',\n    'items',\n    'allOf',\n    'oneOf',\n    'anyOf',\n    'additionalProperties',\n  ];\n\n  /** True when a schema carries no renderable content (metadata only). see docs/issues.md #5 */\n  public static isEmptySchema(schema: SchemaObject | ReferenceObject): boolean {\n    const s = schema as Record<string, unknown>;\n    return Factory.SHAPE_KEYWORDS.every((k) => s[k] == null) && _.isEmpty(s.properties);\n  }\n\n  /**\n   * True for an object with no declared fields: no shape keyword except (at most) a boolean\n   * `additionalProperties` (`{}`, `{ additionalProperties: false }`, …). A real map\n   * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19\n   */\n  private static isShapelessObject(schema: SchemaObject): boolean {\n    const s = schema as Record<string, unknown>;\n    const noShape = ['$ref', 'type', 'enum', 'items', 'allOf', 'oneOf', 'anyOf'].every((k) => s[k] == null);\n    return noShape && _.isEmpty(s.properties) && typeof s.additionalProperties !== 'object';\n  }\n\n  private static createScalarType(schema: SchemaObject | null, parent: IType) {\n    const typeStr = schema?.type;\n    if (typeStr != null) {\n      if (typeStr === 'array') {\n        throw new Error(`Should have been handled already? ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      } else if (schema?.enum != null) {\n        return new En(parent, 'enum', schema, schema.enum! as string[]);\n      }\n      // scalar case\n      else if (GqlUtils.gqlScalar(typeStr as string)) {\n        const scalarType = GqlUtils.getGQLScalarType(schema!);\n        return new Scalar(parent, scalarType, schema!);\n      }\n      // or we have no idea how to handle this\n      else {\n        throw new Error(`Cannot handle property type ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      }\n    } else if (schema?.enum != null) {\n      return new En(parent, 'enum', schema, _.get(schema, 'enum') as string[]);\n    }\n    // or we have no idea how to handle this\n    else {\n      throw new Error(`Cannot handle schema ${parent.pathToRoot()}, schema: ${JSON.stringify(schema)}`);\n    }\n  }\n\n  private static createContainerType(parent: IType, schema: SchemaObject, ref?: string) {\n    let result: IType | null;\n\n    // composed object\n    if (schema.allOf) {\n      result = new Composed(parent, ref || _.get(schema, 'name'), schema);\n    }\n    // union\n    else if (schema.oneOf || schema.anyOf) {\n      const oneOfs = schema.oneOf || [];\n      result = new Union(\n        parent,\n        ref || _.get(schema, 'name'),\n        oneOfs as SchemaObject[],\n        false,\n        _.get(schema, 'discriminator'),\n      );\n    }\n    // map (object with only additionalProperties)\n    else if (this.isMapSchema(schema)) {\n      result = new Map(parent, ref || _.get(schema, 'name') || null, schema);\n    }\n    // or a plain obj\n    else {\n      if (!schema.properties) {\n        warn(\n          null,\n          '[factory]',\n          'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot(),\n        );\n      }\n\n      result = new Obj(parent, ref || _.get(schema, 'name') || null, schema);\n    }\n\n    return result;\n  }\n\n  private static isMapSchema(schema: SchemaObject): boolean {\n    // A schema is considered a map if:\n    // 1. It has additionalProperties defined as an object\n    // 2. It has no explicit properties OR has empty properties\n    return Boolean(\n      schema.additionalProperties &&\n        typeof schema.additionalProperties === 'object' &&\n        (!schema.properties || _.isEmpty(schema.properties)),\n    );\n  }\n\n  private static createArrayType(parent: IType | Res, schema: SchemaObject | null, context: OasContext) {\n    // Array schema case.\n    let parentName = parent.name;\n    if (parent instanceof Res) {\n      const get = parent.parent as Get; // Assume parent.parent is a GetOp.\n      parentName = _.upperFirst(get.getGqlOpName());\n    }\n\n    const arr = new Arr(parent, parentName);\n    const items = _.get(schema, 'items') as ArraySchemaObject;\n    arr.items = items;\n\n    // TODO: check this\n    arr.itemsType = Factory.fromSchema(context, arr, items);\n    arr.add(arr.itemsType); // add it to the children\n\n    return arr;\n  }\n\n  public static fromProp(\n    context: OasContext,\n    parent: IType,\n    propName: string,\n    inputSchema: SchemaObject | ReferenceObject,\n  ): Prop {\n    if (!inputSchema) {\n      throw new Error(`Should have a schema defined for property '${propName}' (parent: '${parent.name}')`);\n    }\n\n    let schema: SchemaObject | ReferenceObject | null = inputSchema;\n\n    let prop: Prop;\n    let ref: string | undefined;\n\n    if (!_.get(schema, 'type') && '$ref' in schema) {\n      ref = (schema as ReferenceObject).$ref;\n      schema = context.lookupRef(ref);\n      // this was a prop ref, but now needs to be returned as the ref directly?\n      // prop = new PropRef(parent, propName, schema, ref);\n      // return prop;\n    }\n\n    // uses the type of the schema to find out what kind of property it is\n    const schemaObj = schema as SchemaObject;\n    // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23\n    this.normalizeTypeArray(schemaObj);\n    const type = schemaObj.type;\n\n    if (type) {\n      // 1st case is if the type is an array\n      if (type === 'array') {\n        const array = new PropArray(parent, propName, schema!);\n        // const itemsName = Naming.genArrayItems(propName);\n\n        const itemsSchema = _.get(schemaObj, 'items') as ArraySchemaObject;\n        // const itemsType = Factory.fromProp(context, array, itemsName, itemsSchema); // TODO: re-test\n        const itemsType = Factory.fromSchema(context, array, itemsSchema);\n\n        array.setItems(itemsType);\n        prop = array;\n\n        // Array items resolve eagerly here, so if the item ref re-entered a schema on the path\n        // (fromSchema returned the circular sentinel), bubble the cut up to the whole list field:\n        // render `# children: [Node] — circular reference omitted`. see docs/issues.md #10\n        if (itemsType instanceof CircularRef) {\n          return new PropCircRef(parent, array);\n        }\n      }\n      // 2nd checks for obj property\n      else if (\n        schemaObj?.type === 'object' ||\n        schemaObj?.oneOf ||\n        schemaObj?.allOf ||\n        !_.isEmpty(schemaObj.properties)\n      ) {\n        if (schemaObj.oneOf) {\n          const inner: PropComp = new PropComp(parent, propName, schemaObj);\n          inner.comp = new Union(\n            inner,\n            ref || _.get(schemaObj, 'name'),\n            schemaObj.oneOf as SchemaObject[],\n            false,\n            _.get(schemaObj, 'discriminator'),\n          );\n          prop = inner;\n        } else if (schemaObj.allOf) {\n          const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n          propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n          prop = propComp;\n        } else if (this.isMapSchema(schemaObj)) {\n          console.log('isMapSchema', schemaObj);\n          // Map property: object with only additionalProperties\n          const mapType: Map = new Map(parent, ref || propName, schemaObj);\n          prop = new PropMap(parent, propName, schemaObj, mapType);\n        } else if (schemaObj.properties != null) {\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        } else {\n          // the type of the property will be an object, which needs to be added as a child\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        }\n      } else if (ref && schemaObj?.enum) {\n        if (this.isGqlEnum(schemaObj)) {\n          const en: En = new En(\n            parent,\n            ref,\n            schemaObj,\n            (schemaObj.enum as string[]).map((v) => v.trim()),\n          );\n          prop = new PropEn(parent, propName, ref, schemaObj);\n          prop.add(en);\n        } else {\n          // No GraphQL enum form for this one — degrade to the base scalar instead of emitting\n          // an invalid definition: boolean/number enums (slack `ok: { enum: [true] }` ->\n          // `ok: Boolean`) and string enums with non-identifier values (github reactions\n          // `enum: [\"+1\", \"-1\", …]` -> String). see docs/issues.md #24\n          prop = new PropScalar(parent, propName, GqlUtils.getGQLScalarType(schemaObj), schemaObj);\n        }\n      }\n      // 3rd tries for scalar\n      else if (GqlUtils.gqlScalar(type as string)) {\n        const scalar = GqlUtils.gqlScalar(type as string);\n        prop = new PropScalar(parent, propName, scalar as string, schemaObj);\n      }\n      // or we don't know how to handle this\n      else {\n        throw new Error('Cannot handle property type ' + type);\n      }\n    }\n    // otherwise let's use the properties instead and assume an Obj\n    // TODO: repeated code\n    else if (schemaObj.oneOf) {\n      const inner: PropComp = new PropComp(parent, propName, schemaObj);\n      inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf as SchemaObject[]);\n      prop = inner;\n    } else if (schemaObj.allOf) {\n      const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n      propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n      prop = propComp;\n    } else if (this.isMapSchema(schemaObj)) {\n      // Map property: object with only additionalProperties (no explicit type)\n      const mapType: Map = new Map(parent, ref || propName, schemaObj);\n      prop = new PropMap(parent, propName, schemaObj, mapType);\n    } else if (schemaObj.properties != null) {\n      const propType: IType = new Obj(parent, ref || propName, schemaObj);\n      prop = new PropObj(parent, propName, schemaObj, propType);\n    }\n    // default case, we don't know what to do so we'll create a scalar of type JSON\n    else {\n      prop = new PropScalar(parent, propName, 'JSON', schemaObj);\n    }\n\n    // Cut a recursive direct-`$ref` property: the legacy id/name check, plus a schema-identity check\n    // (the resolved component schema already on the path) that catches cycles the name check misses\n    // because the recursion mints distinct per-depth names. see docs/issues.md #10\n    const cyclic = ref ? this.cyclicAncestor(parent, schema as SchemaObject) : undefined;\n    if (cyclic || parent.ancestors().find((a) => a.id === prop.id)) {\n      prop = new PropCircRef(parent, prop);\n    }\n\n    return prop;\n  }\n\n  /**\n   * The nearest ancestor built from the same resolved component `$ref` (compared by `SchemaObject`\n   * identity — `lookupRef` returns the same instance per ref), or undefined. Scoped to the current\n   * expansion path (`ancestors()`), so a shared non-recursive component used by sibling fields is NOT\n   * cut — only a schema that is its own ancestor. `schema` is undefined for inline (non-`$ref`) nodes,\n   * which can never match an ancestor. see docs/issues.md #10\n   */\n  private static cyclicAncestor(parent: IType, schema?: SchemaObject): IType | undefined {\n    if (!schema) return undefined;\n    return parent.ancestors().find((a) => a.schema === schema);\n  }\n\n  /** Build the `fromSchema` circular sentinel (commented in both SDL + selection). see docs/issues.md #10 */\n  public static fromRefCircRef(parent: IType, ancestor: IType, ref: string): IType {\n    const node = new RefCircRef(parent, Naming.getRefName(ref) ?? ancestor.name);\n    node.ref = ancestor;\n    return node;\n  }\n\n  public static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType {\n    return new Res(parent, 'r', mediaSchema);\n  }\n\n  public static fromParam(context: OasContext, parent: IType, p: ParameterObject | ReferenceObject): Param {\n    let param: ParameterObject;\n\n    if ('$ref' in p) {\n      const ref: ReferenceObject = p as ReferenceObject;\n      const schema = context.lookupParam(ref.$ref);\n\n      if (!schema) {\n        throw new Error('Schema not found for ref: ' + ref.$ref);\n      }\n      param = schema as ParameterObject;\n    } else {\n      param = p as ParameterObject;\n    }\n\n    const schema = param.schema as SchemaObject;\n    const required = param.required === true;\n\n    return new Param(parent, param.name, schema, required, schema.default, param);\n  }\n\n  public static fromCircularRef(parent: IType, child: IType): IType {\n    const _tree = T.print(parent);\n\n    const circularRef = new CircularRef(parent, child.name);\n    circularRef.ref = child;\n    return circularRef;\n  }\n\n  public static fromUnion(_context: OasContext, parent: IType, oneOfs: SchemaObject[]): IType {\n    const union = new Union(parent, parent.name, oneOfs);\n    parent.add(union);\n    return union;\n  }\n\n  public static fromPost(name: string, op: Operation): Post {\n    return new Post(name, op);\n  }\n\n  public static fromPut(name: string, op: Operation): Post {\n    return new Put(name, op);\n  }\n\n  public static fromPatch(name: string, op: Operation): Post {\n    return new Patch(name, op);\n  }\n\n  public static fromDelete(name: string, op: Operation): Post {\n    return new Delete(name, op);\n  }\n\n  public static fromBody(_context: OasContext, parent: IType, schema: SchemaObject): IType {\n    const body = new Body(parent, 'b', schema);\n    parent.add(body);\n    return body;\n  }\n}\n"]}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/oas/nodes/factory.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Arr,\n  Body,\n  CircularRef,\n  Composed,\n  Delete,\n  En,\n  Get,\n  IType,\n  Map,\n  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropMap,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\n  RefCircRef,\n  Res,\n  Scalar,\n  T,\n  Union,\n  PropEn,\n} from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { ParameterObject, SchemaObject } from 'oas/types';\nimport { OpenAPIV3 } from 'openapi-types';\nimport _ from 'lodash';\nimport { warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { GqlUtils } from '../utils/gql.js';\nimport { Naming } from '../utils/naming.js';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\n\nexport class Factory {\n  public static createGet(name: string, op: Operation): Get {\n    return new Get(name, op);\n  }\n\n  public static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType {\n    let result: IType | null = null;\n    let schema: SchemaObject | ReferenceObject | undefined = inputSchema;\n    let ref: string | undefined;\n\n    // resolve first if reference\n    if ('$ref' in schema) {\n      // result = new Ref(parent, schema.$ref as string, schema as ReferenceObject);\n      ref = schema?.$ref;\n      if (ref) schema = context.lookupRef(ref) as SchemaObject;\n    }\n\n    if (!schema) throw new Error('Unknown or undefined schema');\n    const schemaObj: SchemaObject = schema as SchemaObject;\n    // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23\n    this.normalizeTypeArray(schemaObj);\n\n    // Cycle cut (see docs/issues.md #10): a recursive schema can only close through a component `$ref`,\n    // and `lookupRef` returns the same `SchemaObject` instance for a given ref. So if this resolved ref's\n    // schema is already on the expansion path (an ancestor was built from it), re-entering would recurse\n    // forever / emit a circular connector selection. Stop with a `RefCircRef` sentinel (commented in both\n    // SDL and selection, traversal-terminating) instead of building + lazily expanding the recursion.\n    const cyclic = ref ? this.cyclicAncestor(parent, schemaObj) : undefined;\n    if (cyclic) {\n      return this.fromRefCircRef(parent, cyclic, ref!);\n    }\n\n    // implied array: `items` present even without an explicit `type: array`. see docs/issues.md #4\n    if (_.get(schemaObj, 'items') && (schemaObj.type === 'array' || schemaObj.type == null)) {\n      result = this.createArrayType(parent, schemaObj, context);\n    }\n    // array case\n    else if (\n      schemaObj?.type === 'object' ||\n      schemaObj?.oneOf ||\n      schemaObj?.allOf ||\n      schemaObj?.anyOf ||\n      !_.isEmpty(schemaObj.properties)\n    ) {\n      result = this.createContainerType(parent, schemaObj, ref);\n    }\n    // a shapeless object (nothing but a boolean `additionalProperties`, or `{}`) declares no fields:\n    // fall back to the JSON scalar — NOT an empty Obj, which generate() would skip, dangling the\n    // reference. see docs/issues.md #19\n    else if (this.isShapelessObject(schemaObj)) {\n      result = new Scalar(parent, 'JSON', schemaObj);\n    }\n    // scalar\n    else {\n      result = this.createScalarType(schemaObj, parent);\n    }\n\n    // we could not infer a proper type\n    if (result == null) {\n      throw new Error(`Not yet implemented for ${JSON.stringify(schemaObj)}`);\n    }\n\n    return result;\n  }\n\n  /**\n   * OAS 3.1 type arrays (`type: [\"string\",\"null\"]`) collapse to their first non-null entry:\n   * GraphQL fields are nullable by default, so the \"null\" disjunct adds nothing. Normalized\n   * in place (idempotent; `lookupRef` shares schema instances, so every reader sees it).\n   * see docs/issues.md #23\n   */\n  private static normalizeTypeArray(schema: SchemaObject): void {\n    const s = schema as Record<string, unknown>;\n    if (Array.isArray(s.type)) {\n      const real = (s.type as unknown[]).filter((t) => t && t !== 'null');\n      s.type = real[0];\n    }\n  }\n\n  // every member is a legal GraphQL enum value once trimmed (TMF637 ships `'aborted '`): a bare\n  // identifier that isn't a boolean/null literal. Anything else (numbers, \"+1\", \"fast-forward\",\n  // true) has no enum form. see #24\n  private static isGqlEnum(schema: SchemaObject): boolean {\n    const VALID_ENUM_VALUE = /^[_A-Za-z][_0-9A-Za-z]*$/;\n    const RESERVED = new Set(['true', 'false', 'null']);\n    return _.every(schema.enum, (value) => {\n      if (typeof value !== 'string') return false;\n      const trimmed = value.trim();\n      return VALID_ENUM_VALUE.test(trimmed) && !RESERVED.has(trimmed);\n    });\n  }\n\n  // Keywords that give a schema a renderable GraphQL shape; a schema with none is metadata-only. #5\n  private static readonly SHAPE_KEYWORDS = [\n    '$ref',\n    'type',\n    'enum',\n    'items',\n    'allOf',\n    'oneOf',\n    'anyOf',\n    'additionalProperties',\n  ];\n\n  /** True when a schema carries no renderable content (metadata only). see docs/issues.md #5 */\n  public static isEmptySchema(schema: SchemaObject | ReferenceObject): boolean {\n    const s = schema as Record<string, unknown>;\n    return Factory.SHAPE_KEYWORDS.every((k) => s[k] == null) && _.isEmpty(s.properties);\n  }\n\n  /**\n   * True for an object with no declared fields: no shape keyword except (at most) an explicit\n   * object `type` and a boolean `additionalProperties` (`{}`, `{ additionalProperties: false }`,\n   * `{ type: object, properties: {} }` — googlebooks `Empty`). A real map\n   * (`additionalProperties: <schema>`) is NOT shapeless. see docs/issues.md #19, #31\n   */\n  public static isShapelessObject(schema: SchemaObject): boolean {\n    const s = schema as Record<string, unknown>;\n    const noShape = ['$ref', 'enum', 'items', 'allOf', 'oneOf', 'anyOf'].every((k) => s[k] == null);\n    const objectOrUntyped = s.type == null || s.type === 'object';\n    return noShape && objectOrUntyped && _.isEmpty(s.properties) && typeof s.additionalProperties !== 'object';\n  }\n\n  private static createScalarType(schema: SchemaObject | null, parent: IType) {\n    const typeStr = schema?.type;\n    if (typeStr != null) {\n      if (typeStr === 'array') {\n        throw new Error(`Should have been handled already? ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      } else if (schema?.enum != null) {\n        return new En(parent, 'enum', schema, schema.enum! as string[]);\n      }\n      // scalar case\n      else if (GqlUtils.gqlScalar(typeStr as string)) {\n        const scalarType = GqlUtils.getGQLScalarType(schema!);\n        return new Scalar(parent, scalarType, schema!);\n      }\n      // or we have no idea how to handle this\n      else {\n        throw new Error(`Cannot handle property type ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      }\n    } else if (schema?.enum != null) {\n      return new En(parent, 'enum', schema, _.get(schema, 'enum') as string[]);\n    }\n    // or we have no idea how to handle this\n    else {\n      throw new Error(`Cannot handle schema ${parent.pathToRoot()}, schema: ${JSON.stringify(schema)}`);\n    }\n  }\n\n  private static createContainerType(parent: IType, schema: SchemaObject, ref?: string) {\n    let result: IType | null;\n\n    // composed object\n    if (schema.allOf) {\n      result = new Composed(parent, ref || _.get(schema, 'name'), schema);\n    }\n    // union\n    else if (schema.oneOf || schema.anyOf) {\n      const oneOfs = schema.oneOf || [];\n      result = new Union(\n        parent,\n        ref || _.get(schema, 'name'),\n        oneOfs as SchemaObject[],\n        false,\n        _.get(schema, 'discriminator'),\n      );\n    }\n    // map (object with only additionalProperties)\n    else if (this.isMapSchema(schema)) {\n      result = new Map(parent, ref || _.get(schema, 'name') || null, schema);\n    }\n    // or a plain obj\n    else {\n      if (!schema.properties) {\n        warn(\n          null,\n          '[factory]',\n          'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot(),\n        );\n      }\n\n      result = new Obj(parent, ref || _.get(schema, 'name') || null, schema);\n    }\n\n    return result;\n  }\n\n  private static isMapSchema(schema: SchemaObject): boolean {\n    // A schema is considered a map if:\n    // 1. It has additionalProperties defined as an object\n    // 2. It has no explicit properties OR has empty properties\n    return Boolean(\n      schema.additionalProperties &&\n        typeof schema.additionalProperties === 'object' &&\n        (!schema.properties || _.isEmpty(schema.properties)),\n    );\n  }\n\n  private static createArrayType(parent: IType | Res, schema: SchemaObject | null, context: OasContext) {\n    // Array schema case.\n    let parentName = parent.name;\n    if (parent instanceof Res) {\n      const get = parent.parent as Get; // Assume parent.parent is a GetOp.\n      parentName = _.upperFirst(get.getGqlOpName());\n    }\n\n    const arr = new Arr(parent, parentName);\n    const items = _.get(schema, 'items') as ArraySchemaObject;\n    arr.items = items;\n\n    // TODO: check this\n    arr.itemsType = Factory.fromSchema(context, arr, items);\n    arr.add(arr.itemsType); // add it to the children\n\n    return arr;\n  }\n\n  public static fromProp(\n    context: OasContext,\n    parent: IType,\n    propName: string,\n    inputSchema: SchemaObject | ReferenceObject,\n  ): Prop {\n    if (!inputSchema) {\n      throw new Error(`Should have a schema defined for property '${propName}' (parent: '${parent.name}')`);\n    }\n\n    let schema: SchemaObject | ReferenceObject | null = inputSchema;\n\n    let prop: Prop;\n    let ref: string | undefined;\n\n    if (!_.get(schema, 'type') && '$ref' in schema) {\n      ref = (schema as ReferenceObject).$ref;\n      schema = context.lookupRef(ref);\n      // this was a prop ref, but now needs to be returned as the ref directly?\n      // prop = new PropRef(parent, propName, schema, ref);\n      // return prop;\n    }\n\n    // uses the type of the schema to find out what kind of property it is\n    const schemaObj = schema as SchemaObject;\n    // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23\n    this.normalizeTypeArray(schemaObj);\n    const type = schemaObj.type;\n\n    if (type) {\n      // 1st case is if the type is an array\n      if (type === 'array') {\n        const array = new PropArray(parent, propName, schema!);\n        // const itemsName = Naming.genArrayItems(propName);\n\n        const itemsSchema = _.get(schemaObj, 'items') as ArraySchemaObject;\n        // const itemsType = Factory.fromProp(context, array, itemsName, itemsSchema); // TODO: re-test\n        const itemsType = Factory.fromSchema(context, array, itemsSchema);\n\n        array.setItems(itemsType);\n        prop = array;\n\n        // Array items resolve eagerly here, so if the item ref re-entered a schema on the path\n        // (fromSchema returned the circular sentinel), bubble the cut up to the whole list field:\n        // render `# children: [Node] — circular reference omitted`. see docs/issues.md #10\n        if (itemsType instanceof CircularRef) {\n          return new PropCircRef(parent, array);\n        }\n      }\n      // 2nd checks for obj property\n      else if (\n        schemaObj?.type === 'object' ||\n        schemaObj?.oneOf ||\n        schemaObj?.allOf ||\n        !_.isEmpty(schemaObj.properties)\n      ) {\n        if (schemaObj.oneOf) {\n          const inner: PropComp = new PropComp(parent, propName, schemaObj);\n          inner.comp = new Union(\n            inner,\n            ref || _.get(schemaObj, 'name'),\n            schemaObj.oneOf as SchemaObject[],\n            false,\n            _.get(schemaObj, 'discriminator'),\n          );\n          prop = inner;\n        } else if (schemaObj.allOf) {\n          const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n          propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n          prop = propComp;\n        } else if (this.isMapSchema(schemaObj)) {\n          console.log('isMapSchema', schemaObj);\n          // Map property: object with only additionalProperties\n          const mapType: Map = new Map(parent, ref || propName, schemaObj);\n          prop = new PropMap(parent, propName, schemaObj, mapType);\n        } else if (schemaObj.properties != null) {\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        } else {\n          // the type of the property will be an object, which needs to be added as a child\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        }\n      } else if (ref && schemaObj?.enum) {\n        if (this.isGqlEnum(schemaObj)) {\n          const en: En = new En(\n            parent,\n            ref,\n            schemaObj,\n            (schemaObj.enum as string[]).map((v) => v.trim()),\n          );\n          prop = new PropEn(parent, propName, ref, schemaObj);\n          prop.add(en);\n        } else {\n          // No GraphQL enum form for this one — degrade to the base scalar instead of emitting\n          // an invalid definition: boolean/number enums (slack `ok: { enum: [true] }` ->\n          // `ok: Boolean`) and string enums with non-identifier values (github reactions\n          // `enum: [\"+1\", \"-1\", …]` -> String). see docs/issues.md #24\n          prop = new PropScalar(parent, propName, GqlUtils.getGQLScalarType(schemaObj), schemaObj);\n        }\n      }\n      // 3rd tries for scalar\n      else if (GqlUtils.gqlScalar(type as string)) {\n        const scalar = GqlUtils.gqlScalar(type as string);\n        prop = new PropScalar(parent, propName, scalar as string, schemaObj);\n      }\n      // or we don't know how to handle this\n      else {\n        throw new Error('Cannot handle property type ' + type);\n      }\n    }\n    // otherwise let's use the properties instead and assume an Obj\n    // TODO: repeated code\n    else if (schemaObj.oneOf) {\n      const inner: PropComp = new PropComp(parent, propName, schemaObj);\n      inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf as SchemaObject[]);\n      prop = inner;\n    } else if (schemaObj.allOf) {\n      const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n      propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n      prop = propComp;\n    } else if (this.isMapSchema(schemaObj)) {\n      // Map property: object with only additionalProperties (no explicit type)\n      const mapType: Map = new Map(parent, ref || propName, schemaObj);\n      prop = new PropMap(parent, propName, schemaObj, mapType);\n    } else if (schemaObj.properties != null) {\n      const propType: IType = new Obj(parent, ref || propName, schemaObj);\n      prop = new PropObj(parent, propName, schemaObj, propType);\n    }\n    // default case, we don't know what to do so we'll create a scalar of type JSON\n    else {\n      prop = new PropScalar(parent, propName, 'JSON', schemaObj);\n    }\n\n    // Cut a recursive direct-`$ref` property: the legacy id/name check, plus a schema-identity check\n    // (the resolved component schema already on the path) that catches cycles the name check misses\n    // because the recursion mints distinct per-depth names. see docs/issues.md #10\n    const cyclic = ref ? this.cyclicAncestor(parent, schema as SchemaObject) : undefined;\n    if (cyclic || parent.ancestors().find((a) => a.id === prop.id)) {\n      prop = new PropCircRef(parent, prop);\n    }\n\n    return prop;\n  }\n\n  /**\n   * The nearest ancestor built from the same resolved component `$ref` (compared by `SchemaObject`\n   * identity — `lookupRef` returns the same instance per ref), or undefined. Scoped to the current\n   * expansion path (`ancestors()`), so a shared non-recursive component used by sibling fields is NOT\n   * cut — only a schema that is its own ancestor. `schema` is undefined for inline (non-`$ref`) nodes,\n   * which can never match an ancestor. see docs/issues.md #10\n   */\n  private static cyclicAncestor(parent: IType, schema?: SchemaObject): IType | undefined {\n    if (!schema) return undefined;\n    return parent.ancestors().find((a) => a.schema === schema);\n  }\n\n  /** Build the `fromSchema` circular sentinel (commented in both SDL + selection). see docs/issues.md #10 */\n  public static fromRefCircRef(parent: IType, ancestor: IType, ref: string): IType {\n    const node = new RefCircRef(parent, Naming.getRefName(ref) ?? ancestor.name);\n    node.ref = ancestor;\n    return node;\n  }\n\n  public static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType {\n    return new Res(parent, 'r', mediaSchema);\n  }\n\n  public static fromParam(context: OasContext, parent: IType, p: ParameterObject | ReferenceObject): Param {\n    let param: ParameterObject;\n\n    if ('$ref' in p) {\n      const ref: ReferenceObject = p as ReferenceObject;\n      const schema = context.lookupParam(ref.$ref);\n\n      if (!schema) {\n        throw new Error('Schema not found for ref: ' + ref.$ref);\n      }\n      param = schema as ParameterObject;\n    } else {\n      param = p as ParameterObject;\n    }\n\n    const schema = param.schema as SchemaObject;\n    const required = param.required === true;\n\n    return new Param(parent, param.name, schema, required, schema.default, param);\n  }\n\n  public static fromCircularRef(parent: IType, child: IType): IType {\n    const _tree = T.print(parent);\n\n    const circularRef = new CircularRef(parent, child.name);\n    circularRef.ref = child;\n    return circularRef;\n  }\n\n  public static fromUnion(_context: OasContext, parent: IType, oneOfs: SchemaObject[]): IType {\n    const union = new Union(parent, parent.name, oneOfs);\n    parent.add(union);\n    return union;\n  }\n\n  public static fromPost(name: string, op: Operation): Post {\n    return new Post(name, op);\n  }\n\n  public static fromPut(name: string, op: Operation): Post {\n    return new Put(name, op);\n  }\n\n  public static fromPatch(name: string, op: Operation): Post {\n    return new Patch(name, op);\n  }\n\n  public static fromDelete(name: string, op: Operation): Post {\n    return new Delete(name, op);\n  }\n\n  public static fromBody(_context: OasContext, parent: IType, schema: SchemaObject): IType {\n    const body = new Body(parent, 'b', schema);\n    parent.add(body);\n    return body;\n  }\n}\n"]}

package/dist/oas/nodes/get.d.ts

@@ -22,6 +22,6 @@ export declare class Get extends Type implements Op {
     private visitResponse;
     private visitResponseContent;
     private visitResponseRef;
-    protected generateParameters(context: OasContext, writer: Writer, selection: string[]): void;
+    protected generateParameters(context: OasContext, writer: Writer, selection: string[], bodyArg?: string): void;
     private visitParameter;
 }