apollo-conn-gen 0.1.1 → 0.2.0

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

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

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

@@ -10,5 +10,5 @@ export declare class PropArray extends Prop {
     add(child: IType): void;
     forPrompt(context: OasContext): string;
     select(context: OasContext, writer: Writer, selection: string[]): void;
-    needsBrackets(child: IType): boolean;
+    needsBrackets(child?: IType): boolean;
 }

package/dist/oas/nodes/propArray.js

@@ -1,4 +1,4 @@
-import { Factory, Prop, PropObj, PropRef } from './internal.js';
+import { Factory, Prop, PropComp, PropObj, PropRef } from './internal.js';
 import { trace } from '../log/trace.js';
 import { Naming } from '../utils/naming.js';
 export class PropArray extends Prop {
@@ -55,18 +55,26 @@ export class PropArray extends Prop {
             context.enter(this);
         }
         // Select each child of the items Prop.
-        for (const child of this.items.children) {
-            child.select(context, writer, selection);
+        if (this.needsBrackets(this.items)) {
+            for (const child of this.items.children) {
+                child.select(context, writer, selection);
+            }
         }
         if (this.needsBrackets(this.items)) {
             context.leave(this);
             writer.append(' '.repeat(context.indent + context.stack.length)).append('}');
         }
+        // writer.append('\n');
+        if (context.generateOptions.debugParentInSelection) {
+            writer.append(' # ').append(Naming.getRefName(this.parent.name));
+        }
         writer.append('\n');
         trace(context, '<- [prop:array:select]', 'out');
     }
     needsBrackets(child) {
-        return child instanceof PropRef || child instanceof PropObj;
+        if (!child)
+            return false;
+        return child instanceof PropRef || child instanceof PropObj || child instanceof PropComp;
     }
 }
 //# sourceMappingURL=propArray.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"propArray.js","sourceRoot":"","sources":["../../../src/oas/nodes/propArray.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, IType, Prop, PropObj, PropRef } from './internal.js';\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 PropArray extends Prop {\n  public items?: Prop;\n\n  get id(): string {\n    return `prop:array:#${this.name}`;\n  }\n\n  public override visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [prop-array:visit]', 'in');\n\n    trace(context, '   [prop-array:visit]', 'type: ' + this.items);\n    this.items?.visit(context);\n    this.visited = true;\n\n    trace(context, '<- [prop:array:visit]', 'out');\n    context.leave(this);\n  }\n\n  public setItems(items: Prop): void {\n    this.items = items;\n    if (!this.children.includes(items)) {\n      this.add(items);\n    }\n  }\n\n  public override getValue(context: OasContext): string {\n    return `[${this.items!.getValue(context)}]`;\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    trace(null, '-> [prop-array:add]', 'contains child? ' + contains);\n\n    if (contains) {\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper: IType = Factory.fromCircularRef(this, ancestor);\n      super.add(wrapper);\n      this.visited = true;\n    } else {\n      super.add(child);\n    }\n  }\n\n  public forPrompt(context: OasContext): string {\n    return `${this.name}: [${this.items!.getValue(context)}]`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-array:select]', 'in: ' + this.name);\n\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.needsBrackets(this.items!)) {\n      writer.append(' {');\n      writer.append('\\n');\n      context.enter(this);\n    }\n\n    // Select each child of the items Prop.\n    for (const child of this.items!.children) {\n      child.select(context, writer, selection);\n    }\n\n    if (this.needsBrackets(this.items!)) {\n      context.leave(this);\n      writer.append(' '.repeat(context.indent + context.stack.length)).append('}');\n    }\n    writer.append('\\n');\n\n    trace(context, '<- [prop:array:select]', 'out');\n  }\n\n  public needsBrackets(child: IType): boolean {\n    return child instanceof PropRef || child instanceof PropObj;\n  }\n}\n"]}
+{"version":3,"file":"propArray.js","sourceRoot":"","sources":["../../../src/oas/nodes/propArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAU,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,SAAU,SAAQ,IAAI;IAC1B,KAAK,CAAQ;IAEpB,IAAI,EAAE;QACJ,OAAO,eAAe,IAAI,CAAC,IAAI,EAAE,CAAC;IACpC,CAAC;IAEe,KAAK,CAAC,OAAmB;QACvC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC;QAE9C,KAAK,CAAC,OAAO,EAAE,uBAAuB,EAAE,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,CAAC,OAAO,EAAE,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC/C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,QAAQ,CAAC,KAAW;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAEe,QAAQ,CAAC,OAAmB;QAC1C,OAAO,IAAI,IAAI,CAAC,KAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,GAAG,CAAC,KAAY;QACrB,MAAM,KAAK,GAAY,IAAI,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAY,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEpE,KAAK,CAAC,IAAI,EAAE,qBAAqB,EAAE,kBAAkB,GAAG,QAAQ,CAAC,CAAC;QAElE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAU,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;YACxE,MAAM,OAAO,GAAU,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/D,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,OAAmB;QAClC,OAAO,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,KAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;QAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,SAAS,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,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAM,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,uCAAuC;QACvC,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAM,CAAC,QAAQ,EAAE,CAAC;gBACzC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAM,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/E,CAAC;QACD,uBAAuB;QACvB,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;QAEpB,KAAK,CAAC,OAAO,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAEM,aAAa,CAAC,KAAa;QAChC,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,OAAO,KAAK,YAAY,OAAO,IAAI,KAAK,YAAY,OAAO,IAAI,KAAK,YAAY,QAAQ,CAAC;IAC3F,CAAC;CACF","sourcesContent":["import { Factory, IType, Prop, PropComp, PropObj, PropRef, Scalar } from './internal.js';\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 PropArray extends Prop {\n  public items?: Prop;\n\n  get id(): string {\n    return `prop:array:#${this.name}`;\n  }\n\n  public override visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [prop-array:visit]', 'in');\n\n    trace(context, '   [prop-array:visit]', 'type: ' + this.items);\n    this.items?.visit(context);\n    this.visited = true;\n\n    trace(context, '<- [prop:array:visit]', 'out');\n    context.leave(this);\n  }\n\n  public setItems(items: Prop): void {\n    this.items = items;\n    if (!this.children.includes(items)) {\n      this.add(items);\n    }\n  }\n\n  public override getValue(context: OasContext): string {\n    return `[${this.items!.getValue(context)}]`;\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    trace(null, '-> [prop-array:add]', 'contains child? ' + contains);\n\n    if (contains) {\n      const ancestor: IType = paths[paths.map((p) => p.id).indexOf(child.id)];\n      const wrapper: IType = Factory.fromCircularRef(this, ancestor);\n      super.add(wrapper);\n      this.visited = true;\n    } else {\n      super.add(child);\n    }\n  }\n\n  public forPrompt(context: OasContext): string {\n    return `${this.name}: [${this.items!.getValue(context)}]`;\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [prop-array:select]', 'in: ' + this.name);\n\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.needsBrackets(this.items!)) {\n      writer.append(' {');\n      writer.append('\\n');\n      context.enter(this);\n    }\n\n    // Select each child of the items Prop.\n    if (this.needsBrackets(this.items)) {\n      for (const child of this.items!.children) {\n        child.select(context, writer, selection);\n      }\n    }\n\n    if (this.needsBrackets(this.items!)) {\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:array:select]', 'out');\n  }\n\n  public needsBrackets(child?: IType): boolean {\n    if (!child) return false;\n    return child instanceof PropRef || child instanceof PropObj || child instanceof PropComp;\n  }\n}\n"]}

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

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

package/dist/oas/nodes/propComp.js

@@ -0,0 +1,73 @@
+import { Obj, Union } from './internal.js';
+import { Prop } from './prop.js';
+import _ from 'lodash';
+import { trace } from '../log/trace.js';
+import { Composed } from './comp.js';
+import { Naming } from '../utils/naming.js';
+export class PropComp extends Prop {
+    schema;
+    comp;
+    constructor(parent, name, schema) {
+        super(parent, name, schema);
+        this.schema = schema;
+    }
+    forPrompt(_context) {
+        const type = this.schema.oneOf ? 'One Of' : this.schema.allOf ? 'All Of' : 'Unknown';
+        return _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.comp.name) + ` (${type})`;
+    }
+    get id() {
+        return 'prop:comp:' + this.name;
+    }
+    visit(context) {
+        if (this.visited) {
+            return;
+        }
+        context.enter(this);
+        const comp = this.comp;
+        trace(context, '-> [prop-comp:visit]', 'in ' + this.name + ', obj: ' + comp.name);
+        comp.visit(context);
+        if (!this.children.includes(comp)) {
+            this.add(comp);
+        }
+        this.visited = true;
+        trace(context, '<- [prop-comp:visit]', 'out ' + this.name + ', obj: ' + comp.name);
+        context.leave(this);
+    }
+    getValue(_context) {
+        // we'll make an assumption here: that if the child obj has no properties,
+        // then it's a free-form JSON payload. not sure if the right one, but it will
+        // compose for now.
+        if (_.isEmpty(this.comp?.props))
+            return 'JSON';
+        // return Naming.genTypeName(this.name);
+        return Naming.genTypeName(this.comp.name) + this.comp.nameSuffix();
+    }
+    select(context, writer, selection) {
+        const comp = this.comp;
+        trace(context, '-> [prop-comp:select]', 'in ' + this.name + ', obj: ' + comp.name);
+        const fieldName = this.name;
+        const sanitised = Naming.sanitiseFieldForSelect(fieldName);
+        writer.append(' '.repeat(context.indent + context.stack.length)).append(sanitised);
+        if (this.needsBrackets(comp)) {
+            writer.append(' {').append('\n');
+            context.enter(this);
+        }
+        for (const child of this.children) {
+            child.select(context, writer, selection);
+        }
+        if (this.needsBrackets(comp)) {
+            context.leave(this);
+            writer.append(' '.repeat(context.indent + context.stack.length)).append('}');
+        }
+        // writer.append('\n');
+        if (context.generateOptions.debugParentInSelection) {
+            writer.append(' # ').append(Naming.getRefName(this.parent.name));
+        }
+        writer.append('\n');
+        trace(context, '<- [prop-comp:select]', 'out ' + this.name + ', obj: ' + comp?.name);
+    }
+    needsBrackets(child) {
+        return (child instanceof Obj || child instanceof Union || child instanceof Composed) && !_.isEmpty(child.props);
+    }
+}
+//# sourceMappingURL=propComp.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"propComp.js","sourceRoot":"","sources":["../../../src/oas/nodes/propComp.ts"],"names":[],"mappings":"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","sourcesContent":["import { IType, Obj, Union } from './internal.js';\nimport { Prop } from './prop.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 PropComp extends Prop {\n  public comp?: IType;\n\n  constructor(\n    parent: IType,\n    name: string,\n    public schema: SchemaObject,\n  ) {\n    super(parent, name, schema);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    const type: string = this.schema.oneOf ? 'One Of' : this.schema.allOf ? 'All Of' : 'Unknown';\n    return _.lowerFirst(this.name) + ': ' + Naming.getRefName(this.comp!.name) + ` (${type})`;\n  }\n\n  get id(): string {\n    return 'prop:comp:' + this.name;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    const comp = this.comp!;\n    trace(context, '-> [prop-comp:visit]', 'in ' + this.name + ', obj: ' + comp.name);\n\n    comp.visit(context);\n    if (!this.children.includes(comp)) {\n      this.add(comp);\n    }\n    this.visited = true;\n\n    trace(context, '<- [prop-comp:visit]', 'out ' + this.name + ', obj: ' + comp.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.comp?.props)) return 'JSON';\n\n    // return Naming.genTypeName(this.name);\n    return Naming.genTypeName(this.comp!.name!) + (this.comp as Composed).nameSuffix();\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    const comp = this.comp!;\n    trace(context, '-> [prop-comp:select]', 'in ' + this.name + ', obj: ' + comp.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(comp!)) {\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(comp!)) {\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-comp:select]', 'out ' + this.name + ', obj: ' + comp?.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/propObj.js

@@ -63,6 +63,10 @@ export class PropObj extends Prop {
             context.leave(this);
             writer.append(' '.repeat(context.indent + context.stack.length)).append('}');
         }
+        // writer.append('\n');
+        if (context.generateOptions.debugParentInSelection) {
+            writer.append(' # ').append(Naming.getRefName(this.parent.name));
+        }
         writer.append('\n');
         trace(context, '<- [prop-obj:select]', 'out ' + 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\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 } 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"]}

package/dist/oas/nodes/propScalar.js

@@ -39,6 +39,9 @@ export class PropScalar extends Prop {
         for (const child of this.children) {
             child.select(context, writer, selection);
         }
+        if (context.generateOptions.debugParentInSelection) {
+            writer.append(' # ').append(Naming.getRefName(this.parent.name));
+        }
         writer.append('\n');
     }
 }

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,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    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,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"]}

package/dist/oas/nodes/response.js

@@ -1,4 +1,4 @@
-import { Factory, Type } from './internal.js';
+import { Factory, Type, T } from './internal.js';
 import { trace } from '../log/trace.js';
 export class Response extends Type {
     schema;
@@ -38,8 +38,16 @@ export class Response extends Type {
     }
     select(context, writer, selection) {
         trace(context, '-> [res:select]', `-> in: ${this.parent.name}`);
-        if (this.response) {
-            this.response.select(context, writer, selection);
+        const response = this.response;
+        if (response) {
+            if (T.isScalar(response)) {
+                // best attempt to just copy the value that comes out of the service. most likely the
+                // value will have to be replaced by a GQL type. In fact, we could potentially use SYN_ here but
+                // it will have to do for now.
+                writer.append(' '.repeat(context.indent)).append('$\n');
+            }
+            else
+                response.select(context, writer, selection);
         }
         trace(context, '<- [res:select]', `-> out: ${this.parent.name}`);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/oas/nodes/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,IAAI,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,MAAM,OAAO,QAAS,SAAQ,IAAI;IACzB,MAAM,CAAe;IACrB,QAAQ,CAAS;IAExB,YAAY,MAAa,EAAE,IAAY,EAAE,MAAoB,EAAE,QAAgB;QAC7E,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,OAAmB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACtD,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,SAAS,CAAC,OAAmB;QAClC,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACtE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,mBAAmB,EAAE,UAAU,IAAI,CAAC,MAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,mBAAmB,EAAE,WAAW,IAAI,CAAC,MAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,UAAU,IAAI,CAAC,MAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjE,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,IAAI,CAAC,MAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;CACF","sourcesContent":["import { Factory, 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';\n\nexport class Response 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    this.response = Factory.fromSchema(this, this.schema);\n    trace(context, '   [res:visit]', 'array type: ' + this.response.id);\n    this.visited = true;\n\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    if (this.response) {\n      this.response.select(context, writer, selection);\n    }\n\n    trace(context, '<- [res:select]', `-> out: ${this.parent!.name}`);\n  }\n}\n"]}
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/oas/nodes/response.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 Response 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    this.response = Factory.fromSchema(this, this.schema);\n    trace(context, '   [res:visit]', 'array type: ' + this.response.id);\n    this.visited = true;\n\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/typeUtils.d.ts

@@ -4,4 +4,6 @@ export declare class T {
     static isPropScalar(type: IType): boolean;
     static traverse(node: IType, callback: (node: IType) => void): void;
     static isMutationType(type: IType): boolean;
+    static isScalar(type: IType): boolean;
+    static containers(node: IType): IType[];
 }

package/dist/oas/nodes/typeUtils.js

@@ -1,8 +1,9 @@
-import { CircularRef, En, Obj, PropArray, PropScalar } from './internal.js';
+import { CircularRef, En, Obj, Prop, PropArray, PropScalar, Scalar } from './internal.js';
 import _ from 'lodash';
 export class T {
     static isLeaf(type) {
-        return (type instanceof PropScalar ||
+        return (type instanceof Scalar ||
+            type instanceof PropScalar ||
             type instanceof En ||
             type instanceof CircularRef ||
             (type instanceof PropArray && type.items instanceof PropScalar) ||
@@ -26,5 +27,13 @@ export class T {
             type.id.startsWith('patch:') ||
             type.id.startsWith('del:'));
     }
+    static isScalar(type) {
+        return type.id.startsWith('scalar:');
+    }
+    static containers(node) {
+        return Array.from(node.children.values())
+            .filter((child) => !(child instanceof Prop))
+            .map((child) => (child.id.startsWith('ref:') ? child.refType : child));
+    }
 }
 //# 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,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG5E,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,MAAM,OAAO,CAAC;IACL,MAAM,CAAC,MAAM,CAAC,IAAW;QAC9B,OAAO,CACL,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;CACF","sourcesContent":["import { CircularRef, En, Obj, PropArray, PropScalar } 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 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"]}
+{"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"]}

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

@@ -4,13 +4,16 @@ import { OasContext } from '../oasContext.js';
 import { Writer } from '../io/writer.js';
 export declare class Union extends Type {
     consolidated: boolean;
-    get id(): string;
     schemas: SchemaObject[];
+    discriminator?: string;
     constructor(parent: IType, name: string, schemas: SchemaObject[], consolidated?: boolean);
+    get id(): string;
     forPrompt(_context: OasContext): string;
     visit(context: OasContext): void;
     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;
 }

package/dist/oas/nodes/union.js

@@ -1,16 +1,20 @@
-import { Factory, Prop, Ref, Type } from './internal.js';
+import { Factory, Ref, T, Type } from './internal.js';
 import { trace } from '../log/trace.js';
 import { Naming } from '../utils/naming.js';
+import _ from 'lodash';
 export class Union extends Type {
     consolidated;
-    get id() {
-        return `union:${this.name}`;
-    }
     schemas;
+    discriminator;
     constructor(parent, name, schemas, consolidated = false) {
         super(parent, name);
         this.consolidated = consolidated;
         this.schemas = schemas;
+        this.discriminator = _.get(parent.schema, 'discriminator')?.propertyName;
+        this.updateName();
+    }
+    get id() {
+        return `union:${this.name}`;
     }
     forPrompt(_context) {
         return `${Naming.getRefName(this.name)} (Union)`;
@@ -51,81 +55,132 @@ export class Union extends Type {
                 child.generate(context, writer, selection);
             }
         }
+        // generate traditional union
         else {
-            // When generating this union in GQL it might look like:
-            // union MyUnion = Type1 | Type2 | Type3
-            writer
-                .append('#### NOT SUPPORTED YET BY CONNECTORS!!! union ')
-                .append(Naming.getRefName(this.name))
-                .append(' = ');
-            const childrenNames = this.children.map((child) => Naming.getRefName(child.name)).join('# | ');
-            writer.append(childrenNames).append('#\n\n');
-            trace(context, '   [union::generate]', `[union] -> object: ${this.name}`);
-            writer
-                .append(this.kind + ' ')
-                .append(Naming.getRefName(this.name))
-                .append(this.nameSuffix())
-                .append(' { #### replacement for Union ')
-                .append(this.name)
-                .append('\n');
-            const selected = this.selectedProps(selection);
-            for (const prop of selected) {
-                trace(context, '   [union::generate]', `-> property: ${prop.name} (parent: ${prop.parent.name})`);
-                prop.generate(context, writer, selection);
+            const name = _.upperFirst(Naming.getRefName(this.name));
+            if (!context.generateOptions.consolidateUnion) {
+                this.children.forEach((child) => {
+                    if (child instanceof Ref) {
+                        child.refType?.generate(context, writer, selection);
+                    }
+                    else
+                        child.generate(context, writer, selection);
+                });
+                // const selected = this.selectedProps(selection);
+                writer
+                    .append('union ')
+                    .append(name)
+                    .append(this.nameSuffix())
+                    .append(' = ')
+                    .append(this.children.map((child) => Naming.getRefName(child.name)).join(' | '))
+                    .append('\n\n');
+            }
+            else {
+                // When generating this union in GQL it might look like:
+                // union MyUnion = Type1 | Type2 | Type3
+                writer.append('#### NOT SUPPORTED YET BY CONNECTORS!!! union ').append(name).append(' = ');
+                const childrenNames = this.children.map((child) => Naming.getRefName(child.name)).join(' | ');
+                writer.append(childrenNames).append('\n\n');
+                trace(context, '   [union::generate]', `[union] -> object: ${this.name}`);
+                writer
+                    .append(this.kind + ' ')
+                    .append(name)
+                    .append(this.nameSuffix())
+                    .append(' { #### replacement for Union ')
+                    .append(name)
+                    .append('\n');
+                const selected = this.selectedProps(selection);
+                for (const prop of selected) {
+                    trace(context, '   [union::generate]', `-> property: ${prop.name} (parent: ${prop.parent.name})`);
+                    prop.generate(context, writer, selection);
+                }
+                writer.append('} \n### End replacement for ').append(this.name).append('\n\n');
             }
-            writer.append('} \n### End replacement for ').append(this.name).append('\n\n');
         }
         trace(context, '<- [union::generate]', 'out: ' + schemas);
         context.leave(this);
     }
     select(context, writer, selection) {
         trace(context, '-> [union::select]', `-> in: ${this.name}`);
-        if (!this.consolidated) {
-            this.consolidate(selection);
+        if (context.generateOptions.consolidateUnion) {
+            if (!this.consolidated) {
+                this.consolidate(selection);
+            }
+            const selected = this.selectedProps(selection);
+            for (const prop of selected) {
+                prop.select(context, writer, selection);
+            }
         }
-        const selected = this.selectedProps(selection);
-        for (const prop of selected) {
-            prop.select(context, writer, selection);
+        else {
+            // collect all property names from children and write them here
+            this.children.forEach((child) => {
+                child.select(context, writer, selection);
+            });
         }
+        /* TODO:
+        dataPoints: dataFormat->match(
+        ["raw", $.dataPoints],
+        ["normal", $.dataPoints {
+          priceDateTime
+          # all other fields
+        }],
+        [@, $ { # optimized
+          priceDateTime
+          # all other fields
+          }
+        ])
+         */
         trace(context, '<- [union::select]', `-> out: ${this.name}`);
     }
     consolidate(selection) {
         const ids = new Set();
-        let props = new Map();
-        const queue = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));
+        const props = [];
+        const discriminator = this.discriminator;
+        const queue = T.containers(this);
         while (queue.length > 0) {
             const node = queue.shift();
-            ids.add(node instanceof Ref ? node.refType.id : node.id);
-            if (selection.length > 0) {
-                node.props.forEach((prop) => {
-                    if (selection.find((s) => s.startsWith(prop.path()))) {
-                        props.set(prop.name, prop);
-                    }
-                });
-            }
-            else {
-                node.props.forEach((prop) => props.set(prop.name, prop));
+            ids.add(node.id);
+            // process each prop, renaming the ones that have a name clash with others. if a selection
+            // is passed, then only add those, otherwise add all.
+            for (const prop of _.isEmpty(selection)
+                ? Array.from(node.props.values()) // include all
+                : Array.from(node.props.values())
+                    .filter((i) => selection.find((s) => s.startsWith(i.path()))) // include selected only
+                    .filter((i) => i.name !== discriminator)) {
+                // remove discriminator props
+                // rename every prop there is if there's a conflict, then add it to props
+                this.updatePropName(prop, props, selection);
+                props.push(prop);
             }
-            // sort props
-            props = new Map([...props.entries()].sort());
-            const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));
-            queue.push(...children);
+            // find the other containers and add them to the queue
+            queue.push(...T.containers(node));
         }
-        // copy all collected props from children into this node
-        props.forEach((prop) => this.props.set(prop.name, prop));
-        this.consolidated = true;
+        // add the discriminator, if we have one
+        if (discriminator)
+            props.push(this.children[0].props.get(discriminator));
+        // and finally sort the props and copy them to our original
+        props.sort((a, b) => a.name.localeCompare(b.name)).forEach((prop) => this.props.set(prop.name, prop));
         // and return the types.ts we've used
+        this.consolidated = true;
         return ids;
     }
+    updatePropName(prop, props, selection) {
+        let name = prop.name;
+        let counter = 0;
+        while (props.find((p) => p.name === name)) {
+            name = `${prop.name}${++counter}`;
+        }
+        if (name !== prop.name) {
+            prop.name = name;
+            // we need to extend the selection too, because a new property has been created
+            selection.push(prop.path());
+        }
+    }
     visitProperties(_context) {
         // do nothing?
-        // for (const [_, prop] of collected.entries()) {
-        //   trace(context, '   [union]', 'prop: ' + prop);
-        //   this.props.set(prop.name, prop);
-        //
-        //   if (!this.children.includes(prop))
-        //     this.add(prop);
-        // }
+    }
+    updateName() {
+        this.name = this.parent.name + `Union`;
     }
 }
 //# sourceMappingURL=union.js.map