apollo-conn-gen 0.5.1 → 0.6.0

package/dist/cli/oas-helpers/index.js

@@ -9,7 +9,8 @@ export function generateFromSelection(opts, gen) {
         console.error('Invalid selections file');
         return;
     }
-    console.info('--------------- Apollo Connector schema -----------------');
+    console.info('# --------------- Apollo Connector schema -----------------');
+    console.info(`# Generated at: ${new Date().toISOString()}`);
     console.info(gen.generateSchema(selections));
     return;
 }

package/dist/cli/oas-helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/oas-helpers/index.ts"],"names":[],"mappings":"AAAA,sBAAsB;AACtB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAe,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,8DAA8D;AAC9D,MAAM,UAAU,qBAAqB,CAAC,IAAS,EAAE,GAAW;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC3F,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;IAC1E,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7C,OAAO;AACT,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAS,EAAE,KAAc;IAC7E,SAAS,UAAU,CAAC,IAAY;QAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAe,CAAC;QAEpB,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;YAC7B,oCAAoC;YACnC,IAAiB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,wEAAwE;gBACxE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,IAAI,CAAE,KAAc,CAAC,OAAO,EAAE,CAAC;oBAC7B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,WAAW,CAAC;QACjB,OAAO,EAAE,GAAG,CAAC,OAAQ;QACrB,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,6DAA6D;QACtE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;AACL,CAAC","sourcesContent":["/// internal functions\nimport fs from 'fs';\nimport { Type, IType, Composed } from '../../oas/nodes/internal.js';\nimport { OasGen } from '../../oas/oasGen.js';\nimport { typesPrompt } from '../../oas/prompts/prompt.js';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function generateFromSelection(opts: any, gen: OasGen) {\n  const selections = JSON.parse(fs.readFileSync(opts.loadSelections, { encoding: 'utf-8' }));\n  if (!Array.isArray(selections)) {\n    console.error('Invalid selections file');\n    return;\n  }\n\n  console.info('--------------- Apollo Connector schema -----------------');\n  console.info(gen.generateSchema(selections));\n  return;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function promptForSelection(gen: OasGen, opts: any, types: IType[]) {\n  function expandType(type?: IType) {\n    if (!type) {\n      return types;\n    }\n\n    let result: IType[];\n\n    if (type instanceof Composed) {\n      // make sure we gather all the props\n      (type as Composed).consolidate([]);\n      result = Array.from(type.props.values());\n    } else {\n      // top level paths\n      result = gen.expand(type);\n\n      if (result.length === 1) {\n        // we are checking for a ref so we can go straight to where its pointing\n        const child = result[0];\n\n        if (!(child as Type).visited) {\n          child.visit(gen.context!);\n        }\n      }\n    }\n\n    return result;\n  }\n\n  return typesPrompt({\n    context: gen.context!,\n    expandFn: expandType,\n    message: 'Navigate spec and select the fields to use in the connector',\n    pageSize: parseInt(opts.pageSize, 10),\n    types: types,\n  });\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/oas-helpers/index.ts"],"names":[],"mappings":"AAAA,sBAAsB;AACtB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAe,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,8DAA8D;AAC9D,MAAM,UAAU,qBAAqB,CAAC,IAAS,EAAE,GAAW;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC3F,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IAC5E,OAAO,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7C,OAAO;AACT,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAS,EAAE,KAAc;IAC7E,SAAS,UAAU,CAAC,IAAY;QAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAe,CAAC;QAEpB,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;YAC7B,oCAAoC;YACnC,IAAiB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,wEAAwE;gBACxE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,IAAI,CAAE,KAAc,CAAC,OAAO,EAAE,CAAC;oBAC7B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,WAAW,CAAC;QACjB,OAAO,EAAE,GAAG,CAAC,OAAQ;QACrB,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,6DAA6D;QACtE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;AACL,CAAC","sourcesContent":["/// internal functions\nimport fs from 'fs';\nimport { Type, IType, Composed } from '../../oas/nodes/internal.js';\nimport { OasGen } from '../../oas/oasGen.js';\nimport { typesPrompt } from '../../oas/prompts/prompt.js';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function generateFromSelection(opts: any, gen: OasGen) {\n  const selections = JSON.parse(fs.readFileSync(opts.loadSelections, { encoding: 'utf-8' }));\n  if (!Array.isArray(selections)) {\n    console.error('Invalid selections file');\n    return;\n  }\n\n  console.info('# --------------- Apollo Connector schema -----------------');\n  console.info(`# Generated at: ${new Date().toISOString()}`);\n  console.info(gen.generateSchema(selections));\n  return;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function promptForSelection(gen: OasGen, opts: any, types: IType[]) {\n  function expandType(type?: IType) {\n    if (!type) {\n      return types;\n    }\n\n    let result: IType[];\n\n    if (type instanceof Composed) {\n      // make sure we gather all the props\n      (type as Composed).consolidate([]);\n      result = Array.from(type.props.values());\n    } else {\n      // top level paths\n      result = gen.expand(type);\n\n      if (result.length === 1) {\n        // we are checking for a ref so we can go straight to where its pointing\n        const child = result[0];\n\n        if (!(child as Type).visited) {\n          child.visit(gen.context!);\n        }\n      }\n    }\n\n    return result;\n  }\n\n  return typesPrompt({\n    context: gen.context!,\n    expandFn: expandType,\n    message: 'Navigate spec and select the fields to use in the connector',\n    pageSize: parseInt(opts.pageSize, 10),\n    types: types,\n  });\n}\n"]}

package/dist/cli/oas.js

@@ -32,7 +32,7 @@ async function main(sourceFile, opts) {
     const gen = await OasGen.fromFile(sourceFile, {
         ...opts,
         consolidateUnions: true,
-        showParentInSelections: true,
+        showParentInSelections: false,
         federationVersion: opts.federationVersion,
         connectorSpecVersion: opts.connectorSpecVersion,
         postName: opts.postName,
@@ -63,9 +63,9 @@ async function main(sourceFile, opts) {
         console = originalConsole;
     console.info(gen.generateSchema(paths));
     if (opts.printSelections) {
-        console.info('--------------- Selections -----------------');
+        console.info('# --------------- Selections -----------------');
         console.info(gen.selections);
-        console.info('--------------- Paths -----------------');
+        console.info('# --------------- Paths -----------------');
         console.info('paths =', JSON.stringify(paths, null, 2));
     }
 }
@@ -81,7 +81,6 @@ program
     .option('-s --load-selections <file>', 'Load a JSON file with field selections (other options are ignored)')
     .option('-v --verbose', 'Log all messages from generator')
     .option('-m --print-selections', 'Print selections from generator')
-    .option('-r --post-name <pattern>', 'Apply a regex to transform operation names (e.g., "apiV1(.*):api_v1_$1" to convert "apiV1SomeOperation" to "api_v1_SomeOperation")')
     .option('-t --transform-rules <file>', 'Load transform rules from a JSON file to apply multiple name transformations')
     .option('--federation-version <version>', 'Federation version to use', DEFAULT_VERSIONS.federationVersion)
     .option('--connector-spec-version <version>', 'Connector spec version to use', DEFAULT_VERSIONS.connectorSpecVersion)

package/dist/cli/oas.js.map

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

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

@@ -7,6 +7,7 @@ export declare class Factory {
     static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType;
     private static createScalarType;
     private static createContainerType;
+    private static isMapSchema;
     private static createArrayType;
     static fromProp(context: OasContext, parent: IType, propName: string, inputSchema: SchemaObject | ReferenceObject): Prop;
     static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType;

package/dist/oas/nodes/factory.js

@@ -1,4 +1,4 @@
-import { Arr, Body, CircularRef, Composed, Delete, En, Get, Obj, Param, Patch, Post, PropArray, PropCircRef, PropComp, PropObj, PropScalar, Put, Res, Scalar, T, Union, PropEn, } from './internal.js';
+import { Arr, Body, CircularRef, Composed, Delete, En, Get, Map, Obj, Param, Patch, Post, PropArray, PropCircRef, PropComp, PropMap, PropObj, PropScalar, Put, Res, Scalar, T, Union, PropEn, } from './internal.js';
 import _ from 'lodash';
 import { warn } from '../log/trace.js';
 import { GqlUtils } from '../utils/gql.js';
@@ -81,6 +81,10 @@ export class Factory {
             const oneOfs = schema.oneOf || [];
             result = new Union(parent, ref || _.get(schema, 'name'), oneOfs);
         }
+        // map (object with only additionalProperties)
+        else if (this.isMapSchema(schema)) {
+            result = new Map(parent, ref || _.get(schema, 'name') || null, schema);
+        }
         // or a plain obj
         else {
             if (!schema.properties) {
@@ -94,6 +98,14 @@ export class Factory {
         }
         return result;
     }
+    static isMapSchema(schema) {
+        // A schema is considered a map if:
+        // 1. It has additionalProperties defined as an object
+        // 2. It has no explicit properties OR has empty properties
+        return Boolean(schema.additionalProperties &&
+            typeof schema.additionalProperties === 'object' &&
+            (!schema.properties || _.isEmpty(schema.properties)));
+    }
     static createArrayType(parent, schema, context) {
         // Array schema case.
         let parentName = parent.name;
@@ -152,6 +164,12 @@ export class Factory {
                     propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);
                     prop = propComp;
                 }
+                else if (this.isMapSchema(schemaObj)) {
+                    console.log('isMapSchema', schemaObj);
+                    // Map property: object with only additionalProperties
+                    const mapType = new Map(parent, ref || propName, schemaObj);
+                    prop = new PropMap(parent, propName, schemaObj, mapType);
+                }
                 else if (schemaObj.properties != null) {
                     const propType = new Obj(parent, ref || propName, schemaObj);
                     prop = new PropObj(parent, propName, schemaObj, propType);
@@ -191,6 +209,11 @@ export class Factory {
             propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);
             prop = propComp;
         }
+        else if (this.isMapSchema(schemaObj)) {
+            // Map property: object with only additionalProperties (no explicit type)
+            const mapType = new Map(parent, ref || propName, schemaObj);
+            prop = new PropMap(parent, propName, schemaObj, mapType);
+        }
         else if (schemaObj.properties != null) {
             const propType = new Obj(parent, ref || propName, schemaObj);
             prop = new PropObj(parent, propName, schemaObj, propType);

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 (\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"]}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/oas/nodes/factory.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Arr,\n  Body,\n  CircularRef,\n  Composed,\n  Delete,\n  En,\n  Get,\n  IType,\n  Map,\n  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropMap,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\n  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    // map (object with only additionalProperties)\n    else if (this.isMapSchema(schema)) {\n      result = new Map(parent, ref || _.get(schema, 'name') || null, schema);\n    }\n    // or a plain obj\n    else {\n      if (!schema.properties) {\n        warn(\n          null,\n          '[factory]',\n          'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot(),\n        );\n      }\n\n      result = new Obj(parent, ref || _.get(schema, 'name') || null, schema);\n\n      // 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 isMapSchema(schema: SchemaObject): boolean {\n    // A schema is considered a map if:\n    // 1. It has additionalProperties defined as an object\n    // 2. It has no explicit properties OR has empty properties\n    return Boolean(\n      schema.additionalProperties &&\n        typeof schema.additionalProperties === 'object' &&\n        (!schema.properties || _.isEmpty(schema.properties)),\n    );\n  }\n\n  private static createArrayType(parent: IType | Res, schema: SchemaObject | null, context: OasContext) {\n    // Array schema case.\n    let parentName = parent.name;\n    if (parent instanceof Res) {\n      const get = parent.parent as Get; // Assume parent.parent is a GetOp.\n      parentName = _.upperFirst(get.getGqlOpName());\n    }\n\n    const arr = new Arr(parent, parentName);\n    const items = _.get(schema, 'items') as ArraySchemaObject;\n    arr.items = items;\n\n    // TODO: check this\n    arr.itemsType = Factory.fromSchema(context, arr, items);\n    arr.add(arr.itemsType); // add it to the children\n\n    return arr;\n  }\n\n  public static fromProp(\n    context: OasContext,\n    parent: IType,\n    propName: string,\n    inputSchema: SchemaObject | ReferenceObject,\n  ): Prop {\n    if (!inputSchema) {\n      throw new Error(`Should have a schema defined for property '${propName}' (parent: '${parent.name}')`);\n    }\n\n    let schema: SchemaObject | ReferenceObject | null = inputSchema;\n\n    let prop: Prop;\n    let ref: string | undefined;\n\n    if (!_.get(schema, 'type') && '$ref' in schema) {\n      ref = (schema as ReferenceObject).$ref;\n      schema = context.lookupRef(ref);\n      // this was a prop ref, but now needs to be returned as the ref directly?\n      // prop = new PropRef(parent, propName, schema, ref);\n      // return prop;\n    }\n\n    // uses the type of the schema to find out what kind of property it is\n    const schemaObj = schema as SchemaObject;\n    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 (this.isMapSchema(schemaObj)) {\n          console.log('isMapSchema', schemaObj);\n          // Map property: object with only additionalProperties\n          const mapType: Map = new Map(parent, ref || propName, schemaObj);\n          prop = new PropMap(parent, propName, schemaObj, mapType);\n        } else if (schemaObj.properties != null) {\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        } else {\n          // the type of the property will be an object, which needs to be added as a child\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        }\n      } else if (ref && schemaObj?.enum) {\n        // 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 (this.isMapSchema(schemaObj)) {\n      // Map property: object with only additionalProperties (no explicit type)\n      const mapType: Map = new Map(parent, ref || propName, schemaObj);\n      prop = new PropMap(parent, propName, schemaObj, mapType);\n    } else if (schemaObj.properties != null) {\n      const propType: IType = new Obj(parent, ref || propName, schemaObj);\n      prop = new PropObj(parent, propName, schemaObj, propType);\n    }\n    // default case, we don't know what to do so we'll create a scalar of type JSON\n    else {\n      prop = new PropScalar(parent, propName, 'JSON', schemaObj);\n    }\n\n    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

@@ -119,9 +119,9 @@ export class Get extends Type {
         // If the response has a content property, we need to find the JSON content.
         else if (content) {
             const availableKeys = _.keys(response.content);
-            warn(context, `  [${code}]`, `Available content types: ${availableKeys.join(', ')}`);
+            trace(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'}`);
+            trace(context, `  [${code}]`, `Matched JSON key: ${keys || 'none'}`);
             const json = keys ? response.content[keys] : undefined;
             if (!json) {
                 warn(context, `  [${code}]`, 'No JSON content found!');

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

@@ -1 +1 @@
-{"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    this.writeOpName(context, writer);\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 writeOpName(context: OasContext, writer: Writer): void {\n    let name = this.getGqlOpName();\n\n    // Use the new name mapper if available, otherwise fall back to legacy postName\n    if (context.generateOptions.mapper) {\n      name = context.generateOptions.mapper.operationName(name);\n    }\n\n    writer.write('  ').write(_.lowerFirst(name));\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"]}
+{"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    this.writeOpName(context, writer);\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 writeOpName(context: OasContext, writer: Writer): void {\n    let name = this.getGqlOpName();\n\n    // Use the new name mapper if available, otherwise fall back to legacy postName\n    if (context.generateOptions.mapper) {\n      name = context.generateOptions.mapper.operationName(name);\n    }\n\n    writer.write('  ').write(_.lowerFirst(name));\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      trace(context, `  [${code}]`, `Available content types: ${availableKeys.join(', ')}`);\n      const keys = _.first(availableKeys.filter((k) => /^application\\/(?:.*\\+)?json/i.test(k)));\n      trace(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/internal.d.ts

@@ -24,5 +24,7 @@ export { PropComp } from './propComp.js';
 export { PropCircRef } from './propCircRef.js';
 export { PropEn } from './propEn.js';
 export { PropScalar } from './propScalar.js';
+export { Map } from './map.js';
+export { PropMap } from './propMap.js';
 export { T } from './typeUtils.js';
 export { type Op } from './op.js';

package/dist/oas/nodes/internal.js

@@ -23,5 +23,7 @@ export { PropComp } from './propComp.js';
 export { PropCircRef } from './propCircRef.js';
 export { PropEn } from './propEn.js';
 export { PropScalar } from './propScalar.js';
+export { Map } from './map.js';
+export { PropMap } from './propMap.js';
 export { T } from './typeUtils.js';
 //# sourceMappingURL=internal.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/oas/nodes/internal.ts"],"names":[],"mappings":"AA+BA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC","sourcesContent":["// -- internal.js --\nimport { IType } from './iType.js';\nimport { Type } from './type.js';\nimport { Prop } from './prop.js';\nimport { Param } from './param.js';\nimport { PropArray } from './propArray.js';\nimport { PropObj } from './propObj.js';\nimport { PropComp } from './propComp.js';\nimport { PropCircRef } from './propCircRef.js';\nimport { PropEn } from './propEn.js';\nimport { PropScalar } from './propScalar.js';\nimport { ReferenceObject } from './referenceObject.js';\nimport { Arr } from './arr.js';\nimport { CircularRef } from './circularRef.js';\nimport { Composed } from './comp.js';\nimport { En } from './en.js';\nimport { Factory } from './factory.js';\nimport { Get } from './get.js';\nimport { Post } from './post.js';\nimport { Put } from './put.js';\nimport { Patch } from './patch.js';\nimport { Delete } from './delete.js';\nimport { Body } from './body.js';\nimport { Obj } from './obj.js';\nimport { Ref } from './ref.js';\nimport { Res } from './res.js';\nimport { Scalar } from './scalar.js';\nimport { Union } from './union.js';\nimport { T } from './typeUtils.js';\nimport { Op } from './op.js';\n\nexport * from './iType.js';\nexport { Type } from './type.js';\nexport { type ReferenceObject } from './referenceObject.js';\nexport { Prop } from './prop.js';\nexport { Param } from './param.js';\nexport { Arr } from './arr.js';\nexport { CircularRef } from './circularRef.js';\nexport { Composed } from './comp.js';\nexport { En } from './en.js';\nexport { Factory } from './factory.js';\nexport { Get } from './get.js';\nexport { Post } from './post.js';\nexport { Put } from './put.js';\nexport { Patch } from './patch.js';\nexport { Delete } from './delete.js';\nexport { Body } from './body.js';\nexport { Obj } from './obj.js';\nexport { Res } from './res.js';\nexport { Scalar } from './scalar.js';\nexport { Union } from './union.js';\nexport { PropArray } from './propArray.js';\nexport { PropObj } from './propObj.js';\nexport { PropComp } from './propComp.js';\nexport { PropCircRef } from './propCircRef.js';\nexport { PropEn } from './propEn.js';\nexport { PropScalar } from './propScalar.js';\nexport { T } from './typeUtils.js';\nexport { type Op } from './op.js';\n"]}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/oas/nodes/internal.ts"],"names":[],"mappings":"AAiCA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC","sourcesContent":["// -- internal.js --\nimport { IType } from './iType.js';\nimport { Type } from './type.js';\nimport { Prop } from './prop.js';\nimport { Param } from './param.js';\nimport { PropArray } from './propArray.js';\nimport { PropObj } from './propObj.js';\nimport { PropComp } from './propComp.js';\nimport { PropCircRef } from './propCircRef.js';\nimport { PropEn } from './propEn.js';\nimport { PropScalar } from './propScalar.js';\nimport { ReferenceObject } from './referenceObject.js';\nimport { Arr } from './arr.js';\nimport { CircularRef } from './circularRef.js';\nimport { Composed } from './comp.js';\nimport { En } from './en.js';\nimport { Factory } from './factory.js';\nimport { Get } from './get.js';\nimport { Post } from './post.js';\nimport { Put } from './put.js';\nimport { Patch } from './patch.js';\nimport { Delete } from './delete.js';\nimport { Body } from './body.js';\nimport { Obj } from './obj.js';\nimport { Ref } from './ref.js';\nimport { Res } from './res.js';\nimport { Scalar } from './scalar.js';\nimport { Union } from './union.js';\nimport { Map } from './map.js';\nimport { PropMap } from './propMap.js';\nimport { T } from './typeUtils.js';\nimport { Op } from './op.js';\n\nexport * from './iType.js';\nexport { Type } from './type.js';\nexport { type ReferenceObject } from './referenceObject.js';\nexport { Prop } from './prop.js';\nexport { Param } from './param.js';\nexport { Arr } from './arr.js';\nexport { CircularRef } from './circularRef.js';\nexport { Composed } from './comp.js';\nexport { En } from './en.js';\nexport { Factory } from './factory.js';\nexport { Get } from './get.js';\nexport { Post } from './post.js';\nexport { Put } from './put.js';\nexport { Patch } from './patch.js';\nexport { Delete } from './delete.js';\nexport { Body } from './body.js';\nexport { Obj } from './obj.js';\nexport { Res } from './res.js';\nexport { Scalar } from './scalar.js';\nexport { Union } from './union.js';\nexport { PropArray } from './propArray.js';\nexport { PropObj } from './propObj.js';\nexport { PropComp } from './propComp.js';\nexport { PropCircRef } from './propCircRef.js';\nexport { PropEn } from './propEn.js';\nexport { PropScalar } from './propScalar.js';\nexport { Map } from './map.js';\nexport { PropMap } from './propMap.js';\nexport { T } from './typeUtils.js';\nexport { type Op } from './op.js';\n"]}

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

@@ -0,0 +1,17 @@
+import { IType, Type } from './internal.js';
+import { SchemaObject } from 'oas/types';
+import { OasContext } from '../oasContext.js';
+import { Writer } from '../io/writer.js';
+export declare class Map extends Type {
+    schema: SchemaObject;
+    valueType?: IType;
+    constructor(parent: IType | undefined, name: string, schema: SchemaObject);
+    forPrompt(_context: OasContext): string;
+    get id(): string;
+    visit(context: OasContext): void;
+    generate(context: OasContext, writer: Writer, selection: string[]): void;
+    select(context: OasContext, writer: Writer, selection: string[]): void;
+    private visitAdditionalProperties;
+    dependencies(): IType[];
+    private updateName;
+}

package/dist/oas/nodes/map.js

@@ -0,0 +1,132 @@
+import { Arr, Factory, Type, T, Scalar } from './internal.js';
+import { trace } from '../log/trace.js';
+import { Naming } from '../utils/naming.js';
+export class Map extends Type {
+    schema;
+    valueType;
+    constructor(parent, name, schema) {
+        super(parent, name);
+        this.schema = schema;
+        this.updateName();
+    }
+    forPrompt(_context) {
+        return `[map] ${Naming.getRefName(this.name)}`;
+    }
+    get id() {
+        return `map:${this.kind}:${this.name}`;
+    }
+    visit(context) {
+        if (this.visited) {
+            return;
+        }
+        context.enter(this);
+        trace(context, '-> [map:visit]', 'in ' + this.name);
+        this.visitAdditionalProperties(context);
+        this.visited = true;
+        if (this.name) {
+            if (!T.isRef(this.name) && context.types.has(this.name)) {
+                // Handle name conflict similar to Obj
+            }
+            else {
+                context.store(this.name, this);
+            }
+        }
+        trace(context, '<- [map:visit]', 'out ' + this.name);
+        context.leave(this);
+    }
+    generate(context, writer, selection) {
+        if (!this.valueType) {
+            return;
+        }
+        if (context.inContextOf('Res', this)) {
+            writer.write(Naming.genTypeName(this.name));
+            return;
+        }
+        context.enter(this);
+        trace(context, '-> [map::generate]', `-> in: ${this.name}`);
+        const sanitised = Naming.genTypeName(this.name);
+        const refName = Naming.getRefName(this.name);
+        writer
+            .write(this.kind + ' ')
+            .write(sanitised === refName ? refName : sanitised)
+            .write(this.nameSuffix())
+            .write(' {\n');
+        // Generate the map as an array of key-value pairs
+        writer
+            .write('  key: String\n') // Keys are always present in maps, but not necessarily required in schema
+            .write('  value: ');
+        // Write the value type name without hardcoded required markers
+        if (this.valueType) {
+            if (this.valueType instanceof Arr) {
+                // For arrays, generate [ItemType] format (let the array type handle its own nullability)
+                if (this.valueType.itemsType && this.valueType.itemsType.name) {
+                    writer.write('[' + Naming.genTypeName(this.valueType.itemsType.name) + ']');
+                }
+                else {
+                    writer.write('[JSON]');
+                }
+            }
+            else {
+                // For other types, use the type name directly without hardcoded !
+                writer.write(Naming.genTypeName(this.valueType.name));
+            }
+        }
+        else {
+            writer.write('JSON');
+        }
+        writer.write('\n}\n\n');
+        trace(context, '<- [map::generate]', `-> out: ${this.name}`);
+        context.leave(this);
+    }
+    select(context, writer, selection) {
+        trace(context, '-> [map::select]', `-> in: ${this.name}`);
+        if (this.valueType) {
+            this.valueType.select(context, writer, selection);
+        }
+        trace(context, '<- [map::select]', `-> out: ${this.name}`);
+    }
+    visitAdditionalProperties(context) {
+        // check if it's a map
+        if (!this.schema.additionalProperties || typeof this.schema.additionalProperties !== 'object') {
+            return;
+        }
+        const additionalProps = this.schema.additionalProperties;
+        // If additionalProperties is an empty object, create a JSON scalar type
+        if (Object.keys(additionalProps).length === 0) {
+            trace(context, '-> [map::additionalProps]', 'empty additionalProperties schema, using JSON');
+            this.valueType = new Scalar(this, 'JSON', { type: 'object' });
+            this.add(this.valueType);
+            this.valueType.visit(context);
+            trace(context, '<- [map::additionalProps]', 'out value type: JSON');
+            return;
+        }
+        trace(context, '-> [map::additionalProps]', 'processing additional properties');
+        this.valueType = Factory.fromSchema(context, this, additionalProps);
+        this.add(this.valueType);
+        this.valueType.visit(context);
+        trace(context, '<- [map::additionalProps]', 'out value type: ' + this.valueType.name);
+    }
+    dependencies() {
+        return this.valueType ? [this.valueType] : [];
+    }
+    updateName() {
+        let name = this.name;
+        // If we don't have a name, try to create one based on the parent
+        if (!name || name === 'items') {
+            const parent = this.parent;
+            const parentName = parent?.name;
+            if (parentName) {
+                name = Naming.genTypeName(Naming.getRefName(parentName) + 'Entry');
+            }
+            else {
+                name = '[inline:MapEntry]';
+            }
+        }
+        else {
+            // Add "Entry" suffix to existing names to make them more descriptive
+            name = Naming.genTypeName(Naming.getRefName(name) + 'Entry');
+        }
+        this.name = name;
+    }
+}
+//# sourceMappingURL=map.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../src/oas/nodes/map.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, Factory, IType, Type, T, Scalar } from './internal.js';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class Map extends Type {\n  public valueType?: IType;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[map] ${Naming.getRefName(this.name)}`;\n  }\n\n  get id(): string {\n    return `map:${this.kind}:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [map:visit]', 'in ' + this.name);\n\n    this.visitAdditionalProperties(context);\n    this.visited = true;\n\n    if (this.name) {\n      if (!T.isRef(this.name) && context.types.has(this.name)) {\n        // Handle name conflict similar to Obj\n      } else {\n        context.store(this.name, this);\n      }\n    }\n\n    trace(context, '<- [map:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    if (!this.valueType) {\n      return;\n    }\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [map::generate]', `-> in: ${this.name}`);\n\n    const sanitised = Naming.genTypeName(this.name);\n    const refName = Naming.getRefName(this.name);\n\n    writer\n      .write(this.kind + ' ')\n      .write(sanitised === refName ? refName : sanitised)\n      .write(this.nameSuffix())\n      .write(' {\\n');\n\n    // Generate the map as an array of key-value pairs\n    writer\n      .write('  key: String\\n') // Keys are always present in maps, but not necessarily required in schema\n      .write('  value: ');\n\n    // Write the value type name without hardcoded required markers\n    if (this.valueType) {\n      if (this.valueType instanceof Arr) {\n        // For arrays, generate [ItemType] format (let the array type handle its own nullability)\n        if (this.valueType.itemsType && this.valueType.itemsType.name) {\n          writer.write('[' + Naming.genTypeName(this.valueType.itemsType.name) + ']');\n        } else {\n          writer.write('[JSON]');\n        }\n      } else {\n        // For other types, use the type name directly without hardcoded !\n        writer.write(Naming.genTypeName(this.valueType.name));\n      }\n    } else {\n      writer.write('JSON');\n    }\n    writer.write('\\n}\\n\\n');\n\n    trace(context, '<- [map::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [map::select]', `-> in: ${this.name}`);\n\n    if (this.valueType) {\n      this.valueType.select(context, writer, selection);\n    }\n\n    trace(context, '<- [map::select]', `-> out: ${this.name}`);\n  }\n\n  private visitAdditionalProperties(context: OasContext): void {\n    // check if it's a map\n    if (!this.schema.additionalProperties || typeof this.schema.additionalProperties !== 'object') {\n      return;\n    }\n\n    const additionalProps = this.schema.additionalProperties as SchemaObject;\n\n    // If additionalProperties is an empty object, create a JSON scalar type\n    if (Object.keys(additionalProps).length === 0) {\n      trace(context, '-> [map::additionalProps]', 'empty additionalProperties schema, using JSON');\n      this.valueType = new Scalar(this, 'JSON', { type: 'object' } as SchemaObject);\n      this.add(this.valueType);\n      this.valueType.visit(context);\n      trace(context, '<- [map::additionalProps]', 'out value type: JSON');\n      return;\n    }\n\n    trace(context, '-> [map::additionalProps]', 'processing additional properties');\n\n    this.valueType = Factory.fromSchema(context, this, additionalProps);\n    this.add(this.valueType);\n    this.valueType.visit(context);\n\n    trace(context, '<- [map::additionalProps]', 'out value type: ' + this.valueType.name);\n  }\n\n  dependencies(): IType[] {\n    return this.valueType ? [this.valueType] : [];\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    // If we don't have a name, try to create one based on the parent\n    if (!name || name === 'items') {\n      const parent = this.parent;\n      const parentName = parent?.name;\n\n      if (parentName) {\n        name = Naming.genTypeName(Naming.getRefName(parentName) + 'Entry');\n      } else {\n        name = '[inline:MapEntry]';\n      }\n    } else {\n      // Add \"Entry\" suffix to existing names to make them more descriptive\n      name = Naming.genTypeName(Naming.getRefName(name) + 'Entry');\n    }\n\n    this.name = name;\n  }\n}\n"]}

package/dist/oas/nodes/obj.js

@@ -76,25 +76,30 @@ export class Obj extends Type {
         trace(context, '<- [obj::select]', `-> out: ${this.name}`);
     }
     visitProperties(context) {
-        if (!this.schema.properties) {
+        const hasProperties = this.schema.properties && Object.keys(this.schema.properties).length > 0;
+        const hasAdditionalProperties = this.schema.additionalProperties && typeof this.schema.additionalProperties === 'object';
+        if (!hasProperties && !hasAdditionalProperties) {
             return;
         }
-        const properties = this.schema.properties;
-        const propKeys = Object.keys(properties);
-        trace(context, '-> [obj::props]', 'in props ' + (propKeys.length === 0 ? '0' : propKeys.length.toString()));
-        if (propKeys.length === 0) {
-            trace(context, '<- [obj::props]', 'no props ' + this.props.size);
-            return;
+        trace(context, '-> [obj::props]', `processing ${hasProperties ? 'properties' : ''}${hasProperties && hasAdditionalProperties ? ' and ' : ''}${hasAdditionalProperties ? 'additionalProperties' : ''}`);
+        if (hasProperties) {
+            const properties = this.schema.properties;
+            const sorted = Object.entries(properties).sort((a, b) => a[0].toLowerCase().localeCompare(b[0].toLowerCase()));
+            for (const [key, schemaValue] of sorted) {
+                const prop = Factory.fromProp(context, this, key, schemaValue);
+                this.props.set(prop.name, prop);
+                if (!this.children.includes(prop)) {
+                    this.add(prop);
+                }
+            }
         }
-        const sorted = Object.entries(properties).sort((a, b) => a[0].toLowerCase().localeCompare(b[0].toLowerCase()));
-        for (const [key, schemaValue] of sorted) {
-            const prop = Factory.fromProp(context, this, key, schemaValue);
-            this.props.set(prop.name, prop);
-            if (!this.children.includes(prop)) {
-                this.add(prop);
+        if (hasAdditionalProperties) {
+            const additionalProp = Factory.fromProp(context, this, '[key: string]', this.schema.additionalProperties);
+            this.props.set(additionalProp.name, additionalProp);
+            if (!this.children.includes(additionalProp)) {
+                this.add(additionalProp);
             }
         }
-        // required can also be set in a separate array too, apparently
         if (_.isArray(this.schema.required)) {
             this.schema.required.forEach((name) => {
                 const prop = this.props.get(name);

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

@@ -1 +1 @@
-{"version":3,"file":"obj.js","sourceRoot":"","sources":["../../../src/oas/nodes/obj.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, Body, Factory, Get, IType, PropArray, Type, Res, T } from './internal.js';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nimport _ from 'lodash';\n\nexport class Obj extends Type {\n  synthetic: boolean = false;\n  nameConflict: boolean = false;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[object] ${Naming.getRefName(this.name)}`;\n  }\n\n  get id(): string {\n    return `obj:${this.kind}:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [obj:visit]', 'in ' + this.name);\n\n    if (!context.inContextOf('Composed', this)) {\n      trace(context, '[obj]', 'In object: ' + (this.name ? this.name : this.parent?.name));\n    }\n\n    // do we have a name conflict?\n    if (context.types.has(this.name) && !T.isRef(this.name) && this.synthetic) {\n      this.resolveNameConflict(context);\n    }\n\n    this.visitProperties(context);\n    this.visited = true;\n\n    if (this.name) {\n      if (!T.isRef(this.name) && context.types.has(this.name)) this.nameConflict = true;\n      else context.store(this.name, this);\n    }\n\n    trace(context, '<- [obj:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    if (_.isEmpty(this.props)) {\n      return;\n    }\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [obj::generate]', `-> in: ${this.name}`);\n\n    const sanitised = Naming.genTypeName(this.name);\n    const refName = Naming.getRefName(this.name);\n\n    writer\n      .write(this.kind + ' ')\n      .write(sanitised === refName ? refName : sanitised)\n      .write(this.nameSuffix())\n      .write(' {\\n');\n\n    const selected = this.selectedProps(selection);\n\n    for (const prop of selected) {\n      trace(context, '-> [obj::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n      prop.generate(context, writer, selection);\n    }\n\n    writer.write('}\\n\\n');\n\n    trace(context, '<- [obj::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [obj::select]', `-> in: ${this.name}`);\n\n    const selected = this.selectedProps(selection);\n    for (const prop of selected) {\n      prop.select(context, writer, selection);\n    }\n\n    trace(context, '<- [obj::select]', `-> out: ${this.name}`);\n  }\n\n  private visitProperties(context: OasContext): void {\n    if (!this.schema.properties) {\n      return;\n    }\n\n    const properties = this.schema.properties as Record<string, SchemaObject>;\n    const propKeys = Object.keys(properties);\n    trace(context, '-> [obj::props]', 'in props ' + (propKeys.length === 0 ? '0' : propKeys.length.toString()));\n\n    if (propKeys.length === 0) {\n      trace(context, '<- [obj::props]', 'no props ' + this.props.size);\n      return;\n    }\n\n    const sorted = Object.entries(properties).sort((a, b) => a[0].toLowerCase().localeCompare(b[0].toLowerCase()));\n\n    for (const [key, schemaValue] of sorted) {\n      const prop = Factory.fromProp(context, this, key, schemaValue);\n      this.props.set(prop.name, prop);\n\n      if (!this.children.includes(prop)) {\n        this.add(prop);\n      }\n    }\n\n    // required can also be set in a separate array too, apparently\n    if (_.isArray(this.schema.required)) {\n      this.schema.required.forEach((name) => {\n        const prop = this.props.get(name);\n        if (prop) prop!.required = true;\n      });\n    }\n\n    trace(context, '<- [obj::props]', 'out props ' + this.props.size);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n    // If we are an inline object named \"items\", try to create a better name.\n    if (!name || name === 'items') {\n      const parent = this.parent;\n      const parentName = parent!.name;\n\n      // is our parent an array?\n      if (parent instanceof Arr || parent instanceof PropArray) {\n        // if so, synthesize a name based on the parent name\n        this.synthetic = true;\n        name = Naming.genTypeName(Naming.getRefName(parentName) + 'Item');\n      }\n      // if the parent is a response, we can use the operation name and append \"Response\"\n      else if (parent instanceof Res) {\n        const op = parent.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      }\n      // for posts\n      else if (parent instanceof Body) {\n        // const op = parent.parent as Post;\n        name = this.name + 'Input';\n      }\n      // if the parent is an object then we can use the parent name\n      else if (parent instanceof Obj) {\n        name = parentName + 'Obj';\n      }\n      // extreme case -- we synthesize an anonymous name\n      else {\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n\n  private resolveNameConflict(context: OasContext) {\n    const container = T.findNonPropParent(this.parent!);\n    this.name = container.name + '_' + this.name;\n  }\n}\n"]}
+{"version":3,"file":"obj.js","sourceRoot":"","sources":["../../../src/oas/nodes/obj.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAc,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAExF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,MAAM,OAAO,GAAI,SAAQ,IAAI;IAOlB;IANT,SAAS,GAAY,KAAK,CAAC;IAC3B,YAAY,GAAY,KAAK,CAAC;IAE9B,YACE,MAAyB,EACzB,IAAY,EACL,MAAoB;QAE3B,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAFb,WAAM,GAAN,MAAM,CAAc;QAG3B,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEM,SAAS,CAAC,QAAoB;QACnC,OAAO,YAAY,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACpD,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,OAAmB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,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,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3C,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QACvF,CAAC;QAED,8BAA8B;QAC9B,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC1E,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;;gBAC7E,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,QAAQ,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACtE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM;aACH,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;aACtB,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;aACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QAEjB,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,IAAI,CAAC,IAAI,aAAa,IAAI,CAAC,MAAO,CAAC,IAAI,GAAG,CAAC,CAAC;YACjG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtB,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,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEO,eAAe,CAAC,OAAmB;QACzC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/F,MAAM,uBAAuB,GAC3B,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,KAAK,QAAQ,CAAC;QAE3F,IAAI,CAAC,aAAa,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/C,OAAO;QACT,CAAC;QAED,KAAK,CACH,OAAO,EACP,iBAAiB,EACjB,cAAc,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,IAAI,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,uBAAuB,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,EAAE,CACpK,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAA0C,CAAC;YAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YAE/G,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,MAAM,EAAE,CAAC;gBACxC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;gBAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAEhC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,uBAAuB,EAAE,CAAC;YAC5B,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CACrC,OAAO,EACP,IAAI,EACJ,eAAe,EACf,IAAI,CAAC,MAAM,CAAC,oBAAoC,CACjD,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAEpD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAClC,IAAI,IAAI;oBAAE,IAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,yEAAyE;QACzE,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAO,CAAC,IAAI,CAAC;YAEhC,0BAA0B;YAC1B,IAAI,MAAM,YAAY,GAAG,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;gBACzD,oDAAoD;gBACpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,CAAC;YACpE,CAAC;YACD,mFAAmF;iBAC9E,IAAI,MAAM,YAAY,GAAG,EAAE,CAAC;gBAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,MAAa,CAAC;gBAChC,IAAI,GAAG,EAAE,CAAC,YAAY,EAAE,GAAG,UAAU,CAAC;YACxC,CAAC;YACD,YAAY;iBACP,IAAI,MAAM,YAAY,IAAI,EAAE,CAAC;gBAChC,oCAAoC;gBACpC,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;YAC7B,CAAC;YACD,6DAA6D;iBACxD,IAAI,MAAM,YAAY,GAAG,EAAE,CAAC;gBAC/B,IAAI,GAAG,UAAU,GAAG,KAAK,CAAC;YAC5B,CAAC;YACD,kDAAkD;iBAC7C,CAAC;gBACJ,IAAI,GAAG,WAAW,IAAI,CAAC,MAAO,CAAC,IAAI,GAAG,CAAC;YACzC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,OAAmB;QAC7C,MAAM,SAAS,GAAG,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;IAC/C,CAAC;CACF","sourcesContent":["import { Arr, Body, Factory, Get, IType, PropArray, Type, Res, T } from './internal.js';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nimport _ from 'lodash';\n\nexport class Obj extends Type {\n  synthetic: boolean = false;\n  nameConflict: boolean = false;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[object] ${Naming.getRefName(this.name)}`;\n  }\n\n  get id(): string {\n    return `obj:${this.kind}:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [obj:visit]', 'in ' + this.name);\n\n    if (!context.inContextOf('Composed', this)) {\n      trace(context, '[obj]', 'In object: ' + (this.name ? this.name : this.parent?.name));\n    }\n\n    // do we have a name conflict?\n    if (context.types.has(this.name) && !T.isRef(this.name) && this.synthetic) {\n      this.resolveNameConflict(context);\n    }\n\n    this.visitProperties(context);\n    this.visited = true;\n\n    if (this.name) {\n      if (!T.isRef(this.name) && context.types.has(this.name)) this.nameConflict = true;\n      else context.store(this.name, this);\n    }\n\n    trace(context, '<- [obj:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    if (_.isEmpty(this.props)) {\n      return;\n    }\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [obj::generate]', `-> in: ${this.name}`);\n\n    const sanitised = Naming.genTypeName(this.name);\n    const refName = Naming.getRefName(this.name);\n\n    writer\n      .write(this.kind + ' ')\n      .write(sanitised === refName ? refName : sanitised)\n      .write(this.nameSuffix())\n      .write(' {\\n');\n\n    const selected = this.selectedProps(selection);\n\n    for (const prop of selected) {\n      trace(context, '-> [obj::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n      prop.generate(context, writer, selection);\n    }\n\n    writer.write('}\\n\\n');\n\n    trace(context, '<- [obj::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [obj::select]', `-> in: ${this.name}`);\n\n    const selected = this.selectedProps(selection);\n    for (const prop of selected) {\n      prop.select(context, writer, selection);\n    }\n\n    trace(context, '<- [obj::select]', `-> out: ${this.name}`);\n  }\n\n  private visitProperties(context: OasContext): void {\n    const hasProperties = this.schema.properties && Object.keys(this.schema.properties).length > 0;\n    const hasAdditionalProperties =\n      this.schema.additionalProperties && typeof this.schema.additionalProperties === 'object';\n\n    if (!hasProperties && !hasAdditionalProperties) {\n      return;\n    }\n\n    trace(\n      context,\n      '-> [obj::props]',\n      `processing ${hasProperties ? 'properties' : ''}${hasProperties && hasAdditionalProperties ? ' and ' : ''}${hasAdditionalProperties ? 'additionalProperties' : ''}`,\n    );\n\n    if (hasProperties) {\n      const properties = this.schema.properties as Record<string, SchemaObject>;\n      const sorted = Object.entries(properties).sort((a, b) => a[0].toLowerCase().localeCompare(b[0].toLowerCase()));\n\n      for (const [key, schemaValue] of sorted) {\n        const prop = Factory.fromProp(context, this, key, schemaValue);\n        this.props.set(prop.name, prop);\n\n        if (!this.children.includes(prop)) {\n          this.add(prop);\n        }\n      }\n    }\n\n    if (hasAdditionalProperties) {\n      const additionalProp = Factory.fromProp(\n        context,\n        this,\n        '[key: string]',\n        this.schema.additionalProperties as SchemaObject,\n      );\n      this.props.set(additionalProp.name, additionalProp);\n\n      if (!this.children.includes(additionalProp)) {\n        this.add(additionalProp);\n      }\n    }\n\n    if (_.isArray(this.schema.required)) {\n      this.schema.required.forEach((name) => {\n        const prop = this.props.get(name);\n        if (prop) prop!.required = true;\n      });\n    }\n\n    trace(context, '<- [obj::props]', 'out props ' + this.props.size);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n    // If we are an inline object named \"items\", try to create a better name.\n    if (!name || name === 'items') {\n      const parent = this.parent;\n      const parentName = parent!.name;\n\n      // is our parent an array?\n      if (parent instanceof Arr || parent instanceof PropArray) {\n        // if so, synthesize a name based on the parent name\n        this.synthetic = true;\n        name = Naming.genTypeName(Naming.getRefName(parentName) + 'Item');\n      }\n      // if the parent is a response, we can use the operation name and append \"Response\"\n      else if (parent instanceof Res) {\n        const op = parent.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      }\n      // for posts\n      else if (parent instanceof Body) {\n        // const op = parent.parent as Post;\n        name = this.name + 'Input';\n      }\n      // if the parent is an object then we can use the parent name\n      else if (parent instanceof Obj) {\n        name = parentName + 'Obj';\n      }\n      // extreme case -- we synthesize an anonymous name\n      else {\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n\n  private resolveNameConflict(context: OasContext) {\n    const container = T.findNonPropParent(this.parent!);\n    this.name = container.name + '_' + this.name;\n  }\n}\n"]}

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

@@ -0,0 +1,17 @@
+import { IType, Map, Prop } from './internal.js';
+import { SchemaObject } from 'oas/types';
+import { OasContext } from '../oasContext.js';
+import { Writer } from '../io/writer.js';
+export declare class PropMap extends Prop {
+    schema: SchemaObject;
+    map: Map;
+    constructor(parent: IType, name: string, schema: SchemaObject, map: Map);
+    forPrompt(_context: OasContext): string;
+    get id(): string;
+    visit(context: OasContext): void;
+    getValue(context: OasContext): string;
+    select(context: OasContext, writer: Writer, selection: string[]): void;
+    private needsValueSelection;
+    dependencies(): IType[];
+    private needsBrackets;
+}

package/dist/oas/nodes/propMap.js

@@ -0,0 +1,87 @@
+import { Prop } from './internal.js';
+import _ from 'lodash';
+import { trace } from '../log/trace.js';
+import { Naming } from '../utils/naming.js';
+export class PropMap extends Prop {
+    schema;
+    map;
+    constructor(parent, name, schema, map) {
+        super(parent, name, schema);
+        this.schema = schema;
+        this.map = map;
+        if (!map) {
+            throw new Error('map parameter is required');
+        }
+        // Re-parent the map to this property if needed
+        if (map.parent !== this) {
+            map.parent = this;
+        }
+    }
+    forPrompt(_context) {
+        return '[prop] ' + _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.map.name) + ' (Map)';
+    }
+    get id() {
+        return 'prop:map:' + this.name;
+    }
+    visit(context) {
+        if (this.visited) {
+            return;
+        }
+        context.enter(this);
+        trace(context, '-> [prop-map:visit]', 'in ' + this.name + ', map: ' + this.map.name);
+        this.map.visit(context);
+        if (!this.children.includes(this.map)) {
+            this.add(this.map);
+        }
+        this.visited = true;
+        trace(context, '<- [prop-map:visit]', 'out ' + this.name + ', map: ' + this.map.name);
+        context.leave(this);
+    }
+    getValue(context) {
+        // For maps, we return the generated map type name as an array without hardcoded required markers
+        return '[' + Naming.genTypeName(this.map.name) + this.map.nameSuffix() + ']';
+    }
+    select(context, writer, selection) {
+        trace(context, '-> [prop-map:select]', 'in ' + this.name + ', map: ' + this.map.name);
+        const fieldName = this.name;
+        const sanitised = Naming.sanitiseFieldForSelect(fieldName);
+        // because we are in a map, we need to write the key-value structure
+        writer
+            .write(' '.repeat(context.indent + context.stack.length))
+            .write(sanitised)
+            .write(': ')
+            .write(sanitised);
+        // For maps, we need to select the key-value structure
+        writer.write('->entries {').write('\n');
+        context.enter(this);
+        // Generate the key-value selection structure
+        writer.write(' '.repeat(context.indent + context.stack.length)).write('key\n');
+        writer.write(' '.repeat(context.indent + context.stack.length)).write('value');
+        // If the value type has complex structure, we need to expand it
+        if (this.map.valueType && this.needsValueSelection()) {
+            writer.write(' {').write('\n');
+            context.enter(this);
+            this.map.valueType.select(context, writer, selection);
+            context.leave(this);
+            writer.write(' '.repeat(context.indent + context.stack.length)).write('}');
+        }
+        writer.write('\n');
+        context.leave(this);
+        writer.write(' '.repeat(context.indent + context.stack.length)).write('}');
+        if (context.generateOptions.showParentInSelections) {
+            writer.write(' # ').write(Naming.getRefName(this.parent.name));
+        }
+        writer.write('\n');
+        trace(context, '<- [prop-map:select]', 'out ' + this.name + ', map: ' + this.map.name);
+    }
+    needsValueSelection() {
+        return Boolean(this.map.valueType && !this.map.valueType.name?.match(/^(String|Int|Float|Boolean|JSON)$/));
+    }
+    dependencies() {
+        return [this.map];
+    }
+    needsBrackets() {
+        return Boolean(this.map && this.map.valueType && !_.isEmpty(this.map.props));
+    }
+}
+//# sourceMappingURL=propMap.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"propMap.js","sourceRoot":"","sources":["../../../src/oas/nodes/propMap.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Map, Prop } from './internal.js';\nimport _ from 'lodash';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class PropMap extends Prop {\n  constructor(\n    parent: IType,\n    name: string,\n    public schema: SchemaObject,\n    public map: Map,\n  ) {\n    super(parent, name, schema);\n    if (!map) {\n      throw new Error('map parameter is required');\n    }\n\n    // Re-parent the map to this property if needed\n    if (map.parent !== this) {\n      map.parent = this;\n    }\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return '[prop] ' + _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.map.name) + ' (Map)';\n  }\n\n  get id(): string {\n    return 'prop:map:' + this.name;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [prop-map:visit]', 'in ' + this.name + ', map: ' + this.map.name);\n\n    this.map.visit(context);\n    if (!this.children.includes(this.map)) {\n      this.add(this.map);\n    }\n    this.visited = true;\n\n    trace(context, '<- [prop-map:visit]', 'out ' + this.name + ', map: ' + this.map.name);\n    context.leave(this);\n  }\n\n  public getValue(context: OasContext): string {\n    // For maps, we return the generated map type name as an array without hardcoded required markers\n    return '[' + Naming.genTypeName(this.map.name) + this.map.nameSuffix() + ']';\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-map:select]', 'in ' + this.name + ', map: ' + this.map.name);\n\n    const fieldName = this.name;\n    const sanitised = Naming.sanitiseFieldForSelect(fieldName);\n\n    // because we are in a map, we need to write the key-value structure\n    writer\n      .write(' '.repeat(context.indent + context.stack.length))\n      .write(sanitised)\n      .write(': ')\n      .write(sanitised);\n\n    // For maps, we need to select the key-value structure\n    writer.write('->entries {').write('\\n');\n    context.enter(this);\n\n    // Generate the key-value selection structure\n    writer.write(' '.repeat(context.indent + context.stack.length)).write('key\\n');\n    writer.write(' '.repeat(context.indent + context.stack.length)).write('value');\n\n    // If the value type has complex structure, we need to expand it\n    if (this.map.valueType && this.needsValueSelection()) {\n      writer.write(' {').write('\\n');\n      context.enter(this);\n      this.map.valueType.select(context, writer, selection);\n      context.leave(this);\n      writer.write(' '.repeat(context.indent + context.stack.length)).write('}');\n    }\n    writer.write('\\n');\n\n    context.leave(this);\n    writer.write(' '.repeat(context.indent + context.stack.length)).write('}');\n\n    if (context.generateOptions.showParentInSelections) {\n      writer.write(' # ').write(Naming.getRefName(this.parent!.name));\n    }\n\n    writer.write('\\n');\n\n    trace(context, '<- [prop-map:select]', 'out ' + this.name + ', map: ' + this.map.name);\n  }\n\n  private needsValueSelection(): boolean {\n    return Boolean(this.map.valueType && !this.map.valueType.name?.match(/^(String|Int|Float|Boolean|JSON)$/));\n  }\n\n  dependencies(): IType[] {\n    return [this.map];\n  }\n\n  private needsBrackets(): boolean {\n    return Boolean(this.map && this.map.valueType && !_.isEmpty(this.map.props));\n  }\n}\n"]}

package/dist/oas/nodes/typeUtils.js

@@ -38,7 +38,10 @@ export class T {
             .map((child) => child);
     }
     static isContainer(node) {
-        return node.id.startsWith('obj:') || node.id.startsWith('comp:') || node.id.startsWith('union:');
+        return (node.id.startsWith('obj:') ||
+            node.id.startsWith('comp:') ||
+            node.id.startsWith('union:') ||
+            node.id.startsWith('map:'));
     }
     static composables(node) {
         return _.filter(T.containers(node), (e) => e.id.startsWith('comp:')); // || e.id.startsWith('union:'));

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

@@ -1 +1 @@
-{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../../src/oas/nodes/typeUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, CircularRef, En, IType, Obj, Prop, PropArray, PropEn, PropScalar, Scalar } from './internal.js';\nimport _ from 'lodash';\n\nexport class T {\n  public static isLeaf(type: IType): boolean {\n    return (\n      type instanceof Scalar ||\n      type instanceof PropScalar ||\n      type instanceof En ||\n      type instanceof PropEn ||\n      type instanceof CircularRef ||\n      (type instanceof PropArray && type.items instanceof Scalar) ||\n      (type instanceof Obj && _.isEmpty(type.props)) ||\n      T.isScalarArray(type)\n    );\n  }\n\n  public static isPropScalar(type: IType): boolean {\n    return type instanceof PropScalar;\n  }\n\n  public static traverse(node: IType, callback: (node: IType) => void): void {\n    const traverseNode = (n: IType): void => {\n      callback(n);\n\n      for (const c of n.children) {\n        traverseNode(c);\n      }\n    };\n\n    traverseNode(node);\n  }\n\n  static isMutationType(type: IType): boolean {\n    return (\n      type.id.startsWith('post:') ||\n      type.id.startsWith('put:') ||\n      type.id.startsWith('patch:') ||\n      type.id.startsWith('del:')\n    );\n  }\n\n  static isScalar(type: IType): boolean {\n    return type.id.startsWith('scalar:');\n  }\n\n  public static containers(node: IType) {\n    return Array.from(node.children.values())\n      .filter((child) => !(child instanceof Prop) && T.isContainer(child))\n      .map((child) => child);\n  }\n\n  public static isContainer(node: IType): boolean {\n    return node.id.startsWith('obj:') || node.id.startsWith('comp:') || node.id.startsWith('union:');\n  }\n\n  static composables(node: IType): IType[] {\n    return _.filter(T.containers(node), (e: IType) => e.id.startsWith('comp:')); // || e.id.startsWith('union:'));\n  }\n\n  public static print(node: IType, prefix: string = '', isLast: boolean = true): string {\n    // Build the current line with the appropriate connector.\n    const connector = prefix === '' ? '' : isLast ? '└─ ' : '├─ ';\n    let result = prefix + connector + node.id + '\\n';\n\n    // Prepare the prefix for the children.\n    const childPrefix = prefix + (isLast ? '   ' : '│  ');\n\n    node.children.forEach((child, index) => {\n      const last = index === node.children.length - 1;\n      result += T.print(child, childPrefix, last);\n    });\n\n    return result;\n  }\n\n  public static isRef(name: string) {\n    return name.startsWith('#/components/');\n  }\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static isScalarArray(type: IType) {\n    return type instanceof Arr && type.itemsType instanceof Scalar;\n  }\n}\n"]}
+{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../../src/oas/nodes/typeUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, CircularRef, En, IType, Obj, Prop, PropArray, PropEn, PropScalar, Scalar } from './internal.js';\nimport _ from 'lodash';\n\nexport class T {\n  public static isLeaf(type: IType): boolean {\n    return (\n      type instanceof Scalar ||\n      type instanceof PropScalar ||\n      type instanceof En ||\n      type instanceof PropEn ||\n      type instanceof CircularRef ||\n      (type instanceof PropArray && type.items instanceof Scalar) ||\n      (type instanceof Obj && _.isEmpty(type.props)) ||\n      T.isScalarArray(type)\n    );\n  }\n\n  public static isPropScalar(type: IType): boolean {\n    return type instanceof PropScalar;\n  }\n\n  public static traverse(node: IType, callback: (node: IType) => void): void {\n    const traverseNode = (n: IType): void => {\n      callback(n);\n\n      for (const c of n.children) {\n        traverseNode(c);\n      }\n    };\n\n    traverseNode(node);\n  }\n\n  static isMutationType(type: IType): boolean {\n    return (\n      type.id.startsWith('post:') ||\n      type.id.startsWith('put:') ||\n      type.id.startsWith('patch:') ||\n      type.id.startsWith('del:')\n    );\n  }\n\n  static isScalar(type: IType): boolean {\n    return type.id.startsWith('scalar:');\n  }\n\n  public static containers(node: IType) {\n    return Array.from(node.children.values())\n      .filter((child) => !(child instanceof Prop) && T.isContainer(child))\n      .map((child) => child);\n  }\n\n  public static isContainer(node: IType): boolean {\n    return (\n      node.id.startsWith('obj:') ||\n      node.id.startsWith('comp:') ||\n      node.id.startsWith('union:') ||\n      node.id.startsWith('map:')\n    );\n  }\n\n  static composables(node: IType): IType[] {\n    return _.filter(T.containers(node), (e: IType) => e.id.startsWith('comp:')); // || e.id.startsWith('union:'));\n  }\n\n  public static print(node: IType, prefix: string = '', isLast: boolean = true): string {\n    // Build the current line with the appropriate connector.\n    const connector = prefix === '' ? '' : isLast ? '└─ ' : '├─ ';\n    let result = prefix + connector + node.id + '\\n';\n\n    // Prepare the prefix for the children.\n    const childPrefix = prefix + (isLast ? '   ' : '│  ');\n\n    node.children.forEach((child, index) => {\n      const last = index === node.children.length - 1;\n      result += T.print(child, childPrefix, last);\n    });\n\n    return result;\n  }\n\n  public static isRef(name: string) {\n    return name.startsWith('#/components/');\n  }\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static isScalarArray(type: IType) {\n    return type instanceof Arr && type.itemsType instanceof Scalar;\n  }\n}\n"]}

package/dist/tests/runners.js

@@ -22,11 +22,16 @@ export async function runOasTest(file, paths, pathsSize, typesSize, shouldFail =
     assert.ok(types.size === typesSize, `${types.size} is not equal to ${typesSize}:  ${Array.from(types.keys()).join(',\n')}`);
     const schema = gen.generateSchema(paths);
     assert.ok(schema !== undefined);
-    const schemaFile = path.join(os.tmpdir(), file.replace(/yaml|json|yml/, 'graphql'));
+    // Create a dedicated folder inside tmp for OAS test files
+    const oasTestDir = path.join(os.tmpdir(), 'oas-test');
+    if (!fs.existsSync(oasTestDir)) {
+        fs.mkdirSync(oasTestDir, { recursive: true });
+    }
+    const schemaFile = path.join(oasTestDir, file.replace(/yaml|json|yml/, 'graphql'));
     fs.writeFileSync(schemaFile, schema, { encoding: 'utf-8', flag: 'w' });
     // need to write another graphql file but this only with a sample query otherwise composition
     // will fail for mutations
-    const sampleFile = path.join(os.tmpdir(), 'simple-query.graphql');
+    const sampleFile = path.join(oasTestDir, 'simple-query.graphql');
     if (!fs.existsSync(sampleFile)) {
         fs.writeFileSync(sampleFile, 'type Query { hello: String }', { encoding: 'utf-8', flag: 'w' });
     }
@@ -102,7 +107,7 @@ function compose(schemaPath, samplePath) {
     if (!rover[0]) {
         throw new Error('Rover is not available');
     }
-    const supergraphFile = path.join(os.tmpdir(), 'supergraph.yaml');
+    const supergraphFile = path.join(os.tmpdir(), 'oas-test', 'supergraph.yaml');
     let content = `
 federation_version: =2.11.0
 subgraphs:
@@ -120,6 +125,33 @@ subgraphs:
     }
     fs.writeFileSync(supergraphFile, content, { encoding: 'utf-8', flag: 'w' });
     const cmd = `${rover[1]} supergraph compose --config ${supergraphFile} --elv2-license accept`;
+    // Write the rover command to a bash script for easy re-execution
+    const scriptFile = path.join(os.tmpdir(), 'oas-test', 'run-rover.sh');
+    // Generate script with environment variables and dev command
+    const devCmd = `APOLLO_KEY=\${APOLLO_KEY} APOLLO_GRAPH_REF=\${APOLLO_GRAPH_REF} ${rover[1]} dev --supergraph-config ${supergraphFile}`;
+    const scriptContent = `#!/bin/bash
+
+# Generated rover compose command (original)
+# ${cmd}
+
+# Alternative rover dev command with environment variables
+# Check if required environment variables are set
+if [ -z "\${APOLLO_KEY}" ]; then
+    echo "Error: APOLLO_KEY environment variable is not set"
+    echo "Please set it with: export APOLLO_KEY=your_apollo_key"
+    exit 1
+fi
+
+if [ -z "\${APOLLO_GRAPH_REF}" ]; then
+    echo "Error: APOLLO_GRAPH_REF environment variable is not set"
+    echo "Please set it with: export APOLLO_GRAPH_REF=your_graph_ref"
+    exit 1
+fi
+
+echo "Running rover dev with Apollo Studio integration..."
+${devCmd}
+`;
+    fs.writeFileSync(scriptFile, scriptContent, { encoding: 'utf-8', flag: 'w' });
     let output;
     try {
         output = execSync(cmd, { stdio: 'pipe' });

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 { Mapper } from '../oas/mapper/types.js';\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  mapper?: Mapper,\n): Promise<string | undefined> {\n  const gen = await OasGen.fromFile(`${oasBasePath}/${file}`, {\n    skipValidation,\n    consolidateUnions: true,\n    showParentInSelections: false,\n    mapper,\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"]}
+{"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 { Mapper } from '../oas/mapper/types.js';\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  mapper?: Mapper,\n): Promise<string | undefined> {\n  const gen = await OasGen.fromFile(`${oasBasePath}/${file}`, {\n    skipValidation,\n    consolidateUnions: true,\n    showParentInSelections: false,\n    mapper,\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  // Create a dedicated folder inside tmp for OAS test files\n  const oasTestDir = path.join(os.tmpdir(), 'oas-test');\n  if (!fs.existsSync(oasTestDir)) {\n    fs.mkdirSync(oasTestDir, { recursive: true });\n  }\n\n  const schemaFile = path.join(oasTestDir, 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(oasTestDir, '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(), 'oas-test', '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  // Write the rover command to a bash script for easy re-execution\n  const scriptFile = path.join(os.tmpdir(), 'oas-test', 'run-rover.sh');\n\n  // Generate script with environment variables and dev command\n  const devCmd = `APOLLO_KEY=\\${APOLLO_KEY} APOLLO_GRAPH_REF=\\${APOLLO_GRAPH_REF} ${rover[1]} dev --supergraph-config ${supergraphFile}`;\n  const scriptContent = `#!/bin/bash\n\n# Generated rover compose command (original)\n# ${cmd}\n\n# Alternative rover dev command with environment variables\n# Check if required environment variables are set\nif [ -z \"\\${APOLLO_KEY}\" ]; then\n    echo \"Error: APOLLO_KEY environment variable is not set\"\n    echo \"Please set it with: export APOLLO_KEY=your_apollo_key\"\n    exit 1\nfi\n\nif [ -z \"\\${APOLLO_GRAPH_REF}\" ]; then\n    echo \"Error: APOLLO_GRAPH_REF environment variable is not set\"\n    echo \"Please set it with: export APOLLO_GRAPH_REF=your_graph_ref\"\n    exit 1\nfi\n\necho \"Running rover dev with Apollo Studio integration...\"\n${devCmd}\n`;\n  fs.writeFileSync(scriptFile, scriptContent, { encoding: 'utf-8', flag: 'w' });\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/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/versions.ts","../src/cli/json.ts","../src/cli/oas.ts","../src/cli/oas-helpers/index.ts","../src/json/index.ts","../src/json/io/index.ts","../src/json/io/writer.ts","../src/json/walker/index.ts","../src/json/walker/jsoncontext.ts","../src/json/walker/jsongen.ts","../src/json/walker/naming.ts","../src/json/walker/log/trace.ts","../src/json/walker/types/index.ts","../src/json/walker/types/jsonarray.ts","../src/json/walker/types/jsonobj.ts","../src/json/walker/types/jsonscalar.ts","../src/json/walker/types/jsontype.ts","../src/oas/index.ts","../src/oas/oascontext.ts","../src/oas/oasgen.ts","../src/oas/generator/typescollector.ts","../src/oas/io/operationwriter.ts","../src/oas/io/schemawriter.ts","../src/oas/io/writer.ts","../src/oas/log/trace.ts","../src/oas/mapper/index.ts","../src/oas/mapper/loader.ts","../src/oas/mapper/namemapper.ts","../src/oas/mapper/types.ts","../src/oas/nodes/arr.ts","../src/oas/nodes/body.ts","../src/oas/nodes/circularref.ts","../src/oas/nodes/comp.ts","../src/oas/nodes/delete.ts","../src/oas/nodes/en.ts","../src/oas/nodes/factory.ts","../src/oas/nodes/get.ts","../src/oas/nodes/itype.ts","../src/oas/nodes/internal.ts","../src/oas/nodes/obj.ts","../src/oas/nodes/op.ts","../src/oas/nodes/param.ts","../src/oas/nodes/patch.ts","../src/oas/nodes/post.ts","../src/oas/nodes/prop.ts","../src/oas/nodes/proparray.ts","../src/oas/nodes/propcircref.ts","../src/oas/nodes/propcomp.ts","../src/oas/nodes/propen.ts","../src/oas/nodes/propobj.ts","../src/oas/nodes/propref.ts","../src/oas/nodes/propscalar.ts","../src/oas/nodes/put.ts","../src/oas/nodes/ref.ts","../src/oas/nodes/referenceobject.ts","../src/oas/nodes/res.ts","../src/oas/nodes/scalar.ts","../src/oas/nodes/type.ts","../src/oas/nodes/typeutils.ts","../src/oas/nodes/union.ts","../src/oas/prompts/prompt.ts","../src/oas/prompts/theme.ts","../src/oas/prompts/base/theme.ts","../src/oas/prompts/base/utils.ts","../src/oas/schemas/index.ts","../src/oas/utils/gql.ts","../src/oas/utils/naming.ts","../src/oas/visitor/generatorvisitor.ts","../src/oas/visitor/nodevisitor.ts","../src/oas/visitor/example.ts","../src/oas/visitor/index.ts","../src/tests/runners.ts"],"version":"5.8.2"}
+{"root":["../src/index.ts","../src/versions.ts","../src/cli/json.ts","../src/cli/oas.ts","../src/cli/oas-helpers/index.ts","../src/json/index.ts","../src/json/io/index.ts","../src/json/io/writer.ts","../src/json/walker/index.ts","../src/json/walker/jsoncontext.ts","../src/json/walker/jsongen.ts","../src/json/walker/naming.ts","../src/json/walker/log/trace.ts","../src/json/walker/types/index.ts","../src/json/walker/types/jsonarray.ts","../src/json/walker/types/jsonobj.ts","../src/json/walker/types/jsonscalar.ts","../src/json/walker/types/jsontype.ts","../src/oas/index.ts","../src/oas/oascontext.ts","../src/oas/oasgen.ts","../src/oas/generator/typescollector.ts","../src/oas/io/operationwriter.ts","../src/oas/io/schemawriter.ts","../src/oas/io/writer.ts","../src/oas/log/trace.ts","../src/oas/mapper/index.ts","../src/oas/mapper/loader.ts","../src/oas/mapper/namemapper.ts","../src/oas/mapper/types.ts","../src/oas/nodes/arr.ts","../src/oas/nodes/body.ts","../src/oas/nodes/circularref.ts","../src/oas/nodes/comp.ts","../src/oas/nodes/delete.ts","../src/oas/nodes/en.ts","../src/oas/nodes/factory.ts","../src/oas/nodes/get.ts","../src/oas/nodes/itype.ts","../src/oas/nodes/internal.ts","../src/oas/nodes/map.ts","../src/oas/nodes/obj.ts","../src/oas/nodes/op.ts","../src/oas/nodes/param.ts","../src/oas/nodes/patch.ts","../src/oas/nodes/post.ts","../src/oas/nodes/prop.ts","../src/oas/nodes/proparray.ts","../src/oas/nodes/propcircref.ts","../src/oas/nodes/propcomp.ts","../src/oas/nodes/propen.ts","../src/oas/nodes/propmap.ts","../src/oas/nodes/propobj.ts","../src/oas/nodes/propref.ts","../src/oas/nodes/propscalar.ts","../src/oas/nodes/put.ts","../src/oas/nodes/ref.ts","../src/oas/nodes/referenceobject.ts","../src/oas/nodes/res.ts","../src/oas/nodes/scalar.ts","../src/oas/nodes/type.ts","../src/oas/nodes/typeutils.ts","../src/oas/nodes/union.ts","../src/oas/prompts/prompt.ts","../src/oas/prompts/theme.ts","../src/oas/prompts/base/theme.ts","../src/oas/prompts/base/utils.ts","../src/oas/schemas/index.ts","../src/oas/utils/gql.ts","../src/oas/utils/naming.ts","../src/oas/visitor/generatorvisitor.ts","../src/oas/visitor/nodevisitor.ts","../src/oas/visitor/example.ts","../src/oas/visitor/index.ts","../src/tests/runners.ts"],"version":"5.8.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-conn-gen",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "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

@@ -12,7 +12,8 @@ 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 a schema based on a single or a collection of`JSON` files
+- Full support for OpenAPI `additionalProperties` - converts map/dictionary patterns into GraphQL-compatible key-value entry arrays
 
 ## Changelog
 
@@ -284,13 +285,14 @@ node ./dist/cli/oas petstore.yaml --transform-rules ./transform-rules.json --gre
 - `replacement`: The replacement string (supports capture groups like `$1`, `$2`, etc.)
 - `description`: Optional description of what the rule does
 - `enabled`: Optional boolean to enable/disable the rule (default: `true` - rules are enabled by default)
+- `priority`: Optional number to control the order of rule application (higher numbers = higher priority, default: `0`)
 
 #### Example Transformations
 
 - `apiV1GetUser` → `api_v1_GetUser` → `api_v1_fetchUser`
 - `apiV1CreatePet` → `api_v1_CreatePet` → `api_v1_fetchCreatePet`
 
-Rules are applied in the order they appear in the file, allowing for complex transformation chains.
+Rules are applied in priority order (highest number first), then in the order they appear in the file for rules with the same priority, allowing for complex transformation chains.
 
 ### Filtering paths
 
@@ -512,6 +514,80 @@ This is particularly useful for specifications that are bound to change often.
 
 will select all fields in the `Pet` type:
 
+## OpenAPI `additionalProperties` Support
+
+The tool now fully supports OpenAPI `additionalProperties` for handling map/dictionary patterns in your schemas. When an object type uses `additionalProperties`, it gets converted into a GraphQL-compatible key-value array structure.
+
+### How it works
+
+OpenAPI schemas with `additionalProperties` like this:
+
+```yaml
+VehicleComponentTree:
+  type: object
+  additionalProperties:
+    $ref: "#/components/schemas/VehicleComponent"
+```
+
+Are automatically converted to GraphQL types like this:
+
+```graphql
+type VehicleComponentTree {
+  vehicleComponents: [VehicleComponentsEntry]!
+}
+
+type VehicleComponentsEntry {
+  key: String
+  value: VehicleComponent
+}
+```
+
+### Supported patterns
+
+- **Object maps**: `additionalProperties` pointing to object references
+- **Array maps**: `additionalProperties` containing arrays of objects
+- **Scalar maps**: `additionalProperties` with primitive types
+- **Empty schemas**: `additionalProperties: {}` (treated as JSON)
+
+### GraphQL structure
+
+Each map is converted to an array of entry objects with:
+- `key: String` - The map key
+- `value: <Type>` - The map value (can be objects, arrays, or scalars)
+
+This allows GraphQL clients to work with map data while maintaining type safety and GraphQL schema compatibility.
+
+## Development and Testing
+
+### Testing a local Supergraph
+
+When running tests, the tool automatically generates a `run-rover.sh` script in the system's temporary directory (`/${TMP_DIR}$/oas-test/run-rover.sh` on Unix systems). This script can be used to start a local supergraph with the generated schema.
+
+The script includes:
+- Environment variable validation for `APOLLO_KEY` and `APOLLO_GRAPH_REF`
+- Both `rover supergraph compose` and `rover dev` commands
+- Helpful error messages if required environment variables are missing
+
+To use the script:
+
+1. **Set your Apollo Studio credentials**:
+   ```bash
+   export APOLLO_KEY=your_apollo_studio_key
+   export APOLLO_GRAPH_REF=your_graph_ref
+   ```
+
+2. **Run the generated script**:
+   ```bash
+   # Navigate to the test directory
+   cd /${SYSTEM_TMP_DIR}$/oas-test
+   
+   # Make the script executable and run it
+   chmod +x run-rover.sh
+   ./run-rover.sh
+   ```
+
+The script will validate your environment variables and start a local supergraph development server with your generated schema.
+
 ## Generating all paths
 
 Whilst this option is not recommended for large specifications, you can generate all paths without prompting for a specific selection. To do so, you can use the `-n` (or `--skip-selection`) flag. This may result in a very large Apollo Connector schema, might take a long time to process and not be particularly useful, so use with caution.