Merge pull request #1020 from samchon/features/plugin

Add ContentMediaType and JsonSchemaPlugin tags
samchon · Apr 2, 2024 · 7e4b344 · 7e4b344
2 parents ac2d8b4 + 3aef974
commit 7e4b344
Show file tree

Hide file tree

Showing 95 changed files with 1,984 additions and 37 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": "D:\\github\\samchon\\typia\\typia-5.5.8.tgz"
+    "typia": "D:\\github\\samchon\\typia\\typia-5.5.10.tgz"
   }
 }
diff --git a/errors/package.json b/errors/package.json
@@ -32,6 +32,6 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
-    "typia": "D:\\github\\samchon\\typia\\typia-5.5.8.tgz"
+    "typia": "D:\\github\\samchon\\typia\\typia-5.5.10.tgz"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typia",
-  "version": "5.5.8",
+  "version": "5.5.10",
   "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": "5.5.8",
+  "version": "5.5.10",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -62,7 +62,7 @@
   },
   "homepage": "https://typia.io",
   "dependencies": {
-    "typia": "5.5.8"
+    "typia": "5.5.10"
   },
   "peerDependencies": {
     "typescript": ">=4.8.0 <5.5.0"

diff --git a/src/schemas/json/IJsonSchema.ts b/src/schemas/json/IJsonSchema.ts
@@ -68,6 +68,7 @@ export namespace IJsonSchema {
       | "json-pointer"
       | "relative-json-pointer"
       | (string & {});
+    contentMediaType?: undefined | string;
     "x-typia-typeTags"?: undefined | IMetadataTypeTag[];
   }
   export interface INumber extends IAtomic<"number"> {

diff --git a/src/tags/ContentMediaType.ts b/src/tags/ContentMediaType.ts
@@ -0,0 +1,10 @@
+import { TagBase } from "./TagBase";
+
+export type ContentMediaType<Value extends string> = TagBase<{
+  target: "string";
+  kind: "contentMediaType";
+  value: undefined;
+  schema: {
+    contentMediaType: Value;
+  };
+}>;
diff --git a/src/tags/JsonSchemaPlugin.ts b/src/tags/JsonSchemaPlugin.ts
@@ -0,0 +1,8 @@
+import { TagBase } from "./TagBase";
+
+export type JsonSchemaPlugin<Schema extends object> = TagBase<{
+  target: "string" | "boolean" | "number" | "array";
+  kind: "jsonPlugin";
+  value: undefined;
+  schema: Schema;
+}>;
diff --git a/src/tags/index.ts b/src/tags/index.ts
@@ -9,6 +9,8 @@ export * from "./Minimum";
 export * from "./MinItems";
 export * from "./MinLength";
 export * from "./MultipleOf";
+export * from "./JsonSchemaPlugin";
 export * from "./Pattern";
 export * from "./TagBase";
 export * from "./Type";
+export * from "./ContentMediaType";
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": "D:\\github\\samchon\\typia\\typia-5.5.8.tgz"
+    "typia": "D:\\github\\samchon\\typia\\typia-5.5.10.tgz"
   }
 }
diff --git a/test/schemas/json/ajv_standard/UltimateUnion.json b/test/schemas/json/ajv_standard/UltimateUnion.json
@@ -545,6 +545,9 @@
           "format": {
             "type": "string"
           },
+          "contentMediaType": {
+            "type": "string"
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {
@@ -1488,6 +1491,9 @@
           "format": {
             "type": "string"
           },
+          "contentMediaType": {
+            "type": "string"
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {

diff --git a/test/schemas/json/ajv_surplus/UltimateUnion.json b/test/schemas/json/ajv_surplus/UltimateUnion.json
@@ -797,6 +797,11 @@
             "x-typia-required": false,
             "x-typia-optional": true
           },
+          "contentMediaType": {
+            "type": "string",
+            "x-typia-required": false,
+            "x-typia-optional": true
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {
@@ -2203,6 +2208,11 @@
             "x-typia-required": false,
             "x-typia-optional": true
           },
+          "contentMediaType": {
+            "type": "string",
+            "x-typia-required": false,
+            "x-typia-optional": true
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {

diff --git a/test/schemas/json/swagger_standard/UltimateUnion.json b/test/schemas/json/swagger_standard/UltimateUnion.json
@@ -542,6 +542,9 @@
           "format": {
             "type": "string"
           },
+          "contentMediaType": {
+            "type": "string"
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {
@@ -1484,6 +1487,9 @@
           "format": {
             "type": "string"
           },
+          "contentMediaType": {
+            "type": "string"
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {

diff --git a/test/schemas/json/swagger_surplus/UltimateUnion.json b/test/schemas/json/swagger_surplus/UltimateUnion.json
@@ -794,6 +794,11 @@
             "x-typia-required": false,
             "x-typia-optional": true
           },
+          "contentMediaType": {
+            "type": "string",
+            "x-typia-required": false,
+            "x-typia-optional": true
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {
@@ -2209,6 +2214,11 @@
             "x-typia-required": false,
             "x-typia-optional": true
           },
+          "contentMediaType": {
+            "type": "string",
+            "x-typia-required": false,
+            "x-typia-optional": true
+          },
           "x-typia-typeTags": {
             "type": "array",
             "items": {

diff --git a/test/schemas/reflect/metadata/UltimateUnion.json b/test/schemas/reflect/metadata/UltimateUnion.json
@@ -5350,6 +5350,60 @@
             "description": null,
             "jsDocTags": []
           },
+          {
+            "key": {
+              "any": false,
+              "required": true,
+              "optional": false,
+              "nullable": false,
+              "functional": false,
+              "atomics": [],
+              "constants": [
+                {
+                  "type": "string",
+                  "values": [
+                    "contentMediaType"
+                  ]
+                }
+              ],
+              "templates": [],
+              "escaped": null,
+              "rest": null,
+              "arrays": [],
+              "tuples": [],
+              "objects": [],
+              "aliases": [],
+              "natives": [],
+              "sets": [],
+              "maps": []
+            },
+            "value": {
+              "any": false,
+              "required": false,
+              "optional": true,
+              "nullable": false,
+              "functional": false,
+              "atomics": [
+                {
+                  "type": "string",
+                  "tags": []
+                }
+              ],
+              "constants": [],
+              "templates": [],
+              "escaped": null,
+              "rest": null,
+              "arrays": [],
+              "tuples": [],
+              "objects": [],
+              "aliases": [],
+              "natives": [],
+              "sets": [],
+              "maps": []
+            },
+            "description": null,
+            "jsDocTags": []
+          },
           {
             "key": {
               "any": false,
@@ -15352,6 +15406,60 @@
             "description": null,
             "jsDocTags": []
           },
+          {
+            "key": {
+              "any": false,
+              "required": true,
+              "optional": false,
+              "nullable": false,
+              "functional": false,
+              "atomics": [],
+              "constants": [
+                {
+                  "type": "string",
+                  "values": [
+                    "contentMediaType"
+                  ]
+                }
+              ],
+              "templates": [],
+              "escaped": null,
+              "rest": null,
+              "arrays": [],
+              "tuples": [],
+              "objects": [],
+              "aliases": [],
+              "natives": [],
+              "sets": [],
+              "maps": []
+            },
+            "value": {
+              "any": false,
+              "required": false,
+              "optional": true,
+              "nullable": false,
+              "functional": false,
+              "atomics": [
+                {
+                  "type": "string",
+                  "tags": []
+                }
+              ],
+              "constants": [],
+              "templates": [],
+              "escaped": null,
+              "rest": null,
+              "arrays": [],
+              "tuples": [],
+              "objects": [],
+              "aliases": [],
+              "natives": [],
+              "sets": [],
+              "maps": []
+            },
+            "description": null,
+            "jsDocTags": []
+          },
           {
             "key": {
               "any": false,

diff --git a/test/src/features/issues/test_issue_jsonSchema_contentMediaType.ts b/test/src/features/issues/test_issue_jsonSchema_contentMediaType.ts
@@ -0,0 +1,14 @@
+import typia, { tags } from "typia";
+
+import { TestValidator } from "../../helpers/TestValidator";
+
+export const test_issue_jsonSchema_contentMediaType = () => {
+  const app: typia.IJsonApplication =
+    typia.json.application<
+      [string & tags.ContentMediaType<"application/json">]
+    >();
+  TestValidator.equals("contentType")(app.schemas[0])({
+    type: "string",
+    contentMediaType: "application/json",
+  } as any);
+};
diff --git a/test/src/features/issues/test_issue_jsonSchema_plugin.ts b/test/src/features/issues/test_issue_jsonSchema_plugin.ts
@@ -0,0 +1,18 @@
+import typia, { tags } from "typia";
+
+import { TestValidator } from "../../helpers/TestValidator";
+
+export const test_issue_jsonSchema_plugin = () => {
+  const app: typia.IJsonApplication = typia.json.application<
+    [
+      string &
+        tags.JsonSchemaPlugin<{
+          "x-typia-easy-to-learn": true;
+        }>,
+    ]
+  >();
+  TestValidator.equals("plugin")(app.schemas[0])({
+    type: "string",
+    "x-typia-easy-to-learn": true,
+  } as any);
+};
diff --git a/test/src/generated/output/assert/test_assert_UltimateUnion.ts b/test/src/generated/output/assert/test_assert_UltimateUnion.ts
@@ -264,6 +264,8 @@ export const test_assert_UltimateUnion = _test_assert(TypeGuardError)(
             input.maxLength <= 4294967295)) &&
         (undefined === input.pattern || "string" === typeof input.pattern) &&
         (undefined === input.format || "string" === typeof input.format) &&
+        (undefined === input.contentMediaType ||
+          "string" === typeof input.contentMediaType) &&
         (undefined === input["x-typia-typeTags"] ||
           (Array.isArray(input["x-typia-typeTags"]) &&
             input["x-typia-typeTags"].every(
@@ -755,6 +757,8 @@ export const test_assert_UltimateUnion = _test_assert(TypeGuardError)(
             input.maxLength <= 4294967295)) &&
         (undefined === input.pattern || "string" === typeof input.pattern) &&
         (undefined === input.format || "string" === typeof input.format) &&
+        (undefined === input.contentMediaType ||
+          "string" === typeof input.contentMediaType) &&
         (undefined === input["x-typia-typeTags"] ||
           (Array.isArray(input["x-typia-typeTags"]) &&
             input["x-typia-typeTags"].every(
@@ -2792,6 +2796,17 @@ export const test_assert_UltimateUnion = _test_assert(TypeGuardError)(
               },
               errorFactory,
             )) &&
+          (undefined === input.contentMediaType ||
+            "string" === typeof input.contentMediaType ||
+            $guard(
+              _exceptionable,
+              {
+                path: _path + ".contentMediaType",
+                expected: "(string | undefined)",
+                value: input.contentMediaType,
+              },
+              errorFactory,
+            )) &&
           (undefined === input["x-typia-typeTags"] ||
             ((Array.isArray(input["x-typia-typeTags"]) ||
               $guard(
@@ -5967,6 +5982,17 @@ export const test_assert_UltimateUnion = _test_assert(TypeGuardError)(
               },
               errorFactory,
             )) &&
+          (undefined === input.contentMediaType ||
+            "string" === typeof input.contentMediaType ||
+            $guard(
+              _exceptionable,
+              {
+                path: _path + ".contentMediaType",
+                expected: "(string | undefined)",
+                value: input.contentMediaType,
+              },
+              errorFactory,
+            )) &&
           (undefined === input["x-typia-typeTags"] ||
             ((Array.isArray(input["x-typia-typeTags"]) ||
               $guard(