apollo-conn-gen 0.2.1 → 0.3.0

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

@@ -1 +1 @@
-{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, IType, Prop, Ref, ReferenceObject, Type, Union } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class Composed extends Type {\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    // return `comp:${this.name}`;\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `${Naming.getRefName(this.name)} (Comp)`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', 'In composed schema: ' + this.name);\n    }\n\n    const composedSchema = this.schema;\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n      // deprecated\n      // this.visitOneOfNode(context, composedSchema);\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    const composedSchema = this.schema;\n    if (composedSchema.oneOf != null) {\n      if (this.children.length > 0) {\n        this.children[0].generate(context, writer, selection);\n      }\n    } else if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // writer.write('type ');\n        writer.write(this.kind + ' ');\n        writer.write(Naming.getRefName(this.name));\n        writer.append(this.nameSuffix());\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n\n      ids.add(node instanceof Ref ? (node as Ref).refType!.id : node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types.ts we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      const type = Factory.fromSchema(this, allOfItemSchema as SchemaObject);\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    trace(context, '-> [composed]', 'storing: ' + this.name + ' with: ' + this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  private visitOneOfNode(context: OasContext, schema: SchemaObject): void {\n    const oneOfs = schema.oneOf || [];\n    trace(context, '-> [composed::one-of]', `in: OneOf ${this.name} with size: ${oneOfs.length}`);\n\n    const result = Factory.fromUnion(context, this, oneOfs as SchemaObject[]);\n    if (!result) {\n      throw new Error('Failed to create union type');\n    }\n\n    result.visit(context);\n\n    trace(context, '-> [composed::one-of]', `storing: ${this.name} with: ${this}`);\n    if (this.name != null) {\n      context.store(this.name, this);\n    }\n\n    trace(context, '<- [composed::one-of]', `out: OneOf ${this.name} with size: ${oneOfs.length}`);\n  }\n}\n"]}
+{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, IType, Prop, ReferenceObject, Res, T, Type } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Composed extends Type {\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  get id(): string {\n    // return `comp:${this.name}`;\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[comp] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', '   in composed schema: ' + this.name);\n    }\n\n    const composedSchema = this.schema;\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n      // deprecated\n      // this.visitOneOfNode(context, composedSchema);\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    if (context.inContextOf('Res', this)) {\n      writer.append(Naming.genTypeName(this.name));\n      return;\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.oneOf != null) {\n      if (this.children.length > 0) {\n        this.children[0].generate(context, writer, selection);\n      }\n    } else if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // writer.write('type ');\n        writer.write(this.kind + ' ');\n        writer.write(_.upperFirst(Naming.getRefName(this.name)));\n        writer.append(this.nameSuffix());\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    /*T.composables(this).forEach((child) => {\n      (child as (Composed)).consolidate(selection);\n    });*/\n\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const tree = T.print(this);\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      ids.add(node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types.ts we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      const type = Factory.fromSchema(context, this, allOfItemSchema as SchemaObject);\n      this.add(type);\n\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    const tree = T.print(this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  private visitOneOfNode(context: OasContext, schema: SchemaObject): void {\n    const oneOfs = schema.oneOf || [];\n    trace(context, '-> [composed::one-of]', `in: OneOf ${this.name} with size: ${oneOfs.length}`);\n\n    const result = Factory.fromUnion(context, this, oneOfs as SchemaObject[]);\n    if (!result) {\n      throw new Error('Failed to create union type');\n    }\n\n    result.visit(context);\n\n    trace(context, '-> [composed::one-of]', `storing: ${this.name} with: ${this}`);\n    if (this.name != null) {\n      context.store(this.name, this);\n    }\n\n    trace(context, '<- [composed::one-of]', `out: OneOf ${this.name} with size: ${oneOfs.length}`);\n  }\n\n  add(child: IType): IType {\n    let name = child.name;\n    let idx = 0;\n\n    // TODO: this should not be applicable to Refs\n    while (this.children.some((c) => c.name === name)) {\n      name = `${child.name}:${++idx}`;\n    }\n\n    child.name = name;\n    return super.add(child);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    if (!name) {\n      if (this.parent instanceof Res) {\n        const op = this.parent!.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      } else {\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n    // else if (this.parent instanceof Composed) {\n    //   name = this.parent!.name + 'AllOf';\n    // }\n\n    this.name = name;\n  }\n}\n"]}

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

@@ -5,7 +5,7 @@ import { Writer } from '../io/writer.js';
 export declare class En extends Type {
     schema: SchemaObject;
     items: string[];
-    constructor(parent: IType, schema: SchemaObject, items?: string[]);
+    constructor(parent: IType, name: string | undefined, schema: SchemaObject, items?: string[]);
     get id(): string;
     visit(context: OasContext): void;
     forPrompt(_context: OasContext): string;

package/dist/oas/nodes/en.js

@@ -5,8 +5,8 @@ import { Naming } from '../utils/naming.js';
 export class En extends Type {
     schema;
     items;
-    constructor(parent, schema, items = []) {
-        super(parent, 'enum');
+    constructor(parent, name = 'enum', schema, items = []) {
+        super(parent, name);
         this.schema = schema;
         this.items = items;
     }
@@ -27,7 +27,7 @@ export class En extends Type {
         context.leave(this);
     }
     forPrompt(_context) {
-        return `${Naming.getRefName(this.name)} (Enum): ${this.items.join(', ')}`;
+        return `[enum] ${Naming.getRefName(this.name)}: ${this.items.join(', ')}`;
     }
     generate(context, writer, selection) {
         context.enter(this);

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

@@ -1 +1 @@
-{"version":3,"file":"en.js","sourceRoot":"","sources":["../../../src/oas/nodes/en.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Type } 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 { GqlUtils } from '../utils/gql.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class En extends Type {\n  constructor(\n    parent: IType,\n    public schema: SchemaObject,\n    public items: string[] = [],\n  ) {\n    super(parent, 'enum');\n  }\n\n  get id(): string {\n    return 'enum:' + 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, '-> [enum:visit]', 'in: ' + this.items.toString());\n\n    if (!context.inContextOf('Param', this)) {\n      context.store(this.name, this);\n    }\n\n    this.visited = true;\n\n    trace(context, '<- [enum:visit]', 'out: ' + this.items.toString());\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `${Naming.getRefName(this.name)} (Enum): ${this.items.join(', ')}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [enum::generate]', `-> in: ${this.name}`);\n\n    if (!context.inContextOf('Param', this)) {\n      const builder =\n        'enum ' + Naming.getRefName(this.name) + ' {\\n' + this.items.map((s) => ' ' + s).join(',\\n') + '\\n}\\n\\n';\n      writer.write(builder);\n    }\n    // this covers the case where a union combines a scalar with an enum.\n    else if (!context.inContextOf('Union', this)) {\n      writer.write(GqlUtils.getGQLScalarType(this.schema));\n    }\n\n    // Otherwise, do nothing.\n    trace(context, '<- [enum::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [enum::select]', `-> in: ${this.name}`);\n\n    // do nothing?\n    /*const dependencies = this.dependencies(context);\n    dependencies.forEach((dependency) => {\n      dependency.select(context, writer);\n    });*/\n\n    trace(context, '<- [enum::select]', `-> out: ${this.name}`);\n  }\n}\n"]}
+{"version":3,"file":"en.js","sourceRoot":"","sources":["../../../src/oas/nodes/en.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Type } 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 { GqlUtils } from '../utils/gql.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class En extends Type {\n  constructor(\n    parent: IType,\n    name: string = 'enum',\n    public schema: SchemaObject,\n    public items: string[] = [],\n  ) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    return 'enum:' + 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, '-> [enum:visit]', 'in: ' + this.items.toString());\n\n    if (!context.inContextOf('Param', this)) {\n      context.store(this.name, this);\n    }\n\n    this.visited = true;\n\n    trace(context, '<- [enum:visit]', 'out: ' + this.items.toString());\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[enum] ${Naming.getRefName(this.name)}: ${this.items.join(', ')}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [enum::generate]', `-> in: ${this.name}`);\n\n    if (!context.inContextOf('Param', this)) {\n      const builder =\n        'enum ' + Naming.getRefName(this.name) + ' {\\n' + this.items.map((s) => ' ' + s).join(',\\n') + '\\n}\\n\\n';\n      writer.write(builder);\n    }\n    // this covers the case where a union combines a scalar with an enum.\n    else if (!context.inContextOf('Union', this)) {\n      writer.write(GqlUtils.getGQLScalarType(this.schema));\n    }\n\n    // Otherwise, do nothing.\n    trace(context, '<- [enum::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [enum::select]', `-> in: ${this.name}`);\n\n    // do nothing?\n    /*const dependencies = this.dependencies(context);\n    dependencies.forEach((dependency) => {\n      dependency.select(context, writer);\n    });*/\n\n    trace(context, '<- [enum::select]', `-> out: ${this.name}`);\n  }\n}\n"]}

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

@@ -1,11 +1,14 @@
-import { Get, Post, IType, ReferenceObject, Prop, Param } from './internal.js';
+import { Get, IType, Param, Post, Prop, ReferenceObject } from './internal.js';
 import { Operation } from 'oas/operation';
 import { ParameterObject, SchemaObject } from 'oas/types';
 import { OasContext } from '../oasContext.js';
 export declare class Factory {
     static createGet(name: string, op: Operation): Get;
-    static fromSchema(parent: IType, schema: SchemaObject | ReferenceObject): IType;
-    static fromProp(context: OasContext, parent: IType, propertyName: string, schema: SchemaObject): Prop;
+    static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType;
+    private static createScalarType;
+    private static createContainerType;
+    private static createArrayType;
+    static fromProp(context: OasContext, parent: IType, propName: string, inputSchema: SchemaObject | ReferenceObject): Prop;
     static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType;
     static fromParam(context: OasContext, parent: IType, p: ParameterObject | ReferenceObject): Param;
     static fromCircularRef(parent: IType, child: IType): IType;

package/dist/oas/nodes/factory.js

@@ -1,133 +1,174 @@
-import { Get, Post, Ref, Arr, Composed, Obj, En, Scalar, PropRef, PropArray, PropObj, PropScalar, CircularRef, Union, Response, Param, Body, Put, Patch, Delete, PropComp, } from './internal.js';
+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 _ from 'lodash';
-import { trace, warn } from '../log/trace.js';
-import { Naming } from '../utils/naming.js';
+import { warn } from '../log/trace.js';
 import { GqlUtils } from '../utils/gql.js';
 import { APOLLO_SYNTHETIC_OBJ } from '../schemas/index.js';
 export class Factory {
     static createGet(name, op) {
         return new Get(name, op);
     }
-    static fromSchema(parent, schema) {
+    static fromSchema(context, parent, inputSchema) {
         let result = null;
+        let schema = inputSchema;
+        let ref;
+        // resolve first if reference
         if ('$ref' in schema) {
-            result = new Ref(parent, schema.$ref, schema);
-        }
+            // result = new Ref(parent, schema.$ref as string, schema as ReferenceObject);
+            ref = schema?.$ref;
+            if (ref)
+                schema = context.lookupRef(ref);
+        }
+        if (!schema)
+            throw new Error('Unknown or undefined schema');
+        const schemaObj = schema;
         // array case
-        else if (schema.type === 'array' && schema.items) {
-            // Array schema case.
-            let parentName = parent.name;
-            if (parent instanceof Response) {
-                // Assume parent.parent is a GetOp.
-                const get = parent.parent;
-                parentName = _.upperFirst(get.getGqlOpName());
-            }
-            else {
-                trace(null, '[factory]', 'Factory.fromSchema >>> HERE');
-            }
-            // result = new Arr(parent, parentName, schema.items as ArraySchemaObject);
-            // (result as Arr).itemsType = Factory.fromSchema(result, schema.items as ArraySchemaObject);
-            const arr = new Arr(parent, parentName);
-            const items = schema.items;
-            arr.items = items;
-            arr.itemsType = Factory.fromSchema(arr, items);
-            result = arr;
+        if (schemaObj.type === 'array' && schemaObj.items) {
+            result = this.createArrayType(parent, schemaObj, context);
         }
         // array case
-        else if (schema.type === 'object') {
-            // it's either a union or a composed object
-            if (schema.allOf) {
-                result = new Composed(parent, _.get(schema, 'name') || parent.name, schema);
-            }
-            else if (schema.oneOf) {
-                const oneOfs = schema.oneOf || [];
-                result = new Union(parent, _.get(schema, 'name') || parent.name, oneOfs);
-            }
-            // or a plain obj
-            else {
-                if (!schema.properties) {
-                    warn(null, '[factory]', 'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot());
-                }
-                result = new Obj(parent, _.get(schema, 'name') || null, schema);
-                if (schema.format == APOLLO_SYNTHETIC_OBJ) {
-                    result.synthetic = true;
-                }
-            }
-        }
-        // Composed schema case.
-        else if (schema.oneOf) {
-            const oneOfs = schema.oneOf || [];
-            result = new Union(parent, _.get(schema, 'name') || parent.name, oneOfs);
-        }
-        else if (schema.allOf) {
-            result = new Composed(parent, _.get(schema, 'name') || parent.name, schema);
+        else if (schemaObj?.type === 'object' || schemaObj?.oneOf || schemaObj?.allOf || !_.isEmpty(schemaObj.properties)) {
+            result = this.createContainerType(parent, schemaObj, ref);
         }
         // scalar
         else {
-            const typeStr = schema.type;
-            if (typeStr != null) {
-                if (typeStr === 'array') {
-                    throw new Error(`Should have been handled already? ${typeStr}, schema: ${JSON.stringify(schema)}`);
-                }
-                else if (schema.enum != null) {
-                    result = new En(parent, schema, schema.enum);
-                }
-                // scalar case
-                else if (GqlUtils.gqlScalar(typeStr)) {
-                    const scalarType = GqlUtils.getGQLScalarType(schema);
-                    result = new Scalar(parent, scalarType, schema);
-                }
-                // or we have no idea how to handle this
-                else {
-                    throw new Error(`Cannot handle property type ${typeStr}, schema: ${JSON.stringify(schema)}`);
-                }
+            result = this.createScalarType(schemaObj, parent);
+        }
+        // we could not infer a proper type
+        if (result == null) {
+            throw new Error(`Not yet implemented for ${JSON.stringify(schemaObj)}`);
+        }
+        return result;
+    }
+    static createScalarType(schema, parent) {
+        const typeStr = schema?.type;
+        if (typeStr != null) {
+            if (typeStr === 'array') {
+                throw new Error(`Should have been handled already? ${typeStr}, schema: ${JSON.stringify(schema)}`);
+            }
+            else if (schema?.enum != null) {
+                return new En(parent, 'enum', schema, schema.enum);
             }
-            else if (schema.enum != null) {
-                result = new En(parent, schema, _.get(schema, 'enum'));
+            // scalar case
+            else if (GqlUtils.gqlScalar(typeStr)) {
+                const scalarType = GqlUtils.getGQLScalarType(schema);
+                return new Scalar(parent, scalarType, schema);
             }
             // or we have no idea how to handle this
             else {
-                throw new Error(`Cannot handle schema ${parent.pathToRoot()}, schema: ${JSON.stringify(schema)}`);
+                throw new Error(`Cannot handle property type ${typeStr}, schema: ${JSON.stringify(schema)}`);
             }
         }
-        if (result != null) {
-            parent.add(result);
+        else if (schema?.enum != null) {
+            return new En(parent, 'enum', schema, _.get(schema, 'enum'));
         }
-        // we could not infer a proper type
+        // or we have no idea how to handle this
         else {
-            throw new Error(`Not yet implemented for ${JSON.stringify(schema)}`);
+            throw new Error(`Cannot handle schema ${parent.pathToRoot()}, schema: ${JSON.stringify(schema)}`);
+        }
+    }
+    static createContainerType(parent, schema, ref) {
+        let result;
+        // composed object
+        if (schema.allOf) {
+            result = new Composed(parent, ref || _.get(schema, 'name'), schema);
+        }
+        // union
+        else if (schema.oneOf) {
+            const oneOfs = schema.oneOf || [];
+            result = new Union(parent, ref || _.get(schema, 'name'), oneOfs);
+        }
+        // or a plain obj
+        else {
+            if (!schema.properties) {
+                warn(null, '[factory]', 'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot());
+            }
+            result = new Obj(parent, ref || _.get(schema, 'name') || null, schema);
+            // if we want to syntethise an object:
+            if (schema.format == APOLLO_SYNTHETIC_OBJ) {
+                result.synthetic = true;
+            }
         }
         return result;
     }
-    static fromProp(context, parent, propertyName, schema) {
-        if (!schema) {
-            throw new Error(`Should have a schema defined for property '${propertyName}' (parent: '${parent.name}')`);
+    static createArrayType(parent, schema, context) {
+        // Array schema case.
+        let parentName = parent.name;
+        if (parent instanceof Res) {
+            const get = parent.parent; // Assume parent.parent is a GetOp.
+            parentName = _.upperFirst(get.getGqlOpName());
+        }
+        const arr = new Arr(parent, parentName);
+        const items = _.get(schema, 'items');
+        arr.items = items;
+        // TODO: check this
+        arr.itemsType = Factory.fromSchema(context, arr, items);
+        arr.add(arr.itemsType); // add it to the children
+        return arr;
+    }
+    static fromProp(context, parent, propName, inputSchema) {
+        if (!inputSchema) {
+            throw new Error(`Should have a schema defined for property '${propName}' (parent: '${parent.name}')`);
         }
-        const type = schema.type;
+        let schema = inputSchema;
         let prop;
-        if (!type && '$ref' in schema) {
-            prop = new PropRef(parent, propertyName, schema, schema.$ref);
+        let ref;
+        if (!_.get(schema, 'type') && '$ref' in schema) {
+            ref = schema.$ref;
+            schema = context.lookupRef(ref);
+            // this was a prop ref, but now needs to be returned as the ref directly?
+            // prop = new PropRef(parent, propName, schema, ref);
+            // return prop;
         }
         // uses the type of the schema to find out what kind of property it is
-        else if (type) {
+        const schemaObj = schema;
+        const type = schemaObj.type;
+        if (type) {
             // 1st case is if the type is an array
             if (type === 'array') {
-                const array = new PropArray(parent, propertyName, schema);
-                const itemsName = Naming.genArrayItems(propertyName);
-                const itemsType = Factory.fromProp(context, array, itemsName, schema.items);
+                const array = new PropArray(parent, propName, schema);
+                // const itemsName = Naming.genArrayItems(propName);
+                const itemsSchema = _.get(schemaObj, 'items');
+                // const itemsType = Factory.fromProp(context, array, itemsName, itemsSchema); // TODO: re-test
+                const itemsType = Factory.fromSchema(context, array, itemsSchema);
                 array.setItems(itemsType);
                 prop = array;
             }
             // 2nd checks for obj property
-            else if (type === 'object') {
-                // the type of the property will be an object, which needs to be added as a child
-                const propType = new Obj(parent, propertyName, schema);
-                prop = new PropObj(parent, propertyName, schema, propType);
+            else if (schemaObj?.type === 'object' ||
+                schemaObj?.oneOf ||
+                schemaObj?.allOf ||
+                !_.isEmpty(schemaObj.properties)) {
+                if (schemaObj.oneOf) {
+                    const inner = new PropComp(parent, propName, schemaObj);
+                    inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf);
+                    prop = inner;
+                }
+                else if (schemaObj.allOf) {
+                    const propComp = new PropComp(parent, propName, schemaObj);
+                    propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);
+                    prop = propComp;
+                }
+                else if (schemaObj.properties != null) {
+                    const propType = new Obj(parent, ref || propName, schemaObj);
+                    prop = new PropObj(parent, propName, schemaObj, propType);
+                }
+                else {
+                    // the type of the property will be an object, which needs to be added as a child
+                    const propType = new Obj(parent, ref || propName, schemaObj);
+                    prop = new PropObj(parent, propName, schemaObj, propType);
+                }
+            }
+            else if (ref && schemaObj?.enum) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options
+                const stringEnum = _.every(schemaObj.enum, (value, _) => typeof value === 'string');
+                const en = new En(parent, ref, schemaObj, stringEnum ? schemaObj.enum : []);
+                prop = new PropEn(parent, propName, ref, schemaObj);
+                prop.add(en);
             }
             // 3rd tries for scalar
             else if (GqlUtils.gqlScalar(type)) {
                 const scalar = GqlUtils.gqlScalar(type);
-                prop = new PropScalar(parent, propertyName, scalar, schema);
+                prop = new PropScalar(parent, propName, scalar, schemaObj);
             }
             // or we don't know how to handle this
             else {
@@ -135,31 +176,33 @@ export class Factory {
             }
         }
         // otherwise let's use the properties instead and assume an Obj
-        else if (schema.properties != null) {
-            const propType = new Obj(parent, propertyName, schema);
-            prop = new PropObj(parent, propertyName, schema, propType);
-        }
-        else if (schema.oneOf) {
-            const propComp = new PropComp(parent, propertyName, schema);
-            propComp.comp = new Union(propComp, _.get(schema, 'name') || parent.name, schema.oneOf);
+        // TODO: repeated code
+        else if (schemaObj.oneOf) {
+            const inner = new PropComp(parent, propName, schemaObj);
+            inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf);
+            prop = inner;
+        }
+        else if (schemaObj.allOf) {
+            const propComp = new PropComp(parent, propName, schemaObj);
+            propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);
             prop = propComp;
         }
-        else if (schema.allOf) {
-            const propComp = new PropComp(parent, propertyName, schema);
-            propComp.comp = new Composed(propComp, _.get(schema, 'name') || parent.name, schema);
-            prop = propComp;
+        else if (schemaObj.properties != null) {
+            const propType = new Obj(parent, ref || propName, schemaObj);
+            prop = new PropObj(parent, propName, schemaObj, propType);
         }
         // default case, we don't know what to do so we'll create a scalar of type JSON
         else {
-            prop = new PropScalar(parent, propertyName, 'JSON', schema);
+            prop = new PropScalar(parent, propName, 'JSON', schemaObj);
         }
-        if (parent.ancestors().includes(prop)) {
-            console.warn('[factory] Recursion detected! Ancestors already contain this type: \n' + prop.pathToRoot());
+        if (parent.ancestors().find((a) => a.id === prop.id)) {
+            console.warn('[factory] Recursion detected! Ancestors already contain this type: \n' + prop.id);
+            prop = new PropCircRef(parent, prop);
         }
         return prop;
     }
     static fromResponse(_context, parent, mediaSchema) {
-        return new Response(parent, 'r', mediaSchema);
+        return new Res(parent, 'r', mediaSchema);
     }
     static fromParam(context, parent, p) {
         let param;
@@ -179,6 +222,7 @@ export class Factory {
         return new Param(parent, param.name, schema, required, schema.default, param);
     }
     static fromCircularRef(parent, child) {
+        const _tree = T.print(parent);
         const circularRef = new CircularRef(parent, child.name);
         circularRef.ref = child;
         return circularRef;

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  Get,\n  Post,\n  IType,\n  Ref,\n  ReferenceObject,\n  Arr,\n  Composed,\n  Obj,\n  En,\n  Scalar,\n  Prop,\n  PropRef,\n  PropArray,\n  PropObj,\n  PropScalar,\n  CircularRef,\n  Union,\n  Response,\n  Param,\n  Body,\n  Put,\n  Patch,\n  Delete,\n  PropComp,\n} from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { ParameterObject, SchemaObject } from 'oas/types';\nimport { OpenAPIV3 } from 'openapi-types';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\nimport _ from 'lodash';\nimport { trace, warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Naming } from '../utils/naming.js';\nimport { GqlUtils } from '../utils/gql.js';\nimport { APOLLO_SYNTHETIC_OBJ } from '../schemas/index.js';\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(parent: IType, schema: SchemaObject | ReferenceObject): IType {\n    let result: IType | null = null;\n\n    if ('$ref' in schema) {\n      result = new Ref(parent, schema.$ref as string, schema as ReferenceObject);\n    }\n    // array case\n    else if (schema.type === 'array' && schema.items) {\n      // Array schema case.\n      let parentName = parent.name;\n      if (parent instanceof Response) {\n        // Assume parent.parent is a GetOp.\n        const get = parent.parent as Get;\n        parentName = _.upperFirst(get.getGqlOpName());\n      } else {\n        trace(null, '[factory]', 'Factory.fromSchema >>> HERE');\n      }\n\n      // result = new Arr(parent, parentName, schema.items as ArraySchemaObject);\n      // (result as Arr).itemsType = Factory.fromSchema(result, schema.items as ArraySchemaObject);\n      const arr = new Arr(parent, parentName);\n\n      const items = schema.items as ArraySchemaObject;\n      arr.items = items;\n      arr.itemsType = Factory.fromSchema(arr, items);\n\n      result = arr;\n    }\n    // array case\n    else if (schema.type === 'object') {\n      // it's either a union or a composed object\n      if (schema.allOf) {\n        result = new Composed(parent, _.get(schema, 'name') || parent.name, schema);\n      } else if (schema.oneOf) {\n        const oneOfs = schema.oneOf || [];\n        result = new Union(parent, _.get(schema, 'name') || parent.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, _.get(schema, 'name') || null, schema);\n        if (schema.format == APOLLO_SYNTHETIC_OBJ) {\n          (result as Obj).synthetic = true;\n        }\n      }\n    }\n    // Composed schema case.\n    else if (schema.oneOf) {\n      const oneOfs = schema.oneOf || [];\n      result = new Union(parent, _.get(schema, 'name') || parent.name, oneOfs as SchemaObject[]);\n    } else if (schema.allOf) {\n      result = new Composed(parent, _.get(schema, 'name') || parent.name, schema);\n    }\n    // scalar\n    else {\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          result = new En(parent, schema, schema.enum! as string[]);\n        }\n        // scalar case\n        else if (GqlUtils.gqlScalar(typeStr as string)) {\n          const scalarType = GqlUtils.getGQLScalarType(schema);\n          result = 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        result = new En(parent, 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    if (result != null) {\n      parent.add(result);\n    }\n    // we could not infer a proper type\n    else {\n      throw new Error(`Not yet implemented for ${JSON.stringify(schema)}`);\n    }\n\n    return result;\n  }\n\n  public static fromProp(context: OasContext, parent: IType, propertyName: string, schema: SchemaObject): Prop {\n    if (!schema) {\n      throw new Error(`Should have a schema defined for property '${propertyName}' (parent: '${parent.name}')`);\n    }\n\n    const type = schema.type;\n    let prop: Prop;\n\n    if (!type && '$ref' in schema) {\n      prop = new PropRef(parent, propertyName, schema, (schema as ReferenceObject).$ref);\n    }\n    // uses the type of the schema to find out what kind of property it is\n    else if (type) {\n      // 1st case is if the type is an array\n      if (type === 'array') {\n        const array = new PropArray(parent, propertyName, schema);\n\n        const itemsName = Naming.genArrayItems(propertyName);\n        const itemsType = Factory.fromProp(context, array, itemsName, schema.items as ArraySchemaObject);\n\n        array.setItems(itemsType);\n\n        prop = array;\n      }\n      // 2nd checks for obj property\n      else if (type === 'object') {\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, propertyName, schema);\n        prop = new PropObj(parent, propertyName, schema, propType);\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, propertyName, scalar as string, schema);\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    else if (schema.properties != null) {\n      const propType: IType = new Obj(parent, propertyName, schema);\n      prop = new PropObj(parent, propertyName, schema, propType);\n    } else if (schema.oneOf) {\n      const propComp: PropComp = new PropComp(parent, propertyName, schema);\n      propComp.comp = new Union(propComp, _.get(schema, 'name') || parent.name, schema.oneOf as SchemaObject[]);\n      prop = propComp;\n    } else if (schema.allOf) {\n      const propComp: PropComp = new PropComp(parent, propertyName, schema);\n      propComp.comp = new Composed(propComp, _.get(schema, 'name') || parent.name, schema);\n      prop = propComp;\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, propertyName, 'JSON', schema);\n    }\n\n    if (parent.ancestors().includes(prop)) {\n      console.warn('[factory] Recursion detected! Ancestors already contain this type: \\n' + prop.pathToRoot());\n    }\n\n    return prop;\n  }\n\n  public static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType {\n    return new Response(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 circularRef = new CircularRef(parent, child.name);\n    circularRef.ref = child;\n    return circularRef;\n  }\n\n  public static fromUnion(_context: OasContext, parent: IType, oneOfs: SchemaObject[]): IType {\n    const union = new Union(parent, parent.name, oneOfs);\n    parent.add(union);\n    return union;\n  }\n\n  public static fromPost(name: string, op: Operation): Post {\n    return new Post(name, op);\n  }\n\n  public static fromPut(name: string, op: Operation): Post {\n    return new Put(name, op);\n  }\n\n  public static fromPatch(name: string, op: Operation): Post {\n    return new Patch(name, op);\n  }\n\n  public static fromDelete(name: string, op: Operation): Post {\n    return new Delete(name, op);\n  }\n\n  public static fromBody(_context: OasContext, parent: IType, schema: SchemaObject): IType {\n    const body = new Body(parent, 'b', schema);\n    parent.add(body);\n    return body;\n  }\n}\n"]}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/oas/nodes/factory.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Arr,\n  Body,\n  CircularRef,\n  Composed,\n  Delete,\n  En,\n  Get,\n  IType,\n  Obj,\n  Param,\n  Patch,\n  Post,\n  Prop,\n  PropArray,\n  PropCircRef,\n  PropComp,\n  PropObj,\n  PropScalar,\n  Put,\n  ReferenceObject,\n  Res,\n  Scalar,\n  T,\n  Union,\n  PropEn,\n} from './internal.js';\nimport { Operation } from 'oas/operation';\nimport { ParameterObject, SchemaObject } from 'oas/types';\nimport { OpenAPIV3 } from 'openapi-types';\nimport _ from 'lodash';\nimport { warn } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { GqlUtils } from '../utils/gql.js';\nimport { APOLLO_SYNTHETIC_OBJ } from '../schemas/index.js';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\n\nexport class Factory {\n  public static createGet(name: string, op: Operation): Get {\n    return new Get(name, op);\n  }\n\n  public static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType {\n    let result: IType | null = null;\n    let schema: SchemaObject | ReferenceObject | undefined = inputSchema;\n    let ref: string | undefined;\n\n    // resolve first if reference\n    if ('$ref' in schema) {\n      // result = new Ref(parent, schema.$ref as string, schema as ReferenceObject);\n      ref = schema?.$ref;\n      if (ref) schema = context.lookupRef(ref) as SchemaObject;\n    }\n\n    if (!schema) throw new Error('Unknown or undefined schema');\n    const schemaObj: SchemaObject = schema as SchemaObject;\n\n    // array case\n    if (schemaObj.type === 'array' && schemaObj.items) {\n      result = this.createArrayType(parent, schemaObj, context);\n    }\n    // array case\n    else if (schemaObj?.type === 'object' || schemaObj?.oneOf || schemaObj?.allOf || !_.isEmpty(schemaObj.properties)) {\n      result = this.createContainerType(parent, schemaObj, ref);\n    }\n    // scalar\n    else {\n      result = this.createScalarType(schemaObj, parent);\n    }\n\n    // we could not infer a proper type\n    if (result == null) {\n      throw new Error(`Not yet implemented for ${JSON.stringify(schemaObj)}`);\n    }\n\n    return result;\n  }\n\n  private static createScalarType(schema: SchemaObject | null, parent: IType) {\n    const typeStr = schema?.type;\n    if (typeStr != null) {\n      if (typeStr === 'array') {\n        throw new Error(`Should have been handled already? ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      } else if (schema?.enum != null) {\n        return new En(parent, 'enum', schema, schema.enum! as string[]);\n      }\n      // scalar case\n      else if (GqlUtils.gqlScalar(typeStr as string)) {\n        const scalarType = GqlUtils.getGQLScalarType(schema!);\n        return new Scalar(parent, scalarType, schema!);\n      }\n      // or we have no idea how to handle this\n      else {\n        throw new Error(`Cannot handle property type ${typeStr}, schema: ${JSON.stringify(schema)}`);\n      }\n    } else if (schema?.enum != null) {\n      return new En(parent, 'enum', schema, _.get(schema, 'enum') as string[]);\n    }\n    // or we have no idea how to handle this\n    else {\n      throw new Error(`Cannot handle schema ${parent.pathToRoot()}, schema: ${JSON.stringify(schema)}`);\n    }\n  }\n\n  private static createContainerType(parent: IType, schema: SchemaObject, ref?: string) {\n    let result: IType | null;\n\n    // composed object\n    if (schema.allOf) {\n      result = new Composed(parent, ref || _.get(schema, 'name'), schema);\n    }\n    // union\n    else if (schema.oneOf) {\n      const oneOfs = schema.oneOf || [];\n      result = new Union(parent, ref || _.get(schema, 'name'), oneOfs as SchemaObject[]);\n    }\n    // or a plain obj\n    else {\n      if (!schema.properties) {\n        warn(\n          null,\n          '[factory]',\n          'Object has no properties: ' + JSON.stringify(schema, null, 2) + ' in: ' + parent.pathToRoot(),\n        );\n      }\n\n      result = new Obj(parent, ref || _.get(schema, 'name') || null, schema);\n\n      // if we want to syntethise an object:\n      if (schema.format == APOLLO_SYNTHETIC_OBJ) {\n        (result as Obj).synthetic = true;\n      }\n    }\n\n    return result;\n  }\n\n  private static createArrayType(parent: IType | Res, schema: SchemaObject | null, context: OasContext) {\n    // Array schema case.\n    let parentName = parent.name;\n    if (parent instanceof Res) {\n      const get = parent.parent as Get; // Assume parent.parent is a GetOp.\n      parentName = _.upperFirst(get.getGqlOpName());\n    }\n\n    const arr = new Arr(parent, parentName);\n    const items = _.get(schema, 'items') as ArraySchemaObject;\n    arr.items = items;\n\n    // TODO: check this\n    arr.itemsType = Factory.fromSchema(context, arr, items);\n    arr.add(arr.itemsType); // add it to the children\n\n    return arr;\n  }\n\n  public static fromProp(\n    context: OasContext,\n    parent: IType,\n    propName: string,\n    inputSchema: SchemaObject | ReferenceObject,\n  ): Prop {\n    if (!inputSchema) {\n      throw new Error(`Should have a schema defined for property '${propName}' (parent: '${parent.name}')`);\n    }\n\n    let schema: SchemaObject | ReferenceObject | null = inputSchema;\n\n    let prop: Prop;\n    let ref: string | undefined;\n\n    if (!_.get(schema, 'type') && '$ref' in schema) {\n      ref = (schema as ReferenceObject).$ref;\n      schema = context.lookupRef(ref);\n      // this was a prop ref, but now needs to be returned as the ref directly?\n      // prop = new PropRef(parent, propName, schema, ref);\n      // return prop;\n    }\n\n    // uses the type of the schema to find out what kind of property it is\n    const schemaObj = schema as SchemaObject;\n    const type = schemaObj.type;\n\n    if (type) {\n      // 1st case is if the type is an array\n      if (type === 'array') {\n        const array = new PropArray(parent, propName, schema!);\n        // const itemsName = Naming.genArrayItems(propName);\n\n        const itemsSchema = _.get(schemaObj, 'items') as ArraySchemaObject;\n        // const itemsType = Factory.fromProp(context, array, itemsName, itemsSchema); // TODO: re-test\n        const itemsType = Factory.fromSchema(context, array, itemsSchema);\n\n        array.setItems(itemsType);\n        prop = array;\n      }\n      // 2nd checks for obj property\n      else if (\n        schemaObj?.type === 'object' ||\n        schemaObj?.oneOf ||\n        schemaObj?.allOf ||\n        !_.isEmpty(schemaObj.properties)\n      ) {\n        if (schemaObj.oneOf) {\n          const inner: PropComp = new PropComp(parent, propName, schemaObj);\n          inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf as SchemaObject[]);\n          prop = inner;\n        } else if (schemaObj.allOf) {\n          const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n          propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n          prop = propComp;\n        } else if (schemaObj.properties != null) {\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        } else {\n          // the type of the property will be an object, which needs to be added as a child\n          const propType: IType = new Obj(parent, ref || propName, schemaObj);\n          prop = new PropObj(parent, propName, schemaObj, propType);\n        }\n      } else if (ref && schemaObj?.enum) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options\n        const stringEnum = _.every(schemaObj.enum, (value: any, _: string) => typeof value === 'string');\n        const en: En = new En(parent, ref, schemaObj, stringEnum ? (schemaObj.enum as string[]) : []);\n\n        prop = new PropEn(parent, propName, ref, schemaObj);\n        prop.add(en);\n      }\n      // 3rd tries for scalar\n      else if (GqlUtils.gqlScalar(type as string)) {\n        const scalar = GqlUtils.gqlScalar(type as string);\n        prop = new PropScalar(parent, propName, scalar as string, schemaObj);\n      }\n      // or we don't know how to handle this\n      else {\n        throw new Error('Cannot handle property type ' + type);\n      }\n    }\n    // otherwise let's use the properties instead and assume an Obj\n    // TODO: repeated code\n    else if (schemaObj.oneOf) {\n      const inner: PropComp = new PropComp(parent, propName, schemaObj);\n      inner.comp = new Union(inner, ref || _.get(schemaObj, 'name'), schemaObj.oneOf as SchemaObject[]);\n      prop = inner;\n    } else if (schemaObj.allOf) {\n      const propComp: PropComp = new PropComp(parent, propName, schemaObj);\n      propComp.comp = new Composed(propComp, ref || _.get(schemaObj, 'name'), schemaObj);\n      prop = propComp;\n    } else if (schemaObj.properties != null) {\n      const propType: IType = new Obj(parent, ref || propName, schemaObj);\n      prop = new PropObj(parent, propName, schemaObj, propType);\n    }\n    // default case, we don't know what to do so we'll create a scalar of type JSON\n    else {\n      prop = new PropScalar(parent, propName, 'JSON', schemaObj);\n    }\n\n    if (parent.ancestors().find((a) => a.id === prop.id)) {\n      console.warn('[factory] Recursion detected! Ancestors already contain this type: \\n' + prop.id);\n      prop = new PropCircRef(parent, prop);\n    }\n\n    return prop;\n  }\n\n  public static fromResponse(_context: OasContext, parent: IType, mediaSchema: SchemaObject): IType {\n    return new Res(parent, 'r', mediaSchema);\n  }\n\n  public static fromParam(context: OasContext, parent: IType, p: ParameterObject | ReferenceObject): Param {\n    let param: ParameterObject;\n\n    if ('$ref' in p) {\n      const ref: ReferenceObject = p as ReferenceObject;\n      const schema = context.lookupParam(ref.$ref);\n\n      if (!schema) {\n        throw new Error('Schema not found for ref: ' + ref.$ref);\n      }\n      param = schema as ParameterObject;\n    } else {\n      param = p as ParameterObject;\n    }\n\n    const schema = param.schema as SchemaObject;\n    const required = param.required === true;\n\n    return new Param(parent, param.name, schema, required, schema.default, param);\n  }\n\n  public static fromCircularRef(parent: IType, child: IType): IType {\n    const _tree = T.print(parent);\n\n    const circularRef = new CircularRef(parent, child.name);\n    circularRef.ref = child;\n    return circularRef;\n  }\n\n  public static fromUnion(_context: OasContext, parent: IType, oneOfs: SchemaObject[]): IType {\n    const union = new Union(parent, parent.name, oneOfs);\n    parent.add(union);\n    return union;\n  }\n\n  public static fromPost(name: string, op: Operation): Post {\n    return new Post(name, op);\n  }\n\n  public static fromPut(name: string, op: Operation): Post {\n    return new Put(name, op);\n  }\n\n  public static fromPatch(name: string, op: Operation): Post {\n    return new Patch(name, op);\n  }\n\n  public static fromDelete(name: string, op: Operation): Post {\n    return new Delete(name, op);\n  }\n\n  public static fromBody(_context: OasContext, parent: IType, schema: SchemaObject): IType {\n    const body = new Body(parent, 'b', schema);\n    parent.add(body);\n    return body;\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
-import { Prop } from './prop.js';
+import { Prop } from './internal.js';
 import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';
 export type Kind = 'input' | 'type';
@@ -12,7 +12,7 @@ export interface IType {
     kind: Kind;
     visited: boolean;
     forPrompt(context: OasContext): string;
-    add(child: IType): void;
+    add(child: IType): IType;
     ancestors(): IType[];
     visit(context: OasContext): void;
     generate(context: OasContext, writer: Writer, selection: string[]): void;

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

@@ -1 +1 @@
-{"version":3,"file":"iType.js","sourceRoot":"","sources":["../../../src/oas/nodes/iType.ts"],"names":[],"mappings":"","sourcesContent":["import { Prop } from './prop.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\n\nexport type Kind = 'input' | 'type';\n\nexport interface IType {\n  name: string;\n  parent?: IType;\n  children: IType[];\n  circularRef?: IType;\n  props: Map<string, Prop>;\n  id: string;\n  kind: Kind;\n  visited: boolean;\n\n  forPrompt(context: OasContext): string;\n\n  add(child: IType): void;\n\n  ancestors(): IType[];\n\n  visit(context: OasContext): void;\n\n  generate(context: OasContext, writer: Writer, selection: string[]): void;\n\n  pathToRoot(): string;\n\n  path(): string;\n\n  expand(context: OasContext): IType[];\n\n  find(path: string, collection: IType[]): IType | boolean;\n\n  select(context: OasContext, writer: Writer, selection: string[]): void;\n}\n"]}
+{"version":3,"file":"iType.js","sourceRoot":"","sources":["../../../src/oas/nodes/iType.ts"],"names":[],"mappings":"","sourcesContent":["import { Prop } from './internal.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\n\nexport type Kind = 'input' | 'type';\n\nexport interface IType {\n  name: string;\n  parent?: IType;\n  children: IType[];\n  circularRef?: IType;\n  props: Map<string, Prop>;\n  id: string;\n  kind: Kind;\n  visited: boolean;\n\n  forPrompt(context: OasContext): string;\n\n  add(child: IType): IType;\n\n  ancestors(): IType[];\n\n  visit(context: OasContext): void;\n\n  generate(context: OasContext, writer: Writer, selection: string[]): void;\n\n  pathToRoot(): string;\n\n  path(): string;\n\n  expand(context: OasContext): IType[];\n\n  find(path: string, collection: IType[]): IType | boolean;\n\n  select(context: OasContext, writer: Writer, selection: string[]): void;\n}\n"]}

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

@@ -15,14 +15,14 @@ export { Patch } from './patch.js';
 export { Delete } from './delete.js';
 export { Body } from './body.js';
 export { Obj } from './obj.js';
-export { Ref } from './ref.js';
-export { Response } from './response.js';
+export { Res } from './res.js';
 export { Scalar } from './scalar.js';
 export { Union } from './union.js';
 export { PropArray } from './propArray.js';
 export { PropObj } from './propObj.js';
 export { PropComp } from './propComp.js';
-export { PropRef } from './propRef.js';
+export { PropCircRef } from './propCircRef.js';
+export { PropEn } from './propEn.js';
 export { PropScalar } from './propScalar.js';
 export { T } from './typeUtils.js';
 export { type Op } from './op.js';