@builder6/tables 0.6.2 → 0.6.3
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.
|
@@ -2,5 +2,5 @@ import { MongodbService } from '@builder6/core';
|
|
|
2
2
|
export declare class MetaService {
|
|
3
3
|
private readonly mongodbService;
|
|
4
4
|
constructor(mongodbService: MongodbService);
|
|
5
|
-
getTableMeta(baseId: string, tableId: string): Promise<
|
|
5
|
+
getTableMeta(baseId: string, tableId: string): Promise<any>;
|
|
6
6
|
}
|
|
@@ -2,29 +2,23 @@ import 'regenerator-runtime/runtime';
|
|
|
2
2
|
import { Collection } from 'mongodb';
|
|
3
3
|
import { ConfigService } from '@nestjs/config';
|
|
4
4
|
import { MongodbService } from '@builder6/core';
|
|
5
|
+
import { MetaService } from './meta.service';
|
|
5
6
|
export declare class TablesService {
|
|
6
7
|
private configService;
|
|
7
8
|
private readonly mongodbService;
|
|
9
|
+
private readonly metaService;
|
|
8
10
|
private db;
|
|
9
11
|
private loaders;
|
|
10
12
|
private readonly logger;
|
|
11
|
-
constructor(configService: ConfigService, mongodbService: MongodbService);
|
|
13
|
+
constructor(configService: ConfigService, mongodbService: MongodbService, metaService: MetaService);
|
|
12
14
|
getCollection(baseId: string, tableId: string): Collection;
|
|
13
15
|
createRecord(baseId: string, tableId: any, data: any): Promise<any>;
|
|
14
16
|
getRecords(baseId: string, tableId: string, loadOptions: any, processingOptions: any): Promise<any>;
|
|
15
|
-
find(baseId: string, tableId: string, query: object, options?: object): Promise<
|
|
16
|
-
findOne(baseId: string, tableId: string, query: object): Promise<
|
|
17
|
-
updateRecord(baseId: string, tableId: string, id: string, data: any): Promise<
|
|
18
|
-
deleteOne(baseId: string, tableId: string, query: object): Promise<
|
|
19
|
-
deleteMany(baseId: string, tableId: string, query: object): Promise<
|
|
17
|
+
find(baseId: string, tableId: string, query: object, options?: object): Promise<any>;
|
|
18
|
+
findOne(baseId: string, tableId: string, query: object): Promise<any>;
|
|
19
|
+
updateRecord(baseId: string, tableId: string, id: string, data: any): Promise<any>;
|
|
20
|
+
deleteOne(baseId: string, tableId: string, query: object): Promise<any>;
|
|
21
|
+
deleteMany(baseId: string, tableId: string, query: object): Promise<any>;
|
|
20
22
|
getMongodbDataLoader(collectionName: any, fields?: string[]): Promise<any>;
|
|
21
|
-
getTableField(baseId: any, tableId: any, fieldName: any): Promise<
|
|
22
|
-
type: string;
|
|
23
|
-
name: any;
|
|
24
|
-
reference_to: string;
|
|
25
|
-
} | {
|
|
26
|
-
name: any;
|
|
27
|
-
reference_to: any;
|
|
28
|
-
type?: undefined;
|
|
29
|
-
}>;
|
|
23
|
+
getTableField(baseId: any, tableId: any, fieldName: any): Promise<any>;
|
|
30
24
|
}
|
|
@@ -19,10 +19,12 @@ const query_mongodb_1 = require("@builder6/query-mongodb");
|
|
|
19
19
|
const config_1 = require("@nestjs/config");
|
|
20
20
|
const DataLoader = require("dataloader");
|
|
21
21
|
const core_1 = require("@builder6/core");
|
|
22
|
+
const meta_service_1 = require("./meta.service");
|
|
22
23
|
let TablesService = TablesService_1 = class TablesService {
|
|
23
|
-
constructor(configService, mongodbService) {
|
|
24
|
+
constructor(configService, mongodbService, metaService) {
|
|
24
25
|
this.configService = configService;
|
|
25
26
|
this.mongodbService = mongodbService;
|
|
27
|
+
this.metaService = metaService;
|
|
26
28
|
this.loaders = new Map();
|
|
27
29
|
this.logger = new common_1.Logger(TablesService_1.name);
|
|
28
30
|
const mongoUrl = configService.get('tables.mongo.url') || configService.get('mongo.url');
|
|
@@ -55,10 +57,8 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
55
57
|
});
|
|
56
58
|
const records = result.data;
|
|
57
59
|
const expands = loadOptions?.expands || [];
|
|
58
|
-
console.log('query expand fields', expands);
|
|
59
60
|
for (const expand of expands) {
|
|
60
61
|
const { reference_to } = await this.getTableField(baseId, tableId, expand);
|
|
61
|
-
console.log('query expand fields', expand, reference_to);
|
|
62
62
|
if (reference_to) {
|
|
63
63
|
const loader = await this.getMongodbDataLoader(reference_to, [
|
|
64
64
|
'_id',
|
|
@@ -69,7 +69,6 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
69
69
|
const expandedRecord = (await loader.load(record[expand])) || {
|
|
70
70
|
_id: expand,
|
|
71
71
|
};
|
|
72
|
-
console.log('expandedRecord', expand, expandedRecord);
|
|
73
72
|
record[expand] = expandedRecord;
|
|
74
73
|
}
|
|
75
74
|
}
|
|
@@ -126,6 +125,7 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
126
125
|
return loader;
|
|
127
126
|
}
|
|
128
127
|
async getTableField(baseId, tableId, fieldName) {
|
|
128
|
+
const table = await this.metaService.getTableMeta(baseId, tableId);
|
|
129
129
|
if (fieldName === 'created_by' || fieldName === 'modified_by') {
|
|
130
130
|
return {
|
|
131
131
|
type: 'lookup',
|
|
@@ -133,16 +133,14 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
133
133
|
reference_to: 'users',
|
|
134
134
|
};
|
|
135
135
|
}
|
|
136
|
-
return
|
|
137
|
-
name: fieldName,
|
|
138
|
-
reference_to: null,
|
|
139
|
-
};
|
|
136
|
+
return table.fields.find((field) => field.name === fieldName);
|
|
140
137
|
}
|
|
141
138
|
};
|
|
142
139
|
exports.TablesService = TablesService;
|
|
143
140
|
exports.TablesService = TablesService = TablesService_1 = __decorate([
|
|
144
141
|
(0, common_1.Injectable)(),
|
|
145
142
|
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
146
|
-
core_1.MongodbService
|
|
143
|
+
core_1.MongodbService,
|
|
144
|
+
meta_service_1.MetaService])
|
|
147
145
|
], TablesService);
|
|
148
146
|
//# sourceMappingURL=tables.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.service.js","sourceRoot":"","sources":["../../src/tables/tables.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAAsD;AACtD,+BAAoC;AACpC,2DAAmE;AACnE,2CAA+C;AAC/C,yCAAyC;AACzC,yCAAgD;
|
|
1
|
+
{"version":3,"file":"tables.service.js","sourceRoot":"","sources":["../../src/tables/tables.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/tables",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -11,12 +11,11 @@
|
|
|
11
11
|
"build:watch": "rm -rf dist && tsc --watch"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@builder6/core": "^0.6.
|
|
15
|
-
"dataloader": "^2.2.3"
|
|
16
|
-
"nodemailer": "^6.9.16"
|
|
14
|
+
"@builder6/core": "^0.6.3",
|
|
15
|
+
"dataloader": "^2.2.3"
|
|
17
16
|
},
|
|
18
17
|
"publishConfig": {
|
|
19
18
|
"access": "public"
|
|
20
19
|
},
|
|
21
|
-
"gitHead": "
|
|
20
|
+
"gitHead": "95072e46086936653f20eafe111f229d4f751c84"
|
|
22
21
|
}
|