fix default Api export to do both default and regular export (#257)

oxidecomputer · May 13, 2024 · eb887fc · eb887fc
1 parent 1c7c155
commit eb887fc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/oxide-api/package-lock.json b/oxide-api/package-lock.json
diff --git a/oxide-api/package.json b/oxide-api/package.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"

diff --git a/oxide-api/src/Api.ts b/oxide-api/src/Api.ts
@@ -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;
diff --git a/oxide-openapi-gen-ts/package-lock.json b/oxide-openapi-gen-ts/package-lock.json
diff --git a/oxide-openapi-gen-ts/package.json b/oxide-openapi-gen-ts/package.json
@@ -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",

diff --git a/oxide-openapi-gen-ts/src/client/api.ts b/oxide-openapi-gen-ts/src/client/api.ts
@@ -207,7 +207,7 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
 
   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)) {
@@ -331,6 +331,8 @@ export function generateApi(spec: OpenAPIV3.Document, destDir: string) {
   }
 
   w(`  }
-     }`);
+     }
+
+   export default Api;`);
   out.end();
 }