Merge pull request #1189 from samchon/feature/json-schema

Fix #1188: invalid JSON schema about tuple type.
samchon · Jul 31, 2024 · 57df81d · 57df81d
2 parents 8c34f45 + 06bcafc
commit 57df81d
Show file tree

Hide file tree

Showing 37 changed files with 127 additions and 618 deletions.
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -72,6 +72,6 @@
     "suppress-warnings": "^1.0.2",
     "tstl": "^3.0.0",
     "uuid": "^9.0.1",
-    "typia": "../typia-6.6.1.tgz"
+    "typia": "../typia-6.6.2.tgz"
   }
 }
diff --git a/debug/features/enum.ts b/debug/features/enum.ts
diff --git a/debug/features/internal/TestValidator.ts b/debug/features/internal/TestValidator.ts
diff --git a/debug/features/join.ts b/debug/features/join.ts
diff --git a/debug/features/tuple.ts b/debug/features/tuple.ts
@@ -0,0 +1,7 @@
+import typia from "typia";
+
+console.log(
+  typia.json.application<[[number, string]], "3.0">().schemas[0],
+  typia.json.application<[[number, string]], "3.1">().schemas[0],
+  typia.json.application<[[number, string, ...boolean[]]], "3.1">().schemas[0],
+);
diff --git a/debug/package.json b/debug/package.json
@@ -16,6 +16,6 @@
     "typescript": "^5.4.2"
   },
   "dependencies": {
-    "typia": "../typia-6.6.0-dev.20240727.tgz"
+    "typia": "../typia-6.6.1.tgz"
   }
 }
diff --git a/errors/package.json b/errors/package.json
@@ -32,6 +32,6 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
-    "typia": "../typia-6.6.1.tgz"
+    "typia": "../typia-6.6.2.tgz"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typia",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/typescript-json/package.json b/packages/typescript-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-json",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
   },
   "homepage": "https://typia.io",
   "dependencies": {
-    "typia": "6.6.1"
+    "typia": "6.6.2"
   },
   "peerDependencies": {
     "typescript": ">=4.8.0 <5.6.0"

diff --git a/src/programmers/internal/application_v31_tuple.ts b/src/programmers/internal/application_v31_tuple.ts
@@ -9,7 +9,7 @@ import { MetadataTuple } from "../../schemas/metadata/MetadataTuple";
 export const application_v31_tuple =
   (generator: (meta: Metadata) => OpenApi.IJsonSchema) =>
   (tuple: MetadataTuple): OpenApi.IJsonSchema.ITuple => {
-    const tail: Metadata | undefined = tuple.type.elements.at(-1);
+    const tail: Metadata | null = tuple.type.elements.at(-1)?.rest ?? null;
     const prefixItems: Metadata[] = tuple.type.isRest()
       ? tuple.type.elements.slice(0, -1)
       : tuple.type.elements;

diff --git a/test-esm/package.json b/test-esm/package.json
@@ -36,6 +36,6 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "typia": "../typia-6.6.1.tgz"
+    "typia": "../typia-6.6.2.tgz"
   }
 }
diff --git a/test/package.json b/test/package.json
@@ -51,6 +51,6 @@
     "suppress-warnings": "^1.0.2",
     "tstl": "^3.0.0",
     "uuid": "^9.0.1",
-    "typia": "../typia-6.6.1.tgz"
+    "typia": "../typia-6.6.2.tgz"
   }
 }
diff --git a/test/schemas/json/v3_1/ArrayAtomicAlias.json b/test/schemas/json/v3_1/ArrayAtomicAlias.json
@@ -15,9 +15,7 @@
             "$ref": "#/components/schemas/ArrayAtomicAlias.Aliasstring"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ArrayAtomicAlias.Aliasstring"
-        }
+        "additionalItems": false
       },
       "ArrayAtomicAlias.Aliasboolean": {
         "type": "array",

diff --git a/test/schemas/json/v3_1/ArrayAtomicSimple.json b/test/schemas/json/v3_1/ArrayAtomicSimple.json
@@ -24,12 +24,7 @@
             }
           }
         ],
-        "additionalItems": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/ArrayRepeatedUnionWithTuple.json b/test/schemas/json/v3_1/ArrayRepeatedUnionWithTuple.json
@@ -38,9 +38,7 @@
                 "type": "boolean"
               }
             ],
-            "additionalItems": {
-              "type": "boolean"
-            }
+            "additionalItems": false
           },
           {
             "type": "array",
@@ -52,9 +50,7 @@
                 "$ref": "#/components/schemas/ArrayRepeatedUnionWithTuple.IPoint3D"
               }
             ],
-            "additionalItems": {
-              "$ref": "#/components/schemas/ArrayRepeatedUnionWithTuple.IPoint3D"
-            }
+            "additionalItems": false
           }
         ]
       },

diff --git a/test/schemas/json/v3_1/AtomicAlias.json b/test/schemas/json/v3_1/AtomicAlias.json
@@ -15,9 +15,7 @@
             "type": "string"
           }
         ],
-        "additionalItems": {
-          "type": "string"
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/AtomicClass.json b/test/schemas/json/v3_1/AtomicClass.json
@@ -33,9 +33,7 @@
             "type": "string"
           }
         ],
-        "additionalItems": {
-          "type": "string"
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/AtomicIntersection.json b/test/schemas/json/v3_1/AtomicIntersection.json
@@ -15,9 +15,7 @@
             "$ref": "#/components/schemas/AtomicIntersection.Wrapperstring"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/AtomicIntersection.Wrapperstring"
-        }
+        "additionalItems": false
       },
       "AtomicIntersection.Wrapperboolean": {
         "type": "boolean"

diff --git a/test/schemas/json/v3_1/AtomicSimple.json b/test/schemas/json/v3_1/AtomicSimple.json
@@ -15,9 +15,7 @@
             "type": "string"
           }
         ],
-        "additionalItems": {
-          "type": "string"
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/ConstantAtomicSimple.json b/test/schemas/json/v3_1/ConstantAtomicSimple.json
@@ -18,9 +18,7 @@
             "const": "three"
           }
         ],
-        "additionalItems": {
-          "const": "three"
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/ConstantAtomicWrapper.json b/test/schemas/json/v3_1/ConstantAtomicWrapper.json
@@ -15,9 +15,7 @@
             "$ref": "#/components/schemas/ConstantAtomicWrapper.IPointerstring"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ConstantAtomicWrapper.IPointerstring"
-        }
+        "additionalItems": false
       },
       "ConstantAtomicWrapper.IPointerboolean": {
         "type": "object",

diff --git a/test/schemas/json/v3_1/ConstantIntersection.json b/test/schemas/json/v3_1/ConstantIntersection.json
@@ -15,9 +15,7 @@
             "$ref": "#/components/schemas/ConstantIntersection.Wrappertwo"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ConstantIntersection.Wrappertwo"
-        }
+        "additionalItems": false
       },
       "ConstantIntersection.Wrapperfalse": {
         "const": false

diff --git a/test/schemas/json/v3_1/ObjectGeneric.json b/test/schemas/json/v3_1/ObjectGeneric.json
@@ -15,9 +15,7 @@
             "$ref": "#/components/schemas/ObjectGeneric.ISomethingstring"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ObjectGeneric.ISomethingstring"
-        }
+        "additionalItems": false
       },
       "ObjectGeneric.ISomethingboolean": {
         "type": "object",

diff --git a/test/schemas/json/v3_1/ObjectHierarchical.json b/test/schemas/json/v3_1/ObjectHierarchical.json
@@ -53,9 +53,7 @@
                 "type": "number"
               }
             ],
-            "additionalItems": {
-              "type": "number"
-            }
+            "additionalItems": false
           },
           "created_at": {
             "$ref": "#/components/schemas/ObjectHierarchical.ITimestamp"

diff --git a/test/schemas/json/v3_1/ObjectPropertyNullable.json b/test/schemas/json/v3_1/ObjectPropertyNullable.json
@@ -30,12 +30,7 @@
             }
           }
         ],
-        "additionalItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/components/schemas/ObjectPropertyNullable.IPointerObjectPropertyNullable.IMember"
-          }
-        }
+        "additionalItems": false
       },
       "ObjectPropertyNullable.IPointerboolean": {
         "type": "object",

diff --git a/test/schemas/json/v3_1/ObjectTuple.json b/test/schemas/json/v3_1/ObjectTuple.json
@@ -12,9 +12,7 @@
             "$ref": "#/components/schemas/ObjectTuple.ICitizen"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ObjectTuple.ICitizen"
-        }
+        "additionalItems": false
       },
       "ObjectTuple.ISection": {
         "type": "object",

diff --git a/test/schemas/json/v3_1/ToJsonArray.json b/test/schemas/json/v3_1/ToJsonArray.json
@@ -30,12 +30,7 @@
             }
           }
         ],
-        "additionalItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/components/schemas/ToJsonArray.IObject"
-          }
-        }
+        "additionalItems": false
       },
       "ToJsonArray.IObject": {
         "type": "object",

diff --git a/test/schemas/json/v3_1/ToJsonAtomicSimple.json b/test/schemas/json/v3_1/ToJsonAtomicSimple.json
@@ -15,9 +15,7 @@
             "type": "string"
           }
         ],
-        "additionalItems": {
-          "type": "string"
-        }
+        "additionalItems": false
       }
     }
   },

diff --git a/test/schemas/json/v3_1/ToJsonTuple.json b/test/schemas/json/v3_1/ToJsonTuple.json
@@ -18,9 +18,7 @@
             "$ref": "#/components/schemas/ToJsonTuple.IObject"
           }
         ],
-        "additionalItems": {
-          "$ref": "#/components/schemas/ToJsonTuple.IObject"
-        }
+        "additionalItems": false
       },
       "ToJsonTuple.IObject": {
         "$ref": "#/components/schemas/ToJsonTuple.IHobby"