typed-openapi 0.1.1 → 0.1.2

package/dist/cli.cjs

@@ -30,8 +30,8 @@ var import_arktype2 = require("arktype");
 var import_promises = require("fs/promises");
 
 // package.json
-var name = "typedapi";
-var version = "0.1.0";
+var name = "typed-openapi";
+var version = "0.1.1";
 
 // src/generator.ts
 var import_server2 = require("pastable/server");
@@ -288,14 +288,22 @@ var Box = class _Box {
 };
 
 // src/format.ts
-var import_formatter = require("@dprint/formatter");
-var fs = __toESM(require("fs"), 1);
-var import_path = require("path");
-var tsPluginPath = (0, import_path.join)(__dirname, "..", "node_modules", "@dprint", "typescript", "plugin.wasm");
-var buffer = fs.readFileSync(tsPluginPath);
-var formatter = (0, import_formatter.createFromBuffer)(buffer);
-formatter.setConfig({ lineWidth: 120, indentWidth: 2 }, {});
-var prettify = (code, options) => formatter.formatText("code.ts", code, options);
+var import_prettier = __toESM(require("prettier"), 1);
+var import_parser_typescript = __toESM(require("prettier/parser-typescript"), 1);
+function maybePretty(input, options) {
+  try {
+    return import_prettier.default.format(input, {
+      parser: "typescript",
+      plugins: [import_parser_typescript.default],
+      ...options
+    });
+  } catch (err) {
+    console.warn("Failed to format code");
+    console.warn(err);
+    return input;
+  }
+}
+var prettify = (str, options) => maybePretty(str, { printWidth: 120, trailingComma: "all", ...options });
 
 // src/generator.ts
 var Codegen = __toESM(require("@sinclair/typebox-codegen"), 1);
@@ -354,9 +362,9 @@ var generateFile = (options) => {
   `;
   return prettify(file);
 };
-var generateSchemaList = ({ refs }) => {
+var generateSchemaList = ({ refs, runtime }) => {
   let file = `
-  export namespace Schemas {
+  ${runtime === "none" ? "export namespace Schemas {" : ""}
     // <Schemas>
   `;
   refs.getOrderedSchemas().forEach(([schema, infos]) => {
@@ -369,7 +377,7 @@ var generateSchemaList = ({ refs }) => {
   });
   return file + `
     // </Schemas>
-    }
+    ${runtime === "none" ? "}" : ""}
   `;
 };
 var parameterObjectToString = (parameters) => {
@@ -384,7 +392,7 @@ var parameterObjectToString = (parameters) => {
 };
 var generateEndpointSchemaList = (ctx) => {
   let file = `
-  export namespace Endpoints {
+  ${ctx.runtime === "none" ? "export namespace Endpoints {" : ""}
   // <Endpoints>
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_START__ = {}"}
   `;
@@ -398,18 +406,18 @@ var generateEndpointSchemaList = (ctx) => {
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
           }` : "parameters: never,"}
-      response: ${endpoint.response.recompute((box) => {
+      response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
       if (Box.isReference(box) && !box.params.generics) {
         box.value = `Schemas.${box.value}`;
       }
       return box;
-    }).value},
+    }).value : endpoint.response.value},
     }
 `;
   });
   return file + `
   // </Endpoints>
-  }
+  ${ctx.runtime === "none" ? "}" : ""}
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_END__ = {}"}
   `;
 };
@@ -421,7 +429,9 @@ var generateEndpointByMethod = (ctx) => {
      export ${ctx.runtime === "none" ? "type" : "const"} EndpointByMethod = {
      ${Object.entries(byMethods).map(([method, list]) => {
     return `${method}: {
-           ${list.map((endpoint) => `"${endpoint.path}": Endpoints.${endpoint.meta.alias}`)}
+           ${list.map(
+      (endpoint) => `"${endpoint.path}": ${ctx.runtime === "none" ? "Endpoints." : ""}${endpoint.meta.alias}`
+    )}
          }`;
   }).join(",\n")}
      }

package/dist/cli.js

@@ -1,13 +1,13 @@
 // src/cli.ts
 import SwaggerParser from "@apidevtools/swagger-parser";
 import { cac } from "cac";
-import { join as join2 } from "pathe";
+import { join } from "pathe";
 import { type as type2 } from "arktype";
 import { writeFile } from "fs/promises";
 
 // package.json
-var name = "typedapi";
-var version = "0.1.0";
+var name = "typed-openapi";
+var version = "0.1.1";
 
 // src/generator.ts
 import { capitalize as capitalize2, groupBy } from "pastable/server";
@@ -264,14 +264,22 @@ var Box = class _Box {
 };
 
 // src/format.ts
-import { createFromBuffer } from "@dprint/formatter";
-import * as fs from "fs";
-import { join } from "path";
-var tsPluginPath = join(__dirname, "..", "node_modules", "@dprint", "typescript", "plugin.wasm");
-var buffer = fs.readFileSync(tsPluginPath);
-var formatter = createFromBuffer(buffer);
-formatter.setConfig({ lineWidth: 120, indentWidth: 2 }, {});
-var prettify = (code, options) => formatter.formatText("code.ts", code, options);
+import prettier from "prettier";
+import parserTypescript from "prettier/parser-typescript";
+function maybePretty(input, options) {
+  try {
+    return prettier.format(input, {
+      parser: "typescript",
+      plugins: [parserTypescript],
+      ...options
+    });
+  } catch (err) {
+    console.warn("Failed to format code");
+    console.warn(err);
+    return input;
+  }
+}
+var prettify = (str, options) => maybePretty(str, { printWidth: 120, trailingComma: "all", ...options });
 
 // src/generator.ts
 import * as Codegen from "@sinclair/typebox-codegen";
@@ -330,9 +338,9 @@ var generateFile = (options) => {
   `;
   return prettify(file);
 };
-var generateSchemaList = ({ refs }) => {
+var generateSchemaList = ({ refs, runtime }) => {
   let file = `
-  export namespace Schemas {
+  ${runtime === "none" ? "export namespace Schemas {" : ""}
     // <Schemas>
   `;
   refs.getOrderedSchemas().forEach(([schema, infos]) => {
@@ -345,7 +353,7 @@ var generateSchemaList = ({ refs }) => {
   });
   return file + `
     // </Schemas>
-    }
+    ${runtime === "none" ? "}" : ""}
   `;
 };
 var parameterObjectToString = (parameters) => {
@@ -360,7 +368,7 @@ var parameterObjectToString = (parameters) => {
 };
 var generateEndpointSchemaList = (ctx) => {
   let file = `
-  export namespace Endpoints {
+  ${ctx.runtime === "none" ? "export namespace Endpoints {" : ""}
   // <Endpoints>
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_START__ = {}"}
   `;
@@ -374,18 +382,18 @@ var generateEndpointSchemaList = (ctx) => {
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
           }` : "parameters: never,"}
-      response: ${endpoint.response.recompute((box) => {
+      response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
       if (Box.isReference(box) && !box.params.generics) {
         box.value = `Schemas.${box.value}`;
       }
       return box;
-    }).value},
+    }).value : endpoint.response.value},
     }
 `;
   });
   return file + `
   // </Endpoints>
-  }
+  ${ctx.runtime === "none" ? "}" : ""}
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_END__ = {}"}
   `;
 };
@@ -397,7 +405,9 @@ var generateEndpointByMethod = (ctx) => {
      export ${ctx.runtime === "none" ? "type" : "const"} EndpointByMethod = {
      ${Object.entries(byMethods).map(([method, list]) => {
     return `${method}: {
-           ${list.map((endpoint) => `"${endpoint.path}": Endpoints.${endpoint.meta.alias}`)}
+           ${list.map(
+      (endpoint) => `"${endpoint.path}": ${ctx.runtime === "none" ? "Endpoints." : ""}${endpoint.meta.alias}`
+    )}
          }`;
   }).join(",\n")}
      }
@@ -820,7 +830,7 @@ cli.command("<input>", "Generate").option("-o, --output <path>", "Output path fo
   const ctx = mapOpenApiEndpoints(openApiDoc);
   console.log(`Found ${ctx.endpointList.length} endpoints`);
   const content = generateFile({ ...ctx, runtime: options.runtime });
-  const output = join2(
+  const output = join(
     cwd,
     options.output ?? input + `.${options.runtime === "none" ? "client" : options.runtime}.ts`
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "bin": {
@@ -14,19 +14,18 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.26.2",
-    "@dprint/formatter": "^0.2.0",
-    "@dprint/typescript": "^0.85.1",
     "@sinclair/typebox-codegen": "^0.8.5",
     "arktype": "1.0.18-alpha",
     "cac": "^6.7.14",
-    "dprint": "^0.40.2",
     "openapi3-ts": "^4.1.2",
     "pastable": "^2.2.1",
     "pathe": "^1.1.1",
+    "prettier": "2.8.4",
     "ts-pattern": "^5.0.4"
   },
   "devDependencies": {
     "@types/node": "^20.4.5",
+    "@types/prettier": "2.7.3",
     "tsup": "^7.1.0",
     "typescript": "^5.1.6",
     "vite-node": "^0.33.0",
@@ -47,6 +46,8 @@
     "dev": "tsup --watch",
     "build": "tsup",
     "test": "vitest",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "release": "changeset publish",
+    "release-dev": "changeset version --snapshot dev && changeset publish --tag dev"
   }
 }

package/src/format.ts

@@ -1,12 +1,20 @@
-import { createFromBuffer, GlobalConfiguration } from "@dprint/formatter";
-import * as fs from "fs";
-import { join } from "path";
+import prettier, { type Options } from "prettier";
+import parserTypescript from "prettier/parser-typescript";
 
-const tsPluginPath = join(__dirname, "..", "node_modules", "@dprint", "typescript", "plugin.wasm");
-const buffer = fs.readFileSync(tsPluginPath);
-const formatter = createFromBuffer(buffer);
+/** @see https://github.dev/stephenh/ts-poet/blob/5ea0dbb3c9f1f4b0ee51a54abb2d758102eda4a2/src/Code.ts#L231 */
+function maybePretty(input: string, options?: Options | null): string {
+  try {
+    return prettier.format(input, {
+      parser: "typescript",
+      plugins: [parserTypescript],
+      ...options,
+    });
+  } catch (err) {
+    console.warn("Failed to format code");
+    console.warn(err);
+    return input; // assume it's invalid syntax and ignore
+  }
+}
 
-formatter.setConfig({ lineWidth: 120, indentWidth: 2 }, {});
-
-export const prettify = (code: string, options?: GlobalConfiguration) =>
-  formatter.formatText("code.ts", code, options as any);
+export const prettify = (str: string, options?: Options | null) =>
+  maybePretty(str, { printWidth: 120, trailingComma: "all", ...options });

package/src/generator.ts

@@ -95,9 +95,9 @@ export const generateFile = (options: GeneratorOptions) => {
   return prettify(file);
 };
 
-const generateSchemaList = ({ refs }: GeneratorContext) => {
+const generateSchemaList = ({ refs, runtime }: GeneratorContext) => {
   let file = `
-  export namespace Schemas {
+  ${runtime === "none" ? "export namespace Schemas {" : ""}
     // <Schemas>
   `;
   refs.getOrderedSchemas().forEach(([schema, infos]) => {
@@ -111,7 +111,7 @@ const generateSchemaList = ({ refs }: GeneratorContext) => {
     file +
     `
     // </Schemas>
-    }
+    ${runtime === "none" ? "}" : ""}
   `
   );
 };
@@ -127,7 +127,7 @@ const parameterObjectToString = (parameters: Box<BoxRef> | Record<string, AnyBox
 };
 const generateEndpointSchemaList = (ctx: GeneratorContext) => {
   let file = `
-  export namespace Endpoints {
+  ${ctx.runtime === "none" ? "export namespace Endpoints {" : ""}
   // <Endpoints>
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_START__ = {}"}
   `;
@@ -146,13 +146,15 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
           : "parameters: never,"
       }
       response: ${
-        endpoint.response.recompute((box) => {
-          if (Box.isReference(box) && !box.params.generics) {
-            box.value = `Schemas.${box.value}`;
-          }
-
-          return box;
-        }).value
+        ctx.runtime === "none"
+          ? endpoint.response.recompute((box) => {
+              if (Box.isReference(box) && !box.params.generics) {
+                box.value = `Schemas.${box.value}`;
+              }
+
+              return box;
+            }).value
+          : endpoint.response.value
       },
     }\n`;
   });
@@ -161,7 +163,7 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
     file +
     `
   // </Endpoints>
-  }
+  ${ctx.runtime === "none" ? "}" : ""}
   ${ctx.runtime === "none" ? "" : "type __ENDPOINTS_END__ = {}"}
   `
   );
@@ -177,7 +179,9 @@ const generateEndpointByMethod = (ctx: GeneratorContext) => {
      ${Object.entries(byMethods)
        .map(([method, list]) => {
          return `${method}: {
-           ${list.map((endpoint) => `"${endpoint.path}": Endpoints.${endpoint.meta.alias}`)}
+           ${list.map(
+             (endpoint) => `"${endpoint.path}": ${ctx.runtime === "none" ? "Endpoints." : ""}${endpoint.meta.alias}`,
+           )}
          }`;
        })
        .join(",\n")}