fixup! schema input from stdin

Author: kgtkr

bin/cli.js

@@ -143,7 +143,7 @@ async function main() {
   // handle stdin schema, exit
   if (pathToSpec === "-") {
     if (output !== "." && output === OUTPUT_FILE) fs.mkdirSync(path.dirname(flags.output), { recursive: true });
-    await generateSchema("/dev/stdin");
+    await generateSchema(process.stdin);
     return;
   }
 

src/index.ts

@@ -6,6 +6,7 @@ import { URL } from "url";
 import load, { resolveSchema, VIRTUAL_JSON_URL } from "./load.js";
 import { swaggerVersion } from "./utils.js";
 import { transformAll } from "./transform/index.js";
+import { Readable } from "stream";
 export * from "./types.js"; // expose all types to consumers
 
 export const WARNING_MESSAGE = `/**
@@ -30,7 +31,7 @@ export const WARNING_MESSAGE = `/**
  * @return {Promise<string>}  {Promise<string>} Parsed file schema
  */
 async function openapiTS(
-  schema: string | URL | OpenAPI2 | OpenAPI3 | Record<string, SchemaObject>,
+  schema: string | URL | OpenAPI2 | OpenAPI3 | Record<string, SchemaObject> | Readable,
   options: SwaggerToTSOptions = {} as Partial<SwaggerToTSOptions>
 ): Promise<string> {
   const ctx: GlobalContext = {

src/load.ts

@@ -7,6 +7,7 @@ import { URL } from "url";
 import mime from "mime";
 import yaml from "js-yaml";
 import { parseRef } from "./utils.js";
+import { Readable } from "stream";
 
 type PartialSchema = Record<string, any>; // not a very accurate type, but this is easier to deal with before we know we’re dealing with a valid spec
 type SchemaMap = { [url: string]: PartialSchema };
@@ -95,13 +96,13 @@ interface LoadOptions extends GlobalContext {
 
 /** Load a schema from local path or remote URL */
 export default async function load(
-  schema: URL | PartialSchema,
+  schema: URL | PartialSchema | Readable,
   options: LoadOptions
 ): Promise<{ [url: string]: PartialSchema }> {
   const urlCache = options.urlCache || new Set<string>();
 
-  const isJSON = schema instanceof URL === false; // if this is dynamically-passed-in JSON, we’ll have to change a few things
-  let schemaID = isJSON ? new URL(VIRTUAL_JSON_URL).href : (schema.href as string);
+  const isJSON = schema instanceof URL === false && !(schema instanceof Readable); // if this is dynamically-passed-in JSON, we’ll have to change a few things
+  let schemaID = isJSON || schema instanceof Readable ? new URL(VIRTUAL_JSON_URL).href : (schema.href as string);
 
   const schemas = options.schemas;
 
@@ -116,9 +117,25 @@ export default async function load(
 
     let contents = "";
     let contentType = "";
-    const schemaURL = schema as URL; // helps TypeScript
-
-    if (isFile(schemaURL)) {
+    const schemaURL = schema instanceof Readable ? new URL(VIRTUAL_JSON_URL) : (schema as URL); // helps TypeScript
+
+    if (schema instanceof Readable) {
+      const readable = schema;
+      contents = await new Promise<string>((resolve) => {
+        readable.resume();
+        readable.setEncoding("utf8");
+
+        let content = "";
+        readable.on("data", (chunk: string) => {
+          content += chunk;
+        });
+
+        readable.on("end", () => {
+          resolve(content);
+        });
+      });
+      contentType = "text/yaml";
+    } else if (isFile(schemaURL)) {
       // load local
       contents = fs.readFileSync(schemaURL, "utf8");
       contentType = mime.getType(schemaID) || "";