@contember/schema-utils 1.2.0 → 1.3.0-alpha.13
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/SchemaDatabaseMetadata.d.ts +40 -0
- package/dist/src/SchemaDatabaseMetadata.d.ts.map +1 -0
- package/dist/src/SchemaDatabaseMetadata.js +20 -0
- package/dist/src/SchemaDatabaseMetadata.js.map +1 -0
- package/dist/src/acl/PredicateDefinitionProcessor.d.ts.map +1 -1
- package/dist/src/acl/PredicateDefinitionProcessor.js +49 -44
- package/dist/src/acl/PredicateDefinitionProcessor.js.map +1 -1
- package/dist/src/definition-generator/AclDefinitionCodeGenerator.d.ts +19 -0
- package/dist/src/definition-generator/AclDefinitionCodeGenerator.d.ts.map +1 -0
- package/dist/src/definition-generator/AclDefinitionCodeGenerator.js +116 -0
- package/dist/src/definition-generator/AclDefinitionCodeGenerator.js.map +1 -0
- package/dist/src/definition-generator/DefinitionCodeGenerator.d.ts +27 -0
- package/dist/src/definition-generator/DefinitionCodeGenerator.d.ts.map +1 -0
- package/dist/src/definition-generator/DefinitionCodeGenerator.js +216 -0
- package/dist/src/definition-generator/DefinitionCodeGenerator.js.map +1 -0
- package/dist/src/definition-generator/DefinitionNamingConventions.d.ts +7 -0
- package/dist/src/definition-generator/DefinitionNamingConventions.d.ts.map +1 -0
- package/dist/src/definition-generator/DefinitionNamingConventions.js +18 -0
- package/dist/src/definition-generator/DefinitionNamingConventions.js.map +1 -0
- package/dist/src/definition-generator/TsDefinitionGenerator.d.ts +4 -18
- package/dist/src/definition-generator/TsDefinitionGenerator.d.ts.map +1 -1
- package/dist/src/definition-generator/TsDefinitionGenerator.js +6 -232
- package/dist/src/definition-generator/TsDefinitionGenerator.js.map +1 -1
- package/dist/src/definition-generator/index.d.ts +3 -0
- package/dist/src/definition-generator/index.d.ts.map +1 -1
- package/dist/src/definition-generator/index.js +3 -0
- package/dist/src/definition-generator/index.js.map +1 -1
- package/dist/src/index.d.ts +2 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +6 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/lax/LaxSchemaConverter.d.ts.map +1 -1
- package/dist/src/lax/LaxSchemaConverter.js +4 -5
- package/dist/src/lax/LaxSchemaConverter.js.map +1 -1
- package/dist/src/model/index.d.ts +0 -1
- package/dist/src/model/index.d.ts.map +1 -1
- package/dist/src/model/index.js +0 -1
- package/dist/src/model/index.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/type-schema/actions.d.ts +31 -0
- package/dist/src/type-schema/actions.d.ts.map +1 -0
- package/dist/src/type-schema/actions.js +75 -0
- package/dist/src/type-schema/actions.js.map +1 -0
- package/dist/src/type-schema/model.d.ts +8 -6
- package/dist/src/type-schema/model.d.ts.map +1 -1
- package/dist/src/type-schema/model.js +6 -6
- package/dist/src/type-schema/model.js.map +1 -1
- package/dist/src/type-schema/where.d.ts +7 -0
- package/dist/src/type-schema/where.d.ts.map +1 -0
- package/dist/src/type-schema/where.js +50 -0
- package/dist/src/type-schema/where.js.map +1 -0
- package/dist/src/utils/deepCompare.d.ts +8 -2
- package/dist/src/utils/deepCompare.d.ts.map +1 -1
- package/dist/src/utils/deepCompare.js +32 -4
- package/dist/src/utils/deepCompare.js.map +1 -1
- package/dist/src/utils/printJsValue.d.ts +13 -0
- package/dist/src/utils/printJsValue.d.ts.map +1 -0
- package/dist/src/utils/printJsValue.js +57 -0
- package/dist/src/utils/printJsValue.js.map +1 -0
- package/dist/src/validation/ActionsValidator.d.ts +13 -0
- package/dist/src/validation/ActionsValidator.d.ts.map +1 -0
- package/dist/src/validation/ActionsValidator.js +134 -0
- package/dist/src/validation/ActionsValidator.js.map +1 -0
- package/dist/src/validation/ModelValidator.d.ts.map +1 -1
- package/dist/src/validation/ModelValidator.js +5 -31
- package/dist/src/validation/ModelValidator.js.map +1 -1
- package/dist/src/validation/SchemaValidator.d.ts.map +1 -1
- package/dist/src/validation/SchemaValidator.js +4 -1
- package/dist/src/validation/SchemaValidator.js.map +1 -1
- package/dist/src/validation/errors.d.ts +1 -1
- package/dist/src/validation/errors.d.ts.map +1 -1
- package/dist/src/validation/errors.js.map +1 -1
- package/dist/tests/cases/unit/deepCompare.test.d.ts +2 -0
- package/dist/tests/cases/unit/deepCompare.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/deepCompare.test.js +43 -0
- package/dist/tests/cases/unit/deepCompare.test.js.map +1 -0
- package/dist/tests/cases/unit/modelValidator.test.js +6 -72
- package/dist/tests/cases/unit/modelValidator.test.js.map +1 -1
- package/dist/tests/cases/unit/printJsvalue.test.d.ts +2 -0
- package/dist/tests/cases/unit/printJsvalue.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/printJsvalue.test.js +90 -0
- package/dist/tests/cases/unit/printJsvalue.test.js.map +1 -0
- package/dist/tests/cases/unit/schemas/acl.d.ts +13 -0
- package/dist/tests/cases/unit/schemas/acl.d.ts.map +1 -0
- package/dist/tests/cases/unit/schemas/acl.js +47 -0
- package/dist/tests/cases/unit/schemas/acl.js.map +1 -0
- package/dist/tests/cases/unit/schemas/basic.d.ts.map +1 -1
- package/dist/tests/cases/unit/schemas/basic.js.map +1 -1
- package/dist/tests/cases/unit/schemas/enum.d.ts.map +1 -1
- package/dist/tests/cases/unit/schemas/enum.js.map +1 -1
- package/dist/tests/cases/unit/schemas/relations.d.ts.map +1 -1
- package/dist/tests/cases/unit/schemas/relations.js.map +1 -1
- package/dist/tests/cases/unit/schemas/unique.d.ts.map +1 -1
- package/dist/tests/cases/unit/schemas/unique.js.map +1 -1
- package/dist/tests/cases/unit/tsDefinitionGenerator.test.js +5 -3
- package/dist/tests/cases/unit/tsDefinitionGenerator.test.js.map +1 -1
- package/dist/tests/cases/unit/whereSchema.test.d.ts +2 -0
- package/dist/tests/cases/unit/whereSchema.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/whereSchema.test.js +85 -0
- package/dist/tests/cases/unit/whereSchema.test.js.map +1 -0
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -4
- package/src/SchemaDatabaseMetadata.ts +66 -0
- package/src/acl/PredicateDefinitionProcessor.ts +59 -60
- package/src/definition-generator/AclDefinitionCodeGenerator.ts +126 -0
- package/src/definition-generator/DefinitionCodeGenerator.ts +250 -0
- package/src/definition-generator/DefinitionNamingConventions.ts +16 -0
- package/src/definition-generator/TsDefinitionGenerator.ts +8 -264
- package/src/definition-generator/index.ts +3 -0
- package/src/index.ts +5 -1
- package/src/lax/LaxSchemaConverter.ts +4 -5
- package/src/model/index.ts +0 -1
- package/src/tsconfig.json +2 -6
- package/src/type-schema/actions.ts +79 -0
- package/src/type-schema/model.ts +21 -8
- package/src/type-schema/where.ts +28 -0
- package/src/utils/deepCompare.ts +37 -4
- package/src/utils/printJsValue.ts +62 -0
- package/src/validation/ActionsValidator.ts +119 -0
- package/src/validation/ModelValidator.ts +12 -36
- package/src/validation/SchemaValidator.ts +6 -1
- package/src/validation/errors.ts +7 -0
- package/tests/cases/unit/__snapshots__/laxSchemaConverter.test.ts.snap +30 -14
- package/tests/cases/unit/deepCompare.test.ts +44 -0
- package/tests/cases/unit/modelValidator.test.ts +6 -73
- package/tests/cases/unit/printJsvalue.test.ts +100 -0
- package/tests/cases/unit/schemas/acl.ts +34 -0
- package/tests/cases/unit/schemas/basic.ts +1 -1
- package/tests/cases/unit/schemas/enum.ts +1 -1
- package/tests/cases/unit/schemas/relations.ts +1 -1
- package/tests/cases/unit/schemas/unique.ts +1 -1
- package/tests/cases/unit/tsDefinitionGenerator.test.ts +6 -4
- package/tests/cases/unit/whereSchema.test.ts +89 -0
- package/tests/tsconfig.json +1 -3
- package/tsconfig.json +2 -6
- package/dist/src/model/NamingHelper.d.ts +0 -9
- package/dist/src/model/NamingHelper.d.ts.map +0 -1
- package/dist/src/model/NamingHelper.js +0 -46
- package/dist/src/model/NamingHelper.js.map +0 -1
- package/src/model/NamingHelper.ts +0 -42
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export declare class DefinitionNamingConventions {
|
|
2
|
+
private static reservedWords;
|
|
3
|
+
formatIdentifier(id: string): string;
|
|
4
|
+
roleVarName(id: string): string;
|
|
5
|
+
variableVarName(role: string, id: string): string;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=DefinitionNamingConventions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DefinitionNamingConventions.d.ts","sourceRoot":"","sources":["../../../src/definition-generator/DefinitionNamingConventions.ts"],"names":[],"mappings":"AAAA,qBAAa,2BAA2B;IACvC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAid;IAEte,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAKpC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAI/B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;CAGxD"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DefinitionNamingConventions = void 0;
|
|
4
|
+
class DefinitionNamingConventions {
|
|
5
|
+
formatIdentifier(id) {
|
|
6
|
+
// todo: validate
|
|
7
|
+
return id;
|
|
8
|
+
}
|
|
9
|
+
roleVarName(id) {
|
|
10
|
+
return this.formatIdentifier(`${id}Role`);
|
|
11
|
+
}
|
|
12
|
+
variableVarName(role, id) {
|
|
13
|
+
return this.formatIdentifier(`${id}${role.charAt(0).toUpperCase() + role.slice(1)}Variable`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.DefinitionNamingConventions = DefinitionNamingConventions;
|
|
17
|
+
DefinitionNamingConventions.reservedWords = new Set(['do', 'if', 'in', 'for', 'let', 'new', 'try', 'var', 'case', 'else', 'enum', 'eval', 'null', 'this', 'true', 'void', 'with', 'await', 'break', 'catch', 'class', 'const', 'false', 'super', 'throw', 'while', 'yield', 'delete', 'export', 'import', 'public', 'return', 'static', 'switch', 'typeof', 'default', 'extends', 'finally', 'package', 'private', 'continue', 'debugger', 'function', 'arguments', 'interface', 'protected', 'implements', 'instanceof']);
|
|
18
|
+
//# sourceMappingURL=DefinitionNamingConventions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DefinitionNamingConventions.js","sourceRoot":"","sources":["../../../src/definition-generator/DefinitionNamingConventions.ts"],"names":[],"mappings":";;;AAAA,MAAa,2BAA2B;IAGhC,gBAAgB,CAAC,EAAU;QACjC,iBAAiB;QACjB,OAAO,EAAE,CAAA;IACV,CAAC;IAEM,WAAW,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC1C,CAAC;IAEM,eAAe,CAAC,IAAY,EAAE,EAAU;QAC9C,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAC7F,CAAC;;AAdF,kEAeC;AAde,yCAAa,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAA"}
|
|
@@ -1,26 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Schema } from '@contember/schema';
|
|
2
2
|
import { NamingConventions } from '../model';
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated use {@link DefinitionCodeGenerator}
|
|
5
|
+
*/
|
|
3
6
|
export declare class TsDefinitionGenerator {
|
|
4
7
|
private readonly schema;
|
|
5
8
|
private readonly conventions;
|
|
6
|
-
private static reservedWords;
|
|
7
9
|
constructor(schema: Schema, conventions?: NamingConventions);
|
|
8
10
|
generate(): string;
|
|
9
|
-
private generateEnum;
|
|
10
|
-
generateEntity({ entity }: {
|
|
11
|
-
entity: Model.Entity;
|
|
12
|
-
}): string;
|
|
13
|
-
private generateUniqueConstraint;
|
|
14
|
-
private generateIndex;
|
|
15
|
-
private generateView;
|
|
16
|
-
generateField({ entity, field }: {
|
|
17
|
-
entity: Model.Entity;
|
|
18
|
-
field: Model.AnyField;
|
|
19
|
-
}): string | undefined;
|
|
20
|
-
private generateColumn;
|
|
21
|
-
private formatIdentifier;
|
|
22
|
-
private formatLiteral;
|
|
23
|
-
private isValidIdentifier;
|
|
24
|
-
private isSimpleIdentifier;
|
|
25
11
|
}
|
|
26
12
|
//# sourceMappingURL=TsDefinitionGenerator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TsDefinitionGenerator.d.ts","sourceRoot":"","sources":["../../../src/definition-generator/TsDefinitionGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TsDefinitionGenerator.d.ts","sourceRoot":"","sources":["../../../src/definition-generator/TsDefinitionGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAA4B,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAGtE;;GAEG;AACH,qBAAa,qBAAqB;IAEhC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,MAAM,EAAE,MAAM,EACd,WAAW,GAAE,iBAAkD;IAI1E,QAAQ;CAIf"}
|
|
@@ -1,246 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TsDefinitionGenerator = void 0;
|
|
4
|
-
const schema_1 = require("@contember/schema");
|
|
5
4
|
const model_1 = require("../model");
|
|
5
|
+
const DefinitionCodeGenerator_1 = require("./DefinitionCodeGenerator");
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated use {@link DefinitionCodeGenerator}
|
|
8
|
+
*/
|
|
6
9
|
class TsDefinitionGenerator {
|
|
7
10
|
constructor(schema, conventions = new model_1.DefaultNamingConventions()) {
|
|
8
11
|
this.schema = schema;
|
|
9
12
|
this.conventions = conventions;
|
|
10
13
|
}
|
|
11
14
|
generate() {
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
values,
|
|
15
|
-
})).join('');
|
|
16
|
-
const entities = Object.values(this.schema.model.entities).map(entity => this.generateEntity({ entity })).join('');
|
|
17
|
-
return `import { SchemaDefinition as def } from '@contember/schema-definition'
|
|
18
|
-
${enums}${entities}`;
|
|
19
|
-
}
|
|
20
|
-
generateEnum({ name, values }) {
|
|
21
|
-
return `\nexport const ${this.formatIdentifier(name)} = def.createEnum(${values.map(it => this.formatLiteral(it)).join(', ')})\n`;
|
|
22
|
-
}
|
|
23
|
-
generateEntity({ entity }) {
|
|
24
|
-
const decorators = [
|
|
25
|
-
...Object.values(entity.unique).map(constraint => this.generateUniqueConstraint({ entity, constraint })),
|
|
26
|
-
...Object.values(entity.indexes).map(index => this.generateIndex({ entity, index })),
|
|
27
|
-
this.generateView({ entity }),
|
|
28
|
-
].filter(it => !!it).map(it => `${it}\n`);
|
|
29
|
-
return `\n${decorators}export class ${this.formatIdentifier(entity.name)} {
|
|
30
|
-
${Object.values(entity.fields).map(field => this.generateField({ field, entity })).filter(it => !!it).join('\n')}
|
|
31
|
-
}\n`;
|
|
32
|
-
}
|
|
33
|
-
generateUniqueConstraint({ entity, constraint }) {
|
|
34
|
-
const defaultName = model_1.NamingHelper.createUniqueConstraintName(entity.name, constraint.fields);
|
|
35
|
-
if (defaultName === constraint.name) {
|
|
36
|
-
const fieldsList = `${constraint.fields.map(it => this.formatLiteral(it)).join(', ')}`;
|
|
37
|
-
return `@def.Unique(${fieldsList})`;
|
|
38
|
-
}
|
|
39
|
-
return `@def.Unique(${this.formatLiteral(constraint)})`;
|
|
40
|
-
}
|
|
41
|
-
generateIndex({ entity, index }) {
|
|
42
|
-
const defaultName = model_1.NamingHelper.createIndexName(entity.name, index.fields);
|
|
43
|
-
if (defaultName === index.name) {
|
|
44
|
-
const fieldsList = `${index.fields.map(it => this.formatLiteral(it)).join(', ')}`;
|
|
45
|
-
return `@def.Index(${fieldsList})`;
|
|
46
|
-
}
|
|
47
|
-
return `@def.Index(${this.formatLiteral(index)})`;
|
|
48
|
-
}
|
|
49
|
-
generateView({ entity }) {
|
|
50
|
-
var _a, _b, _c;
|
|
51
|
-
if (!entity.view) {
|
|
52
|
-
return undefined;
|
|
53
|
-
}
|
|
54
|
-
const dependenciesExpr = ((_b = (_a = entity.view.dependencies) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0
|
|
55
|
-
? `, {\n\tdependencies: () => [${(_c = entity.view.dependencies) === null || _c === void 0 ? void 0 : _c.map(it => this.formatIdentifier(it))}]\n}`
|
|
56
|
-
: '';
|
|
57
|
-
return `@def.View(\`${entity.view.sql}\`${dependenciesExpr})`;
|
|
58
|
-
}
|
|
59
|
-
generateField({ entity, field }) {
|
|
60
|
-
const formatRelationFactory = (method, relation) => {
|
|
61
|
-
const otherSide = (0, model_1.isInverseRelation)(relation) ? relation.ownedBy : relation.inversedBy;
|
|
62
|
-
const otherSideFormatted = otherSide ? `, ${this.formatLiteral(otherSide)}` : '';
|
|
63
|
-
return `${method}(${this.formatIdentifier(relation.target)}${otherSideFormatted})`;
|
|
64
|
-
};
|
|
65
|
-
const formatEnumRef = (enumName, enumValues, providedValue, defaultValue) => {
|
|
66
|
-
var _a;
|
|
67
|
-
if (!providedValue || providedValue === defaultValue) {
|
|
68
|
-
return undefined;
|
|
69
|
-
}
|
|
70
|
-
const enumValueKey = (_a = Object.entries(schema_1.Model.OrderDirection).find(dir => dir[1] === providedValue)) === null || _a === void 0 ? void 0 : _a[0];
|
|
71
|
-
if (!enumValueKey) {
|
|
72
|
-
throw new Error(`Value ${providedValue} is not defined in enum ${enumName}`);
|
|
73
|
-
}
|
|
74
|
-
return `${enumName}.${enumValueKey}`;
|
|
75
|
-
};
|
|
76
|
-
const formatOrderBy = (orderBy) => {
|
|
77
|
-
var _a;
|
|
78
|
-
return (_a = orderBy === null || orderBy === void 0 ? void 0 : orderBy.map(it => {
|
|
79
|
-
const enumExpr = formatEnumRef(`Model.OrderDirection`, schema_1.Model.OrderDirection, it.direction, schema_1.Model.OrderDirection.asc);
|
|
80
|
-
return `orderBy(${this.formatLiteral(it.path)}${enumExpr ? `, ${enumExpr}` : ''})`;
|
|
81
|
-
})) !== null && _a !== void 0 ? _a : [];
|
|
82
|
-
};
|
|
83
|
-
const formatOnDelete = (onDelete) => {
|
|
84
|
-
if (onDelete === schema_1.Model.OnDelete.cascade) {
|
|
85
|
-
return 'cascadeOnDelete()';
|
|
86
|
-
}
|
|
87
|
-
if (onDelete === schema_1.Model.OnDelete.setNull) {
|
|
88
|
-
return 'setNullOnDelete()';
|
|
89
|
-
}
|
|
90
|
-
return undefined;
|
|
91
|
-
};
|
|
92
|
-
const formatJoiningColumn = (joiningColumnName, fieldName) => {
|
|
93
|
-
const defaultJoiningColumn = this.conventions.getJoiningColumnName(fieldName);
|
|
94
|
-
if (defaultJoiningColumn === joiningColumnName) {
|
|
95
|
-
return undefined;
|
|
96
|
-
}
|
|
97
|
-
return `joiningColumn(${this.formatLiteral(joiningColumnName)})`;
|
|
98
|
-
};
|
|
99
|
-
const definition = (0, model_1.acceptFieldVisitor)(this.schema.model, entity, field, {
|
|
100
|
-
visitColumn: ctx => {
|
|
101
|
-
return this.generateColumn(ctx);
|
|
102
|
-
},
|
|
103
|
-
visitOneHasMany: ({ relation }) => {
|
|
104
|
-
return [
|
|
105
|
-
formatRelationFactory('oneHasMany', relation),
|
|
106
|
-
...formatOrderBy(relation.orderBy),
|
|
107
|
-
];
|
|
108
|
-
},
|
|
109
|
-
visitManyHasOne: ({ relation }) => {
|
|
110
|
-
return [
|
|
111
|
-
formatRelationFactory('manyHasOne', relation),
|
|
112
|
-
!relation.nullable ? 'notNull()' : undefined,
|
|
113
|
-
formatOnDelete(relation.joiningColumn.onDelete),
|
|
114
|
-
formatJoiningColumn(relation.joiningColumn.columnName, relation.name),
|
|
115
|
-
];
|
|
116
|
-
},
|
|
117
|
-
visitOneHasOneInverse: ({ relation }) => {
|
|
118
|
-
return [
|
|
119
|
-
formatRelationFactory('oneHasOneInverse', relation),
|
|
120
|
-
!relation.nullable ? 'notNull()' : undefined,
|
|
121
|
-
];
|
|
122
|
-
},
|
|
123
|
-
visitOneHasOneOwning: ({ relation }) => {
|
|
124
|
-
return [
|
|
125
|
-
formatRelationFactory('oneHasOne', relation),
|
|
126
|
-
!relation.nullable ? 'notNull()' : undefined,
|
|
127
|
-
formatOnDelete(relation.joiningColumn.onDelete),
|
|
128
|
-
formatJoiningColumn(relation.joiningColumn.columnName, relation.name),
|
|
129
|
-
relation.orphanRemoval ? 'removeOrphan()' : undefined,
|
|
130
|
-
];
|
|
131
|
-
},
|
|
132
|
-
visitManyHasManyOwning: ({ entity, relation }) => {
|
|
133
|
-
const columnNames = this.conventions.getJoiningTableColumnNames(entity.name, relation.name, relation.target, relation.inversedBy);
|
|
134
|
-
const defaultJoiningTable = this.conventions.getJoiningTableName(entity.name, relation.name);
|
|
135
|
-
const joiningTable = {};
|
|
136
|
-
if (relation.joiningTable.tableName !== defaultJoiningTable) {
|
|
137
|
-
joiningTable.tableName = relation.joiningTable.tableName;
|
|
138
|
-
}
|
|
139
|
-
if (!relation.joiningTable.eventLog.enabled) {
|
|
140
|
-
joiningTable.eventLog = { enabled: false };
|
|
141
|
-
}
|
|
142
|
-
if (columnNames[0] !== relation.joiningTable.joiningColumn.columnName || relation.joiningTable.joiningColumn.onDelete !== schema_1.Model.OnDelete.cascade) {
|
|
143
|
-
joiningTable.joiningColumn = {
|
|
144
|
-
columnName: relation.joiningTable.joiningColumn.columnName,
|
|
145
|
-
onDelete: relation.joiningTable.joiningColumn.onDelete,
|
|
146
|
-
};
|
|
147
|
-
}
|
|
148
|
-
if (columnNames[1] !== relation.joiningTable.inverseJoiningColumn.columnName || relation.joiningTable.inverseJoiningColumn.onDelete !== schema_1.Model.OnDelete.cascade) {
|
|
149
|
-
joiningTable.inverseJoiningColumn = {
|
|
150
|
-
columnName: relation.joiningTable.inverseJoiningColumn.columnName,
|
|
151
|
-
onDelete: relation.joiningTable.inverseJoiningColumn.onDelete,
|
|
152
|
-
};
|
|
153
|
-
}
|
|
154
|
-
return [
|
|
155
|
-
formatRelationFactory('manyHasMany', relation),
|
|
156
|
-
...formatOrderBy(relation.orderBy),
|
|
157
|
-
Object.keys(joiningTable).length > 0 ? `joiningTable(${this.formatLiteral(joiningTable)})` : undefined,
|
|
158
|
-
];
|
|
159
|
-
},
|
|
160
|
-
visitManyHasManyInverse: ({ relation }) => {
|
|
161
|
-
return [
|
|
162
|
-
formatRelationFactory('manyHasManyInverse', relation),
|
|
163
|
-
...formatOrderBy(relation.orderBy),
|
|
164
|
-
];
|
|
165
|
-
},
|
|
166
|
-
});
|
|
167
|
-
const definitionCode = definition.filter(it => !!it).join('.');
|
|
168
|
-
if (field.name === 'id' && definitionCode === 'uuidColumn().notNull()') {
|
|
169
|
-
return undefined;
|
|
170
|
-
}
|
|
171
|
-
return `\t${this.formatIdentifier(field.name)} = def.${definitionCode}`;
|
|
172
|
-
}
|
|
173
|
-
generateColumn({ entity, column }) {
|
|
174
|
-
let parts = [];
|
|
175
|
-
if (column.type === schema_1.Model.ColumnType.Enum) {
|
|
176
|
-
parts.push(`enumColumn(${column.columnType})`);
|
|
177
|
-
}
|
|
178
|
-
else {
|
|
179
|
-
parts.push(`${ColumnToMethodMapping[column.type]}()`);
|
|
180
|
-
const defaultColumnType = (0, model_1.resolveDefaultColumnType)(column.type);
|
|
181
|
-
if (defaultColumnType !== column.columnType) {
|
|
182
|
-
parts.push(`columnType(${this.formatLiteral(column.columnType)})`);
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
const defaultColumnName = this.conventions.getColumnName(column.name);
|
|
186
|
-
if (defaultColumnName !== column.columnName) {
|
|
187
|
-
parts.push(`columnName(${this.formatLiteral(column.columnName)})`);
|
|
188
|
-
}
|
|
189
|
-
if (!column.nullable) {
|
|
190
|
-
parts.push('notNull()');
|
|
191
|
-
}
|
|
192
|
-
if (column.default !== undefined) {
|
|
193
|
-
parts.push(`default(${this.formatLiteral(column.default)})`);
|
|
194
|
-
}
|
|
195
|
-
if (column.typeAlias) {
|
|
196
|
-
parts.push(`typeAlias(${this.formatLiteral(column.typeAlias)})`);
|
|
197
|
-
}
|
|
198
|
-
// todo: sequence
|
|
199
|
-
// todo: maybe single column unique()
|
|
200
|
-
return parts;
|
|
201
|
-
}
|
|
202
|
-
formatIdentifier(id) {
|
|
203
|
-
// todo: validate
|
|
204
|
-
return id;
|
|
205
|
-
}
|
|
206
|
-
formatLiteral(value) {
|
|
207
|
-
if (value === undefined || value === null || typeof value === 'boolean' || typeof value === 'number' || typeof value === 'function') {
|
|
208
|
-
return String(value);
|
|
209
|
-
}
|
|
210
|
-
if (typeof value === 'bigint') {
|
|
211
|
-
return value.toString(10) + 'n';
|
|
212
|
-
}
|
|
213
|
-
if (typeof value === 'string') {
|
|
214
|
-
return `'${value.replaceAll(/'/g, '\\\'')}'`;
|
|
215
|
-
}
|
|
216
|
-
if (Array.isArray(value)) {
|
|
217
|
-
return `[${value.map(it => this.formatLiteral(it)).join(', ')}]`;
|
|
218
|
-
}
|
|
219
|
-
return `{${Object.entries(value).map(([key, value]) => {
|
|
220
|
-
const formattedKey = this.isSimpleIdentifier(key) ? key : `[${this.formatLiteral(key)}]`;
|
|
221
|
-
return `${formattedKey}: ${this.formatLiteral(value)}`;
|
|
222
|
-
}).join(', ')}`;
|
|
223
|
-
}
|
|
224
|
-
isValidIdentifier(identifier) {
|
|
225
|
-
if (!this.isSimpleIdentifier(identifier)) {
|
|
226
|
-
return false;
|
|
227
|
-
}
|
|
228
|
-
return !TsDefinitionGenerator.reservedWords.has(identifier);
|
|
229
|
-
}
|
|
230
|
-
isSimpleIdentifier(identifier) {
|
|
231
|
-
return !!identifier.match(/^[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*$/);
|
|
15
|
+
const generator = new DefinitionCodeGenerator_1.DefinitionCodeGenerator(this.conventions);
|
|
16
|
+
return generator.generate(this.schema);
|
|
232
17
|
}
|
|
233
18
|
}
|
|
234
19
|
exports.TsDefinitionGenerator = TsDefinitionGenerator;
|
|
235
|
-
TsDefinitionGenerator.reservedWords = new Set(['do', 'if', 'in', 'for', 'let', 'new', 'try', 'var', 'case', 'else', 'enum', 'eval', 'null', 'this', 'true', 'void', 'with', 'await', 'break', 'catch', 'class', 'const', 'false', 'super', 'throw', 'while', 'yield', 'delete', 'export', 'import', 'public', 'return', 'static', 'switch', 'typeof', 'default', 'extends', 'finally', 'package', 'private', 'continue', 'debugger', 'function', 'arguments', 'interface', 'protected', 'implements', 'instanceof']);
|
|
236
|
-
const ColumnToMethodMapping = {
|
|
237
|
-
[schema_1.Model.ColumnType.Bool]: 'boolColumn',
|
|
238
|
-
[schema_1.Model.ColumnType.Date]: 'dateColumn',
|
|
239
|
-
[schema_1.Model.ColumnType.DateTime]: 'dateTimeColumn',
|
|
240
|
-
[schema_1.Model.ColumnType.Json]: 'jsonColumn',
|
|
241
|
-
[schema_1.Model.ColumnType.Double]: 'doubleColumn',
|
|
242
|
-
[schema_1.Model.ColumnType.Uuid]: 'uuidColumn',
|
|
243
|
-
[schema_1.Model.ColumnType.Int]: 'intColumn',
|
|
244
|
-
[schema_1.Model.ColumnType.String]: 'stringColumn',
|
|
245
|
-
};
|
|
246
20
|
//# sourceMappingURL=TsDefinitionGenerator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TsDefinitionGenerator.js","sourceRoot":"","sources":["../../../src/definition-generator/TsDefinitionGenerator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TsDefinitionGenerator.js","sourceRoot":"","sources":["../../../src/definition-generator/TsDefinitionGenerator.ts"],"names":[],"mappings":";;;AACA,oCAAsE;AACtE,uEAAmE;AAEnE;;GAEG;AACH,MAAa,qBAAqB;IACjC,YACkB,MAAc,EACd,cAAiC,IAAI,gCAAwB,EAAE;QAD/D,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAoD;IAEjF,CAAC;IAEM,QAAQ;QACd,MAAM,SAAS,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/D,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;CACD;AAXD,sDAWC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/definition-generator/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/definition-generator/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,2BAA2B,CAAA;AACzC,cAAc,+BAA+B,CAAA"}
|
|
@@ -15,4 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./TsDefinitionGenerator"), exports);
|
|
18
|
+
__exportStar(require("./AclDefinitionCodeGenerator"), exports);
|
|
19
|
+
__exportStar(require("./DefinitionCodeGenerator"), exports);
|
|
20
|
+
__exportStar(require("./DefinitionNamingConventions"), exports);
|
|
18
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/definition-generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAuC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/definition-generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAuC;AACvC,+DAA4C;AAC5C,4DAAyC;AACzC,gEAA6C"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Schema } from '@contember/schema';
|
|
2
2
|
import * as Typesafe from '@contember/typesafe';
|
|
3
3
|
export * from './definition-generator';
|
|
4
|
+
export * from './SchemaDatabaseMetadata';
|
|
4
5
|
export * from './lax';
|
|
5
6
|
export * from './model';
|
|
6
7
|
export * from './acl';
|
|
@@ -8,7 +9,7 @@ export * from './dataUtils';
|
|
|
8
9
|
export * from './validation';
|
|
9
10
|
export * from './schemaNormalizer';
|
|
10
11
|
export * from './schemaFilter';
|
|
11
|
-
export { deepCompare } from './utils';
|
|
12
|
+
export { deepCompare, compareArraysIgnoreOrder } from './utils';
|
|
12
13
|
export declare const emptySchema: Schema;
|
|
13
14
|
export declare const schemaType: Typesafe.Type<Schema>;
|
|
14
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAI/C,cAAc,wBAAwB,CAAA;AACtC,cAAc,0BAA0B,CAAA;AACxC,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAE/D,eAAO,MAAM,WAAW,EAAE,MAMzB,CAAA;AAED,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAM3C,CAAA"}
|
package/dist/src/index.js
CHANGED
|
@@ -26,11 +26,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
26
26
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.schemaType = exports.emptySchema = exports.deepCompare = void 0;
|
|
29
|
+
exports.schemaType = exports.emptySchema = exports.compareArraysIgnoreOrder = exports.deepCompare = void 0;
|
|
30
30
|
const model_1 = require("./model");
|
|
31
31
|
const Typesafe = __importStar(require("@contember/typesafe"));
|
|
32
32
|
const type_schema_1 = require("./type-schema");
|
|
33
|
+
const actions_1 = require("./type-schema/actions");
|
|
33
34
|
__exportStar(require("./definition-generator"), exports);
|
|
35
|
+
__exportStar(require("./SchemaDatabaseMetadata"), exports);
|
|
34
36
|
__exportStar(require("./lax"), exports);
|
|
35
37
|
__exportStar(require("./model"), exports);
|
|
36
38
|
__exportStar(require("./acl"), exports);
|
|
@@ -40,16 +42,19 @@ __exportStar(require("./schemaNormalizer"), exports);
|
|
|
40
42
|
__exportStar(require("./schemaFilter"), exports);
|
|
41
43
|
var utils_1 = require("./utils");
|
|
42
44
|
Object.defineProperty(exports, "deepCompare", { enumerable: true, get: function () { return utils_1.deepCompare; } });
|
|
45
|
+
Object.defineProperty(exports, "compareArraysIgnoreOrder", { enumerable: true, get: function () { return utils_1.compareArraysIgnoreOrder; } });
|
|
43
46
|
exports.emptySchema = {
|
|
44
47
|
model: model_1.emptyModelSchema,
|
|
45
48
|
acl: { roles: {} },
|
|
46
49
|
validation: {},
|
|
50
|
+
actions: { triggers: {}, targets: {} },
|
|
47
51
|
settings: {},
|
|
48
52
|
};
|
|
49
53
|
exports.schemaType = Typesafe.object({
|
|
50
54
|
model: type_schema_1.modelSchema,
|
|
51
55
|
acl: type_schema_1.aclSchema,
|
|
52
56
|
validation: type_schema_1.validationSchema,
|
|
57
|
+
actions: Typesafe.coalesce(actions_1.actionsSchema, { triggers: {}, targets: {} }),
|
|
53
58
|
settings: Typesafe.coalesce(type_schema_1.settingsSchema, {}),
|
|
54
59
|
});
|
|
55
60
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,8DAA+C;AAC/C,+CAAwF;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,8DAA+C;AAC/C,+CAAwF;AACxF,mDAAqD;AAErD,yDAAsC;AACtC,2DAAwC;AACxC,wCAAqB;AACrB,0CAAuB;AACvB,wCAAqB;AACrB,8CAA2B;AAC3B,+CAA4B;AAC5B,qDAAkC;AAClC,iDAA8B;AAC9B,iCAA+D;AAAtD,oGAAA,WAAW,OAAA;AAAE,iHAAA,wBAAwB,OAAA;AAEjC,QAAA,WAAW,GAAW;IAClC,KAAK,EAAE,wBAAgB;IACvB,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;IAClB,UAAU,EAAE,EAAE;IACd,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IACtC,QAAQ,EAAE,EAAE;CACZ,CAAA;AAEY,QAAA,UAAU,GAA0B,QAAQ,CAAC,MAAM,CAAC;IAChE,KAAK,EAAE,yBAAW;IAClB,GAAG,EAAE,uBAAS;IACd,UAAU,EAAE,8BAAgB;IAC5B,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,uBAAa,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACxE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,4BAAc,EAAE,EAAE,CAAC;CAC/C,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LaxSchemaConverter.d.ts","sourceRoot":"","sources":["../../../src/lax/LaxSchemaConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAY,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAqE,MAAM,UAAU,CAAA;AACvG,OAAO,EAA4B,iBAAiB,EAA4B,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"LaxSchemaConverter.d.ts","sourceRoot":"","sources":["../../../src/lax/LaxSchemaConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAY,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAqE,MAAM,UAAU,CAAA;AACvG,OAAO,EAA4B,iBAAiB,EAA4B,MAAM,UAAU,CAAA;AAehG,qBAAa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,MAAM,EAAE,SAAS,EACjB,WAAW,GAAE,iBAAkD;IAI1E,OAAO,IAAI,MAAM;CAKxB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LaxSchemaConverter = void 0;
|
|
4
4
|
const schema_1 = require("@contember/schema");
|
|
5
5
|
const model_1 = require("../model");
|
|
6
|
+
const index_1 = require("../index");
|
|
6
7
|
const simpleColumnTypes = {
|
|
7
8
|
boolean: { type: schema_1.Model.ColumnType.Bool, columnType: 'boolean' },
|
|
8
9
|
int: { type: schema_1.Model.ColumnType.Int, columnType: 'integer' },
|
|
@@ -46,9 +47,7 @@ class LaxSchemaBuilder {
|
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
return {
|
|
49
|
-
|
|
50
|
-
settings: {},
|
|
51
|
-
validation: {},
|
|
50
|
+
...index_1.emptySchema,
|
|
52
51
|
model: {
|
|
53
52
|
enums: this.enums,
|
|
54
53
|
entities: this.entities,
|
|
@@ -183,8 +182,8 @@ class LaxSchemaBuilder {
|
|
|
183
182
|
var _b;
|
|
184
183
|
return (_a = (_b = this.entities)[entityName]) !== null && _a !== void 0 ? _a : (_b[entityName] = {
|
|
185
184
|
name: entityName,
|
|
186
|
-
unique:
|
|
187
|
-
indexes:
|
|
185
|
+
unique: [],
|
|
186
|
+
indexes: [],
|
|
188
187
|
primary: 'id',
|
|
189
188
|
primaryColumn: 'id',
|
|
190
189
|
tableName: this.conventions.getTableName(entityName),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LaxSchemaConverter.js","sourceRoot":"","sources":["../../../src/lax/LaxSchemaConverter.ts"],"names":[],"mappings":";;;AAAA,8CAA2D;AAE3D,oCAAgG;
|
|
1
|
+
{"version":3,"file":"LaxSchemaConverter.js","sourceRoot":"","sources":["../../../src/lax/LaxSchemaConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,qBAAqB,CAAA"}
|
package/dist/src/model/index.js
CHANGED
|
@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./modelUtils"), exports);
|
|
18
|
-
__exportStar(require("./NamingHelper"), exports);
|
|
19
18
|
__exportStar(require("./resolveDefaultColumnType"), exports);
|
|
20
19
|
__exportStar(require("./NamingConventions"), exports);
|
|
21
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/model/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/model/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6DAA0C;AAC1C,sDAAmC"}
|