@contember/schema-definition 1.2.0-alpha.9 → 1.2.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/acl/builder/EntitySelector.d.ts +1 -1
- package/dist/src/acl/builder/EntitySelector.d.ts.map +1 -1
- package/dist/src/acl/builder/EntitySelector.js +2 -2
- package/dist/src/acl/builder/EntitySelector.js.map +1 -1
- package/dist/src/acl/definition/internal/AclFactory.d.ts.map +1 -1
- package/dist/src/acl/definition/internal/AclFactory.js +1 -0
- package/dist/src/acl/definition/internal/AclFactory.js.map +1 -1
- package/dist/src/acl/definition/internal/EntityPredicateResolver.d.ts.map +1 -1
- package/dist/src/acl/definition/internal/EntityPredicateResolver.js +15 -8
- package/dist/src/acl/definition/internal/EntityPredicateResolver.js.map +1 -1
- package/dist/src/acl/definition/roles.d.ts +4 -6
- package/dist/src/acl/definition/roles.d.ts.map +1 -1
- package/dist/src/acl/definition/variables.d.ts +4 -4
- package/dist/src/acl/definition/variables.d.ts.map +1 -1
- package/dist/src/acl/definition/variables.js +5 -5
- package/dist/src/acl/definition/variables.js.map +1 -1
- package/dist/src/createSchema.d.ts.map +1 -1
- package/dist/src/createSchema.js +2 -1
- package/dist/src/createSchema.js.map +1 -1
- package/dist/src/model/builder/SchemaBuilder.d.ts +1 -1
- package/dist/src/model/builder/SchemaBuilder.d.ts.map +1 -1
- package/dist/src/model/builder/SchemaBuilder.js +2 -2
- package/dist/src/model/builder/SchemaBuilder.js.map +1 -1
- package/dist/src/model/builder/SchemaBuilderInternal.d.ts +1 -1
- package/dist/src/model/builder/SchemaBuilderInternal.d.ts.map +1 -1
- package/dist/src/model/builder/internal/ColumnProcessor.d.ts +1 -1
- package/dist/src/model/builder/internal/ColumnProcessor.d.ts.map +1 -1
- package/dist/src/model/builder/internal/ColumnProcessor.js +2 -2
- package/dist/src/model/builder/internal/ColumnProcessor.js.map +1 -1
- package/dist/src/model/builder/internal/ManyHasManyProcessor.d.ts +1 -1
- package/dist/src/model/builder/internal/ManyHasManyProcessor.d.ts.map +1 -1
- package/dist/src/model/builder/internal/ManyHasOneProcessor.d.ts +1 -1
- package/dist/src/model/builder/internal/ManyHasOneProcessor.d.ts.map +1 -1
- package/dist/src/model/builder/internal/OneHasManyProcessor.d.ts +1 -1
- package/dist/src/model/builder/internal/OneHasManyProcessor.d.ts.map +1 -1
- package/dist/src/model/builder/internal/OneHasOneProcessor.d.ts +1 -1
- package/dist/src/model/builder/internal/OneHasOneProcessor.d.ts.map +1 -1
- package/dist/src/model/definition/ViewDefinition.js +2 -2
- package/dist/src/model/definition/ViewDefinition.js.map +1 -1
- package/dist/src/model/definition/extensions.d.ts +6 -1
- package/dist/src/model/definition/extensions.d.ts.map +1 -1
- package/dist/src/model/definition/extensions.js.map +1 -1
- package/dist/src/model/definition/fieldDefinitions/ColumnDefinition.d.ts +1 -1
- package/dist/src/model/definition/fieldDefinitions/ColumnDefinition.d.ts.map +1 -1
- package/dist/src/model/definition/fieldDefinitions/ColumnDefinition.js +3 -3
- package/dist/src/model/definition/fieldDefinitions/ColumnDefinition.js.map +1 -1
- package/dist/src/model/definition/fieldDefinitions/FieldDefinition.d.ts +1 -1
- package/dist/src/model/definition/fieldDefinitions/FieldDefinition.d.ts.map +1 -1
- package/dist/src/model/definition/index.d.ts.map +1 -1
- package/dist/src/model/definition/index.js +2 -2
- package/dist/src/model/definition/index.js.map +1 -1
- package/dist/src/model/definition/internal/SchemaBuilder.d.ts +1 -1
- package/dist/src/model/definition/internal/SchemaBuilder.d.ts.map +1 -1
- package/dist/src/model/definition/internal/SchemaBuilder.js +8 -1
- package/dist/src/model/definition/internal/SchemaBuilder.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/unit/extendEntity.test.d.ts +2 -0
- package/dist/tests/unit/extendEntity.test.d.ts.map +1 -0
- package/dist/tests/unit/extendEntity.test.js +42 -0
- package/dist/tests/unit/extendEntity.test.js.map +1 -0
- package/dist/tests/unit/readAclDefinitions.test.js +91 -0
- package/dist/tests/unit/readAclDefinitions.test.js.map +1 -1
- package/package.json +3 -3
- package/src/acl/builder/EntitySelector.ts +2 -2
- package/src/acl/definition/internal/AclFactory.ts +1 -0
- package/src/acl/definition/internal/EntityPredicateResolver.ts +13 -7
- package/src/acl/definition/roles.ts +6 -6
- package/src/acl/definition/variables.ts +6 -5
- package/src/createSchema.ts +2 -1
- package/src/model/builder/SchemaBuilder.ts +1 -1
- package/src/model/builder/SchemaBuilderInternal.ts +1 -1
- package/src/model/builder/internal/ColumnProcessor.ts +2 -3
- package/src/model/builder/internal/ManyHasManyProcessor.ts +1 -1
- package/src/model/builder/internal/ManyHasOneProcessor.ts +1 -1
- package/src/model/builder/internal/OneHasManyProcessor.ts +1 -1
- package/src/model/builder/internal/OneHasOneProcessor.ts +1 -1
- package/src/model/definition/ViewDefinition.ts +2 -2
- package/src/model/definition/extensions.ts +7 -1
- package/src/model/definition/fieldDefinitions/ColumnDefinition.ts +4 -4
- package/src/model/definition/fieldDefinitions/FieldDefinition.ts +1 -1
- package/src/model/definition/index.ts +1 -1
- package/src/model/definition/internal/SchemaBuilder.ts +9 -3
- package/tests/unit/extendEntity.test.ts +42 -0
- package/tests/unit/readAclDefinitions.test.ts +92 -0
- package/dist/src/model/definition/NamingConventions.d.ts +0 -17
- package/dist/src/model/definition/NamingConventions.d.ts.map +0 -1
- package/dist/src/model/definition/NamingConventions.js +0 -29
- package/dist/src/model/definition/NamingConventions.js.map +0 -1
- package/dist/src/model/utils/getColumnType.d.ts +0 -3
- package/dist/src/model/utils/getColumnType.d.ts.map +0 -1
- package/dist/src/model/utils/getColumnType.js +0 -29
- package/dist/src/model/utils/getColumnType.js.map +0 -1
- package/dist/src/model/utils/index.d.ts +0 -2
- package/dist/src/model/utils/index.d.ts.map +0 -1
- package/dist/src/model/utils/index.js +0 -18
- package/dist/src/model/utils/index.js.map +0 -1
- package/src/model/definition/NamingConventions.ts +0 -53
- package/src/model/utils/getColumnType.ts +0 -25
- package/src/model/utils/index.ts +0 -1
|
@@ -6,7 +6,7 @@ export default class EntitySelector {
|
|
|
6
6
|
static every(): EntitySelector;
|
|
7
7
|
static named(...name: string[]): EntitySelector;
|
|
8
8
|
named(...name: string[]): EntitySelector;
|
|
9
|
-
havingRelation(name: string,
|
|
9
|
+
havingRelation(name: string, targetEntityName?: string): EntitySelector;
|
|
10
10
|
matching(matcher: Matcher): EntitySelector;
|
|
11
11
|
matches(schema: Model.Schema, entity: Model.Entity): boolean;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntitySelector.d.ts","sourceRoot":"","sources":["../../../../src/acl/builder/EntitySelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGzC,aAAK,OAAO,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,OAAO,CAAA;AAEtE,MAAM,CAAC,OAAO,OAAO,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAA7C,OAAO;WAEO,KAAK;WAIL,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;IAIvB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"EntitySelector.d.ts","sourceRoot":"","sources":["../../../../src/acl/builder/EntitySelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGzC,aAAK,OAAO,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,OAAO,CAAA;AAEtE,MAAM,CAAC,OAAO,OAAO,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAA7C,OAAO;WAEO,KAAK;WAIL,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;IAIvB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM;IAWtD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc;IAI1C,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO;CAGnE"}
|
|
@@ -14,11 +14,11 @@ class EntitySelector {
|
|
|
14
14
|
named(...name) {
|
|
15
15
|
return this.matching((schema, entity) => name.includes(entity.name));
|
|
16
16
|
}
|
|
17
|
-
havingRelation(name,
|
|
17
|
+
havingRelation(name, targetEntityName) {
|
|
18
18
|
return this.matching((schema, entity) => entity.fields[name] &&
|
|
19
19
|
(0, schema_utils_1.acceptFieldVisitor)(schema, entity, name, {
|
|
20
20
|
visitColumn: () => false,
|
|
21
|
-
visitRelation: ({
|
|
21
|
+
visitRelation: ({ targetEntity }) => !targetEntityName || targetEntity.name === targetEntityName,
|
|
22
22
|
}));
|
|
23
23
|
}
|
|
24
24
|
matching(matcher) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntitySelector.js","sourceRoot":"","sources":["../../../../src/acl/builder/EntitySelector.ts"],"names":[],"mappings":";;AACA,0DAA4D;AAI5D,MAAqB,cAAc;IAClC,YAAqC,QAAmB;QAAnB,aAAQ,GAAR,QAAQ,CAAW;IAAG,CAAC;IAErD,MAAM,CAAC,KAAK;QAClB,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAc;QACpC,OAAO,cAAc,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,GAAG,IAAc;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IACrE,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"EntitySelector.js","sourceRoot":"","sources":["../../../../src/acl/builder/EntitySelector.ts"],"names":[],"mappings":";;AACA,0DAA4D;AAI5D,MAAqB,cAAc;IAClC,YAAqC,QAAmB;QAAnB,aAAQ,GAAR,QAAQ,CAAW;IAAG,CAAC;IAErD,MAAM,CAAC,KAAK;QAClB,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAc;QACpC,OAAO,cAAc,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,GAAG,IAAc;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IACrE,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,gBAAyB;QAC5D,OAAO,IAAI,CAAC,QAAQ,CACnB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAClB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,IAAA,iCAAkB,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;gBACxC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;gBACxB,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,gBAAgB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB;aAChG,CAAC,CACH,CAAA;IACF,CAAC;IAEM,QAAQ,CAAC,OAAgB;QAC/B,OAAO,IAAI,cAAc,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC;IAEM,OAAO,CAAC,MAAoB,EAAE,MAAoB;QACxD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAU,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;IACnG,CAAC;CACD;AAjCD,iCAiCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AclFactory.d.ts","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/AclFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAOhD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAI/B,qBAAa,UAAU;IAErB,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAIrB,MAAM,CACZ,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACtC,GAAG,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"AclFactory.d.ts","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/AclFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAOhD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAI/B,qBAAa,UAAU;IAErB,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAIrB,MAAM,CACZ,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACtC,GAAG,CAAC,MAAM;IAuBb,OAAO,CAAC,iBAAiB;IAuCzB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,MAAM,CAAC,gBAAgB;CA8B/B;AAGD,oBAAY,iBAAiB,GAAG;IAAE,WAAW,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;IAAC,kBAAkB,EAAE,OAAO,CAAA;CAAE,CAAA;AACpG,oBAAY,mBAAmB,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAChE,oBAAY,0BAA0B,GAAG,GAAG,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AclFactory.js","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/AclFactory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AclFactory.js","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/AclFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityPredicateResolver.d.ts","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/EntityPredicateResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAS,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAMlD,qBAAa,wBAAwB;IAInC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,cAAc;IANvB,OAAO,CAAC,cAAc,CAAe;IAErC,OAAO;WAQO,MAAM,CACnB,eAAe,EAAE,mBAAmB,EACpC,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,MAAM,EAAE,KAAK,CAAC,MAAM,GAClB,wBAAwB;IAsC3B,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"EntityPredicateResolver.d.ts","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/EntityPredicateResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAS,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAMlD,qBAAa,wBAAwB;IAInC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,cAAc;IANvB,OAAO,CAAC,cAAc,CAAe;IAErC,OAAO;WAQO,MAAM,CACnB,eAAe,EAAE,mBAAmB,EACpC,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,MAAM,EAAE,KAAK,CAAC,MAAM,GAClB,wBAAwB;IAsC3B,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM;IAoC3G,iBAAiB,IAAI,GAAG,CAAC,YAAY;IAKrC,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA+C/B,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAc/B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EntityPredicatesResolver = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_util_1 = require("node:util");
|
|
5
5
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
6
6
|
const createPredicateName_1 = require("./createPredicateName");
|
|
7
7
|
const references_1 = require("../references");
|
|
@@ -70,12 +70,19 @@ class EntityPredicatesResolver {
|
|
|
70
70
|
return predicateNames[0];
|
|
71
71
|
}
|
|
72
72
|
const predicate = { or: predicateNames.map(it => this.predicates[it]) };
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
73
|
+
const origName = predicateNames.every(it => this.generatedNames.has(it)) ? (0, createPredicateName_1.createPredicateName)(predicate) : predicateNames.join('_or_');
|
|
74
|
+
let predicateName = origName;
|
|
75
|
+
for (let i = 1;; i++) {
|
|
76
|
+
if (!(predicateName in this.predicates)) {
|
|
77
|
+
this.predicates[predicateName] = predicate;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
else if ((0, node_util_1.isDeepStrictEqual)(predicate, this.predicates[predicateName])) {
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
predicateName = `${origName}_${i}`;
|
|
85
|
+
}
|
|
79
86
|
}
|
|
80
87
|
this.usedPredicates.push(predicateName);
|
|
81
88
|
return predicateName;
|
|
@@ -111,7 +118,7 @@ class EntityPredicatesResolver {
|
|
|
111
118
|
return { [ctx.targetEntity.primary]: { never: true } };
|
|
112
119
|
}
|
|
113
120
|
if (whens.includes(true)) {
|
|
114
|
-
return { [ctx.targetEntity.primary]: {
|
|
121
|
+
return { [ctx.targetEntity.primary]: { isNull: false } };
|
|
115
122
|
}
|
|
116
123
|
const predicates = whens.map(it => EntityPredicatesResolver.resolvePredicate(model, ctx.targetEntity, it, rolePermissionsByEntity));
|
|
117
124
|
if (predicates.length > 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityPredicateResolver.js","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/EntityPredicateResolver.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"EntityPredicateResolver.js","sourceRoot":"","sources":["../../../../../src/acl/definition/internal/EntityPredicateResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { Acl } from '@contember/schema';
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
system?: Acl.SystemPermissions;
|
|
6
|
-
}
|
|
1
|
+
import { Acl, JSONValue } from '@contember/schema';
|
|
2
|
+
export declare type RoleOptions = Omit<Acl.BaseRolePermissions, 'variables' | 'entities' | 'inherits'> & {
|
|
3
|
+
readonly [key: string]: JSONValue;
|
|
4
|
+
};
|
|
7
5
|
export declare class Role<Name extends string = string> {
|
|
8
6
|
readonly name: Name;
|
|
9
7
|
readonly options: RoleOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../../src/acl/definition/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../../src/acl/definition/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAElD,oBAAY,WAAW,GACpB,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,CAAC,GACpE;IACD,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CACjC,CAAA;AAEF,qBAAa,IAAI,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM;aAE5B,IAAI,EAAE,IAAI;aACV,OAAO,EAAE,WAAW;gBADpB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,WAAW;CAGrC;AAED,eAAO,MAAM,UAAU,8CAA8C,WAAW,eAE/E,CAAA"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Role } from './roles';
|
|
2
|
-
import { Acl } from '@contember/schema';
|
|
2
|
+
import { Acl, Input } from '@contember/schema';
|
|
3
3
|
export declare class VariableDefinition<Name extends string = string, Roles extends Role<string> = Role<string>, Variable extends Acl.Variable = Acl.Variable> {
|
|
4
4
|
readonly name: Name;
|
|
5
5
|
readonly roles: Roles[];
|
|
6
6
|
readonly variable: Acl.Variable;
|
|
7
7
|
constructor(name: Name, roles: Roles[], variable: Acl.Variable);
|
|
8
8
|
}
|
|
9
|
-
export declare const createEntityVariable: <R extends Role<string>, Name extends string>(name: Name, entityName: string, roles: R | R[]) => VariableDefinition<Name, R, Acl.EntityVariable>;
|
|
10
|
-
export declare const createPredefinedVariable: <R extends Role<string>, Name extends string>(name: Name, value: Acl.PredefinedVariableValue, roles: R | R[]) => VariableDefinition<Name, R, Acl.EntityVariable>;
|
|
11
|
-
export declare const createConditionVariable: <R extends Role<string>, Name extends string>(name: Name, roles: R | R[]) => VariableDefinition<Name, R, Acl.ConditionVariable>;
|
|
9
|
+
export declare const createEntityVariable: <R extends Role<string>, Name extends string>(name: Name, entityName: string, roles: R | R[], fallback?: Input.Condition) => VariableDefinition<Name, R, Acl.EntityVariable>;
|
|
10
|
+
export declare const createPredefinedVariable: <R extends Role<string>, Name extends string>(name: Name, value: Acl.PredefinedVariableValue, roles: R | R[], fallback?: Input.Condition) => VariableDefinition<Name, R, Acl.EntityVariable>;
|
|
11
|
+
export declare const createConditionVariable: <R extends Role<string>, Name extends string>(name: Name, roles: R | R[], fallback?: Input.Condition) => VariableDefinition<Name, R, Acl.ConditionVariable>;
|
|
12
12
|
//# sourceMappingURL=variables.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../src/acl/definition/variables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../src/acl/definition/variables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,qBAAa,kBAAkB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,SAAS,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ;aAEnI,IAAI,EAAE,IAAI;aACV,KAAK,EAAE,KAAK,EAAE;aACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBAFtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EAAE,EACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;CAGvC;AAED,eAAO,MAAM,oBAAoB,wEAEpB,MAAM,6BAEP,MAAM,SAAS,oDAO1B,CAAA;AAED,eAAO,MAAM,wBAAwB,mEAE7B,IAAI,uBAAuB,6BAEvB,MAAM,SAAS,oDAO1B,CAAA;AAED,eAAO,MAAM,uBAAuB,uFAGxB,MAAM,SAAS,uDAO1B,CAAA"}
|
|
@@ -10,16 +10,16 @@ class VariableDefinition {
|
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
exports.VariableDefinition = VariableDefinition;
|
|
13
|
-
const createEntityVariable = (name, entityName, roles) => {
|
|
14
|
-
return new VariableDefinition(name, Array.isArray(roles) ? roles : [roles], { type: schema_1.Acl.VariableType.entity, entityName });
|
|
13
|
+
const createEntityVariable = (name, entityName, roles, fallback) => {
|
|
14
|
+
return new VariableDefinition(name, Array.isArray(roles) ? roles : [roles], { type: schema_1.Acl.VariableType.entity, entityName, ...(fallback ? { fallback } : {}) });
|
|
15
15
|
};
|
|
16
16
|
exports.createEntityVariable = createEntityVariable;
|
|
17
|
-
const createPredefinedVariable = (name, value, roles) => {
|
|
17
|
+
const createPredefinedVariable = (name, value, roles, fallback) => {
|
|
18
18
|
return new VariableDefinition(name, Array.isArray(roles) ? roles : [roles], { type: schema_1.Acl.VariableType.predefined, value });
|
|
19
19
|
};
|
|
20
20
|
exports.createPredefinedVariable = createPredefinedVariable;
|
|
21
|
-
const createConditionVariable = (name, roles) => {
|
|
22
|
-
return new VariableDefinition(name, Array.isArray(roles) ? roles : [roles], { type: schema_1.Acl.VariableType.condition });
|
|
21
|
+
const createConditionVariable = (name, roles, fallback) => {
|
|
22
|
+
return new VariableDefinition(name, Array.isArray(roles) ? roles : [roles], { type: schema_1.Acl.VariableType.condition, ...(fallback ? { fallback } : {}) });
|
|
23
23
|
};
|
|
24
24
|
exports.createConditionVariable = createConditionVariable;
|
|
25
25
|
//# sourceMappingURL=variables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../src/acl/definition/variables.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../src/acl/definition/variables.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AAE9C,MAAa,kBAAkB;IAC9B,YACiB,IAAU,EACV,KAAc,EACd,QAAsB;QAFtB,SAAI,GAAJ,IAAI,CAAM;QACV,UAAK,GAAL,KAAK,CAAS;QACd,aAAQ,GAAR,QAAQ,CAAc;IAEvC,CAAC;CACD;AAPD,gDAOC;AAEM,MAAM,oBAAoB,GAAG,CACnC,IAAU,EACV,UAAkB,EAClB,KAAc,EACd,QAA0B,EACwB,EAAE;IACpD,OAAO,IAAI,kBAAkB,CAC5B,IAAI,EACJ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EACtC,EAAE,IAAI,EAAE,YAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAChF,CAAA;AACF,CAAC,CAAA;AAXY,QAAA,oBAAoB,wBAWhC;AAEM,MAAM,wBAAwB,GAAG,CACvC,IAAU,EACV,KAAkC,EAClC,KAAc,EACd,QAA0B,EACwB,EAAE;IACpD,OAAO,IAAI,kBAAkB,CAC5B,IAAI,EACJ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EACtC,EAAE,IAAI,EAAE,YAAG,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,EAAE,CAC5C,CAAA;AACF,CAAC,CAAA;AAXY,QAAA,wBAAwB,4BAWpC;AAEM,MAAM,uBAAuB,GAAG,CACtC,IAAU,EACV,KAAc,EACd,QAA0B,EAC2B,EAAE;IACvD,OAAO,IAAI,kBAAkB,CAC5B,IAAI,EACJ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EACtC,EAAE,IAAI,EAAE,YAAG,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CACvE,CAAA;AACF,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSchema.d.ts","sourceRoot":"","sources":["../../src/createSchema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"createSchema.d.ts","sourceRoot":"","sources":["../../src/createSchema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,eAAO,MAAM,YAAY,gBAAiB,OAAO,MAAM,EAAE,GAAG,CAAC,6BAA4B,MAAM,KAAK,MAAM,kBAAG,MAM5G,CAAA"}
|
package/dist/src/createSchema.js
CHANGED
|
@@ -4,11 +4,12 @@ exports.createSchema = void 0;
|
|
|
4
4
|
const model_1 = require("./model");
|
|
5
5
|
const InputValidation = require("./validation");
|
|
6
6
|
const AclDefinition = require("./acl/definition");
|
|
7
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
7
8
|
const createSchema = (definitions, modifyCallback) => {
|
|
8
9
|
const model = model_1.SchemaDefinition.createModel(definitions);
|
|
9
10
|
const validation = InputValidation.parseDefinition(definitions);
|
|
10
11
|
const acl = AclDefinition.createAcl(definitions, model);
|
|
11
|
-
const schema = { model, validation, acl };
|
|
12
|
+
const schema = { ...schema_utils_1.emptySchema, model, validation, acl };
|
|
12
13
|
return modifyCallback ? modifyCallback(schema) : schema;
|
|
13
14
|
};
|
|
14
15
|
exports.createSchema = createSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSchema.js","sourceRoot":"","sources":["../../src/createSchema.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAC1C,gDAA+C;AAC/C,kDAAiD;
|
|
1
|
+
{"version":3,"file":"createSchema.js","sourceRoot":"","sources":["../../src/createSchema.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAC1C,gDAA+C;AAC/C,kDAAiD;AAEjD,0DAAqD;AAE9C,MAAM,YAAY,GAAG,CAAC,WAAgC,EAAE,cAA2C,EAAU,EAAE;IACrH,MAAM,KAAK,GAAG,wBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;IAC/D,MAAM,GAAG,GAAG,aAAa,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,EAAE,GAAG,0BAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAA;IACzD,OAAO,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;AACxD,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model } from '@contember/schema';
|
|
2
|
-
import { NamingConventions } from '
|
|
2
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
3
3
|
import { EntityConfigurator } from './types';
|
|
4
4
|
export default class SchemaBuilder {
|
|
5
5
|
private readonly conventions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaBuilder.d.ts","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,OAAO,EAA4B,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SchemaBuilder.d.ts","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,OAAO,EAA4B,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,aAAa;IAIrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAHxC,OAAO,CAAC,QAAQ,CAA6C;IAC7D,OAAO,CAAC,KAAK,CAAmC;gBAEnB,WAAW,GAAE,iBAAkD;IAErF,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa;IAKnD,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,kBAAkB,GAAG,aAAa;IAKrE,WAAW,IAAI,KAAK,CAAC,MAAM;CAiBlC;AAED,cAAc,sBAAsB,CAAA"}
|
|
@@ -15,10 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
const EntityBuilder_1 = require("./EntityBuilder");
|
|
18
|
-
const
|
|
18
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
19
19
|
const SchemaBuilderInternal_1 = require("./SchemaBuilderInternal");
|
|
20
20
|
class SchemaBuilder {
|
|
21
|
-
constructor(conventions = new
|
|
21
|
+
constructor(conventions = new schema_utils_1.DefaultNamingConventions()) {
|
|
22
22
|
this.conventions = conventions;
|
|
23
23
|
this.entities = {};
|
|
24
24
|
this.enums = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaBuilder.js","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,mDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"SchemaBuilder.js","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,mDAA2C;AAC3C,0DAAqF;AACrF,mEAA2D;AAG3D,MAAqB,aAAa;IAIjC,YAA6B,cAAiC,IAAI,uCAAwB,EAAE;QAA/D,gBAAW,GAAX,WAAW,CAAoD;QAHpF,aAAQ,GAA2C,EAAE,CAAA;QACrD,UAAK,GAAiC,EAAE,CAAA;IAE+C,CAAC;IAEzF,IAAI,CAAC,IAAY,EAAE,MAAgB;QACzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;QACzB,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,MAAM,CAAC,IAAY,EAAE,YAAgC;QAC3D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,YAAY,CAAA;QAClC,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,WAAW;QACjB,MAAM,OAAO,GAAG,IAAI,+BAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE3D,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,YAAgC,EAAQ,EAAE;YAC1E,MAAM,aAAa,GAAkB,YAAY,CAAC,IAAI,uBAAa,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;YACvF,MAAM,aAAa,GAAG,aAAa,CAAC,UAAU,EAAE,CAAA;YAChD,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAA;YACxC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;QAC/C,CAAC,CAAA;QACD,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACxC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;SAC7B;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEhF,OAAO,OAAO,CAAC,YAAY,EAAE,CAAA;IAC9B,CAAC;CACD;AAjCD,gCAiCC;AAED,uDAAoC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Model } from '@contember/schema';
|
|
2
2
|
import EntityBuilder from './EntityBuilder';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
import FieldBuilder from './FieldBuilder';
|
|
5
5
|
export default class SchemaBuilderInternal {
|
|
6
6
|
private readonly conventions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaBuilderInternal.d.ts","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilderInternal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAEnD,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAQ3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SchemaBuilderInternal.d.ts","sourceRoot":"","sources":["../../../../src/model/builder/SchemaBuilderInternal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAEnD,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAQ3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAO7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IANxC,OAAO,CAAC,QAAQ,CAAoF;IAEpG,OAAO,CAAC,YAAY,CAA6C;IAEjE,OAAO,CAAC,KAAK,CAAmC;gBAEnB,WAAW,EAAE,iBAAiB;IAEpD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,YAAY,EAAE,YAAY,CAAC,GAAG,GAAG,IAAI;IA2BnG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAI7C,YAAY,IAAI,KAAK,CAAC,MAAM;IAkBnC,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,YAAY;CAoBpB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import FieldProcessor from './FieldProcessor';
|
|
2
2
|
import ColumnBuilder from '../ColumnBuilder';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
export default class ColumnProcessor implements FieldProcessor<ColumnBuilder.Options> {
|
|
5
5
|
private conventions;
|
|
6
6
|
constructor(conventions: NamingConventions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ColumnProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,aAAa,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ColumnProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ColumnProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,aAAa,MAAM,kBAAkB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAA4B,MAAM,yBAAyB,CAAA;AAErF,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC;IACpF,OAAO,CAAC,WAAW,CAAmB;gBAE1B,WAAW,EAAE,iBAAiB;IAInC,OAAO,CACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,aAAa,EAAE,cAAc,CAAC,cAAc,GAC1C,IAAI;IAIP,OAAO,CAAC,YAAY;CAkBpB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const schema_1 = require("@contember/schema");
|
|
4
|
-
const
|
|
4
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
5
5
|
class ColumnProcessor {
|
|
6
6
|
constructor(conventions) {
|
|
7
7
|
this.conventions = conventions;
|
|
@@ -23,7 +23,7 @@ class ColumnProcessor {
|
|
|
23
23
|
return {
|
|
24
24
|
...common,
|
|
25
25
|
type,
|
|
26
|
-
columnType: (0,
|
|
26
|
+
columnType: (0, schema_utils_1.resolveDefaultColumnType)(type),
|
|
27
27
|
...(options.typeAlias !== undefined ? { typeAlias: options.typeAlias } : {}),
|
|
28
28
|
};
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnProcessor.js","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ColumnProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ColumnProcessor.js","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ColumnProcessor.ts"],"names":[],"mappings":";;AAEA,8CAAyC;AACzC,0DAAqF;AAErF,MAAqB,eAAe;IAGnC,YAAY,WAA8B;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/B,CAAC;IAEM,OAAO,CACb,UAAkB,EAClB,SAAiB,EACjB,OAA8B,EAC9B,aAA4C;QAE5C,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IACjE,CAAC;IAEO,YAAY,CAAC,SAAiB,EAAE,OAA8B;QACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACzB,MAAM,MAAM,GAAG;YACd,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC;YAC3E,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ;SAClE,CAAA;QACD,IAAI,IAAI,KAAK,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE;YACnC,oEAAoE;YACpE,OAAO,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,QAAS,EAAE,CAAA;SAC/D;QACD,OAAO;YACN,GAAG,MAAM;YACT,IAAI;YACJ,UAAU,EAAE,IAAA,uCAAwB,EAAC,IAAI,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5E,CAAA;IACF,CAAC;CACD;AAlCD,kCAkCC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import FieldProcessor from './FieldProcessor';
|
|
2
2
|
import ManyHasManyBuilder from '../ManyHasManyBuilder';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
export default class ManyHasManyProcessor implements FieldProcessor<ManyHasManyBuilder.Options> {
|
|
5
5
|
private conventions;
|
|
6
6
|
constructor(conventions: NamingConventions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyHasManyProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ManyHasManyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,kBAAkB,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ManyHasManyProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ManyHasManyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,kBAAkB,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC;IAC9F,OAAO,CAAC,WAAW,CAAmB;gBAE1B,WAAW,EAAE,iBAAiB;IAInC,OAAO,CACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,aAAa,EAAE,cAAc,CAAC,cAAc,GAC1C,IAAI;IAOP,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,uBAAuB;CAgC/B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import FieldProcessor from './FieldProcessor';
|
|
2
2
|
import ManyHasOneBuilder from '../ManyHasOneBuilder';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
export default class ManyHasOneProcessor implements FieldProcessor<ManyHasOneBuilder.Options> {
|
|
5
5
|
private conventions;
|
|
6
6
|
constructor(conventions: NamingConventions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyHasOneProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ManyHasOneProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAE7C,OAAO,iBAAiB,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ManyHasOneProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/ManyHasOneProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAE7C,OAAO,iBAAiB,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,cAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC;IAC5F,OAAO,CAAC,WAAW,CAAmB;gBAE1B,WAAW,EAAE,iBAAiB;IAInC,OAAO,CACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAClC,aAAa,EAAE,cAAc,CAAC,cAAc,GAC1C,IAAI;IAYP,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,sBAAsB;CAc9B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import FieldProcessor from './FieldProcessor';
|
|
2
2
|
import OneHasManyBuilder from '../OneHasManyBuilder';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
export default class OneHasManyProcessor implements FieldProcessor<OneHasManyBuilder.Options> {
|
|
5
5
|
private conventions;
|
|
6
6
|
constructor(conventions: NamingConventions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneHasManyProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/OneHasManyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,iBAAiB,MAAM,sBAAsB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"OneHasManyProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/OneHasManyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,iBAAiB,MAAM,sBAAsB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,cAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC;IAC5F,OAAO,CAAC,WAAW,CAAmB;gBAE1B,WAAW,EAAE,iBAAiB;IAI1C,OAAO,CACN,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAClC,aAAa,EAAE,cAAc,CAAC,cAAc,GAC1C,IAAI;IASP,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,YAAY;CAmBpB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import OneHasOneBuilder from '../OneHasOneBuilder';
|
|
2
2
|
import FieldProcessor from './FieldProcessor';
|
|
3
|
-
import { NamingConventions } from '
|
|
3
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
4
|
export default class OneHasOneProcessor implements FieldProcessor<OneHasOneBuilder.Options> {
|
|
5
5
|
private conventions;
|
|
6
6
|
constructor(conventions: NamingConventions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneHasOneProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/OneHasOneProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,qBAAqB,CAAA;AAClD,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"OneHasOneProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/model/builder/internal/OneHasOneProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,qBAAqB,CAAA;AAClD,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;IAC1F,OAAO,CAAC,WAAW,CAAmB;gBAE1B,WAAW,EAAE,iBAAiB;IAInC,OAAO,CACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,gBAAgB,CAAC,OAAO,EACjC,aAAa,EAAE,cAAc,CAAC,cAAc,GAC1C,IAAI;IAcP,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,oBAAoB;CAgB5B"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.View = void 0;
|
|
4
4
|
const extensions_1 = require("./extensions");
|
|
5
|
-
const View = (sql, { dependencies } = {}) => (0, extensions_1.extendEntity)(({ entity,
|
|
5
|
+
const View = (sql, { dependencies } = {}) => (0, extensions_1.extendEntity)(({ entity, entityRegistry }) => {
|
|
6
6
|
const dependenciesResolved = typeof dependencies === 'function' ? dependencies() : dependencies;
|
|
7
7
|
if (dependenciesResolved === null || dependenciesResolved === void 0 ? void 0 : dependenciesResolved.some(it => it === undefined)) {
|
|
8
8
|
throw `"undefined" value detected in dependencies of view entity ${entity.name}. This is possibly caused by circular imports.
|
|
@@ -18,7 +18,7 @@ dependencies: () => [MyEntity]
|
|
|
18
18
|
...entity,
|
|
19
19
|
view: {
|
|
20
20
|
sql,
|
|
21
|
-
...(dependenciesResolved ? { dependencies: dependenciesResolved.map(it =>
|
|
21
|
+
...(dependenciesResolved ? { dependencies: dependenciesResolved.map(it => entityRegistry.getName(it)) } : {}),
|
|
22
22
|
},
|
|
23
23
|
});
|
|
24
24
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewDefinition.js","sourceRoot":"","sources":["../../../../src/model/definition/ViewDefinition.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAGpC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,YAAY,KAA2E,EAAE,EAAE,EAAE,CAChI,IAAA,yBAAY,EAAC,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"ViewDefinition.js","sourceRoot":"","sources":["../../../../src/model/definition/ViewDefinition.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAGpC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,YAAY,KAA2E,EAAE,EAAE,EAAE,CAChI,IAAA,yBAAY,EAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,EAAE;IAC3C,MAAM,oBAAoB,GAAG,OAAO,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;IAC/F,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE;QACvD,MAAM,6DAA6D,MAAM,CAAC,IAAI;;;;;;;CAOhF,CAAA;KACE;IACD,OAAO,CAAC;QACP,GAAG,MAAM;QACT,IAAI,EAAE;YACL,GAAG;YACH,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7G;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AApBU,QAAA,IAAI,QAoBd"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import { Model } from '@contember/schema';
|
|
2
2
|
import { DecoratorFunction, EntityConstructor, FieldsDefinition } from './types';
|
|
3
|
-
import { EntityRegistry } from './internal';
|
|
3
|
+
import { EntityRegistry, EnumRegistry } from './internal';
|
|
4
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
4
5
|
interface EntityExtensionArgs {
|
|
5
6
|
entity: Model.Entity;
|
|
6
7
|
definition: FieldsDefinition;
|
|
8
|
+
conventions: NamingConventions;
|
|
9
|
+
enumRegistry: EnumRegistry;
|
|
10
|
+
entityRegistry: EntityRegistry;
|
|
11
|
+
/** @deprecated use entityRegistry */
|
|
7
12
|
registry: EntityRegistry;
|
|
8
13
|
}
|
|
9
14
|
export declare type EntityExtension = (args: EntityExtensionArgs) => Model.Entity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../../src/model/definition/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../../src/model/definition/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,UAAU,mBAAmB;IAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAA;IACpB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,WAAW,EAAE,iBAAiB,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAA;IAC1B,cAAc,EAAE,cAAc,CAAA;IAE9B,qCAAqC;IACrC,QAAQ,EAAE,cAAc,CAAA;CACxB;AAED,oBAAY,eAAe,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,KAAK,CAAC,MAAM,CAAA;AACzE,eAAO,MAAM,YAAY,iBAAkB,eAAe,yBAKzD,CAAA;AAED,eAAO,MAAM,qBAAqB,QAC5B,iBAAiB,QAChB,mBAAmB,KACvB,MAAM,MAIP,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../../src/model/definition/extensions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../../src/model/definition/extensions.ts"],"names":[],"mappings":";;;AAiBO,MAAM,YAAY,GAAG,CAAI,SAA0B,EAAwB,EAAE;IACnF,OAAO,UAAU,GAAsB;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,CAAA;QAC/D,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,GAAG,UAAU,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,CAAA;IACtE,CAAC,CAAA;AACF,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB;AAEM,MAAM,qBAAqB,GAAG,CACpC,GAAsB,EACtB,IAAyB,EACV,EAAE,CAChB,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,CAAuB,CAAC,MAAM,CAC3E,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,EACzC,IAAI,CAAC,MAAM,CACX,CAAA;AAPW,QAAA,qBAAqB,yBAOhC"}
|
|
@@ -9,7 +9,7 @@ export declare class ColumnDefinition extends FieldDefinition<ColumnDefinitionOp
|
|
|
9
9
|
columnType(columnType: string): Interface<ColumnDefinition>;
|
|
10
10
|
nullable(): Interface<ColumnDefinition>;
|
|
11
11
|
notNull(): Interface<ColumnDefinition>;
|
|
12
|
-
sequence(options?: Model.ColumnTypeDefinition['sequence']): Interface<ColumnDefinition>;
|
|
12
|
+
sequence(options?: Partial<Model.ColumnTypeDefinition['sequence']>): Interface<ColumnDefinition>;
|
|
13
13
|
unique(): Interface<ColumnDefinition>;
|
|
14
14
|
default(value: ColumnDefinition['options']['default']): Interface<ColumnDefinition>;
|
|
15
15
|
typeAlias(alias: string): Interface<ColumnDefinition>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/ColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAGlD,qBAAa,gBAAiB,SAAQ,eAAe,CAAC,uBAAuB,CAAC;IAC7E,IAAI,qBAA8B;WAEpB,MAAM,CACnB,IAAI,EAAE,KAAK,CAAC,UAAU,EACtB,WAAW,GAAE,iBAAsB,GACjC,gBAAgB;IAQZ,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAI3D,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAI3D,QAAQ,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAIvC,OAAO,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAItC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/ColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAGlD,qBAAa,gBAAiB,SAAQ,eAAe,CAAC,uBAAuB,CAAC;IAC7E,IAAI,qBAA8B;WAEpB,MAAM,CACnB,IAAI,EAAE,KAAK,CAAC,UAAU,EACtB,WAAW,GAAE,iBAAsB,GACjC,gBAAgB;IAQZ,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAI3D,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAI3D,QAAQ,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAIvC,OAAO,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAItC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAIhG,MAAM,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAIrC,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAInF,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAI5D,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,kBAAkB,GAAG,KAAK,CAAC,QAAQ;CAiChG;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,WAAW,GAAE,iBAAsB,oBAEjF;AAED,wBAAgB,YAAY,qBAE3B;AAED,wBAAgB,SAAS,qBAExB;AAED,wBAAgB,UAAU,qBAEzB;AAED,wBAAgB,YAAY,qBAE3B;AAED,wBAAgB,UAAU,qBAEzB;AAED,wBAAgB,cAAc,qBAE7B;AAED,wBAAgB,UAAU,qBAEzB;AAED,wBAAgB,UAAU,CAAC,cAAc,EAAE,cAAc,oBAExD;AAED,wBAAgB,UAAU,qBAEzB;AAED,oBAAY,iBAAiB,GAAG;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAA;CAC/B,CAAA;AACD,oBAAY,uBAAuB,GAAG;IACrC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;IAC/C,QAAQ,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAA;CACjD,GAAG,iBAAiB,CAAA"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.uuidColumn = exports.enumColumn = exports.jsonColumn = exports.dateTimeColumn = exports.dateColumn = exports.doubleColumn = exports.boolColumn = exports.intColumn = exports.stringColumn = exports.column = exports.ColumnDefinition = void 0;
|
|
4
4
|
const schema_1 = require("@contember/schema");
|
|
5
5
|
const FieldDefinition_1 = require("./FieldDefinition");
|
|
6
|
-
const
|
|
6
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
7
7
|
class ColumnDefinition extends FieldDefinition_1.FieldDefinition {
|
|
8
8
|
constructor() {
|
|
9
9
|
super(...arguments);
|
|
@@ -28,7 +28,7 @@ class ColumnDefinition extends FieldDefinition_1.FieldDefinition {
|
|
|
28
28
|
return this.withOption('nullable', false);
|
|
29
29
|
}
|
|
30
30
|
sequence(options) {
|
|
31
|
-
return this.withOption('sequence',
|
|
31
|
+
return this.withOption('sequence', { precedence: 'BY DEFAULT', ...options });
|
|
32
32
|
}
|
|
33
33
|
unique() {
|
|
34
34
|
return this.withOption('unique', true);
|
|
@@ -68,7 +68,7 @@ class ColumnDefinition extends FieldDefinition_1.FieldDefinition {
|
|
|
68
68
|
return {
|
|
69
69
|
...common,
|
|
70
70
|
type: type,
|
|
71
|
-
columnType: columnType || (0,
|
|
71
|
+
columnType: columnType || (0, schema_utils_1.resolveDefaultColumnType)(type),
|
|
72
72
|
...(typeAlias !== undefined ? { typeAlias } : {}),
|
|
73
73
|
};
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnDefinition.js","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/ColumnDefinition.ts"],"names":[],"mappings":";;;AAAA,8CAAyC;AAEzC,uDAAuE;AAEvE,
|
|
1
|
+
{"version":3,"file":"ColumnDefinition.js","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/ColumnDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model } from '@contember/schema';
|
|
2
|
-
import { NamingConventions } from '
|
|
2
|
+
import { NamingConventions } from '@contember/schema-utils';
|
|
3
3
|
import { EntityRegistry, EnumRegistry } from '../internal';
|
|
4
4
|
export declare abstract class FieldDefinition<O> {
|
|
5
5
|
readonly options: O;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/FieldDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"FieldDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/model/definition/fieldDefinitions/FieldDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1D,8BAAsB,eAAe,CAAC,CAAC;aACV,OAAO,EAAE,CAAC;gBAAV,OAAO,EAAE,CAAC;IAEtC,SAAS,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG;SAAG,CAAC,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;KAAE;IAIvG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,KAAK,CAAC,QAAQ;CACjE;AAED,MAAM,WAAW,kBAAkB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,iBAAiB,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAA;IAC1B,cAAc,EAAE,cAAc,CAAA;CAC9B;AACD,oBAAY,GAAG,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAAE,CAAA"}
|