apollo-conn-gen 0.9.1 → 0.10.0

package/dist/oas/generator/typesCollector.d.ts

@@ -6,4 +6,6 @@ export declare class TypesCollector {
     expanded: string[];
     constructor(gen: OasGen);
     collect(selection: string[]): void;
+    private collectReachable;
+    private findSelectedFieldNode;
 }

package/dist/oas/generator/typesCollector.js

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import { Composed } from '../nodes/comp.js';
-import { Prop, PropArray, PropCircRef, Scalar, T } from '../nodes/internal.js';
+import { Prop, PropArray, PropCircRef, PropEn, Scalar, T } from '../nodes/internal.js';
+import { Naming } from '../utils/naming.js';
 export class TypesCollector {
     gen;
     types = new Map();
@@ -18,7 +19,7 @@ export class TypesCollector {
             let i = 0;
             const parts = path.split('>');
             do {
-                const part = parts[i].replace(/#\/c\/s/g, '#/components/schemas');
+                const part = Naming.expandRef(parts[i]);
                 if (part === '*') {
                     // remove the current path from the expanded array
                     expanded = expanded.filter((s) => s !== path);
@@ -45,15 +46,6 @@ export class TypesCollector {
                 collection = Array.from(current.children.values()) || Array.from(current.props.values()) || [];
                 i++;
             } while (i < parts.length);
-            // optional hook -- if the type in question has deps, add them here
-            const deps = _.invoke(current, 'dependencies', [this.gen.context]);
-            if (deps) {
-                deps
-                    .filter((i) => !pendingTypes.has(i.id))
-                    .forEach((i) => {
-                    pendingTypes.set(i.id, i);
-                });
-            }
             if (current && !(current instanceof Scalar)) {
                 const parentType = T.findNonPropParent(current);
                 if (!pendingTypes.has(parentType.id)) {
@@ -68,19 +60,122 @@ export class TypesCollector {
                 });
             }
         }
+        // One operation can reach the same schema through several routes, and each route builds its
+        // own node for it. Cycle detection (#10) removes a field from a node when that field would
+        // loop back to an ancestor of ITS route — so two nodes for the same schema can end up with
+        // different fields. Only one of them is written to the output schema (the first one found),
+        // but the connector selection is assembled from ALL routes: it can ask for a field the
+        // written node doesn't have, and composition fails (SELECTED_FIELD_NOT_FOUND).
+        //
+        // e.g. (confluence, one op): `Space` is reached twice —
+        //   via Content: its `history` field was removed (history loops back to Content)
+        //   via Results: `history` kept — and that route's selection asks for it
+        //
+        // The routes are already spelled out in `expanded`, so for each removed field we look for a
+        // selection path carrying the real field under the same type id, walk that path to its node,
+        // and tell the writer to emit that version of the field (context.sdlPropOverrides — the TYPE
+        // DEFINITION only; selections are left alone, each route keeps its own "field removed"
+        // comment. Putting the field back into props re-created the loop cycle detection had just
+        // broken: rover CIRCULAR_REFERENCE). Because the replacement comes FROM the selection, a
+        // field nobody selects is never added (CONNECTORS_UNRESOLVED_FIELD, test_040 AdobeCommerce).
+        // see docs/issues.md #13
+        const context = this.gen.context;
+        for (const kept of pendingTypes.values()) {
+            kept.props.forEach((prop, name) => {
+                if (!(prop instanceof PropCircRef)) {
+                    return;
+                }
+                const donor = this.findSelectedFieldNode(kept, name, expanded);
+                if (donor) {
+                    let overrides = context.sdlPropOverrides.get(kept);
+                    if (!overrides) {
+                        overrides = new Map();
+                        context.sdlPropOverrides.set(kept, overrides);
+                    }
+                    overrides.set(name, donor);
+                }
+            });
+        }
         // first pass is to consolidate all Composed & Union nodes
         const composed = Array.from(pendingTypes.values())
             .filter((t) => t instanceof Composed)
             .map((t) => t);
-        const context = this.gen.context;
         for (const comp of composed) {
             if (!comp.visited)
                 comp.visit(context);
             comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));
         }
+        // keep exactly the types the written schema references: confluence emitted `Label` with
+        // nothing selecting it, box dropped `Folder--Mini` while still referencing it. see #26
+        const reachable = this.collectReachable(expanded);
+        for (const [id, type] of Array.from(pendingTypes.entries())) {
+            if (!reachable.has(type)) {
+                pendingTypes.delete(id);
+            }
+        }
+        for (const type of reachable) {
+            if (!pendingTypes.has(type.id)) {
+                pendingTypes.set(type.id, type);
+            }
+        }
         this.types = pendingTypes;
         this.expanded = expanded;
     }
+    // Every type the written schema will point at, walked over each node's own dependencies()
+    // from the selected operations' result/body. e.g. `getUser: User` + `User.address: Address`
+    // reaches { User, Address }. see #26
+    collectReachable(expanded) {
+        const context = this.gen.context;
+        const opIds = new Set(expanded.map((p) => p.split('>')[0]));
+        const queue = [];
+        for (const op of this.gen.paths.values()) {
+            if (opIds.has(op.id)) {
+                const roots = [_.get(op, 'resultType'), _.get(op, 'body')];
+                queue.push(...roots.filter((n) => !!n));
+            }
+        }
+        const visited = new Set();
+        while (queue.length > 0) {
+            const node = queue.pop();
+            if (visited.has(node)) {
+                continue;
+            }
+            // every container was expanded by the collect loop before this walk — an unvisited one
+            // means a missed reference, and writing it would silently truncate the schema. Enums are
+            // exempt: they are complete at construction and their visit() only registers the name.
+            // dependencies() implementations must stay read-only: no visit(), no context stack. #26
+            if (!node.visited && T.isContainer(node)) {
+                throw new Error(`collectReachable: unvisited type ${node.id} — the collect walk missed a reference`);
+            }
+            visited.add(node);
+            queue.push(...node.dependencies(context, expanded));
+        }
+        return new Set(Array.from(visited).filter(T.isEmittable));
+    }
+    // A selection path that carries the real `name` field under this type id (`>obj:type:X>prop:…:name>`),
+    // walked to its node — the un-removed version of a field this node lost to a cycle cut. see #13
+    findSelectedFieldNode(kept, name, expanded) {
+        // selection paths abbreviate component refs (`path()` writes `#/c/s`); match that form
+        const marker = `>${Naming.abbreviateRef(kept.id)}>`;
+        for (const sel of expanded) {
+            const at = sel.indexOf(marker);
+            if (at < 0) {
+                continue;
+            }
+            const segment = sel.slice(at + marker.length).split('>')[0];
+            const isRealProp = segment.startsWith('prop:') && !segment.startsWith('prop:circular-ref');
+            if (!isRealProp || !(segment.endsWith(':' + name) || segment.endsWith(':#' + name))) {
+                continue;
+            }
+            const donorPath = sel.slice(0, at + marker.length + segment.length);
+            const stack = new PathsCollector(this.gen).collectPaths(donorPath, Array.from(this.gen.paths.values()));
+            const donor = stack[stack.length - 1];
+            if (donor && !(donor instanceof PropCircRef)) {
+                return donor;
+            }
+        }
+        return undefined;
+    }
 }
 class PathsCollector {
     gen;
@@ -109,7 +204,7 @@ class PathsCollector {
         let i = 0;
         const parts = path.split('>');
         do {
-            const part = parts[i].replace(/#\/c\/s/g, '#/components/schemas');
+            const part = Naming.expandRef(parts[i]);
             current = collection.find((t) => t.id === part);
             if (!current) {
                 throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());
@@ -135,6 +230,11 @@ class PathsCollector {
                 if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {
                     newSelection.add(child.path());
                 }
+                else if (child instanceof PropEn) {
+                    // enum props are leaves too — without this, `>**` silently drops every enum field
+                    // (slack's `ok`-only stubs collapsed to zero types). see docs/issues.md #24
+                    newSelection.add(child.path());
+                }
                 else if (child instanceof PropCircRef) {
                     // a cut cycle is a leaf: include its path so the commented field is emitted (in both the
                     // SDL and the selection) instead of silently dropped. see docs/issues.md #10

package/dist/oas/generator/typesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"typesCollector.js","sourceRoot":"","sources":["../../../src/oas/generator/typesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { Composed } from '../nodes/comp.js';\nimport { IType, Prop, PropArray, PropCircRef, Scalar, T } from '../nodes/internal.js';\nimport { OasGen } from '../oasGen.js';\n\nexport class TypesCollector {\n  types: Map<string, IType> = new Map();\n  expanded: string[] = [];\n\n  constructor(private gen: OasGen) {}\n\n  public collect(selection: string[]): void {\n    const pendingTypes: Map<string, IType> = new Map();\n    let expanded: string[] = new PathsCollector(this.gen).collectExpandedPaths(selection);\n\n    for (const path of expanded) {\n      let collection = Array.from(this.gen.paths.values());\n      let current: IType | undefined;\n      let last: IType | undefined;\n\n      let i = 0;\n      const parts = path.split('>');\n      do {\n        const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n        if (part === '*') {\n          // remove the current path from the expanded array\n          expanded = expanded.filter((s) => s !== path);\n\n          if (current && current instanceof Composed) {\n            current!.consolidate(expanded);\n          }\n\n          // add all the props from the current node and exit loop\n          current?.props.forEach((child) => {\n            if (T.isLeaf(child)) {\n              expanded.push(child.path());\n            }\n          });\n          break;\n        }\n\n        current = collection.find((t) => t.id === part);\n        if (!current) {\n          const tree = T.print(last!.ancestors()[0]);\n\n          // let's collect the possible paths so we don't have to debug\n          throw new Error(\n            'Could not find type: ' + part + ' from ' + path + '\\nlast:\\n' + last?.pathToRoot() + '\\ntree: ' + tree,\n          );\n        }\n\n        // make sure we expand it before we move on to the next part\n        this.gen.expand(current);\n        last = current;\n\n        collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n        i++;\n      } while (i < parts.length);\n\n      // optional hook -- if the type in question has deps, add them here\n      const deps: IType[] = _.invoke(current, 'dependencies', [this.gen.context]);\n      if (deps) {\n        deps\n          .filter((i) => !pendingTypes.has(i.id))\n          .forEach((i) => {\n            pendingTypes.set(i.id, i);\n          });\n      }\n\n      if (current && !(current instanceof Scalar)) {\n        const parentType = T.findNonPropParent(current as IType);\n        if (!pendingTypes.has(parentType.id)) {\n          pendingTypes.set(parentType.id, parentType);\n        }\n\n        // add all ancestors (of the parent of the prop) that are containers so they are generated accordingly\n        parentType\n          .ancestors()\n          .filter((t) => !pendingTypes.has(t.id) && T.isContainer(t))\n          .forEach((dep) => {\n            pendingTypes.set(dep.id, dep);\n          });\n      }\n    }\n\n    // first pass is to consolidate all Composed & Union nodes\n    const composed: Array<Composed> = Array.from(pendingTypes.values())\n      .filter((t) => t instanceof Composed)\n      .map((t) => t as Composed);\n\n    const context = this.gen.context!;\n    for (const comp of composed) {\n      if (!comp.visited) comp.visit(context);\n      comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));\n    }\n\n    this.types = pendingTypes;\n    this.expanded = expanded;\n  }\n}\n\nclass PathsCollector {\n  constructor(private gen: OasGen) {}\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static progressiveSplits(input: string): string[] {\n    const parts = input.split('>');\n    const results: string[] = [];\n    for (let i = 1; i <= parts.length; i++) {\n      results.push(parts.slice(0, i).join('>'));\n    }\n    return results;\n  }\n\n  public collectPaths(path: string, collection: IType[]): IType[] {\n    const stack: IType[] = [];\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = parts[i].replace(/#\\/c\\/s/g, '#/components/schemas');\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());\n      }\n\n      // make sure we expand it before we move on to the next part\n      this.gen.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      stack.push(current);\n      i++;\n    } while (i < parts.length);\n\n    return stack;\n  }\n\n  public collectExpandedPaths(selection: string[]) {\n    const newSelection = new Set<string>();\n    const expands = selection.filter((p) => p.endsWith('>**'));\n    const filtered = expands.map((p) => p.replace('>**', ''));\n\n    const paths = Array.from(this.gen.paths.values());\n    const nodes = filtered.map((p) => this.collectPaths(p, paths));\n\n    nodes.forEach((stack) => {\n      const root = _.last(stack)!;\n      T.traverse(root, (child) => {\n        if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {\n          newSelection.add(child.path());\n        } else if (child instanceof PropCircRef) {\n          // a cut cycle is a leaf: include its path so the commented field is emitted (in both the\n          // SDL and the selection) instead of silently dropped. see docs/issues.md #10\n          newSelection.add(child.path());\n        } else {\n          this.gen.expand(child);\n        }\n      });\n    });\n\n    // finally remove the expanded paths from the selection\n    return [...newSelection, ...selection.filter((p) => !expands.includes(p))];\n  }\n}\n"]}
+{"version":3,"file":"typesCollector.js","sourceRoot":"","sources":["../../../src/oas/generator/typesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { Composed } from '../nodes/comp.js';\nimport { IType, Prop, PropArray, PropCircRef, PropEn, Scalar, T } from '../nodes/internal.js';\nimport { OasGen } from '../oasGen.js';\nimport { Naming } from '../utils/naming.js';\n\nexport class TypesCollector {\n  types: Map<string, IType> = new Map();\n  expanded: string[] = [];\n\n  constructor(private gen: OasGen) {}\n\n  public collect(selection: string[]): void {\n    const pendingTypes: Map<string, IType> = new Map();\n    let expanded: string[] = new PathsCollector(this.gen).collectExpandedPaths(selection);\n\n    for (const path of expanded) {\n      let collection = Array.from(this.gen.paths.values());\n      let current: IType | undefined;\n      let last: IType | undefined;\n\n      let i = 0;\n      const parts = path.split('>');\n      do {\n        const part = Naming.expandRef(parts[i]);\n        if (part === '*') {\n          // remove the current path from the expanded array\n          expanded = expanded.filter((s) => s !== path);\n\n          if (current && current instanceof Composed) {\n            current!.consolidate(expanded);\n          }\n\n          // add all the props from the current node and exit loop\n          current?.props.forEach((child) => {\n            if (T.isLeaf(child)) {\n              expanded.push(child.path());\n            }\n          });\n          break;\n        }\n\n        current = collection.find((t) => t.id === part);\n        if (!current) {\n          const tree = T.print(last!.ancestors()[0]);\n\n          // let's collect the possible paths so we don't have to debug\n          throw new Error(\n            'Could not find type: ' + part + ' from ' + path + '\\nlast:\\n' + last?.pathToRoot() + '\\ntree: ' + tree,\n          );\n        }\n\n        // make sure we expand it before we move on to the next part\n        this.gen.expand(current);\n        last = current;\n\n        collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n        i++;\n      } while (i < parts.length);\n\n      if (current && !(current instanceof Scalar)) {\n        const parentType = T.findNonPropParent(current as IType);\n        if (!pendingTypes.has(parentType.id)) {\n          pendingTypes.set(parentType.id, parentType);\n        }\n\n        // add all ancestors (of the parent of the prop) that are containers so they are generated accordingly\n        parentType\n          .ancestors()\n          .filter((t) => !pendingTypes.has(t.id) && T.isContainer(t))\n          .forEach((dep) => {\n            pendingTypes.set(dep.id, dep);\n          });\n      }\n    }\n\n    // One operation can reach the same schema through several routes, and each route builds its\n    // own node for it. Cycle detection (#10) removes a field from a node when that field would\n    // loop back to an ancestor of ITS route — so two nodes for the same schema can end up with\n    // different fields. Only one of them is written to the output schema (the first one found),\n    // but the connector selection is assembled from ALL routes: it can ask for a field the\n    // written node doesn't have, and composition fails (SELECTED_FIELD_NOT_FOUND).\n    //\n    // e.g. (confluence, one op): `Space` is reached twice —\n    //   via Content: its `history` field was removed (history loops back to Content)\n    //   via Results: `history` kept — and that route's selection asks for it\n    //\n    // The routes are already spelled out in `expanded`, so for each removed field we look for a\n    // selection path carrying the real field under the same type id, walk that path to its node,\n    // and tell the writer to emit that version of the field (context.sdlPropOverrides — the TYPE\n    // DEFINITION only; selections are left alone, each route keeps its own \"field removed\"\n    // comment. Putting the field back into props re-created the loop cycle detection had just\n    // broken: rover CIRCULAR_REFERENCE). Because the replacement comes FROM the selection, a\n    // field nobody selects is never added (CONNECTORS_UNRESOLVED_FIELD, test_040 AdobeCommerce).\n    // see docs/issues.md #13\n    const context = this.gen.context!;\n    for (const kept of pendingTypes.values()) {\n      kept.props.forEach((prop, name) => {\n        if (!(prop instanceof PropCircRef)) {\n          return;\n        }\n        const donor = this.findSelectedFieldNode(kept, name, expanded);\n        if (donor) {\n          let overrides = context.sdlPropOverrides.get(kept);\n          if (!overrides) {\n            overrides = new Map();\n            context.sdlPropOverrides.set(kept, overrides);\n          }\n          overrides.set(name, donor);\n        }\n      });\n    }\n\n    // first pass is to consolidate all Composed & Union nodes\n    const composed: Array<Composed> = Array.from(pendingTypes.values())\n      .filter((t) => t instanceof Composed)\n      .map((t) => t as Composed);\n\n    for (const comp of composed) {\n      if (!comp.visited) comp.visit(context);\n      comp.consolidate(expanded).forEach((id) => pendingTypes.delete(id));\n    }\n\n    // keep exactly the types the written schema references: confluence emitted `Label` with\n    // nothing selecting it, box dropped `Folder--Mini` while still referencing it. see #26\n    const reachable = this.collectReachable(expanded);\n    for (const [id, type] of Array.from(pendingTypes.entries())) {\n      if (!reachable.has(type)) {\n        pendingTypes.delete(id);\n      }\n    }\n    for (const type of reachable) {\n      if (!pendingTypes.has(type.id)) {\n        pendingTypes.set(type.id, type);\n      }\n    }\n\n    this.types = pendingTypes;\n    this.expanded = expanded;\n  }\n\n  // Every type the written schema will point at, walked over each node's own dependencies()\n  // from the selected operations' result/body. e.g. `getUser: User` + `User.address: Address`\n  // reaches { User, Address }. see #26\n  private collectReachable(expanded: string[]): Set<IType> {\n    const context = this.gen.context!;\n    const opIds = new Set(expanded.map((p) => p.split('>')[0]));\n\n    const queue: IType[] = [];\n    for (const op of this.gen.paths.values()) {\n      if (opIds.has(op.id)) {\n        const roots = [_.get(op, 'resultType'), _.get(op, 'body')] as Array<IType | undefined>;\n        queue.push(...roots.filter((n): n is IType => !!n));\n      }\n    }\n\n    const visited = new Set<IType>();\n    while (queue.length > 0) {\n      const node = queue.pop()!;\n      if (visited.has(node)) {\n        continue;\n      }\n      // every container was expanded by the collect loop before this walk — an unvisited one\n      // means a missed reference, and writing it would silently truncate the schema. Enums are\n      // exempt: they are complete at construction and their visit() only registers the name.\n      // dependencies() implementations must stay read-only: no visit(), no context stack. #26\n      if (!node.visited && T.isContainer(node)) {\n        throw new Error(`collectReachable: unvisited type ${node.id} — the collect walk missed a reference`);\n      }\n      visited.add(node);\n      queue.push(...node.dependencies(context, expanded));\n    }\n\n    return new Set(Array.from(visited).filter(T.isEmittable));\n  }\n\n  // A selection path that carries the real `name` field under this type id (`>obj:type:X>prop:…:name>`),\n  // walked to its node — the un-removed version of a field this node lost to a cycle cut. see #13\n  private findSelectedFieldNode(kept: IType, name: string, expanded: string[]): IType | undefined {\n    // selection paths abbreviate component refs (`path()` writes `#/c/s`); match that form\n    const marker = `>${Naming.abbreviateRef(kept.id)}>`;\n    for (const sel of expanded) {\n      const at = sel.indexOf(marker);\n      if (at < 0) {\n        continue;\n      }\n      const segment = sel.slice(at + marker.length).split('>')[0];\n      const isRealProp = segment.startsWith('prop:') && !segment.startsWith('prop:circular-ref');\n      if (!isRealProp || !(segment.endsWith(':' + name) || segment.endsWith(':#' + name))) {\n        continue;\n      }\n      const donorPath = sel.slice(0, at + marker.length + segment.length);\n      const stack = new PathsCollector(this.gen).collectPaths(donorPath, Array.from(this.gen.paths.values()));\n      const donor = stack[stack.length - 1];\n      if (donor && !(donor instanceof PropCircRef)) {\n        return donor;\n      }\n    }\n    return undefined;\n  }\n}\n\nclass PathsCollector {\n  constructor(private gen: OasGen) {}\n\n  public static findNonPropParent(type: IType) {\n    let parent = type;\n    while (parent instanceof Prop) {\n      parent = parent.parent!;\n    }\n    return parent;\n  }\n\n  public static progressiveSplits(input: string): string[] {\n    const parts = input.split('>');\n    const results: string[] = [];\n    for (let i = 1; i <= parts.length; i++) {\n      results.push(parts.slice(0, i).join('>'));\n    }\n    return results;\n  }\n\n  public collectPaths(path: string, collection: IType[]): IType[] {\n    const stack: IType[] = [];\n    let current: IType | undefined;\n    let last: IType | undefined;\n\n    let i = 0;\n    const parts = path.split('>');\n    do {\n      const part = Naming.expandRef(parts[i]);\n\n      current = collection.find((t) => t.id === part);\n      if (!current) {\n        throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());\n      }\n\n      // make sure we expand it before we move on to the next part\n      this.gen.expand(current);\n      last = current;\n\n      collection = Array.from(current!.children.values()) || Array.from(current!.props.values()) || [];\n\n      stack.push(current);\n      i++;\n    } while (i < parts.length);\n\n    return stack;\n  }\n\n  public collectExpandedPaths(selection: string[]) {\n    const newSelection = new Set<string>();\n    const expands = selection.filter((p) => p.endsWith('>**'));\n    const filtered = expands.map((p) => p.replace('>**', ''));\n\n    const paths = Array.from(this.gen.paths.values());\n    const nodes = filtered.map((p) => this.collectPaths(p, paths));\n\n    nodes.forEach((stack) => {\n      const root = _.last(stack)!;\n      T.traverse(root, (child) => {\n        if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {\n          newSelection.add(child.path());\n        } else if (child instanceof PropEn) {\n          // enum props are leaves too — without this, `>**` silently drops every enum field\n          // (slack's `ok`-only stubs collapsed to zero types). see docs/issues.md #24\n          newSelection.add(child.path());\n        } else if (child instanceof PropCircRef) {\n          // a cut cycle is a leaf: include its path so the commented field is emitted (in both the\n          // SDL and the selection) instead of silently dropped. see docs/issues.md #10\n          newSelection.add(child.path());\n        } else {\n          this.gen.expand(child);\n        }\n      });\n    });\n\n    // finally remove the expanded paths from the selection\n    return [...newSelection, ...selection.filter((p) => !expands.includes(p))];\n  }\n}\n"]}

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

@@ -11,5 +11,6 @@ export declare class Arr extends Type {
     visit(context: OasContext): void;
     forPrompt(_context: OasContext): string;
     generate(context: OasContext, writer: Writer, selection: string[]): void;
+    dependencies(): IType[];
     select(context: OasContext, writer: Writer, selection: string[]): void;
 }

package/dist/oas/nodes/arr.js

@@ -35,6 +35,9 @@ export class Arr extends Type {
         trace(context, '<- [array::generate]', `-> out: ${this.name}`);
         context.leave(this);
     }
+    dependencies() {
+        return this.itemsType ? [this.itemsType] : [];
+    }
     select(context, writer, selection) {
         trace(context, '-> [array::select]', `-> in: ${this.name}`);
         if (this.itemsType) {

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

@@ -1 +1 @@
-{"version":3,"file":"arr.js","sourceRoot":"","sources":["../../../src/oas/nodes/arr.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,GAAI,SAAQ,IAAI;IACpB,SAAS,CAAS;IAClB,KAAK,CAAqB;IAEjC,YAAY,MAAyB,EAAE,IAAY;QACjD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,QAAQ,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,OAAmB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,SAAS,CAAC,QAAoB;QACnC,OAAO,WAAW,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACnD,CAAC;IAEM,QAAQ,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACtE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAElB,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;CACF","sourcesContent":["import { OpenAPIV3 } from 'openapi-types';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\n\nimport { IType, Type } 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 Arr extends Type {\n  public itemsType?: IType;\n  public items?: ArraySchemaObject;\n\n  constructor(parent: IType | undefined, name: string) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    return 'array:' + (this.itemsType ? this.itemsType.name : 'unknown-yet');\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [array:visit]', 'in');\n\n    this.itemsType?.visit(context);\n    this.visited = true;\n\n    trace(context, '-> [array:visit]', 'out');\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[array] ${Naming.getRefName(this.name)}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [array::generate]', `-> in: ${this.name}`);\n\n    writer.write('[');\n    if (this.itemsType) {\n      this.itemsType.generate(context, writer, selection);\n    }\n    writer.write(']');\n\n    trace(context, '<- [array::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [array::select]', `-> in: ${this.name}`);\n\n    if (this.itemsType) {\n      this.itemsType.select(context, writer, selection);\n    }\n\n    trace(context, '<- [array::select]', `-> out: ${this.name}`);\n  }\n}\n"]}
+{"version":3,"file":"arr.js","sourceRoot":"","sources":["../../../src/oas/nodes/arr.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,GAAI,SAAQ,IAAI;IACpB,SAAS,CAAS;IAClB,KAAK,CAAqB;IAEjC,YAAY,MAAyB,EAAE,IAAY;QACjD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,QAAQ,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,OAAmB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEM,SAAS,CAAC,QAAoB;QACnC,OAAO,WAAW,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACnD,CAAC;IAEM,QAAQ,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACtE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAElB,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,OAAmB,EAAE,MAAc,EAAE,SAAmB;QACpE,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;CACF","sourcesContent":["import { OpenAPIV3 } from 'openapi-types';\nimport ArraySchemaObject = OpenAPIV3.ArraySchemaObject;\n\nimport { IType, Type } 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 Arr extends Type {\n  public itemsType?: IType;\n  public items?: ArraySchemaObject;\n\n  constructor(parent: IType | undefined, name: string) {\n    super(parent, name);\n  }\n\n  get id(): string {\n    return 'array:' + (this.itemsType ? this.itemsType.name : 'unknown-yet');\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [array:visit]', 'in');\n\n    this.itemsType?.visit(context);\n    this.visited = true;\n\n    trace(context, '-> [array:visit]', 'out');\n    context.leave(this);\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[array] ${Naming.getRefName(this.name)}`;\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [array::generate]', `-> in: ${this.name}`);\n\n    writer.write('[');\n    if (this.itemsType) {\n      this.itemsType.generate(context, writer, selection);\n    }\n    writer.write(']');\n\n    trace(context, '<- [array::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  dependencies(): IType[] {\n    return this.itemsType ? [this.itemsType] : [];\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [array::select]', `-> in: ${this.name}`);\n\n    if (this.itemsType) {\n      this.itemsType.select(context, writer, selection);\n    }\n\n    trace(context, '<- [array::select]', `-> out: ${this.name}`);\n  }\n}\n"]}

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

@@ -10,6 +10,7 @@ export declare class Body extends Type {
     visit(context: OasContext): void;
     forPrompt(context: OasContext): string;
     generate(_context: OasContext, _writer: Writer, _selection: string[]): void;
+    dependencies(): IType[];
     select(context: OasContext, writer: Writer, selection: string[]): void;
     private visitBody;
     private visitBodyRef;

package/dist/oas/nodes/body.js

@@ -29,6 +29,9 @@ export class Body extends Type {
     generate(_context, _writer, _selection) {
         // do nothing for body, it will be added automatically
     }
+    dependencies() {
+        return this.payload ? [this.payload] : [];
+    }
     select(context, writer, selection) {
         trace(context, '-> [body:select]', `-> in: ${this.parent.name}`);
         if (this.payload) {

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

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/oas/nodes/body.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, IType, ReferenceObject, 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 Body extends Type {\n  public schema: SchemaObject;\n  public payload?: IType;\n\n  constructor(parent: IType, name: string, schema: SchemaObject) {\n    super(parent, name);\n    this.schema = schema;\n    this.kind = 'input'; // all children will have the same type\n  }\n\n  get id(): string {\n    return 'body:' + this.name;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [body:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [body:visit]', 'in ' + this.name);\n\n    this.visitBody(context, 'Input', this.schema);\n    this.visited = true;\n\n    trace(context, '<- [body:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n  public forPrompt(context: OasContext): string {\n    return 'Body';\n  }\n\n  public generate(_context: OasContext, _writer: Writer, _selection: string[]): void {\n    // do nothing for body, it will be added automatically\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]): void {\n    trace(context, '-> [body:select]', `-> in: ${this.parent!.name}`);\n\n    if (this.payload) {\n      const spacing = ' '.repeat(6);\n      writer.write(spacing + 'body: \"\"\"\\n').write(spacing + '$args.input {\\n');\n\n      context.indent += 2;\n      this.payload.select(context, writer, selection);\n      context.indent -= 2;\n\n      writer.write(spacing + '} \\n').write(spacing + '\"\"\"\\n' + ' '.repeat(5));\n    }\n\n    trace(context, '<- [body:select]', `-> out: ${this.parent!.name}`);\n  }\n\n  private visitBody(context: OasContext, name: string, schema: SchemaObject | ReferenceObject): void {\n    trace(context, '-> [post::body::content]', 'in ' + this.name);\n\n    if ('$ref' in schema) {\n      this.visitBodyRef(context, schema as ReferenceObject);\n    }\n    // If the response has a content property, we need to find the JSON content.\n    else if (schema) {\n      const type = Factory.fromSchema(context, this, schema as SchemaObject);\n      this.add(type);\n\n      this.payload = type;\n      this.payload!.name = name;\n    }\n    // don't know how to handle this yet\n    else {\n      throw new Error('Not yet implemented for: ' + JSON.stringify(schema));\n    }\n\n    trace(context, '<- [post::body::content]', 'out ' + this.name);\n  }\n\n  private visitBodyRef(context: OasContext, ref: ReferenceObject): void {\n    trace(context, '-> [post::body::ref]', `in: ${this.name}, ref: ${ref.$ref}`);\n\n    const lookup = context.lookupRef(ref.$ref!);\n    if (!lookup) {\n      throw new Error('Could not find a response with ref: ' + ref.$ref);\n    }\n\n    if ('$ref' in lookup) {\n      throw new Error('Not yet implemented for nested refs');\n    }\n\n    this.visitBody(context, ref.$ref, lookup as SchemaObject);\n    trace(context, '<- [post::body::ref]', `out: ${this.name}, ref: ${ref.$ref}`);\n  }\n}\n"]}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/oas/nodes/body.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, IType, ReferenceObject, 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 Body extends Type {\n  public schema: SchemaObject;\n  public payload?: IType;\n\n  constructor(parent: IType, name: string, schema: SchemaObject) {\n    super(parent, name);\n    this.schema = schema;\n    this.kind = 'input'; // all children will have the same type\n  }\n\n  get id(): string {\n    return 'body:' + this.name;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      trace(context, '-> [body:visit]', this.name + ' already visited.');\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [body:visit]', 'in ' + this.name);\n\n    this.visitBody(context, 'Input', this.schema);\n    this.visited = true;\n\n    trace(context, '<- [body:visit]', 'out ' + this.name);\n    context.leave(this);\n  }\n  public forPrompt(context: OasContext): string {\n    return 'Body';\n  }\n\n  public generate(_context: OasContext, _writer: Writer, _selection: string[]): void {\n    // do nothing for body, it will be added automatically\n  }\n\n  dependencies(): IType[] {\n    return this.payload ? [this.payload] : [];\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]): void {\n    trace(context, '-> [body:select]', `-> in: ${this.parent!.name}`);\n\n    if (this.payload) {\n      const spacing = ' '.repeat(6);\n      writer.write(spacing + 'body: \"\"\"\\n').write(spacing + '$args.input {\\n');\n\n      context.indent += 2;\n      this.payload.select(context, writer, selection);\n      context.indent -= 2;\n\n      writer.write(spacing + '} \\n').write(spacing + '\"\"\"\\n' + ' '.repeat(5));\n    }\n\n    trace(context, '<- [body:select]', `-> out: ${this.parent!.name}`);\n  }\n\n  private visitBody(context: OasContext, name: string, schema: SchemaObject | ReferenceObject): void {\n    trace(context, '-> [post::body::content]', 'in ' + this.name);\n\n    if ('$ref' in schema) {\n      this.visitBodyRef(context, schema as ReferenceObject);\n    }\n    // If the response has a content property, we need to find the JSON content.\n    else if (schema) {\n      const type = Factory.fromSchema(context, this, schema as SchemaObject);\n      this.add(type);\n\n      this.payload = type;\n      this.payload!.name = name;\n    }\n    // don't know how to handle this yet\n    else {\n      throw new Error('Not yet implemented for: ' + JSON.stringify(schema));\n    }\n\n    trace(context, '<- [post::body::content]', 'out ' + this.name);\n  }\n\n  private visitBodyRef(context: OasContext, ref: ReferenceObject): void {\n    trace(context, '-> [post::body::ref]', `in: ${this.name}, ref: ${ref.$ref}`);\n\n    const lookup = context.lookupRef(ref.$ref!);\n    if (!lookup) {\n      throw new Error('Could not find a response with ref: ' + ref.$ref);\n    }\n\n    if ('$ref' in lookup) {\n      throw new Error('Not yet implemented for nested refs');\n    }\n\n    this.visitBody(context, ref.$ref, lookup as SchemaObject);\n    trace(context, '<- [post::body::ref]', `out: ${this.name}, ref: ${ref.$ref}`);\n  }\n}\n"]}

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

@@ -12,6 +12,7 @@ export declare class Composed extends Type {
     forPrompt(_context: OasContext): string;
     visit(context: OasContext): void;
     generate(context: OasContext, writer: Writer, selection: string[]): void;
+    dependencies(_context: OasContext, selection: string[]): IType[];
     select(context: OasContext, writer: Writer, selection: string[]): void;
     consolidate(selection: string[]): Set<string>;
     private visitAllOfNode;

package/dist/oas/nodes/comp.js

@@ -32,6 +32,11 @@ export class Composed extends Type {
         if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {
             trace(context, '[comp]', '   in composed schema: ' + this.name);
         }
+        // a PropComp-named inline allOf (#7) that clashes with a stored type of a different class
+        // must rename — otherwise the same type name is defined twice. see docs/issues.md #22
+        if (this.parent instanceof Prop && T.collidesAcrossNodeClasses(this, context)) {
+            T.resolveNameConflict(this, context);
+        }
         const composedSchema = this.schema;
         // this will be a type declaration
         if (composedSchema.allOf != null) {
@@ -82,6 +87,13 @@ export class Composed extends Type {
         trace(context, '<- [comp::generate]', `-> out: ${this.name}`);
         context.leave(this);
     }
+    // the selected props, once the allOf members are folded in (same shape select writes)
+    dependencies(_context, selection) {
+        if (this.schema.allOf != null && !this.consolidated) {
+            this.consolidate(selection);
+        }
+        return this.selectedProps(selection);
+    }
     select(context, writer, selection) {
         trace(context, '-> [comp::select]', `-> in: ${this.name}`);
         if (!this.consolidated) {

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

@@ -1 +1 @@
-{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, IType, Prop, ReferenceObject, Res, T, Type } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Composed extends Type {\n  // R2: GraphQL interface this member implements (a shared allOf base of a discriminated\n  // oneOf). When set, generate() appends `implements <Base>`. Set by promoteInterfaces.\n  public implementsInterface?: string;\n\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  get id(): string {\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[comp] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', '   in composed schema: ' + this.name);\n    }\n\n    const composedSchema = this.schema;\n\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type and should be handled elsewhere\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    if (this.schema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // Definition and reference must agree: references emit genTypeName(name), so the definition\n        // does too (upperFirst(getRefName) kept separators: `Billing_historyResponse` vs the\n        // reference's `BillingHistoryResponse`). Mirrors obj.ts. see docs/issues.md #15, #6\n        const sanitised = Naming.genTypeName(this.name);\n        const refName = Naming.getRefName(this.name);\n        writer.write(this.kind + ' ');\n        writer.write(sanitised === refName ? refName : sanitised);\n        writer.write(this.nameSuffix());\n        // R2: a promoted member implements the shared base interface.\n        if (this.implementsInterface) {\n          writer.write(` implements ${this.implementsInterface}`);\n        }\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const tree = T.print(this);\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      ids.add(node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      // skip metadata-only allOf members (they contribute no fields). see docs/issues.md #5\n      if (Factory.isEmptySchema(allOfItemSchema as SchemaObject)) {\n        trace(context, '   [composed::all-of]', `skipping empty allOf member #${i}`);\n        continue;\n      }\n\n      const type = Factory.fromSchema(context, this, allOfItemSchema as SchemaObject);\n      this.add(type);\n\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    const tree = T.print(this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  add(child: IType): IType {\n    let name = child.name;\n    let idx = 0;\n\n    // TODO: this should not be applicable to Refs\n    while (this.children.some((c) => c.name === name)) {\n      name = `${child.name}:${++idx}`;\n    }\n\n    child.name = name;\n    return super.add(child);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    if (!name) {\n      if (this.parent instanceof Res) {\n        const op = this.parent!.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      } else if (this.schema?.allOf?.length === 1) {\n        // single member: adopt its ref name (avoids an unusable '[inline:…]' name). see docs/issues.md #7\n        name = _.get(this.schema?.allOf[0], '$ref') as string;\n      } else if (this.parent instanceof Prop) {\n        // emitted inline allOf-property type needs a real name, not '[inline:…]'. see docs/issues.md #7\n        name = Naming.genTypeName(Naming.getRefName(this.parent.name));\n      } else {\n        // consolidated allOf member: keep the '[inline:…]' id that selection paths reference. issue #7\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n}\n"]}
+{"version":3,"file":"comp.js","sourceRoot":"","sources":["../../../src/oas/nodes/comp.ts"],"names":[],"mappings":"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","sourcesContent":["import { Factory, Get, IType, Prop, ReferenceObject, Res, T, Type } from './internal.js';\nimport { SchemaObject } from 'oas/types';\n\nimport { trace } from '../log/trace.js';\nimport { OasContext } from '../oasContext.js';\nimport { Writer } from '../io/writer.js';\nimport { Naming } from '../utils/naming.js';\nimport _ from 'lodash';\n\nexport class Composed extends Type {\n  // R2: GraphQL interface this member implements (a shared allOf base of a discriminated\n  // oneOf). When set, generate() appends `implements <Base>`. Set by promoteInterfaces.\n  public implementsInterface?: string;\n\n  constructor(\n    parent: IType | undefined,\n    public name: string,\n    public schema: SchemaObject,\n    public consolidated: boolean = false,\n  ) {\n    super(parent, name);\n    this.updateName();\n  }\n\n  get id(): string {\n    return `comp:${this.kind}:${this.name}`;\n  }\n\n  public forPrompt(_context: OasContext): string {\n    return `[comp] ${Naming.getRefName(this.name)}`;\n  }\n\n  public visit(context: OasContext): void {\n    if (this.visited) {\n      return;\n    }\n\n    context.enter(this);\n    trace(context, '-> [composed:visit]', 'in: ' + (this.name == null ? '[object]' : this.name));\n\n    // If not in the context of a Composed or Param, log the composed schema.\n    if (!context.inContextOf('Composed', this) && !context.inContextOf('Param', this)) {\n      trace(context, '[comp]', '   in composed schema: ' + this.name);\n    }\n\n    // a PropComp-named inline allOf (#7) that clashes with a stored type of a different class\n    // must rename — otherwise the same type name is defined twice. see docs/issues.md #22\n    if (this.parent instanceof Prop && T.collidesAcrossNodeClasses(this, context)) {\n      T.resolveNameConflict(this, context);\n    }\n\n    const composedSchema = this.schema;\n\n    // this will be a type declaration\n    if (composedSchema.allOf != null) {\n      this.visitAllOfNode(context, composedSchema);\n    }\n    // represents a Union type and should be handled elsewhere\n    else if (composedSchema.oneOf != null) {\n      throw new Error('Unions should be constructed by its own object');\n    }\n    // can't hand this yet\n    else {\n      throw new Error('Composed.visit: unsupported composed schema: ' + this.schema);\n    }\n\n    this.visited = true;\n    trace(context, '<- [composed:visit]', 'out: ' + this.name);\n    context.leave(this);\n  }\n\n  public generate(context: OasContext, writer: Writer, selection: string[]): void {\n    context.enter(this);\n    trace(context, '-> [comp::generate]', `-> in: ${this.name}`);\n\n    if (context.inContextOf('Res', this)) {\n      writer.write(Naming.genTypeName(this.name));\n      return;\n    }\n\n    if (this.schema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      if (selected.length > 0) {\n        // Definition and reference must agree: references emit genTypeName(name), so the definition\n        // does too (upperFirst(getRefName) kept separators: `Billing_historyResponse` vs the\n        // reference's `BillingHistoryResponse`). Mirrors obj.ts. see docs/issues.md #15, #6\n        const sanitised = Naming.genTypeName(this.name);\n        const refName = Naming.getRefName(this.name);\n        writer.write(this.kind + ' ');\n        writer.write(sanitised === refName ? refName : sanitised);\n        writer.write(this.nameSuffix());\n        // R2: a promoted member implements the shared base interface.\n        if (this.implementsInterface) {\n          writer.write(` implements ${this.implementsInterface}`);\n        }\n        writer.write(' {\\n');\n\n        for (const prop of selected) {\n          trace(context, '   [comp::generate]', `-> property: ${prop.name} (parent: ${prop.parent!.name})`);\n          prop.generate(context, writer, selection);\n        }\n\n        writer.write('}\\n\\n');\n      }\n    }\n\n    trace(context, '<- [comp::generate]', `-> out: ${this.name}`);\n    context.leave(this);\n  }\n\n  // the selected props, once the allOf members are folded in (same shape select writes)\n  dependencies(_context: OasContext, selection: string[]): IType[] {\n    if (this.schema.allOf != null && !this.consolidated) {\n      this.consolidate(selection);\n    }\n    return this.selectedProps(selection);\n  }\n\n  public select(context: OasContext, writer: Writer, selection: string[]) {\n    trace(context, '-> [comp::select]', `-> in: ${this.name}`);\n    if (!this.consolidated) {\n      this.consolidate(selection);\n    }\n\n    const composedSchema = this.schema;\n    if (composedSchema.allOf != null) {\n      const selected = this.selectedProps(selection);\n\n      for (const prop of selected) {\n        prop.select(context, writer, selection);\n      }\n    } else if (composedSchema.oneOf != null) {\n      if (this.children.length === 1) {\n        this.children[0].select(context, writer, selection);\n      } else {\n        throw new Error('Expected exactly one child for a oneOf schema');\n      }\n    }\n\n    trace(context, '<- [comp::select]', `-> out: ${this.name}`);\n  }\n\n  public consolidate(selection: string[]): Set<string> {\n    const ids: Set<string> = new Set();\n    let props: Map<string, Prop> = new Map();\n\n    const tree = T.print(this);\n    const queue: IType[] = Array.from(this.children.values()).filter((child) => !(child instanceof Prop));\n\n    while (queue.length > 0) {\n      const node = queue.shift()!;\n      ids.add(node.id);\n\n      if (selection.length > 0) {\n        node.props.forEach((prop) => {\n          if (selection.find((s) => s.startsWith(prop.path()))) {\n            props.set(prop.name, prop);\n          }\n        });\n      } else {\n        node.props.forEach((prop) => props.set(prop.name, prop));\n      }\n\n      // sort props\n      props = new Map([...props.entries()].sort());\n\n      const children = Array.from(node.children.values()).filter((child) => !(child instanceof Prop));\n      queue.push(...children);\n    }\n\n    // copy all collected props from children into this node\n    props.forEach((prop, name) => this.props.set(name, prop));\n\n    this.consolidated = true;\n\n    // and return the types we've used\n    return ids;\n  }\n\n  private visitAllOfNode(context: OasContext, schema: SchemaObject): void {\n    const allOfs = schema.allOf || [];\n    const refs = allOfs.map((s) => (s as ReferenceObject).$ref);\n\n    trace(context, '-> [composed::all-of]', `in: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n\n    for (let i = 0; i < allOfs.length; i++) {\n      const allOfItemSchema = allOfs[i];\n\n      // skip metadata-only allOf members (they contribute no fields). see docs/issues.md #5\n      if (Factory.isEmptySchema(allOfItemSchema as SchemaObject)) {\n        trace(context, '   [composed::all-of]', `skipping empty allOf member #${i}`);\n        continue;\n      }\n\n      const type = Factory.fromSchema(context, this, allOfItemSchema as SchemaObject);\n      this.add(type);\n\n      trace(context, '   [composed::all-of]', 'allOf type: ' + type);\n\n      if (type) {\n        type.visit(context);\n      }\n    }\n\n    const tree = T.print(this);\n    context.store(this.name, this);\n    trace(context, '<- [composed::all-of]', `out: '${this.name}' of: ${allOfs.length} - refs: ${refs}`);\n  }\n\n  add(child: IType): IType {\n    let name = child.name;\n    let idx = 0;\n\n    // TODO: this should not be applicable to Refs\n    while (this.children.some((c) => c.name === name)) {\n      name = `${child.name}:${++idx}`;\n    }\n\n    child.name = name;\n    return super.add(child);\n  }\n\n  private updateName(): void {\n    let name = this.name;\n\n    if (!name) {\n      if (this.parent instanceof Res) {\n        const op = this.parent!.parent as Get;\n        name = op.getGqlOpName() + 'Response';\n      } else if (this.schema?.allOf?.length === 1) {\n        // single member: adopt its ref name (avoids an unusable '[inline:…]' name). see docs/issues.md #7\n        name = _.get(this.schema?.allOf[0], '$ref') as string;\n      } else if (this.parent instanceof Prop) {\n        // emitted inline allOf-property type needs a real name, not '[inline:…]'. see docs/issues.md #7\n        name = Naming.genTypeName(Naming.getRefName(this.parent.name));\n      } else {\n        // consolidated allOf member: keep the '[inline:…]' id that selection paths reference. issue #7\n        name = `[inline:${this.parent!.name}]`;\n      }\n    }\n\n    this.name = name;\n  }\n}\n"]}

package/dist/oas/nodes/en.js

@@ -33,7 +33,15 @@ export class En extends Type {
         context.enter(this);
         trace(context, '-> [enum::generate]', `-> in: ${this.name}`);
         if (!context.inContextOf('Param', this)) {
-            const builder = 'enum ' + Naming.getRefName(this.name) + ' {\n' + this.items.map((s) => ' ' + s).join(',\n') + '\n}\n\n';
+            // Definition and reference must agree (the #15 discipline): PropEn references emit
+            // genTypeName(name), so the definition does too (`author-association` -> `AuthorAssociation`).
+            const sanitised = Naming.genTypeName(this.name);
+            const refName = Naming.getRefName(this.name);
+            const builder = 'enum ' +
+                (sanitised === refName ? refName : sanitised) +
+                ' {\n' +
+                this.items.map((s) => ' ' + s).join(',\n') +
+                '\n}\n\n';
             writer.write(builder);
         }
         // this covers the case where a union combines a scalar with an enum.

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

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

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

@@ -5,6 +5,14 @@ import { OasContext } from '../oasContext.js';
 export declare class Factory {
     static createGet(name: string, op: Operation): Get;
     static fromSchema(context: OasContext, parent: IType, inputSchema: SchemaObject | ReferenceObject): IType;
+    /**
+     * OAS 3.1 type arrays (`type: ["string","null"]`) collapse to their first non-null entry:
+     * GraphQL fields are nullable by default, so the "null" disjunct adds nothing. Normalized
+     * in place (idempotent; `lookupRef` shares schema instances, so every reader sees it).
+     * see docs/issues.md #23
+     */
+    private static normalizeTypeArray;
+    private static isGqlEnum;
     private static readonly SHAPE_KEYWORDS;
     /** True when a schema carries no renderable content (metadata only). see docs/issues.md #5 */
     static isEmptySchema(schema: SchemaObject | ReferenceObject): boolean;

package/dist/oas/nodes/factory.js

@@ -21,6 +21,8 @@ export class Factory {
         if (!schema)
             throw new Error('Unknown or undefined schema');
         const schemaObj = schema;
+        // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23
+        this.normalizeTypeArray(schemaObj);
         // Cycle cut (see docs/issues.md #10): a recursive schema can only close through a component `$ref`,
         // and `lookupRef` returns the same `SchemaObject` instance for a given ref. So if this resolved ref's
         // schema is already on the expansion path (an ancestor was built from it), re-entering would recurse
@@ -58,6 +60,32 @@ export class Factory {
         }
         return result;
     }
+    /**
+     * OAS 3.1 type arrays (`type: ["string","null"]`) collapse to their first non-null entry:
+     * GraphQL fields are nullable by default, so the "null" disjunct adds nothing. Normalized
+     * in place (idempotent; `lookupRef` shares schema instances, so every reader sees it).
+     * see docs/issues.md #23
+     */
+    static normalizeTypeArray(schema) {
+        const s = schema;
+        if (Array.isArray(s.type)) {
+            const real = s.type.filter((t) => t && t !== 'null');
+            s.type = real[0];
+        }
+    }
+    // every member is a legal GraphQL enum value once trimmed (TMF637 ships `'aborted '`): a bare
+    // identifier that isn't a boolean/null literal. Anything else (numbers, "+1", "fast-forward",
+    // true) has no enum form. see #24
+    static isGqlEnum(schema) {
+        const VALID_ENUM_VALUE = /^[_A-Za-z][_0-9A-Za-z]*$/;
+        const RESERVED = new Set(['true', 'false', 'null']);
+        return _.every(schema.enum, (value) => {
+            if (typeof value !== 'string')
+                return false;
+            const trimmed = value.trim();
+            return VALID_ENUM_VALUE.test(trimmed) && !RESERVED.has(trimmed);
+        });
+    }
     // Keywords that give a schema a renderable GraphQL shape; a schema with none is metadata-only. #5
     static SHAPE_KEYWORDS = [
         '$ref',
@@ -174,6 +202,8 @@ export class Factory {
         }
         // uses the type of the schema to find out what kind of property it is
         const schemaObj = schema;
+        // OAS 3.1 nullable syntax (`type: [string, 'null']`) would crash every plain-string `type` read below. #23
+        this.normalizeTypeArray(schemaObj);
         const type = schemaObj.type;
         if (type) {
             // 1st case is if the type is an array
@@ -224,11 +254,18 @@ export class Factory {
                 }
             }
             else if (ref && schemaObj?.enum) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for options
-                const stringEnum = _.every(schemaObj.enum, (value, _) => typeof value === 'string');
-                const en = new En(parent, ref, schemaObj, stringEnum ? schemaObj.enum : []);
-                prop = new PropEn(parent, propName, ref, schemaObj);
-                prop.add(en);
+                if (this.isGqlEnum(schemaObj)) {
+                    const en = new En(parent, ref, schemaObj, schemaObj.enum.map((v) => v.trim()));
+                    prop = new PropEn(parent, propName, ref, schemaObj);
+                    prop.add(en);
+                }
+                else {
+                    // No GraphQL enum form for this one — degrade to the base scalar instead of emitting
+                    // an invalid definition: boolean/number enums (slack `ok: { enum: [true] }` ->
+                    // `ok: Boolean`) and string enums with non-identifier values (github reactions
+                    // `enum: ["+1", "-1", …]` -> String). see docs/issues.md #24
+                    prop = new PropScalar(parent, propName, GqlUtils.getGQLScalarType(schemaObj), schemaObj);
+                }
             }
             // 3rd tries for scalar
             else if (GqlUtils.gqlScalar(type)) {