@hasagi/schema 0.6.5 → 0.6.6

package/openapi/generate-openapi-v3.js

@@ -1,4 +1,5 @@
 import { HasagiClient as HasagiLiteClient } from "@hasagi/core";
+import { getSwaggerTypeName } from "../util.js";
 function getRootType(input) {
     const isObject = input.fields.length > 0;
     const isEnum = input.values.length > 0;
@@ -52,7 +53,7 @@ function getType(input) {
         case "":
             return undefined; //
         default:
-            return { $ref: `#/components/schemas/${type}` };
+            return { $ref: `#/components/schemas/${getSwaggerTypeName(type)}` };
     }
 }
 export async function generateOpenAPIv3(schema) {
@@ -184,7 +185,7 @@ function endpointToOperation(endpoint, schema) {
             parameters.push({
                 in: "query",
                 name: arg.name,
-                schema: getType(arg),
+                schema: getType(arg) ?? { type: "string" },
                 required: !arg.optional
             });
         });
@@ -214,7 +215,7 @@ function endpointToOperation(endpoint, schema) {
                     in: "query",
                     required: !arg.optional,
                     name: arg.name,
-                    schema: getType(arg)
+                    schema: getType(arg) ?? { type: "string" }
                 };
             }
         });
@@ -233,6 +234,14 @@ function endpointToOperation(endpoint, schema) {
     }
     const returnType = getType({ type: endpoint.returns });
     response = returnType !== undefined ? { content: { "application/json": { schema: returnType } }, description: "Success response" } : { description: "Success response" };
+    // Ensure GET endpoints have "content" set to comply with Swagger schema rules
+    if (endpoint.method === "GET" && !response.content) {
+        response.content = {
+            "application/json": {
+                schema: {}
+            }
+        };
+    }
     const tags = [];
     if (endpoint.path?.startsWith("/lol-"))
         tags.push("Plugin " + endpoint.path.split("/")[1]);

package/openapi/openapi-schema.js

@@ -112,7 +112,7 @@ function getTypeBySchemaObject(schema, namespace) {
         case "object":
             return getObjectTypeBySchemaObject(schema, namespace).split("\n").join("\n\t");
         default:
-            return `${namespace}.${TYPE_OVERRIDES[schema.type].rename ? TYPE_OVERRIDES[schema.type].rename : schema.type}`;
+            return `${namespace}.${TYPE_OVERRIDES[schema.type]?.rename ? TYPE_OVERRIDES[schema.type].rename : schema.type}`;
     }
 }
 function getArrayTypeBySchemaObject(schema, namespace) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasagi/schema",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "keywords": [
     "hasagi"
   ],

package/util.d.ts

@@ -6,3 +6,4 @@ export declare function getType(t: {
 } | string, namespace?: string): string;
 export declare function formatForArrayLabel(str: string): string;
 export declare function getTypeScriptName(input: string): string;
+export declare function getSwaggerTypeName(input: string): string;

package/util.js

@@ -55,3 +55,8 @@ export function getTypeScriptName(input) {
         input = TYPESCRIPT_TYPE_NAME_OVERRIDES[input];
     return input;
 }
+export function getSwaggerTypeName(input) {
+    if (TYPESCRIPT_TYPE_NAME_OVERRIDES[input])
+        input = TYPESCRIPT_TYPE_NAME_OVERRIDES[input];
+    return input;
+}