apollo-conn-gen 0.3.3 → 0.4.0

package/dist/oas/io/operationWriter.js

@@ -0,0 +1,106 @@
+import _ from 'lodash';
+import { Naming } from '../utils/naming.js';
+export class OperationWriter {
+    gen;
+    constructor(gen) {
+        this.gen = gen;
+    }
+    writeQuery(context, writer, collected, selection) {
+        const selectionSet = new Set(selection.map((s) => s.split('>')[0]));
+        const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));
+        if (_.isEmpty(paths))
+            return;
+        writer.write('type Query {\n');
+        for (const path of paths) {
+            path.generate(context, writer, []);
+            this.writeConnector(context, writer, path, selection);
+            context.generatedSet.add(path.id);
+        }
+        writer.write('}\n\n');
+    }
+    writeMutations(context, writer, collected, selection) {
+        const selectionSet = new Set(selection.map((s) => s.split('>')[0]));
+        const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));
+        if (_.isEmpty(paths))
+            return;
+        writer.write('type Mutation {\n');
+        for (const path of paths) {
+            path.generate(context, writer, []);
+            this.writeConnector(context, writer, path, selection);
+            context.generatedSet.add(path.id);
+        }
+        writer.write('}\n\n');
+    }
+    writeConnector(context, writer, type, selection) {
+        const indent = 0;
+        const op = type; // assume type is GetOp
+        let spacing = ' '.repeat(indent + 4);
+        writer.write(spacing).write('@connect(\n');
+        spacing = ' '.repeat(indent + 6);
+        writer.write(spacing).write('source: "api"\n').write(spacing).write('http: ');
+        this.requestMethod(context, writer, op, selection);
+        writer.write('\n').write(spacing).write('selection: """\n');
+        if (_.has(op, 'resultType')) {
+            // scalar types don't need to be generated?
+            this.writeSelection(context, writer, _.get(op, 'resultType'), selection);
+        }
+        writer.write(spacing).write('"""\n');
+        spacing = ' '.repeat(indent + 4);
+        writer.write(spacing).write(')\n');
+    }
+    requestMethod(context, writer, op, selection) {
+        // replace every {elem} in the path for {$args.elem}
+        const verb = op.verb;
+        writer.write(`{ ${verb}: `).write('"' + op.operation.path.replace(/\{([a-zA-Z0-9]+)\}/g, '{$args.$1}'));
+        if (op.params.length > 0) {
+            const params = op.params.filter((p) => {
+                return p.required && p.parameter.in && p.parameter.in.toLowerCase() === 'query';
+            });
+            if (params.length > 0) {
+                writer.write('?' + params.map((p) => `${p.name}={$args.${Naming.genParamName(p.name)}}`).join('&'));
+            }
+            const headers = op.operation.getParameters().filter((p) => p.in && p.in.toLowerCase() === 'header');
+            writer.write('"\n');
+            if (headers.length > 0) {
+                let spacing = ' '.repeat(6);
+                writer.write(spacing + 'headers: [\n');
+                spacing = ' '.repeat(8);
+                for (const p of headers) {
+                    let value = null;
+                    if (p.example != null) {
+                        value = p.example.toString();
+                    }
+                    if (p.examples && Object.keys(p.examples).length > 0) {
+                        value = Object.keys(p.examples).join(',');
+                    }
+                    if (value == null) {
+                        value = '<placeholder>';
+                    }
+                    writer.write(spacing + `{ name: "${p.name}", value: "${value}" }\n`);
+                }
+                spacing = ' '.repeat(6);
+                writer.write(spacing + ']');
+            }
+        }
+        else {
+            writer.write('"');
+        }
+        if (_.has(op, 'body')) {
+            const body = op.body;
+            this.writeBodySelection(context, writer, body, selection);
+        }
+        writer.write('}');
+    }
+    writeSelection(context, writer, type, selection) {
+        context.indent = 6;
+        type.select(context, writer, selection);
+    }
+    writeBodySelection(context, writer, body, selection) {
+        writer.write(',\n');
+        context.indent = 6;
+        if (body) {
+            body.select(context, writer, selection);
+        }
+    }
+}
+//# sourceMappingURL=operationWriter.js.map

package/dist/oas/io/operationWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operationWriter.js","sourceRoot":"","sources":["../../../src/oas/io/operationWriter.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { OasContext } from '../oasContext.js';\nimport { OasGen } from '../oasGen.js';\nimport { Body, IType, Op, Param, Type } from '../nodes/internal.js';\nimport { Naming } from '../utils/naming.js';\nimport { Writer } from './writer.js';\n\nexport class OperationWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeQuery(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Query {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeMutations(context: OasContext, writer: Writer, collected: Map<string, IType>, selection: string[]): void {\n    const selectionSet = new Set<string>(selection.map((s) => s.split('>')[0]));\n\n    const paths = Array.from(collected.values()).filter((path) => selectionSet.has(path.id));\n    if (_.isEmpty(paths)) return;\n\n    writer.write('type Mutation {\\n');\n\n    for (const path of paths) {\n      path.generate(context, writer, []);\n      this.writeConnector(context, writer, path, selection);\n      context.generatedSet.add(path.id);\n    }\n\n    writer.write('}\\n\\n');\n  }\n\n  public writeConnector(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    const indent = 0;\n    const op = type as unknown as Op; // assume type is GetOp\n    let spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write('@connect(\\n');\n\n    spacing = ' '.repeat(indent + 6);\n    writer.write(spacing).write('source: \"api\"\\n').write(spacing).write('http: ');\n\n    this.requestMethod(context, writer, op, selection);\n\n    writer.write('\\n').write(spacing).write('selection: \"\"\"\\n');\n\n    if (_.has(op, 'resultType')) {\n      // scalar types don't need to be generated?\n      this.writeSelection(context, writer, _.get(op, 'resultType') as Type, selection);\n    }\n\n    writer.write(spacing).write('\"\"\"\\n');\n    spacing = ' '.repeat(indent + 4);\n    writer.write(spacing).write(')\\n');\n  }\n\n  private requestMethod(context: OasContext, writer: Writer, op: Op, selection: string[]): void {\n    // replace every {elem} in the path for {$args.elem}\n    const verb = op.verb;\n    writer.write(`{ ${verb}: `).write('\"' + op.operation.path.replace(/\\{([a-zA-Z0-9]+)\\}/g, '{$args.$1}'));\n\n    if (op.params.length > 0) {\n      const params = op.params.filter((p: Param) => {\n        return p.required && p.parameter.in && p.parameter.in.toLowerCase() === 'query';\n      });\n\n      if (params.length > 0) {\n        writer.write('?' + params.map((p: Param) => `${p.name}={$args.${Naming.genParamName(p.name)}}`).join('&'));\n      }\n      const headers = op.operation.getParameters().filter((p) => p.in && p.in.toLowerCase() === 'header');\n\n      writer.write('\"\\n');\n\n      if (headers.length > 0) {\n        let spacing = ' '.repeat(6);\n        writer.write(spacing + 'headers: [\\n');\n        spacing = ' '.repeat(8);\n\n        for (const p of headers) {\n          let value: string | null = null;\n\n          if (p.example != null) {\n            value = p.example.toString();\n          }\n\n          if (p.examples && Object.keys(p.examples).length > 0) {\n            value = Object.keys(p.examples).join(',');\n          }\n\n          if (value == null) {\n            value = '<placeholder>';\n          }\n\n          writer.write(spacing + `{ name: \"${p.name}\", value: \"${value}\" }\\n`);\n        }\n\n        spacing = ' '.repeat(6);\n        writer.write(spacing + ']');\n      }\n    } else {\n      writer.write('\"');\n    }\n\n    if (_.has(op, 'body')) {\n      const body = op.body as Body;\n      this.writeBodySelection(context, writer, body, selection);\n    }\n\n    writer.write('}');\n  }\n\n  private writeSelection(context: OasContext, writer: Writer, type: IType, selection: string[]): void {\n    context.indent = 6;\n    type.select(context, writer, selection);\n  }\n\n  private writeBodySelection(context: OasContext, writer: Writer, body: Body, selection: string[]): void {\n    writer.write(',\\n');\n    context.indent = 6;\n    if (body) {\n      body.select(context, writer, selection);\n    }\n  }\n}\n"]}

package/dist/oas/io/pathCollector.d.ts

@@ -0,0 +1,11 @@
+import { OasGen } from '../oasGen.js';
+import { IType } from '../nodes/internal.js';
+export declare class PathCollector {
+    private gen;
+    constructor(gen: OasGen);
+    static findNonPropParent(type: IType): IType;
+    static progressiveSplits(input: string): string[];
+    collectPaths(path: string, collection: IType[]): IType[];
+    collectExpandedPaths(selection: string[]): string[];
+    traverseTree(current: IType, selection: string[], pending: Map<string, IType>): void;
+}

package/dist/oas/io/pathCollector.js

@@ -0,0 +1,95 @@
+import _ from 'lodash';
+import { Composed, Prop, PropArray, Scalar, T } from '../nodes/internal.js';
+export class PathCollector {
+    gen;
+    constructor(gen) {
+        this.gen = gen;
+    }
+    static findNonPropParent(type) {
+        let parent = type;
+        while (parent instanceof Prop) {
+            parent = parent.parent;
+        }
+        return parent;
+    }
+    static progressiveSplits(input) {
+        const parts = input.split('>');
+        const results = [];
+        for (let i = 1; i <= parts.length; i++) {
+            results.push(parts.slice(0, i).join('>'));
+        }
+        return results;
+    }
+    collectPaths(path, collection) {
+        const stack = [];
+        let current;
+        let last;
+        let i = 0;
+        const parts = path.split('>');
+        do {
+            const part = parts[i].replace(/#\/c\/s/g, '#/components/schemas');
+            current = collection.find((t) => t.id === part);
+            if (!current) {
+                throw new Error('Could not find type: ' + part + ' from ' + path + ', last: ' + last?.pathToRoot());
+            }
+            // make sure we expand it before we move on to the next part
+            this.gen.expand(current);
+            last = current;
+            collection = Array.from(current.children.values()) || Array.from(current.props.values()) || [];
+            stack.push(current);
+            i++;
+        } while (i < parts.length);
+        return stack;
+    }
+    collectExpandedPaths(selection) {
+        const newSelection = new Set();
+        const expands = selection.filter((p) => p.endsWith('>**'));
+        const filtered = expands.map((p) => p.replace('>**', ''));
+        const paths = Array.from(this.gen.paths.values());
+        const nodes = filtered.map((p) => this.collectPaths(p, paths));
+        nodes.forEach((stack) => {
+            const root = _.last(stack);
+            T.traverse(root, (child) => {
+                if (T.isPropScalar(child) || (child instanceof PropArray && child.items instanceof Scalar)) {
+                    newSelection.add(child.path());
+                }
+                else {
+                    this.gen.expand(child);
+                }
+            });
+        });
+        // finally remove the expanded paths from the selection
+        return [...newSelection, ...selection.filter((p) => !expands.includes(p))];
+    }
+    traverseTree(current, selection, pending) {
+        // we might be in a node far from the root, so we need to traverse upwards
+        // as well and add the props that we can find on the way
+        const source = current;
+        source
+            .ancestors()
+            .filter((t) => t instanceof Prop)
+            .map((p) => PathCollector.findNonPropParent(p))
+            .forEach((parent) => pending.set(parent.id, parent));
+        T.traverse(source, (child) => {
+            if (T.isLeaf(child)) {
+                // this is a weird take but if the child is an array of scalars
+                // then we want to avoid adding it twice
+                if (T.isLeaf(child.parent)) {
+                    return;
+                }
+                selection.push(child.path());
+                const parentType = PathCollector.findNonPropParent(child);
+                if (!pending.has(parentType.id)) {
+                    pending.set(parentType.id, parentType);
+                }
+            }
+            else {
+                this.gen.expand(child);
+                if (child instanceof Composed) {
+                    child.consolidate(selection);
+                }
+            }
+        });
+    }
+}
+//# sourceMappingURL=pathCollector.js.map

package/dist/oas/io/pathCollector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pathCollector.js","sourceRoot":"","sources":["../../../src/oas/io/pathCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { OasGen } from '../oasGen.js';\nimport { Composed, IType, Prop, PropArray, Scalar, Type, T } from '../nodes/internal.js';\nimport { Writer } from './writer.js';\n\nexport class PathCollector {\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 {\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  public traverseTree(current: IType, selection: string[], pending: Map<string, IType>) {\n    // we might be in a node far from the root, so we need to traverse upwards\n    // as well and add the props that we can find on the way\n    const source = current as Type;\n\n    source\n      .ancestors()\n      .filter((t) => t instanceof Prop)\n      .map((p) => PathCollector.findNonPropParent(p))\n      .forEach((parent) => pending.set(parent.id, parent));\n\n    T.traverse(source, (child) => {\n      if (T.isLeaf(child)) {\n        // this is a weird take but if the child is an array of scalars\n        // then we want to avoid adding it twice\n        if (T.isLeaf(child.parent!)) {\n          return;\n        }\n        selection.push(child.path());\n\n        const parentType = PathCollector.findNonPropParent(child);\n        if (!pending.has(parentType.id)) {\n          pending.set(parentType.id, parentType);\n        }\n      } else {\n        this.gen.expand(child);\n\n        if (child instanceof Composed) {\n          child.consolidate(selection);\n        }\n      }\n    });\n  }\n}\n"]}

package/dist/oas/io/schemaWriter.d.ts

@@ -0,0 +1,9 @@
+import { OasGen } from '../oasGen.js';
+import { Writer } from './writer.js';
+export declare class SchemaWriter {
+    private gen;
+    constructor(gen: OasGen);
+    writeJSONScalar(writer: Writer): void;
+    writeDirectives(writer: Writer): void;
+    private getServerUrl;
+}

package/dist/oas/io/schemaWriter.js

@@ -0,0 +1,36 @@
+export class SchemaWriter {
+    gen;
+    constructor(gen) {
+        this.gen = gen;
+    }
+    writeJSONScalar(writer) {
+        writer.write('\nscalar JSON\n\n');
+    }
+    writeDirectives(writer) {
+        const api = this.gen.parser;
+        const host = this.getServerUrl(api.getDefinition().servers?.[0]);
+        writer
+            .write('extend schema\n')
+            .write('  @link(url: "https://specs.apollo.dev/federation/v2.10", import: ["@key"])\n')
+            .write('  @link(\n')
+            .write('    url: "https://specs.apollo.dev/connect/v0.1"\n')
+            .write('    import: ["@connect", "@source"]\n')
+            .write('  )\n')
+            .write('  @source(name: "api", http: { baseURL: "')
+            .write(host)
+            .write('" })\n\n');
+    }
+    getServerUrl(server) {
+        if (!server) {
+            return 'http://localhost:4010';
+        }
+        let url = server.url;
+        if (server.variables) {
+            for (const key in server.variables) {
+                url = url.replace('{' + key + '}', server.variables[key].default);
+            }
+        }
+        return url;
+    }
+}
+//# sourceMappingURL=schemaWriter.js.map

package/dist/oas/io/schemaWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaWriter.js","sourceRoot":"","sources":["../../../src/oas/io/schemaWriter.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,YAAY;IACH;IAApB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAE5B,eAAe,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;IAEM,eAAe,CAAC,MAAc;QACnC,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM;aACH,KAAK,CAAC,iBAAiB,CAAC;aACxB,KAAK,CAAC,+EAA+E,CAAC;aACtF,KAAK,CAAC,YAAY,CAAC;aACnB,KAAK,CAAC,oDAAoD,CAAC;aAC3D,KAAK,CAAC,uCAAuC,CAAC;aAC9C,KAAK,CAAC,OAAO,CAAC;aACd,KAAK,CAAC,2CAA2C,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC;aACX,KAAK,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,MAAgC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,uBAAuB,CAAC;QACjC,CAAC;QACD,IAAI,GAAG,GAAW,MAAM,CAAC,GAAG,CAAC;QAC7B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF","sourcesContent":["import Oas from 'oas';\nimport { ServerObject } from 'oas/types';\nimport { OasGen } from '../oasGen.js';\nimport { Writer } from './writer.js';\n\nexport class SchemaWriter {\n  constructor(private gen: OasGen) {}\n\n  public writeJSONScalar(writer: Writer): void {\n    writer.write('\\nscalar JSON\\n\\n');\n  }\n\n  public writeDirectives(writer: Writer): void {\n    const api: Oas = this.gen.parser;\n    const host = this.getServerUrl(api.getDefinition().servers?.[0]);\n    writer\n      .write('extend schema\\n')\n      .write('  @link(url: \"https://specs.apollo.dev/federation/v2.10\", import: [\"@key\"])\\n')\n      .write('  @link(\\n')\n      .write('    url: \"https://specs.apollo.dev/connect/v0.1\"\\n')\n      .write('    import: [\"@connect\", \"@source\"]\\n')\n      .write('  )\\n')\n      .write('  @source(name: \"api\", http: { baseURL: \"')\n      .write(host)\n      .write('\" })\\n\\n');\n  }\n\n  private getServerUrl(server: ServerObject | undefined): string {\n    if (!server) {\n      return 'http://localhost:4010';\n    }\n    let url: string = server.url;\n    if (server.variables) {\n      for (const key in server.variables) {\n        url = url.replace('{' + key + '}', server.variables[key].default);\n      }\n    }\n    return url;\n  }\n}\n"]}

package/dist/oas/io/writer.d.ts

@@ -1,26 +1,14 @@
 import { OasGen } from '../oasGen.js';
 import { IType } from '../nodes/internal.js';
 export declare class Writer {
-    generator: OasGen;
-    static findNonPropParent(type: IType): IType;
-    static progressiveSplits(input: string): string[];
+    gen: OasGen;
+    private pathCollector;
+    private schemaWriter;
+    private operationWriter;
     buffer: string[];
-    constructor(generator: OasGen);
+    constructor(gen: OasGen);
     write(input: string): Writer;
-    append(input: string): Writer;
     flush(): string;
     writeSchema(writer: Writer, types: Map<string, IType>, selection: string[]): void;
     generate(selection: string[]): string[];
-    collectPaths(path: string, collection: IType[]): IType[];
-    private writeJSONScalar;
-    private writeQuery;
-    private writeConnector;
-    private requestMethod;
-    private writeSelection;
-    private writeDirectives;
-    private getServerUrl;
-    private traverseTree;
-    private collectExpandedPaths;
-    private writeMutations;
-    private writeBodySelection;
 }