@samchon/openapi - npm Package Compare versions

Comparing version 2.0.0-dev.20241112 to 2.0.0-dev.20241113

lib/converters/HttpLlmConverter.js

@@ -93,3 +93,3 @@ "use strict";
                     path: route.path,
-                    messages: ["Failed to escape $ref"], // @todo
+                    messages: ["Failed to escape $ref"],
                     operation: function () { return route.operation(); },
@@ -96,0 +96,0 @@ route: function () { return route; },

lib/converters/LlmConverterV3.js

@@ -55,6 +55,12 @@ "use strict";
             return null;
-        return OpenApiV3Downgrader_1.OpenApiV3Downgrader.downgradeSchema({
+        var downgraded = OpenApiV3Downgrader_1.OpenApiV3Downgrader.downgradeSchema({
             original: {},
             downgraded: {},
         })(resolved);
+        LlmTypeCheckerV3_1.LlmTypeCheckerV3.visit(downgraded, function (schema) {
+            if (LlmTypeCheckerV3_1.LlmTypeCheckerV3.isOneOf(schema) &&
+                schema.discriminator !== undefined)
+                delete schema.discriminator;
+        });
+        return downgraded;
     };
@@ -61,0 +67,0 @@ LlmConverterV3.separate = function (props) {

lib/converters/OpenApiV3Downgrader.js

@@ -203,3 +203,2 @@ "use strict";
             var visit = function (schema) {
-                var _a, _b;
                 if (OpenApiTypeChecker_1.OpenApiTypeChecker.isBoolean(schema))
@@ -216,10 +215,16 @@ union.push({ type: "boolean" });
                 else if (OpenApiTypeChecker_1.OpenApiTypeChecker.isTuple(schema))
-                    visit(__assign(__assign(__assign({}, schema), { type: "array", items: {
-                            oneOf: __spreadArray(__spreadArray([], __read(schema.prefixItems), false), __read((typeof schema.additionalItems === "object" &&
-                                schema.additionalItems !== null
-                                ? [schema.additionalItems]
-                                : [])), false),
-                        }, minItems: (_a = schema.minItems) !== null && _a !== void 0 ? _a : schema.prefixItems.length, maxItems: (_b = schema.maxItems) !== null && _b !== void 0 ? _b : (schema.additionalItems === true
+                    union.push(__assign(__assign(__assign({}, schema), { items: (function () {
+                            if (schema.additionalItems === true)
+                                return {};
+                            var elements = __spreadArray(__spreadArray([], __read(schema.prefixItems), false), __read((typeof schema.additionalItems === "object"
+                                ? [OpenApiV3Downgrader.downgradeSchema(collection)(schema.additionalItems)]
+                                : [])), false);
+                            if (elements.length === 0)
+                                return {};
+                            return {
+                                oneOf: elements.map(OpenApiV3Downgrader.downgradeSchema(collection)),
+                            };
+                        })(), minItems: schema.prefixItems.length, maxItems: !!schema.additionalItems === true
                             ? undefined
-                            : schema.prefixItems.length) }), {
+                            : schema.prefixItems.length }), {
                         prefixItems: undefined,
@@ -226,0 +231,0 @@ additionalItems: undefined,

lib/converters/SwaggerV2Downgrader.js

@@ -224,3 +224,2 @@ "use strict";
             var visit = function (schema) {
-                var _a, _b;
                 if (OpenApiTypeChecker_1.OpenApiTypeChecker.isBoolean(schema))
@@ -242,13 +241,21 @@ union.push({ type: "boolean" });
                 else if (OpenApiTypeChecker_1.OpenApiTypeChecker.isTuple(schema))
-                    visit(__assign(__assign(__assign({}, schema), { type: "array", items: {
-                            oneOf: __spreadArray(__spreadArray([], __read(schema.prefixItems), false), __read((typeof schema.additionalItems === "object" &&
-                                schema.additionalItems !== null
-                                ? [schema.additionalItems]
-                                : [])), false),
-                        }, minItems: (_a = schema.minItems) !== null && _a !== void 0 ? _a : schema.prefixItems.length, maxItems: (_b = schema.maxItems) !== null && _b !== void 0 ? _b : (schema.additionalItems === true
+                    union.push(__assign(__assign(__assign(__assign({}, schema), { items: (function () {
+                            if (schema.additionalItems === true)
+                                return {};
+                            var elements = __spreadArray(__spreadArray([], __read(schema.prefixItems), false), __read((typeof schema.additionalItems === "object"
+                                ? [SwaggerV2Downgrader.downgradeSchema(collection)(schema.additionalItems)]
+                                : [])), false);
+                            if (elements.length === 0)
+                                return {};
+                            return {
+                                "x-oneOf": elements.map(SwaggerV2Downgrader.downgradeSchema(collection)),
+                            };
+                        })(), minItems: schema.prefixItems.length, maxItems: !!schema.additionalItems === true
                             ? undefined
-                            : schema.prefixItems.length) }), {
+                            : schema.prefixItems.length }), {
                         prefixItems: undefined,
                         additionalItems: undefined,
-                    }));
+                    }), { examples: schema.examples
+                            ? Object.values(schema.examples)
+                            : undefined }));
                 else if (OpenApiTypeChecker_1.OpenApiTypeChecker.isObject(schema))
@@ -277,8 +284,6 @@ union.push(__assign(__assign({}, schema), { properties: schema.properties
             var visitConstant = function (schema) {
-                var e_3, _a;
                 var insert = function (value) {
                     var _a;
                     var matched = union.find(function (u) {
-                        return u.type ===
-                            typeof value;
+                        return u.type === value;
                     });
@@ -291,20 +296,7 @@ if (matched !== undefined) {
                         union.push({ type: typeof value, enum: [value] });
+                    if (OpenApiTypeChecker_1.OpenApiTypeChecker.isConstant(schema))
+                        insert(schema.const);
+                    else if (OpenApiTypeChecker_1.OpenApiTypeChecker.isOneOf(schema))
+                        schema.oneOf.forEach(insert);
                 };
-                if (OpenApiTypeChecker_1.OpenApiTypeChecker.isConstant(schema))
-                    insert(schema.const);
-                else if (OpenApiTypeChecker_1.OpenApiTypeChecker.isOneOf(schema))
-                    try {
-                        for (var _b = __values(schema.oneOf), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var u = _c.value;
-                            if (OpenApiTypeChecker_1.OpenApiTypeChecker.isConstant(u))
-                                insert(u.const);
-                        }
-                    }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                    finally {
-                        try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                    }
             };
@@ -311,0 +303,0 @@ visit(input);

lib/utils/OpenApiTypeChecker.js

@@ -224,3 +224,3 @@ "use strict";
                 return undefined;
-            return __assign(__assign({}, props), { oneOf: filtered.map(function (v) { return flat(props.components, v); }).flat(), discriminator: undefined });
+            return __assign(__assign({}, props), { oneOf: filtered.map(function (v) { return flat(props.components, v); }).flat() });
         }
@@ -227,0 +227,0 @@ else if (OpenApiTypeChecker.isObject(props.schema)) {

package.json

 {
   "name": "@samchon/openapi",
-  "version": "2.0.0-dev.20241112",
+  "version": "2.0.0-dev.20241113",
   "description": "OpenAPI definitions and converters for 'typia' and 'nestia'.",
@@ -55,4 +55,5 @@ "main": "./lib/index.js",
     "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.2",
     "ts-patch": "^3.2.1",
-    "typescript": "5.5.4",
+    "typescript": "^5.6.3",
     "typescript-transform-paths": "^3.4.7",
@@ -67,4 +68,3 @@ "typia": "^6.9.0",
     "README.md"
-  ],
-  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
+  ]
 }

src/converters/HttpLlmConverter.ts

@@ -81,3 +81,3 @@ import { OpenApi } from "../OpenApi";
               path: route.path,
-              messages: ["Failed to escape $ref"], // @todo
+              messages: ["Failed to escape $ref"],
               operation: () => route.operation(),
@@ -84,0 +84,0 @@ route: () => route as any as Route,

src/converters/LlmConverterV3.ts

@@ -19,6 +19,14 @@ import { OpenApi } from "../OpenApi";
     if (resolved === null) return null;
-    return OpenApiV3Downgrader.downgradeSchema({
+    const downgraded: ILlmSchemaV3 = OpenApiV3Downgrader.downgradeSchema({
       original: {},
       downgraded: {},
-    })(resolved);
+    })(resolved) as ILlmSchemaV3;
+    LlmTypeCheckerV3.visit(downgraded, (schema) => {
+      if (
+        LlmTypeCheckerV3.isOneOf(schema) &&
+        (schema as any).discriminator !== undefined
+      )
+        delete (schema as any).discriminator;
+    });
+    return downgraded;
   };
@@ -25,0 +33,0 @@

src/converters/OpenApiV3Downgrader.ts

@@ -211,20 +211,22 @@ import { OpenApi } from "../OpenApi";
         else if (OpenApiTypeChecker.isTuple(schema))
-          visit({
+          union.push({
             ...schema,
-            type: "array",
-            items: {
-              oneOf: [
+            items: ((): OpenApiV3.IJsonSchema => {
+              if (schema.additionalItems === true) return {};
+              const elements = [
                 ...schema.prefixItems,
-                ...(typeof schema.additionalItems === "object" &&
-                schema.additionalItems !== null
-                  ? [schema.additionalItems]
+                ...(typeof schema.additionalItems === "object"
+                  ? [downgradeSchema(collection)(schema.additionalItems)]
                   : []),
-              ],
-            },
-            minItems: schema.minItems ?? schema.prefixItems.length,
+              ];
+              if (elements.length === 0) return {};
+              return {
+                oneOf: elements.map(downgradeSchema(collection) as any),
+              };
+            })(),
+            minItems: schema.prefixItems.length,
             maxItems:
-              schema.maxItems ??
-              (schema.additionalItems === true
+              !!schema.additionalItems === true
                 ? undefined
-                : schema.prefixItems.length),
+                : schema.prefixItems.length,
             ...{
@@ -234,3 +236,3 @@ prefixItems: undefined,
             },
-          } satisfies OpenApi.IJsonSchema.IArray);
+          });
         else if (OpenApiTypeChecker.isObject(schema))
@@ -237,0 +239,0 @@ union.push({

src/converters/SwaggerV2Downgrader.ts

@@ -231,20 +231,22 @@ import { OpenApi } from "../OpenApi";
         else if (OpenApiTypeChecker.isTuple(schema))
-          visit({
+          union.push({
             ...schema,
-            type: "array",
-            items: {
-              oneOf: [
+            items: ((): SwaggerV2.IJsonSchema => {
+              if (schema.additionalItems === true) return {};
+              const elements = [
                 ...schema.prefixItems,
-                ...(typeof schema.additionalItems === "object" &&
-                schema.additionalItems !== null
-                  ? [schema.additionalItems]
+                ...(typeof schema.additionalItems === "object"
+                  ? [downgradeSchema(collection)(schema.additionalItems)]
                   : []),
-              ],
-            },
-            minItems: schema.minItems ?? schema.prefixItems.length,
+              ];
+              if (elements.length === 0) return {};
+              return {
+                "x-oneOf": elements.map(downgradeSchema(collection) as any),
+              };
+            })(),
+            minItems: schema.prefixItems.length,
             maxItems:
-              schema.maxItems ??
-              (schema.additionalItems === true
+              !!schema.additionalItems === true
                 ? undefined
-                : schema.prefixItems.length),
+                : schema.prefixItems.length,
             ...{
@@ -254,3 +256,6 @@ prefixItems: undefined,
             },
-          } satisfies OpenApi.IJsonSchema.IArray);
+            examples: schema.examples
+              ? Object.values(schema.examples)
+              : undefined,
+          });
         else if (OpenApiTypeChecker.isObject(schema))
@@ -285,4 +290,3 @@ union.push({
             (u) =>
-              (u as SwaggerV2.IJsonSchema.__ISignificant<any>).type ===
-              typeof value,
+              (u as SwaggerV2.IJsonSchema.__ISignificant<any>).type === value,
           ) as SwaggerV2.IJsonSchema.INumber | undefined;
@@ -293,7 +297,6 @@ if (matched !== undefined) {
           } else union.push({ type: typeof value as "number", enum: [value] });
+          if (OpenApiTypeChecker.isConstant(schema)) insert(schema.const);
+          else if (OpenApiTypeChecker.isOneOf(schema))
+            schema.oneOf.forEach(insert);
         };
-        if (OpenApiTypeChecker.isConstant(schema)) insert(schema.const);
-        else if (OpenApiTypeChecker.isOneOf(schema))
-          for (const u of schema.oneOf)
-            if (OpenApiTypeChecker.isConstant(u)) insert(u.const);
       };
@@ -300,0 +303,0 @@

src/utils/OpenApiTypeChecker.ts

@@ -204,3 +204,2 @@ import { OpenApi } from "../OpenApi";
         oneOf: filtered.map((v) => flat(props.components, v)).flat(),
-        discriminator: undefined,
       };
@@ -207,0 +206,0 @@ } else if (isObject(props.schema)) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1488245

increased by0.06%

Lines of code

26071

increased by0.05%

Worsened metrics

Dev dependency count

26

increased by4%

No dependency changes