fix default Api export to do both default and regular export

Author: david-crespo

oxide-api/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxide/api",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.8",
   "description": "TypeScript client for the Oxide API",
   "engines": {
     "node": ">=18"

oxide-api/package.json

@@ -4175,7 +4175,7 @@ export type ApiListMethods = Pick<
 >;
 
 type EmptyObj = Record<string, never>;
-export default class Api extends HttpClient {
+export class Api extends HttpClient {
   methods = {
     /**
      * Start an OAuth 2.0 Device Authorization Grant
@@ -6990,3 +6990,5 @@ export default class Api extends HttpClient {
     },
   };
 }
+
+export default Api;

oxide-api/src/Api.ts

@@ -1,6 +1,6 @@
 {
   "name": "@oxide/openapi-gen-ts",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "OpenAPI client generator used to generate Oxide TypeScript SDK",
   "keywords": [
     "oxide",

oxide-openapi-gen-ts/package-lock.json

@@ -55,7 +55,7 @@ function checkErrorSchema(schema: Schema) {
       },
       required: ["message", "request_id"],
     },
-    "Error schema does not match the one hard-coded as ErrorBody in http-client.ts."
+    "Error schema does not match the one hard-coded as ErrorBody in http-client.ts.",
   );
 }
 
@@ -162,7 +162,7 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
     .map((handlers) =>
       Object.entries(handlers!)
         .filter(([method]) => method.toUpperCase() in HttpMethods)
-        .map(([_, conf]) => conf)
+        .map(([_, conf]) => conf),
     )
     .flat()
     .filter((handler) => {
@@ -173,7 +173,7 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
 
   // TODO: Fix this type
   const ops = operations as Exclude<
-    typeof operations[number],
+    (typeof operations)[number],
     | string
     | (OpenAPIV3.ReferenceObject | OpenAPIV3.ParameterObject)[]
     | OpenAPIV3.ServerObject[]
@@ -182,32 +182,32 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
   const idRoutes = ops.filter((op) => op.operationId?.endsWith("view_by_id"));
   if (idRoutes.length > 0) {
     w(
-      "export type ApiViewByIdMethods = Pick<InstanceType<typeof Api>['methods'], "
+      "export type ApiViewByIdMethods = Pick<InstanceType<typeof Api>['methods'], ",
     );
     w0(
       `${idRoutes
         .map((op) => `'${snakeToCamel(op.operationId!)}'`)
-        .join(" | ")}`
+        .join(" | ")}`,
     );
     w(">\n");
   }
 
   const listRoutes = ops.filter((op) => op.operationId?.match(/_list(_v1)?$/));
   if (listRoutes.length > 0) {
     w(
-      "export type ApiListMethods = Pick<InstanceType<typeof Api>['methods'], "
+      "export type ApiListMethods = Pick<InstanceType<typeof Api>['methods'], ",
     );
     w0(
       `${listRoutes
         .map((op) => `'${snakeToCamel(op.operationId!)}'`)
-        .join(" | ")}`
+        .join(" | ")}`,
     );
     w(">\n");
   }
 
   w("type EmptyObj = Record<string, never>;");
 
-  w(`export default class Api extends HttpClient {
+  w(`export class Api extends HttpClient {
        methods = {`);
 
   for (const { conf, opId, method, path } of iterPathConfig(spec.paths)) {
@@ -219,10 +219,10 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
 
     const params = conf.parameters || [];
     const pathParams = params.filter(
-      (p) => "in" in p && p.in === "path"
+      (p) => "in" in p && p.in === "path",
     ) as OpenAPIV3.ParameterObject[];
     const queryParams = params.filter(
-      (p) => "in" in p && p.in === "query"
+      (p) => "in" in p && p.in === "query",
     ) as OpenAPIV3.ParameterObject[];
 
     const bodyType = contentRef(conf.requestBody);
@@ -294,10 +294,10 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
 
     const params = conf.parameters || [];
     const pathParams = params.filter(
-      (p) => "in" in p && p.in === "path"
+      (p) => "in" in p && p.in === "path",
     ) as OpenAPIV3.ParameterObject[];
     const queryParams = params.filter(
-      (p) => "in" in p && p.in === "query"
+      (p) => "in" in p && p.in === "query",
     ) as OpenAPIV3.ParameterObject[];
 
     docComment(conf.summary || conf.description, schemaNames, io);
@@ -331,6 +331,8 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
   }
 
   w(`  }
-     }`);
+     }
+
+   export default Api;`);
   out.end();
 }