@adaptivestone/framework 5.0.0-beta.26 → 5.0.0-beta.28
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/CHANGELOG.md +10 -0
- package/dist/Cli.d.ts +1 -1
- package/dist/Cli.js.map +1 -1
- package/dist/commands/CreateUser.js +4 -3
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/Documentation.js +1 -1
- package/dist/commands/Documentation.js.map +1 -1
- package/dist/commands/GenerateTypes.js +1 -1
- package/dist/commands/GenerateTypes.js.map +1 -1
- package/dist/commands/SyncIndexes.js +0 -1
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Create.js +3 -4
- package/dist/commands/migration/Create.js.map +1 -1
- package/dist/commands/migration/Migrate.js +1 -4
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/controllers/Auth.d.ts +53 -10
- package/dist/controllers/Auth.js +2 -3
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Home.d.ts +4 -4
- package/dist/controllers/Home.js +1 -3
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/index.d.ts +1 -1
- package/dist/controllers/index.js.map +1 -1
- package/dist/folderConfig.d.ts +1 -1
- package/dist/folderConfig.js +0 -1
- package/dist/folderConfig.js.map +1 -1
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/files.js +1 -1
- package/dist/helpers/files.js.map +1 -1
- package/dist/helpers/yup.js +1 -1
- package/dist/helpers/yup.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +1 -3
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/Migration.d.ts +1 -1
- package/dist/models/Migration.js.map +1 -1
- package/dist/models/Sequence.d.ts +1 -1
- package/dist/models/Sequence.js.map +1 -1
- package/dist/models/User.d.ts +4 -4
- package/dist/models/User.js +27 -19
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -2
- package/dist/models/UserOld.js +18 -19
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/AbstractCommand.d.ts +1 -1
- package/dist/modules/AbstractCommand.js.map +1 -1
- package/dist/modules/AbstractController.d.ts +1 -1
- package/dist/modules/AbstractController.js +3 -5
- package/dist/modules/AbstractController.js.map +1 -1
- package/dist/modules/AbstractModel.d.ts +2 -2
- package/dist/modules/AbstractModel.js +0 -1
- package/dist/modules/AbstractModel.js.map +1 -1
- package/dist/modules/Base.d.ts +1 -1
- package/dist/modules/Base.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +2 -2
- package/dist/modules/BaseCli.js +2 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +3 -3
- package/dist/modules/BaseModel.js +3 -3
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +4 -4
- package/dist/server.js +3 -5
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.d.ts +1 -1
- package/dist/services/cache/Cache.js +3 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/documentation/DocumentationGenerator.js +0 -4
- package/dist/services/documentation/DocumentationGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +3 -3
- package/dist/services/http/HttpServer.js +6 -8
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +3 -3
- package/dist/services/http/middleware/AbstractMiddleware.js +1 -4
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Auth.d.ts +2 -2
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/Cors.d.ts +3 -3
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +4 -4
- package/dist/services/http/middleware/GetUserByToken.js +1 -2
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/middleware/I18n.d.ts +9 -5
- package/dist/services/http/middleware/I18n.js +2 -3
- package/dist/services/http/middleware/I18n.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.d.ts +3 -3
- package/dist/services/http/middleware/IpDetector.js +1 -1
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.d.ts +3 -3
- package/dist/services/http/middleware/Pagination.js +2 -3
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/PrepareAppInfo.d.ts +3 -3
- package/dist/services/http/middleware/PrepareAppInfo.js +1 -1
- package/dist/services/http/middleware/PrepareAppInfo.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +5 -5
- package/dist/services/http/middleware/RateLimiter.js +4 -4
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestLogger.d.ts +2 -2
- package/dist/services/http/middleware/RequestLogger.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +2 -2
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/middleware/Role.d.ts +3 -3
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/validate/ValidateService.js +4 -5
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/drivers/AbstractValidator.d.ts +2 -2
- package/dist/services/validate/drivers/AbstractValidator.js +3 -6
- package/dist/services/validate/drivers/AbstractValidator.js.map +1 -1
- package/dist/tests/frameworkVitestSetup.js +1 -1
- package/dist/tests/frameworkVitestSetup.js.map +1 -1
- package/dist/tests/setupVitest.js +4 -4
- package/dist/tests/setupVitest.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +2 -2
- package/package.json +10 -22
- package/eslint.config.js +0 -75
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { RateLimiterMemory, RateLimiterRedis, RateLimiterMongo, } from 'rate-limiter-flexible';
|
|
2
|
-
import merge from 'deepmerge';
|
|
3
1
|
import { createClient } from '@redis/client';
|
|
2
|
+
import merge from 'deepmerge';
|
|
4
3
|
import mongoose from 'mongoose';
|
|
4
|
+
import { RateLimiterMemory, RateLimiterMongo, RateLimiterRedis, } from 'rate-limiter-flexible';
|
|
5
5
|
import AbstractMiddleware from "./AbstractMiddleware.js";
|
|
6
6
|
class RateLimiter extends AbstractMiddleware {
|
|
7
7
|
static get description() {
|
|
@@ -72,9 +72,9 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
72
72
|
if (user && req.appInfo?.user) {
|
|
73
73
|
key.push(req.appInfo?.user.id);
|
|
74
74
|
}
|
|
75
|
-
if (request
|
|
75
|
+
if (request?.length) {
|
|
76
76
|
request.forEach((val) => {
|
|
77
|
-
if (req
|
|
77
|
+
if (req?.body[val]) {
|
|
78
78
|
key.push(req.body[val]);
|
|
79
79
|
}
|
|
80
80
|
// if (req.appInfo.request && req.appInfo.request[val]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type { Response, NextFunction } from 'express';
|
|
1
|
+
import type { NextFunction, Response } from 'express';
|
|
3
2
|
import type { FrameworkRequest } from '../HttpServer.ts';
|
|
3
|
+
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
4
4
|
declare class RequestLogger extends AbstractMiddleware {
|
|
5
5
|
static get description(): string;
|
|
6
6
|
middleware(req: FrameworkRequest, res: Response, next: NextFunction): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestLogger.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RequestLogger.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestLogger.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,aAAc,SAAQ,kBAAkB;IAC5C,MAAM,KAAK,WAAW;QACpB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,gBAAgB,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,YAAY,IAAI,aAAa,GAAG,CAAC,UAAU,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CACrF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type { Response, NextFunction } from 'express';
|
|
1
|
+
import type { NextFunction, Response } from 'express';
|
|
3
2
|
import type { FrameworkRequest } from '../HttpServer.ts';
|
|
3
|
+
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
4
4
|
declare class RequestParser extends AbstractMiddleware {
|
|
5
5
|
static get description(): string;
|
|
6
6
|
middleware(req: FrameworkRequest, res: Response, next: NextFunction): Promise<void | Response<any, Record<string, any>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,aAAc,SAAQ,kBAAkB;IAC5C,MAAM,KAAK,WAAW;QACpB,OAAO,sDAAsD,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACxC,8HAA8H;QAE9H,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,6DAA6D;QACnG,IAAI,MAAiC,CAAC;QACtC,IAAI,KAA+B,CAAC;QACpC,IAAI,CAAC;YACH,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;YAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,OAAO,EAAE,uIAAuI;aACjJ,CAAC,CAAC;YACH,oBAAoB;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,OAAO,CAClB,2CAA2C,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CACjE,CAAC;QAEF,GAAG,CAAC,IAAI,GAAG;YACT,mCAAmC;YACnC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YACnB,GAAG,MAAM;YACT,GAAG,KAAK;SACT,CAAC;QACF,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type {
|
|
1
|
+
import type { NextFunction, Response } from 'express';
|
|
2
|
+
import type { TUser } from '../../../models/User.ts';
|
|
3
3
|
import type { FrameworkRequest } from '../HttpServer.ts';
|
|
4
|
+
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
4
5
|
import type { GetUserByTokenAppInfo } from './GetUserByToken.ts';
|
|
5
|
-
import type { TUser } from '../../../models/User.ts';
|
|
6
6
|
declare class RoleMiddleware extends AbstractMiddleware {
|
|
7
7
|
static get description(): string;
|
|
8
8
|
middleware(req: FrameworkRequest & GetUserByTokenAppInfo & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Role.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Role.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Role.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Role.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,cAAe,SAAQ,kBAAkB;IAC7C,MAAM,KAAK,WAAW;QACpB,OAAO,uIAAuI,CAAC;IACjJ,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GACuD,EACvD,GAAa,EACb,IAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAuB,CAAA,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isSchema } from 'yup';
|
|
2
|
-
import YupValidator from './drivers/YupValidator.js';
|
|
3
|
-
import CustomValidator from './drivers/CustomValidator.js';
|
|
4
2
|
import Base from "../../modules/Base.js";
|
|
3
|
+
import CustomValidator from './drivers/CustomValidator.js';
|
|
4
|
+
import YupValidator from './drivers/YupValidator.js';
|
|
5
5
|
class ValidateService extends Base {
|
|
6
6
|
constructor(app, validator) {
|
|
7
7
|
super(app);
|
|
@@ -17,10 +17,10 @@ class ValidateService extends Base {
|
|
|
17
17
|
if (!(validator instanceof Object)) {
|
|
18
18
|
return false;
|
|
19
19
|
}
|
|
20
|
-
return Object.values(
|
|
20
|
+
return Object.values(ValidateService.drivers).some((driver) => validator instanceof driver);
|
|
21
21
|
}
|
|
22
22
|
static getDriverByValidatorBody(app, body = {}) {
|
|
23
|
-
if (
|
|
23
|
+
if (ValidateService.isValidatorExists(body)) {
|
|
24
24
|
return body;
|
|
25
25
|
}
|
|
26
26
|
if (isSchema(body)) {
|
|
@@ -61,7 +61,6 @@ class ValidateService extends Base {
|
|
|
61
61
|
],
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
-
// eslint-disable-next-line class-methods-use-this
|
|
65
64
|
async validateSchema(req, validator, data) {
|
|
66
65
|
if (!validator) {
|
|
67
66
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.js"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export default AbstractValidator;
|
|
2
2
|
declare class AbstractValidator extends Base {
|
|
3
|
-
static convertFieldsToJson(
|
|
3
|
+
static convertFieldsToJson(_fields: any): {};
|
|
4
4
|
constructor(app: any, body: any);
|
|
5
5
|
body: any;
|
|
6
6
|
get fieldsInJsonFormat(): {};
|
|
7
|
-
validateFields(
|
|
7
|
+
validateFields(_data: any, { query, body, appInfo }: {
|
|
8
8
|
query: any;
|
|
9
9
|
body: any;
|
|
10
10
|
appInfo: any;
|
|
@@ -4,22 +4,19 @@ class AbstractValidator extends Base {
|
|
|
4
4
|
super(app);
|
|
5
5
|
this.body = body;
|
|
6
6
|
}
|
|
7
|
-
|
|
8
|
-
static convertFieldsToJson(fields) {
|
|
7
|
+
static convertFieldsToJson(_fields) {
|
|
9
8
|
// IMPLENT;
|
|
10
9
|
return {};
|
|
11
10
|
}
|
|
12
|
-
// eslint-disable-next-line class-methods-use-this
|
|
13
11
|
get fieldsInJsonFormat() {
|
|
14
12
|
// IMPLENT;
|
|
15
13
|
return {};
|
|
16
14
|
}
|
|
17
|
-
//
|
|
18
|
-
async validateFields(
|
|
15
|
+
// biome-ignore lint/correctness/noUnusedFunctionParameters: child will use them
|
|
16
|
+
async validateFields(_data, { query, body, appInfo }) {
|
|
19
17
|
// IMPLENT;
|
|
20
18
|
return true;
|
|
21
19
|
}
|
|
22
|
-
// eslint-disable-next-line class-methods-use-this
|
|
23
20
|
async castFields() {
|
|
24
21
|
// IMPLENT;
|
|
25
22
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractValidator.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/AbstractValidator.js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0BAA0B,CAAC;AAE5C,MAAM,iBAAkB,SAAQ,IAAI;IAClC,YAAY,GAAG,EAAE,IAAI;QACnB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"AbstractValidator.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/AbstractValidator.js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0BAA0B,CAAC;AAE5C,MAAM,iBAAkB,SAAQ,IAAI;IAClC,YAAY,GAAG,EAAE,IAAI;QACnB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,OAAO;QAChC,WAAW;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,kBAAkB;QACpB,WAAW;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gFAAgF;IAChF,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,WAAW;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU;QACd,WAAW;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,oBAAoB,CAAC;IAC9B,CAAC;CACF;AACD,eAAe,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frameworkVitestSetup.js","sourceRoot":"","sources":["../../src/tests/frameworkVitestSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"frameworkVitestSetup.js","sourceRoot":"","sources":["../../src/tests/frameworkVitestSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,qBAAqB,EAAE,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,eAAe;AACjB,CAAC,CAAC,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
1
|
import crypto from 'node:crypto';
|
|
3
|
-
import
|
|
4
|
-
import { setServerInstance, serverInstance } from "./testHelpers.js";
|
|
5
|
-
import mongoose from 'mongoose'; // we do not need create indexes on tests
|
|
2
|
+
import path from 'node:path';
|
|
6
3
|
import { createClient } from '@redis/client';
|
|
4
|
+
import mongoose from 'mongoose'; // we do not need create indexes on tests
|
|
5
|
+
import { afterAll, afterEach, beforeAll, beforeEach } from 'vitest';
|
|
7
6
|
import { clearNamespace } from "../helpers/redis/clearNamespace.js";
|
|
8
7
|
import Server from "../server.js";
|
|
8
|
+
import { serverInstance, setServerInstance } from "./testHelpers.js";
|
|
9
9
|
mongoose.set('autoIndex', false);
|
|
10
10
|
const basePath = new URL('.', import.meta.url).pathname;
|
|
11
11
|
beforeAll(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupVitest.js","sourceRoot":"","sources":["../../src/tests/setupVitest.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"setupVitest.js","sourceRoot":"","sources":["../../src/tests/setupVitest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type Server from '../server.ts';
|
|
2
|
-
import type { GetModelTypeFromClass } from '../modules/BaseModel.ts';
|
|
3
1
|
import type UserModel from '../models/User.ts';
|
|
2
|
+
import type { GetModelTypeFromClass } from '../modules/BaseModel.ts';
|
|
3
|
+
import type Server from '../server.ts';
|
|
4
4
|
export declare let serverInstance: Server;
|
|
5
5
|
export declare let defaultUser: InstanceType<GetModelTypeFromClass<typeof UserModel>>;
|
|
6
6
|
export declare let defaultAuthToken: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"version": "5.0.0-beta.28",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -23,11 +23,13 @@
|
|
|
23
23
|
"prod": "node --watch ./src/cluster.ts",
|
|
24
24
|
"test": "vitest run",
|
|
25
25
|
"t": "vitest --coverage=false --reporter=default",
|
|
26
|
-
"
|
|
27
|
-
"
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
26
|
+
"format": "biome format",
|
|
27
|
+
"format:fix": "biome format --write",
|
|
28
|
+
"knip": "knip",
|
|
29
|
+
"lint": "biome lint",
|
|
30
|
+
"lint:fix": "biome lint --write",
|
|
31
|
+
"check": "biome check",
|
|
32
|
+
"check:fix": "biome check --write",
|
|
31
33
|
"prepublishOnly": "npm run build",
|
|
32
34
|
"cli": "node cliCommand.ts",
|
|
33
35
|
"benchmark": "h2load -n 10000 -c 50 -p 'http/1.1' http://localhost:3300/",
|
|
@@ -50,23 +52,14 @@
|
|
|
50
52
|
"yup": "^1.0.0"
|
|
51
53
|
},
|
|
52
54
|
"devDependencies": {
|
|
53
|
-
"@
|
|
55
|
+
"@biomejs/biome": "^2.0.6",
|
|
54
56
|
"@types/express": "^5.0.1",
|
|
55
57
|
"@types/formidable": "^3.4.5",
|
|
56
58
|
"@types/node": "^24.0.0",
|
|
57
59
|
"@vitest/coverage-v8": "^3.0.0",
|
|
58
|
-
"
|
|
59
|
-
"eslint": "^9.24.0",
|
|
60
|
-
"eslint-config-prettier": "^10.0.0",
|
|
61
|
-
"eslint-plugin-import-x": "^4.6.1",
|
|
62
|
-
"eslint-plugin-prettier": "^5.0.0",
|
|
63
|
-
"globals": "^16.0.0",
|
|
64
|
-
"husky": "^9.0.0",
|
|
65
|
-
"lint-staged": "^16.0.0",
|
|
60
|
+
"lefthook": "^1.11.14",
|
|
66
61
|
"mongodb-memory-server": "^10.0.0",
|
|
67
|
-
"prettier": "^3.0.0",
|
|
68
62
|
"typescript": "^5.8.3",
|
|
69
|
-
"typescript-eslint": "^8.30.1",
|
|
70
63
|
"vitest": "^3.0.0"
|
|
71
64
|
},
|
|
72
65
|
"peerDependencies": {
|
|
@@ -76,10 +69,5 @@
|
|
|
76
69
|
"@adaptivestone/framework-module-email": {
|
|
77
70
|
"optional": true
|
|
78
71
|
}
|
|
79
|
-
},
|
|
80
|
-
"lint-staged": {
|
|
81
|
-
"**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
|
|
82
|
-
"prettier --write"
|
|
83
|
-
]
|
|
84
72
|
}
|
|
85
73
|
}
|
package/eslint.config.js
DELETED
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
import globals from 'globals';
|
|
2
|
-
import pluginJs from '@eslint/js';
|
|
3
|
-
import tseslint from 'typescript-eslint';
|
|
4
|
-
|
|
5
|
-
import { flatConfigs as importPlugin } from 'eslint-plugin-import-x';
|
|
6
|
-
import vitest from '@vitest/eslint-plugin';
|
|
7
|
-
import eslintConfigPrettier from 'eslint-config-prettier';
|
|
8
|
-
// eslint-disable-next-line import-x/extensions
|
|
9
|
-
import prettierPlugin from 'eslint-plugin-prettier/recommended';
|
|
10
|
-
|
|
11
|
-
// /** @type {import('eslint').Linter.Config[]} */
|
|
12
|
-
export default tseslint.config([
|
|
13
|
-
{
|
|
14
|
-
ignores: ['dist/', 'genTypes.d.ts'],
|
|
15
|
-
},
|
|
16
|
-
pluginJs.configs.recommended,
|
|
17
|
-
tseslint.configs.recommended,
|
|
18
|
-
importPlugin.recommended,
|
|
19
|
-
eslintConfigPrettier,
|
|
20
|
-
prettierPlugin,
|
|
21
|
-
{
|
|
22
|
-
languageOptions: {
|
|
23
|
-
sourceType: 'module',
|
|
24
|
-
ecmaVersion: 'latest',
|
|
25
|
-
globals: {
|
|
26
|
-
...globals.es2024,
|
|
27
|
-
...globals.node,
|
|
28
|
-
},
|
|
29
|
-
},
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
rules: {
|
|
33
|
-
'no-await-in-loop': 'error',
|
|
34
|
-
'no-param-reassign': 'error',
|
|
35
|
-
'class-methods-use-this': 'error',
|
|
36
|
-
'no-shadow': 'error',
|
|
37
|
-
'prefer-const': 'error',
|
|
38
|
-
'import-x/no-extraneous-dependencies': ['error'],
|
|
39
|
-
'import-x/extensions': ['error', 'always'],
|
|
40
|
-
'import-x/first': ['error'],
|
|
41
|
-
camelcase: ['error', { properties: 'never', ignoreDestructuring: false }],
|
|
42
|
-
'prefer-destructuring': [
|
|
43
|
-
'error',
|
|
44
|
-
{
|
|
45
|
-
VariableDeclarator: {
|
|
46
|
-
array: false,
|
|
47
|
-
object: true,
|
|
48
|
-
},
|
|
49
|
-
AssignmentExpression: {
|
|
50
|
-
array: true,
|
|
51
|
-
object: false,
|
|
52
|
-
},
|
|
53
|
-
},
|
|
54
|
-
{
|
|
55
|
-
enforceForRenamedProperties: false,
|
|
56
|
-
},
|
|
57
|
-
],
|
|
58
|
-
'no-plusplus': 'error',
|
|
59
|
-
'consistent-return': 'error',
|
|
60
|
-
'no-return-await': 'error',
|
|
61
|
-
'arrow-body-style': 'error',
|
|
62
|
-
'dot-notation': 'error',
|
|
63
|
-
curly: 'error',
|
|
64
|
-
},
|
|
65
|
-
},
|
|
66
|
-
{
|
|
67
|
-
files: ['**/*.test.js', '**/*.test.ts'],
|
|
68
|
-
plugins: {
|
|
69
|
-
vitest,
|
|
70
|
-
},
|
|
71
|
-
rules: {
|
|
72
|
-
...vitest.configs.recommended.rules,
|
|
73
|
-
},
|
|
74
|
-
},
|
|
75
|
-
]);
|