apollo-conn-gen 0.2.1 → 0.3.0

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

@@ -1,5 +1,4 @@
-import { IType } from './internal.js';
-import { Prop } from './internal.js';
+import { IType, Prop } from './internal.js';
 import { SchemaObject } from 'oas/types';
 import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';

package/dist/oas/nodes/propObj.js

@@ -1,5 +1,4 @@
-import { Obj, Union } from './internal.js';
-import { Prop } from './internal.js';
+import { Obj, Union, Prop } from './internal.js';
 import _ from 'lodash';
 import { trace } from '../log/trace.js';
 import { Composed } from './comp.js';
@@ -20,7 +19,7 @@ export class PropObj extends Prop {
         }
     }
     forPrompt(_context) {
-        return _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.obj.name) + ' (Obj)';
+        return '[prop] ' + _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.obj.name) + ' (Obj)';
     }
     get id() {
         return 'prop:obj:' + this.name;
@@ -45,7 +44,7 @@ export class PropObj extends Prop {
         // compose for now.
         if (_.isEmpty(this.obj?.props))
             return 'JSON';
-        return Naming.genTypeName(this.name);
+        return Naming.genTypeName(this.obj.name) + this.obj.nameSuffix();
     }
     select(context, writer, selection) {
         trace(context, '-> [prop-obj:select]', 'in ' + this.name + ', obj: ' + this.obj.name);

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

@@ -1 +1 @@
-{"version":3,"file":"propObj.js","sourceRoot":"","sources":["../../../src/oas/nodes/propObj.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Obj, Union } from './internal.js';\nimport { Prop } from './internal.js';\nimport _ from 'lodash';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { Composed } from './comp.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class PropObj extends Prop {\n  constructor(\n    parent: IType,\n    name: string,\n    public schema: SchemaObject,\n    public obj: IType,\n  ) {\n    super(parent, name, schema);\n    if (!obj) {\n      throw new Error('obj parameter is required');\n    }\n\n    // TODO: check if re-parenting is necessary?!?!\n    if (obj.parent !== this) {\n      obj.parent = this;\n    }\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.obj.name) + ' (Obj)';\n  }\n\n  get id(): string {\n    return 'prop:obj:' + 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-obj:visit]', 'in ' + this.name + ', obj: ' + this.obj.name);\n\n    this.obj.visit(context);\n    if (!this.children.includes(this.obj)) {\n      this.add(this.obj);\n    }\n    this.visited = true;\n\n    trace(context, '<- [prop-obj:visit]', 'out ' + this.name + ', obj: ' + this.obj.name);\n    context.leave(this);\n  }\n\n  public getValue(context: OasContext): string {\n    // we'll make an assumption here: that if the child obj has no properties,\n    // then it's a free-form JSON payload. not sure if the right one, but it will\n    // compose for now.\n    if (_.isEmpty(this.obj?.props)) return 'JSON';\n\n    return Naming.genTypeName(this.name);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-obj:select]', 'in ' + this.name + ', obj: ' + this.obj.name);\n\n    const fieldName = this.name;\n    const sanitised = Naming.sanitiseFieldForSelect(fieldName);\n\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    if (this.needsBrackets(this.obj!)) {\n      writer.append(' {').append('\\n');\n      context.enter(this);\n    }\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (this.needsBrackets(this.obj!)) {\n      context.leave(this);\n      writer.append(' '.repeat(context.indent + context.stack.length)).append('}');\n    }\n    // writer.append('\\n');\n    if (context.generateOptions.debugParentInSelection) {\n      writer.append(' # ').append(Naming.getRefName(this.parent!.name));\n    }\n\n    writer.append('\\n');\n\n    trace(context, '<- [prop-obj:select]', 'out ' + this.name + ', obj: ' + this.obj?.name);\n  }\n\n  private needsBrackets(child: IType): boolean {\n    return (child instanceof Obj || child instanceof Union || child instanceof Composed) && !_.isEmpty(child.props);\n  }\n}\n"]}
+{"version":3,"file":"propObj.js","sourceRoot":"","sources":["../../../src/oas/nodes/propObj.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Obj, Union, Prop } from './internal.js';\nimport _ from 'lodash';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { Composed } from './comp.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class PropObj extends Prop {\n  constructor(\n    parent: IType,\n    name: string,\n    public schema: SchemaObject,\n    public obj: IType,\n  ) {\n    super(parent, name, schema);\n    if (!obj) {\n      throw new Error('obj parameter is required');\n    }\n\n    // TODO: check if re-parenting is necessary?!?!\n    if (obj.parent !== this) {\n      obj.parent = this;\n    }\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return '[prop] ' + _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.obj.name) + ' (Obj)';\n  }\n\n  get id(): string {\n    return 'prop:obj:' + 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-obj:visit]', 'in ' + this.name + ', obj: ' + this.obj.name);\n\n    this.obj.visit(context);\n    if (!this.children.includes(this.obj)) {\n      this.add(this.obj);\n    }\n    this.visited = true;\n\n    trace(context, '<- [prop-obj:visit]', 'out ' + this.name + ', obj: ' + this.obj.name);\n    context.leave(this);\n  }\n\n  public getValue(context: OasContext): string {\n    // we'll make an assumption here: that if the child obj has no properties,\n    // then it's a free-form JSON payload. not sure if the right one, but it will\n    // compose for now.\n    if (_.isEmpty(this.obj?.props)) return 'JSON';\n\n    return Naming.genTypeName(this.obj!.name!) + (this.obj as Obj).nameSuffix();\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-obj:select]', 'in ' + this.name + ', obj: ' + this.obj.name);\n\n    const fieldName = this.name;\n    const sanitised = Naming.sanitiseFieldForSelect(fieldName);\n\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    if (this.needsBrackets(this.obj!)) {\n      writer.append(' {').append('\\n');\n      context.enter(this);\n    }\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (this.needsBrackets(this.obj!)) {\n      context.leave(this);\n      writer.append(' '.repeat(context.indent + context.stack.length)).append('}');\n    }\n    // writer.append('\\n');\n    if (context.generateOptions.debugParentInSelection) {\n      writer.append(' # ').append(Naming.getRefName(this.parent!.name));\n    }\n\n    writer.append('\\n');\n\n    trace(context, '<- [prop-obj:select]', 'out ' + this.name + ', obj: ' + this.obj?.name);\n  }\n\n  private needsBrackets(child: IType): boolean {\n    return (child instanceof Obj || child instanceof Union || child instanceof Composed) && !_.isEmpty(child.props);\n  }\n}\n"]}

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

@@ -1,19 +1,20 @@
 import { OasContext } from '../oasContext.js';
-import { IType } from './internal.js';
-import { Prop } from './internal.js';
+import { Prop, IType } from './internal.js';
 import { SchemaObject } from 'oas/types';
 import { Writer } from '../io/writer.js';
+/**
+ * @deprecated No longer used
+ */
 export declare class PropRef extends Prop {
     schema: SchemaObject;
     ref: string;
     get id(): string;
     refType?: IType;
     constructor(parent: IType | undefined, name: string, schema: SchemaObject, ref: string);
-    add(child: IType): void;
     visit(context: OasContext): void;
     getValue(_context: OasContext): string;
     forPrompt(context: OasContext): string;
     select(context: OasContext, writer: Writer, selection: string[]): void;
-    protected generateValue(context: OasContext, writer: Writer): void;
+    generateValue(context: OasContext, writer: Writer): void;
     private needsBrackets;
 }

package/dist/oas/nodes/propRef.js

@@ -1,8 +1,10 @@
-import { Arr, CircularRef, Composed, Factory, Obj, Union } from './internal.js';
-import { Prop } from './internal.js';
+import { Arr, Prop, Composed, Factory, Obj, Union } from './internal.js';
 import _ from 'lodash';
 import { trace } from '../log/trace.js';
 import { Naming } from '../utils/naming.js';
+/**
+ * @deprecated No longer used
+ */
 export class PropRef extends Prop {
     schema;
     ref;
@@ -15,22 +17,25 @@ export class PropRef extends Prop {
         this.schema = schema;
         this.ref = ref;
     }
-    add(child) {
-        child.name = this.ref;
-        const paths = this.ancestors();
-        const contains = paths.map((p) => p.id).includes(child.id);
-        trace(null, '-> [prop-ref:add]', 'contains child? ' + contains);
-        if (contains) {
-            const ancestor = paths[paths.map((p) => p.id).indexOf(child.id)];
-            const wrapper = Factory.fromCircularRef(this, ancestor);
-            super.add(wrapper);
-            this.visited = true;
-            this.refType = wrapper;
-        }
-        else {
-            super.add(child);
-        }
-    }
+    /*  public override add(child: IType): IType {
+      child.name = this.ref;
+      const paths: IType[] = this.ancestors();
+      const contains: boolean = paths.map((p) => p.id).includes(child.id);
+  
+      trace(null, '-> [prop-ref:add]', 'contains child? ' + contains);
+      let added: IType = child;
+      if (contains) {
+        const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];
+        const wrapper = Factory.fromCircularRef(this, ancestor);
+        added = super.add(wrapper);
+        this.visited = true;
+        this.refType = wrapper;
+      } else {
+        added = super.add(child);
+      }
+  
+      return added;
+    }*/
     visit(context) {
         if (this.visited) {
             return;
@@ -41,8 +46,9 @@ export class PropRef extends Prop {
         if (!schema) {
             throw new Error('Schema not found for ref: ' + this.ref);
         }
-        const type = Factory.fromSchema(this, schema);
+        const type = Factory.fromSchema(context, this, schema);
         if (!this.refType) {
+            this.add(type);
             this.refType = type;
             type.name = this.ref;
             type.visit(context);
@@ -60,7 +66,7 @@ export class PropRef extends Prop {
         return Naming.genTypeName(name) + this.nameSuffix();
     }
     forPrompt(context) {
-        return `${this.name}: ${Naming.getRefName(this.ref)} (Ref)`;
+        return `[prop] ${this.name}: ${Naming.getRefName(this.ref)} (Ref)`;
     }
     select(context, writer, selection) {
         trace(context, '-> [prop-ref:select]', 'in ' + this.name + ', ref: ' + this.ref);
@@ -97,7 +103,7 @@ export class PropRef extends Prop {
         if (child instanceof Arr) {
             return this.needsBrackets(child.itemsType);
         }
-        return child instanceof Obj || child instanceof Union || child instanceof Composed || child instanceof CircularRef;
+        return child instanceof Obj || child instanceof Union || child instanceof Composed;
     }
 }
 //# sourceMappingURL=propRef.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"propRef.js","sourceRoot":"","sources":["../../../src/oas/nodes/propRef.ts"],"names":[],"mappings":"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","sourcesContent":["import { OasContext } from '../oasContext.js';\nimport { Arr, CircularRef, Composed, Factory, IType, Obj, Union } from './internal.js';\nimport { Prop } from './internal.js';\nimport _ from 'lodash';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class PropRef extends Prop {\n  get id(): string {\n    return `prop:ref:#${this.name}`;\n  }\n  public refType?: IType;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: SchemaObject,\n    public ref: string,\n  ) {\n    super(parent, name, schema);\n  }\n\n  public override add(child: IType): void {\n    child.name = this.ref;\n    const paths: IType[] = this.ancestors();\n    const contains: boolean = paths.map((p) => p.id).includes(child.id);\n\n    trace(null, '-> [prop-ref:add]', 'contains child? ' + contains);\n    if (contains) {\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper = Factory.fromCircularRef(this, ancestor);\n      super.add(wrapper);\n      this.visited = true;\n      this.refType = wrapper;\n    } else {\n      super.add(child);\n    }\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n    context.enter(this);\n    trace(context, '-> [prop-ref:visit]', 'in ' + this.name + ', ref: ' + this.ref);\n\n    const schema = context.lookupRef(this.ref);\n    if (!schema) {\n      throw new Error('Schema not found for ref: ' + this.ref);\n    }\n\n    const type = Factory.fromSchema(this, schema);\n    if (!this.refType) {\n      this.refType = type;\n      type.name = this.ref;\n      type.visit(context);\n\n      if (!this.children.includes(this.refType!)) {\n        this.add(this.refType!);\n      }\n\n      this.visited = true;\n    }\n    trace(context, '<- [prop-ref:visit]', 'out ' + this.name + ', ref: ' + this.ref);\n    context.leave(this);\n  }\n\n  public getValue(_context: OasContext): string {\n    const type = this.refType!;\n    const name = type ? type.name : this.ref;\n\n    return Naming.genTypeName(name!) + this.nameSuffix();\n  }\n\n  public forPrompt(context: OasContext): string {\n    return `${this.name}: ${Naming.getRefName(this.ref)} (Ref)`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-ref:select]', 'in ' + this.name + ', ref: ' + this.ref);\n    const fieldName = this.name;\n    const sanitised = Naming.sanitiseFieldForSelect(fieldName);\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    if (this.refType && this.needsBrackets(this.refType)) {\n      writer.append(' {').append('\\n');\n      context.enter(this);\n    }\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (this.refType && this.needsBrackets(this.refType)) {\n      context.leave(this);\n      writer.append(' '.repeat(context.indent + context.stack.length)).append('}');\n    }\n\n    writer.append('\\n');\n    trace(context, '<- [prop-ref:select]', 'out ' + this.name + ', ref: ' + this.ref);\n  }\n\n  protected generateValue(context: OasContext, writer: Writer): void {\n    const type = this.refType;\n\n    if (type && (type as IType) instanceof Arr) {\n      writer.append('[');\n      const items = (type as Arr).itemsType;\n      writer.append(_.upperFirst(items!.name));\n      writer.append(']');\n    } else {\n      writer.append(this.getValue(context));\n    }\n  }\n\n  private needsBrackets(child: IType): boolean {\n    if (child instanceof Arr) {\n      return this.needsBrackets(child.itemsType!);\n    }\n    return child instanceof Obj || child instanceof Union || child instanceof Composed || child instanceof CircularRef;\n  }\n}\n"]}
+{"version":3,"file":"propRef.js","sourceRoot":"","sources":["../../../src/oas/nodes/propRef.ts"],"names":[],"mappings":"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","sourcesContent":["import { OasContext } from '../oasContext.js';\nimport { Arr, Prop, Composed, Factory, IType, Obj, Union } from './internal.js';\nimport _ from 'lodash';\nimport { SchemaObject } from 'oas/types';\nimport { trace } from '../log/trace.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\n\n/**\n * @deprecated No longer used\n */\nexport class PropRef extends Prop {\n  get id(): string {\n    return `prop:ref:#${this.name}`;\n  }\n  public refType?: IType;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: SchemaObject,\n    public ref: string,\n  ) {\n    super(parent, name, schema);\n  }\n\n  /*  public override add(child: IType): IType {\n    child.name = this.ref;\n    const paths: IType[] = this.ancestors();\n    const contains: boolean = paths.map((p) => p.id).includes(child.id);\n\n    trace(null, '-> [prop-ref:add]', 'contains child? ' + contains);\n    let added: IType = child;\n    if (contains) {\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper = Factory.fromCircularRef(this, ancestor);\n      added = super.add(wrapper);\n      this.visited = true;\n      this.refType = wrapper;\n    } else {\n      added = super.add(child);\n    }\n\n    return added;\n  }*/\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n    context.enter(this);\n    trace(context, '-> [prop-ref:visit]', 'in ' + this.name + ', ref: ' + this.ref);\n\n    const schema = context.lookupRef(this.ref);\n    if (!schema) {\n      throw new Error('Schema not found for ref: ' + this.ref);\n    }\n\n    const type = Factory.fromSchema(context, this, schema);\n    if (!this.refType) {\n      this.add(type);\n      this.refType = type;\n      type.name = this.ref;\n      type.visit(context);\n\n      if (!this.children.includes(this.refType!)) {\n        this.add(this.refType!);\n      }\n\n      this.visited = true;\n    }\n    trace(context, '<- [prop-ref:visit]', 'out ' + this.name + ', ref: ' + this.ref);\n    context.leave(this);\n  }\n\n  public getValue(_context: OasContext): string {\n    const type = this.refType!;\n    const name = type ? type.name : this.ref;\n\n    return Naming.genTypeName(name!) + this.nameSuffix();\n  }\n\n  public forPrompt(context: OasContext): string {\n    return `[prop] ${this.name}: ${Naming.getRefName(this.ref)} (Ref)`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-ref:select]', 'in ' + this.name + ', ref: ' + this.ref);\n    const fieldName = this.name;\n    const sanitised = Naming.sanitiseFieldForSelect(fieldName);\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    if (this.refType && this.needsBrackets(this.refType)) {\n      writer.append(' {').append('\\n');\n      context.enter(this);\n    }\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (this.refType && this.needsBrackets(this.refType)) {\n      context.leave(this);\n      writer.append(' '.repeat(context.indent + context.stack.length)).append('}');\n    }\n\n    writer.append('\\n');\n    trace(context, '<- [prop-ref:select]', 'out ' + this.name + ', ref: ' + this.ref);\n  }\n\n  generateValue(context: OasContext, writer: Writer): void {\n    const type = this.refType;\n\n    if (type && (type as IType) instanceof Arr) {\n      writer.append('[');\n      const items = (type as Arr).itemsType;\n      writer.append(_.upperFirst(items!.name));\n      writer.append(']');\n    } else {\n      writer.append(this.getValue(context));\n    }\n  }\n\n  private needsBrackets(child: IType): boolean {\n    if (child instanceof Arr) {\n      return this.needsBrackets(child.itemsType!);\n    }\n    return child instanceof Obj || child instanceof Union || child instanceof Composed;\n  }\n}\n"]}

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

@@ -1,5 +1,4 @@
-import { IType } from './internal.js';
-import { Prop } from './internal.js';
+import { IType, Prop } from './internal.js';
 import { SchemaObject } from 'oas/types';
 import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';
@@ -10,7 +9,7 @@ export declare class PropScalar extends Prop {
     constructor(parent: IType, name: string, type: string, schema: SchemaObject);
     get id(): string;
     visit(context: OasContext): void;
-    getValue(context: OasContext): string;
+    getValue(_context: OasContext): string;
     forPrompt(context: OasContext): string;
     select(context: OasContext, writer: Writer, selection: string[]): void;
 }

package/dist/oas/nodes/propScalar.js

@@ -1,5 +1,4 @@
-import { Factory } from './internal.js';
-import { Prop } from './internal.js';
+import { Factory, Prop } from './internal.js';
 import { trace } from '../log/trace.js';
 import { Naming } from '../utils/naming.js';
 export class PropScalar extends Prop {
@@ -20,17 +19,22 @@ export class PropScalar extends Prop {
         }
         context.enter(this);
         if (!this.propType) {
-            this.propType = Factory.fromSchema(this, this.schema);
-            // this.propType.visit(context);
+            const type = Factory.fromSchema(context, this, this.schema);
+            this.add(type);
+            this.propType = type;
             this.visited = true;
         }
         context.leave(this);
     }
-    getValue(context) {
+    getValue(_context) {
         return this.type;
     }
     forPrompt(context) {
-        return `${this.name}: ${this.type}`;
+        let result = `[prop] ${this.name}: ${this.type}`;
+        if (context.generateOptions.debugParentInSelection) {
+            result = result + ` (${Naming.getRefName(this.parent.name)})`;
+        }
+        return result;
     }
     select(context, writer, selection) {
         trace(context, '   [prop:select]', this.name);

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

@@ -1 +1 @@
-{"version":3,"file":"propScalar.js","sourceRoot":"","sources":["../../../src/oas/nodes/propScalar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,UAAW,SAAQ,IAAI;IAMzB;IACA;IAND,QAAQ,CAAS;IAEzB,YACE,MAAa,EACb,IAAY,EACL,IAAY,EACZ,MAAoB;QAE3B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAc;IAG7B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,eAAe,IAAI,CAAC,IAAI,EAAE,CAAC;IACpC,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,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,gCAAgC;YAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,QAAQ,CAAC,OAAmB;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,SAAS,CAAC,OAAmB;QAClC,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEnF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,OAAO,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;YACnD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CACF","sourcesContent":["import { Factory, IType } from './internal.js';\nimport { Prop } 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 PropScalar extends Prop {\n  private propType?: IType;\n\n  constructor(\n    parent: IType,\n    name: string,\n    public type: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name, schema);\n  }\n\n  get id(): string {\n    return `prop:scalar:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    if (!this.propType) {\n      this.propType = Factory.fromSchema(this, this.schema);\n      // this.propType.visit(context);\n      this.visited = true;\n    }\n    context.leave(this);\n  }\n\n  public getValue(context: OasContext): string {\n    return this.type;\n  }\n\n  public forPrompt(context: OasContext): string {\n    return `${this.name}: ${this.type}`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '   [prop:select]', this.name);\n    const sanitised = Naming.sanitiseFieldForSelect(this.name);\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (context.generateOptions.debugParentInSelection) {\n      writer.append(' # ').append(Naming.getRefName(this.parent!.name));\n    }\n\n    writer.append('\\n');\n  }\n}\n"]}
+{"version":3,"file":"propScalar.js","sourceRoot":"","sources":["../../../src/oas/nodes/propScalar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,IAAI,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,UAAW,SAAQ,IAAI;IAMzB;IACA;IAND,QAAQ,CAAS;IAEzB,YACE,MAAa,EACb,IAAY,EACL,IAAY,EACZ,MAAoB;QAE3B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAc;IAG7B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,eAAe,IAAI,CAAC,IAAI,EAAE,CAAC;IACpC,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,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,QAAQ,CAAC,QAAoB;QAClC,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,SAAS,CAAC,OAAmB;QAClC,IAAI,MAAM,GAAG,UAAU,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;QAEjD,IAAI,OAAO,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;YACnD,MAAM,GAAG,MAAM,GAAG,KAAK,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,GAAG,CAAC;QACjE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEnF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,OAAO,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;YACnD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CACF","sourcesContent":["import { Factory, IType, Prop } 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 PropScalar extends Prop {\n  private propType?: IType;\n\n  constructor(\n    parent: IType,\n    name: string,\n    public type: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name, schema);\n  }\n\n  get id(): string {\n    return `prop:scalar:${this.name}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    if (!this.propType) {\n      const type = Factory.fromSchema(context, this, this.schema);\n      this.add(type);\n      this.propType = type;\n      this.visited = true;\n    }\n    context.leave(this);\n  }\n\n  public getValue(_context: OasContext): string {\n    return this.type;\n  }\n\n  public forPrompt(context: OasContext): string {\n    let result = `[prop] ${this.name}: ${this.type}`;\n\n    if (context.generateOptions.debugParentInSelection) {\n      result = result + ` (${Naming.getRefName(this.parent!.name)})`;\n    }\n\n    return result;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '   [prop:select]', this.name);\n    const sanitised = Naming.sanitiseFieldForSelect(this.name);\n    writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);\n\n    for (const child of this.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (context.generateOptions.debugParentInSelection) {\n      writer.append(' # ').append(Naming.getRefName(this.parent!.name));\n    }\n\n    writer.append('\\n');\n  }\n}\n"]}

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

@@ -2,6 +2,9 @@ import { IType, Prop, Type } from './internal.js';
 import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';
 import { ReferenceObject } from './referenceObject.js';
+/**
+ * @deprecated This class is deprecated and should not be used in new code.
+ */
 export declare class Ref extends Type {
     schema: ReferenceObject | null;
     refType?: IType;

package/dist/oas/nodes/ref.js

@@ -1,6 +1,9 @@
 import { Arr, Factory, Type } from './internal.js';
 import { trace } from '../log/trace.js';
 import { Naming } from '../utils/naming.js';
+/**
+ * @deprecated This class is deprecated and should not be used in new code.
+ */
 export class Ref extends Type {
     schema;
     refType;
@@ -15,7 +18,7 @@ export class Ref extends Type {
         return this.refType?.props ?? new Map();
     }
     forPrompt(_context) {
-        return `${Naming.getRefName(this.name)} (Ref)`;
+        return `[ref] ${Naming.getRefName(this.name)}`;
     }
     visit(context) {
         // console.log('schema', this.schema);
@@ -29,7 +32,9 @@ export class Ref extends Type {
         if (!schema) {
             throw new Error('Schema not found for ref: ' + ref);
         }
-        this.refType = Factory.fromSchema(this, schema);
+        const type = Factory.fromSchema(context, this, schema);
+        this.add(type);
+        this.refType = type;
         // Set the name of the resolved type to the reference string.
         this.refType.name = ref;
         this.refType.visit(context);
@@ -42,7 +47,7 @@ export class Ref extends Type {
         trace(context, '-> [ref::generate]', `-> in: ${this.name}`);
         // If we're in a Response context and the resolved type is an Arr,
         // generate it with array notation.
-        if (context.inContextOf('Response', this) && this.refType instanceof Arr) {
+        if (context.inContextOf('Res', this) && this.refType instanceof Arr) {
             writer.append('[').append(this.firstChild().name).append(']');
         }
         else {

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

@@ -1 +1 @@
-{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/oas/nodes/ref.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, Factory, IType, Prop, 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 { Naming } from '../utils/naming.js';\n\nimport { ReferenceObject } from './referenceObject.js';\n\nexport class Ref extends Type {\n  public refType?: IType;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: ReferenceObject | null,\n  ) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    return 'ref:' + this.schema?.$ref;\n  }\n\n  get props(): Map<string, Prop> {\n    return this.refType?.props ?? new Map();\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `${Naming.getRefName(this.name)} (Ref)`;\n  }\n\n  public visit(context: OasContext): void {\n    // console.log('schema', this.schema);\n    if (this.visited) {\n      return;\n    }\n    const ref = this.schema?.$ref ?? '';\n\n    context.enter(this);\n    trace(context, '-> [ref:visit]', 'in: ' + ref);\n\n    const schema: SchemaObject | null = context.lookupRef(ref);\n    if (!schema) {\n      throw new Error('Schema not found for ref: ' + ref);\n    }\n\n    this.refType = Factory.fromSchema(this, schema);\n    // Set the name of the resolved type to the reference string.\n    this.refType.name = ref;\n    this.refType.visit(context);\n\n    this.visited = true;\n    trace(context, '<- [ref:visit]', 'out: ' + ref);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, _selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [ref::generate]', `-> in: ${this.name}`);\n\n    // If we're in a Response context and the resolved type is an Arr,\n    // generate it with array notation.\n    if (context.inContextOf('Response', this) && this.refType instanceof Arr) {\n      writer.append('[').append(this.firstChild().name).append(']');\n    } else {\n      // Rewrite terrible names to something more sensible.\n      const sanitised = Naming.genTypeName(this.name);\n      const refName = Naming.getRefName(this.name);\n      writer.write(sanitised === refName ? refName : sanitised);\n    }\n\n    trace(context, '<- [ref::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [ref::select]', `-> in: ${this.name}`);\n    if (this.refType) {\n      this.refType.select(context, writer, selection);\n    }\n    trace(context, '<- [ref::select]', `-> out: ${this.name}`);\n  }\n\n  private firstChild() {\n    return this.refType!.children[0];\n  }\n}\n"]}
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/oas/nodes/ref.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arr, Factory, IType, Prop, 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 { Naming } from '../utils/naming.js';\n\nimport { ReferenceObject } from './referenceObject.js';\n\n/**\n * @deprecated This class is deprecated and should not be used in new code.\n */\nexport class Ref extends Type {\n  public refType?: IType;\n\n  constructor(\n    parent: IType | undefined,\n    name: string,\n    public schema: ReferenceObject | null,\n  ) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    return 'ref:' + this.schema?.$ref;\n  }\n\n  get props(): Map<string, Prop> {\n    return this.refType?.props ?? new Map();\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[ref] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    // console.log('schema', this.schema);\n    if (this.visited) {\n      return;\n    }\n    const ref = this.schema?.$ref ?? '';\n\n    context.enter(this);\n    trace(context, '-> [ref:visit]', 'in: ' + ref);\n\n    const schema: SchemaObject | null = context.lookupRef(ref);\n    if (!schema) {\n      throw new Error('Schema not found for ref: ' + ref);\n    }\n\n    const type = Factory.fromSchema(context, this, schema);\n    this.add(type);\n    this.refType = type;\n    // Set the name of the resolved type to the reference string.\n    this.refType.name = ref;\n    this.refType.visit(context);\n\n    this.visited = true;\n    trace(context, '<- [ref:visit]', 'out: ' + ref);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, _selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [ref::generate]', `-> in: ${this.name}`);\n\n    // If we're in a Response context and the resolved type is an Arr,\n    // generate it with array notation.\n    if (context.inContextOf('Res', this) && this.refType instanceof Arr) {\n      writer.append('[').append(this.firstChild().name).append(']');\n    } else {\n      // Rewrite terrible names to something more sensible.\n      const sanitised = Naming.genTypeName(this.name);\n      const refName = Naming.getRefName(this.name);\n      writer.write(sanitised === refName ? refName : sanitised);\n    }\n\n    trace(context, '<- [ref::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [ref::select]', `-> in: ${this.name}`);\n    if (this.refType) {\n      this.refType.select(context, writer, selection);\n    }\n    trace(context, '<- [ref::select]', `-> out: ${this.name}`);\n  }\n\n  private firstChild() {\n    return this.refType!.children[0];\n  }\n}\n"]}

package/dist/oas/nodes/{response.d.ts → res.d.ts}

@@ -2,7 +2,7 @@ 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 Response extends Type {
+export declare class Res extends Type {
     schema: SchemaObject;
     response?: IType;
     constructor(parent: IType, name: string, schema: SchemaObject, response?: IType);

package/dist/oas/nodes/{response.js → res.js}

@@ -1,6 +1,6 @@
 import { Factory, Type, T } from './internal.js';
 import { trace } from '../log/trace.js';
-export class Response extends Type {
+export class Res extends Type {
     schema;
     response;
     constructor(parent, name, schema, response) {
@@ -18,8 +18,10 @@ export class Response extends Type {
         }
         context.enter(this);
         trace(context, '-> [res:visit]', 'in ' + this.name);
-        this.response = Factory.fromSchema(this, this.schema);
-        trace(context, '   [res:visit]', 'array type: ' + this.response.id);
+        const type = Factory.fromSchema(context, this, this.schema);
+        this.add(type);
+        this.response = type;
+        trace(context, '   [res:visit]', 'response type: ' + this.response.id);
         this.visited = true;
         trace(context, '<- [res:visit]', 'out ' + this.name);
         context.leave(this);
@@ -52,4 +54,4 @@ export class Response extends Type {
         trace(context, '<- [res:select]', `-> out: ${this.parent.name}`);
     }
 }
-//# sourceMappingURL=response.js.map
+//# sourceMappingURL=res.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"res.js","sourceRoot":"","sources":["../../../src/oas/nodes/res.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, IType, Type, 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';\n\nexport class Res extends Type {\n  public schema: SchemaObject;\n  public response?: IType;\n\n  constructor(parent: IType, name: string, schema: SchemaObject, response?: IType) {\n    super(parent, name);\n    this.schema = schema;\n    this.response = response;\n  }\n\n  get id(): string {\n    return 'res:' + this.name;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [res:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [res:visit]', 'in ' + this.name);\n\n    const type = Factory.fromSchema(context, this, this.schema);\n    this.add(type);\n\n    this.response = type;\n    trace(context, '   [res:visit]', 'response type: ' + this.response.id);\n\n    this.visited = true;\n    trace(context, '<- [res:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n\n  public forPrompt(context: OasContext): string {\n    return 'Response';\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [res:generate]', `-> in: ${this.parent!.name}`);\n\n    if (this.response) {\n      this.response.generate(context, writer, selection);\n    }\n\n    trace(context, '<- [res:generate]', `-> out: ${this.parent!.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]): void {\n    trace(context, '-> [res:select]', `-> in: ${this.parent!.name}`);\n\n    const response = this.response;\n    if (response) {\n      if (T.isScalar(response)) {\n        // best attempt to just copy the value that comes out of the service. most likely the\n        // value will have to be replaced by a GQL type. In fact, we could potentially use SYN_ here but\n        // it will have to do for now.\n        writer.append(' '.repeat(context.indent)).append('$\\n');\n      } else response.select(context, writer, selection);\n    }\n\n    trace(context, '<- [res:select]', `-> out: ${this.parent!.name}`);\n  }\n}\n"]}

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

@@ -1,7 +1,6 @@
-import { IType, Kind } from './internal.js';
+import { IType, Kind, Prop } from './internal.js';
 import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';
-import { Prop } from './internal.js';
 export declare abstract class Type implements IType {
     parent?: IType;
     name: string;
@@ -22,7 +21,7 @@ export declare abstract class Type implements IType {
     ancestors(): IType[];
     path(): string;
     pathToRoot(): string;
-    add(child: IType): void;
+    add(child: IType): IType;
     selectedProps(selection: string[]): Prop[];
     nameSuffix(): string;
 }

package/dist/oas/nodes/type.js

@@ -74,34 +74,19 @@ export class Type {
     add(child) {
         const paths = this.ancestors();
         const contains = paths.map((p) => p.id).includes(child.id);
+        let pushed = child;
         if (contains) {
             trace(null, '-> [type:add]', 'already contains child: ' + child.id);
             const ancestor = paths[paths.map((p) => p.id).indexOf(child.id)];
             const wrapper = Factory.fromCircularRef(this, ancestor);
             this.children.push(wrapper);
+            pushed = wrapper;
         }
         else {
             this.children.push(child);
         }
+        return pushed;
     }
-    /*
-      remove = (value: IType): void => {
-        const index = this.children.findIndex(child => child === value);
-        if (index !== -1) {
-          this.children.splice(index, 1);
-        }
-      };
-  
-  */
-    /*traverseB(callback: (node: IType) => void): void {
-      const queue: IType[] = [this];
-  
-      while (queue.length > 0) {
-        const node = queue.shift()!;
-        callback(node);
-        queue.push(...node.children);
-      }
-    }*/
     selectedProps(selection) {
         return Array.from(this.props.values()).filter((prop) => selection.find((s) => s.startsWith(prop.path())));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../src/oas/nodes/type.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Kind } from './internal.js';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Factory } from './factory.js';\nimport { Prop } from './internal.js';\n\nexport abstract class Type implements IType {\n  public parent?: IType;\n  public name: string;\n  public children: IType[];\n  public circularRef?: IType;\n  public kind: Kind;\n  public visited: boolean;\n\n  private readonly _props: Map<string, Prop>;\n\n  protected constructor(parent: IType | undefined, name: string) {\n    this.parent = parent;\n    this.name = name;\n    this.children = [];\n    this.visited = false;\n    this._props = new Map<string, Prop>();\n    this.kind = parent?.kind || 'type';\n  }\n\n  public abstract visit(context: OasContext): void;\n\n  public abstract forPrompt(context: OasContext): string;\n\n  public abstract select(context: OasContext, writer: Writer, selection: string[]): void;\n\n  public find(path: string, collection: IType[]): IType | boolean {\n    const parts = path.split('>');\n    let current: IType | undefined;\n\n    let i = 0;\n    do {\n      const part = parts[i];\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        return false;\n      }\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n      // console.log(\"found\", current);\n\n      i++;\n    } while (i < parts.length);\n\n    return current || false;\n  }\n\n  public expand(context: OasContext): IType[] {\n    trace(context, '-> [expand]', `in: path: ${this.path()}`);\n    if (!this.visited) {\n      this.visit(context);\n    }\n\n    trace(context, '<- [expand]', `out: path: ${this.path()}`);\n\n    // TODO:\n    // if ((type instanceof Composed || type instanceof Union) && !type.getProps().isEmpty()) {\n    //   return type.props?.values() || [];\n    // }\n    // else {\n    return this.children;\n    // }\n  }\n\n  public abstract generate(context: OasContext, writer: Writer, selection: string[]): void;\n\n  get id() {\n    return this.name;\n  }\n  get props() {\n    return this._props;\n  }\n\n  public ancestors(): IType[] {\n    return this.parent ? [...this.parent.ancestors(), this] : [this];\n  }\n\n  public path(): string {\n    const ancestors = this.ancestors();\n    return ancestors\n      .map((t) => t.id)\n      .join('>')\n      .replace(/#\\/components\\/schemas/g, '#/c/s');\n  }\n\n  public pathToRoot(): string {\n    let builder = '';\n    let indent = 0;\n\n    const ancestors = this.ancestors();\n    for (let i = 0; i < ancestors.length; i++) {\n      builder += ' <- ' + ' '.repeat(indent++) + ancestors[i].id + ' (' + ancestors[i].constructor.name + ')\\n';\n    }\n\n    return builder;\n  }\n\n  public add(child: IType): void {\n    const paths: IType[] = this.ancestors();\n    const contains: boolean = paths.map((p) => p.id).includes(child.id);\n\n    if (contains) {\n      trace(null, '-> [type:add]', 'already contains child: ' + child.id);\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper = Factory.fromCircularRef(this, ancestor);\n      this.children.push(wrapper);\n    } else {\n      this.children.push(child);\n    }\n  }\n\n  /*\n    remove = (value: IType): void => {\n      const index = this.children.findIndex(child => child === value);\n      if (index !== -1) {\n        this.children.splice(index, 1);\n      }\n    };\n\n*/\n\n  /*traverseB(callback: (node: IType) => void): void {\n    const queue: IType[] = [this];\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      callback(node);\n      queue.push(...node.children);\n    }\n  }*/\n\n  public selectedProps(selection: string[]) {\n    return Array.from(this.props.values()).filter((prop) => selection.find((s) => s.startsWith(prop.path())));\n  }\n\n  nameSuffix(): string {\n    return this.kind === 'input' ? 'Input' : '';\n  }\n}\n"]}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../src/oas/nodes/type.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Kind, Prop } from './internal.js';\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Factory } from './factory.js';\n\nexport abstract class Type implements IType {\n  public parent?: IType;\n  public name: string;\n  public children: IType[];\n  public circularRef?: IType;\n  public kind: Kind;\n  public visited: boolean;\n\n  private readonly _props: Map<string, Prop>;\n\n  protected constructor(parent: IType | undefined, name: string) {\n    this.parent = parent;\n    this.name = name;\n    this.children = [];\n    this.visited = false;\n    this._props = new Map<string, Prop>();\n    this.kind = parent?.kind || 'type';\n  }\n\n  public abstract visit(context: OasContext): void;\n\n  public abstract forPrompt(context: OasContext): string;\n\n  public abstract select(context: OasContext, writer: Writer, selection: string[]): void;\n\n  public find(path: string, collection: IType[]): IType | boolean {\n    const parts = path.split('>');\n    let current: IType | undefined;\n\n    let i = 0;\n    do {\n      const part = parts[i];\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        return false;\n      }\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n      // console.log(\"found\", current);\n\n      i++;\n    } while (i < parts.length);\n\n    return current || false;\n  }\n\n  public expand(context: OasContext): IType[] {\n    trace(context, '-> [expand]', `in: path: ${this.path()}`);\n    if (!this.visited) {\n      this.visit(context);\n    }\n\n    trace(context, '<- [expand]', `out: path: ${this.path()}`);\n\n    // TODO:\n    // if ((type instanceof Composed || type instanceof Union) && !type.getProps().isEmpty()) {\n    //   return type.props?.values() || [];\n    // }\n    // else {\n    return this.children;\n    // }\n  }\n\n  public abstract generate(context: OasContext, writer: Writer, selection: string[]): void;\n\n  get id() {\n    return this.name;\n  }\n\n  get props() {\n    return this._props;\n  }\n\n  public ancestors(): IType[] {\n    return this.parent ? [...this.parent.ancestors(), this] : [this];\n  }\n\n  public path(): string {\n    const ancestors = this.ancestors();\n    return ancestors\n      .map((t) => t.id)\n      .join('>')\n      .replace(/#\\/components\\/schemas/g, '#/c/s');\n  }\n\n  public pathToRoot(): string {\n    let builder = '';\n    let indent = 0;\n\n    const ancestors = this.ancestors();\n    for (let i = 0; i < ancestors.length; i++) {\n      builder += ' <- ' + ' '.repeat(indent++) + ancestors[i].id + ' (' + ancestors[i].constructor.name + ')\\n';\n    }\n\n    return builder;\n  }\n\n  public add(child: IType): IType {\n    const paths: IType[] = this.ancestors();\n    const contains: boolean = paths.map((p) => p.id).includes(child.id);\n    let pushed = child;\n\n    if (contains) {\n      trace(null, '-> [type:add]', 'already contains child: ' + child.id);\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper = Factory.fromCircularRef(this, ancestor);\n      this.children.push(wrapper);\n      pushed = wrapper;\n    } else {\n      this.children.push(child);\n    }\n\n    return pushed;\n  }\n\n  public selectedProps(selection: string[]) {\n    return Array.from(this.props.values()).filter((prop) => selection.find((s) => s.startsWith(prop.path())));\n  }\n\n  nameSuffix(): string {\n    return this.kind === 'input' ? 'Input' : '';\n  }\n}\n"]}

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

@@ -6,4 +6,7 @@ export declare class T {
     static isMutationType(type: IType): boolean;
     static isScalar(type: IType): boolean;
     static containers(node: IType): IType[];
+    static isContainer(node: IType): boolean;
+    static composables(node: IType): IType[];
+    static print(node: IType, prefix?: string, isLast?: boolean): string;
 }

package/dist/oas/nodes/typeUtils.js

@@ -1,12 +1,13 @@
-import { CircularRef, En, Obj, Prop, PropArray, PropScalar, Scalar } from './internal.js';
+import { CircularRef, En, Obj, Prop, PropArray, PropEn, PropScalar, Scalar } from './internal.js';
 import _ from 'lodash';
 export class T {
     static isLeaf(type) {
         return (type instanceof Scalar ||
             type instanceof PropScalar ||
             type instanceof En ||
+            type instanceof PropEn ||
             type instanceof CircularRef ||
-            (type instanceof PropArray && type.items instanceof PropScalar) ||
+            (type instanceof PropArray && type.items instanceof Scalar) ||
             (type instanceof Obj && _.isEmpty(type.props)));
     }
     static isPropScalar(type) {
@@ -32,8 +33,26 @@ export class T {
     }
     static containers(node) {
         return Array.from(node.children.values())
-            .filter((child) => !(child instanceof Prop))
-            .map((child) => (child.id.startsWith('ref:') ? child.refType : child));
+            .filter((child) => !(child instanceof Prop) && T.isContainer(child))
+            .map((child) => child);
+    }
+    static isContainer(node) {
+        return node.id.startsWith('obj:') || node.id.startsWith('comp:') || node.id.startsWith('union:');
+    }
+    static composables(node) {
+        return _.filter(T.containers(node), (e) => e.id.startsWith('comp:')); // || e.id.startsWith('union:'));
+    }
+    static print(node, prefix = '', isLast = true) {
+        // Build the current line with the appropriate connector.
+        const connector = prefix === '' ? '' : isLast ? '└─ ' : '├─ ';
+        let result = prefix + connector + node.id + '\n';
+        // Prepare the prefix for the children.
+        const childPrefix = prefix + (isLast ? '   ' : '│  ');
+        node.children.forEach((child, index) => {
+            const last = index === node.children.length - 1;
+            result += T.print(child, childPrefix, last);
+        });
+        return result;
     }
 }
 //# sourceMappingURL=typeUtils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../../src/oas/nodes/typeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAO,MAAM,EAAE,MAAM,eAAe,CAAC;AAG/F,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,MAAM,OAAO,CAAC;IACL,MAAM,CAAC,MAAM,CAAC,IAAW;QAC9B,OAAO,CACL,IAAI,YAAY,MAAM;YACtB,IAAI,YAAY,UAAU;YAC1B,IAAI,YAAY,EAAE;YAClB,IAAI,YAAY,WAAW;YAC3B,CAAC,IAAI,YAAY,SAAS,IAAI,IAAI,CAAC,KAAK,YAAY,UAAU,CAAC;YAC/D,CAAC,IAAI,YAAY,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAC/C,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,IAAW;QACpC,OAAO,IAAI,YAAY,UAAU,CAAC;IACpC,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAW,EAAE,QAA+B;QACjE,MAAM,YAAY,GAAG,CAAC,CAAQ,EAAQ,EAAE;YACtC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAEZ,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3B,YAAY,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC,CAAC;QAEF,YAAY,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,IAAW;QAC/B,OAAO,CACL,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;YAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAW;QACzB,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,IAAW;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aACtC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,OAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACrF,CAAC;CACF","sourcesContent":["import { CircularRef, En, Obj, Prop, PropArray, PropScalar, Ref, Scalar } from './internal.js';\n\nimport { IType } 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 CircularRef ||\n      (type instanceof PropArray && type.items instanceof PropScalar) ||\n      (type instanceof Obj && _.isEmpty(type.props))\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))\n      .map((child) => (child.id.startsWith('ref:') ? (child as Ref).refType! : child));\n  }\n}\n"]}
+{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../../src/oas/nodes/typeUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { CircularRef, En, Obj, Prop, PropArray, PropEn, PropScalar, Scalar } from './internal.js';\n\nimport { IType } 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    );\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"]}

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

@@ -13,7 +13,6 @@ export declare class Union extends Type {
     generate(context: OasContext, writer: Writer, selection: string[]): void;
     select(context: OasContext, writer: Writer, selection: string[]): void;
     consolidate(selection: string[]): Set<string>;
-    private updatePropName;
     private visitProperties;
     private updateName;
 }