@builder6/core 0.9.3 → 0.10.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/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.module.js +2 -1
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/auth/index.d.ts +1 -0
- package/dist/auth/index.js +1 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/users.controller.d.ts +8 -0
- package/dist/auth/users.controller.js +88 -0
- package/dist/auth/users.controller.js.map +1 -0
- package/dist/files/files.controller.js +1 -0
- package/dist/files/files.controller.js.map +1 -1
- package/dist/files/files.service.js +5 -6
- package/dist/files/files.service.js.map +1 -1
- package/dist/mongodb/mongodb.service.d.ts +2 -1
- package/dist/mongodb/mongodb.service.js +13 -2
- package/dist/mongodb/mongodb.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,iDAA6C;AAC7C,6CAAoD;AAK7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IA2B1C,AAAN,KAAK,CAAC,KAAK,CACF,GAAY,EACZ,GAAa,EACE,WAAmB,EACvB,QAAgB,EAChB,QAAgB;QAElC,IAAI;YACF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;gBAC1B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;aAC/E;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAC1C,QAAQ,EACR,QAAQ,CACT,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAEzD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE;gBACnC,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,KAAK;gBACf,UAAU;gBACV,YAAY;aACb,CAAC,CAAC;YACH,IAAI,WAAW;gBACb,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;gBAEjC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;SACnE;IACH,CAAC;CAEF,CAAA;AAjCO;IAzBL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,aAAI,EAAC,OAAO,CAAC;IACb,IAAA,kBAAQ,EAAC;QACR,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,iBAAO,EAAC;QACP,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC7B;SACF;QACD,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,MAAM;iBACjB;aACF;SACF;KACF,CAAC;IAEC,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;IAChB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;;;;2CA0BlB;AA3DU,cAAc;IAD1B,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAES,0BAAW;GADjC,cAAc,CA6D1B;AA7DY,wCAAc"}
|
package/dist/auth/auth.module.js
CHANGED
|
@@ -14,6 +14,7 @@ const auth_service_1 = require("./auth.service");
|
|
|
14
14
|
const mongodb_module_1 = require("../mongodb/mongodb.module");
|
|
15
15
|
const admin_guard_1 = require("./admin.guard");
|
|
16
16
|
const auth_guard_1 = require("./auth.guard");
|
|
17
|
+
const users_controller_1 = require("./users.controller");
|
|
17
18
|
let AuthModule = class AuthModule {
|
|
18
19
|
};
|
|
19
20
|
AuthModule = __decorate([
|
|
@@ -25,7 +26,7 @@ AuthModule = __decorate([
|
|
|
25
26
|
signOptions: { expiresIn: '60s' },
|
|
26
27
|
}),
|
|
27
28
|
],
|
|
28
|
-
controllers: [auth_controller_1.AuthController],
|
|
29
|
+
controllers: [auth_controller_1.AuthController, users_controller_1.UsersController],
|
|
29
30
|
providers: [auth_service_1.AuthService, admin_guard_1.AdminGuard, auth_guard_1.AuthGuard],
|
|
30
31
|
exports: [auth_service_1.AuthService, admin_guard_1.AdminGuard, auth_guard_1.AuthGuard],
|
|
31
32
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qCAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,8DAA0D;AAC1D,+CAA2C;AAC3C,6CAAyC;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qCAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,8DAA0D;AAC1D,+CAA2C;AAC3C,6CAAyC;AACzC,yDAAqD;AAc9C,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,UAAU;IAZtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,8BAAa;YACb,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,QAAQ;gBAC7C,WAAW,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;aAClC,CAAC;SACH;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,kCAAe,CAAC;QAC9C,SAAS,EAAE,CAAC,0BAAW,EAAE,wBAAU,EAAE,sBAAS,CAAC;QAC/C,OAAO,EAAE,CAAC,0BAAW,EAAE,wBAAU,EAAE,sBAAS,CAAC;KAC9C,CAAC;GACW,UAAU,CAAG;AAAb,gCAAU"}
|
package/dist/auth/index.d.ts
CHANGED
package/dist/auth/index.js
CHANGED
|
@@ -19,4 +19,5 @@ __exportStar(require("./auth.controller"), exports);
|
|
|
19
19
|
__exportStar(require("./auth.guard"), exports);
|
|
20
20
|
__exportStar(require("./auth.module"), exports);
|
|
21
21
|
__exportStar(require("./auth.service"), exports);
|
|
22
|
+
__exportStar(require("./users.controller"), exports);
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,oDAAkC;AAClC,+CAA6B;AAC7B,gDAA8B;AAC9B,iDAA+B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,oDAAkC;AAClC,+CAA6B;AAC7B,gDAA8B;AAC9B,iDAA+B;AAC/B,qDAAmC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { AuthService } from './auth.service';
|
|
2
|
+
import { Request, Response } from 'express';
|
|
3
|
+
export declare class UsersController {
|
|
4
|
+
private authService;
|
|
5
|
+
constructor(authService: AuthService);
|
|
6
|
+
me(req: Request): Promise<any>;
|
|
7
|
+
meAvatar(req: Request, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.UsersController = void 0;
|
|
16
|
+
const common_1 = require("@nestjs/common");
|
|
17
|
+
const auth_service_1 = require("./auth.service");
|
|
18
|
+
const auth_guard_1 = require("./auth.guard");
|
|
19
|
+
let UsersController = class UsersController {
|
|
20
|
+
constructor(authService) {
|
|
21
|
+
this.authService = authService;
|
|
22
|
+
}
|
|
23
|
+
async me(req) {
|
|
24
|
+
const user = req['user'];
|
|
25
|
+
return user;
|
|
26
|
+
}
|
|
27
|
+
async meAvatar(req, res) {
|
|
28
|
+
const me = req['user'];
|
|
29
|
+
const space = me.space;
|
|
30
|
+
const user = await this.authService.getSpaceUser(req.params.userId, space);
|
|
31
|
+
if (!user) {
|
|
32
|
+
return res.status(404).json({ message: 'User not found' });
|
|
33
|
+
}
|
|
34
|
+
const defaultAvatar = `
|
|
35
|
+
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
36
|
+
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
|
|
37
|
+
<style type="text/css">
|
|
38
|
+
.st0{fill:#FFFFFF;}
|
|
39
|
+
.st1{fill:#D0D0D0;}
|
|
40
|
+
</style>
|
|
41
|
+
<g>
|
|
42
|
+
<path class="st0" d="M36,71.1c-19.3,0-35-15.7-35-35s15.7-35,35-35s35,15.7,35,35S55.3,71.1,36,71.1z"/>
|
|
43
|
+
<path class="st1" d="M36,2.1c18.7,0,34,15.3,34,34s-15.3,34-34,34S2,54.8,2,36.1S17.3,2.1,36,2.1 M36,0.1c-19.9,0-36,16.1-36,36
|
|
44
|
+
s16.1,36,36,36s36-16.1,36-36S55.9,0.1,36,0.1L36,0.1z"/>
|
|
45
|
+
</g>
|
|
46
|
+
<g>
|
|
47
|
+
<g>
|
|
48
|
+
<path class="st1" d="M35.8,42.6c8.3,0,15.1-6.8,15.1-15.1c0-8.3-6.8-15.1-15.1-15.1c-8.3,0-15.1,6.8-15.1,15.1
|
|
49
|
+
C20.7,35.8,27.5,42.6,35.8,42.6z"/>
|
|
50
|
+
<path class="st1" d="M36.2,70.7c8.7,0,16.7-3.1,22.9-8.2c-3.6-9.6-12.7-15.5-23.3-15.5c-10.4,0-19.4,5.7-23.1,15
|
|
51
|
+
C19,67.4,27.2,70.7,36.2,70.7z"/>
|
|
52
|
+
</g>
|
|
53
|
+
</g>
|
|
54
|
+
</svg>
|
|
55
|
+
`;
|
|
56
|
+
if (user.avatar) {
|
|
57
|
+
res.redirect(`/api/v6/files/avatars/${user.avatar}`);
|
|
58
|
+
}
|
|
59
|
+
else if (user.avatar_url) {
|
|
60
|
+
res.redirect(user.avatar_url);
|
|
61
|
+
}
|
|
62
|
+
res.set('Content-Type', 'image/svg+xml');
|
|
63
|
+
res.send(defaultAvatar);
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
__decorate([
|
|
67
|
+
(0, common_1.UseGuards)(auth_guard_1.AuthGuard),
|
|
68
|
+
(0, common_1.Get)('me'),
|
|
69
|
+
__param(0, (0, common_1.Req)()),
|
|
70
|
+
__metadata("design:type", Function),
|
|
71
|
+
__metadata("design:paramtypes", [Object]),
|
|
72
|
+
__metadata("design:returntype", Promise)
|
|
73
|
+
], UsersController.prototype, "me", null);
|
|
74
|
+
__decorate([
|
|
75
|
+
(0, common_1.UseGuards)(auth_guard_1.AuthGuard),
|
|
76
|
+
(0, common_1.Get)(':userId/avatar'),
|
|
77
|
+
__param(0, (0, common_1.Req)()),
|
|
78
|
+
__param(1, (0, common_1.Res)()),
|
|
79
|
+
__metadata("design:type", Function),
|
|
80
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
81
|
+
__metadata("design:returntype", Promise)
|
|
82
|
+
], UsersController.prototype, "meAvatar", null);
|
|
83
|
+
UsersController = __decorate([
|
|
84
|
+
(0, common_1.Controller)('api/v6/users'),
|
|
85
|
+
__metadata("design:paramtypes", [auth_service_1.AuthService])
|
|
86
|
+
], UsersController);
|
|
87
|
+
exports.UsersController = UsersController;
|
|
88
|
+
//# sourceMappingURL=users.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/auth/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,iDAA6C;AAG7C,6CAAyC;AAGlC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAI1C,AAAN,KAAK,CAAC,EAAE,CACC,GAAY;QAEnB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAIK,AAAN,KAAK,CAAC,QAAQ,CACL,GAAY,EACZ,GAAa;QAEpB,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;QACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;SAC5D;QAED,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;KAqBrB,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,GAAG,CAAC,QAAQ,CAAC,yBAAyB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SACtD;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YAC1B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/B;QAED,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1B,CAAC;CAEF,CAAA;AArDO;IAFL,IAAA,kBAAS,EAAC,sBAAS,CAAC;IACpB,IAAA,YAAG,EAAC,IAAI,CAAC;IAEP,WAAA,IAAA,YAAG,GAAE,CAAA;;;;yCAIP;AAIK;IAFL,IAAA,kBAAS,EAAC,sBAAS,CAAC;IACpB,IAAA,YAAG,EAAC,gBAAgB,CAAC;IAEnB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAwCP;AAxDU,eAAe;IAD3B,IAAA,mBAAU,EAAC,cAAc,CAAC;qCAEQ,0BAAW;GADjC,eAAe,CA0D3B;AA1DY,0CAAe"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.controller.js","sourceRoot":"","sources":["../../src/files/files.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"files.controller.js","sourceRoot":"","sources":["../../src/files/files.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,15 +51,14 @@ let FilesService = FilesService_1 = class FilesService {
|
|
|
51
51
|
}
|
|
52
52
|
async uploadFile(collectionName = 'cfs.files.filerecord', file, metadata) {
|
|
53
53
|
const { _id = (0, uuid_1.v4)(), object_name, owner, space, record_id, parent, } = metadata;
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
'application/octet-stream';
|
|
54
|
+
const fileName = Buffer.from(file.originalname, 'binary').toString('utf8');
|
|
55
|
+
const mimeType = file.mimetype || mime.lookup(fileName) || 'application/octet-stream';
|
|
57
56
|
let relativeKey;
|
|
58
57
|
const md5 = crypto.createHash('md5').update(file.buffer).digest('hex');
|
|
59
58
|
const currentDate = new Date();
|
|
60
59
|
const year = currentDate.getFullYear();
|
|
61
60
|
const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
|
|
62
|
-
const uniqueFileName = `${_id}-${
|
|
61
|
+
const uniqueFileName = `${_id}-${fileName}`;
|
|
63
62
|
const collectionFolderName = this.getCollectionFolderName(collectionName);
|
|
64
63
|
if (this.cfsStore === 'local') {
|
|
65
64
|
const fileDir = path.join(this.storageDir, 'files', collectionFolderName, object_name || 'default', year.toString(), month);
|
|
@@ -98,7 +97,7 @@ let FilesService = FilesService_1 = class FilesService {
|
|
|
98
97
|
original: {
|
|
99
98
|
type: mimeType,
|
|
100
99
|
size: file.size,
|
|
101
|
-
name:
|
|
100
|
+
name: fileName,
|
|
102
101
|
md5,
|
|
103
102
|
},
|
|
104
103
|
metadata: {
|
|
@@ -111,7 +110,7 @@ let FilesService = FilesService_1 = class FilesService {
|
|
|
111
110
|
uploadedAt: new Date(),
|
|
112
111
|
copies: {
|
|
113
112
|
[collectionFolderName]: {
|
|
114
|
-
name:
|
|
113
|
+
name: fileName,
|
|
115
114
|
type: mimeType,
|
|
116
115
|
size: file.size,
|
|
117
116
|
key: relativeKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.service.js","sourceRoot":"","sources":["../../src/files/files.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+BAA+B;AAC/B,+BAA+B;AAC/B,+BAAkC;AAClC,6BAA6B;AAC7B,gEAA4D;AAE5D,mCAAmC;AACnC,2CAA+C;AAC/C,iCAAiC;AAG1B,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAQvB,YACU,aAA4B,EAC5B,cAA8B;QAD9B,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAJvB,WAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;QAMtD,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,mBAAmB,CAAC;QAE1E,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC;QAC1D,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE;YAC1B,IAAI,CAAC,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;gBACnB,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC;gBAClD,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,0BAA0B,CAAC;gBAC1D,eAAe,EAAE,aAAa,CAAC,GAAG,CAAC,8BAA8B,CAAC;gBAClE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBAC9C,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;SACxD;IACH,CAAC;IAED,uBAAuB,CAAC,cAAc;QAGpC,IAAI,oBAAoB,GAAG,cAAc,CAAC;QAC1C,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,IACE,mBAAmB,CAAC,MAAM,KAAK,CAAC;YAChC,mBAAmB,CAAC,CAAC,CAAC,KAAK,KAAK;YAChC,mBAAmB,CAAC,CAAC,CAAC,KAAK,YAAY,EACvC;YACA,oBAAoB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU,CACd,iBAAyB,sBAAsB,EAC/C,IAKC,EACD,QAOC;QAED,MAAM,EACJ,GAAG,GAAG,IAAA,SAAI,GAAE,EACZ,WAAW,EACX,KAAK,EACL,KAAK,EACL,SAAS,EACT,MAAM,GACP,GAAG,QAAQ,CAAC;QAEb,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"files.service.js","sourceRoot":"","sources":["../../src/files/files.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ export declare class MongodbService {
|
|
|
7
7
|
private client;
|
|
8
8
|
constructor(configService: ConfigService);
|
|
9
9
|
getCollection(collectionName: string): Promise<any>;
|
|
10
|
-
insertOne(collectionName: string,
|
|
10
|
+
insertOne(collectionName: string, record: any): Promise<any>;
|
|
11
|
+
insertMany(collectionName: string, records: any[]): Promise<any>;
|
|
11
12
|
find(collectionName: string, query: object, options?: object): Promise<any>;
|
|
12
13
|
findOne(collectionName: string, query: object, options?: object): Promise<any>;
|
|
13
14
|
objectqlFind(collectionName: string, queryOptions: any, processingOptions?: any): Promise<any>;
|
|
@@ -36,12 +36,23 @@ let MongodbService = MongodbService_1 = class MongodbService {
|
|
|
36
36
|
async getCollection(collectionName) {
|
|
37
37
|
return this.db.collection(collectionName);
|
|
38
38
|
}
|
|
39
|
-
async insertOne(collectionName,
|
|
39
|
+
async insertOne(collectionName, record) {
|
|
40
40
|
const collection = this.db.collection(collectionName);
|
|
41
|
-
const
|
|
41
|
+
const { _id = (0, uuid_1.v4)(), ...data } = record;
|
|
42
|
+
const entry = { _id, ...data };
|
|
42
43
|
await collection.insertOne(entry);
|
|
43
44
|
return entry;
|
|
44
45
|
}
|
|
46
|
+
async insertMany(collectionName, records) {
|
|
47
|
+
const recordsWithId = records.map((record) => {
|
|
48
|
+
const { _id = (0, uuid_1.v4)(), ...data } = record;
|
|
49
|
+
return { _id, ...data };
|
|
50
|
+
});
|
|
51
|
+
const options = { ordered: true };
|
|
52
|
+
const collection = this.db.collection(collectionName);
|
|
53
|
+
const results = await collection.insertMany(recordsWithId, options);
|
|
54
|
+
return results;
|
|
55
|
+
}
|
|
45
56
|
async find(collectionName, query, options = {}) {
|
|
46
57
|
const collection = this.db.collection(collectionName);
|
|
47
58
|
return await collection.find(query, options).toArray();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAA0C;AAC1C,+BAAoC;AACpC,2DAAsD;AACtD,2CAA+C;AAGxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJ/B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;QAKxD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE,EAGvC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;aACR,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,cAAsB;QACxC,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,cAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAA0C;AAC1C,+BAAoC;AACpC,2DAAsD;AACtD,2CAA+C;AAGxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJ/B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;QAKxD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE,EAGvC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;aACR,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,cAAsB;QACxC,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,cAAsB,EAAE,MAAW;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,EAAE,GAAG,GAAG,IAAA,SAAM,GAAE,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;QAC3C,MAAM,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;QAC/B,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,cAAsB,EAAE,OAAc;QAErD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3C,MAAM,EAAE,GAAG,GAAG,IAAA,SAAM,GAAE,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;YAC3C,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,cAAsB,EAAE,KAAa,EAAE,UAAkB,EAAE;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAsB,EAAE,KAAa,EAAE,UAAkB,EAAE;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,cAAsB,EACtB,YAAiB,EACjB,oBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE;QAE9C,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,YAAY,CAAC;QAC1E,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,GAAG;YACT,IAAI;YACJ,iBAAiB,EAAE,IAAI;YACvB,GAAG,WAAW;SACR,CAAC;QACT,IAAI,OAAO,EAAE;YACX,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC;SAC9B;QACD,IAAI,IAAI,EAAE;YACR,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC9C,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,CAAC;YACnD,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,EAAE;YACV,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;aAC7B;iBAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBACrC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACxC;SACF;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAEtD,OAAO,IAAA,2BAAW,EAAC,UAAU,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,cAAsB,EAAE,OAAY;QACxD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACpC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;YACtD,OAAO;YACP,MAAM;SACP,CAAC,CAAQ,CAAC;QACX,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACvB;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,cAAsB,EAAE,KAAa,EAAE,IAAS;QACrE,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAC9C,KAAK,EACL,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,cAAsB,EAAE,KAAa;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,cAAsB,EAAE,KAAa;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7HY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAMwB,sBAAa;GALrC,cAAc,CA6H1B;AA7HY,wCAAc"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.10.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
8
8
|
],
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@builder6/query-mongodb": "^0.
|
|
10
|
+
"@builder6/query-mongodb": "^0.10.2"
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
13
|
"build": "rimraf dist && tsc",
|
|
@@ -16,5 +16,5 @@
|
|
|
16
16
|
"publishConfig": {
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
|
-
"gitHead": "
|
|
19
|
+
"gitHead": "ea097019fd7d6e9efb44edbefcc5b3bed8d7eb82"
|
|
20
20
|
}
|