@kubb/swagger-ts 2.0.0-beta.8 → 2.0.0-beta.9

package/dist/{infer.d.ts → oas.d.ts}

@@ -1,10 +1,54 @@
+import { Call, Tuples, Objects, Booleans, Strings, Pipe, Fn } from 'hotscript';
+import { Object as Object$1 } from 'ts-toolbelt';
 import { OasTypes } from '@kubb/swagger';
-import { Pipe, Tuples, Fn, Call, Objects, Booleans, Strings } from 'hotscript';
 import { JSONSchema, FromSchema } from 'json-schema-to-ts';
-import { Object as Object$1 } from 'ts-toolbelt';
 import { TupleToUnion, SplitByDelimiter } from '@kubb/types';
 
 declare namespace Checks$5 {
+    type AllOFf = {
+        allOf: any[];
+    };
+    type Object = {
+        type: 'object';
+        properties: any;
+    };
+    type Properties = {
+        properties: any;
+    };
+    type PropertiesRequired = {
+        properties: Record<string, any>;
+        required: string[];
+    };
+}
+type FixAdditionalPropertiesForAllOf<T> = T extends Checks$5.AllOFf ? Omit<T, 'allOf'> & {
+    allOf: Call<Tuples.Map<Objects.Omit<'additionalProperties'>>, T['allOf']>;
+} : T;
+type FixMissingAdditionalProperties<T> = T extends Checks$5.Object ? Omit<T, 'additionalProperties'> & {
+    additionalProperties: false;
+} : T;
+type FixMissingTypeObject<T> = T extends Checks$5.Properties ? T & {
+    type: 'object';
+} : T;
+type FixExtraRequiredFields<T> = T extends Checks$5.PropertiesRequired ? Omit<T, 'required'> & {
+    required: Call<Tuples.Filter<Booleans.Extends<keyof T['properties']>>, T['required']>;
+} : T;
+type FixJSONSchema<T> = FixAdditionalPropertiesForAllOf<FixMissingAdditionalProperties<FixMissingTypeObject<FixExtraRequiredFields<T>>>>;
+type Mutable<Type> = FixJSONSchema<{
+    -readonly [Key in keyof Type]: Mutable<Type[Key]>;
+}>;
+type RefToPath<T extends string> = T extends `#/${infer Ref}` ? Call<Strings.Split<'/'>, Ref> : never;
+type ResolveRef<TObj, TRef extends string> = {
+    $id: TRef;
+} & Object$1.Path<TObj, RefToPath<TRef>>;
+type ResolveRefInObj<T, TBase> = T extends {
+    $ref: infer Ref;
+} ? Ref extends string ? ResolveRef<TBase, Ref> : T : T;
+type ResolveRefsInObj<T, TBase = T> = {
+    [K in keyof T]: ResolveRefsInObj<ResolveRefInObj<T[K], TBase>, TBase>;
+};
+type Infer<TOAS> = Mutable<ResolveRefsInObj<TOAS>>;
+
+declare namespace Checks$4 {
     type Required = {
         required: true;
     };
@@ -36,35 +80,35 @@ interface ParamPropMap {
 type JSONSchemaTypeName = 'string' | 'number' | 'integer' | 'boolean' | 'object' | 'array' | 'null';
 type ParamObj<TParameter extends {
     name: string;
-}> = TParameter extends Checks$5.Required ? {
-    [TName in TParameter['name']]: TParameter extends Checks$5.Schemas ? FromSchema<TParameter['schema']> : TParameter extends Checks$5.Enum ? FromSchema<{
+}> = TParameter extends Checks$4.Required ? {
+    [TName in TParameter['name']]: TParameter extends Checks$4.Schemas ? FromSchema<TParameter['schema']> : TParameter extends Checks$4.Enum ? FromSchema<{
         type: TParameter['type'];
         enum: TParameter['enum'];
     }> : unknown;
 } : {
-    [TName in TParameter['name']]?: TParameter extends Checks$5.Schemas ? FromSchema<TParameter['schema']> : TParameter extends Checks$5.Enum ? FromSchema<{
+    [TName in TParameter['name']]?: TParameter extends Checks$4.Schemas ? FromSchema<TParameter['schema']> : TParameter extends Checks$4.Enum ? FromSchema<{
         type: TParameter['type'];
         enum: TParameter['enum'];
     }> : unknown;
 };
-interface ParamToRequestParam<TParameters extends Checks$5.Parameters> extends Fn {
+interface ParamToRequestParam<TParameters extends Checks$4.Parameters> extends Fn {
     return: this['arg0'] extends {
         name: string;
         in: infer TParamType;
-    } ? TParameters extends Checks$5.SingleParameter<TParamType> ? {
+    } ? TParameters extends Checks$4.SingleParameter<TParamType> ? {
         [TKey in TParamType extends keyof ParamPropMap ? ParamPropMap[TParamType] : never]: ParamObj<this['arg0']>;
     } : {
         [TKey in TParamType extends keyof ParamPropMap ? ParamPropMap[TParamType] : never]?: ParamObj<this['arg0']>;
     } : {};
 }
-type ParamMap<TParameters extends Checks$5.Parameters> = Pipe<TParameters, [
+type ParamMap<TParameters extends Checks$4.Parameters> = Pipe<TParameters, [
     Tuples.Map<ParamToRequestParam<TParameters>>,
     Tuples.ToIntersection
 ]>;
 type MethodMap<TOAS extends OasTypes.OASDocument, TPath extends keyof PathMap<TOAS>> = PathMap<TOAS>[TPath];
-type StatusMap<TOAS extends OasTypes.OASDocument, TPath extends keyof PathMap<TOAS>, TMethod extends keyof MethodMap<TOAS, TPath>> = MethodMap<TOAS, TPath>[TMethod] extends Checks$5.Responses ? MethodMap<TOAS, TPath>[TMethod]['responses'] : never;
+type StatusMap<TOAS extends OasTypes.OASDocument, TPath extends keyof PathMap<TOAS>, TMethod extends keyof MethodMap<TOAS, TPath>> = MethodMap<TOAS, TPath>[TMethod] extends Checks$4.Responses ? MethodMap<TOAS, TPath>[TMethod]['responses'] : never;
 
-declare namespace Checks$4 {
+declare namespace Checks$3 {
     type ModelWithSchemas = {
         components: {
             schemas: Record<string, JSONSchema>;
@@ -86,51 +130,7 @@ declare namespace Checks$4 {
         };
     };
 }
-type Model<TOAS extends OasTypes.OASDocument, TName extends TOAS extends Checks$4.ModelWithSchemas ? keyof TOAS['components']['schemas'] : TOAS extends Checks$4.ModelWithDefinitions ? keyof TOAS['definitions'] : never> = TOAS extends Checks$4.ModelWithSchemasNamed<TName> ? FromSchema<TOAS['components']['schemas'][TName]> : TOAS extends Checks$4.ModelWithDefinitionsNamed<TName> ? FromSchema<TOAS['definitions'][TName]> : never;
-
-declare namespace Checks$3 {
-    type AllOFf = {
-        allOf: any[];
-    };
-    type Object = {
-        type: 'object';
-        properties: any;
-    };
-    type Properties = {
-        properties: any;
-    };
-    type PropertiesRequired = {
-        properties: Record<string, any>;
-        required: string[];
-    };
-}
-type FixAdditionalPropertiesForAllOf<T> = T extends Checks$3.AllOFf ? Omit<T, 'allOf'> & {
-    allOf: Call<Tuples.Map<Objects.Omit<'additionalProperties'>>, T['allOf']>;
-} : T;
-type FixMissingAdditionalProperties<T> = T extends Checks$3.Object ? Omit<T, 'additionalProperties'> & {
-    additionalProperties: false;
-} : T;
-type FixMissingTypeObject<T> = T extends Checks$3.Properties ? T & {
-    type: 'object';
-} : T;
-type FixExtraRequiredFields<T> = T extends Checks$3.PropertiesRequired ? Omit<T, 'required'> & {
-    required: Call<Tuples.Filter<Booleans.Extends<keyof T['properties']>>, T['required']>;
-} : T;
-type FixJSONSchema<T> = FixAdditionalPropertiesForAllOf<FixMissingAdditionalProperties<FixMissingTypeObject<FixExtraRequiredFields<T>>>>;
-type Mutable<Type> = FixJSONSchema<{
-    -readonly [Key in keyof Type]: Mutable<Type[Key]>;
-}>;
-type RefToPath<T extends string> = T extends `#/${infer Ref}` ? Call<Strings.Split<'/'>, Ref> : never;
-type ResolveRef<TObj, TRef extends string> = {
-    $id: TRef;
-} & Object$1.Path<TObj, RefToPath<TRef>>;
-type ResolveRefInObj<T, TBase> = T extends {
-    $ref: infer Ref;
-} ? Ref extends string ? ResolveRef<TBase, Ref> : T : T;
-type ResolveRefsInObj<T, TBase = T> = {
-    [K in keyof T]: ResolveRefsInObj<ResolveRefInObj<T[K], TBase>, TBase>;
-};
-type Parse<TOAS> = Mutable<ResolveRefsInObj<TOAS>>;
+type Model<TOAS extends OasTypes.OASDocument, TName extends TOAS extends Checks$3.ModelWithSchemas ? keyof TOAS['components']['schemas'] : TOAS extends Checks$3.ModelWithDefinitions ? keyof TOAS['definitions'] : never> = TOAS extends Checks$3.ModelWithSchemasNamed<TName> ? FromSchema<TOAS['components']['schemas'][TName]> : TOAS extends Checks$3.ModelWithDefinitionsNamed<TName> ? FromSchema<TOAS['definitions'][TName]> : never;
 
 declare namespace Checks$2 {
     type Security = {
@@ -378,4 +378,4 @@ type ResponseSchemas<TOAS extends OasTypes.OASDocument, TPath extends keyof Path
 type JSONResponseSchema<TOAS extends OasTypes.OASDocument, TPath extends keyof PathMap<TOAS>, TMethod extends keyof MethodMap<TOAS, TPath>, TStatus extends keyof StatusMap<TOAS, TPath, TMethod>> = StatusMap<TOAS, TPath, TMethod>[TStatus] extends Checks.Content ? ResponseSchemas<TOAS, TPath, TMethod, TStatus>[keyof ResponseSchemas<TOAS, TPath, TMethod, TStatus>]['schema'] : StatusMap<TOAS, TPath, TMethod>[TStatus]['schema'];
 type Response<TOAS extends OasTypes.OASDocument, TPath extends keyof PathMap<TOAS>, TMethod extends keyof MethodMap<TOAS, TPath>, TStatusCode extends keyof StatusMap<TOAS, TPath, TMethod> = 200> = FromSchema<JSONResponseSchema<TOAS, TPath, TMethod, TStatusCode>>;
 
-export type { MethodMap, Model, Parse, PathMap, RequestParams, Response, StatusMap };
+export type { Infer, MethodMap, Model, PathMap, RequestParams, Response, StatusMap };

package/dist/{infer.js → oas.js}

@@ -2,4 +2,4 @@ import { createRequire } from 'module';
 
 createRequire(import.meta.url);
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=infer.js.map
+//# sourceMappingURL=oas.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/swagger-ts",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "Generator swagger-ts",
   "keywords": [
     "typescript",
@@ -30,8 +30,8 @@
       "require": "./dist/components.cjs",
       "default": "./dist/components.cjs"
     },
-    "./infer": {
-      "types": "./dist/infer.d.ts"
+    "./oas": {
+      "types": "./dist/oas.d.ts"
     },
     "./package.json": "./package.json",
     "./*": "./*"
@@ -46,17 +46,17 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "json-schema-to-ts": "^2.9.2",
     "hotscript": "^1.0.13",
+    "json-schema-to-ts": "^2.9.2",
     "ts-toolbelt": "^9.6.0",
-    "@kubb/core": "2.0.0-beta.8",
-    "@kubb/parser": "2.0.0-beta.8",
-    "@kubb/react": "2.0.0-beta.8",
-    "@kubb/types": "2.0.0-beta.8",
-    "@kubb/swagger": "2.0.0-beta.8"
+    "@kubb/core": "2.0.0-beta.9",
+    "@kubb/parser": "2.0.0-beta.9",
+    "@kubb/react": "2.0.0-beta.9",
+    "@kubb/swagger": "2.0.0-beta.9",
+    "@kubb/types": "2.0.0-beta.9"
   },
   "devDependencies": {
-    "@types/react": "^18.2.38",
+    "@types/react": "^18.2.39",
     "eslint": "^8.54.0",
     "expect-type": "^0.17.3",
     "react": "^18.2.0",
@@ -66,7 +66,7 @@
     "@kubb/tsup-config": "1.1.8"
   },
   "peerDependencies": {
-    "@kubb/react": "2.0.0-beta.8"
+    "@kubb/react": "2.0.0-beta.9"
   },
   "packageManager": "pnpm@8.3.0",
   "engines": {

package/src/components/Oas.tsx

@@ -25,7 +25,7 @@ function Template({
       {`export const ${name} = ${JSON.stringify(api, undefined, 2)} as const`}
       <br />
       <Type name={typeName} export>
-        {`Parse<typeof ${name}>`}
+        {`Infer<typeof ${name}>`}
       </Type>
     </>
   )
@@ -73,7 +73,7 @@ Oas.File = function({ name, typeName, templates = defaultTemplates }: FileProps)
       path={file.path}
       meta={file.meta}
     >
-      <File.Import name={['Parse']} path="@kubb/swagger-ts/infer" isTypeOnly />
+      <File.Import name={['Infer']} path="@kubb/swagger-ts/oas" isTypeOnly />
       <File.Source>
         <Oas Template={Template} name={name} typeName={typeName} />
       </File.Source>

package/src/{infer → oas}/index.ts

@@ -1,7 +1,7 @@
 // based on https://github.com/ardatan/feTS/tree/master
 
+export type { Infer } from './infer.ts'
 export type { MethodMap, PathMap, StatusMap } from './mappers.ts'
 export type { Model } from './model.ts'
-export type { Parse } from './parse.ts'
 export type { RequestParams } from './requestParams.ts'
 export type { Response } from './response.ts'

package/src/{infer/parse.ts → oas/infer.ts}

@@ -55,4 +55,4 @@ type ResolveRefsInObj<T, TBase = T> = {
   [K in keyof T]: ResolveRefsInObj<ResolveRefInObj<T[K], TBase>, TBase>
 }
 
-export type Parse<TOAS> = Mutable<ResolveRefsInObj<TOAS>>
+export type Infer<TOAS> = Mutable<ResolveRefsInObj<TOAS>>

package/src/types.ts

@@ -72,9 +72,7 @@ export type Options = {
     name?: (name: ResolveNameParams['name'], type?: ResolveNameParams['type']) => string
   }
   /**
-   * Export Oas object as Oas type with import type { Infer } from `@kubb/swagger-ts/infer`
-   * TODO add docs
-   * @beta
+   * Export an Oas object as Oas type with `import type { Infer } from '@kubb/swagger-ts/oas'`
    */
   oasType?: boolean
 }
@@ -104,4 +102,4 @@ declare module '@kubb/core' {
   }
 }
 // external packages
-export * as Infer from './infer/index.ts'
+export * as Oas from './oas/index.ts'