json-schema-to-ts
Advanced tools
Comparing version 0.1.4 to 0.1.5
{ | ||
"name": "json-schema-to-ts", | ||
"version": "0.1.4", | ||
"version": "0.1.5", | ||
"description": "Infer typescript types from your JSON schemas!", | ||
@@ -5,0 +5,0 @@ "main": "src/index.ts", |
import { FromWriteableSchema } from "./index"; | ||
import { ObjectSchema, Schema } from "./schema"; | ||
import { Merge } from "./utils"; | ||
import { MergeRight } from "./utils"; | ||
@@ -8,3 +8,3 @@ export type FromObjectSchema<S> = S extends ObjectSchema | ||
? number extends keyof S["required"] | ||
? Merge< | ||
? MergeRight< | ||
{ | ||
@@ -11,0 +11,0 @@ [key in Exclude< |
@@ -1,2 +0,2 @@ | ||
import { Merge } from "./utils"; | ||
import { MergeRight } from "./utils"; | ||
@@ -13,3 +13,3 @@ type CommonProps = { | ||
type MakeSchema<SpecificProps = {}> = Merge<CommonProps, SpecificProps>; | ||
type MakeSchema<SpecificProps = {}> = MergeRight<CommonProps, SpecificProps>; | ||
@@ -16,0 +16,0 @@ export type NullSchema = MakeSchema<{ |
@@ -7,4 +7,4 @@ export { Head } from "./head"; | ||
export { ShortenReversed } from "./shorten"; | ||
export { Merge } from "./merge"; | ||
export { MergeRight } from "./merge"; | ||
export { Writeable } from "./writeable"; | ||
export { DoesExtend, DoesBothExtend } from "./extends"; |
14918
20
300