equipped 5.0.1 → 5.0.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.
- package/CHANGELOG.md +14 -0
- package/lib/cache/pipes.d.ts +2 -2
- package/lib/cache/pipes.js +2 -4
- package/lib/cache/pipes.js.map +1 -1
- package/lib/dbs/base/_instance.d.ts +3 -28
- package/lib/dbs/base/_instance.js.map +1 -1
- package/lib/dbs/base/core.d.ts +41 -16
- package/lib/dbs/mongo/api.d.ts +1 -2
- package/lib/dbs/mongo/api.js +3 -1
- package/lib/dbs/mongo/api.js.map +1 -1
- package/lib/dbs/mongo/changes.d.ts +2 -2
- package/lib/dbs/mongo/changes.js.map +1 -1
- package/lib/dbs/mongo/index.d.ts +2 -2
- package/lib/dbs/mongo/index.js +1 -1
- package/lib/dbs/mongo/index.js.map +1 -1
- package/lib/dbs/pipes.js +9 -12
- package/lib/dbs/pipes.js.map +1 -1
- package/lib/events/pipes.d.ts +3 -3
- package/lib/events/pipes.js +4 -6
- package/lib/events/pipes.js.map +1 -1
- package/lib/instance/index.js +3 -3
- package/lib/instance/index.js.map +1 -1
- package/lib/instance/settings.d.ts +2 -2
- package/lib/jobs/pipes.d.ts +2 -2
- package/lib/jobs/pipes.js +2 -4
- package/lib/jobs/pipes.js.map +1 -1
- package/lib/server/impls/base.js +9 -8
- package/lib/server/impls/base.js.map +1 -1
- package/lib/server/middlewares/parseAuthUser.d.ts +2 -2
- package/lib/server/middlewares/requireAuthUser.d.ts +8 -8
- package/lib/server/pipes.d.ts +2 -2
- package/lib/validations/index.js +2 -1
- package/lib/validations/index.js.map +1 -1
- package/lib/validations/valleyed.js +7 -6
- package/lib/validations/valleyed.js.map +1 -1
- package/package.json +3 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [5.0.3](https://github.com/kevinand11/equipped/compare/v5.0.2...v5.0.3) (2025-06-25)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* dbs add config on table ([3a0b248](https://github.com/kevinand11/equipped/commit/3a0b2485f98fd8c30268bf231b81f2a9ec513a95))
|
|
11
|
+
|
|
12
|
+
### [5.0.2](https://github.com/kevinand11/equipped/compare/v5.0.1...v5.0.2) (2025-06-24)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* valleyed 4.5.6 ([e61c65f](https://github.com/kevinand11/equipped/commit/e61c65f9c21d121e114f142bbe37f6f99ff39c2d))
|
|
18
|
+
|
|
5
19
|
### [5.0.1](https://github.com/kevinand11/equipped/compare/v5.0.0...v5.0.1) (2025-06-24)
|
|
6
20
|
|
|
7
21
|
## [5.0.0](https://github.com/kevinand11/equipped/compare/v5.0.0-rc.40...v5.0.0) (2025-06-24)
|
package/lib/cache/pipes.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PipeOutput } from 'valleyed';
|
|
2
|
-
export declare const redisConfigPipe:
|
|
1
|
+
import { v, PipeOutput } from 'valleyed';
|
|
2
|
+
export declare const redisConfigPipe: v.Pipe<{
|
|
3
3
|
host: string;
|
|
4
4
|
port: number | undefined;
|
|
5
5
|
password: string | undefined;
|
package/lib/cache/pipes.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { v } from 'valleyed';
|
|
2
|
-
export const redisConfigPipe = v
|
|
3
|
-
.object({
|
|
2
|
+
export const redisConfigPipe = v.meta(v.object({
|
|
4
3
|
host: v.string(),
|
|
5
4
|
port: v.optional(v.number()),
|
|
6
5
|
password: v.optional(v.string()),
|
|
7
6
|
username: v.optional(v.string()),
|
|
8
7
|
tls: v.optional(v.boolean()),
|
|
9
8
|
cluster: v.optional(v.boolean()),
|
|
10
|
-
})
|
|
11
|
-
.meta({ title: 'Redis Config', $refId: 'RedisConfig' });
|
|
9
|
+
}), { title: 'Redis Config', $refId: 'RedisConfig' });
|
|
12
10
|
//# sourceMappingURL=pipes.js.map
|
package/lib/cache/pipes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/cache/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAc,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/cache/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAc,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CACpC,CAAC,CAAC,MAAM,CAAC;IACR,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;CAChC,CAAC,EACF,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,CAChD,CAAA"}
|
|
@@ -1,45 +1,20 @@
|
|
|
1
1
|
import * as core from './core';
|
|
2
2
|
import { DbChangeConfig, DbConfig } from './types';
|
|
3
|
-
import type { DeepPartial } from '../../types';
|
|
4
3
|
export declare const TopicPrefix = "db-changes";
|
|
5
4
|
export type TableOptions = {
|
|
6
5
|
skipAudit?: boolean;
|
|
7
6
|
};
|
|
8
|
-
export type Config<Model extends core.Model<core.IdType>, Entity extends core.Entity> = {
|
|
9
|
-
db: string;
|
|
10
|
-
col: string;
|
|
11
|
-
mapper: (model: Model) => Entity;
|
|
12
|
-
change?: DbChangeCallbacks<Model, Entity>;
|
|
13
|
-
options?: {
|
|
14
|
-
skipAudit?: boolean;
|
|
15
|
-
};
|
|
16
|
-
};
|
|
17
7
|
export declare abstract class Db<IdKey extends core.IdType> {
|
|
18
8
|
protected config: DbConfig;
|
|
19
9
|
constructor(config: DbConfig);
|
|
20
10
|
protected getScopedDb(db: string): string;
|
|
21
|
-
abstract use<Model extends core.Model<IdKey>, Entity extends core.Entity>(config: Config<Model, Entity>): core.Table<IdKey, Model, Entity>;
|
|
11
|
+
abstract use<Model extends core.Model<IdKey>, Entity extends core.Entity>(config: core.Config<Model, Entity>): core.Table<IdKey, Model, Entity>;
|
|
22
12
|
}
|
|
23
13
|
export declare abstract class DbChange<Model extends core.Model<core.IdType>, Entity extends core.Entity> {
|
|
24
14
|
#private;
|
|
25
15
|
private config;
|
|
26
|
-
constructor(config: DbChangeConfig, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model) => Entity);
|
|
27
|
-
get callbacks(): Readonly<DbChangeCallbacks<Model, Entity>>;
|
|
16
|
+
constructor(config: DbChangeConfig, callbacks: core.DbChangeCallbacks<Model, Entity>, mapper: (model: Model) => Entity);
|
|
17
|
+
get callbacks(): Readonly<core.DbChangeCallbacks<Model, Entity>>;
|
|
28
18
|
get mapper(): (model: Model) => Entity;
|
|
29
19
|
protected configureConnector(key: string, data: Record<string, string>): Promise<any>;
|
|
30
20
|
}
|
|
31
|
-
export type DbChangeCallbacks<Model extends core.Model<core.IdType>, Entity extends core.Entity> = {
|
|
32
|
-
created?: (data: {
|
|
33
|
-
before: null;
|
|
34
|
-
after: Entity;
|
|
35
|
-
}) => Promise<void>;
|
|
36
|
-
updated?: (data: {
|
|
37
|
-
before: Entity;
|
|
38
|
-
after: Entity;
|
|
39
|
-
changes: DeepPartial<Model>;
|
|
40
|
-
}) => Promise<void>;
|
|
41
|
-
deleted?: (data: {
|
|
42
|
-
before: Entity;
|
|
43
|
-
after: null;
|
|
44
|
-
}) => Promise<void>;
|
|
45
|
-
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_instance.js","sourceRoot":"","sources":["../../../src/dbs/base/_instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"_instance.js","sourceRoot":"","sources":["../../../src/dbs/base/_instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAA;AAIvC,MAAM,OAAgB,EAAE;IACD;IAAtB,YAAsB,MAAgB;QAAhB,WAAM,GAAN,MAAM,CAAU;IAAG,CAAC;IAEhC,WAAW,CAAC,EAAU;QAC/B,OAAO,QAAQ,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC7D,CAAC;CAKD;AAED,MAAM,OAAgB,QAAQ;IAKpB;IAJT,UAAU,GAA0C,EAAE,CAAA;IACtD,OAAO,CAA0B;IAEjC,YACS,MAAsB,EAC9B,SAAgD,EAChD,MAAgC;QAFxB,WAAM,GAAN,MAAM,CAAgB;QAI9B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAA;IACpB,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,IAA4B;QAC3E,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QACnE,OAAO,MAAM,QAAQ;aACnB,GAAG,CAAC,eAAe,GAAG,SAAS,EAAE;YACjC,cAAc,EAAE,WAAW;YAC3B,uBAAuB,EAAE,OAAO;YAChC,2CAA2C,EAAE,IAAI;YACjD,mCAAmC,EAAE,IAAI;YACzC,eAAe,EAAE,6CAA6C;YAC9D,8BAA8B,EAAE,OAAO;YACvC,iBAAiB,EAAE,6CAA6C;YAChE,gCAAgC,EAAE,OAAO;YACzC,GAAG,IAAI;SACP,CAAC;aACD,IAAI,CAAC,KAAK,IAAI,EAAE;YAChB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC,CAAA;YAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;QAC1D,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,MAAM,IAAI,aAAa,CAAC,6BAA6B,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC;CACD"}
|
package/lib/dbs/base/core.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ClientSession, Filter, UpdateFilter } from 'mongodb';
|
|
2
|
-
import { ConditionalObjectKeys, DistributiveOmit } from '../../types';
|
|
2
|
+
import { ConditionalObjectKeys, DeepPartial, DistributiveOmit } from '../../types';
|
|
3
3
|
import { QueryParams, QueryResults } from '../pipes';
|
|
4
4
|
export type IdType = {
|
|
5
5
|
_id: string;
|
|
@@ -15,31 +15,31 @@ export type Model<IdKey extends IdType> = IdKey & {
|
|
|
15
15
|
updatedAt?: number;
|
|
16
16
|
};
|
|
17
17
|
type Sort = NonNullable<QueryParams['sort']>[number];
|
|
18
|
-
export type Table<Id extends IdType, T extends Model<Id>,
|
|
19
|
-
query: (query: QueryParams) => Promise<QueryResults<
|
|
18
|
+
export type Table<Id extends IdType, T extends Model<Id>, E extends Entity, Extras extends Record<string, unknown> = {}> = {
|
|
19
|
+
query: (query: QueryParams) => Promise<QueryResults<E>>;
|
|
20
20
|
findMany: (filter: Filter<T>, options?: Options & {
|
|
21
21
|
limit?: number;
|
|
22
22
|
sort?: Sort | Sort[];
|
|
23
|
-
}) => Promise<
|
|
24
|
-
findOne: (filter: Filter<T>, options?: Options) => Promise<
|
|
25
|
-
findById: (id: ModelId<T>, options?: Options) => Promise<
|
|
23
|
+
}) => Promise<E[]>;
|
|
24
|
+
findOne: (filter: Filter<T>, options?: Options) => Promise<E | null>;
|
|
25
|
+
findById: (id: ModelId<T>, options?: Options) => Promise<E | null>;
|
|
26
26
|
insertOne: (values: CreateInput<T>, options?: Options & {
|
|
27
27
|
makeId?: () => string;
|
|
28
28
|
getTime?: () => Date;
|
|
29
|
-
}) => Promise<
|
|
29
|
+
}) => Promise<E>;
|
|
30
30
|
insertMany: (values: CreateInput<T>[], options?: Options & {
|
|
31
31
|
makeId?: (i: number) => string;
|
|
32
32
|
getTime?: () => Date;
|
|
33
|
-
}) => Promise<
|
|
33
|
+
}) => Promise<E[]>;
|
|
34
34
|
updateMany: (filter: Filter<T>, values: UpdateInput<T>, options?: Options & {
|
|
35
35
|
getTime?: () => Date;
|
|
36
|
-
}) => Promise<
|
|
36
|
+
}) => Promise<E[]>;
|
|
37
37
|
updateOne: (filter: Filter<T>, values: UpdateInput<T>, options?: Options & {
|
|
38
38
|
getTime?: () => Date;
|
|
39
|
-
}) => Promise<
|
|
39
|
+
}) => Promise<E | null>;
|
|
40
40
|
updateById: (id: ModelId<T>, values: UpdateInput<T>, options?: Options & {
|
|
41
41
|
getTime?: () => Date;
|
|
42
|
-
}) => Promise<
|
|
42
|
+
}) => Promise<E | null>;
|
|
43
43
|
upsertOne: (filter: Filter<T>, values: {
|
|
44
44
|
insert: CreateInput<T>;
|
|
45
45
|
} | {
|
|
@@ -48,14 +48,15 @@ export type Table<Id extends IdType, T extends Model<Id>, Transform = T, Extras
|
|
|
48
48
|
}, options?: Options & {
|
|
49
49
|
makeId?: () => string;
|
|
50
50
|
getTime?: () => Date;
|
|
51
|
-
}) => Promise<
|
|
52
|
-
deleteOne: (filter: Filter<T>, options?: Options) => Promise<
|
|
53
|
-
deleteById: (id: ModelId<T>, options?: Options) => Promise<
|
|
54
|
-
deleteMany: (filter: Filter<T>, options?: Options) => Promise<
|
|
51
|
+
}) => Promise<E>;
|
|
52
|
+
deleteOne: (filter: Filter<T>, options?: Options) => Promise<E | null>;
|
|
53
|
+
deleteById: (id: ModelId<T>, options?: Options) => Promise<E | null>;
|
|
54
|
+
deleteMany: (filter: Filter<T>, options?: Options) => Promise<E[]>;
|
|
55
55
|
bulkWrite: (operations: BulkWriteOperation<T>[], options?: Options & {
|
|
56
56
|
getTime?: () => Date;
|
|
57
57
|
}) => Promise<void>;
|
|
58
|
-
|
|
58
|
+
readonly config: Config<T, E>;
|
|
59
|
+
readonly extras: Extras;
|
|
59
60
|
};
|
|
60
61
|
export type Options = {
|
|
61
62
|
session?: ClientSession;
|
|
@@ -86,3 +87,27 @@ export type BulkWriteOperation<T extends Model<any>> = {
|
|
|
86
87
|
op: 'delete';
|
|
87
88
|
filter: Filter<T>;
|
|
88
89
|
};
|
|
90
|
+
export type DbChangeCallbacks<M extends Model<IdType>, E extends Entity> = {
|
|
91
|
+
created?: (data: {
|
|
92
|
+
before: null;
|
|
93
|
+
after: E;
|
|
94
|
+
}) => Promise<void>;
|
|
95
|
+
updated?: (data: {
|
|
96
|
+
before: E;
|
|
97
|
+
after: Entity;
|
|
98
|
+
changes: DeepPartial<M>;
|
|
99
|
+
}) => Promise<void>;
|
|
100
|
+
deleted?: (data: {
|
|
101
|
+
before: E;
|
|
102
|
+
after: null;
|
|
103
|
+
}) => Promise<void>;
|
|
104
|
+
};
|
|
105
|
+
export type Config<M extends Model<IdType>, E extends Entity> = {
|
|
106
|
+
db: string;
|
|
107
|
+
col: string;
|
|
108
|
+
mapper: (model: M) => E;
|
|
109
|
+
change?: DbChangeCallbacks<M, E>;
|
|
110
|
+
options?: {
|
|
111
|
+
skipAudit?: boolean;
|
|
112
|
+
};
|
|
113
|
+
};
|
package/lib/dbs/mongo/api.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { Collection } from 'mongodb';
|
|
2
|
-
import { Config } from '../base/_instance';
|
|
3
2
|
import * as core from '../base/core';
|
|
4
3
|
type IdType = {
|
|
5
4
|
_id: string;
|
|
6
5
|
};
|
|
7
|
-
export declare function getTable<Model extends core.Model<IdType>, Entity extends core.Entity>(
|
|
6
|
+
export declare function getTable<Model extends core.Model<IdType>, Entity extends core.Entity>(config: core.Config<Model, Entity>, collection: Collection<Model>): core.Table<IdType, Model, Entity, {
|
|
8
7
|
collection: Collection<Model>;
|
|
9
8
|
}>;
|
|
10
9
|
export {};
|
package/lib/dbs/mongo/api.js
CHANGED
|
@@ -2,7 +2,8 @@ import { ObjectId } from 'mongodb';
|
|
|
2
2
|
import { parseMongodbQueryParams } from './query';
|
|
3
3
|
import { EquippedError } from '../../errors';
|
|
4
4
|
const idKey = '_id';
|
|
5
|
-
export function getTable(
|
|
5
|
+
export function getTable(config, collection) {
|
|
6
|
+
const { mapper, options: tableOptions = {} } = config;
|
|
6
7
|
async function transform(doc) {
|
|
7
8
|
const docs = Array.isArray(doc) ? doc : [doc];
|
|
8
9
|
const mapped = docs.map((d) => mapper(d));
|
|
@@ -37,6 +38,7 @@ export function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
37
38
|
};
|
|
38
39
|
}
|
|
39
40
|
const table = {
|
|
41
|
+
config,
|
|
40
42
|
extras: { collection },
|
|
41
43
|
query: async (params) => {
|
|
42
44
|
const results = await parseMongodbQueryParams(collection, params);
|
package/lib/dbs/mongo/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dbs/mongo/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAmD,MAAM,SAAS,CAAA;AAG/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dbs/mongo/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MongoClient } from 'mongodb';
|
|
2
|
-
import { DbChange
|
|
2
|
+
import { DbChange } from '../base/_instance';
|
|
3
3
|
import * as core from '../base/core';
|
|
4
4
|
import { DbChangeConfig } from '../base/types';
|
|
5
5
|
import { MongoDbConfig } from '../pipes';
|
|
@@ -7,5 +7,5 @@ export declare class MongoDbChange<Model extends core.Model<{
|
|
|
7
7
|
_id: string;
|
|
8
8
|
}>, Entity extends core.Entity> extends DbChange<Model, Entity> {
|
|
9
9
|
#private;
|
|
10
|
-
constructor(config: MongoDbConfig, change: DbChangeConfig, client: MongoClient, dbName: string, colName: string, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model) => Entity);
|
|
10
|
+
constructor(config: MongoDbConfig, change: DbChangeConfig, client: MongoClient, dbName: string, colName: string, callbacks: core.DbChangeCallbacks<Model, Entity>, mapper: (model: Model) => Entity);
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../src/dbs/mongo/changes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../src/dbs/mongo/changes.ts"],"names":[],"mappings":"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"}
|
package/lib/dbs/mongo/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ClientSession, ObjectId } from 'mongodb';
|
|
2
2
|
import { MongoDbConfig } from '../pipes';
|
|
3
|
-
import { Db
|
|
3
|
+
import { Db } from '../base/_instance';
|
|
4
4
|
import * as core from '../base/core';
|
|
5
5
|
import { DbConfig } from '../base/types';
|
|
6
6
|
export declare class MongoDb extends Db<{
|
|
@@ -13,7 +13,7 @@ export declare class MongoDb extends Db<{
|
|
|
13
13
|
id(): ObjectId;
|
|
14
14
|
use<Model extends core.Model<{
|
|
15
15
|
_id: string;
|
|
16
|
-
}>, Entity extends core.Entity>(config: Config<Model, Entity>): core.Table<{
|
|
16
|
+
}>, Entity extends core.Entity>(config: core.Config<Model, Entity>): core.Table<{
|
|
17
17
|
_id: string;
|
|
18
18
|
}, Model, Entity, {
|
|
19
19
|
collection: import("mongodb").Collection<Model>;
|
package/lib/dbs/mongo/index.js
CHANGED
|
@@ -53,7 +53,7 @@ export class MongoDb extends Db {
|
|
|
53
53
|
}
|
|
54
54
|
this.#cols.push({ db: this.getScopedDb(config.db), col: config.col });
|
|
55
55
|
const collection = this.#client.db(this.getScopedDb(config.db)).collection(config.col);
|
|
56
|
-
return getTable(
|
|
56
|
+
return getTable(config, collection);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dbs/mongo/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9E,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dbs/mongo/index.ts"],"names":[],"mappings":"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"}
|
package/lib/dbs/pipes.js
CHANGED
|
@@ -17,11 +17,11 @@ export var Conditions;
|
|
|
17
17
|
Conditions["nin"] = "nin";
|
|
18
18
|
Conditions["exists"] = "exists";
|
|
19
19
|
})(Conditions || (Conditions = {}));
|
|
20
|
-
const queryKeys = v.
|
|
20
|
+
const queryKeys = v.catch(v.defaults(v.in([QueryKeys.and, QueryKeys.or]), QueryKeys.and), QueryKeys.and);
|
|
21
21
|
const queryWhere = v.object({
|
|
22
22
|
field: v.string(),
|
|
23
23
|
value: v.any(),
|
|
24
|
-
condition: v.
|
|
24
|
+
condition: v.catch(v.defaults(v.in(Object.values(Conditions)), Conditions.eq), Conditions.eq),
|
|
25
25
|
});
|
|
26
26
|
const queryWhereBlock = v.object({
|
|
27
27
|
condition: queryKeys,
|
|
@@ -30,11 +30,11 @@ const queryWhereBlock = v.object({
|
|
|
30
30
|
const queryWhereClause = v.defaults(v.array(v.or([queryWhere, queryWhereBlock])), []);
|
|
31
31
|
export function queryParamsPipe() {
|
|
32
32
|
const pagLimit = Instance.get().settings.server?.requests.paginationDefaultLimit ?? 100;
|
|
33
|
-
return v
|
|
33
|
+
return v.meta(v
|
|
34
34
|
.object({
|
|
35
35
|
all: v.defaults(v.boolean(), false),
|
|
36
|
-
limit: v.
|
|
37
|
-
page: v.
|
|
36
|
+
limit: v.catch(v.defaults(v.number().pipe(v.lte(pagLimit)), pagLimit), pagLimit),
|
|
37
|
+
page: v.catch(v.defaults(v.number().pipe(v.gte(1)), 1), 1),
|
|
38
38
|
search: v.defaults(v.nullish(v.object({
|
|
39
39
|
value: v.string(),
|
|
40
40
|
fields: v.array(v.string()),
|
|
@@ -46,8 +46,7 @@ export function queryParamsPipe() {
|
|
|
46
46
|
whereType: queryKeys,
|
|
47
47
|
where: queryWhereClause,
|
|
48
48
|
})
|
|
49
|
-
.pipe((p) => ({ ...p, auth: [], authType: QueryKeys.and }))
|
|
50
|
-
.meta({ title: 'Query Params', $refId: 'QueryParams' });
|
|
49
|
+
.pipe((p) => ({ ...p, auth: [], authType: QueryKeys.and })), { title: 'Query Params', $refId: 'QueryParams' });
|
|
51
50
|
}
|
|
52
51
|
export function queryResultsPipe(model) {
|
|
53
52
|
return v.object({
|
|
@@ -67,11 +66,9 @@ export function queryResultsPipe(model) {
|
|
|
67
66
|
});
|
|
68
67
|
}
|
|
69
68
|
export function wrapQueryParams(params) {
|
|
70
|
-
return queryParamsPipe()
|
|
69
|
+
return v.assert(queryParamsPipe(), params);
|
|
71
70
|
}
|
|
72
|
-
export const mongoDbConfigPipe = v
|
|
73
|
-
.object({
|
|
71
|
+
export const mongoDbConfigPipe = v.meta(v.object({
|
|
74
72
|
uri: v.string(),
|
|
75
|
-
})
|
|
76
|
-
.meta({ title: 'Mongodb Config', $refId: 'MongodbConfig' });
|
|
73
|
+
}), { title: 'Mongodb Config', $refId: 'MongodbConfig' });
|
|
77
74
|
//# sourceMappingURL=pipes.js.map
|
package/lib/dbs/pipes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/dbs/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,CAAC,EAAE,MAAM,UAAU,CAAA;AAEhF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACpB,wBAAW,CAAA;IACX,sBAAS,CAAA;AACV,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,CAAN,IAAY,UAUX;AAVD,WAAY,UAAU;IACrB,uBAAS,CAAA;IACT,yBAAW,CAAA;IACX,uBAAS,CAAA;IACT,yBAAW,CAAA;IACX,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,yBAAW,CAAA;IACX,+BAAiB,CAAA;AAClB,CAAC,EAVW,UAAU,KAAV,UAAU,QAUrB;AAED,MAAM,SAAS,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/dbs/pipes.ts"],"names":[],"mappings":"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"}
|
package/lib/events/pipes.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { PipeOutput } from 'valleyed';
|
|
2
|
-
export declare const rabbitmqConfigPipe:
|
|
1
|
+
import { PipeOutput, v } from 'valleyed';
|
|
2
|
+
export declare const rabbitmqConfigPipe: v.Pipe<{
|
|
3
3
|
uri: string;
|
|
4
4
|
eventColumnName: string;
|
|
5
5
|
}, {
|
|
6
6
|
uri: string;
|
|
7
7
|
eventColumnName: string;
|
|
8
8
|
}, any>;
|
|
9
|
-
export declare const kafkaConfigPipe:
|
|
9
|
+
export declare const kafkaConfigPipe: v.Pipe<{
|
|
10
10
|
brokers: string[];
|
|
11
11
|
ssl: boolean | undefined;
|
|
12
12
|
sasl: {
|
package/lib/events/pipes.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { v } from 'valleyed';
|
|
2
|
-
export const rabbitmqConfigPipe = v
|
|
3
|
-
.object({
|
|
2
|
+
export const rabbitmqConfigPipe = v.meta(v.object({
|
|
4
3
|
uri: v.string(),
|
|
5
4
|
eventColumnName: v.string(),
|
|
6
|
-
})
|
|
7
|
-
|
|
8
|
-
export const kafkaConfigPipe = v.object({
|
|
5
|
+
}), { title: 'Rabbitmq Config', $refId: 'RabbitmqConfig' });
|
|
6
|
+
export const kafkaConfigPipe = v.meta(v.object({
|
|
9
7
|
brokers: v.array(v.string()),
|
|
10
8
|
ssl: v.optional(v.boolean()),
|
|
11
9
|
sasl: v.optional(v.object({
|
|
@@ -15,5 +13,5 @@ export const kafkaConfigPipe = v.object({
|
|
|
15
13
|
})),
|
|
16
14
|
confluent: v.optional(v.boolean()),
|
|
17
15
|
clientId: v.optional(v.string()),
|
|
18
|
-
});
|
|
16
|
+
}), { title: 'Kafka Config', $refId: 'KafkaConfig' });
|
|
19
17
|
//# sourceMappingURL=pipes.js.map
|
package/lib/events/pipes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/events/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/events/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CACvC,CAAC,CAAC,MAAM,CAAC;IACR,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;CAC3B,CAAC,EACF,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CACtD,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CACpC,CAAC,CAAC,MAAM,CAAC;IACR,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,EAAE,CAAC,CAAC,QAAQ,CACf,CAAC,CAAC,MAAM,CAAC;QACR,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,OAAgB,CAAC;QACjC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC,CACF;IACD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,EACF,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,CAChD,CAAA"}
|
package/lib/instance/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DataClass } from 'valleyed';
|
|
1
|
+
import { DataClass, v } from 'valleyed';
|
|
2
2
|
import { runHooks } from './hooks';
|
|
3
3
|
import { instanceSettingsPipe, mapSettingsToInstance } from './settings';
|
|
4
4
|
import { EquippedError } from '../errors';
|
|
@@ -29,13 +29,13 @@ export class Instance extends DataClass {
|
|
|
29
29
|
static create(envsPipe, settings) {
|
|
30
30
|
if (Instance.#instance)
|
|
31
31
|
throw Instance.crash(new EquippedError('An instance has already been created. Use that instead', {}));
|
|
32
|
-
const envValidity =
|
|
32
|
+
const envValidity = v.validate(envsPipe, process.env);
|
|
33
33
|
if (!envValidity.valid) {
|
|
34
34
|
Instance.crash(new EquippedError(`Environment variables are not valid\n${envValidity.error.toString()}`, {
|
|
35
35
|
messages: envValidity.error.messages,
|
|
36
36
|
}));
|
|
37
37
|
}
|
|
38
|
-
const settingsValidity = instanceSettingsPipe()
|
|
38
|
+
const settingsValidity = v.validate(instanceSettingsPipe(), settings(envValidity.value));
|
|
39
39
|
if (!settingsValidity.valid) {
|
|
40
40
|
Instance.crash(new EquippedError(`Settings are not valid\n${settingsValidity.error.toString()}`, {
|
|
41
41
|
messages: settingsValidity.error.messages,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instance/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAQ,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instance/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Logger } from 'pino';
|
|
2
|
-
import { ConditionalObjectKeys, IsInTypeList, PipeInput, PipeOutput } from 'valleyed';
|
|
2
|
+
import { ConditionalObjectKeys, IsInTypeList, PipeInput, PipeOutput, v } from 'valleyed';
|
|
3
3
|
import { Cache } from '../cache';
|
|
4
4
|
import { MongoDb } from '../dbs';
|
|
5
5
|
import { EventBus } from '../events';
|
|
6
6
|
import { RedisJob } from '../jobs';
|
|
7
7
|
import { BaseApiKeysUtility, BaseTokensUtility, Server } from '../server';
|
|
8
|
-
export declare const instanceSettingsPipe: () =>
|
|
8
|
+
export declare const instanceSettingsPipe: () => v.Pipe<{
|
|
9
9
|
app: {
|
|
10
10
|
id: string;
|
|
11
11
|
name: string;
|
package/lib/jobs/pipes.d.ts
CHANGED
package/lib/jobs/pipes.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { v } from 'valleyed';
|
|
2
2
|
import { redisConfigPipe } from '../cache';
|
|
3
|
-
export const redisJobsConfigPipe = v
|
|
4
|
-
.object({
|
|
3
|
+
export const redisJobsConfigPipe = v.meta(v.object({
|
|
5
4
|
redisConfig: redisConfigPipe,
|
|
6
5
|
queueName: v.string(),
|
|
7
|
-
})
|
|
8
|
-
.meta({ title: 'Redis Jobs Config', $refId: 'RedisJobsConfig' });
|
|
6
|
+
}), { title: 'Redis Jobs Config', $refId: 'RedisJobsConfig' });
|
|
9
7
|
//# sourceMappingURL=pipes.js.map
|
package/lib/jobs/pipes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/jobs/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/jobs/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CACxC,CAAC,CAAC,MAAM,CAAC;IACR,WAAW,EAAE,eAAe;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACrB,CAAC,EACF,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CACzD,CAAA"}
|
package/lib/server/impls/base.js
CHANGED
|
@@ -15,9 +15,10 @@ const errorsSchemas = Object.entries(StatusCodes)
|
|
|
15
15
|
.map(([key, value]) => ({
|
|
16
16
|
status: value,
|
|
17
17
|
contentType: 'application/json',
|
|
18
|
-
pipe: v
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
pipe: v.meta(v.array(v.object({ message: v.string(), field: v.optional(v.string()) })), {
|
|
19
|
+
$refId: `Errors.${key}Response`,
|
|
20
|
+
description: `${key} Response`,
|
|
21
|
+
}),
|
|
21
22
|
}));
|
|
22
23
|
export class Server {
|
|
23
24
|
config;
|
|
@@ -105,7 +106,7 @@ export class Server {
|
|
|
105
106
|
return;
|
|
106
107
|
if (def.type === 'request') {
|
|
107
108
|
requestPipe[def.key] = pipe;
|
|
108
|
-
jsonSchema.request[def.key] =
|
|
109
|
+
jsonSchema.request[def.key] = v.schema(pipe);
|
|
109
110
|
}
|
|
110
111
|
if (def.type === 'response') {
|
|
111
112
|
const pipeRecords = errorsSchemas.concat({ status: defaultStatusCode, contentType, pipe });
|
|
@@ -113,12 +114,12 @@ export class Server {
|
|
|
113
114
|
const p = pipeRecords.find((r) => r.status === status)?.pipe;
|
|
114
115
|
if (!p)
|
|
115
116
|
throw PipeError.root(`schema not defined for status code: ${status}`, input);
|
|
116
|
-
return
|
|
117
|
+
return v.assert(p, input);
|
|
117
118
|
});
|
|
118
119
|
jsonSchema.response[def.key] = pipeRecords.map((record) => ({
|
|
119
120
|
status: record.status,
|
|
120
121
|
contentType: record.contentType,
|
|
121
|
-
schema: record.pipe
|
|
122
|
+
schema: v.schema(record.pipe),
|
|
122
123
|
}));
|
|
123
124
|
}
|
|
124
125
|
});
|
|
@@ -127,7 +128,7 @@ export class Server {
|
|
|
127
128
|
return request;
|
|
128
129
|
const context = schema.context ? await schema.context(request) : {};
|
|
129
130
|
request.context = context;
|
|
130
|
-
const validity = requestLocalStorage.run(request, () => v.object(requestPipe)
|
|
131
|
+
const validity = requestLocalStorage.run(request, () => v.validate(v.object(requestPipe), {
|
|
131
132
|
params: request.params,
|
|
132
133
|
headers: request.headers,
|
|
133
134
|
query: request.query,
|
|
@@ -147,7 +148,7 @@ export class Server {
|
|
|
147
148
|
status = response.status;
|
|
148
149
|
contentType = response.contentType;
|
|
149
150
|
contentType;
|
|
150
|
-
const validity = responseLocalStorage.run(response, () => v.object(responsePipe)
|
|
151
|
+
const validity = responseLocalStorage.run(response, () => v.validate(v.object(responsePipe), {
|
|
151
152
|
responseHeaders: response.headers,
|
|
152
153
|
response: response.body,
|
|
153
154
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/server/impls/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,WAAW,CAAA;AAC1B,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAQ,SAAS,EAAE,CAAC,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAoB,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAyB,WAAW,EAAc,MAAM,UAAU,CAAA;AAKlF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;KAC/C,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,CAAC;KAClC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,EAAE,KAAK;IACb,WAAW,EAAE,kBAAkB;IAC/B,IAAI,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/server/impls/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const parseAuthUser: {
|
|
2
|
-
cb: (req: import("..").Request<import("
|
|
3
|
-
onSetup: ((route: import("
|
|
2
|
+
cb: (req: import("..").Request<import("..").RouteDefToReqRes<import("..").RouteDef>>) => void | Promise<void>;
|
|
3
|
+
onSetup: ((route: import("..").Route<import("..").RouteDef>) => void) | undefined;
|
|
4
4
|
};
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
export declare const requireAuthUser: {
|
|
2
|
-
cb: (req: import("..").Request<import("
|
|
3
|
-
onSetup: ((route: import("
|
|
2
|
+
cb: (req: import("..").Request<import("..").RouteDefToReqRes<import("..").RouteDef>>) => void | Promise<void>;
|
|
3
|
+
onSetup: ((route: import("..").Route<import("..").RouteDef>) => void) | undefined;
|
|
4
4
|
};
|
|
5
5
|
export declare const requireAuthorizationUser: {
|
|
6
|
-
cb: (req: import("..").Request<import("
|
|
7
|
-
onSetup: ((route: import("
|
|
6
|
+
cb: (req: import("..").Request<import("..").RouteDefToReqRes<import("..").RouteDef>>) => void | Promise<void>;
|
|
7
|
+
onSetup: ((route: import("..").Route<import("..").RouteDef>) => void) | undefined;
|
|
8
8
|
};
|
|
9
9
|
export declare const requireApiKeyUser: {
|
|
10
|
-
cb: (req: import("..").Request<import("
|
|
11
|
-
onSetup: ((route: import("
|
|
10
|
+
cb: (req: import("..").Request<import("..").RouteDefToReqRes<import("..").RouteDef>>) => void | Promise<void>;
|
|
11
|
+
onSetup: ((route: import("..").Route<import("..").RouteDef>) => void) | undefined;
|
|
12
12
|
};
|
|
13
13
|
export declare const requireRefreshTokenUser: {
|
|
14
|
-
cb: (req: import("..").Request<import("
|
|
15
|
-
onSetup: ((route: import("
|
|
14
|
+
cb: (req: import("..").Request<import("..").RouteDefToReqRes<import("..").RouteDef>>) => void | Promise<void>;
|
|
15
|
+
onSetup: ((route: import("..").Route<import("..").RouteDef>) => void) | undefined;
|
|
16
16
|
};
|
package/lib/server/pipes.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { PipeOutput } from 'valleyed';
|
|
1
|
+
import { PipeOutput, v } from 'valleyed';
|
|
2
2
|
import { BaseApiKeysUtility, BaseTokensUtility } from './requests-auth';
|
|
3
3
|
import { EventBus } from '../events';
|
|
4
4
|
import { Instance } from '../instance';
|
|
5
|
-
export declare const serverPipe:
|
|
5
|
+
export declare const serverPipe: v.Pipe<{
|
|
6
6
|
type: "fastify" | "express";
|
|
7
7
|
port: number;
|
|
8
8
|
publicPath: string | undefined;
|
package/lib/validations/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from 'valleyed';
|
|
2
2
|
export * as v from './valleyed';
|
|
3
|
+
import { v } from 'valleyed';
|
|
3
4
|
import { ValidationError } from '../errors';
|
|
4
5
|
export function pipeErrorToValidationError(error) {
|
|
5
6
|
const errorsObject = error.messages.reduce((acc, { path = '', message }) => {
|
|
@@ -12,7 +13,7 @@ export function pipeErrorToValidationError(error) {
|
|
|
12
13
|
return new ValidationError(Object.values(errorsObject));
|
|
13
14
|
}
|
|
14
15
|
export function validate(pipe, value) {
|
|
15
|
-
const validity =
|
|
16
|
+
const validity = v.validate(pipe, value);
|
|
16
17
|
if (validity.valid)
|
|
17
18
|
return validity.value;
|
|
18
19
|
throw pipeErrorToValidationError(validity.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,OAAO,KAAK,CAAC,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,OAAO,KAAK,CAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAA+B,CAAC,EAAE,MAAM,UAAU,CAAA;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,UAAU,0BAA0B,CAAC,KAAgB;IAC1D,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAwD,CAAC,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACjI,IAAI,GAAG,CAAC,IAAI,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;;YAC1C,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;QACrD,OAAO,GAAG,CAAA;IACX,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAwC,IAAO,EAAE,KAAc;IACtF,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACxC,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,KAAsB,CAAA;IAC1D,MAAM,0BAA0B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AACjD,CAAC"}
|
|
@@ -9,23 +9,24 @@ const filePipe = (err) => v.array(v.file(err).pipe((input) => {
|
|
|
9
9
|
return input;
|
|
10
10
|
throw PipeError.root(err, input);
|
|
11
11
|
}));
|
|
12
|
-
export const incomingFile = (err) => v.pipe((input) => filePipe(err)
|
|
12
|
+
export const incomingFile = (err) => v.pipe((input) => v.assert(filePipe(err)
|
|
13
13
|
.pipe(v.min(1, 'no file provided'))
|
|
14
|
-
.pipe((files) => files[0])
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
.pipe((files) => files[0]), input), { schema: () => ({ type: 'string', format: 'binary' }) });
|
|
15
|
+
export const incomingFiles = (err) => v.pipe((input) => v.assert(filePipe(err), input), {
|
|
16
|
+
schema: () => ({ type: 'string', format: 'binary' }),
|
|
17
|
+
});
|
|
17
18
|
export const requestLocalStorage = new AsyncLocalStorage();
|
|
18
19
|
export const responseLocalStorage = new AsyncLocalStorage();
|
|
19
20
|
export const withRequest = (fn) => v.pipe((input) => {
|
|
20
21
|
const req = requestLocalStorage.getStore();
|
|
21
22
|
if (!req)
|
|
22
23
|
throw PipeError.root('Request not found in context', input);
|
|
23
|
-
return fn(req)
|
|
24
|
+
return v.assert(fn(req), input);
|
|
24
25
|
});
|
|
25
26
|
export const withResponse = (fn) => v.pipe((input) => {
|
|
26
27
|
const res = responseLocalStorage.getStore();
|
|
27
28
|
if (!res)
|
|
28
29
|
throw PipeError.root('Response not found in context', input);
|
|
29
|
-
return fn(res)
|
|
30
|
+
return v.assert(fn(res), input);
|
|
30
31
|
});
|
|
31
32
|
//# sourceMappingURL=valleyed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valleyed.js","sourceRoot":"","sources":["../../src/validations/valleyed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAQ,SAAS,EAAyB,CAAC,EAAE,MAAM,UAAU,CAAA;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGtC,cAAc,4BAA4B,CAAA;AAE1C,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,EAAE,CACjC,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,IAAI,CAAe,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;IACxC,MAAM,GAAG,GAAG,mCAAmC,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,IAAI,CAAA;IACjH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/C,IAAI,KAAK;QAAE,OAAO,KAAK,CAAA;IACvB,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACjC,CAAC,CAAC,CACF,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAY,EAAE,EAAE,CAC5C,CAAC,CAAC,IAAI,CACL,CAAC,KAAK,EAAE,EAAE,CACT,QAAQ,CAAC,GAAG,CAAC;KACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;KAClC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"valleyed.js","sourceRoot":"","sources":["../../src/validations/valleyed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAQ,SAAS,EAAyB,CAAC,EAAE,MAAM,UAAU,CAAA;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGtC,cAAc,4BAA4B,CAAA;AAE1C,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,EAAE,CACjC,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,IAAI,CAAe,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;IACxC,MAAM,GAAG,GAAG,mCAAmC,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,IAAI,CAAA;IACjH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/C,IAAI,KAAK;QAAE,OAAO,KAAK,CAAA;IACvB,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACjC,CAAC,CAAC,CACF,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAY,EAAE,EAAE,CAC5C,CAAC,CAAC,IAAI,CACL,CAAC,KAAK,EAAE,EAAE,CACT,CAAC,CAAC,MAAM,CACP,QAAQ,CAAC,GAAG,CAAC;KACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;KAClC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAC3B,KAAK,CACL,EACF,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,CACxD,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAY,EAAE,EAAE,CAC7C,CAAC,CAAC,IAAI,CAA+B,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE;IAC/E,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;CACpD,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,EAAuC,CAAA;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,iBAAiB,EAAwC,CAAA;AAEjG,MAAM,CAAC,MAAM,WAAW,GAAG,CAAgC,EAAmD,EAAE,EAAE,CACjH,CAAC,CAAC,IAAI,CAAmC,CAAC,KAAK,EAAE,EAAE;IAClD,MAAM,GAAG,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAA;IAC1C,IAAI,CAAC,GAAG;QAAE,MAAM,SAAS,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAA;IACrE,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAChC,CAAC,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAgC,EAAoD,EAAE,EAAE,CACnH,CAAC,CAAC,IAAI,CAAmC,CAAC,KAAK,EAAE,EAAE;IAClD,MAAM,GAAG,GAAG,oBAAoB,CAAC,QAAQ,EAAE,CAAA;IAC3C,IAAI,CAAC,GAAG;QAAE,MAAM,SAAS,CAAC,IAAI,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAA;IACtE,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAChC,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "equipped",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -26,9 +26,7 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@commitlint/cli": "^19.8.1",
|
|
28
28
|
"@commitlint/config-conventional": "^19.8.1",
|
|
29
|
-
"@k11/
|
|
30
|
-
"@k11/prettier-config": "^0.1.0",
|
|
31
|
-
"@k11/ts-config": "^0.1.5",
|
|
29
|
+
"@k11/configs": "^0.1.0",
|
|
32
30
|
"@types/amqplib": "^0.10.7",
|
|
33
31
|
"@types/bcryptjs": "^3.0.0",
|
|
34
32
|
"@types/bull": "^4.10.4",
|
|
@@ -83,7 +81,7 @@
|
|
|
83
81
|
"redis": "5.1.1",
|
|
84
82
|
"socket.io": "4.8.1",
|
|
85
83
|
"supertest": "7.1.1",
|
|
86
|
-
"valleyed": "^4.5.
|
|
84
|
+
"valleyed": "^4.5.6"
|
|
87
85
|
},
|
|
88
86
|
"repository": {
|
|
89
87
|
"url": "git://github.com/kevinand11/equipped.git"
|