@contember/schema-utils
Advanced tools
Comparing version 1.1.0-alpha.8 to 1.1.0-beta.0
@@ -75,2 +75,5 @@ "use strict"; | ||
const oneHasOneOwningRelationSchemaCheck = true; | ||
const eventLogSchema = Typesafe.coalesce(Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), { enabled: true }); | ||
const manyHasManyOwningRelationSchema = Typesafe.intersection(Typesafe.object({ | ||
@@ -84,5 +87,3 @@ type: Typesafe.literal(schema_1.Model.RelationType.ManyHasMany), | ||
inverseJoiningColumn: joiningColumnSchema, | ||
eventLog: Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), | ||
eventLog: eventLogSchema, | ||
}), | ||
@@ -121,3 +122,3 @@ }), Typesafe.partial({ | ||
const columnSchemaCheck = true; | ||
const fieldSchema = Typesafe.union(oneHasOneInverseRelationSchema, oneHasOneOwningRelationSchema, oneHasManyRelationSchema, manyHasOneRelationSchema, manyHasManyInverseRelationSchema, manyHasManyOwningRelationSchema, columnSchema); | ||
const fieldSchema = Typesafe.discriminatedUnion('type', oneHasOneInverseRelationSchema, oneHasOneOwningRelationSchema, oneHasManyRelationSchema, manyHasOneRelationSchema, manyHasManyInverseRelationSchema, manyHasManyOwningRelationSchema, columnSchema); | ||
const viewSchemaInner = Typesafe.intersection(Typesafe.object({ | ||
@@ -140,5 +141,3 @@ sql: Typesafe.string, | ||
})), | ||
eventLog: Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), | ||
eventLog: eventLogSchema, | ||
}), Typesafe.partial({ | ||
@@ -145,0 +144,0 @@ view: viewSchema, |
{ | ||
"name": "@contember/schema-utils", | ||
"version": "1.1.0-alpha.8", | ||
"version": "1.1.0-beta.0", | ||
"license": "Apache-2.0", | ||
@@ -11,4 +11,4 @@ "main": "dist/src/index.js", | ||
"dependencies": { | ||
"@contember/schema": "^1.1.0-alpha.8", | ||
"@contember/typesafe": "^1.1.0-alpha.8" | ||
"@contember/schema": "^1.1.0-beta.0", | ||
"@contember/typesafe": "^1.1.0-beta.0" | ||
}, | ||
@@ -15,0 +15,0 @@ "devDependencies": { |
@@ -66,2 +66,6 @@ import * as Typesafe from '@contember/typesafe' | ||
const eventLogSchema = Typesafe.coalesce(Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), { enabled: true }) as Typesafe.Type<{ readonly enabled: boolean }> | ||
const manyHasManyOwningRelationSchema = Typesafe.intersection( | ||
@@ -76,5 +80,3 @@ Typesafe.object({ | ||
inverseJoiningColumn: joiningColumnSchema, | ||
eventLog: Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), | ||
eventLog: eventLogSchema, | ||
}), | ||
@@ -128,3 +130,4 @@ }), | ||
const fieldSchema: Typesafe.Type<Model.AnyField> = Typesafe.union( | ||
const fieldSchema: Typesafe.Type<Model.AnyField> = Typesafe.discriminatedUnion( | ||
'type', | ||
oneHasOneInverseRelationSchema, | ||
@@ -161,5 +164,3 @@ oneHasOneOwningRelationSchema, | ||
})), | ||
eventLog: Typesafe.object({ | ||
enabled: Typesafe.boolean, | ||
}), | ||
eventLog: eventLogSchema, | ||
}), | ||
@@ -166,0 +167,0 @@ Typesafe.partial({ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
234797
3469