@etohq/framework 1.3.0 → 1.4.0
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/LICENSE +21 -0
- package/dist/context/index.d.ts.map +1 -1
- package/dist/context/index.js +6 -3
- package/dist/context/index.js.map +1 -1
- package/dist/eto.js.map +1 -1
- package/dist/http/middlewares/error-handler.d.ts.map +1 -1
- package/dist/http/middlewares/error-handler.js +6 -6
- package/dist/http/middlewares/error-handler.js.map +1 -1
- package/dist/http/types.d.ts +9 -10
- package/dist/http/types.d.ts.map +1 -1
- package/package.json +48 -46
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
The MIT License (MIT)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2021 Etohq
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAA;AAExD,OAAO,EAEL,iBAAiB,EACjB,sBAAsB,EAEtB,UAAU,EACX,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAA;AAExD,OAAO,EAEL,iBAAiB,EACjB,sBAAsB,EAEtB,UAAU,EACX,MAAM,SAAS,CAAA;AAEhB,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,iBAAiB,CA8B9D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,sBAAsB,CAWxE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,WAAW,GAAG,UAAU,CAQxD"}
|
package/dist/context/index.js
CHANGED
|
@@ -9,7 +9,10 @@ function reqContext(req) {
|
|
|
9
9
|
const requestContext = req.middlewareData?.requestContext;
|
|
10
10
|
const listConfig = req.middlewareData?.listConfig ?? {};
|
|
11
11
|
const retrieveConfig = req.middlewareData?.retrieveConfig ?? {};
|
|
12
|
-
const queryConfig = req.middlewareData?.queryConfig ?? {
|
|
12
|
+
const queryConfig = req.middlewareData?.queryConfig ?? {
|
|
13
|
+
fields: [],
|
|
14
|
+
pagination: { skip: 0, take: 100 }
|
|
15
|
+
};
|
|
13
16
|
const allowedProperties = req.middlewareData?.allowedProperties ?? [];
|
|
14
17
|
const filterableFields = req.middlewareData?.filterableFields ?? {};
|
|
15
18
|
const errors = req.middlewareData?.errors ?? [];
|
|
@@ -40,11 +43,11 @@ function storeReqContext(req) {
|
|
|
40
43
|
};
|
|
41
44
|
}
|
|
42
45
|
function authContext(req) {
|
|
46
|
+
const data = reqContext(req);
|
|
43
47
|
const authContext = req.middlewareData?.authContext;
|
|
44
|
-
const scope = req.middlewareData?.scope;
|
|
45
48
|
return {
|
|
49
|
+
...data,
|
|
46
50
|
authContext,
|
|
47
|
-
scope,
|
|
48
51
|
};
|
|
49
52
|
}
|
|
50
53
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":";;AAWA,gCA8BC;AAED,0CAWC;AAED,kCAQC;AArDD,SAAgB,UAAU,CAAC,GAAgB;IACzC,MAAM,KAAK,GAAG,GAAG,CAAC,cAAc,EAAE,KAAqB,CAAA;IACvD,MAAM,SAAS,GAAG,GAAG,CAAC,cAAc,EAAE,SAAmB,CAAA;IACzD,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,EAAE,cAE1C,CAAA;IACD,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,EAAE,UAAU,IAAI,EAAE,CAAA;IACvD,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,EAAE,cAAc,IAAI,EAAE,CAAA;IAC/D,MAAM,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,WAAW,IAAI;QACrD,MAAM,EAAE,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE;KACnC,CAAA;IACD,MAAM,iBAAiB,GAAG,GAAG,CAAC,cAAc,EAAE,iBAAiB,IAAI,EAAE,CAAA;IACrE,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,EAAE,gBAAgB,IAAI,EAAE,CAAA;IACnE,MAAM,MAAM,GAAG,GAAG,CAAC,cAAc,EAAE,MAAM,IAAI,EAAE,CAAA;IAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,cAAc,EAAE,MAAM,IAAI,EAAE,CAAA;IAE/C,OAAO;QACL,GAAG;QACH,KAAK;QACL,MAAM,EAAE,gEAAgE;QACxE,SAAS;QACT,cAAc;QACd,UAAU;QACV,cAAc;QACd,WAAW;QACX,iBAAiB;QACjB,gBAAgB;QAChB,MAAM;KACP,CAAA;AACH,CAAC;AAED,SAAgB,eAAe,CAAC,GAAgB;IAC9C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,WAA0B,CAAA;IACvE,MAAM,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc;QACnD,EAAE,qBAA8C,CAAA;IAElD,OAAO;QACL,GAAG,IAAI;QACP,WAAW;QACX,qBAAqB;KACtB,CAAA;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,GAAgB;IAC1C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,WAA0B,CAAA;IAElE,OAAO;QACL,GAAG,IAAI;QACP,WAAW;KACZ,CAAA;AACH,CAAC"}
|
package/dist/eto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eto.js","sourceRoot":"","sources":["../src/eto.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AASvB,wCAQqB;AAGrB,oDAA8C;AAC9C,mCAAgC;AAChC,qCAAiC;AA4BjC,MAAa,UAAU;IAMrB,YAAY,OAAyB;QAF7B,iBAAY,GAAG,eAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAG7C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,IAAI,KAAK,CAAA;QACpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAA;IACzB,CAAC;IAEO,YAAY,CAClB,SAAqC,EAAE;QAEvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,mBAAmB,EAAE,GAClD,MAAM,CAAC,aAAa,IAAI,EAAE,CAAA;QAC5B;;;WAGG;QACH,MAAM,aAAa,GAAkC;YACnD,WAAW,EACT,OAAO,CAAC,GAAG,CAAC,YAAY;gBACvB,IAAI,CAAC,IAAI,CAAC,oBAA+B;gBAC1C,0CAA0C;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EACN,OAAO,CAAC,GAAG,CAAC,SAAS,IAAK,IAAI,CAAC,IAAI,CAAC,kBAA6B;gBACnE,SAAS,EACP,OAAO,CAAC,GAAG,CAAC,UAAU;oBACrB,IAAI,CAAC,IAAI,CAAC,cAAyB;oBACpC,aAAa;gBACf,YAAY,EACV,OAAO,CAAC,GAAG,CAAC,aAAa;oBACxB,IAAI,CAAC,IAAI,CAAC,cAAyB;oBACpC,aAAa;gBACf,gBAAgB,EAAE;oBAChB,KAAK,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC;wBACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,+
|
|
1
|
+
{"version":3,"file":"eto.js","sourceRoot":"","sources":["../src/eto.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAA6B,QAAQ,EAAE,MAAM,cAAc,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAYlE,wBAAgB,YAAY,KAExB,KAAK,QAAQ,EACb,KAAK,oBAAoB,EACzB,KAAK,WAAW,EAChB,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAA6B,QAAQ,EAAE,MAAM,cAAc,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAYlE,wBAAgB,YAAY,KAExB,KAAK,QAAQ,EACb,KAAK,oBAAoB,EACzB,KAAK,WAAW,EAChB,MAAM,iBAAiB,qDAkE1B;AAED;;;;;;;;;;;;;;;;;GAiBG"}
|
|
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.errorHandler = errorHandler;
|
|
4
4
|
const utils_1 = require("@etohq/utils");
|
|
5
5
|
const exception_formatter_1 = require("./exception-formatter");
|
|
6
|
+
const error_1 = require("../../error");
|
|
6
7
|
const QUERY_RUNNER_RELEASED = "QueryRunnerAlreadyReleasedError";
|
|
7
8
|
const TRANSACTION_STARTED = "TransactionAlreadyStartedError";
|
|
8
9
|
const TRANSACTION_NOT_STARTED = "TransactionNotStartedError";
|
|
9
|
-
const API_ERROR =
|
|
10
|
-
const INVALID_REQUEST_ERROR =
|
|
11
|
-
const INVALID_STATE_ERROR =
|
|
12
|
-
// to add to Etomiddleware.
|
|
10
|
+
const API_ERROR = error_1.ErrCode.Internal;
|
|
11
|
+
const INVALID_REQUEST_ERROR = error_1.ErrCode.InvalidArgument;
|
|
12
|
+
const INVALID_STATE_ERROR = error_1.ErrCode.FailedPrecondition;
|
|
13
13
|
function errorHandler() {
|
|
14
14
|
return async (err, req, res, next) => {
|
|
15
15
|
const logger = req.data.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
@@ -57,9 +57,9 @@ function errorHandler() {
|
|
|
57
57
|
case utils_1.EtoError.Types.INVALID_ARGUMENT:
|
|
58
58
|
break;
|
|
59
59
|
default:
|
|
60
|
-
errObj.code =
|
|
60
|
+
errObj.code = error_1.ErrCode.Unknown;
|
|
61
61
|
errObj.message = "An unknown error occurred.";
|
|
62
|
-
errObj.type =
|
|
62
|
+
errObj.type = error_1.ErrCode.Unknown;
|
|
63
63
|
break;
|
|
64
64
|
}
|
|
65
65
|
const response = await next(req);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":";;AAgBA,oCAuEC;AArFD,wCAAkE;AAClE,+DAAuD;AAEvD,uCAAqC;AAErC,MAAM,qBAAqB,GAAG,iCAAiC,CAAA;AAC/D,MAAM,mBAAmB,GAAG,gCAAgC,CAAA;AAC5D,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAE5D,MAAM,SAAS,GAAG,eAAO,CAAC,QAAQ,CAAA;AAClC,MAAM,qBAAqB,GAAG,eAAO,CAAC,eAAe,CAAA;AACrD,MAAM,mBAAmB,GAAG,eAAO,CAAC,kBAAkB,CAAA;AAGtD,SAAgB,YAAY;IAC1B,OAAO,KAAK,EACV,GAAa,EACb,GAAyB,EACzB,GAAgB,EAChB,IAAuB,EACvB,EAAE;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,iCAAyB,CAAC,MAAM,CAAC,CAAA;QAEjE,GAAG,GAAG,IAAA,qCAAe,EAAC,GAAG,CAAC,CAAA;QAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAA;QAEtC,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAA;QAED,IAAI,UAAU,GAAG,GAAG,CAAA;QACpB,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,qBAAqB,CAAC;YAC3B,KAAK,mBAAmB,CAAC;YACzB,KAAK,uBAAuB,CAAC;YAC7B,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAA;gBACjC,MAAM,CAAC,OAAO;oBACZ,2GAA2G,CAAA;gBAC7G,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,2BAA2B;gBAC7C,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,eAAe;gBACjC,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAA;gBACnC,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;YAChC,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,SAAS;gBAC3B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;gBACvB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACrC,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB;gBAClC,MAAK;YACP;gBACE,MAAM,CAAC,IAAI,GAAG,eAAO,CAAC,OAAO,CAAA;gBAE7B,MAAM,CAAC,OAAO,GAAG,4BAA4B,CAAA;gBAC7C,MAAM,CAAC,IAAI,GAAG,eAAO,CAAC,OAAO,CAAA;gBAC7B,MAAK;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;QAEhC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAA;QAE5B,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG"}
|
package/dist/http/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ZodNullable, ZodObject, ZodOptional } from "zod";
|
|
2
2
|
import { RouteVerb, FindConfig, Middleware, MiddlewareFn, MiddlewareOptions, MiddlewareRequest, HandlerResponse, Next, MiddlewareVerb, EtoContainer, EtoResponse, EtoRequest } from "@etohq/types";
|
|
3
3
|
import type { APICallMeta } from "encore.dev";
|
|
4
|
-
import { RestrictedFields } from
|
|
4
|
+
import { RestrictedFields } from "./utils/restricted-fields";
|
|
5
5
|
type SyncRouteHandler = (req: EtoRequest, res: EtoResponse) => void;
|
|
6
6
|
export type AsyncRouteHandler = (req: EtoRequest, res: EtoResponse) => Promise<void>;
|
|
7
7
|
export type RouteHandler = SyncRouteHandler | AsyncRouteHandler;
|
|
@@ -114,28 +114,27 @@ export interface EtoRequestContext {
|
|
|
114
114
|
*/
|
|
115
115
|
additionalDataValidator?: ZodOptional<ZodNullable<ZodObject<any, any>>>;
|
|
116
116
|
}
|
|
117
|
-
export type AuthContext =
|
|
117
|
+
export type AuthContext = {
|
|
118
118
|
actor_id: string;
|
|
119
119
|
actor_type: string;
|
|
120
120
|
auth_identity_id: string;
|
|
121
121
|
app_metadata: Record<string, unknown>;
|
|
122
122
|
};
|
|
123
|
-
export type EtoSession = {
|
|
124
|
-
authContext: AuthContext;
|
|
125
|
-
scope: EtoContainer;
|
|
126
|
-
};
|
|
127
123
|
export interface PublishableKeyContext {
|
|
128
124
|
key: string;
|
|
129
125
|
sales_channel_ids: string[];
|
|
130
126
|
}
|
|
131
|
-
export
|
|
127
|
+
export interface EtoSession extends EtoRequestContext {
|
|
128
|
+
authContext: AuthContext;
|
|
129
|
+
}
|
|
130
|
+
export interface AuthEtoRequestContext extends EtoRequestContext {
|
|
132
131
|
authContext: AuthContext;
|
|
133
132
|
publishableKeyContext?: PublishableKeyContext;
|
|
134
|
-
}
|
|
135
|
-
export
|
|
133
|
+
}
|
|
134
|
+
export interface EtoStoreRequestContext extends EtoRequestContext {
|
|
136
135
|
authContext?: AuthContext;
|
|
137
136
|
publishableKeyContext: PublishableKeyContext;
|
|
138
|
-
}
|
|
137
|
+
}
|
|
139
138
|
export type EtoRequestHandler = (req: EtoMiddlewareRequest, next: EtoMiddlewareNext) => Promise<EtoHandlerResponse>;
|
|
140
139
|
export {};
|
|
141
140
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/http/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AAEzD,OAAO,EACL,SAAS,EACT,UAAU,EACV,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,IAAI,EACJ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACX,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etohq/framework",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -47,66 +47,61 @@
|
|
|
47
47
|
},
|
|
48
48
|
"author": "Eto",
|
|
49
49
|
"license": "MIT",
|
|
50
|
-
"scripts": {
|
|
51
|
-
"watch": "tsc --watch ",
|
|
52
|
-
"watch:test": "tsc --watch",
|
|
53
|
-
"build": "rimraf dist && tsc --build",
|
|
54
|
-
"test": "jest --runInBand --bail --passWithNoTests --forceExit"
|
|
55
|
-
},
|
|
56
50
|
"devDependencies": {
|
|
57
|
-
"@etohq/cli": "^1.3.0",
|
|
58
51
|
"@mikro-orm/cli": "5.9.7",
|
|
59
52
|
"@mikro-orm/core": "5.9.7",
|
|
60
53
|
"@mikro-orm/knex": "5.9.7",
|
|
61
54
|
"@mikro-orm/migrations": "5.9.7",
|
|
62
55
|
"@mikro-orm/postgresql": "5.9.7",
|
|
63
|
-
"@swc/core": "
|
|
64
|
-
"@swc/jest": "
|
|
65
|
-
"@types/cors": "
|
|
66
|
-
"@types/jest": "
|
|
67
|
-
"@types/jsonwebtoken": "
|
|
68
|
-
"compression": "
|
|
69
|
-
"ioredis": "
|
|
70
|
-
"jest": "
|
|
71
|
-
"pg": "
|
|
72
|
-
"
|
|
73
|
-
"
|
|
74
|
-
"
|
|
75
|
-
"
|
|
56
|
+
"@swc/core": "1.7.28",
|
|
57
|
+
"@swc/jest": "0.2.36",
|
|
58
|
+
"@types/cors": "2.8.17",
|
|
59
|
+
"@types/jest": "29.5.14",
|
|
60
|
+
"@types/jsonwebtoken": "8.5.9",
|
|
61
|
+
"compression": "1.7.4",
|
|
62
|
+
"ioredis": "5.4.1",
|
|
63
|
+
"jest": "29.7.0",
|
|
64
|
+
"pg": "8.13.0",
|
|
65
|
+
"tsc-alias": "1.8.6",
|
|
66
|
+
"rimraf": "5.0.2",
|
|
67
|
+
"supertest": "4.0.2",
|
|
68
|
+
"typescript": "5.8.3",
|
|
69
|
+
"vite": "5.2.11",
|
|
70
|
+
"@etohq/cli": "1.4.0"
|
|
76
71
|
},
|
|
77
72
|
"dependencies": {
|
|
78
|
-
"@
|
|
79
|
-
"@
|
|
80
|
-
"@
|
|
81
|
-
"
|
|
82
|
-
"@etohq/utils": "^1.3.0",
|
|
83
|
-
"@etohq/workflows-sdk": "^1.3.0",
|
|
84
|
-
"@jercle/yargonaut": "^1.1.5",
|
|
85
|
-
"@opentelemetry/api": "^1.9.0",
|
|
86
|
-
"@types/express": "^4.17.17",
|
|
87
|
-
"awilix": "^8.0.1",
|
|
73
|
+
"@jercle/yargonaut": "1.1.5",
|
|
74
|
+
"@opentelemetry/api": "1.9.0",
|
|
75
|
+
"@types/express": "4.17.17",
|
|
76
|
+
"awilix": "8.0.1",
|
|
88
77
|
"connect-redis": "5.2.0",
|
|
89
|
-
"cookie-parser": "
|
|
90
|
-
"cors": "
|
|
91
|
-
"express": "
|
|
92
|
-
"express-session": "
|
|
93
|
-
"jsonwebtoken": "
|
|
94
|
-
"lodash": "
|
|
95
|
-
"morgan": "
|
|
96
|
-
"tsconfig-paths": "
|
|
97
|
-
"zod": "3.22.4"
|
|
78
|
+
"cookie-parser": "1.4.6",
|
|
79
|
+
"cors": "2.8.5",
|
|
80
|
+
"express": "4.21.0",
|
|
81
|
+
"express-session": "1.17.3",
|
|
82
|
+
"jsonwebtoken": "9.0.2",
|
|
83
|
+
"lodash": "4.17.21",
|
|
84
|
+
"morgan": "1.9.1",
|
|
85
|
+
"tsconfig-paths": "4.2.0",
|
|
86
|
+
"zod": "3.22.4",
|
|
87
|
+
"@etohq/link-modules-sdk": "1.4.0",
|
|
88
|
+
"@etohq/modules-sdk": "1.4.0",
|
|
89
|
+
"@etohq/orchestration": "1.4.0",
|
|
90
|
+
"@etohq/types": "1.4.0",
|
|
91
|
+
"@etohq/utils": "1.4.0",
|
|
92
|
+
"@etohq/workflows-sdk": "1.4.0"
|
|
98
93
|
},
|
|
99
94
|
"peerDependencies": {
|
|
100
|
-
"@etohq/cli": "^1.2.0",
|
|
101
95
|
"@mikro-orm/cli": "5.9.7",
|
|
102
96
|
"@mikro-orm/core": "5.9.7",
|
|
103
97
|
"@mikro-orm/knex": "5.9.7",
|
|
104
98
|
"@mikro-orm/migrations": "5.9.7",
|
|
105
99
|
"@mikro-orm/postgresql": "5.9.7",
|
|
106
|
-
"awilix": "
|
|
107
|
-
"ioredis": "
|
|
108
|
-
"pg": "
|
|
109
|
-
"vite": "
|
|
100
|
+
"awilix": "8.0.1",
|
|
101
|
+
"ioredis": "5.4.1",
|
|
102
|
+
"pg": "8.13.0",
|
|
103
|
+
"vite": "5.2.11",
|
|
104
|
+
"@etohq/cli": "1.4.0"
|
|
110
105
|
},
|
|
111
106
|
"peerDependenciesMeta": {
|
|
112
107
|
"@mikro-orm/cli": {
|
|
@@ -118,5 +113,12 @@
|
|
|
118
113
|
"vite": {
|
|
119
114
|
"optional": true
|
|
120
115
|
}
|
|
116
|
+
},
|
|
117
|
+
"scripts": {
|
|
118
|
+
"watch": "tsc --watch ",
|
|
119
|
+
"watch:test": "tsc --watch",
|
|
120
|
+
"build": "rimraf dist && tsc --build && npm run resolve:aliases",
|
|
121
|
+
"resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json",
|
|
122
|
+
"test": "jest --runInBand --bail --passWithNoTests --forceExit"
|
|
121
123
|
}
|
|
122
|
-
}
|
|
124
|
+
}
|