fix: 对象结构中可能包含特殊字符，需要使用引号包裹

Author: geekact

src/lib/parse-schema.ts

@@ -30,7 +30,7 @@ export const parseSchema = (
       const requiredProperties = parsed.required || [];
       const properties = Object.entries(parsed.properties || {}).map(([key, schema]) => {
         const schemaObj = refToObject(docs, schema);
-        return `${generateComments(schemaObj)}${key}${requiredProperties.includes(key) ? '' : '?'}: ${parseSchema(docs, schemaObj)}`;
+        return `${generateComments(schemaObj)}"${key}"${requiredProperties.includes(key) ? '' : '?'}: ${parseSchema(docs, schemaObj)}`;
       });
       return `({ ${properties.join(';')} }${nullable})`;
     }

test/lib/parse-request-body.test.ts

@@ -24,7 +24,7 @@ test('从requestBody字段获取', () => {
       "body": {
         "optional": false,
         "types": [
-          "({ foo?: (string) })",
+          "({ "foo"?: (string) })",
         ],
       },
       "contentTypes": [
@@ -57,7 +57,7 @@ test('多个返回类型', () => {
       "body": {
         "optional": false,
         "types": [
-          "({ foo?: (string) })",
+          "({ "foo"?: (string) })",
           "(string)",
         ],
       },
@@ -138,7 +138,7 @@ test('*/* 类型被忽略', () => {
       "body": {
         "optional": false,
         "types": [
-          "({ foo?: (string) })",
+          "({ "foo"?: (string) })",
         ],
       },
       "contentTypes": [],

test/lib/parse-response.test.ts

@@ -24,7 +24,7 @@ test('从response字段获取', () => {
     {
       "response": {
         "types": [
-          "({ foo?: (string) })",
+          "({ "foo"?: (string) })",
         ],
       },
       "responseTypes": [
@@ -72,8 +72,8 @@ test('只保留2xx状态', () => {
     {
       "response": {
         "types": [
-          "({ foo?: (string) })",
-          "({ foo1?: (string) })",
+          "({ "foo"?: (string) })",
+          "({ "foo1"?: (string) })",
         ],
       },
       "responseTypes": [
@@ -105,7 +105,7 @@ test('*/* 类型被忽略', () => {
     {
       "response": {
         "types": [
-          "({ foo?: (string) })",
+          "({ "foo"?: (string) })",
         ],
       },
       "responseTypes": [],

test/lib/parse-schema.test.ts

@@ -34,15 +34,15 @@ describe('常规', () => {
         required: ['foo'],
       },
     });
-    expect(type).toMatchInlineSnapshot(`"((({ foo: (string) }))[])"`);
+    expect(type).toMatchInlineSnapshot(`"((({ "foo": (string) }))[])"`);
   });
 
   test('对象', () => {
     const type = parseSchema(docs, {
       type: 'object',
       properties: { foo: { type: 'string' } },
     });
-    expect(type).toMatchInlineSnapshot(`"({ foo?: (string) })"`);
+    expect(type).toMatchInlineSnapshot(`"({ "foo"?: (string) })"`);
   });
 
   test('对象属性包含描述', () => {
@@ -55,10 +55,18 @@ describe('常规', () => {
       /**
       * foo=bar 
       */
-      foo?: (string) })"
+      "foo"?: (string) })"
     `);
   });
 
+  test('对象属性包含特殊字符', () => {
+    const type = parseSchema(docs, {
+      type: 'object',
+      properties: { '123foo': { type: 'string' } },
+    });
+    expect(type).toMatchInlineSnapshot(`"({ "123foo"?: (string) })"`);
+  });
+
   test('空对象', () => {
     const type = parseSchema(docs, { type: 'object' });
     expect(type).toMatchInlineSnapshot(`"({  })"`);
@@ -98,7 +106,7 @@ describe('oneOf', () => {
       ],
     });
     expect(type).toMatchInlineSnapshot(
-      `"((((({ foo?: (string) }) | ({ bar: (string) })))))"`,
+      `"((((({ "foo"?: (string) }) | ({ "bar": (string) })))))"`,
     );
   });
 
@@ -132,7 +140,7 @@ describe('anyOf', () => {
       ],
     });
     expect(type).toMatchInlineSnapshot(
-      `"((((({ foo?: (string) }) | ({ bar: (string) })))))"`,
+      `"((((({ "foo"?: (string) }) | ({ "bar": (string) })))))"`,
     );
   });
 
@@ -166,7 +174,7 @@ describe('allOf', () => {
       ],
     });
     expect(type).toMatchInlineSnapshot(
-      `"(((({ foo?: (string) }) & ({ bar: (string) }))))"`,
+      `"(((({ "foo"?: (string) }) & ({ "bar": (string) }))))"`,
     );
   });
 
@@ -196,7 +204,7 @@ describe('allOf + anyOf + oneOf', () => {
       ],
     });
     expect(type).toMatchInlineSnapshot(
-      `"((((({ foo2?: (string) }) | ({ bar2?: (string) })) | (({ foo1?: (string) }) | ({ bar1?: (string) }))) & (({ foo: (string) }) & ({ bar?: (string) }))))"`,
+      `"((((({ "foo2"?: (string) }) | ({ "bar2"?: (string) })) | (({ "foo1"?: (string) }) | ({ "bar1"?: (string) }))) & (({ "foo": (string) }) & ({ "bar"?: (string) }))))"`,
     );
   });
 
@@ -208,7 +216,7 @@ describe('allOf + anyOf + oneOf', () => {
       oneOf: [{ properties: { foo: { type: 'string' } }, required: ['foo'] }],
     });
     expect(type).toMatchInlineSnapshot(
-      `"((((({ foo: (string) }))) & (({ foo2?: (string) }))))"`,
+      `"((((({ "foo": (string) }))) & (({ "foo2"?: (string) }))))"`,
     );
   });
 
@@ -219,7 +227,7 @@ describe('allOf + anyOf + oneOf', () => {
       anyOf: [{ properties: { foo2: { type: 'string' } }, required: ['foo'] }],
       oneOf: [{ properties: { foo: { type: 'string' } }, required: ['foo'] }],
     });
-    expect(type).toMatchInlineSnapshot(`"((((({ foo: (string) })))))"`);
+    expect(type).toMatchInlineSnapshot(`"((((({ "foo": (string) })))))"`);
   });
 
   test('anyOf = allOf', () => {
@@ -229,7 +237,7 @@ describe('allOf + anyOf + oneOf', () => {
       anyOf: [{ properties: { foo: { type: 'string' } }, required: ['foo'] }],
       oneOf: [{ properties: { foo2: { type: 'string' } }, required: ['foo'] }],
     });
-    expect(type).toMatchInlineSnapshot(`"((((({ foo: (string) })))))"`);
+    expect(type).toMatchInlineSnapshot(`"((((({ "foo": (string) })))))"`);
   });
 
   test('oneOf = anyOf = allOf', () => {
@@ -239,7 +247,7 @@ describe('allOf + anyOf + oneOf', () => {
       anyOf: [{ properties: { foo: { type: 'string' } }, required: ['foo'] }],
       oneOf: [{ properties: { foo: { type: 'string' } }, required: ['foo'] }],
     });
-    expect(type).toMatchInlineSnapshot(`"((((({ foo: (string) })))))"`);
+    expect(type).toMatchInlineSnapshot(`"((((({ "foo": (string) })))))"`);
   });
 });
 
@@ -286,7 +294,7 @@ describe('nullable', () => {
         type: 'object',
         properties: { foo: { type: 'string', nullable: true } },
       }),
-    ).toMatchInlineSnapshot(`"({ foo?: (string | null) })"`);
+    ).toMatchInlineSnapshot(`"({ "foo"?: (string | null) })"`);
   });
 
   test('二进制', () => {