fix(types): Add looser types to input schema (#61)

* fix(types): Add looser types to input schema * fix(types): Add looser types to input schema
openapi-contrib · Apr 4, 2023 · 28686f4 · 28686f4
1 parent e21a5bf
commit 28686f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,10 +1,12 @@
 import deepEqual from "fast-deep-equal";
 import { fromSchema, fromParameter } from "./lib/convert";
-import type { Options, OptionsInternal, OpenAPI3 } from "./openapi-schema-types";
+import type { Options, OptionsInternal } from "./openapi-schema-types";
 import { NOT_SUPPORTED, STRUCTS } from "./consts";
 import type { JSONSchema4 } from "json-schema";
 import type { ParameterObject, ResponseObject } from "openapi-typescript/src/types";
 import { cloneDeep } from "./lib/utils/cloneDeep";
+import type { AcceptibleInputSchema } from "./openapi-schema-types";
+
 const patternPropertiesHandler = (schema) => {
   let pattern;
   const patternsObj = schema.patternProperties;
@@ -56,7 +58,10 @@ const resolveOptions = (_options?: Options): OptionsInternal => {
   return options;
 };
 
-const openapiSchemaToJsonSchema = <T extends OpenAPI3 = OpenAPI3>(schema: T, options?: Options): JSONSchema4 => {
+const openapiSchemaToJsonSchema = <T extends AcceptibleInputSchema = AcceptibleInputSchema>(
+  schema: T,
+  options?: Options,
+): JSONSchema4 => {
   const optionsInternal = resolveOptions(options);
   return fromSchema<T>(schema, optionsInternal);
 };

diff --git a/src/lib/converters/schema.ts b/src/lib/converters/schema.ts
@@ -8,9 +8,13 @@ import type { PatternPropertiesHandler } from "../../openapi-schema-types";
 import type { OpenAPI3 } from "openapi-typescript";
 import type { ReferenceObject } from "openapi-typescript/src/types";
 import { cloneDeep } from "../utils/cloneDeep";
+import type { AcceptibleInputSchema } from "../../openapi-schema-types";
 
 // Convert from OpenAPI 3.0 `SchemaObject` to JSON schema v4
-function convertFromSchema<T extends OpenAPI3 = OpenAPI3>(schema: T, options: OptionsInternal): JSONSchema4 {
+function convertFromSchema<T extends AcceptibleInputSchema = AcceptibleInputSchema>(
+  schema: T,
+  options: OptionsInternal,
+): JSONSchema4 {
   const newSchema = convertSchema(schema, options);
   (<JSONSchema4>newSchema).$schema = "http://json-schema.org/draft-04/schema#";
   return newSchema;

diff --git a/src/openapi-schema-types.ts b/src/openapi-schema-types.ts
@@ -6,6 +6,7 @@ import type { JSONSchema4 } from "json-schema";
 export type { OpenAPI3 };
 // We don't know what the shape of the object looks like when it's passed in, but we know its some mix of these two
 export type PatternPropertiesHandler = (schema: SchemaObject) => SchemaObject;
+export type AcceptibleInputSchema = SchemaObject | OpenAPI3 | Record<string, any>;
 
 export interface Options {
   dateToDateTime?: boolean;