@decaf-ts/for-http 0.3.29 → 0.3.31
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/README.md +1 -1
- package/dist/for-http.cjs +1 -1
- package/dist/for-http.cjs.map +1 -1
- package/dist/for-http.js +1 -1
- package/dist/for-http.js.map +1 -1
- package/lib/RestRepository.cjs +30 -42
- package/lib/RestRepository.d.ts +1 -2
- package/lib/RestRepository.js.map +1 -1
- package/lib/RestService.d.ts +1 -1
- package/lib/adapter.cjs +31 -32
- package/lib/adapter.d.ts +4 -4
- package/lib/adapter.js.map +1 -1
- package/lib/axios/axios.cjs +8 -6
- package/lib/axios/axios.js.map +1 -1
- package/lib/esm/RestRepository.d.ts +1 -2
- package/lib/esm/RestRepository.js +31 -43
- package/lib/esm/RestRepository.js.map +1 -1
- package/lib/esm/RestService.d.ts +1 -1
- package/lib/esm/adapter.d.ts +4 -4
- package/lib/esm/adapter.js +10 -11
- package/lib/esm/adapter.js.map +1 -1
- package/lib/esm/axios/axios.js +8 -6
- package/lib/esm/axios/axios.js.map +1 -1
- package/lib/esm/index.d.ts +1 -1
- package/lib/esm/index.js +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.d.ts +1 -1
- package/package.json +3 -2
- package/workdocs/assets/slogans.json +202 -0
package/lib/adapter.cjs
CHANGED
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.HttpAdapter = void 0;
|
|
4
4
|
exports.suffixMethod = suffixMethod;
|
|
5
5
|
const core_1 = require("@decaf-ts/core");
|
|
6
|
+
const core_2 = require("@decaf-ts/core");
|
|
6
7
|
const db_decorators_1 = require("@decaf-ts/db-decorators");
|
|
7
8
|
const decorator_validation_1 = require("@decaf-ts/decorator-validation");
|
|
8
9
|
const decoration_1 = require("@decaf-ts/decoration");
|
|
9
10
|
const RestService_1 = require("./RestService.cjs");
|
|
10
|
-
const core_2 = require("@decaf-ts/core");
|
|
11
11
|
const logging_1 = require("@decaf-ts/logging");
|
|
12
12
|
const HttpStatement_1 = require("./HttpStatement.cjs");
|
|
13
13
|
const HttpPaginator_1 = require("./HttpPaginator.cjs");
|
|
@@ -57,9 +57,10 @@ function suffixMethod(obj, before, suffix, beforeName) {
|
|
|
57
57
|
* }
|
|
58
58
|
* ```
|
|
59
59
|
*/
|
|
60
|
-
class HttpAdapter extends
|
|
60
|
+
class HttpAdapter extends core_2.Adapter {
|
|
61
61
|
constructor(config, flavour, alias) {
|
|
62
62
|
super(config, flavour, alias);
|
|
63
|
+
this.DefaultFlags = core_2.DefaultAdapterFlags;
|
|
63
64
|
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
64
65
|
const self = this;
|
|
65
66
|
[
|
|
@@ -85,11 +86,10 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
85
86
|
* @param {...any[]} args - Additional arguments forwarded to the base implementation
|
|
86
87
|
* @return {Promise<FlagsOf<C>>} The flags object with headers
|
|
87
88
|
*/
|
|
88
|
-
async flags(operation, model, overrides
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
});
|
|
89
|
+
async flags(operation, model, overrides) {
|
|
90
|
+
return super.flags(operation, model, Object.assign({
|
|
91
|
+
headers: overrides.headers ?? {},
|
|
92
|
+
}, overrides));
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
95
95
|
* @description Returns the repository constructor for this adapter
|
|
@@ -114,13 +114,13 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
114
114
|
prepare(model, ...args) {
|
|
115
115
|
const { log } = this.logCtx(args, this.prepare);
|
|
116
116
|
const result = Object.assign({}, model);
|
|
117
|
-
if (model[
|
|
118
|
-
log.silly(`Passing along persistence metadata for ${model[
|
|
119
|
-
Object.defineProperty(result,
|
|
117
|
+
if (model[core_2.PersistenceKeys.METADATA]) {
|
|
118
|
+
log.silly(`Passing along persistence metadata for ${model[core_2.PersistenceKeys.METADATA]}`);
|
|
119
|
+
Object.defineProperty(result, core_2.PersistenceKeys.METADATA, {
|
|
120
120
|
enumerable: false,
|
|
121
121
|
writable: false,
|
|
122
122
|
configurable: true,
|
|
123
|
-
value: model[
|
|
123
|
+
value: model[core_2.PersistenceKeys.METADATA],
|
|
124
124
|
});
|
|
125
125
|
}
|
|
126
126
|
return {
|
|
@@ -148,10 +148,10 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
148
148
|
if (!constr)
|
|
149
149
|
throw new db_decorators_1.InternalError(`Failed to retrieve model constructor for ${clazz}`);
|
|
150
150
|
const result = new constr(obj);
|
|
151
|
-
const metadata = obj[
|
|
151
|
+
const metadata = obj[core_2.PersistenceKeys.METADATA];
|
|
152
152
|
if (metadata) {
|
|
153
153
|
log.silly(`Passing along ${this.flavour} persistence metadata for ${m.constructor.name} id ${id}: ${metadata}`);
|
|
154
|
-
Object.defineProperty(result,
|
|
154
|
+
Object.defineProperty(result, core_2.PersistenceKeys.METADATA, {
|
|
155
155
|
enumerable: false,
|
|
156
156
|
configurable: false,
|
|
157
157
|
writable: false,
|
|
@@ -205,7 +205,7 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
205
205
|
return idStr.split(composed.separator);
|
|
206
206
|
}
|
|
207
207
|
parseResponse(clazz, method, res) {
|
|
208
|
-
if (clazz &&
|
|
208
|
+
if (clazz && core_2.Paginator.isSerializedPage(res))
|
|
209
209
|
return Object.assign({}, res, {
|
|
210
210
|
data: res.data.map((d) => new clazz(d)),
|
|
211
211
|
});
|
|
@@ -282,22 +282,22 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
282
282
|
return new db_decorators_1.BadRequestError(err);
|
|
283
283
|
if (msg.includes(db_decorators_1.ValidationError.name) || msg.includes("422"))
|
|
284
284
|
return new db_decorators_1.ValidationError(err);
|
|
285
|
-
if (msg.includes(
|
|
286
|
-
return new
|
|
287
|
-
if (msg.includes(
|
|
288
|
-
return new
|
|
285
|
+
if (msg.includes(core_2.QueryError.name))
|
|
286
|
+
return new core_2.QueryError(err);
|
|
287
|
+
if (msg.includes(core_2.PagingError.name))
|
|
288
|
+
return new core_2.PagingError(err);
|
|
289
289
|
if (msg.includes(core_1.UnsupportedError.name))
|
|
290
290
|
return new core_1.UnsupportedError(err);
|
|
291
|
-
if (msg.includes(
|
|
292
|
-
return new
|
|
293
|
-
if (msg.includes(
|
|
294
|
-
return new
|
|
295
|
-
if (msg.includes(
|
|
296
|
-
return new
|
|
297
|
-
if (msg.includes(
|
|
298
|
-
return new
|
|
299
|
-
if (msg.includes(
|
|
300
|
-
return new
|
|
291
|
+
if (msg.includes(core_2.MigrationError.name))
|
|
292
|
+
return new core_2.MigrationError(err);
|
|
293
|
+
if (msg.includes(core_2.ObserverError.name))
|
|
294
|
+
return new core_2.ObserverError(err);
|
|
295
|
+
if (msg.includes(core_2.AuthorizationError.name))
|
|
296
|
+
return new core_2.AuthorizationError(err);
|
|
297
|
+
if (msg.includes(core_2.ForbiddenError.name))
|
|
298
|
+
return new core_2.ForbiddenError(err);
|
|
299
|
+
if (msg.includes(core_2.ConnectionError.name))
|
|
300
|
+
return new core_2.ConnectionError(err);
|
|
301
301
|
if (msg.includes(db_decorators_1.SerializationError.name))
|
|
302
302
|
return new db_decorators_1.SerializationError(err);
|
|
303
303
|
return new db_decorators_1.InternalError(err);
|
|
@@ -312,8 +312,7 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
312
312
|
descriptor.value = new Proxy(descriptor.value, {
|
|
313
313
|
async apply(target, thisArg, args) {
|
|
314
314
|
const repo = thisArg;
|
|
315
|
-
const
|
|
316
|
-
const { log, ctxArgs } = repo["logCtx"](contextArgs.args, target);
|
|
315
|
+
const { log, ctxArgs } = (await repo["logCtx"](args, db_decorators_1.OperationKeys.READ, true)).for(prop);
|
|
317
316
|
log.verbose(`Running prepared statement ${target.name}`);
|
|
318
317
|
log.debug(`With args: ${JSON.stringify(args, null, 2)}`);
|
|
319
318
|
return thisArg.statement(target.name, ...ctxArgs);
|
|
@@ -321,10 +320,10 @@ class HttpAdapter extends core_1.Adapter {
|
|
|
321
320
|
});
|
|
322
321
|
};
|
|
323
322
|
}
|
|
324
|
-
return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(
|
|
323
|
+
return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(core_2.PersistenceKeys.QUERY, prop), options), (0, core_2.prepared)(), innerQuery(options))(obj, prop, descriptor);
|
|
325
324
|
};
|
|
326
325
|
}
|
|
327
|
-
decoration_1.Decoration.for(
|
|
326
|
+
decoration_1.Decoration.for(core_2.PersistenceKeys.QUERY)
|
|
328
327
|
.define({
|
|
329
328
|
decorator: query,
|
|
330
329
|
})
|
package/lib/adapter.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AdapterFlags, Condition, SequenceOptions } from "@decaf-ts/core";
|
|
2
|
+
import { Adapter, Context, ContextualArgs, MaybeContextualArg, Paginator, Statement, PreparedModel, PreparedStatement, Repository, Sequence, FlagsOf } from "@decaf-ts/core";
|
|
2
3
|
import { BaseError, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
|
|
3
4
|
import { HttpConfig, HttpFlags } from "./types";
|
|
4
5
|
import { Model } from "@decaf-ts/decorator-validation";
|
|
5
6
|
import { Constructor } from "@decaf-ts/decoration";
|
|
6
|
-
import { Statement, SequenceOptions, Sequence } from "@decaf-ts/core";
|
|
7
|
-
import type { AdapterFlags } from "@decaf-ts/core";
|
|
8
7
|
export declare function suffixMethod(obj: any, before: (...args: any[]) => any, suffix: (...args: any[]) => any, beforeName?: string): void;
|
|
9
8
|
/**
|
|
10
9
|
* @description Abstract HTTP adapter for REST API interactions
|
|
@@ -50,7 +49,8 @@ export declare abstract class HttpAdapter<CONF extends HttpConfig, CON, REQ, Q e
|
|
|
50
49
|
* @param {...any[]} args - Additional arguments forwarded to the base implementation
|
|
51
50
|
* @return {Promise<FlagsOf<C>>} The flags object with headers
|
|
52
51
|
*/
|
|
53
|
-
protected flags<M extends Model>(operation: OperationKeys | string, model: Constructor<M> | Constructor<M>[], overrides: Partial<FlagsOf<C
|
|
52
|
+
protected flags<M extends Model>(operation: OperationKeys | string, model: Constructor<M> | Constructor<M>[], overrides: Partial<FlagsOf<C>>): Promise<FlagsOf<C>>;
|
|
53
|
+
protected DefaultFlags: Partial<FlagsOf<C>>;
|
|
54
54
|
/**
|
|
55
55
|
* @description Returns the repository constructor for this adapter
|
|
56
56
|
* @summary Provides the RestService class as the repository implementation for this HTTP adapter.
|
package/lib/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/axios/axios.cjs
CHANGED
|
@@ -108,7 +108,8 @@ class AxiosHttpAdapter extends adapter_1.HttpAdapter {
|
|
|
108
108
|
catch (e) {
|
|
109
109
|
// do nothing
|
|
110
110
|
}
|
|
111
|
-
|
|
111
|
+
const response = await this.client.request(Object.assign({}, details, overrides));
|
|
112
|
+
return response;
|
|
112
113
|
}
|
|
113
114
|
parseResponse(clazz, method, res) {
|
|
114
115
|
if (res.status >= 400)
|
|
@@ -121,17 +122,17 @@ class AxiosHttpAdapter extends adapter_1.HttpAdapter {
|
|
|
121
122
|
case core_1.PreparedStatementKeys.FIND_BY:
|
|
122
123
|
case core_1.PreparedStatementKeys.LIST_BY:
|
|
123
124
|
case core_1.PreparedStatementKeys.PAGE_BY:
|
|
124
|
-
return res.body;
|
|
125
|
+
return res.body || res;
|
|
125
126
|
case db_decorators_1.OperationKeys.CREATE:
|
|
126
127
|
case db_decorators_1.OperationKeys.READ:
|
|
127
128
|
case db_decorators_1.OperationKeys.UPDATE:
|
|
128
129
|
case db_decorators_1.OperationKeys.DELETE:
|
|
129
|
-
return res.body;
|
|
130
|
+
return res.body || res;
|
|
130
131
|
case core_1.PreparedStatementKeys.FIND_ONE_BY:
|
|
131
132
|
case "statement":
|
|
132
|
-
return super.parseResponse(clazz, method, res.body);
|
|
133
|
+
return super.parseResponse(clazz, method, res.body || res);
|
|
133
134
|
default:
|
|
134
|
-
return res.body;
|
|
135
|
+
return res.body || res;
|
|
135
136
|
}
|
|
136
137
|
}
|
|
137
138
|
/**
|
|
@@ -149,9 +150,10 @@ class AxiosHttpAdapter extends adapter_1.HttpAdapter {
|
|
|
149
150
|
const url = this.url(tableName, this.extractIdArgs(tableName, id));
|
|
150
151
|
const cfg = this.toRequest(ctx);
|
|
151
152
|
log.debug(`POSTing to ${url} with ${JSON.stringify(model)} and cfg ${JSON.stringify(cfg)}`);
|
|
152
|
-
|
|
153
|
+
const result = await this.client.post(url, Object.assign({}, model, {
|
|
153
154
|
[decorator_validation_1.ModelKeys.ANCHOR]: tableName.name,
|
|
154
155
|
}), cfg);
|
|
156
|
+
return result;
|
|
155
157
|
}
|
|
156
158
|
catch (e) {
|
|
157
159
|
throw this.parseError(e);
|
package/lib/axios/axios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/axios/axios.ts"],"names":[],"mappings":";;;AAAA,8CAAyC;AACzC,iCAAkD;AAGlD,2DAKiC;AACjC,yCAOwB;AACxB,+CAA2C;AAC3C,yEAAkE;AAGlE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAa,gBAAiB,SAAQ,qBAMrC;IACC,YAAY,MAAkB,EAAE,KAAc;QAC5C,KAAK,CAAC,MAAM,EAAE,wBAAY,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;IAEkB,SAAS;QAC1B,OAAO,IAAI,aAAK,CAAC;YACf,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;SACnC,CAAC,CAAC;IAC3B,CAAC;IAQQ,SAAS,CAChB,UAAwD,EACxD,GAAyB;QAEzB,IAAI,KAAyC,CAAC;QAC9C,IAAI,OAAwC,CAAC;QAE7C,IAAI,UAAU,YAAY,cAAO,EAAE,CAAC;YAClC,OAAO,GAAG,UAAU,CAAC;YACrB,KAAK,GAAG,SAAS,CAAC,CAAC,8CAA8C;QACnE,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,UAAU,CAAC;YACnB,OAAO,GAAG,GAAG,CAAC;QAChB,CAAC;QAED,MAAM,GAAG,GAAuB,EAAE,CAAC;QACnC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBAC3C,6DAA6D;YAC/D,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,aAAa;YACf,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC;YACnB,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAChB,KAAK,CAAC,KAAK,EACX,CAAC,sBAAe,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAChE,KAAK,CAAC,MAAa,CACpB,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;;;OAOG;IACM,KAAK,CAAC,OAAO,CACpB,OAA2B,EAC3B,GAAG,IAA6C;QAEhD,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAChD,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAChC,6DAA6D;QAC/D,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,aAAa;QACf,CAAC;
|
|
1
|
+
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/axios/axios.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ import { HttpAdapter } from "./adapter";
|
|
|
32
32
|
* @see {@link RestService}
|
|
33
33
|
*/
|
|
34
34
|
export declare class RestRepository<M extends Model, A extends HttpAdapter<any, any, any, any, any>, Q = A extends HttpAdapter<any, any, any, infer Q, any> ? Q : never> extends Repository<M, A> {
|
|
35
|
-
protected _overrides: Partial<import("@decaf-ts/core").FlagsOf<ContextOf<A>>> &
|
|
35
|
+
protected _overrides: Partial<import("@decaf-ts/core").FlagsOf<ContextOf<A>>> & {
|
|
36
36
|
allowRawStatements: boolean;
|
|
37
37
|
forcePrepareSimpleQueries: boolean;
|
|
38
38
|
forcePrepareComplexQueries: boolean;
|
|
@@ -41,7 +41,6 @@ export declare class RestRepository<M extends Model, A extends HttpAdapter<any,
|
|
|
41
41
|
url<M extends Model>(tableName: string | Constructor<M>): string;
|
|
42
42
|
url<M extends Model>(tableName: string | Constructor<M>, pathParams: string[]): string;
|
|
43
43
|
url<M extends Model>(tableName: string | Constructor<M>, queryParams: Record<string, string | number> | undefined): string;
|
|
44
|
-
protected createAllPrefix(models: M[], ...args: MaybeContextualArg<ContextOf<A>>): Promise<[M[], ...any[], ContextOf<A>]>;
|
|
45
44
|
paginateBy(key: keyof M, order: OrderDirection, ref?: Omit<DirectionLimitOffset, "direction">, ...args: MaybeContextualArg<ContextOf<A>>): Promise<SerializedPage<M>>;
|
|
46
45
|
listBy(key: keyof M, order: OrderDirection, ...args: MaybeContextualArg<ContextOf<A>>): Promise<any>;
|
|
47
46
|
findBy(key: keyof M, value: any, ...args: MaybeContextualArg<ContextOf<A>>): Promise<M[]>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Context, PersistenceKeys, PreparedStatementKeys, Repository, } from "@decaf-ts/core";
|
|
2
2
|
import { Model } from "@decaf-ts/decorator-validation";
|
|
3
|
-
import { OperationKeys
|
|
3
|
+
import { OperationKeys } from "@decaf-ts/db-decorators";
|
|
4
4
|
/**
|
|
5
5
|
* @description Repository for REST API interactions
|
|
6
6
|
* @summary A specialized repository implementation for interacting with REST APIs.
|
|
@@ -42,68 +42,50 @@ export class RestRepository extends Repository {
|
|
|
42
42
|
url(tableName, pathParams, queryParams) {
|
|
43
43
|
return this.adapter.url(tableName, pathParams, queryParams);
|
|
44
44
|
}
|
|
45
|
-
async createAllPrefix(models, ...args) {
|
|
46
|
-
const contextArgs = await Context.args(OperationKeys.CREATE, this.class, args, this.adapter, this._overrides || {});
|
|
47
|
-
const ignoreHandlers = contextArgs.context.get("ignoreHandlers");
|
|
48
|
-
const ignoreValidate = contextArgs.context.get("ignoreValidation");
|
|
49
|
-
if (!models.length)
|
|
50
|
-
return [models, ...contextArgs.args];
|
|
51
|
-
models = await Promise.all(models.map(async (m) => {
|
|
52
|
-
m = new this.class(m);
|
|
53
|
-
if (!ignoreHandlers)
|
|
54
|
-
await enforceDBDecorators(this, contextArgs.context, m, OperationKeys.CREATE, OperationKeys.ON);
|
|
55
|
-
return m;
|
|
56
|
-
}));
|
|
57
|
-
if (!ignoreValidate) {
|
|
58
|
-
const ignoredProps = contextArgs.context.get("ignoredValidationProperties") || [];
|
|
59
|
-
const errors = await Promise.all(models.map((m) => Promise.resolve(m.hasErrors(...ignoredProps))));
|
|
60
|
-
const errorMessages = reduceErrorsToPrint(errors);
|
|
61
|
-
if (errorMessages)
|
|
62
|
-
throw new ValidationError(errorMessages);
|
|
63
|
-
}
|
|
64
|
-
return [models, ...contextArgs.args];
|
|
65
|
-
}
|
|
66
45
|
async paginateBy(key, order, ref = {
|
|
67
46
|
offset: 1,
|
|
68
47
|
limit: 10,
|
|
69
48
|
}, ...args) {
|
|
70
|
-
const
|
|
71
|
-
const { log, ctxArgs } = this.logCtx(
|
|
72
|
-
log.verbose(`paginating ${Model.tableName(this.class)} with page size ${
|
|
49
|
+
const { offset, bookmark, limit } = ref;
|
|
50
|
+
const { log, ctxArgs } = (await this.logCtx(args, PreparedStatementKeys.PAGE_BY, true)).for(this.paginateBy);
|
|
51
|
+
log.verbose(`paginating ${Model.tableName(this.class)} with page size ${limit}`);
|
|
73
52
|
const params = {
|
|
74
53
|
direction: order,
|
|
75
|
-
limit:
|
|
54
|
+
limit: limit,
|
|
76
55
|
};
|
|
77
|
-
if (
|
|
78
|
-
params.bookmark =
|
|
56
|
+
if (bookmark) {
|
|
57
|
+
params.bookmark = bookmark;
|
|
79
58
|
}
|
|
80
|
-
return this.statement(this.paginateBy.name, key,
|
|
59
|
+
return this.statement(this.paginateBy.name, key, offset, params, ...ctxArgs);
|
|
81
60
|
}
|
|
82
61
|
async listBy(key, order, ...args) {
|
|
83
|
-
const
|
|
84
|
-
const { log, ctxArgs } = this.logCtx(contextArgs.args, this.listBy);
|
|
62
|
+
const { log, ctxArgs } = (await this.logCtx(args, PreparedStatementKeys.LIST_BY, true)).for(this.listBy);
|
|
85
63
|
log.verbose(`listing ${Model.tableName(this.class)} by ${key} ${order}`);
|
|
86
64
|
return (await this.statement(this.listBy.name, key, { direction: order }, ...ctxArgs));
|
|
87
65
|
}
|
|
88
66
|
async findBy(key, value, ...args) {
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
log.verbose(`finding all ${Model.tableName(this.class)} with ${key} ${value}`);
|
|
67
|
+
const { log, ctxArgs } = (await this.logCtx(args, PreparedStatementKeys.FIND_BY, true)).for(this.findBy);
|
|
68
|
+
log.verbose(`finding ${Model.tableName(this.class)} with ${key} ${value}`);
|
|
92
69
|
return (await this.statement(this.findBy.name, key, value, {}, ...ctxArgs));
|
|
93
70
|
}
|
|
94
71
|
async findOneBy(key, value, ...args) {
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
log.verbose(`finding One ${Model.tableName(this.class)} with ${key} ${value}`);
|
|
72
|
+
const { log, ctxArgs } = (await this.logCtx(args, PreparedStatementKeys.FIND_ONE_BY, true)).for(this.findOneBy);
|
|
73
|
+
log.verbose(`finding ${Model.tableName(this.class)} with ${key} ${value}`);
|
|
98
74
|
return (await this.statement(this.findOneBy.name, key, value, {}, ...ctxArgs));
|
|
99
75
|
}
|
|
100
76
|
async statement(name, ...args) {
|
|
101
|
-
const
|
|
102
|
-
const
|
|
103
|
-
const
|
|
77
|
+
const { log, ctx, ctxArgs } = (await this.logCtx(args, PersistenceKeys.STATEMENT, true)).for(this.statement);
|
|
78
|
+
const argList = ctxArgs.slice(0, -1);
|
|
79
|
+
const lastArg = argList[argList.length - 1];
|
|
80
|
+
const hasParams = typeof lastArg === "object" &&
|
|
81
|
+
lastArg !== null &&
|
|
82
|
+
!Array.isArray(lastArg);
|
|
83
|
+
const params = hasParams
|
|
84
|
+
? argList.pop()
|
|
85
|
+
: undefined;
|
|
104
86
|
const query = {
|
|
105
87
|
class: this.class,
|
|
106
|
-
args:
|
|
88
|
+
args: argList,
|
|
107
89
|
method: name,
|
|
108
90
|
params: params,
|
|
109
91
|
};
|
|
@@ -112,8 +94,14 @@ export class RestRepository extends Repository {
|
|
|
112
94
|
return this.adapter.parseResponse(this.class, name, await this.request(req, ...ctxArgs));
|
|
113
95
|
}
|
|
114
96
|
async request(details, ...args) {
|
|
115
|
-
|
|
116
|
-
|
|
97
|
+
let contextualizeArgs;
|
|
98
|
+
if (args.length && args[args.length - 1] instanceof Context) {
|
|
99
|
+
contextualizeArgs = this.logCtx(args, this.request);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
contextualizeArgs = (await this.logCtx(args, OperationKeys.READ, true)).for(this.request);
|
|
103
|
+
}
|
|
104
|
+
const { ctxArgs } = contextualizeArgs;
|
|
117
105
|
return this.adapter.request(details, ...ctxArgs);
|
|
118
106
|
}
|
|
119
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestRepository.js","sourceRoot":"","sources":["../../src/RestRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAKP,eAAe,EAEf,qBAAqB,EACrB,UAAU,GAEX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAGvD,OAAO,
|
|
1
|
+
{"version":3,"file":"RestRepository.js","sourceRoot":"","sources":["../../src/RestRepository.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/RestService.d.ts
CHANGED
|
@@ -51,7 +51,7 @@ import { RestRepository } from "./RestRepository";
|
|
|
51
51
|
* Service-->>Client: revert(record)
|
|
52
52
|
*/
|
|
53
53
|
export declare class RestService<M extends Model, A extends HttpAdapter<any, any, any, any, any>, Q = A extends HttpAdapter<any, any, any, infer Q, any> ? Q : never> extends RestRepository<M, A, Q> {
|
|
54
|
-
protected _overrides: Partial<import("@decaf-ts/core").FlagsOf<import("@decaf-ts/core").ContextOf<A>>> &
|
|
54
|
+
protected _overrides: Partial<import("@decaf-ts/core").FlagsOf<import("@decaf-ts/core").ContextOf<A>>> & {
|
|
55
55
|
allowRawStatements: boolean;
|
|
56
56
|
forcePrepareSimpleQueries: boolean;
|
|
57
57
|
forcePrepareComplexQueries: boolean;
|
package/lib/esm/adapter.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AdapterFlags, Condition, SequenceOptions } from "@decaf-ts/core";
|
|
2
|
+
import { Adapter, Context, ContextualArgs, MaybeContextualArg, Paginator, Statement, PreparedModel, PreparedStatement, Repository, Sequence, FlagsOf } from "@decaf-ts/core";
|
|
2
3
|
import { BaseError, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
|
|
3
4
|
import { HttpConfig, HttpFlags } from "./types";
|
|
4
5
|
import { Model } from "@decaf-ts/decorator-validation";
|
|
5
6
|
import { Constructor } from "@decaf-ts/decoration";
|
|
6
|
-
import { Statement, SequenceOptions, Sequence } from "@decaf-ts/core";
|
|
7
|
-
import type { AdapterFlags } from "@decaf-ts/core";
|
|
8
7
|
export declare function suffixMethod(obj: any, before: (...args: any[]) => any, suffix: (...args: any[]) => any, beforeName?: string): void;
|
|
9
8
|
/**
|
|
10
9
|
* @description Abstract HTTP adapter for REST API interactions
|
|
@@ -50,7 +49,8 @@ export declare abstract class HttpAdapter<CONF extends HttpConfig, CON, REQ, Q e
|
|
|
50
49
|
* @param {...any[]} args - Additional arguments forwarded to the base implementation
|
|
51
50
|
* @return {Promise<FlagsOf<C>>} The flags object with headers
|
|
52
51
|
*/
|
|
53
|
-
protected flags<M extends Model>(operation: OperationKeys | string, model: Constructor<M> | Constructor<M>[], overrides: Partial<FlagsOf<C
|
|
52
|
+
protected flags<M extends Model>(operation: OperationKeys | string, model: Constructor<M> | Constructor<M>[], overrides: Partial<FlagsOf<C>>): Promise<FlagsOf<C>>;
|
|
53
|
+
protected DefaultFlags: Partial<FlagsOf<C>>;
|
|
54
54
|
/**
|
|
55
55
|
* @description Returns the repository constructor for this adapter
|
|
56
56
|
* @summary Provides the RestService class as the repository implementation for this HTTP adapter.
|
package/lib/esm/adapter.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { UnsupportedError, } from "@decaf-ts/core";
|
|
2
|
+
import { Adapter, AuthorizationError, ConnectionError, ForbiddenError, MigrationError, ObserverError, Paginator, PagingError, PersistenceKeys, prepared, QueryError, DefaultAdapterFlags, } from "@decaf-ts/core";
|
|
3
|
+
import { BadRequestError, ConflictError, InternalError, NotFoundError, OperationKeys, SerializationError, ValidationError, } from "@decaf-ts/db-decorators";
|
|
3
4
|
import { Model } from "@decaf-ts/decorator-validation";
|
|
4
|
-
import { apply, Decoration,
|
|
5
|
+
import { apply, Decoration, Metadata, methodMetadata, } from "@decaf-ts/decoration";
|
|
5
6
|
import { RestService } from "./RestService.js";
|
|
6
|
-
import { prepared, } from "@decaf-ts/core";
|
|
7
7
|
import { toKebabCase } from "@decaf-ts/logging";
|
|
8
8
|
import { HttpStatement } from "./HttpStatement.js";
|
|
9
9
|
import { HttpPaginator } from "./HttpPaginator.js";
|
|
@@ -56,6 +56,7 @@ export function suffixMethod(obj, before, suffix, beforeName) {
|
|
|
56
56
|
export class HttpAdapter extends Adapter {
|
|
57
57
|
constructor(config, flavour, alias) {
|
|
58
58
|
super(config, flavour, alias);
|
|
59
|
+
this.DefaultFlags = DefaultAdapterFlags;
|
|
59
60
|
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
60
61
|
const self = this;
|
|
61
62
|
[
|
|
@@ -81,11 +82,10 @@ export class HttpAdapter extends Adapter {
|
|
|
81
82
|
* @param {...any[]} args - Additional arguments forwarded to the base implementation
|
|
82
83
|
* @return {Promise<FlagsOf<C>>} The flags object with headers
|
|
83
84
|
*/
|
|
84
|
-
async flags(operation, model, overrides
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
});
|
|
85
|
+
async flags(operation, model, overrides) {
|
|
86
|
+
return super.flags(operation, model, Object.assign({
|
|
87
|
+
headers: overrides.headers ?? {},
|
|
88
|
+
}, overrides));
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
91
|
* @description Returns the repository constructor for this adapter
|
|
@@ -308,8 +308,7 @@ export class HttpAdapter extends Adapter {
|
|
|
308
308
|
descriptor.value = new Proxy(descriptor.value, {
|
|
309
309
|
async apply(target, thisArg, args) {
|
|
310
310
|
const repo = thisArg;
|
|
311
|
-
const
|
|
312
|
-
const { log, ctxArgs } = repo["logCtx"](contextArgs.args, target);
|
|
311
|
+
const { log, ctxArgs } = (await repo["logCtx"](args, OperationKeys.READ, true)).for(prop);
|
|
313
312
|
log.verbose(`Running prepared statement ${target.name}`);
|
|
314
313
|
log.debug(`With args: ${JSON.stringify(args, null, 2)}`);
|
|
315
314
|
return thisArg.statement(target.name, ...ctxArgs);
|
package/lib/esm/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,kBAAkB,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}
|