@forestadmin/datasource-customizer 1.35.4 → 1.35.5
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.
|
@@ -77,6 +77,6 @@ export default class DataSourceCustomizer<S extends TSchema = TSchema> {
|
|
|
77
77
|
use<Options>(plugin: Plugin<Options>, options?: Options): this;
|
|
78
78
|
getDataSource(logger: Logger): Promise<DataSource>;
|
|
79
79
|
getFactory(): DataSourceFactory;
|
|
80
|
-
updateTypesOnFileSystem(typingsPath: string, typingsMaxDepth: number): Promise<void>;
|
|
80
|
+
updateTypesOnFileSystem(typingsPath: string, typingsMaxDepth: number, logger?: Logger): Promise<void>;
|
|
81
81
|
}
|
|
82
82
|
//# sourceMappingURL=datasource-customizer.d.ts.map
|
|
@@ -129,9 +129,10 @@ class DataSourceCustomizer {
|
|
|
129
129
|
getFactory() {
|
|
130
130
|
return async (logger) => this.getDataSource(logger);
|
|
131
131
|
}
|
|
132
|
-
async updateTypesOnFileSystem(typingsPath, typingsMaxDepth) {
|
|
133
|
-
|
|
132
|
+
async updateTypesOnFileSystem(typingsPath, typingsMaxDepth, logger) {
|
|
133
|
+
const typingGenerator = new typing_generator_1.default(logger);
|
|
134
|
+
return typingGenerator.updateTypesOnFileSystem(this.stack.hook, typingsPath, typingsMaxDepth);
|
|
134
135
|
}
|
|
135
136
|
}
|
|
136
137
|
exports.default = DataSourceCustomizer;
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YXNvdXJjZS1jdXN0b21pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2RhdGFzb3VyY2UtY3VzdG9taXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVFBLG9GQUEyRDtBQUUzRCw2RkFBb0U7QUFDcEUscUZBQTREO0FBQzVELHFGQUFpRjtBQUNqRiwyRkFBNEY7QUFHNUYsMEVBQWlEO0FBRWpEOzs7Ozs7Ozs7R0FTRztBQUNILE1BQXFCLG9CQUFvQjtJQUl2Qzs7T0FFRztJQUNILElBQUksTUFBTTtRQUNSLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDO0lBQ3RDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksV0FBVztRQUNiLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUMvQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUEwQixDQUFDLENBQ2pELENBQUM7SUFDSixDQUFDO0lBRUQ7UUFDRSxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSw4QkFBbUIsRUFBYyxDQUFDO1FBQ2pFLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSwwQkFBZSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsYUFBYSxDQUFDLE9BQTBCLEVBQUUsT0FBMkI7UUFDbkUsSUFBSSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUMsTUFBTSxFQUFDLEVBQUU7WUFDM0MsSUFBSSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFdkMsSUFBSSxPQUFPLEVBQUUsT0FBTyxJQUFJLE9BQU8sRUFBRSxPQUFPLEVBQUU7Z0JBQ3hDLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxvQkFBOEIsQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDNUUsb0JBQW9CLENBQUMsdUJBQXVCLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQy9FLFVBQVUsR0FBRyxvQkFBb0IsQ0FBQzthQUNuQztZQUVELElBQUksT0FBTyxFQUFFLE1BQU0sRUFBRTtnQkFDbkIsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLG9CQUFtQyxDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUM3RSxnQkFBZ0IsQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ25ELFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQzthQUMvQjtZQUVELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDckQsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNILFFBQVEsQ0FBQyxJQUFZLEVBQUUsVUFBd0M7UUFDN0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLElBQUksRUFBRTtZQUN2QyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzlDLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG1CQUFtQixDQUNqQixJQUFPLEVBQ1AsTUFBMkQ7UUFFM0QsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUVqQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7O09BR0c7SUFDSCxhQUFhLENBQStCLElBQU87UUFDakQsT0FBTyxJQUFJLCtCQUFvQixDQUFPLElBQUksRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILGdCQUFnQixDQUFDLEdBQUcsS0FBMkI7UUFDN0MsSUFBSSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLElBQUksRUFBRTtZQUN2QyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDbkUsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILEdBQUcsQ0FBVSxNQUF1QixFQUFFLE9BQWlCO1FBQ3JELElBQUksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDdkMsTUFBTSxNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsTUFBYztRQUNoQyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMseUJBQXlCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFbkQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQztJQUMvQixDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sS0FBSyxFQUFFLE1BQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRUQsS0FBSyxDQUFDLHVCQUF1QixDQUMzQixXQUFtQixFQUNuQixlQUF1QixFQUN2QixNQUFlO1FBRWYsTUFBTSxlQUFlLEdBQUcsSUFBSSwwQkFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRXBELE9BQU8sZUFBZSxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxlQUFlLENBQUMsQ0FBQztJQUNoRyxDQUFDO0NBQ0Y7QUFuSkQsdUNBbUpDIn0=
|
|
@@ -1,20 +1,26 @@
|
|
|
1
|
+
import type { Logger } from '@forestadmin/datasource-toolkit';
|
|
1
2
|
import { DataSource } from '@forestadmin/datasource-toolkit';
|
|
2
3
|
export default class TypingGenerator {
|
|
4
|
+
private readonly logger;
|
|
5
|
+
private readonly options;
|
|
6
|
+
constructor(logger: Logger, options?: {
|
|
7
|
+
maxFieldsCount?: number;
|
|
8
|
+
});
|
|
3
9
|
/**
|
|
4
10
|
* Write types to disk at a given path.
|
|
5
11
|
* This method read the file which is already there before overwriting so that customers
|
|
6
12
|
* using equivalents to nodemon to not enter restart loops.
|
|
7
13
|
*/
|
|
8
|
-
|
|
14
|
+
updateTypesOnFileSystem(dataSource: DataSource, typingsPath: string, typingsMaxDepth: number): Promise<void>;
|
|
9
15
|
/**
|
|
10
16
|
* Generates types on a string.
|
|
11
17
|
*/
|
|
12
|
-
|
|
13
|
-
private
|
|
14
|
-
private
|
|
15
|
-
private
|
|
16
|
-
private
|
|
17
|
-
private
|
|
18
|
-
private
|
|
18
|
+
generateTypes(dataSource: DataSource, maxDepth: number): string;
|
|
19
|
+
private generateAliases;
|
|
20
|
+
private getRow;
|
|
21
|
+
private getRelations;
|
|
22
|
+
private getFlatRelations;
|
|
23
|
+
private getFieldsOnCollection;
|
|
24
|
+
private getType;
|
|
19
25
|
}
|
|
20
26
|
//# sourceMappingURL=typing-generator.d.ts.map
|
package/dist/typing-generator.js
CHANGED
|
@@ -3,13 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
4
4
|
const promises_1 = require("fs/promises");
|
|
5
5
|
class TypingGenerator {
|
|
6
|
+
constructor(logger, options = {}) {
|
|
7
|
+
this.logger = logger;
|
|
8
|
+
this.options = {
|
|
9
|
+
maxFieldsCount: 10000,
|
|
10
|
+
};
|
|
11
|
+
this.options.maxFieldsCount = options.maxFieldsCount ?? this.options.maxFieldsCount;
|
|
12
|
+
}
|
|
6
13
|
/**
|
|
7
14
|
* Write types to disk at a given path.
|
|
8
15
|
* This method read the file which is already there before overwriting so that customers
|
|
9
16
|
* using equivalents to nodemon to not enter restart loops.
|
|
10
17
|
*/
|
|
11
|
-
|
|
12
|
-
const newTypes =
|
|
18
|
+
async updateTypesOnFileSystem(dataSource, typingsPath, typingsMaxDepth) {
|
|
19
|
+
const newTypes = this.generateTypes(dataSource, typingsMaxDepth);
|
|
13
20
|
let olderTypes = null;
|
|
14
21
|
try {
|
|
15
22
|
olderTypes = await (0, promises_1.readFile)(typingsPath, { encoding: 'utf-8' });
|
|
@@ -27,7 +34,7 @@ class TypingGenerator {
|
|
|
27
34
|
/**
|
|
28
35
|
* Generates types on a string.
|
|
29
36
|
*/
|
|
30
|
-
|
|
37
|
+
generateTypes(dataSource, maxDepth) {
|
|
31
38
|
const collections = [...dataSource.collections].sort((a, b) => a.name.localeCompare(b.name));
|
|
32
39
|
return [
|
|
33
40
|
`/* eslint-disable */`,
|
|
@@ -53,7 +60,7 @@ class TypingGenerator {
|
|
|
53
60
|
'};\n',
|
|
54
61
|
].join('\n');
|
|
55
62
|
}
|
|
56
|
-
|
|
63
|
+
generateAliases(dataSource) {
|
|
57
64
|
return dataSource.collections
|
|
58
65
|
.flatMap(collection => {
|
|
59
66
|
const name = collection.name.slice(0, 1).toUpperCase() +
|
|
@@ -71,13 +78,13 @@ class TypingGenerator {
|
|
|
71
78
|
})
|
|
72
79
|
.join('\n');
|
|
73
80
|
}
|
|
74
|
-
|
|
81
|
+
getRow(collection) {
|
|
75
82
|
const content = Object.entries(collection.schema.fields).reduce((memo, [name, field]) => {
|
|
76
83
|
return field.type === 'Column' ? [...memo, ` '${name}': ${this.getType(field)};`] : memo;
|
|
77
84
|
}, []);
|
|
78
85
|
return ` plain: {\n${content.join('\n')}\n };`;
|
|
79
86
|
}
|
|
80
|
-
|
|
87
|
+
getRelations(collection) {
|
|
81
88
|
const content = Object.entries(collection.schema.fields).reduce((memo, [name, field]) => {
|
|
82
89
|
if (field.type === 'ManyToOne' || field.type === 'OneToOne') {
|
|
83
90
|
const relation = field.foreignCollection;
|
|
@@ -90,40 +97,54 @@ class TypingGenerator {
|
|
|
90
97
|
}, []);
|
|
91
98
|
return content.length ? ` nested: {\n${content.join('\n')}\n };` : ` nested: {};`;
|
|
92
99
|
}
|
|
93
|
-
|
|
94
|
-
const fields = this.
|
|
100
|
+
getFlatRelations(collection, maxDepth) {
|
|
101
|
+
const fields = this.getFieldsOnCollection(collection, maxDepth);
|
|
95
102
|
return fields.length
|
|
96
103
|
? ` flat: {\n ${fields.join('\n ')}\n };`
|
|
97
104
|
: ` flat: {};`;
|
|
98
105
|
}
|
|
99
|
-
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
{
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
106
|
+
getFieldsOnCollection(mainCollection, maxDepth) {
|
|
107
|
+
const result = [];
|
|
108
|
+
const queue = [{ collection: mainCollection, depth: 0, prefix: '', traversed: [] }];
|
|
109
|
+
while (queue.length > 0 && result.length < this.options.maxFieldsCount) {
|
|
110
|
+
const { collection, depth, prefix, traversed } = queue.shift();
|
|
111
|
+
if (prefix) {
|
|
112
|
+
result.push(...Object.entries(collection.schema.fields)
|
|
113
|
+
.filter(([, schema]) => schema.type === 'Column')
|
|
114
|
+
.map(([name, schema]) => `'${prefix}:${name}': ${this.getType(schema)};`));
|
|
115
|
+
}
|
|
116
|
+
if (depth < maxDepth) {
|
|
117
|
+
queue.push(...Object.entries(collection.schema.fields)
|
|
118
|
+
.filter(([, schema]) => schema.type === 'ManyToOne' || schema.type === 'OneToOne')
|
|
119
|
+
.map(([name, schema]) => {
|
|
120
|
+
return {
|
|
121
|
+
subCollection: collection.dataSource.getCollection(schema.foreignCollection),
|
|
122
|
+
inverse: datasource_toolkit_1.CollectionUtils.getInverseRelation(collection, name),
|
|
123
|
+
name,
|
|
124
|
+
schema,
|
|
125
|
+
};
|
|
126
|
+
})
|
|
127
|
+
.filter(({ subCollection, inverse }) => {
|
|
128
|
+
// Do not expand inverse relations, as those create useless cycles
|
|
129
|
+
return !traversed.find(({ c, r }) => c === subCollection && r === inverse);
|
|
130
|
+
})
|
|
131
|
+
.map(({ subCollection, name }) => {
|
|
132
|
+
return {
|
|
133
|
+
collection: subCollection,
|
|
134
|
+
depth: depth + 1,
|
|
135
|
+
prefix: prefix ? `${prefix}:${name}` : name,
|
|
136
|
+
traversed: [...traversed, { c: collection, r: name }],
|
|
137
|
+
};
|
|
138
|
+
}));
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
if (queue.length || result.length >= this.options.maxFieldsCount) {
|
|
142
|
+
this.logger?.('Warn', `Fields generation stopped on collection ${mainCollection.name}, ` +
|
|
143
|
+
`try using a lower typingsMaxDepth (${maxDepth}) to avoid this issue.`);
|
|
144
|
+
}
|
|
145
|
+
return result.slice(0, this.options.maxFieldsCount);
|
|
125
146
|
}
|
|
126
|
-
|
|
147
|
+
getType(field) {
|
|
127
148
|
if (Array.isArray(field.columnType)) {
|
|
128
149
|
return `Array<${this.getType({
|
|
129
150
|
columnType: field.columnType[0],
|
|
@@ -153,4 +174,4 @@ class TypingGenerator {
|
|
|
153
174
|
}
|
|
154
175
|
}
|
|
155
176
|
exports.default = TypingGenerator;
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typing-generator.js","sourceRoot":"","sources":["../src/typing-generator.ts"],"names":[],"mappings":"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"}
|