Fix/revert pr224 (#304)

jmjf · web-flow · commit 3577a0bd3055 · 2024-08-12T09:58:02.000+02:00
* chore: exclude devcontainer dir

* test: demonstrate failure

* test: remove -p test

* fix: oas2tson handles FooBARBaz (added to example spec)

* fix: remove formatFilename and deps

* chore: remove devcontiner from .gitignore (manually excluded)

* fix: add output files (including FooBARBaz)

* fix: add package-lock.json
diff --git a/example/openapi.yml b/example/openapi.yml
@@ -771,8 +771,13 @@ components:
           type: string
         message:
           type: string
+        FooBARBaz:
+          $ref: '#/components/schemas/FooBARBaz'
       xml:
         name: '##default'
+    FooBARBaz:
+      type: string
+      description: this name is valid and should be FooBARBaz everywhere it appears
   requestBodies:
     Pet:
       description: Pet object that needs to be added to the store
diff --git a/example/output/json/components.schemas/ApiResponse.json b/example/output/json/components.schemas/ApiResponse.json
@@ -12,6 +12,9 @@
     },
     "message": {
       "type": "string"
+    },
+    "FooBARBaz": {
+      "$ref": "FooBARBaz.json"
     }
   },
   "title": "ApiResponse",
diff --git a/example/output/json/components.schemas/FooBARBaz.json b/example/output/json/components.schemas/FooBARBaz.json
@@ -0,0 +1,6 @@
+{
+  "type": "string",
+  "description": "this name is valid and should be FooBARBaz everywhere it appears",
+  "title": "FooBARBaz",
+  "$id": "FooBARBaz.json"
+}
diff --git a/example/output/ts/ApiResponse.ts b/example/output/ts/ApiResponse.ts
@@ -9,6 +9,13 @@ export const ApiResponse = {
     },
     type: { type: "string" },
     message: { type: "string" },
+    FooBARBaz: {
+      type: "string",
+      description:
+        "this name is valid and should be FooBARBaz everywhere it appears",
+      title: "FooBARBaz",
+      $id: "FooBARBaz.json",
+    },
   },
   title: "ApiResponse",
   $id: "ApiResponse.json",
diff --git a/example/output/ts/FooBARBaz.ts b/example/output/ts/FooBARBaz.ts
@@ -0,0 +1,7 @@
+export const FooBARBaz = {
+  type: "string",
+  description:
+    "this name is valid and should be FooBARBaz everywhere it appears",
+  title: "FooBARBaz",
+  $id: "FooBARBaz.json",
+} as const;
diff --git a/example/output/tson/Address.ts b/example/output/tson/Address.ts
@@ -0,0 +1,11 @@
+export const Address = {
+  type: "object",
+  properties: {
+    street: { type: "string" },
+    city: { type: "string" },
+    state: { type: "string" },
+    zip: { type: "string" },
+  },
+  title: "Address",
+  $id: "Address.json",
+} as const;
diff --git a/example/output/tson/ApiResponse.ts b/example/output/tson/ApiResponse.ts
@@ -0,0 +1,22 @@
+export const ApiResponse = {
+  type: "object",
+  properties: {
+    code: {
+      type: "integer",
+      format: "int32",
+      minimum: -2147483648,
+      maximum: 2147483647,
+    },
+    type: { type: "string" },
+    message: { type: "string" },
+    FooBARBaz: {
+      type: "string",
+      description:
+        "this name is valid and should be FooBARBaz everywhere it appears",
+      title: "FooBARBaz",
+      $id: "FooBARBaz.json",
+    },
+  },
+  title: "ApiResponse",
+  $id: "ApiResponse.json",
+} as const;
diff --git a/example/output/tson/Category.ts b/example/output/tson/Category.ts
@@ -0,0 +1,14 @@
+export const Category = {
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    name: { type: "string" },
+  },
+  title: "Category",
+  $id: "Category.json",
+} as const;
diff --git a/example/output/tson/Customer.ts b/example/output/tson/Customer.ts
@@ -0,0 +1,28 @@
+export const Customer = {
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    username: { type: "string" },
+    address: {
+      type: "array",
+      items: {
+        type: "object",
+        properties: {
+          street: { type: "string" },
+          city: { type: "string" },
+          state: { type: "string" },
+          zip: { type: "string" },
+        },
+        title: "Address",
+        $id: "Address.json",
+      },
+    },
+  },
+  title: "Customer",
+  $id: "Customer.json",
+} as const;
diff --git a/example/output/tson/FooBARBaz.ts b/example/output/tson/FooBARBaz.ts
@@ -0,0 +1,7 @@
+export const FooBARBaz = {
+  type: "string",
+  description:
+    "this name is valid and should be FooBARBaz everywhere it appears",
+  title: "FooBARBaz",
+  $id: "FooBARBaz.json",
+} as const;
diff --git a/example/output/tson/Order.ts b/example/output/tson/Order.ts
@@ -0,0 +1,32 @@
+export const Order = {
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    petId: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    quantity: {
+      type: "integer",
+      format: "int32",
+      minimum: -2147483648,
+      maximum: 2147483647,
+    },
+    shipDate: { type: "string", format: "date-time" },
+    status: {
+      type: "string",
+      description: "Order Status",
+      enum: ["placed", "approved", "delivered"],
+    },
+    complete: { type: "boolean" },
+  },
+  title: "Order",
+  $id: "Order.json",
+} as const;
diff --git a/example/output/tson/Pet.ts b/example/output/tson/Pet.ts
@@ -0,0 +1,56 @@
+export const Pet = {
+  required: ["name", "photoUrls"],
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    name: { type: "string" },
+    category: {
+      type: "object",
+      properties: {
+        id: {
+          type: "integer",
+          format: "int64",
+          minimum: -9223372036854776000,
+          maximum: 9223372036854776000,
+        },
+        name: { type: "string" },
+      },
+      title: "Category",
+      $id: "Category.json",
+    },
+    photoUrls: { type: "array", items: { type: "string" } },
+    tags: {
+      type: "array",
+      items: {
+        type: "object",
+        properties: {
+          id: {
+            type: "integer",
+            format: "int64",
+            minimum: -9223372036854776000,
+            maximum: 9223372036854776000,
+          },
+          name: { type: "string" },
+        },
+        title: "Tag",
+        $id: "Tag.json",
+      },
+    },
+    status: {
+      type: "string",
+      description: "pet status in the store",
+      enum: ["available", "pending", "sold"],
+    },
+    nullableValue: {
+      type: ["string", "null"],
+      description: "example nullable value",
+    },
+  },
+  title: "Pet",
+  $id: "Pet.json",
+} as const;
diff --git a/example/output/tson/Tag.ts b/example/output/tson/Tag.ts
@@ -0,0 +1,14 @@
+export const Tag = {
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    name: { type: "string" },
+  },
+  title: "Tag",
+  $id: "Tag.json",
+} as const;
diff --git a/example/output/tson/User.ts b/example/output/tson/User.ts
@@ -0,0 +1,26 @@
+export const User = {
+  type: "object",
+  properties: {
+    id: {
+      type: "integer",
+      format: "int64",
+      minimum: -9223372036854776000,
+      maximum: 9223372036854776000,
+    },
+    username: { type: "string" },
+    firstName: { type: "string" },
+    lastName: { type: "string" },
+    email: { type: "string" },
+    password: { type: "string" },
+    phone: { type: "string" },
+    userStatus: {
+      type: "integer",
+      description: "User Status",
+      format: "int32",
+      minimum: -2147483648,
+      maximum: 2147483647,
+    },
+  },
+  title: "User",
+  $id: "User.json",
+} as const;
diff --git a/example/output/types/ApiResponse.d.ts b/example/output/types/ApiResponse.d.ts
@@ -1,3 +1,5 @@
+import { FooBARBaz } from './FooBARBaz';
+
 /* eslint-disable */
 /**
  * This file was automatically generated by openapi-transformer-toolkit CLI/methods.
@@ -9,5 +11,6 @@ export interface ApiResponse {
   code?: number;
   type?: string;
   message?: string;
+  FooBARBaz?: FooBARBaz;
   [k: string]: unknown;
 }
diff --git a/example/output/types/FooBARBaz.d.ts b/example/output/types/FooBARBaz.d.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+/**
+ * This file was automatically generated by openapi-transformer-toolkit CLI/methods.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source OpenAPI file,
+ * and run openapi-transformer-toolkit CLI/methods to regenerate this file.
+ */
+
+/**
+ * this name is valid and should be FooBARBaz everywhere it appears
+ */
+export type FooBARBaz = string;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/commands/oas2tson.ts b/src/commands/oas2tson.ts
diff --git a/src/utils/paths.ts b/src/utils/paths.ts
diff --git a/test/fixtures/openapi.yml b/test/fixtures/openapi.yml
diff --git a/test/oas2json.test.ts b/test/oas2json.test.ts
diff --git a/test/oas2ts.test.ts b/test/oas2ts.test.ts
diff --git a/test/oas2tson.test.ts b/test/oas2tson.test.ts
