apollo-conn-gen 0.4.6 → 0.4.8

package/dist/json/io/writer.js

@@ -18,9 +18,9 @@ export class ConnectorWriter {
     }
     static writeConnector(writer) {
         writer.write(`extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])
+  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])
   @link(
-    url: "https://specs.apollo.dev/connect/v0.1"
+    url: "https://specs.apollo.dev/connect/v0.2"
     import: ["@connect", "@source"]
   )
   @source(name: "api", http: { baseURL: "http://localhost:4010" })

package/dist/json/io/writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../src/json/io/writer.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,YAAY;IACvB,OAAO,GAAa,EAAE,CAAC;IAEvB,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,MAAe,EAAE,MAAe;QAClD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,MAAe;QAC3C,MAAM,CAAC,KAAK,CAAC;;;;;;;;CAQhB,CAAC,CAAC;IACD,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,MAAe,EAAE,MAAe;QACxD,MAAM,CAAC,KAAK,CACV,IAAI;YACF;;;;;qBAKa;YACb,IAAI,CACP,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;QAEtC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAEhC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;CACF","sourcesContent":["import { JsonGen } from '../walker/jsonGen.js';\n\nexport interface IWriter {\n  write(text: string): void;\n}\n\nexport class StringWriter implements IWriter {\n  builder: string[] = [];\n\n  write(text: string): void {\n    this.builder.push(text);\n  }\n\n  flush(): string {\n    return this.builder.join('');\n  }\n\n  clear(): void {\n    this.builder = [];\n  }\n}\n\nexport class ConnectorWriter {\n  public static write(walker: JsonGen, writer: IWriter): void {\n    this.writeConnector(writer);\n    writer.write(walker.writeTypes());\n    this.writeQuery(walker, writer);\n  }\n\n  private static writeConnector(writer: IWriter): void {\n    writer.write(`extend schema\n  @link(url: \"https://specs.apollo.dev/federation/v2.10\", import: [\"@key\"])\n  @link(\n    url: \"https://specs.apollo.dev/connect/v0.1\"\n    import: [\"@connect\", \"@source\"]\n  )\n  @source(name: \"api\", http: { baseURL: \"http://localhost:4010\" })\n  \n`);\n  }\n\n  private static writeQuery(walker: JsonGen, writer: IWriter): void {\n    writer.write(\n      '\\n' +\n        `type Query {\n  root: Root\n    @connect(\n      source: \"api\"\n      http: { GET: \"/test\" }\n      selection: \"\"\"` +\n        '\\n',\n    );\n\n    writer.write(walker.writeSelection());\n\n    const ctx = walker.getContext();\n\n    writer.write(ctx.getIndent() + '\"\"\"\\n');\n    writer.write(ctx.getIndentWith(2) + ')}');\n  }\n}\n"]}
+{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../src/json/io/writer.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,YAAY;IACvB,OAAO,GAAa,EAAE,CAAC;IAEvB,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,MAAe,EAAE,MAAe;QAClD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,MAAe;QAC3C,MAAM,CAAC,KAAK,CAAC;;;;;;;;CAQhB,CAAC,CAAC;IACD,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,MAAe,EAAE,MAAe;QACxD,MAAM,CAAC,KAAK,CACV,IAAI;YACF;;;;;qBAKa;YACb,IAAI,CACP,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;QAEtC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAEhC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;CACF","sourcesContent":["import { JsonGen } from '../walker/jsonGen.js';\n\nexport interface IWriter {\n  write(text: string): void;\n}\n\nexport class StringWriter implements IWriter {\n  builder: string[] = [];\n\n  write(text: string): void {\n    this.builder.push(text);\n  }\n\n  flush(): string {\n    return this.builder.join('');\n  }\n\n  clear(): void {\n    this.builder = [];\n  }\n}\n\nexport class ConnectorWriter {\n  public static write(walker: JsonGen, writer: IWriter): void {\n    this.writeConnector(writer);\n    writer.write(walker.writeTypes());\n    this.writeQuery(walker, writer);\n  }\n\n  private static writeConnector(writer: IWriter): void {\n    writer.write(`extend schema\n  @link(url: \"https://specs.apollo.dev/federation/v2.11\", import: [\"@key\"])\n  @link(\n    url: \"https://specs.apollo.dev/connect/v0.2\"\n    import: [\"@connect\", \"@source\"]\n  )\n  @source(name: \"api\", http: { baseURL: \"http://localhost:4010\" })\n  \n`);\n  }\n\n  private static writeQuery(walker: JsonGen, writer: IWriter): void {\n    writer.write(\n      '\\n' +\n        `type Query {\n  root: Root\n    @connect(\n      source: \"api\"\n      http: { GET: \"/test\" }\n      selection: \"\"\"` +\n        '\\n',\n    );\n\n    writer.write(walker.writeSelection());\n\n    const ctx = walker.getContext();\n\n    writer.write(ctx.getIndent() + '\"\"\"\\n');\n    writer.write(ctx.getIndentWith(2) + ')}');\n  }\n}\n"]}

package/dist/oas/io/schemaWriter.js

@@ -11,9 +11,9 @@ export class SchemaWriter {
         const host = this.getServerUrl(api.getDefinition().servers?.[0]);
         writer
             .write('extend schema\n')
-            .write('  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])\n')
+            .write('  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])\n')
             .write('  @link(\n')
-            .write('    url: "https://specs.apollo.dev/connect/v0.1"\n')
+            .write('    url: "https://specs.apollo.dev/connect/v0.2"\n')
             .write('    import: ["@connect", "@source"]\n')
             .write('  )\n')
             .write('  @source(name: "api", http: { baseURL: "')

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

@@ -1 +1 @@
-{"version":3,"file":"schemaWriter.js","sourceRoot":"","sources":["../../../src/oas/io/schemaWriter.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,YAAY;IACH;IAApB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,eAAe,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;IAEM,eAAe,CAAC,MAAc;QACnC,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM;aACH,KAAK,CAAC,iBAAiB,CAAC;aACxB,KAAK,CAAC,+EAA+E,CAAC;aACtF,KAAK,CAAC,YAAY,CAAC;aACnB,KAAK,CAAC,oDAAoD,CAAC;aAC3D,KAAK,CAAC,uCAAuC,CAAC;aAC9C,KAAK,CAAC,OAAO,CAAC;aACd,KAAK,CAAC,2CAA2C,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC;aACX,KAAK,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,MAAgC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,uBAAuB,CAAC;QACjC,CAAC;QACD,IAAI,GAAG,GAAW,MAAM,CAAC,GAAG,CAAC;QAC7B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF","sourcesContent":["import Oas from 'oas';\nimport { ServerObject } from 'oas/types';\nimport { OasGen } from '../oasGen.js';\nimport { Writer } from './writer.js';\n\nexport class SchemaWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeJSONScalar(writer: Writer): void {\n    writer.write('\\nscalar JSON\\n\\n');\n  }\n\n  public writeDirectives(writer: Writer): void {\n    const api: Oas = this.gen.parser;\n    const host = this.getServerUrl(api.getDefinition().servers?.[0]);\n    writer\n      .write('extend schema\\n')\n      .write('  @link(url: \"https://specs.apollo.dev/federation/v2.10\", import: [\"@key\"])\\n')\n      .write('  @link(\\n')\n      .write('    url: \"https://specs.apollo.dev/connect/v0.1\"\\n')\n      .write('    import: [\"@connect\", \"@source\"]\\n')\n      .write('  )\\n')\n      .write('  @source(name: \"api\", http: { baseURL: \"')\n      .write(host)\n      .write('\" })\\n\\n');\n  }\n\n  private getServerUrl(server: ServerObject | undefined): string {\n    if (!server) {\n      return 'http://localhost:4010';\n    }\n    let url: string = server.url;\n    if (server.variables) {\n      for (const key in server.variables) {\n        url = url.replace('{' + key + '}', server.variables[key].default);\n      }\n    }\n    return url;\n  }\n}\n"]}
+{"version":3,"file":"schemaWriter.js","sourceRoot":"","sources":["../../../src/oas/io/schemaWriter.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,YAAY;IACH;IAApB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,eAAe,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;IAEM,eAAe,CAAC,MAAc;QACnC,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM;aACH,KAAK,CAAC,iBAAiB,CAAC;aACxB,KAAK,CAAC,+EAA+E,CAAC;aACtF,KAAK,CAAC,YAAY,CAAC;aACnB,KAAK,CAAC,oDAAoD,CAAC;aAC3D,KAAK,CAAC,uCAAuC,CAAC;aAC9C,KAAK,CAAC,OAAO,CAAC;aACd,KAAK,CAAC,2CAA2C,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC;aACX,KAAK,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,MAAgC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,uBAAuB,CAAC;QACjC,CAAC;QACD,IAAI,GAAG,GAAW,MAAM,CAAC,GAAG,CAAC;QAC7B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF","sourcesContent":["import Oas from 'oas';\nimport { ServerObject } from 'oas/types';\nimport { OasGen } from '../oasGen.js';\nimport { Writer } from './writer.js';\n\nexport class SchemaWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeJSONScalar(writer: Writer): void {\n    writer.write('\\nscalar JSON\\n\\n');\n  }\n\n  public writeDirectives(writer: Writer): void {\n    const api: Oas = this.gen.parser;\n    const host = this.getServerUrl(api.getDefinition().servers?.[0]);\n    writer\n      .write('extend schema\\n')\n      .write('  @link(url: \"https://specs.apollo.dev/federation/v2.11\", import: [\"@key\"])\\n')\n      .write('  @link(\\n')\n      .write('    url: \"https://specs.apollo.dev/connect/v0.2\"\\n')\n      .write('    import: [\"@connect\", \"@source\"]\\n')\n      .write('  )\\n')\n      .write('  @source(name: \"api\", http: { baseURL: \"')\n      .write(host)\n      .write('\" })\\n\\n');\n  }\n\n  private getServerUrl(server: ServerObject | undefined): string {\n    if (!server) {\n      return 'http://localhost:4010';\n    }\n    let url: string = server.url;\n    if (server.variables) {\n      for (const key in server.variables) {\n        url = url.replace('{' + key + '}', server.variables[key].default);\n      }\n    }\n    return url;\n  }\n}\n"]}

package/dist/oas/io/writer.js

@@ -2,6 +2,7 @@ import { T } from '../nodes/internal.js';
 import { OperationWriter } from './operationWriter.js';
 import { SchemaWriter } from './schemaWriter.js';
 import { TypesCollector } from '../generator/typesCollector.js';
+import _ from 'lodash';
 export class Writer {
     gen;
     schemaWriter;
@@ -32,15 +33,17 @@ export class Writer {
     writeSchema(writer, types, selection) {
         const context = this.gen.context;
         const generatedSet = context.generatedSet;
+        // make our own copy of the refCount, so it doesn't get modified by the writing process
+        const refCount = _.cloneDeep(context.refCount);
         this.schemaWriter.writeDirectives(writer);
         this.schemaWriter.writeJSONScalar(writer);
         types.forEach((type) => {
-            const count = context.refCount.get(type.name) !== undefined ? context.refCount.get(type.name) : Infinity;
+            const count = refCount.get(type.name) !== undefined ? refCount.get(type.name) : Infinity;
             if (!generatedSet.has(type.id) && count > 0) {
                 type.generate(context, this, selection);
                 generatedSet.add(type.id);
+                refCount.set(type.name, count - 1);
             }
-            context.decRefCount(type.name);
         });
         const expanded = [...this.gen.paths];
         const queries = new Map(expanded.filter(([_k, type]) => type.id.startsWith('get:')));

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

@@ -1 +1 @@
-{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../src/oas/io/writer.ts"],"names":[],"mappings":"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","sourcesContent":["import { OasGen } from '../oasGen.js';\nimport { IType, T } from '../nodes/internal.js';\nimport { OperationWriter } from './operationWriter.js';\nimport { SchemaWriter } from './schemaWriter.js';\nimport { TypesCollector } from '../generator/typesCollector.js';\nimport _ from 'lodash';\n\nexport class Writer {\n  private schemaWriter: SchemaWriter;\n  private operationWriter: OperationWriter;\n  public buffer: string[];\n\n  constructor(public gen: OasGen) {\n    this.buffer = [];\n    this.schemaWriter = new SchemaWriter(gen);\n    this.operationWriter = new OperationWriter(gen);\n  }\n\n  public write(input: string): Writer {\n    this.buffer.push(input);\n    return this;\n  }\n\n  public flush(): string {\n    return this.buffer.join('');\n  }\n\n  public generate(paths: string[]): string[] {\n    const collector = new TypesCollector(this.gen);\n    collector.collect(paths);\n\n    return this.generateWith(collector.types, collector.expanded);\n  }\n\n  public generateWith(types: Map<string, IType>, selection: string[]) {\n    this.writeSchema(this, types, selection);\n    return selection;\n  }\n\n  public writeSchema(writer: Writer, types: Map<string, IType>, selection: string[]): void {\n    const context = this.gen.context!;\n    const generatedSet = context.generatedSet;\n\n    this.schemaWriter.writeDirectives(writer);\n    this.schemaWriter.writeJSONScalar(writer);\n\n    types.forEach((type: IType) => {\n      const count = context.refCount.get(type.name) !== undefined ? context.refCount.get(type.name)! : Infinity;\n\n      if (!generatedSet.has(type.id) && count > 0) {\n        type.generate(context, this, selection);\n        generatedSet.add(type.id);\n      }\n\n      context.decRefCount(type.name);\n    });\n\n    const expanded = [...this.gen.paths];\n\n    const queries = new Map(expanded.filter(([_k, type]) => type.id.startsWith('get:')));\n    const mutations = new Map(expanded.filter(([_k, type]) => T.isMutationType(type)));\n\n    this.operationWriter.writeQuery(context, writer, queries, selection);\n    this.operationWriter.writeMutations(context, writer, mutations, selection);\n\n    writer.flush();\n  }\n}\n"]}
+{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../src/oas/io/writer.ts"],"names":[],"mappings":"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","sourcesContent":["import { OasGen } from '../oasGen.js';\nimport { IType, T } from '../nodes/internal.js';\nimport { OperationWriter } from './operationWriter.js';\nimport { SchemaWriter } from './schemaWriter.js';\nimport { TypesCollector } from '../generator/typesCollector.js';\nimport _ from 'lodash';\n\nexport class Writer {\n  private schemaWriter: SchemaWriter;\n  private operationWriter: OperationWriter;\n  public buffer: string[];\n\n  constructor(public gen: OasGen) {\n    this.buffer = [];\n    this.schemaWriter = new SchemaWriter(gen);\n    this.operationWriter = new OperationWriter(gen);\n  }\n\n  public write(input: string): Writer {\n    this.buffer.push(input);\n    return this;\n  }\n\n  public flush(): string {\n    return this.buffer.join('');\n  }\n\n  public generate(paths: string[]): string[] {\n    const collector = new TypesCollector(this.gen);\n    collector.collect(paths);\n\n    return this.generateWith(collector.types, collector.expanded);\n  }\n\n  public generateWith(types: Map<string, IType>, selection: string[]) {\n    this.writeSchema(this, types, selection);\n    return selection;\n  }\n\n  public writeSchema(writer: Writer, types: Map<string, IType>, selection: string[]): void {\n    const context = this.gen.context!;\n    const generatedSet = context.generatedSet;\n\n    // make our own copy of the refCount, so it doesn't get modified by the writing process\n    const refCount = _.cloneDeep(context.refCount);\n\n    this.schemaWriter.writeDirectives(writer);\n    this.schemaWriter.writeJSONScalar(writer);\n\n    types.forEach((type: IType) => {\n      const count = refCount.get(type.name) !== undefined ? refCount.get(type.name)! : Infinity;\n\n      if (!generatedSet.has(type.id) && count > 0) {\n        type.generate(context, this, selection);\n        generatedSet.add(type.id);\n        refCount.set(type.name, count - 1);\n      }\n    });\n\n    const expanded = [...this.gen.paths];\n\n    const queries = new Map(expanded.filter(([_k, type]) => type.id.startsWith('get:')));\n    const mutations = new Map(expanded.filter(([_k, type]) => T.isMutationType(type)));\n\n    this.operationWriter.writeQuery(context, writer, queries, selection);\n    this.operationWriter.writeMutations(context, writer, mutations, selection);\n\n    writer.flush();\n  }\n}\n"]}

package/dist/oas/nodes/factory.js

@@ -26,7 +26,11 @@ export class Factory {
             result = this.createArrayType(parent, schemaObj, context);
         }
         // array case
-        else if (schemaObj?.type === 'object' || schemaObj?.oneOf || schemaObj?.allOf || !_.isEmpty(schemaObj.properties)) {
+        else if (schemaObj?.type === 'object' ||
+            schemaObj?.oneOf ||
+            schemaObj?.allOf ||
+            schemaObj?.anyOf ||
+            !_.isEmpty(schemaObj.properties)) {
             result = this.createContainerType(parent, schemaObj, ref);
         }
         // scalar
@@ -73,7 +77,7 @@ export class Factory {
             result = new Composed(parent, ref || _.get(schema, 'name'), schema);
         }
         // union
-        else if (schema.oneOf) {
+        else if (schema.oneOf || schema.anyOf) {
             const oneOfs = schema.oneOf || [];
             result = new Union(parent, ref || _.get(schema, 'name'), oneOfs);
         }

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  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\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 { APOLLO_SYNTHETIC_OBJ } from '../schemas/index.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\n    // array case\n    if (schemaObj.type === 'array' && schemaObj.items) {\n      result = this.createArrayType(parent, schemaObj, context);\n    }\n    // array case\n    else if (schemaObj?.type === 'object' || schemaObj?.oneOf || schemaObj?.allOf || !_.isEmpty(schemaObj.properties)) {\n      result = this.createContainerType(parent, schemaObj, ref);\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  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) {\n      const oneOfs = schema.oneOf || [];\n      result = new Union(parent, ref || _.get(schema, 'name'), oneOfs as SchemaObject[]);\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      // if we want to syntethise an object:\n      if (schema.format == APOLLO_SYNTHETIC_OBJ) {\n        (result as Obj).synthetic = true;\n      }\n    }\n\n    return result;\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    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      // 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(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 (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        // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\n        const stringEnum = _.every(schemaObj.enum, (value: any, _: string) => typeof value === 'string');\n        const en: En = new En(parent, ref, schemaObj, stringEnum ? (schemaObj.enum as string[]) : []);\n\n        prop = new PropEn(parent, propName, ref, schemaObj);\n        prop.add(en);\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 (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    if (parent.ancestors().find((a) => a.id === prop.id)) {\n      console.warn('[factory] Recursion detected! Ancestors already contain this type: \\n' + prop.id);\n      prop = new PropCircRef(parent, prop);\n    }\n\n    return prop;\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  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\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 { APOLLO_SYNTHETIC_OBJ } from '../schemas/index.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\n    // array case\n    if (schemaObj.type === 'array' && schemaObj.items) {\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    // 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  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(parent, ref || _.get(schema, 'name'), oneOfs as SchemaObject[]);\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      // if we want to syntethise an object:\n      if (schema.format == APOLLO_SYNTHETIC_OBJ) {\n        (result as Obj).synthetic = true;\n      }\n    }\n\n    return result;\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    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      // 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(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 (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        // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\n        const stringEnum = _.every(schemaObj.enum, (value: any, _: string) => typeof value === 'string');\n        const en: En = new En(parent, ref, schemaObj, stringEnum ? (schemaObj.enum as string[]) : []);\n\n        prop = new PropEn(parent, propName, ref, schemaObj);\n        prop.add(en);\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 (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    if (parent.ancestors().find((a) => a.id === prop.id)) {\n      console.warn('[factory] Recursion detected! Ancestors already contain this type: \\n' + prop.id);\n      prop = new PropCircRef(parent, prop);\n    }\n\n    return prop;\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.js

@@ -110,10 +110,13 @@ export class Get extends Type {
         }
         // If the response has a content property, we need to find the JSON content.
         else if (content) {
-            const keys = _.first(_.keys(response.content).filter((k) => k.includes('application/json')));
+            const availableKeys = _.keys(response.content);
+            warn(context, `  [${code}]`, `Available content types: ${availableKeys.join(', ')}`);
+            const keys = _.first(availableKeys.filter((k) => /^application\/(?:.*\+)?json/i.test(k)));
+            warn(context, `  [${code}]`, `Matched JSON key: ${keys || 'none'}`);
             const json = keys ? response.content[keys] : undefined;
             if (!json) {
-                warn(context, `  [${code}]`, 'no entry found for content application/json!');
+                warn(context, `  [${code}]`, 'No JSON content found!');
             }
             else {
                 this.visitResponseContent(context, code, json);

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

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/oas/nodes/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,OAAO,EAAM,MAAM,eAAe,CAAC;AAIjF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,MAAM,OAAO,GAAI,SAAQ,IAAI;IAUlB;IATF,IAAI,GAAW,KAAK,CAAC;IAErB,UAAU,CAAS;IACnB,MAAM,GAAY,EAAE,CAAC;IACrB,OAAO,CAAU;IACjB,WAAW,CAAU;IAE5B,YACE,IAAY,EACL,SAAoB;QAE3B,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAFhB,cAAS,GAAT,SAAS,CAAW;QAG3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,OAAmB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpD,mBAAmB;QACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAE9B,qBAAqB;QACrB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,SAAS,CAAC,QAAoB;QACnC,OAAO,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAEM,QAAQ,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACtE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAEzC,IAAI,WAAW,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;YACD,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEpD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,QAAoB,EAAE,OAAe,EAAE,UAAoB;QACvE,aAAa;IACf,CAAC;IAEM,YAAY;QACjB,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAES,eAAe,CAAC,OAAmB;QAC3C,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QAElD,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,GAAG,UAAU;iBACrB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAK,CAAC,CAAC,EAAa,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,CAAC;iBAC7E,GAAG,CAAC,CAAC,CAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACnB,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAES,cAAc,GAAG,CAAC,OAAmB,EAAE,EAAE;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC;QAE5D,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACrE,wDAAwD;YACxD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;QAClD,IAAI,SAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,SAAU,CAAC,KAAK,CAAmB,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,SAAU,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,SAAU,CAAC,OAAyB,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;IACH,CAAC,CAAC;IAEM,aAAa,CAAC,OAAmB,EAAE,IAAY,EAAE,QAAwB;QAC/E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAA0B,CAAC;QAEpD,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAA2B,CAAC,CAAC;QAC9D,CAAC;QACD,4EAA4E;aACvE,IAAI,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAE7F,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,EAAE,8CAA8C,CAAC,CAAC;YAC/E,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9D,0CAA0C;YAC1C,kCAAkC;YAClC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,OAAmB,EAAE,KAAa,EAAE,KAAsB;QACrF,KAAK,CAAC,OAAO,EAAE,8BAA8B,EAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,KAAM,CAAC,MAAsB,CAAC;QAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9D,gCAAgC;QAChC,yBAAyB;QACzB,oCAAoC;QACpC,IAAI;QAEJ,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,8BAA8B,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;IAEO,gBAAgB,CAAC,OAAmB,EAAE,GAAoB;QAChE,KAAK,CAAC,OAAO,EAAE,0BAA0B,EAAE,OAAO,IAAI,CAAC,IAAI,UAAU,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjF,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,IAAK,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,IAAK,EAAE,MAAwB,CAAC,CAAC;QACjE,KAAK,CAAC,OAAO,EAAE,0BAA0B,EAAE,QAAQ,IAAI,CAAC,IAAI,UAAU,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACpF,CAAC;IAES,kBAAkB,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACnF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAElB,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YAClC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;YACD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAEO,cAAc,CAAC,OAAmB,EAAE,MAAY,EAAE,CAAkB;QAC1E,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;CACF","sourcesContent":["import { IType, Type, Param, ReferenceObject, Factory, Op } from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { MediaTypeObject, ParameterObject, ResponseObject, SchemaObject } from 'oas/types';\n\nimport { trace, warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport { SYN_SUCCESS_RESPONSE } from '../schemas/index.js';\nimport _ from 'lodash';\n\nexport class Get extends Type implements Op {\n  public verb: string = 'GET';\n\n  public resultType?: IType;\n  public params: Param[] = [];\n  public summary?: string;\n  public description?: string;\n\n  constructor(\n    name: string,\n    public operation: Operation,\n  ) {\n    super(undefined, name);\n    this.summary = operation.getSummary();\n    this.description = operation.getDescription();\n  }\n\n  get id(): string {\n    return `get:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [get:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [get:visit]', 'in ' + this.name);\n\n    // 1. Visit params.\n    this.visitParameters(context);\n\n    // 2. Visit responses\n    this.visitResponses(context);\n    this.visited = true;\n\n    trace(context, '<- [get:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[get] ${this.name}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [get::generate]', `-> in: ${this.name}`);\n\n    const description = this.operation.getDescription();\n    const summary = this.operation.getSummary();\n    const originalPath = this.operation.path;\n\n    if (description || summary || originalPath) {\n      writer.write('  \"\"\"\\n').write('  ');\n      if (description) {\n        writer.write(description).write(' ');\n      }\n      if (summary) {\n        writer.write(summary).write(' ');\n      }\n      if (originalPath) {\n        writer.write('(').write(originalPath).write(')');\n      }\n      writer.write('\\n  \"\"\"\\n');\n    }\n\n    writer.write('  ').write(this.getGqlOpName());\n    this.generateParameters(context, writer, selection);\n\n    if (this.resultType) {\n      writer.write(': ');\n      this.resultType.generate(context, writer, selection);\n    }\n\n    writer.write('\\n');\n    trace(context, '<- [get::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(_context: OasContext, _writer: Writer, _selection: string[]) {\n    // do nothing\n  }\n\n  public getGqlOpName(): string {\n    return Naming.genOperationName(this.operation.path, this.operation);\n  }\n\n  protected visitParameters(context: OasContext): void {\n    trace(context, '-> [get::params]', 'in: ' + this.name);\n\n    const parameters = this.operation.getParameters();\n\n    if (parameters && parameters.length > 0) {\n      this.params = parameters\n        .filter((p) => !p.in || (p.in && (p.in as string).toLowerCase() !== 'header'))\n        .map((p: ParameterObject) => this.visitParameter(context, this, p));\n    } else {\n      this.params = [];\n    }\n\n    trace(context, '<- [get::params]', 'out: ' + this.name);\n  }\n\n  protected visitResponses = (context: OasContext) => {\n    const statusCodes = this.operation.getResponseStatusCodes();\n\n    if (!statusCodes.includes('200') && !statusCodes.includes('default')) {\n      // we can potentially synthesize an Empty response here:\n      this.visitResponse(context, '200', SYN_SUCCESS_RESPONSE);\n      return;\n    }\n\n    const responses = this.operation.schema.responses;\n    if (responses!['200']) {\n      this.visitResponse(context, '200', responses!['200'] as ResponseObject);\n    } else if (responses!.default) {\n      this.visitResponse(context, 'default', responses!.default as ResponseObject);\n    } else {\n      throw new Error(\"Could not find a '200' or 'default' response\");\n    }\n  };\n\n  private visitResponse(context: OasContext, code: string, response: ResponseObject): void {\n    const content = response.content as MediaTypeObject;\n\n    if ('$ref' in response) {\n      this.visitResponseRef(context, response as ReferenceObject);\n    }\n    // If the response has a content property, we need to find the JSON content.\n    else if (content) {\n      const keys = _.first(_.keys(response.content).filter((k) => k.includes('application/json')));\n\n      const json = keys ? response.content![keys] : undefined;\n      if (!json) {\n        warn(context, `  [${code}]`, 'no entry found for content application/json!');\n      } else {\n        this.visitResponseContent(context, code, json);\n      }\n    } else if ((code === 'default' || code === '200') && !content) {\n      // there is no response for this operation\n      // TODO: should we synthesize one?\n      this.visitResponse(context, '200', SYN_SUCCESS_RESPONSE);\n    } else {\n      throw new Error('Not yet implemented for: ' + JSON.stringify(response));\n    }\n  }\n\n  private visitResponseContent(context: OasContext, _code: string, media: MediaTypeObject): void {\n    trace(context, '-> [get::responses::content]', 'in ' + this.name);\n    const schema = media!.schema as SchemaObject;\n\n    if (!schema) {\n      throw new Error('No schema content found!');\n    }\n\n    this.resultType = Factory.fromResponse(context, this, schema);\n    // PENDING: do not visit anymore\n    // if (this.resultType) {\n    //   this.resultType.visit(context);\n    // }\n\n    if (this.resultType && !this.children.includes(this.resultType)) {\n      this.add(this.resultType);\n    }\n\n    trace(context, '<- [get::responses::content]', 'out ' + this.name);\n  }\n\n  private visitResponseRef(context: OasContext, ref: ReferenceObject): void {\n    trace(context, '-> [get::responses::ref]', `in: ${this.name}, ref: ${ref.$ref}`);\n\n    const lookup = context.lookupResponse(ref.$ref!);\n    if (!lookup) {\n      throw new Error('Could not find a response with ref: ' + ref.$ref);\n    }\n\n    if ('$ref' in lookup) {\n      throw new Error('Not yet implemented for nested refs');\n    }\n\n    this.visitResponse(context, ref.$ref!, lookup as ResponseObject);\n    trace(context, '<- [get::responses::ref]', `out: ${this.name}, ref: ${ref.$ref}`);\n  }\n\n  protected generateParameters(context: OasContext, writer: Writer, selection: string[]): void {\n    const sorted = this.params.sort((a, b) => (b.required ? 1 : 0) - (a.required ? 1 : 0));\n\n    if (sorted.length === 0) {\n      return;\n    }\n\n    writer.write('(');\n\n    sorted.forEach((parameter, index) => {\n      if (index > 0) {\n        writer.write(', ');\n      }\n      parameter.generate(context, writer, selection);\n    });\n\n    writer.write(')');\n  }\n\n  private visitParameter(context: OasContext, parent: Type, p: ParameterObject): Param {\n    trace(context, '->[visitParameter]', 'begin: ' + p.name);\n\n    const param = Factory.fromParam(context, parent, p);\n    param.visit(context);\n\n    trace(context, '<-[visitParameter]', 'end: ' + p.name);\n    return param;\n  }\n}\n"]}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/oas/nodes/get.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Type, Param, ReferenceObject, Factory, Op } from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { MediaTypeObject, ParameterObject, ResponseObject, SchemaObject } from 'oas/types';\n\nimport { trace, warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport { SYN_SUCCESS_RESPONSE } from '../schemas/index.js';\nimport _ from 'lodash';\n\nexport class Get extends Type implements Op {\n  public verb: string = 'GET';\n\n  public resultType?: IType;\n  public params: Param[] = [];\n  public summary?: string;\n  public description?: string;\n\n  constructor(\n    name: string,\n    public operation: Operation,\n  ) {\n    super(undefined, name);\n    this.summary = operation.getSummary();\n    this.description = operation.getDescription();\n  }\n\n  get id(): string {\n    return `get:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [get:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [get:visit]', 'in ' + this.name);\n\n    // 1. Visit params.\n    this.visitParameters(context);\n\n    // 2. Visit responses\n    this.visitResponses(context);\n    this.visited = true;\n\n    trace(context, '<- [get:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[get] ${this.name}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [get::generate]', `-> in: ${this.name}`);\n\n    const description = this.operation.getDescription();\n    const summary = this.operation.getSummary();\n    const originalPath = this.operation.path;\n\n    if (description || summary || originalPath) {\n      writer.write('  \"\"\"\\n').write('  ');\n      if (description) {\n        writer.write(description).write(' ');\n      }\n      if (summary) {\n        writer.write(summary).write(' ');\n      }\n      if (originalPath) {\n        writer.write('(').write(originalPath).write(')');\n      }\n      writer.write('\\n  \"\"\"\\n');\n    }\n\n    writer.write('  ').write(this.getGqlOpName());\n    this.generateParameters(context, writer, selection);\n\n    if (this.resultType) {\n      writer.write(': ');\n      this.resultType.generate(context, writer, selection);\n    }\n\n    writer.write('\\n');\n    trace(context, '<- [get::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(_context: OasContext, _writer: Writer, _selection: string[]) {\n    // do nothing\n  }\n\n  public getGqlOpName(): string {\n    return Naming.genOperationName(this.operation.path, this.operation);\n  }\n\n  protected visitParameters(context: OasContext): void {\n    trace(context, '-> [get::params]', 'in: ' + this.name);\n\n    const parameters = this.operation.getParameters();\n\n    if (parameters && parameters.length > 0) {\n      this.params = parameters\n        .filter((p) => !p.in || (p.in && (p.in as string).toLowerCase() !== 'header'))\n        .map((p: ParameterObject) => this.visitParameter(context, this, p));\n    } else {\n      this.params = [];\n    }\n\n    trace(context, '<- [get::params]', 'out: ' + this.name);\n  }\n\n  protected visitResponses = (context: OasContext) => {\n    const statusCodes = this.operation.getResponseStatusCodes();\n\n    if (!statusCodes.includes('200') && !statusCodes.includes('default')) {\n      // we can potentially synthesize an Empty response here:\n      this.visitResponse(context, '200', SYN_SUCCESS_RESPONSE);\n      return;\n    }\n\n    const responses = this.operation.schema.responses;\n    if (responses!['200']) {\n      this.visitResponse(context, '200', responses!['200'] as ResponseObject);\n    } else if (responses!.default) {\n      this.visitResponse(context, 'default', responses!.default as ResponseObject);\n    } else {\n      throw new Error(\"Could not find a '200' or 'default' response\");\n    }\n  };\n\n  private visitResponse(context: OasContext, code: string, response: ResponseObject): void {\n    const content = response.content as MediaTypeObject;\n\n    if ('$ref' in response) {\n      this.visitResponseRef(context, response as ReferenceObject);\n    }\n    // If the response has a content property, we need to find the JSON content.\n    else if (content) {\n      const availableKeys = _.keys(response.content);\n\n      warn(context, `  [${code}]`, `Available content types: ${availableKeys.join(', ')}`);\n      const keys = _.first(availableKeys.filter((k) => /^application\\/(?:.*\\+)?json/i.test(k)));\n      warn(context, `  [${code}]`, `Matched JSON key: ${keys || 'none'}`);\n\n      const json = keys ? response.content![keys] : undefined;\n      if (!json) {\n        warn(context, `  [${code}]`, 'No JSON content found!');\n      } else {\n        this.visitResponseContent(context, code, json);\n      }\n    } else if ((code === 'default' || code === '200') && !content) {\n      // there is no response for this operation\n      // TODO: should we synthesize one?\n      this.visitResponse(context, '200', SYN_SUCCESS_RESPONSE);\n    } else {\n      throw new Error('Not yet implemented for: ' + JSON.stringify(response));\n    }\n  }\n\n  private visitResponseContent(context: OasContext, _code: string, media: MediaTypeObject): void {\n    trace(context, '-> [get::responses::content]', 'in ' + this.name);\n    const schema = media!.schema as SchemaObject;\n\n    if (!schema) {\n      throw new Error('No schema content found!');\n    }\n\n    this.resultType = Factory.fromResponse(context, this, schema);\n    // PENDING: do not visit anymore\n    // if (this.resultType) {\n    //   this.resultType.visit(context);\n    // }\n\n    if (this.resultType && !this.children.includes(this.resultType)) {\n      this.add(this.resultType);\n    }\n\n    trace(context, '<- [get::responses::content]', 'out ' + this.name);\n  }\n\n  private visitResponseRef(context: OasContext, ref: ReferenceObject): void {\n    trace(context, '-> [get::responses::ref]', `in: ${this.name}, ref: ${ref.$ref}`);\n\n    const lookup = context.lookupResponse(ref.$ref!);\n    if (!lookup) {\n      throw new Error('Could not find a response with ref: ' + ref.$ref);\n    }\n\n    if ('$ref' in lookup) {\n      throw new Error('Not yet implemented for nested refs');\n    }\n\n    this.visitResponse(context, ref.$ref!, lookup as ResponseObject);\n    trace(context, '<- [get::responses::ref]', `out: ${this.name}, ref: ${ref.$ref}`);\n  }\n\n  protected generateParameters(context: OasContext, writer: Writer, selection: string[]): void {\n    const sorted = this.params.sort((a, b) => (b.required ? 1 : 0) - (a.required ? 1 : 0));\n\n    if (sorted.length === 0) {\n      return;\n    }\n\n    writer.write('(');\n\n    sorted.forEach((parameter, index) => {\n      if (index > 0) {\n        writer.write(', ');\n      }\n      parameter.generate(context, writer, selection);\n    });\n\n    writer.write(')');\n  }\n\n  private visitParameter(context: OasContext, parent: Type, p: ParameterObject): Param {\n    trace(context, '->[visitParameter]', 'begin: ' + p.name);\n\n    const param = Factory.fromParam(context, parent, p);\n    param.visit(context);\n\n    trace(context, '<-[visitParameter]', 'end: ' + p.name);\n    return param;\n  }\n}\n"]}

package/dist/oas/nodes/post.js

@@ -71,9 +71,16 @@ export class Post extends Get {
         if (mediaTypes.length === 0) {
             return;
         }
-        const body = this.operation.getRequestBody('application/json');
-        if (!body)
+        const mediaType = _.first(mediaTypes.filter((k) => /^application\/(?:.*\+)?json/i.test(k)));
+        if (!mediaType) {
+            warn(context, '  [post::visitBody]', `No JSON media type found!`);
             return;
+        }
+        const body = this.operation.getRequestBody(mediaType);
+        if (!body) {
+            warn(context, '  [post::visitBody]', `No valid body found!`);
+            return;
+        }
         // if it is an array, throw an error for now
         if (Array.isArray(body)) {
             throw new Error('Array body not yet implemented.');

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

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../src/oas/nodes/post.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, Body, Type } from './internal.js';\nimport { Writer } from '../io/writer.js';\nimport { OasContext } from '../oasContext.js';\nimport { Operation } from 'oas/operation';\nimport { trace, warn } from '../log/trace.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Post extends Get {\n  public body?: Body;\n  public verb: string = 'POST';\n\n  constructor(\n    name: string,\n    public operation: Operation,\n  ) {\n    super(name, operation);\n  }\n\n  get id(): string {\n    return `post:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [post:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [post:visit]', 'in ' + this.name);\n\n    // 1. Visit params.\n    this.visitParameters(context);\n\n    // 2. Visit body\n    this.visitBody(context);\n\n    // 3. Visit responses\n    this.visitResponses(context);\n    this.visited = true;\n\n    trace(context, '<- [post:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public getGqlOpName(): string {\n    return 'create' + _.upperFirst(Naming.genOperationName(this.operation.path, this.operation));\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[post] ${this.name}`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]): void {\n    throw new Error('select not implemented.');\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [post::generate]', `-> in: ${this.name}`);\n\n    const summary = this.operation.getSummary();\n    const originalPath = this.operation.path;\n\n    if (summary || originalPath) {\n      writer.write('  \"\"\"\\n').write('  ');\n      if (summary) {\n        writer.write(summary).write(' ');\n      }\n      if (originalPath) {\n        writer.write('(').write(originalPath).write(')');\n      }\n      writer.write('\\n  \"\"\"\\n');\n    }\n\n    writer.write('  ').write(this.getGqlOpName());\n\n    this.generateParameters(context, writer, selection);\n    this.generateBodyInput(context, writer);\n\n    if (this.resultType) {\n      writer.write(': ');\n      this.resultType.generate(context, writer, selection);\n    }\n\n    writer.write('\\n');\n    trace(context, '<- [post::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  private visitBody(context: OasContext) {\n    trace(context, '-> [post::visitBody]', `in: ${this.name}`);\n\n    const mediaTypes = this.operation.getRequestBodyMediaTypes();\n    if (mediaTypes.length === 0) {\n      return;\n    }\n\n    const body = this.operation.getRequestBody('application/json');\n    if (!body) return;\n\n    // if it is an array, throw an error for now\n    if (Array.isArray(body)) {\n      throw new Error('Array body not yet implemented.');\n    }\n\n    if (!body.schema) {\n      warn(context, '  [post::visitBody]', `No schema found!`);\n      return;\n    }\n\n    this.body = Factory.fromBody(context, this, body.schema) as Body;\n    this.body.visit(context);\n\n    trace(context, '<- [post::visitBody]', `out: ${this.name}`);\n  }\n\n  private generateBodyInput(context: OasContext, writer: Writer) {\n    if (!this.body || !this.body.payload) return;\n\n    const payload = this.body.payload as Type;\n\n    writer.write('(');\n\n    const name = Naming.getRefName(payload.name!) + payload.nameSuffix();\n    writer.write('input').write(': ').write(name).write('!');\n\n    writer.write(')');\n  }\n}\n"]}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../src/oas/nodes/post.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, Body, Type } from './internal.js';\nimport { Writer } from '../io/writer.js';\nimport { OasContext } from '../oasContext.js';\nimport { Operation } from 'oas/operation';\nimport { trace, warn } from '../log/trace.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Post extends Get {\n  public body?: Body;\n  public verb: string = 'POST';\n\n  constructor(\n    name: string,\n    public operation: Operation,\n  ) {\n    super(name, operation);\n  }\n\n  get id(): string {\n    return `post:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [post:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [post:visit]', 'in ' + this.name);\n\n    // 1. Visit params.\n    this.visitParameters(context);\n\n    // 2. Visit body\n    this.visitBody(context);\n\n    // 3. Visit responses\n    this.visitResponses(context);\n    this.visited = true;\n\n    trace(context, '<- [post:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public getGqlOpName(): string {\n    return 'create' + _.upperFirst(Naming.genOperationName(this.operation.path, this.operation));\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[post] ${this.name}`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]): void {\n    throw new Error('select not implemented.');\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [post::generate]', `-> in: ${this.name}`);\n\n    const summary = this.operation.getSummary();\n    const originalPath = this.operation.path;\n\n    if (summary || originalPath) {\n      writer.write('  \"\"\"\\n').write('  ');\n      if (summary) {\n        writer.write(summary).write(' ');\n      }\n      if (originalPath) {\n        writer.write('(').write(originalPath).write(')');\n      }\n      writer.write('\\n  \"\"\"\\n');\n    }\n\n    writer.write('  ').write(this.getGqlOpName());\n\n    this.generateParameters(context, writer, selection);\n    this.generateBodyInput(context, writer);\n\n    if (this.resultType) {\n      writer.write(': ');\n      this.resultType.generate(context, writer, selection);\n    }\n\n    writer.write('\\n');\n    trace(context, '<- [post::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  private visitBody(context: OasContext) {\n    trace(context, '-> [post::visitBody]', `in: ${this.name}`);\n\n    const mediaTypes = this.operation.getRequestBodyMediaTypes();\n    if (mediaTypes.length === 0) {\n      return;\n    }\n\n    const mediaType = _.first(mediaTypes.filter((k) => /^application\\/(?:.*\\+)?json/i.test(k)));\n    if (!mediaType) {\n      warn(context, '  [post::visitBody]', `No JSON media type found!`);\n      return;\n    }\n\n    const body = this.operation.getRequestBody(mediaType);\n    if (!body) {\n      warn(context, '  [post::visitBody]', `No valid body found!`);\n      return;\n    }\n\n    // if it is an array, throw an error for now\n    if (Array.isArray(body)) {\n      throw new Error('Array body not yet implemented.');\n    }\n\n    if (!body.schema) {\n      warn(context, '  [post::visitBody]', `No schema found!`);\n      return;\n    }\n\n    this.body = Factory.fromBody(context, this, body.schema) as Body;\n    this.body.visit(context);\n\n    trace(context, '<- [post::visitBody]', `out: ${this.name}`);\n  }\n\n  private generateBodyInput(context: OasContext, writer: Writer) {\n    if (!this.body || !this.body.payload) return;\n\n    const payload = this.body.payload as Type;\n\n    writer.write('(');\n\n    const name = Naming.getRefName(payload.name!) + payload.nameSuffix();\n    writer.write('input').write(': ').write(name).write('!');\n\n    writer.write(')');\n  }\n}\n"]}

package/dist/oas/oasContext.d.ts

@@ -18,6 +18,7 @@ export declare class OasContext {
     refCount: Map<string, number>;
     private parser;
     constructor(parser: Oas, options?: GenerateOptions);
+    reset(): void;
     enter(type: IType): void;
     leave(type: IType): void;
     size(): number;

package/dist/oas/oasContext.js

@@ -19,6 +19,9 @@ export class OasContext {
             showParentInSelections: true, // by default, we don't show where the fields are coming from
         };
     }
+    reset() {
+        this.generatedSet?.clear();
+    }
     enter(type) {
         this.stack.push(type);
         trace(this, '-> [context::enter]', type.id);

package/dist/oas/oasContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"oasContext.js","sourceRoot":"","sources":["../../src/oas/oasContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { trace, warn } from './log/trace.js';\nimport Oas from 'oas';\nimport { ParameterObject, ResponseObject, SchemaObject } from 'oas/types';\nimport { ReferenceObject } from './nodes/internal.js';\nimport { Naming } from './utils/naming.js';\nimport { IType } from './nodes/internal.js';\n\nexport type GenerateOptions = {\n  consolidateUnions: boolean;\n  showParentInSelections: boolean;\n};\n\nexport class OasContext {\n  public static readonly COMPONENTS_SCHEMAS: string = '#/components/schemas/';\n  public static readonly COMPONENTS_RESPONSES: string = '#/components/responses/';\n  public static readonly PARAMETER_SCHEMAS: string = '#/components/parameters/';\n\n  public generatedSet: Set<string> = new Set();\n  public indent: number;\n\n  public stack: IType[] = new Array<IType>();\n  public types: Map<string, IType | undefined> = new Map();\n  public generateOptions: GenerateOptions;\n  public refCount: Map<string, number> = new Map();\n\n  private parser: Oas;\n\n  constructor(parser: Oas, options?: GenerateOptions) {\n    this.parser = parser;\n    this.indent = 0;\n    this.generateOptions = options || {\n      consolidateUnions: true, // by default, we consolidate fields until unions are supported\n      showParentInSelections: true, // by default, we don't show where the fields are coming from\n    };\n  }\n\n  public enter(type: IType): void {\n    this.stack.push(type);\n    trace(this, '-> [context::enter]', type.id);\n  }\n\n  public leave(type: IType): void {\n    this.stack.pop();\n    trace(this, '<- [context::leave]', type.id);\n  }\n\n  public size() {\n    return this.stack.length;\n  }\n\n  public store(name: string, type: IType): void {\n    trace(this, '[context::store]', 'store ' + type.id);\n    this.types.set(name, undefined);\n  }\n\n  public lookupResponse(ref: string): ResponseObject | ReferenceObject | null {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_RESPONSES)) {\n      const definition = this.parser.getDefinition();\n      const responses = definition.components?.responses ?? {};\n\n      // get the response schema\n      return responses[Naming.getRefName(ref)!] ?? null;\n    }\n\n    return null;\n  }\n\n  public lookupRef(ref: string | null): SchemaObject | null {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_SCHEMAS)) {\n      const currentCount = this.refCount.get(ref) || 0;\n      this.refCount.set(ref, currentCount + 1);\n\n      const definition = this.parser.getDefinition();\n      const schemas = definition.components?.schemas ?? {};\n\n      return schemas ? schemas[Naming.getRefName(ref)!] : null;\n    }\n\n    return null;\n  }\n\n  public decRefCount(ref: string): void {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_SCHEMAS)) {\n      const currentCount = this.refCount.get(ref) || 0;\n      if (currentCount > 0) {\n        this.refCount.set(ref, currentCount - 1);\n      }\n    }\n  }\n\n  public lookupParam(ref: string): ParameterObject | boolean {\n    if (ref && ref.startsWith(OasContext.PARAMETER_SCHEMAS)) {\n      const definition = this.parser.getDefinition();\n      const parameters = definition.components?.parameters ?? {};\n\n      // get the parameter schema\n      const name = Naming.getRefName(ref)!;\n      return (parameters[name] as ParameterObject) ?? false;\n    }\n\n    return false;\n  }\n\n  public inContextOf(type: string, node: IType): boolean {\n    // console\n    for (let i = this.stack.length - 1; i >= 0; i--) {\n      if (this.stack[i] === node) {\n        continue;\n      }\n\n      if (this.stack[i].constructor.name === type) {\n        return true;\n      }\n    }\n\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"oasContext.js","sourceRoot":"","sources":["../../src/oas/oasContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { trace, warn } from './log/trace.js';\nimport Oas from 'oas';\nimport { ParameterObject, ResponseObject, SchemaObject } from 'oas/types';\nimport { ReferenceObject } from './nodes/internal.js';\nimport { Naming } from './utils/naming.js';\nimport { IType } from './nodes/internal.js';\n\nexport type GenerateOptions = {\n  consolidateUnions: boolean;\n  showParentInSelections: boolean;\n};\n\nexport class OasContext {\n  public static readonly COMPONENTS_SCHEMAS: string = '#/components/schemas/';\n  public static readonly COMPONENTS_RESPONSES: string = '#/components/responses/';\n  public static readonly PARAMETER_SCHEMAS: string = '#/components/parameters/';\n\n  public generatedSet: Set<string> = new Set();\n  public indent: number;\n\n  public stack: IType[] = new Array<IType>();\n  public types: Map<string, IType | undefined> = new Map();\n  public generateOptions: GenerateOptions;\n  public refCount: Map<string, number> = new Map();\n\n  private parser: Oas;\n\n  constructor(parser: Oas, options?: GenerateOptions) {\n    this.parser = parser;\n    this.indent = 0;\n    this.generateOptions = options || {\n      consolidateUnions: true, // by default, we consolidate fields until unions are supported\n      showParentInSelections: true, // by default, we don't show where the fields are coming from\n    };\n  }\n\n  public reset(): void {\n    this.generatedSet?.clear();\n  }\n\n  public enter(type: IType): void {\n    this.stack.push(type);\n    trace(this, '-> [context::enter]', type.id);\n  }\n\n  public leave(type: IType): void {\n    this.stack.pop();\n    trace(this, '<- [context::leave]', type.id);\n  }\n\n  public size() {\n    return this.stack.length;\n  }\n\n  public store(name: string, type: IType): void {\n    trace(this, '[context::store]', 'store ' + type.id);\n    this.types.set(name, undefined);\n  }\n\n  public lookupResponse(ref: string): ResponseObject | ReferenceObject | null {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_RESPONSES)) {\n      const definition = this.parser.getDefinition();\n      const responses = definition.components?.responses ?? {};\n\n      // get the response schema\n      return responses[Naming.getRefName(ref)!] ?? null;\n    }\n\n    return null;\n  }\n\n  public lookupRef(ref: string | null): SchemaObject | null {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_SCHEMAS)) {\n      const currentCount = this.refCount.get(ref) || 0;\n      this.refCount.set(ref, currentCount + 1);\n\n      const definition = this.parser.getDefinition();\n      const schemas = definition.components?.schemas ?? {};\n\n      return schemas ? schemas[Naming.getRefName(ref)!] : null;\n    }\n\n    return null;\n  }\n\n  public decRefCount(ref: string): void {\n    if (ref && ref.startsWith(OasContext.COMPONENTS_SCHEMAS)) {\n      const currentCount = this.refCount.get(ref) || 0;\n      if (currentCount > 0) {\n        this.refCount.set(ref, currentCount - 1);\n      }\n    }\n  }\n\n  public lookupParam(ref: string): ParameterObject | boolean {\n    if (ref && ref.startsWith(OasContext.PARAMETER_SCHEMAS)) {\n      const definition = this.parser.getDefinition();\n      const parameters = definition.components?.parameters ?? {};\n\n      // get the parameter schema\n      const name = Naming.getRefName(ref)!;\n      return (parameters[name] as ParameterObject) ?? false;\n    }\n\n    return false;\n  }\n\n  public inContextOf(type: string, node: IType): boolean {\n    // console\n    for (let i = this.stack.length - 1; i >= 0; i--) {\n      if (this.stack[i] === node) {\n        continue;\n      }\n\n      if (this.stack[i].constructor.name === type) {\n        return true;\n      }\n    }\n\n    return false;\n  }\n}\n"]}

package/dist/oas/oasGen.d.ts

@@ -9,6 +9,7 @@ interface IGenOptions {
 }
 export declare class OasGen {
     selections: string[];
+    private visited;
     static fromData(data: ArrayBuffer, options?: IGenOptions): Promise<OasGen>;
     static fromFile(sourceFile: string, options?: IGenOptions): Promise<OasGen>;
     parser: Oas;
@@ -23,6 +24,7 @@ export declare class OasGen {
     getTypes(paths: string[]): Map<string, IType>;
     generateSchema(paths: string[]): string;
     visit(): Promise<void>;
+    visitSync(): void;
     private isSupported;
     getContext(): OasContext;
     expand(type: IType): IType[];
@@ -30,7 +32,6 @@ export declare class OasGen {
     /** this seems a bit buggy at the moment, needs more testing **/
     findPath(path: string): IType | boolean;
     writer(): Writer;
-    reset(): Promise<void>;
     private visitGet;
     private visitPost;
     private visitPut;

package/dist/oas/oasGen.js

@@ -8,6 +8,7 @@ import { trace } from './log/trace.js';
 import { TypesCollector } from './generator/typesCollector.js';
 export class OasGen {
     selections = [];
+    visited = false;
     static async fromData(data, options = {
         skipValidation: false,
         consolidateUnions: true,
@@ -82,13 +83,16 @@ export class OasGen {
     }
     getTypes(paths) {
         // make sure we pass the latest options to our context for the generation
-        this.context.generateOptions = this.options;
+        const context = this.getContext();
+        context.generateOptions = this.options;
         this.collector.collect(paths);
         return this.collector.types;
     }
     generateSchema(paths) {
         // make sure we pass the latest options to our context for the generation
-        this.context.generateOptions = this.options;
+        const context = this.getContext();
+        context.reset();
+        context.generateOptions = this.options;
         this.collector.collect(paths);
         const writer = new Writer(this);
         this.selections = writer.generateWith(this.collector.types, this.collector.expanded);
@@ -107,6 +111,21 @@ export class OasGen {
         }
         this.paths = collected;
     }
+    visitSync() {
+        if (this.visited)
+            return;
+        const parser = this.parser;
+        const context = this.getContext();
+        const paths = parser.getPaths();
+        const filtered = Object.entries(paths)
+            .filter(([_key, pathItem]) => this.isSupported(pathItem))
+            .sort((a, b) => a[0].localeCompare(b[0], undefined, { sensitivity: 'base' }));
+        const collected = new Map();
+        for (const [key, pathItem] of filtered) {
+            this.visitPath(context, key, pathItem).forEach((type) => collected.set(type.id, type));
+        }
+        this.paths = collected;
+    }
     isSupported(pathItem) {
         return pathItem.get || pathItem.post || pathItem.put || pathItem.delete || pathItem.patch;
     }
@@ -161,12 +180,6 @@ export class OasGen {
     writer() {
         return new Writer(this);
     }
-    async reset() {
-        this.selections = [];
-        this.context = new OasContext(this.parser, this.options);
-        this.collector = new TypesCollector(this);
-        await this.visit();
-    }
     // private methods
     visitGet(context, name, op) {
         trace(context, '-> [visitGet]', `in:  [${name}] id: ${op.getOperationId()}`);

package/dist/oas/oasGen.js.map

@@ -1 +1 @@
-{"version":3,"file":"oasGen.js","sourceRoot":"","sources":["../../src/oas/oasGen.ts"],"names":[],"mappings":"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","sourcesContent":["import Oas from 'oas';\nimport OASNormalize from 'oas-normalize';\nimport { Operation, Webhook } from 'oas/operation';\nimport { HttpMethods, OASDocument } from 'oas/types';\nimport { OpenAPI } from 'openapi-types';\n\nimport fs from 'fs';\nimport { GenerateOptions, OasContext } from './oasContext.js';\nimport { Factory, IType } from './nodes/internal.js';\nimport { Writer } from './io/writer.js';\nimport { trace } from './log/trace.js';\nimport { TypesCollector } from './generator/typesCollector.js';\n\ninterface IGenOptions {\n  skipValidation: boolean;\n  consolidateUnions: boolean;\n  showParentInSelections: boolean;\n}\n\nexport class OasGen {\n  public selections: string[] = [];\n\n  public static async fromData(\n    data: ArrayBuffer,\n    options: IGenOptions = {\n      skipValidation: false,\n      consolidateUnions: true,\n      showParentInSelections: false,\n    },\n  ): Promise<OasGen> {\n    const normalizer: OASNormalize = new OASNormalize(data, {\n      enablePaths: true,\n    });\n\n    const _loaded: Record<string, unknown> = await normalizer.load();\n    console.log('loaded file');\n\n    const _normalised: OpenAPI.Document = await normalizer.bundle();\n    console.log('loaded bundle');\n\n    if (!options.skipValidation) {\n      const validated: boolean = await normalizer.validate();\n      if (!validated) {\n        console.log('validated', validated);\n        throw new Error('Could not validate source file');\n      }\n    }\n\n    const json = await normalizer.convert();\n    console.log('converted');\n\n    const parser: Oas = new Oas(json as OASDocument);\n    return new OasGen(parser, options);\n  }\n\n  public static async fromFile(\n    sourceFile: string,\n    options: IGenOptions = {\n      skipValidation: false,\n      consolidateUnions: true,\n      showParentInSelections: false,\n    },\n    // prompt: Prompt\n  ): Promise<OasGen> {\n    if (!fs.existsSync(sourceFile)) {\n      throw new Error('Source not found: ' + sourceFile);\n    }\n\n    const normalizer: OASNormalize = new OASNormalize(sourceFile, {\n      enablePaths: true,\n    });\n\n    const _loaded: Record<string, unknown> = await normalizer.load();\n    console.log('loaded file');\n\n    const _normalised: OpenAPI.Document = await normalizer.bundle();\n    console.log('loaded bundle');\n\n    if (!options.skipValidation) {\n      const validated: boolean = await normalizer.validate();\n      if (!validated) {\n        console.log('validated', validated);\n        throw new Error('Could not validate source file');\n      }\n    }\n\n    const json = await normalizer.convert();\n    console.log('converted');\n\n    const parser: Oas = new Oas(json as OASDocument);\n    return new OasGen(parser, options);\n  }\n\n  public parser: Oas;\n  // public prompt: Prompt;\n  public context?: OasContext;\n  public paths: Map<string, IType> = new Map();\n  public options: GenerateOptions;\n  private collector: TypesCollector;\n\n  constructor(parser: Oas, options: GenerateOptions) {\n    this.parser = parser;\n    this.options = options;\n    this.collector = new TypesCollector(this);\n  }\n\n  public title(): string {\n    return this.parser.getDefinition().info.title;\n  }\n\n  public version(): string {\n    return this.parser.getDefinition().info.version;\n  }\n\n  public expanded(paths: string[]): string[] {\n    this.collector!.collect(paths);\n    return this.collector!.expanded;\n  }\n\n  public getTypes(paths: string[]): Map<string, IType> {\n    // make sure we pass the latest options to our context for the generation\n    this.context!.generateOptions = this.options;\n    this.collector!.collect(paths);\n    return this.collector.types;\n  }\n\n  public generateSchema(paths: string[]): string {\n    // make sure we pass the latest options to our context for the generation\n    this.context!.generateOptions = this.options;\n    this.collector!.collect(paths);\n\n    const writer: Writer = new Writer(this);\n    this.selections = writer.generateWith(this.collector!.types, this.collector!.expanded);\n    return writer.flush();\n  }\n\n  public async visit(): Promise<void> {\n    const parser = this.parser;\n    const context = this.getContext();\n\n    const paths = parser.getPaths();\n    const filtered = Object.entries(paths)\n      .filter(([_key, pathItem]) => this.isSupported(pathItem))\n      .sort((a, b) => a[0].localeCompare(b[0], undefined, { sensitivity: 'base' }));\n\n    const collected = new Map<string, IType>();\n    for (const [key, pathItem] of filtered) {\n      this.visitPath(context, key, pathItem).forEach((type) => collected.set(type.id, type));\n    }\n\n    this.paths = collected;\n  }\n\n  private isSupported(pathItem: Record<HttpMethods, Webhook | Operation>) {\n    return pathItem.get || pathItem.post || pathItem.put || pathItem.delete || pathItem.patch;\n  }\n\n  public getContext(): OasContext {\n    if (!this.context) {\n      this.context = new OasContext(this.parser, this.options);\n    }\n    return this.context;\n  }\n\n  public expand(type: IType): IType[] {\n    const ctx = this.getContext();\n    const path = type.path();\n\n    trace(ctx, '-> [expand]', `in: path: ${path}`);\n    type.visit(ctx);\n    trace(ctx, '<- [expand]', `out: path: ${path}`);\n\n    return type.children;\n  }\n\n  public find(path: string): IType | boolean {\n    for (const [_name, type] of this.paths) {\n      if (type.path() === path) {\n        return type;\n      }\n\n      type.visit(this.getContext());\n\n      const result = type.find(path, type.children);\n      if (result) {\n        return result;\n      }\n    }\n\n    return false;\n  }\n\n  /** this seems a bit buggy at the moment, needs more testing **/\n  public findPath(path: string): IType | boolean {\n    let collection = Array.from(this.paths.values());\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n      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.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      i++;\n    } while (i < parts.length);\n\n    return current;\n  }\n\n  public writer(): Writer {\n    return new Writer(this);\n  }\n\n  public async reset() {\n    this.selections = [];\n    this.context = new OasContext(this.parser, this.options);\n    this.collector = new TypesCollector(this);\n    await this.visit();\n  }\n  // private methods\n\n  private visitGet(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitGet]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.createGet(name, op);\n    trace(context, '<- [visitGet]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPost(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPost]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPost(name, op);\n    trace(context, '<- [visitPost]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPut(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPut]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPut(name, op);\n    trace(context, '<- [visitPut]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPatch(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPatch]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPatch(name, op);\n    trace(context, '<- [visitPatch]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitDelete(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitDelete]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromDelete(name, op);\n    trace(context, '<- [visitDelete]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPath(context: OasContext, name: string, pathItem: Record<string, Webhook | Operation>): IType[] {\n    const paths: IType[] = [];\n    if (pathItem.get !== undefined) {\n      if ((pathItem.get as Webhook | Operation)?.constructor.name === 'Webhook') {\n        throw new Error('Webhook not supported');\n      }\n      paths.push(this.visitGet(context, name, pathItem.get as Webhook | Operation));\n    }\n\n    if (pathItem.post !== undefined) {\n      paths.push(this.visitPost(context, name, pathItem.post));\n    }\n\n    if (pathItem.put !== undefined) {\n      paths.push(this.visitPut(context, name, pathItem.put));\n    }\n\n    if (pathItem.patch !== undefined) {\n      paths.push(this.visitPatch(context, name, pathItem.patch));\n    }\n\n    if (pathItem.delete !== undefined) {\n      paths.push(this.visitDelete(context, name, pathItem.delete));\n    }\n\n    return paths;\n  }\n}\n"]}
+{"version":3,"file":"oasGen.js","sourceRoot":"","sources":["../../src/oas/oasGen.ts"],"names":[],"mappings":"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","sourcesContent":["import Oas from 'oas';\nimport OASNormalize from 'oas-normalize';\nimport { Operation, Webhook } from 'oas/operation';\nimport { HttpMethods, OASDocument } from 'oas/types';\nimport { OpenAPI } from 'openapi-types';\n\nimport fs from 'fs';\nimport { GenerateOptions, OasContext } from './oasContext.js';\nimport { Factory, IType } from './nodes/internal.js';\nimport { Writer } from './io/writer.js';\nimport { trace } from './log/trace.js';\nimport { TypesCollector } from './generator/typesCollector.js';\n\ninterface IGenOptions {\n  skipValidation: boolean;\n  consolidateUnions: boolean;\n  showParentInSelections: boolean;\n}\n\nexport class OasGen {\n  public selections: string[] = [];\n  private visited: boolean = false;\n\n  public static async fromData(\n    data: ArrayBuffer,\n    options: IGenOptions = {\n      skipValidation: false,\n      consolidateUnions: true,\n      showParentInSelections: false,\n    },\n  ): Promise<OasGen> {\n    const normalizer: OASNormalize = new OASNormalize(data, {\n      enablePaths: true,\n    });\n\n    const _loaded: Record<string, unknown> = await normalizer.load();\n    console.log('loaded file');\n\n    const _normalised: OpenAPI.Document = await normalizer.bundle();\n    console.log('loaded bundle');\n\n    if (!options.skipValidation) {\n      const validated: boolean = await normalizer.validate();\n      if (!validated) {\n        console.log('validated', validated);\n        throw new Error('Could not validate source file');\n      }\n    }\n\n    const json = await normalizer.convert();\n    console.log('converted');\n\n    const parser: Oas = new Oas(json as OASDocument);\n    return new OasGen(parser, options);\n  }\n\n  public static async fromFile(\n    sourceFile: string,\n    options: IGenOptions = {\n      skipValidation: false,\n      consolidateUnions: true,\n      showParentInSelections: false,\n    },\n    // prompt: Prompt\n  ): Promise<OasGen> {\n    if (!fs.existsSync(sourceFile)) {\n      throw new Error('Source not found: ' + sourceFile);\n    }\n\n    const normalizer: OASNormalize = new OASNormalize(sourceFile, {\n      enablePaths: true,\n    });\n\n    const _loaded: Record<string, unknown> = await normalizer.load();\n    console.log('loaded file');\n\n    const _normalised: OpenAPI.Document = await normalizer.bundle();\n    console.log('loaded bundle');\n\n    if (!options.skipValidation) {\n      const validated: boolean = await normalizer.validate();\n      if (!validated) {\n        console.log('validated', validated);\n        throw new Error('Could not validate source file');\n      }\n    }\n\n    const json = await normalizer.convert();\n    console.log('converted');\n\n    const parser: Oas = new Oas(json as OASDocument);\n    return new OasGen(parser, options);\n  }\n\n  public parser: Oas;\n  // public prompt: Prompt;\n  public context?: OasContext;\n  public paths: Map<string, IType> = new Map();\n  public options: GenerateOptions;\n  private collector: TypesCollector;\n\n  constructor(parser: Oas, options: GenerateOptions) {\n    this.parser = parser;\n    this.options = options;\n    this.collector = new TypesCollector(this);\n  }\n\n  public title(): string {\n    return this.parser.getDefinition().info.title;\n  }\n\n  public version(): string {\n    return this.parser.getDefinition().info.version;\n  }\n\n  public expanded(paths: string[]): string[] {\n    this.collector.collect(paths);\n    return this.collector.expanded;\n  }\n\n  public getTypes(paths: string[]): Map<string, IType> {\n    // make sure we pass the latest options to our context for the generation\n    const context = this.getContext();\n    context.generateOptions = this.options;\n\n    this.collector.collect(paths);\n\n    return this.collector.types;\n  }\n\n  public generateSchema(paths: string[]): string {\n    // make sure we pass the latest options to our context for the generation\n    const context = this.getContext();\n    context.reset();\n    context.generateOptions = this.options;\n\n    this.collector.collect(paths);\n\n    const writer: Writer = new Writer(this);\n    this.selections = writer.generateWith(this.collector.types, this.collector.expanded);\n\n    return writer.flush();\n  }\n\n  public async visit(): Promise<void> {\n    const parser = this.parser;\n    const context = this.getContext();\n\n    const paths = parser.getPaths();\n    const filtered = Object.entries(paths)\n      .filter(([_key, pathItem]) => this.isSupported(pathItem))\n      .sort((a, b) => a[0].localeCompare(b[0], undefined, { sensitivity: 'base' }));\n\n    const collected = new Map<string, IType>();\n    for (const [key, pathItem] of filtered) {\n      this.visitPath(context, key, pathItem).forEach((type) => collected.set(type.id, type));\n    }\n\n    this.paths = collected;\n  }\n\n  public visitSync(): void {\n    if (this.visited) return;\n\n    const parser = this.parser;\n    const context = this.getContext();\n\n    const paths = parser.getPaths();\n    const filtered = Object.entries(paths)\n      .filter(([_key, pathItem]) => this.isSupported(pathItem))\n      .sort((a, b) => a[0].localeCompare(b[0], undefined, { sensitivity: 'base' }));\n\n    const collected = new Map<string, IType>();\n    for (const [key, pathItem] of filtered) {\n      this.visitPath(context, key, pathItem).forEach((type) => collected.set(type.id, type));\n    }\n\n    this.paths = collected;\n  }\n\n  private isSupported(pathItem: Record<HttpMethods, Webhook | Operation>) {\n    return pathItem.get || pathItem.post || pathItem.put || pathItem.delete || pathItem.patch;\n  }\n\n  public getContext(): OasContext {\n    if (!this.context) {\n      this.context = new OasContext(this.parser, this.options);\n    }\n    return this.context;\n  }\n\n  public expand(type: IType): IType[] {\n    const ctx = this.getContext();\n    const path = type.path();\n\n    trace(ctx, '-> [expand]', `in: path: ${path}`);\n    type.visit(ctx);\n    trace(ctx, '<- [expand]', `out: path: ${path}`);\n\n    return type.children;\n  }\n\n  public find(path: string): IType | boolean {\n    for (const [_name, type] of this.paths) {\n      if (type.path() === path) {\n        return type;\n      }\n\n      type.visit(this.getContext());\n\n      const result = type.find(path, type.children);\n      if (result) {\n        return result;\n      }\n    }\n\n    return false;\n  }\n\n  /** this seems a bit buggy at the moment, needs more testing **/\n  public findPath(path: string): IType | boolean {\n    let collection = Array.from(this.paths.values());\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n      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.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      i++;\n    } while (i < parts.length);\n\n    return current;\n  }\n\n  public writer(): Writer {\n    return new Writer(this);\n  }\n\n  // private methods\n  private visitGet(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitGet]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.createGet(name, op);\n    trace(context, '<- [visitGet]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPost(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPost]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPost(name, op);\n    trace(context, '<- [visitPost]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPut(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPut]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPut(name, op);\n    trace(context, '<- [visitPut]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPatch(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitPatch]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromPatch(name, op);\n    trace(context, '<- [visitPatch]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitDelete(context: OasContext, name: string, op: Operation): IType {\n    trace(context, '-> [visitDelete]', `in:  [${name}] id: ${op.getOperationId()}`);\n    const result = Factory.fromDelete(name, op);\n    trace(context, '<- [visitDelete]', `out: [${name}] id: ${op.getOperationId()}`);\n    return result;\n  }\n\n  private visitPath(context: OasContext, name: string, pathItem: Record<string, Webhook | Operation>): IType[] {\n    const paths: IType[] = [];\n    if (pathItem.get !== undefined) {\n      if ((pathItem.get as Webhook | Operation)?.constructor.name === 'Webhook') {\n        throw new Error('Webhook not supported');\n      }\n      paths.push(this.visitGet(context, name, pathItem.get as Webhook | Operation));\n    }\n\n    if (pathItem.post !== undefined) {\n      paths.push(this.visitPost(context, name, pathItem.post));\n    }\n\n    if (pathItem.put !== undefined) {\n      paths.push(this.visitPut(context, name, pathItem.put));\n    }\n\n    if (pathItem.patch !== undefined) {\n      paths.push(this.visitPatch(context, name, pathItem.patch));\n    }\n\n    if (pathItem.delete !== undefined) {\n      paths.push(this.visitDelete(context, name, pathItem.delete));\n    }\n\n    return paths;\n  }\n}\n"]}

package/dist/tests/runners.js

@@ -103,7 +103,7 @@ function compose(schemaPath, samplePath) {
     }
     const supergraphFile = path.join(os.tmpdir(), 'supergraph.yaml');
     let content = `
-federation_version: =2.10.0
+federation_version: =2.11.0
 subgraphs:
   test_spec:
     routing_url: http://localhost # this value is ignored

package/dist/tests/runners.js.map

@@ -1 +1 @@
-{"version":3,"file":"runners.js","sourceRoot":"","sources":["../../src/tests/runners.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonGen, OasGen } from '../index.js';\nimport { JsonContext, JsonType } from '../json/index.js';\nimport assert from 'node:assert';\nimport path from 'path';\nimport os from 'os';\nimport fs from 'fs';\nimport { execSync, spawnSync } from 'child_process';\nimport _ from 'lodash';\n\nexport const oasBasePath = './tests/resources/oas';\nconst jsonBasePath = './tests/resources/json';\n\n// runOasTest test\nexport async function runOasTest(\n  file: string,\n  paths: string[],\n  pathsSize: number,\n  typesSize: number,\n  shouldFail: boolean = false,\n  skipValidation: boolean = false,\n): Promise<string | undefined> {\n  const gen = await OasGen.fromFile(`${oasBasePath}/${file}`, {\n    skipValidation,\n    consolidateUnions: true,\n    showParentInSelections: false,\n  });\n  await gen.visit();\n\n  assert.ok(gen.paths !== undefined);\n  assert.ok(gen.paths.size === pathsSize, `${gen.paths.size} is not equal to ${pathsSize}`);\n\n  const types = gen.getTypes(paths);\n  assert.ok(\n    types.size === typesSize,\n    `${types.size} is not equal to ${typesSize}:  ${Array.from(types.keys()).join(',\\n')}`,\n  );\n\n  const schema = gen.generateSchema(paths);\n  assert.ok(schema !== undefined);\n\n  const schemaFile = path.join(os.tmpdir(), file.replace(/yaml|json|yml/, 'graphql'));\n  fs.writeFileSync(schemaFile, schema, { encoding: 'utf-8', flag: 'w' });\n\n  // need to write another graphql file but this only with a sample query otherwise composition\n  // will fail for mutations\n  const sampleFile = path.join(os.tmpdir(), 'simple-query.graphql');\n  if (!fs.existsSync(sampleFile)) {\n    fs.writeFileSync(sampleFile, 'type Query { hello: String }', { encoding: 'utf-8', flag: 'w' });\n  }\n\n  const [result, output] = compose(schemaFile, sampleFile);\n  if (shouldFail) {\n    assert.ok(!result);\n    assert.ok(output !== undefined);\n    return output as unknown as string | undefined;\n  } else {\n    assert.ok(output === undefined, 'should have been undefined, but it is: ' + output);\n    assert.ok(result);\n    console.error(schema);\n  }\n}\n\ninterface IJsonTestOptions {\n  shouldFail: boolean;\n  outputContains?: string;\n}\n\nexport async function runJsonTest(\n  fileOrFolder: string,\n  options: IJsonTestOptions = { shouldFail: false, outputContains: undefined },\n): Promise<string | undefined> {\n  const fileOrFolderPath: string = `${jsonBasePath}/${fileOrFolder}`;\n\n  assert.ok(fs.existsSync(fileOrFolderPath));\n\n  let walker: JsonGen;\n\n  const stats = fs.statSync(fileOrFolderPath);\n  if (stats.isDirectory()) {\n    walker = JsonGen.new();\n\n    const sources = fs.readdirSync(fileOrFolderPath).filter((name) => name.toLowerCase().endsWith('.json'));\n\n    for (const source of sources) {\n      const fullPath = path.join(fileOrFolderPath, source);\n      const json = fs.readFileSync(fullPath, 'utf-8');\n      assert.ok(json !== undefined);\n\n      walker.walkJson(json);\n    }\n  } else {\n    const json = fs.readFileSync(fileOrFolderPath, 'utf-8');\n    assert.ok(json !== undefined);\n\n    walker = JsonGen.fromReader(json);\n  }\n\n  const context: JsonContext = walker.getContext();\n\n  const types: JsonType[] = context.getTypes();\n  assert.ok(types.length > 0);\n\n  const schema = walker.generateSchema();\n  assert.ok(schema !== undefined);\n\n  const schemaFile = path.join(os.tmpdir() + '/walker', fileOrFolder.replace(/\\.yaml|\\.json|\\.yml/, '') + '.graphql');\n\n  // Ensure the directory exists\n  // fs.mkdirSync(path.dirname(schemaFile), { recursive: true });\n  const parentFolder = path.dirname(schemaFile);\n  if (!fs.existsSync(parentFolder)) {\n    fs.mkdirSync(parentFolder, { recursive: true });\n  }\n\n  if (fs.existsSync(schemaFile)) {\n    fs.unlinkSync(schemaFile);\n  }\n\n  fs.writeFileSync(schemaFile, schema, { encoding: 'utf-8', flag: 'w' });\n\n  const [result, output] = compose(schemaFile);\n\n  if (options.shouldFail) {\n    assert.ok(result === false);\n    assert.ok(output !== undefined);\n    return output as unknown as string | undefined;\n  } else {\n    assert.ok(output === undefined);\n    assert.ok(result === true);\n  }\n\n  // writer.clear();\n}\n\n/// rover checks\nfunction isRoverAvailable(command: string): [boolean, string?] {\n  const cmd = os.platform() === 'win32' ? 'where' : 'which';\n  const result = spawnSync(cmd, [command], { encoding: 'utf8' });\n\n  return [result.status === 0, result.stdout.toString().trim()];\n}\n\nfunction compose(schemaPath: string, samplePath?: string) {\n  console.info('schemaPath', schemaPath);\n\n  const rover: [boolean, (string | undefined)?] = isRoverAvailable('rover');\n  if (!rover[0]) {\n    throw new Error('Rover is not available');\n  }\n\n  const supergraphFile = path.join(os.tmpdir(), 'supergraph.yaml');\n  let content: string = `\nfederation_version: =2.10.0\nsubgraphs:\n  test_spec:\n    routing_url: http://localhost # this value is ignored\n    schema:\n      file: ${schemaPath} # path to the schema file`;\n\n  if (samplePath) {\n    content += `\n  sample_spec:\n    routing_url: http://localhost # this value is ignored\n    schema:\n      file: ${samplePath} # path to the sample file\\`;\n  `;\n  }\n\n  fs.writeFileSync(supergraphFile, content, { encoding: 'utf-8', flag: 'w' });\n\n  const cmd = `${rover[1]} supergraph compose --config ${supergraphFile} --elv2-license accept`;\n\n  let output;\n  try {\n    output = execSync(cmd, { stdio: 'pipe' });\n    return [true, undefined];\n  } catch (error) {\n    return [false, _.get(error, 'message')];\n  }\n}\n"]}
+{"version":3,"file":"runners.js","sourceRoot":"","sources":["../../src/tests/runners.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonGen, OasGen } from '../index.js';\nimport { JsonContext, JsonType } from '../json/index.js';\nimport assert from 'node:assert';\nimport path from 'path';\nimport os from 'os';\nimport fs from 'fs';\nimport { execSync, spawnSync } from 'child_process';\nimport _ from 'lodash';\n\nexport const oasBasePath = './tests/resources/oas';\nconst jsonBasePath = './tests/resources/json';\n\n// runOasTest test\nexport async function runOasTest(\n  file: string,\n  paths: string[],\n  pathsSize: number,\n  typesSize: number,\n  shouldFail: boolean = false,\n  skipValidation: boolean = false,\n): Promise<string | undefined> {\n  const gen = await OasGen.fromFile(`${oasBasePath}/${file}`, {\n    skipValidation,\n    consolidateUnions: true,\n    showParentInSelections: false,\n  });\n  await gen.visit();\n\n  assert.ok(gen.paths !== undefined);\n  assert.ok(gen.paths.size === pathsSize, `${gen.paths.size} is not equal to ${pathsSize}`);\n\n  const types = gen.getTypes(paths);\n  assert.ok(\n    types.size === typesSize,\n    `${types.size} is not equal to ${typesSize}:  ${Array.from(types.keys()).join(',\\n')}`,\n  );\n\n  const schema = gen.generateSchema(paths);\n  assert.ok(schema !== undefined);\n\n  const schemaFile = path.join(os.tmpdir(), file.replace(/yaml|json|yml/, 'graphql'));\n  fs.writeFileSync(schemaFile, schema, { encoding: 'utf-8', flag: 'w' });\n\n  // need to write another graphql file but this only with a sample query otherwise composition\n  // will fail for mutations\n  const sampleFile = path.join(os.tmpdir(), 'simple-query.graphql');\n  if (!fs.existsSync(sampleFile)) {\n    fs.writeFileSync(sampleFile, 'type Query { hello: String }', { encoding: 'utf-8', flag: 'w' });\n  }\n\n  const [result, output] = compose(schemaFile, sampleFile);\n  if (shouldFail) {\n    assert.ok(!result);\n    assert.ok(output !== undefined);\n    return output as unknown as string | undefined;\n  } else {\n    assert.ok(output === undefined, 'should have been undefined, but it is: ' + output);\n    assert.ok(result);\n    console.error(schema);\n  }\n}\n\ninterface IJsonTestOptions {\n  shouldFail: boolean;\n  outputContains?: string;\n}\n\nexport async function runJsonTest(\n  fileOrFolder: string,\n  options: IJsonTestOptions = { shouldFail: false, outputContains: undefined },\n): Promise<string | undefined> {\n  const fileOrFolderPath: string = `${jsonBasePath}/${fileOrFolder}`;\n\n  assert.ok(fs.existsSync(fileOrFolderPath));\n\n  let walker: JsonGen;\n\n  const stats = fs.statSync(fileOrFolderPath);\n  if (stats.isDirectory()) {\n    walker = JsonGen.new();\n\n    const sources = fs.readdirSync(fileOrFolderPath).filter((name) => name.toLowerCase().endsWith('.json'));\n\n    for (const source of sources) {\n      const fullPath = path.join(fileOrFolderPath, source);\n      const json = fs.readFileSync(fullPath, 'utf-8');\n      assert.ok(json !== undefined);\n\n      walker.walkJson(json);\n    }\n  } else {\n    const json = fs.readFileSync(fileOrFolderPath, 'utf-8');\n    assert.ok(json !== undefined);\n\n    walker = JsonGen.fromReader(json);\n  }\n\n  const context: JsonContext = walker.getContext();\n\n  const types: JsonType[] = context.getTypes();\n  assert.ok(types.length > 0);\n\n  const schema = walker.generateSchema();\n  assert.ok(schema !== undefined);\n\n  const schemaFile = path.join(os.tmpdir() + '/walker', fileOrFolder.replace(/\\.yaml|\\.json|\\.yml/, '') + '.graphql');\n\n  // Ensure the directory exists\n  // fs.mkdirSync(path.dirname(schemaFile), { recursive: true });\n  const parentFolder = path.dirname(schemaFile);\n  if (!fs.existsSync(parentFolder)) {\n    fs.mkdirSync(parentFolder, { recursive: true });\n  }\n\n  if (fs.existsSync(schemaFile)) {\n    fs.unlinkSync(schemaFile);\n  }\n\n  fs.writeFileSync(schemaFile, schema, { encoding: 'utf-8', flag: 'w' });\n\n  const [result, output] = compose(schemaFile);\n\n  if (options.shouldFail) {\n    assert.ok(result === false);\n    assert.ok(output !== undefined);\n    return output as unknown as string | undefined;\n  } else {\n    assert.ok(output === undefined);\n    assert.ok(result === true);\n  }\n\n  // writer.clear();\n}\n\n/// rover checks\nfunction isRoverAvailable(command: string): [boolean, string?] {\n  const cmd = os.platform() === 'win32' ? 'where' : 'which';\n  const result = spawnSync(cmd, [command], { encoding: 'utf8' });\n\n  return [result.status === 0, result.stdout.toString().trim()];\n}\n\nfunction compose(schemaPath: string, samplePath?: string) {\n  console.info('schemaPath', schemaPath);\n\n  const rover: [boolean, (string | undefined)?] = isRoverAvailable('rover');\n  if (!rover[0]) {\n    throw new Error('Rover is not available');\n  }\n\n  const supergraphFile = path.join(os.tmpdir(), 'supergraph.yaml');\n  let content: string = `\nfederation_version: =2.11.0\nsubgraphs:\n  test_spec:\n    routing_url: http://localhost # this value is ignored\n    schema:\n      file: ${schemaPath} # path to the schema file`;\n\n  if (samplePath) {\n    content += `\n  sample_spec:\n    routing_url: http://localhost # this value is ignored\n    schema:\n      file: ${samplePath} # path to the sample file\\`;\n  `;\n  }\n\n  fs.writeFileSync(supergraphFile, content, { encoding: 'utf-8', flag: 'w' });\n\n  const cmd = `${rover[1]} supergraph compose --config ${supergraphFile} --elv2-license accept`;\n\n  let output;\n  try {\n    output = execSync(cmd, { stdio: 'pipe' });\n    return [true, undefined];\n  } catch (error) {\n    return [false, _.get(error, 'message')];\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-conn-gen",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Library to generate Apollo connector schemas from OpenAPI specs or JSON payloads. Also includes a CLI to generate connectors from the command line.",
   "author": "Fernando @ Apollo",
   "license": "MIT",

package/readme.md

@@ -1,17 +1,18 @@
-# Generator library and CLI for Apollo Connectors 
+# Generator library and CLI for Apollo Connectors
 
 ## Introduction
 
 This project is a library designed to generate an an [Apollo Connector](https://www.apollographql.com/graphos/apollo-connectors) schema from either
+
 - an OpenAPI Specification (OAS) file (YAML or JSON), or
-- a set of JSON payloads. 
+- a set of JSON payloads.
 
 It also includes CLI tools to facilitate this conversion process.
 
 Key features:
 
-* Generates an Apollo Connector from an OAS specification, converting all types and `GET` entry points defined in the spec (*only* `GET` methods are supported for now)
-* Generates a schema based on a single or a collection of`JSON` files.
+- Generates an Apollo Connector from an OAS specification, converting all types and `GET` entry points defined in the spec (*only* `GET` methods are supported for now)
+- Generates a schema based on a single or a collection of`JSON` files.
 
 ## Changelog
 
@@ -19,7 +20,7 @@ See the [changelog](./CHANGELOG.md) for the latest changes.
 
 ## Prerequisites
 
-* [Node.js](https://nodejs.org/) version 18 or higher. Built using Typescript 5.1.6.
+- [Node.js](https://nodejs.org/) version 18 or higher. Built using Typescript 5.1.6.
 
 ## Installation
 
@@ -100,9 +101,9 @@ Will result in the following Apollo connector schema:
 
 ```graphql
 extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])
+  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])
   @link(
-    url: "https://specs.apollo.dev/connect/v0.1"
+    url: "https://specs.apollo.dev/connect/v0.2"
     import: ["@connect", "@source"]
   )
   @source(name: "api", http: { baseURL: "http://localhost:4010" })
@@ -132,8 +133,8 @@ type Query {
 
 The library provides two entry classes:
 
-* `OasGen`, for generating from OAS specifications, and
-* `JsonGen` for working with `JSON` files
+- `OasGen`, for generating from OAS specifications, and
+- `JsonGen` for working with `JSON` files
 
 ### Installation for JS/TS projects
 
@@ -156,8 +157,8 @@ import { JsonGen } from "apollo-conn-gen/json"
 
 Navigate using the `arrow` keys and select the fields you want to include in the generated connector schema using the 'x' key. Other options are:
 
-* `a` to select all fields in the current type, or
-* `n` key to deselect all fields.
+- `a` to select all fields in the current type, or
+- `n` key to deselect all fields.
 
 Once you've made your selection, press the `Enter` key to generate the Apollo Connector.
 
@@ -165,9 +166,9 @@ Here's an example of the output when selecting all the fields from `[GET] /pet/{
 
 ```graphql
 extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])
+  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])
   @link(
-    url: "https://specs.apollo.dev/connect/v0.1"
+    url: "https://specs.apollo.dev/connect/v0.2"
     import: ["@connect", "@source"]
   )
   @source(name: "api", http: { baseURL: "https://petstore3.swagger.io/v3" })
@@ -222,9 +223,9 @@ type Query {
 
 ## Options
 
-* `-i, --skip-validation`: Skip the validation step (default: `false`).
-* `-n, --skip-selection`: Generate all filtered paths without prompting for selection (default: `false`).
-* `-l, --list-paths`: Only list the paths that can be generated (default: `false`).
+- `-i, --skip-validation`: Skip the validation step (default: `false`).
+- `-n, --skip-selection`: Generate all filtered paths without prompting for selection (default: `false`).
+- `-l, --list-paths`: Only list the paths that can be generated (default: `false`).
 
 For a complete list of options, run:
 
@@ -309,9 +310,9 @@ will output the following:
 ```graphql
 --------------- Apollo Connector schema -----------------
 extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])
+  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])
   @link(
-    url: "https://specs.apollo.dev/connect/v0.1"
+    url: "https://specs.apollo.dev/connect/v0.2"
     import: ["@connect", "@source"]
   )
   @source(name: "api", http: { baseURL: "https://petstore3.swagger.io/v3" })
@@ -351,6 +352,7 @@ type Query {
 The tool supports the use of wildcards in selection sets. For example, to select all fields in a `type`, you can use the `*` character. For example, the two selection sets below will produce the same result:
 
 `./tests/resources/sample-petstore-selection.json`:
+
 ```json
 [
   "get:/pet/{petId}>res:r>ref:#/c/s/Pet>obj:#/c/s/Pet>prop:scalar:id",
@@ -361,6 +363,7 @@ The tool supports the use of wildcards in selection sets. For example, to select
 ```
 
 `./tests/resources/wildcard-petstore-selection.json`:
+
 ```json
 [
   "get:/pet/{petId}>res:r>ref:#/c/s/Pet>obj:#/c/s/Pet>*"
@@ -389,9 +392,9 @@ will output the following:
 
 ```graphql
 extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])
+  @link(url: "https://specs.apollo.dev/federation/v2.11", import: ["@key"])
   @link(
-    url: "https://specs.apollo.dev/connect/v0.1"
+    url: "https://specs.apollo.dev/connect/v0.2"
     import: ["@connect", "@source"]
   )
   @source(name: "api", http: { baseURL: "https://petstore3.swagger.io/v3" })
@@ -446,7 +449,6 @@ type Query {
 }
 ```
 
-
 This is particularly useful for specifications that are bound to change often.
 
 will select all fields in the `Pet` type:
@@ -489,8 +491,8 @@ Options:
 
 The CLI options affect what is generated by the tool. There are three possibilities:
 
-* generate the whole connector schema,
-* generate only the types for the schema, or
-* generate the selection set
+- generate the whole connector schema,
+- generate only the types for the schema, or
+- generate the selection set
 
 The `-o` (or `--output-file`) allows sending the output to a file instead of the console.