fix: convert names that begin with a number

aspida · May 15, 2021 · 9b2dcfa · 9b2dcfa
1 parent 65b919c
commit 9b2dcfa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/samples/openapi.json b/samples/openapi.json
@@ -2149,7 +2149,7 @@
                     {
                       "type": "object",
                       "required": ["token"],
-                      "properties": { "settings": { "$ref": "#/components/schemas/UserSettings" } }
+                      "properties": { "settings": { "$ref": "#/components/schemas/200-UserSettings" } }
                     }
                   ]
                 }
@@ -2381,7 +2381,7 @@
                           "type": "string",
                           "example": "bc402f28c60255f6af5057434587e5a41e71afb0"
                         },
-                        "settings": { "$ref": "#/components/schemas/UserSettings" }
+                        "settings": { "$ref": "#/components/schemas/200-UserSettings" }
                       }
                     }
                   ]
@@ -3247,7 +3247,7 @@
           "url": { "type": "string", "format": "url" }
         }
       },
-      "UserSettings": {
+      "200-UserSettings": {
         "required": ["isAppLocked"],
         "properties": { "isAppLocked": { "type": "boolean" } }
       },

diff --git a/samples/openapi/@types/index.ts b/samples/openapi/@types/index.ts
@@ -61,7 +61,7 @@ export type UserInfo = {
   url: string
 }
 
-export type UserSettings = {
+export type $200_UserSettings = {
   isAppLocked: boolean
 }
 

diff --git a/samples/openapi/api/v3/login/index.ts b/samples/openapi/api/v3/login/index.ts
@@ -9,7 +9,7 @@ export type Methods = {
     /** OK */
     resBody: Types.UserInfo & {
       token: string
-      settings?: Types.UserSettings
+      settings?: Types.$200_UserSettings
     }
 
     reqBody: {

diff --git a/samples/openapi/api/v3/me/index.ts b/samples/openapi/api/v3/me/index.ts
@@ -8,7 +8,7 @@ export type Methods = {
 
     /** OK */
     resBody: Types.UserInfo & {
-      settings?: Types.UserSettings
+      settings?: Types.$200_UserSettings
     }
   }
 }
diff --git a/src/builderUtils/converters.ts b/src/builderUtils/converters.ts
@@ -2,7 +2,9 @@ import { OpenAPIV3 } from 'openapi-types'
 import { Prop, PropValue } from './props2String'
 
 export const defKey2defName = (key: string) =>
-  `${key[0].toUpperCase()}${key.slice(1).replace(/[^a-zA-Z0-9$_]/g, '_')}`
+  `${key[0].replace(/^([^a-zA-Z$_])$/, '$$$1').toUpperCase()}${key
+    .slice(1)
+    .replace(/[^a-zA-Z0-9$_]/g, '_')}`
 
 export const $ref2TypeName = (ref: string) => {
   const [, , , typeName, , propName] = ref.split('/')