@hasagi/schema 0.6.2 → 0.6.4

package/openapi/generate-openapi-v3.js

@@ -50,7 +50,7 @@ function getType(input) {
         case "object":
             return { type: "object", additionalProperties: true };
         case "":
-            return { type: "object", additionalProperties: true };
+            return undefined; //
         default:
             return { $ref: `#/components/schemas/${type}` };
     }
@@ -191,7 +191,8 @@ function endpointToOperation(endpoint, schema) {
     }
     else if (endpoint.method === "GET" || endpoint.method === "DELETE" || endpoint.method === "HEAD" || endpoint.method === "OPTIONS" || endpoint.method === "TRACE") {
         const params = endpoint.arguments.slice(parameters.length).flatMap(arg => {
-            const type = getType(arg);
+            console.log(arg);
+            const type = getType(arg) ?? { type: "object", additionalProperties: true };
             if ("$ref" in type) {
                 const schemaObject = schema.components.schemas[type.$ref.split("/").at(-1)];
                 if (schemaObject.properties)

package/openapi/openapi-schema.js

@@ -1,4 +1,4 @@
-import { formatFieldName, formatForArrayLabel } from "../util.js";
+import { formatFieldName, formatForArrayLabel, getTypeScriptName } from "../util.js";
 const DEFAULT_TYPES = `export type LCUEndpoint<Method extends HttpMethod, Path extends EndpointsWithMethod<Method>> = (...args: [...(Path extends keyof LCUEndpoints ? Method extends keyof LCUEndpoints[Path] ? "path" extends keyof LCUEndpoints[Path][Method] ? LCUEndpoints[Path][Method]["path"] extends never ? [] : LCUEndpoints[Path][Method]["path"] : [] : [] : []), ...(LCUEndpointBodyType<Method, Path> extends never ? (LCUEndpointParams<Method, Path> extends never ? [] : {} extends LCUEndpointParams<Method, Path> ? [data?: LCUEndpointParams<Method, Path>] : [data: LCUEndpointParams<Method, Path>]) : [data: LCUEndpointBodyType<Method, Path>])]) => Promise<LCUEndpointResponseType<Method, Path>>
 export type LCUEndpointResponseType<Method extends string, Path extends string> = Path extends keyof LCUEndpoints ? Method extends keyof LCUEndpoints[Path] ? "response" extends keyof LCUEndpoints[Path][Method] ? LCUEndpoints[Path][Method]["response"] : unknown : unknown : unknown;
 export type LCUEndpointBodyType<Method extends string, Path extends string> = Path extends keyof LCUEndpoints ? Method extends keyof LCUEndpoints[Path] ? "body" extends keyof LCUEndpoints[Path][Method] ? LCUEndpoints[Path][Method]["body"] : unknown : unknown : unknown;
@@ -31,6 +31,7 @@ export default class OpenAPISchema {
         if (this.components?.schemas === undefined)
             return [];
         return Object.entries(this.components.schemas).map(([name, schema]) => {
+            name = getTypeScriptName(name);
             if (TYPE_OVERRIDES[name] && TYPE_OVERRIDES[name].definition)
                 return `export ${TYPE_OVERRIDES[TYPE_OVERRIDES[name].rename ?? name].definition}`.replaceAll("{{namespace}}", namespace !== undefined ? `${namespace}.` : "");
             if ("$ref" in schema) {
@@ -111,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}` ?? "unknown";
+            return `${namespace}.${TYPE_OVERRIDES[schema.type].rename ? TYPE_OVERRIDES[schema.type].rename : schema.type}`;
     }
 }
 function getArrayTypeBySchemaObject(schema, namespace) {

package/overrides.d.ts

@@ -1,2 +1,3 @@
 import { Endpoint } from "./get-extended-help.js";
 export declare const EXTENDED_HELP_FUNCTION_OVERRIDES: Record<string, Partial<Endpoint>>;
+export declare const TYPESCRIPT_TYPE_NAME_OVERRIDES: Record<string, string>;

package/overrides.js

@@ -59,3 +59,8 @@ export const EXTENDED_HELP_FUNCTION_OVERRIDES = {
         tags: ["riotclient"]
     }
 };
+export const TYPESCRIPT_TYPE_NAME_OVERRIDES = {
+    "LolMissionsCapMissionSeries": "LolMissionsCAPMissionSeries",
+    "LolObjectivesCapMissionSeries": "LolObjectivesCAPMissionSeries",
+    "LolTftEventCapMissionSeries": "LolTftEventCAPMissionSeries"
+};

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hasagi/schema",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "keywords": [
     "hasagi"
   ],
   "author": "dysolix",
   "license": "MIT",
   "dependencies": {
-    "@hasagi/core": "^0.5.12",
+    "@hasagi/core": "^0.6.3",
     "axios": "^1.7.9"
   },
   "exports": {

package/util.d.ts

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

package/util.js

@@ -1,4 +1,5 @@
 import fs from "fs/promises";
+import { TYPESCRIPT_TYPE_NAME_OVERRIDES } from "./overrides";
 function requiresQuotes(fieldName) {
     return fieldName.includes("-") || /\d/.test(fieldName);
 }
@@ -48,6 +49,9 @@ export function formatForArrayLabel(str) {
 function kebabCaseToCamelCase(str) {
     return str.replace(/-([a-z])/g, g => g[1].toUpperCase());
 }
-export function sanitizeTypeScriptName(input) {
-    return input.replaceAll("-", "_");
+export function getTypeScriptName(input) {
+    input = input.replaceAll("-", "_");
+    if (TYPESCRIPT_TYPE_NAME_OVERRIDES[input])
+        input = TYPESCRIPT_TYPE_NAME_OVERRIDES[input];
+    return input;
 }