apollo-conn-gen 0.6.3 → 0.7.1

package/dist/cli/json.js

@@ -12,6 +12,7 @@ async function main(fileOrFolder, opts) {
     const jsonOptions = {
         federationVersion: opts.federationVersion,
         connectorSpecVersion: opts.connectorSpecVersion,
+        rootType: opts.rootType,
     };
     // generator
     let gen;
@@ -55,6 +56,7 @@ program
     .option('-o --output-file <file>', 'Where to write the output', 'stdout')
     .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)
     .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)
+    .option('--root-type <name>', 'Root type name for the generated schema (default: Root)')
     .parse(process.argv);
 const source = program.args[0];
 main(source, program.opts()).then(() => console.log('done'));

package/dist/cli/json.js.map

@@ -1 +1 @@
-{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/cli/json.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport { DEFAULT_VERSIONS } from '../versions.js';\nimport { JsonGen } from '../json/index.js';\n\nimport { Command } from 'commander';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\nasync function main(fileOrFolder: string, opts: any): Promise<void> {\n  console.log = () => {};\n\n  if (!fs.existsSync(fileOrFolder)) {\n    console.error(`File or folder not found: ${fileOrFolder}`);\n    return;\n  }\n\n  const jsonOptions = {\n    federationVersion: opts.federationVersion,\n    connectorSpecVersion: opts.connectorSpecVersion,\n  };\n\n  // generator\n  let gen: JsonGen;\n\n  // if it is a file\n  if (fs.lstatSync(fileOrFolder).isFile()) {\n    // read contents\n    const contents = fs.readFileSync(fileOrFolder, 'utf-8');\n    gen = JsonGen.fromReader(contents, jsonOptions);\n  } else {\n    // iterate through the files found in the target folder and load all the contents\n    gen = JsonGen.new(jsonOptions);\n    fs.readdirSync(fileOrFolder).forEach((file) => {\n      const contents = fs.readFileSync(fileOrFolder + '/' + file, 'utf-8');\n      gen.walkJson(contents);\n    });\n  }\n\n  let generated;\n  if (opts.schemaTypes) {\n    generated = gen.writeTypes();\n  } else if (opts.selectionSet) {\n    generated = gen.writeSelection();\n  } else {\n    generated = gen.generateSchema();\n  }\n\n  if (opts.outputFile !== 'stdout') {\n    fs.writeFileSync(opts.outputFile, generated);\n  } else {\n    console.info(generated);\n  }\n}\n\nconst program = new Command();\nprogram\n  .version('0.0.1')\n  .argument('<file|folder>', 'A single JSON file or a folder with a collection of JSON files')\n  .option('-s --schema-types', 'Output the GraphQL schema types', false)\n  .option('-e --selection-set', 'Output the Apollo Connector selection set', false)\n  .option('-o --output-file <file>', 'Where to write the output', 'stdout')\n  .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)\n  .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)\n  .parse(process.argv);\n\nconst source = program.args[0];\nmain(source, program.opts()).then(() => console.log('done'));\n"]}
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/cli/json.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport { DEFAULT_VERSIONS } from '../versions.js';\nimport { JsonGen } from '../json/index.js';\n\nimport { Command } from 'commander';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\nasync function main(fileOrFolder: string, opts: any): Promise<void> {\n  console.log = () => {};\n\n  if (!fs.existsSync(fileOrFolder)) {\n    console.error(`File or folder not found: ${fileOrFolder}`);\n    return;\n  }\n\n  const jsonOptions = {\n    federationVersion: opts.federationVersion,\n    connectorSpecVersion: opts.connectorSpecVersion,\n    rootType: opts.rootType,\n  };\n\n  // generator\n  let gen: JsonGen;\n\n  // if it is a file\n  if (fs.lstatSync(fileOrFolder).isFile()) {\n    // read contents\n    const contents = fs.readFileSync(fileOrFolder, 'utf-8');\n    gen = JsonGen.fromReader(contents, jsonOptions);\n  } else {\n    // iterate through the files found in the target folder and load all the contents\n    gen = JsonGen.new(jsonOptions);\n    fs.readdirSync(fileOrFolder).forEach((file) => {\n      const contents = fs.readFileSync(fileOrFolder + '/' + file, 'utf-8');\n      gen.walkJson(contents);\n    });\n  }\n\n  let generated;\n  if (opts.schemaTypes) {\n    generated = gen.writeTypes();\n  } else if (opts.selectionSet) {\n    generated = gen.writeSelection();\n  } else {\n    generated = gen.generateSchema();\n  }\n\n  if (opts.outputFile !== 'stdout') {\n    fs.writeFileSync(opts.outputFile, generated);\n  } else {\n    console.info(generated);\n  }\n}\n\nconst program = new Command();\nprogram\n  .version('0.0.1')\n  .argument('<file|folder>', 'A single JSON file or a folder with a collection of JSON files')\n  .option('-s --schema-types', 'Output the GraphQL schema types', false)\n  .option('-e --selection-set', 'Output the Apollo Connector selection set', false)\n  .option('-o --output-file <file>', 'Where to write the output', 'stdout')\n  .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)\n  .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)\n  .option('--root-type <name>', 'Root type name for the generated schema (default: Root)')\n  .parse(process.argv);\n\nconst source = program.args[0];\nmain(source, program.opts()).then(() => console.log('done'));\n"]}

package/dist/json/io/writer.d.ts

@@ -11,6 +11,7 @@ export declare class StringWriter implements IWriter {
 export interface ConnectorWriterOptions {
     federationVersion?: string;
     connectorSpecVersion?: string;
+    rootType?: string;
 }
 export declare class ConnectorWriter {
     static write(walker: JsonGen, writer: IWriter, options?: ConnectorWriterOptions): void;

package/dist/json/io/writer.js

@@ -1,4 +1,5 @@
 import { DEFAULT_VERSIONS } from '../../versions.js';
+import { sanitiseField, upperFirst } from '../walker/naming.js';
 export class StringWriter {
     builder = [];
     write(text) {
@@ -15,7 +16,7 @@ export class ConnectorWriter {
     static write(walker, writer, options) {
         this.writeConnector(writer, options);
         writer.write(walker.writeTypes());
-        this.writeQuery(walker, writer);
+        this.writeQuery(walker, writer, options);
     }
     static writeConnector(writer, options) {
         const federationVersion = options?.federationVersion || DEFAULT_VERSIONS.federationVersion;
@@ -30,10 +31,12 @@ export class ConnectorWriter {
   
 `);
     }
-    static writeQuery(walker, writer) {
+    static writeQuery(walker, writer, options) {
+        const fieldName = options?.rootType ? sanitiseField(options.rootType) : 'root';
+        const typeName = options?.rootType ? upperFirst(sanitiseField(options.rootType)) : 'Root';
         writer.write('\n' +
             `type Query {
-  root: Root
+  ${fieldName}: ${typeName}
     @connect(
       source: "api"
       http: { GET: "/test" }

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

@@ -1 +1 @@
-{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../src/json/io/writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAOrD,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;AAOD,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,MAAe,EAAE,MAAe,EAAE,OAAgC;QACpF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,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,EAAE,OAAgC;QAC7E,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,gBAAgB,CAAC,iBAAiB,CAAC;QAC3F,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,gBAAgB,CAAC,oBAAoB,CAAC;QACpG,MAAM,CAAC,KAAK,CAAC;oDACmC,iBAAiB;;6CAExB,oBAAoB;;;;;CAKhE,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 { DEFAULT_VERSIONS } from '../../versions.js';\nimport { 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 interface ConnectorWriterOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n}\n\nexport class ConnectorWriter {\n  public static write(walker: JsonGen, writer: IWriter, options?: ConnectorWriterOptions): void {\n    this.writeConnector(writer, options);\n    writer.write(walker.writeTypes());\n    this.writeQuery(walker, writer);\n  }\n\n  private static writeConnector(writer: IWriter, options?: ConnectorWriterOptions): void {\n    const federationVersion = options?.federationVersion || DEFAULT_VERSIONS.federationVersion;\n    const connectorSpecVersion = options?.connectorSpecVersion || DEFAULT_VERSIONS.connectorSpecVersion;\n    writer.write(`extend schema\n  @link(url: \"https://specs.apollo.dev/federation/${federationVersion}\", import: [\"@key\"])\n  @link(\n    url: \"https://specs.apollo.dev/connect/${connectorSpecVersion}\"\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":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAMhE,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;AAQD,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,MAAe,EAAE,MAAe,EAAE,OAAgC;QACpF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,MAAe,EAAE,OAAgC;QAC7E,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,gBAAgB,CAAC,iBAAiB,CAAC;QAC3F,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,gBAAgB,CAAC,oBAAoB,CAAC;QACpG,MAAM,CAAC,KAAK,CAAC;oDACmC,iBAAiB;;6CAExB,oBAAoB;;;;;CAKhE,CAAC,CAAC;IACD,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,MAAe,EAAE,MAAe,EAAE,OAAgC;QAC1F,MAAM,SAAS,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/E,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAE1F,MAAM,CAAC,KAAK,CACV,IAAI;YACF;IACJ,SAAS,KAAK,QAAQ;;;;qBAIL;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 { DEFAULT_VERSIONS } from '../../versions.js';\nimport { JsonGen } from '../walker/jsonGen.js';\nimport { sanitiseField, upperFirst } from '../walker/naming.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 interface ConnectorWriterOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n  rootType?: string;\n}\n\nexport class ConnectorWriter {\n  public static write(walker: JsonGen, writer: IWriter, options?: ConnectorWriterOptions): void {\n    this.writeConnector(writer, options);\n    writer.write(walker.writeTypes());\n    this.writeQuery(walker, writer, options);\n  }\n\n  private static writeConnector(writer: IWriter, options?: ConnectorWriterOptions): void {\n    const federationVersion = options?.federationVersion || DEFAULT_VERSIONS.federationVersion;\n    const connectorSpecVersion = options?.connectorSpecVersion || DEFAULT_VERSIONS.connectorSpecVersion;\n    writer.write(`extend schema\n  @link(url: \"https://specs.apollo.dev/federation/${federationVersion}\", import: [\"@key\"])\n  @link(\n    url: \"https://specs.apollo.dev/connect/${connectorSpecVersion}\"\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, options?: ConnectorWriterOptions): void {\n    const fieldName = options?.rootType ? sanitiseField(options.rootType) : 'root';\n    const typeName = options?.rootType ? upperFirst(sanitiseField(options.rootType)) : 'Root';\n\n    writer.write(\n      '\\n' +\n        `type Query {\n  ${fieldName}: ${typeName}\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/json/walker/jsonGen.d.ts

@@ -2,6 +2,7 @@ import { JsonContext } from '../index.js';
 export interface JsonGenOptions {
     federationVersion?: string;
     connectorSpecVersion?: string;
+    rootType?: string;
 }
 export declare class JsonGen {
     private readonly context;

package/dist/json/walker/jsonGen.js

@@ -98,7 +98,7 @@ export class JsonGen {
     // Walk the JSON provided as a string
     walkJson(json) {
         const rootElement = JSON.parse(json);
-        this.walkElement(this.context, null, 'root', rootElement);
+        this.walkElement(this.context, null, this.options.rootType ?? 'root', rootElement);
         trace(this.context, '   [walkSource]', 'types found: ' + this.context.getTypes().length);
     }
     // Walk an element in the JSON tree

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

@@ -1 +1 @@
-{"version":3,"file":"jsonGen.js","sourceRoot":"","sources":["../../../src/json/walker/jsonGen.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport _ from 'lodash';\nimport { DEFAULT_VERSIONS } from '../../versions.js';\nimport { ConnectorWriter, JsonArray, JsonContext, JsonObj, JsonScalar, JsonType, StringWriter } from '../index.js';\nimport { trace, warn } from './log/trace.js';\nimport { sanitiseField } from './naming.js';\n\nexport interface JsonGenOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n}\n\nexport class JsonGen {\n  private readonly context: JsonContext;\n  private readonly options: JsonGenOptions;\n\n  // Private constructor\n  private constructor(options: JsonGenOptions = {}) {\n    this.context = new JsonContext();\n    this.options = {\n      federationVersion: DEFAULT_VERSIONS.federationVersion,\n      connectorSpecVersion: DEFAULT_VERSIONS.connectorSpecVersion,\n      ...options,\n    };\n  }\n\n  public getContext(): JsonContext {\n    return this.context;\n  }\n\n  public static new(options?: JsonGenOptions): JsonGen {\n    return new JsonGen(options);\n  }\n\n  // Factory method from a JSON string\n  public static fromReader(json: string, options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    walker.walkJson(json);\n    return walker;\n  }\n\n  public static fromJsons(jsons: string[], options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    for (const json of jsons) {\n      walker.walkJson(json);\n    }\n    return walker;\n  }\n\n  public generateSchema(): string {\n    const writer = new StringWriter();\n    ConnectorWriter.write(this, writer, this.options);\n    return writer.flush();\n  }\n\n  // Writes selection using a given Writer\n  public writeSelection(indent: number = 6): string {\n    const writer = new StringWriter();\n    this.context.setIndent(indent);\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      root.select(this.context, writer);\n    }\n\n    return writer.flush();\n  }\n\n  // Writes all types in order using the provided Writer\n  public writeTypes(): string {\n    const writer = new StringWriter();\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      const orderedSet = new Set<JsonType>();\n      this.writeType(root, orderedSet);\n\n      const generatedSet = new Map<string, JsonType>();\n      orderedSet.forEach((t) => {\n        // Assumes t is an Obj\n        const obj = t as unknown as JsonObj;\n        let typeName = obj.getType();\n        if (generatedSet.has(typeName)) {\n          // If same type, skip generation\n          if (_.isEqual(obj, generatedSet.get(typeName))) {\n            return;\n          }\n          obj.setType(JsonGen.generateNewObjType(generatedSet, t, typeName));\n          typeName = obj.getType();\n        }\n        t.write(this.context, writer);\n        generatedSet.set(typeName, t);\n      });\n\n      console.log('orderedSet =', Array.from(orderedSet));\n    }\n\n    return writer.flush();\n  }\n\n  // Recursive helper to order types\n  private writeType(type: JsonType, orderedSet: Set<JsonType>): void {\n    if (type instanceof JsonObj) {\n      // Traverse children first\n      for (const child of Array.from((type as JsonObj).getFields().values())) {\n        this.writeType(child, orderedSet);\n      }\n      orderedSet.add(type);\n    } else if (type instanceof JsonArray) {\n      const arrayType = (type as JsonArray).getArrayType();\n      if (arrayType) {\n        this.writeType(arrayType, orderedSet);\n      }\n    }\n  }\n\n  // Walk the JSON provided as a string\n  public walkJson(json: string): void {\n    const rootElement = JSON.parse(json);\n    this.walkElement(this.context, null, 'root', rootElement);\n    trace(this.context, '   [walkSource]', 'types found: ' + this.context.getTypes().length);\n  }\n\n  // Walk an element in the JSON tree\n  private walkElement(context: JsonContext, parent: JsonType | null, name: string, element: any): JsonType {\n    trace(context, '-> [walkElement]', 'in: ' + name);\n    let result: JsonType;\n\n    if (typeof element === 'object' && !Array.isArray(element) && element !== null) {\n      // JSON object\n      result = this.walkObject(context, parent, name, element);\n      context.store(result);\n    } else if (Array.isArray(element)) {\n      result = this.walkArray(context, parent, name, element);\n    } else if (typeof element === 'string' || typeof element === 'number' || typeof element === 'boolean') {\n      result = this.walkPrimitive(context, parent, name, element);\n    } else if (element === null) {\n      // we'll treat null as a string\n      result = this.walkPrimitive(context, parent, name, 'string');\n    } else {\n      throw new Error(\"Cannot yet handle '\" + name + \"' of type \" + typeof element);\n    }\n\n    trace(context, '<- [walkElement]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON object\n  private walkObject(context: JsonContext, parent: JsonType | null, name: string, object: any): JsonObj {\n    trace(context, '-> [walkObject]', 'in: ' + name);\n    const result = new JsonObj(name, parent);\n    const fieldSet = Object.keys(object);\n    trace(context, '  [walkObject]', 'fieldSet: ' + fieldSet);\n\n    for (const field of fieldSet) {\n      trace(context, '  [walkObject]', 'field: ' + field);\n      const childElement = object[field];\n      const type = this.walkElement(context, result, field, childElement);\n      result.add(field, type);\n    }\n\n    trace(context, '<- [walkObject]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON array\n  private walkArray(context: JsonContext, parent: JsonType | null, name: string, array: any[]): JsonArray {\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    const result = new JsonArray(name, parent);\n    if (array.length > 0) {\n      const firstElement = array[0];\n      const arrayType = this.walkElement(context, parent, name, firstElement);\n      result.setArrayType(arrayType);\n    } else {\n      warn(context, '   [walkArray]', \"Array is empty -- cannot derive type for field '\" + name + \"'\");\n    }\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    return result;\n  }\n\n  // Walk a primitive JSON value\n  private walkPrimitive(_context: JsonContext, parent: JsonType | null, name: string, primitive: any): JsonScalar {\n    let result: JsonScalar;\n    if (typeof primitive === 'string') {\n      result = new JsonScalar(name, parent, 'String');\n    } else if (typeof primitive === 'boolean') {\n      result = new JsonScalar(name, parent, 'Boolean');\n    } else if (typeof primitive === 'number') {\n      result = new JsonScalar(name, parent, 'Int');\n    } else {\n      throw new Error('Cannot yet handle primitive: ' + primitive);\n    }\n    return result;\n  }\n\n  // Utility method for naming conflict resolution\n  private static generateNewObjType(generatedSet: Map<string, JsonType>, t: JsonType, typeName: string): string {\n    let newName: string;\n    let type: JsonType | null = t;\n    do {\n      const parent: JsonType | null = type.getParent();\n      const parentName = parent === null ? '' : sanitiseField(parent.getName()).replace(/^\\w/, (c) => c.toUpperCase());\n      const thisName = sanitiseField(typeName).replace(/^\\w/, (c) => c.toUpperCase());\n      newName = parentName + thisName;\n      type = parent;\n    } while (type !== null && generatedSet.has(newName));\n    return newName;\n  }\n}\n"]}
+{"version":3,"file":"jsonGen.js","sourceRoot":"","sources":["../../../src/json/walker/jsonGen.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAY,YAAY,EAAE,MAAM,aAAa,CAAC;AACnH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQ5C,MAAM,OAAO,OAAO;IACD,OAAO,CAAc;IACrB,OAAO,CAAiB;IAEzC,sBAAsB;IACtB,YAAoB,UAA0B,EAAE;QAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG;YACb,iBAAiB,EAAE,gBAAgB,CAAC,iBAAiB;YACrD,oBAAoB,EAAE,gBAAgB,CAAC,oBAAoB;YAC3D,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,OAAwB;QACxC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,oCAAoC;IAC7B,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,OAAwB;QAC7D,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,KAAe,EAAE,OAAwB;QAC/D,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,cAAc;QACnB,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAClC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,wCAAwC;IACjC,cAAc,CAAC,SAAiB,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,CAAC;QACjE,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,sDAAsD;IAC/C,UAAU;QACf,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAElC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,CAAC;QACjE,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,UAAU,GAAG,IAAI,GAAG,EAAY,CAAC;YACvC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAEjC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;YACjD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvB,sBAAsB;gBACtB,MAAM,GAAG,GAAG,CAAuB,CAAC;gBACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC7B,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC/B,gCAAgC;oBAChC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;wBAC/C,OAAO;oBACT,CAAC;oBACD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;oBACnE,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC;gBACD,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC9B,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,kCAAkC;IAC1B,SAAS,CAAC,IAAc,EAAE,UAAyB;QACzD,IAAI,IAAI,YAAY,OAAO,EAAE,CAAC;YAC5B,0BAA0B;YAC1B,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,IAAI,CAAE,IAAgB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;gBACvE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACpC,CAAC;YACD,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,IAAI,YAAY,SAAS,EAAE,CAAC;YACrC,MAAM,SAAS,GAAI,IAAkB,CAAC,YAAY,EAAE,CAAC;YACrD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IAED,qCAAqC;IAC9B,QAAQ,CAAC,IAAY;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,EAAE,WAAW,CAAC,CAAC;QACnF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;IAC3F,CAAC;IAED,mCAAmC;IAC3B,WAAW,CAAC,OAAoB,EAAE,MAAuB,EAAE,IAAY,EAAE,OAAY;QAC3F,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;QAClD,IAAI,MAAgB,CAAC;QAErB,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAC/E,cAAc;YACd,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;YACtG,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAC5B,+BAA+B;YAC/B,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,GAAG,YAAY,GAAG,OAAO,OAAO,CAAC,CAAC;QAChF,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,qBAAqB;IACb,UAAU,CAAC,OAAoB,EAAE,MAAuB,EAAE,IAAY,EAAE,MAAW;QACzF,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,GAAG,QAAQ,CAAC,CAAC;QAE1D,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,GAAG,KAAK,CAAC,CAAC;YACpD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;YACpE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,oBAAoB;IACZ,SAAS,CAAC,OAAoB,EAAE,MAAuB,EAAE,IAAY,EAAE,KAAY;QACzF,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YACxE,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,kDAAkD,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC;QACnG,CAAC;QACD,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8BAA8B;IACtB,aAAa,CAAC,QAAqB,EAAE,MAAuB,EAAE,IAAY,EAAE,SAAc;QAChG,IAAI,MAAkB,CAAC;QACvB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,OAAO,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1C,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YACzC,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,SAAS,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,gDAAgD;IACxC,MAAM,CAAC,kBAAkB,CAAC,YAAmC,EAAE,CAAW,EAAE,QAAgB;QAClG,IAAI,OAAe,CAAC;QACpB,IAAI,IAAI,GAAoB,CAAC,CAAC;QAC9B,GAAG,CAAC;YACF,MAAM,MAAM,GAAoB,IAAI,CAAC,SAAS,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACjH,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YAChF,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;YAChC,IAAI,GAAG,MAAM,CAAC;QAChB,CAAC,QAAQ,IAAI,KAAK,IAAI,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACrD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport _ from 'lodash';\nimport { DEFAULT_VERSIONS } from '../../versions.js';\nimport { ConnectorWriter, JsonArray, JsonContext, JsonObj, JsonScalar, JsonType, StringWriter } from '../index.js';\nimport { trace, warn } from './log/trace.js';\nimport { sanitiseField } from './naming.js';\n\nexport interface JsonGenOptions {\n  federationVersion?: string;\n  connectorSpecVersion?: string;\n  rootType?: string;\n}\n\nexport class JsonGen {\n  private readonly context: JsonContext;\n  private readonly options: JsonGenOptions;\n\n  // Private constructor\n  private constructor(options: JsonGenOptions = {}) {\n    this.context = new JsonContext();\n    this.options = {\n      federationVersion: DEFAULT_VERSIONS.federationVersion,\n      connectorSpecVersion: DEFAULT_VERSIONS.connectorSpecVersion,\n      ...options,\n    };\n  }\n\n  public getContext(): JsonContext {\n    return this.context;\n  }\n\n  public static new(options?: JsonGenOptions): JsonGen {\n    return new JsonGen(options);\n  }\n\n  // Factory method from a JSON string\n  public static fromReader(json: string, options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    walker.walkJson(json);\n    return walker;\n  }\n\n  public static fromJsons(jsons: string[], options?: JsonGenOptions): JsonGen {\n    const walker = new JsonGen(options);\n    for (const json of jsons) {\n      walker.walkJson(json);\n    }\n    return walker;\n  }\n\n  public generateSchema(): string {\n    const writer = new StringWriter();\n    ConnectorWriter.write(this, writer, this.options);\n    return writer.flush();\n  }\n\n  // Writes selection using a given Writer\n  public writeSelection(indent: number = 6): string {\n    const writer = new StringWriter();\n    this.context.setIndent(indent);\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      root.select(this.context, writer);\n    }\n\n    return writer.flush();\n  }\n\n  // Writes all types in order using the provided Writer\n  public writeTypes(): string {\n    const writer = new StringWriter();\n\n    const types = this.context.getTypes();\n    const root = types.find((t: JsonType) => t.getParent() === null);\n    if (root) {\n      const orderedSet = new Set<JsonType>();\n      this.writeType(root, orderedSet);\n\n      const generatedSet = new Map<string, JsonType>();\n      orderedSet.forEach((t) => {\n        // Assumes t is an Obj\n        const obj = t as unknown as JsonObj;\n        let typeName = obj.getType();\n        if (generatedSet.has(typeName)) {\n          // If same type, skip generation\n          if (_.isEqual(obj, generatedSet.get(typeName))) {\n            return;\n          }\n          obj.setType(JsonGen.generateNewObjType(generatedSet, t, typeName));\n          typeName = obj.getType();\n        }\n        t.write(this.context, writer);\n        generatedSet.set(typeName, t);\n      });\n\n      console.log('orderedSet =', Array.from(orderedSet));\n    }\n\n    return writer.flush();\n  }\n\n  // Recursive helper to order types\n  private writeType(type: JsonType, orderedSet: Set<JsonType>): void {\n    if (type instanceof JsonObj) {\n      // Traverse children first\n      for (const child of Array.from((type as JsonObj).getFields().values())) {\n        this.writeType(child, orderedSet);\n      }\n      orderedSet.add(type);\n    } else if (type instanceof JsonArray) {\n      const arrayType = (type as JsonArray).getArrayType();\n      if (arrayType) {\n        this.writeType(arrayType, orderedSet);\n      }\n    }\n  }\n\n  // Walk the JSON provided as a string\n  public walkJson(json: string): void {\n    const rootElement = JSON.parse(json);\n    this.walkElement(this.context, null, this.options.rootType ?? 'root', rootElement);\n    trace(this.context, '   [walkSource]', 'types found: ' + this.context.getTypes().length);\n  }\n\n  // Walk an element in the JSON tree\n  private walkElement(context: JsonContext, parent: JsonType | null, name: string, element: any): JsonType {\n    trace(context, '-> [walkElement]', 'in: ' + name);\n    let result: JsonType;\n\n    if (typeof element === 'object' && !Array.isArray(element) && element !== null) {\n      // JSON object\n      result = this.walkObject(context, parent, name, element);\n      context.store(result);\n    } else if (Array.isArray(element)) {\n      result = this.walkArray(context, parent, name, element);\n    } else if (typeof element === 'string' || typeof element === 'number' || typeof element === 'boolean') {\n      result = this.walkPrimitive(context, parent, name, element);\n    } else if (element === null) {\n      // we'll treat null as a string\n      result = this.walkPrimitive(context, parent, name, 'string');\n    } else {\n      throw new Error(\"Cannot yet handle '\" + name + \"' of type \" + typeof element);\n    }\n\n    trace(context, '<- [walkElement]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON object\n  private walkObject(context: JsonContext, parent: JsonType | null, name: string, object: any): JsonObj {\n    trace(context, '-> [walkObject]', 'in: ' + name);\n    const result = new JsonObj(name, parent);\n    const fieldSet = Object.keys(object);\n    trace(context, '  [walkObject]', 'fieldSet: ' + fieldSet);\n\n    for (const field of fieldSet) {\n      trace(context, '  [walkObject]', 'field: ' + field);\n      const childElement = object[field];\n      const type = this.walkElement(context, result, field, childElement);\n      result.add(field, type);\n    }\n\n    trace(context, '<- [walkObject]', 'out: ' + name);\n    return result;\n  }\n\n  // Walk a JSON array\n  private walkArray(context: JsonContext, parent: JsonType | null, name: string, array: any[]): JsonArray {\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    const result = new JsonArray(name, parent);\n    if (array.length > 0) {\n      const firstElement = array[0];\n      const arrayType = this.walkElement(context, parent, name, firstElement);\n      result.setArrayType(arrayType);\n    } else {\n      warn(context, '   [walkArray]', \"Array is empty -- cannot derive type for field '\" + name + \"'\");\n    }\n    trace(context, '-> [walkArray]', 'in: ' + name);\n    return result;\n  }\n\n  // Walk a primitive JSON value\n  private walkPrimitive(_context: JsonContext, parent: JsonType | null, name: string, primitive: any): JsonScalar {\n    let result: JsonScalar;\n    if (typeof primitive === 'string') {\n      result = new JsonScalar(name, parent, 'String');\n    } else if (typeof primitive === 'boolean') {\n      result = new JsonScalar(name, parent, 'Boolean');\n    } else if (typeof primitive === 'number') {\n      result = new JsonScalar(name, parent, 'Int');\n    } else {\n      throw new Error('Cannot yet handle primitive: ' + primitive);\n    }\n    return result;\n  }\n\n  // Utility method for naming conflict resolution\n  private static generateNewObjType(generatedSet: Map<string, JsonType>, t: JsonType, typeName: string): string {\n    let newName: string;\n    let type: JsonType | null = t;\n    do {\n      const parent: JsonType | null = type.getParent();\n      const parentName = parent === null ? '' : sanitiseField(parent.getName()).replace(/^\\w/, (c) => c.toUpperCase());\n      const thisName = sanitiseField(typeName).replace(/^\\w/, (c) => c.toUpperCase());\n      newName = parentName + thisName;\n      type = parent;\n    } while (type !== null && generatedSet.has(newName));\n    return newName;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-conn-gen",
-  "version": "0.6.3",
+  "version": "0.7.1",
   "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",
@@ -43,8 +43,8 @@
     "lint": "eslint",
     "prepare": "npm run build",
     "prepublishOnly": "npm run build && npm test && publint",
-    "preversion": "npm run lint && npm test",
-    "version": "npm run format && git add -A src",
+    "preversion": "npm run lint",
+    "version": "npm run format && git add src",
     "postversion": "git push && git push --tags",
     "yalc:update": "yalc push --scripts --update --replace"
   },

package/readme.md

@@ -210,7 +210,8 @@ const genFromData = await OasGen.fromData(fileBuffer, { skipValidation: true });
 const jsonData = '{"user": {"id": 1, "name": "John", "email": "john@example.com"}}';
 const jsonGen = JsonGen.fromReader(jsonData, {
   federationVersion: 'v2.11',
-  connectorSpecVersion: 'v0.2'
+  connectorSpecVersion: 'v0.2',
+  rootType: 'User' // optional: customizes root type (default: 'Root')
 });
 
 // Generate full Apollo Connector schema
@@ -278,7 +279,8 @@ The `JsonGen` class supports incremental JSON processing and multiple output for
 // Incremental JSON processing
 const gen = JsonGen.new({
   federationVersion: 'v2.11',
-  connectorSpecVersion: 'v0.2'
+  connectorSpecVersion: 'v0.2',
+  rootType: 'User' // optional: root type becomes 'User', nested types become 'UserAddress', etc.
 });
 
 // Add JSON data incrementally (merges structures)