Skip to content

fix: Merge both properties and allOf in JSON schemas #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tatemz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Merge both properties and allOf in JSON schemas #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/JsonSchemaGen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ const make = Effect.gen(function* () {
) {
if ("allOf" in schema) {
const item = schema.allOf[0]
schema = Struct.omit(schema, "allOf") as any
Object.assign(schema, item)
const baseSchema = Struct.omit(schema, "allOf") as any
// Merge the schemas properly instead of overwriting
schema = mergeSchemas(baseSchema, item as any) as any
} else if ("anyOf" in schema) {
const item = schema.anyOf[0]
schema = Struct.omit(schema, "anyOf") as any
Expand Down Expand Up @@ -96,7 +97,7 @@ const make = Effect.gen(function* () {
addRefs(resolved.schema, resolved.name)
store.set(resolved.name, resolved.schema)
classes.add(resolved.name)
} else if ("properties" in schema) {
} else if ("properties" in schema && schema.properties) {
Object.entries(schema.properties).forEach(([name, s]) =>
addRefs(s, childName ? childName + identifier(name) : undefined),
)
Expand Down Expand Up @@ -138,7 +139,9 @@ const make = Effect.gen(function* () {
return identifier(root.$ref.split("/").pop()!)
} else {
addRefs(root, "properties" in root ? name : undefined)
store.set(name, root)
// If the schema has allOf, store the resolved version instead of the original
const resolvedRoot = "allOf" in root ? resolveAllOf(root, { ...root, ...context }) : root
store.set(name, resolvedRoot)
if (!asStruct) {
classes.add(name)
}
Expand Down Expand Up @@ -188,7 +191,8 @@ const make = Effect.gen(function* () {
schema: JsonSchema.JsonSchema,
): JsonSchema.JsonSchema => {
if ("allOf" in schema) {
let out = {} as JsonSchema.JsonSchema
// Start with the schema itself (excluding allOf) to preserve any direct properties
let out = Struct.omit(schema, "allOf") as JsonSchema.JsonSchema
for (const member of schema.allOf) {
let s = getSchema(member as any)
if ("allOf" in s) {
Expand Down Expand Up @@ -723,16 +727,16 @@ function mergeSchemas(
self: JsonSchema.JsonSchema,
other: JsonSchema.JsonSchema,
): JsonSchema.JsonSchema {
if ("properties" in self && "properties" in other) {
if ("properties" in self || "properties" in other) {
return {
...other,
...self,
properties: {
...other.properties,
...self.properties,
...(other as any).properties,
...(self as any).properties,
},
required: [...(other.required || []), ...(self.required || [])],
}
required: [...((other as any).required || []), ...((self as any).required || [])],
} as any
} else if ("anyOf" in self && "anyOf" in other) {
return {
...other,
Expand Down Expand Up @@ -764,10 +768,13 @@ function resolveAllOf(
if (schema.allOf.length === 0) {
return out
}
Object.assign(out, schema.allOf[0])
// Merge the schemas properly instead of overwriting
const resolvedMember = resolveAllOf(schema.allOf[0] as any, context, resolveRefs)
out = mergeSchemas(out, resolvedMember) as any
return resolveAllOf(out, context, resolveRefs)
}
let out = {} as JsonSchema.JsonSchema
// Start with the schema itself (excluding allOf) to preserve any direct properties
let out = Struct.omit(schema, "allOf") as JsonSchema.JsonSchema
for (const member of schema.allOf) {
out = mergeSchemas(out, resolveAllOf(member as any, context, resolveRefs))
}
Expand Down