@typetron/framework 0.4.0-rc7 → 0.4.0-rc8
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/Database/Drivers/SQLite/SqliteDriver.d.ts.map +1 -1
- package/Database/Drivers/SQLite/SqliteDriver.js +4 -1
- package/Database/Drivers/SQLite/SqliteDriver.js.map +1 -1
- package/Database/Entity.js +1 -1
- package/Database/Entity.js.map +1 -1
- package/Framework/Auth/Auth.d.ts.map +1 -1
- package/Framework/Auth/Auth.js +5 -1
- package/Framework/Auth/Auth.js.map +1 -1
- package/Framework/Auth/index.d.ts.map +1 -1
- package/Framework/Auth/index.js +0 -6
- package/Framework/Auth/index.js.map +1 -1
- package/Framework/Middleware/StaticAssetsMiddleware.d.ts.map +1 -1
- package/Framework/Middleware/StaticAssetsMiddleware.js +2 -1
- package/Framework/Middleware/StaticAssetsMiddleware.js.map +1 -1
- package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
- package/Framework/Providers/WebsocketsProvider.js +3 -1
- package/Framework/Providers/WebsocketsProvider.js.map +1 -1
- package/Framework/Resolvers/EntityResolver.js +2 -2
- package/Framework/Resolvers/EntityResolver.js.map +1 -1
- package/Framework/Resolvers/FormResolver.d.ts.map +1 -1
- package/Framework/Resolvers/FormResolver.js +2 -1
- package/Framework/Resolvers/FormResolver.js.map +1 -1
- package/Router/Decorators.d.ts +1 -4
- package/Router/Decorators.d.ts.map +1 -1
- package/Router/Decorators.js +11 -10
- package/Router/Decorators.js.map +1 -1
- package/Router/Http/Handler.d.ts.map +1 -1
- package/Router/Http/Handler.js +2 -0
- package/Router/Http/Handler.js.map +1 -1
- package/Router/Http/HttpRoute.js.map +1 -1
- package/Router/Metadata.d.ts +3 -0
- package/Router/Metadata.d.ts.map +1 -1
- package/Router/Metadata.js +4 -1
- package/Router/Metadata.js.map +1 -1
- package/Router/Route.d.ts +3 -3
- package/Router/Route.d.ts.map +1 -1
- package/Router/Route.js.map +1 -1
- package/Router/Servers/uNetworking.d.ts.map +1 -1
- package/Router/Servers/uNetworking.js +5 -2
- package/Router/Servers/uNetworking.js.map +1 -1
- package/Router/Websockets/Handler.d.ts.map +1 -1
- package/Router/Websockets/Handler.js +3 -1
- package/Router/Websockets/Handler.js.map +1 -1
- package/Router/Websockets/WebsocketRoute.d.ts.map +1 -1
- package/Router/Websockets/WebsocketRoute.js +0 -9
- package/Router/Websockets/WebsocketRoute.js.map +1 -1
- package/Testing/TestCase.d.ts +1 -0
- package/Testing/TestCase.d.ts.map +1 -1
- package/Testing/TestCase.js +1 -0
- package/Testing/TestCase.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqliteDriver.d.ts","sourceRoot":"","sources":["../../../../Database/Drivers/SQLite/SqliteDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAUjC,qBAAa,YAAa,YAAW,cAAc;IAC/C,QAAQ,EAAE,QAAQ,CAAA;IAElB,MAAM,EAAE,cAAc,CAAmB;IAEzC,UAAU;;;;;;;MAOT;gBAEW,gBAAgB,EAAE,MAAM;IAI9B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAKlE,QAAQ,CAAC,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"SqliteDriver.d.ts","sourceRoot":"","sources":["../../../../Database/Drivers/SQLite/SqliteDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAUjC,qBAAa,YAAa,YAAW,cAAc;IAC/C,QAAQ,EAAE,QAAQ,CAAA;IAElB,MAAM,EAAE,cAAc,CAAmB;IAEzC,UAAU;;;;;;;MAOT;gBAEW,gBAAgB,EAAE,MAAM;IAI9B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAKlE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAQtB,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAajC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAY5D,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAYlE,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAMhE,MAAM;cACqB,MAAM;;IAOjC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAStC,YAAY,CAAC,KAAK,EAAE,MAAM;;;;;;;;CAkBnC"}
|
|
@@ -39,8 +39,11 @@ class SqliteDriver {
|
|
|
39
39
|
return this.lastInsertedId();
|
|
40
40
|
}
|
|
41
41
|
async truncate(table) {
|
|
42
|
-
|
|
42
|
+
await this.run(`DELETE
|
|
43
43
|
FROM ${table}`);
|
|
44
|
+
return this.run(`DELETE
|
|
45
|
+
FROM SQLITE_SEQUENCE
|
|
46
|
+
WHERE name = '${table}'`);
|
|
44
47
|
}
|
|
45
48
|
async lastInsertedId() {
|
|
46
49
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqliteDriver.js","sourceRoot":"","sources":["../../../../Database/Drivers/SQLite/SqliteDriver.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAGlC,qDAAiD;AACjD,qDAAiD;AACjD,qDAAiD;AACjD,qDAAiD;AACjD,mDAA+C;AAC/C,qCAAiC;AAEjC,2CAAoC;AACpC,qCAAiC;AAUjC,MAAa,YAAY;IAcrB,YAAY,gBAAwB;QAXpC,WAAM,GAAmB,IAAI,eAAM,CAAC,IAAI,CAAC,CAAA;QAEzC,eAAU,GAAG;YACT,MAAM,EAAE,eAAM;YACd,MAAM,EAAE,eAAM;YACd,MAAM,EAAE,eAAM;YACd,MAAM,EAAE,eAAM;YACd,MAAM,EAAE,eAAM;YACd,KAAK,EAAE,aAAK;SACf,CAAA;QAGG,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,CAAC,gBAAgB,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAa,EAAE,SAAqB,EAAE;QAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAA;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvC,IAAI,KAAK,EAAE;oBACP,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;iBACzD;gBAED,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,SAAqB,EAAE;QAClD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,cAAc,EAAE,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QACxB,
|
|
1
|
+
{"version":3,"file":"SqliteDriver.js","sourceRoot":"","sources":["../../../../Database/Drivers/SQLite/SqliteDriver.ts"],"names":[],"mappings":"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"}
|
package/Database/Entity.js
CHANGED
package/Database/Entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../Database/Entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../Database/Entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAc,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE1D,qBACa,IAAI;IAGb,UAAU,EAAE,UAAU,CAAA;IAGtB,GAAG,EAAE,GAAG,CAAA;IAGR,KAAK,EAAE,KAAK,CAAA;IAEZ,EAAE,CAAC,EAAE,EAAE,CAAA;IAEP;;OAEG;IACH,SAAS,OAAa;IAEtB,OAAO,CAAC,SAAS,CAAC,CAAM;IAExB,IAAI,aAAa,IAAI,OAAO,IAAI,CAE/B;IAkBK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAc,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE1D,qBACa,IAAI;IAGb,UAAU,EAAE,UAAU,CAAA;IAGtB,GAAG,EAAE,GAAG,CAAA;IAGR,KAAK,EAAE,KAAK,CAAA;IAEZ,EAAE,CAAC,EAAE,EAAE,CAAA;IAEP;;OAEG;IACH,SAAS,OAAa;IAEtB,OAAO,CAAC,SAAS,CAAC,CAAM;IAExB,IAAI,aAAa,IAAI,OAAO,IAAI,CAE/B;IAkBK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;IAkBlC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhE,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlC,SAAS,CAAC,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,2BAA2B,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAY7D,QAAQ,CAAC,CAAC,SAAS,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAOxE,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAQrD,OAAO,CAAC,GAAG;CAWd"}
|
package/Framework/Auth/Auth.js
CHANGED
|
@@ -45,7 +45,11 @@ let Auth = class Auth {
|
|
|
45
45
|
if (!this.id) {
|
|
46
46
|
throw new Error('You tried to use the Auth service without authenticating the user. Please use the AuthMiddleware or authenticate the user before using this route');
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
const user = await this.authenticable.find(this.id);
|
|
49
|
+
if (!user) {
|
|
50
|
+
throw new Error(`Could not find a user with id '${this.id}'`);
|
|
51
|
+
}
|
|
52
|
+
return this.savedUser = user;
|
|
49
53
|
}
|
|
50
54
|
async login(username, password) {
|
|
51
55
|
const user = await this.authenticable.where((new this.authenticable).getUsername(), username).first();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA2D;AAE3D,sCAAsC;AAEtC,qDAA0D;AAG1D,IAAa,IAAI,GAAjB,MAAa,IAAI;IAAjB;QAaI;;WAEG;QACH,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":"AAGA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,mBAAmB,CAAA;AAEjC,eAAO,MAAM,kBAAkB,eAA0C,CAAA;AAEzE,wBAAgB,QAAQ,aACI,MAAM,YAAY,MAAM,+
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":"AAGA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,mBAAmB,CAAA;AAEjC,eAAO,MAAM,kBAAkB,eAA0C,CAAA;AAEzE,wBAAgB,QAAQ,aACI,MAAM,YAAY,MAAM,+CAkBnD"}
|
package/Framework/Auth/index.js
CHANGED
|
@@ -26,13 +26,7 @@ function AuthUser() {
|
|
|
26
26
|
Container_1.InjectableMetadata.set(metadata, target.constructor);
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
|
-
// TODO refactor this so it doesn't add the metadata to both .routes and .actions
|
|
30
29
|
const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
|
|
31
|
-
// const route = metadata.routes[property] || new RouteMetadata()
|
|
32
|
-
// route.parametersOverrides[parameterIndex] = async function(container: Container) {
|
|
33
|
-
// return await container.get(AuthUserIdentifier)
|
|
34
|
-
// }
|
|
35
|
-
// metadata.routes[property] = route
|
|
36
30
|
const methodMetadata = metadata.methods[property] || new Metadata_1.MethodMetadata();
|
|
37
31
|
methodMetadata.parametersOverrides[parameterIndex] = async function (container) {
|
|
38
32
|
return await container.get(exports.AuthUserIdentifier);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAyF;AAEzF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAS,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACrE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAyF;AAEzF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAS,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACrE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAE3D,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,yBAAc,EAAE,CAAA;YACzE,cAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBACpF,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAA;YAE3C,6BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;IACL,CAAC,CAAA;AACL,CAAC;AAnBD,4BAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,qBACa,sBAAuB,YAAW,mBAAmB;IAG9D,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,
|
|
1
|
+
{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,qBACa,sBAAuB,YAAW,mBAAmB;IAG9D,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAUjC;IAEK,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc;IAW7C,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;YA4BvE,WAAW;CAM5B"}
|
|
@@ -43,6 +43,7 @@ let StaticAssetsMiddleware = class StaticAssetsMiddleware {
|
|
|
43
43
|
'html': 'text/html',
|
|
44
44
|
'css': 'text/css',
|
|
45
45
|
'jpg': 'image/jpeg',
|
|
46
|
+
'jpeg': 'image/jpeg',
|
|
46
47
|
'png': 'image/png',
|
|
47
48
|
'webp': 'image/webp',
|
|
48
49
|
'gif': 'image/gif',
|
|
@@ -53,7 +54,7 @@ let StaticAssetsMiddleware = class StaticAssetsMiddleware {
|
|
|
53
54
|
return await next(request);
|
|
54
55
|
}
|
|
55
56
|
catch (error) {
|
|
56
|
-
if (request.method === Http_1.Http.Method.GET && error instanceof Router_1.RouteNotFoundError) {
|
|
57
|
+
if (request.method.toLowerCase() === Http_1.Http.Method.GET.toLowerCase() && error instanceof Router_1.RouteNotFoundError) {
|
|
57
58
|
return this.loadStaticAsset(error, request);
|
|
58
59
|
}
|
|
59
60
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoD;AACpD,yCAAsF;AACtF,2CAAuC;AACvC,4CAA2D;AAC3D,sCAAqC;AACrC,2CAA4B;AAG5B,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAQI,cAAS,GAA4B;YACjC,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,WAAW;SACrB,CAAA;IA+CL,CAAC;IA7CG,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAoB;QAC/C,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,CAAA;SAC7B;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,OAAO,CAAC,MAAM,KAAK,WAAI,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,YAAY,2BAAkB,EAAE;
|
|
1
|
+
{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAAY,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAuB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASjF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAAY,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAuB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASjF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YA8ElB,YAAY;CAS7B"}
|
|
@@ -45,7 +45,9 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
45
45
|
this.handler.onOpen?.run(socketWrapper.connection.container, {});
|
|
46
46
|
},
|
|
47
47
|
close: async (socket) => {
|
|
48
|
-
await this.handler.onClose?.run(socket.container, {})
|
|
48
|
+
await this.handler.onClose?.run(socket.container, {}).catch(error => {
|
|
49
|
+
console.log('socket close error ->', error);
|
|
50
|
+
});
|
|
49
51
|
},
|
|
50
52
|
/* For brevity we skip the other actions (upgrade, open, ping, pong, close) */
|
|
51
53
|
message: async (socket, message, isBinary) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAsC;AACtC,+CAAmD;AACnD,sCAAqC;AACrC,mDAAuF;AACvF,+BAAkC;AAClC,4CAAmE;AACnE,wDAAiF;AAEjF,iEAA6D;AAE7D,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACvB,mCAAS,CAAA;IACT,yCAAe,CAAA;AACnB,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAED,MAAa,kBAAmB,SAAQ,mBAAQ;IAAhD;;QAWI,YAAO,GAAG,IAAI,GAAG,EAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EntityResolver = void 0;
|
|
4
4
|
const Database_1 = require("../../Database");
|
|
5
|
-
const
|
|
5
|
+
const Request_1 = require("../../Router/Request");
|
|
6
6
|
const Container_1 = require("../../Container");
|
|
7
7
|
const EntityNotFoundError_1 = require("../../Database/EntityNotFoundError");
|
|
8
8
|
class EntityResolver extends Container_1.BaseResolver {
|
|
@@ -12,7 +12,7 @@ class EntityResolver extends Container_1.BaseResolver {
|
|
|
12
12
|
}
|
|
13
13
|
async resolve(abstract, parametersValues) {
|
|
14
14
|
let entity;
|
|
15
|
-
const request = this.container.get(
|
|
15
|
+
const request = this.container.get(Request_1.Request);
|
|
16
16
|
const requestParameterName = abstract.name;
|
|
17
17
|
const parameter = request.parameters[requestParameterName] ?? Number(parametersValues[0]);
|
|
18
18
|
if (parameter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":";;;AACA,6CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"EntityResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":";;;AACA,6CAA0D;AAC1D,kDAA8C;AAC9C,+CAAoF;AACpF,4EAAwE;AAExE,MAAa,cAAe,SAAQ,wBAAY;IAE5C,YAAY,SAAoB;QAC5B,KAAK,CAAC,SAAS,CAAC,CAAA;QAChB,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAAmD,EAAE,gBAA0B;QAC5F,IAAI,MAA0B,CAAA;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAA;QAC3C,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAA;QAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;QACzF,IAAI,SAAS,EAAE;YACX,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvC,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,yCAAmB,CAAC,QAAQ,EAAE,WAAW,oBAAoB,UAAU,QAAQ,CAAC,aAAa,EAAE,KAAK,SAAS,aAAa,CAAC,CAAA;aACxI;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,wEAAwE,oBAAoB,yCAAyC,oBAAoB,4BAA4B,CAAC,CAAA;SACzM;QAED,aAAa;QACb,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,UAAU,CAAI,QAAwB;QAClC,OAAO,QAAQ,CAAC,SAAS,YAAY,iBAAM,CAAA;IAC/C,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAA;QAC/C,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,SAAS,CAAA;QAChC,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAM,CAAC,CAAA;IAC5C,CAAC;CACJ;AAlCD,wCAkCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/FormResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiB,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAc,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"FormResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/FormResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiB,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAc,MAAM,aAAa,CAAA;AAI9C,qBAAa,YAAa,SAAQ,YAAY;gBAE9B,SAAS,EAAE,SAAS;IAK1B,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE;IAatE,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO;IAIhD,OAAO,CAAC,qBAAqB;CAMhC"}
|
|
@@ -4,13 +4,14 @@ exports.FormResolver = void 0;
|
|
|
4
4
|
const Container_1 = require("../../Container");
|
|
5
5
|
const Forms_1 = require("../../Forms");
|
|
6
6
|
const Http_1 = require("../../Router/Http");
|
|
7
|
+
const Request_1 = require("../../Router/Request");
|
|
7
8
|
class FormResolver extends Container_1.BaseResolver {
|
|
8
9
|
constructor(container) {
|
|
9
10
|
super(container);
|
|
10
11
|
this.setFormScopeToRequest();
|
|
11
12
|
}
|
|
12
13
|
async resolve(abstract, parameters) {
|
|
13
|
-
const request = this.container.get(
|
|
14
|
+
const request = this.container.get(Request_1.Request);
|
|
14
15
|
const classResolver = new Container_1.ClassResolver(this.container);
|
|
15
16
|
const form = await classResolver.resolve(abstract, parameters);
|
|
16
17
|
form.fill({ ...request.body, ...request.files });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/FormResolver.ts"],"names":[],"mappings":";;;AAAA,+CAAwE;AAExE,uCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"FormResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/FormResolver.ts"],"names":[],"mappings":";;;AAAA,+CAAwE;AAExE,uCAA8C;AAC9C,4CAAmD;AACnD,kDAA+C;AAE/C,MAAa,YAAa,SAAQ,wBAAY;IAE1C,YAAY,SAAoB;QAC5B,KAAK,CAAC,SAAS,CAAC,CAAA;QAChB,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAA+B,EAAE,UAAoB;QAClE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAA;QAC3C,MAAM,aAAa,GAAG,IAAI,yBAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACvD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CAAC,EAAC,GAAG,OAAO,CAAC,IAAc,EAAE,GAAG,OAAO,CAAC,KAAK,EAAqB,CAAC,CAAA;QAE5E,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,IAAI,gBAAS,CAAC,IAAI,CAAC,MAAM,EAAE,WAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;SACrE;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,UAAU,CAAI,QAAwB;QAClC,OAAO,QAAQ,CAAC,SAAS,YAAY,YAAI,CAAA;IAC7C,CAAC;IAEO,qBAAqB;QACzB,oDAAoD;QACpD,EAAE;QACF,uCAAuC;QACvC,6CAA6C;IACjD,CAAC;CACJ;AA9BD,oCA8BC"}
|
package/Router/Decorators.d.ts
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { Abstract, Type } from '../Support';
|
|
2
2
|
import { MiddlewareInterface } from './Middleware';
|
|
3
|
+
import { ControllerOptions } from './Metadata';
|
|
3
4
|
import { Guard } from './Guard';
|
|
4
|
-
declare class ControllerOptions {
|
|
5
|
-
prefix?: string;
|
|
6
|
-
}
|
|
7
5
|
export declare function Controller(path?: string, options?: ControllerOptions): (target: object) => void;
|
|
8
6
|
export declare function Action(name?: string): (target: object, action: string) => void;
|
|
9
7
|
export declare function OnOpen(target: object, action: string): void;
|
|
@@ -18,5 +16,4 @@ export declare function Middleware(...middleware: Abstract<MiddlewareInterface>[
|
|
|
18
16
|
export declare function AllowIf(...guards: Type<Guard>[]): (target: object, action: string) => void;
|
|
19
17
|
export declare function Query(name: string): (target: object, action: string, parameterIndex: number) => void;
|
|
20
18
|
export declare function Body(): (target: object, action: string, parameterIndex: number) => void;
|
|
21
|
-
export {};
|
|
22
19
|
//# sourceMappingURL=Decorators.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Decorators.d.ts","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"Decorators.d.ts","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAsC,iBAAiB,EAAiC,MAAM,YAAY,CAAA;AACjH,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAO/B,wBAAgB,UAAU,CAAC,IAAI,SAAK,EAAE,OAAO,CAAC,EAAE,iBAAiB,YAC7C,MAAM,UAkCzB;AAkCD,wBAAgB,MAAM,CAAC,IAAI,SAAK,YACZ,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASpD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASrD;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,YACJ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAGzE;AAED,wBAAgB,GAAG,CAAC,IAAI,SAAK,EAAE,IAAI,SAAK,YACpB,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC7B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC5B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,KAAK,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC9B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC/B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,UAAU,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,YACrD,MAAM,uCAiBzB;AAED,wBAAgB,OAAO,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,YACpB,MAAM,UAAU,MAAM,UAiBjD;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,YACN,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAkBzE;AAED,wBAAgB,IAAI,aACQ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAiBzE"}
|
package/Router/Decorators.js
CHANGED
|
@@ -4,16 +4,16 @@ exports.Body = exports.Query = exports.AllowIf = exports.Middleware = exports.De
|
|
|
4
4
|
const Framework_1 = require("../Framework");
|
|
5
5
|
const Metadata_1 = require("./Metadata");
|
|
6
6
|
const Http_1 = require("./Http");
|
|
7
|
+
const Request_1 = require("./Request");
|
|
7
8
|
const Websockets_1 = require("./Websockets");
|
|
8
9
|
const WebsocketRoute_1 = require("./Websockets/WebsocketRoute");
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
function Controller(path = '', options = new ControllerOptions) {
|
|
10
|
+
const Container_1 = require("@Typetron/Container");
|
|
11
|
+
function Controller(path = '', options) {
|
|
12
12
|
return (target) => {
|
|
13
13
|
const metadata = Metadata_1.ControllerMetadata.get(target);
|
|
14
|
-
const prefix = options
|
|
15
|
-
const httpHandler =
|
|
16
|
-
const websocketHandler =
|
|
14
|
+
const prefix = options?.prefix || path ? path + '.' : '';
|
|
15
|
+
const httpHandler = Container_1.Container.getInstance().get(Http_1.Handler);
|
|
16
|
+
const websocketHandler = Container_1.Container.getInstance().get(Websockets_1.Handler);
|
|
17
17
|
Object.keys(metadata.routes).forEach(action => {
|
|
18
18
|
const routeMetadata = metadata.routes[action];
|
|
19
19
|
const route = httpHandler.addRoute(path + (path && routeMetadata.path ? '/' : '') + routeMetadata.path, routeMetadata.method, target, action, prefix + (routeMetadata.name || action), routeMetadata.parametersTypes, metadata.middleware.concat(routeMetadata.middleware));
|
|
@@ -161,10 +161,11 @@ function Body() {
|
|
|
161
161
|
const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
|
|
162
162
|
const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
|
|
163
163
|
route.parametersOverrides[parameterIndex] = function (container) {
|
|
164
|
-
const request = container.get(
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
164
|
+
const request = container.get(Request_1.Request);
|
|
165
|
+
// TODO: should the framework throw error or return undefined?
|
|
166
|
+
// if (!request.body) {
|
|
167
|
+
// throw new Error(`There is no data in the 'body' of the request`)
|
|
168
|
+
// }
|
|
168
169
|
return request.body;
|
|
169
170
|
};
|
|
170
171
|
metadata.methods[action] = route;
|
package/Router/Decorators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAsC,MAAM,EAAE,MAAM,KAAK,CAAA;AACrF,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAQ/D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAGd,YAAY,EAAE,qBAAqB,CAAA;IAEnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAEzC,QAAQ,CACJ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC5E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO,GACjD,KAAK;IAkBR,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAa3B,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAsC,MAAM,EAAE,MAAM,KAAK,CAAA;AACrF,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAQ/D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAGd,YAAY,EAAE,qBAAqB,CAAA;IAEnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAEzC,QAAQ,CACJ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC5E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO,GACjD,KAAK;IAkBR,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAa3B,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAyCjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}
|
package/Router/Http/Handler.js
CHANGED
|
@@ -16,6 +16,7 @@ const _1 = require("./");
|
|
|
16
16
|
const Request_1 = require("./Request");
|
|
17
17
|
const HttpRoute_1 = require("./HttpRoute");
|
|
18
18
|
const Framework_1 = require("../../Framework");
|
|
19
|
+
const Request_2 = require("../Request");
|
|
19
20
|
const Servers_1 = require("@Typetron/Router/Servers");
|
|
20
21
|
const httpServers = {
|
|
21
22
|
node: Servers_1.nodeServer,
|
|
@@ -55,6 +56,7 @@ class Handler {
|
|
|
55
56
|
}
|
|
56
57
|
async handle(app, request) {
|
|
57
58
|
const container = app.createChildContainer();
|
|
59
|
+
container.set(Request_2.Request, request);
|
|
58
60
|
container.set(Request_1.Request, request);
|
|
59
61
|
let stack = async () => {
|
|
60
62
|
const routeIndex = this.cachedRoutes[`${request.method} ${request.uri}`]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,2BAAqF;AACrF,yBAA0D;AAC1D,uCAAmC;AACnC,2CAAgD;AAChD,+CAA2C;
|
|
1
|
+
{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRoute.js","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":";;;AAGA,4CAAkD;AAClD,6CAAwC;AAGxC,MAAa,SAAU,SAAQ,cAAK;IAIhC,YACW,GAAW,EACX,MAAc,EACd,OAAO,EAAE,EACT,UAAuB,EACvB,gBAAwB,EACxB,kBAA+D,EAAE,EACjE,aAA8C,EAAE;QAEvD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,CAAC,CAAA;QAR/D,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,oBAAe,GAAf,eAAe,CAAkD;QACjE,eAAU,GAAV,UAAU,CAAsC;QAT1C,aAAQ,GAAiD,EAAE,CAAA;QAYxE,IAAI,CAAC,aAAa,EAAE,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAoB;QAC1B,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;YAElH,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,gBAAqC,
|
|
1
|
+
{"version":3,"file":"HttpRoute.js","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":"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"}
|
package/Router/Metadata.d.ts
CHANGED
|
@@ -16,6 +16,9 @@ export declare class RouteMetadata extends MethodMetadata {
|
|
|
16
16
|
path: string;
|
|
17
17
|
method: Http.Method;
|
|
18
18
|
}
|
|
19
|
+
export declare class ControllerOptions {
|
|
20
|
+
prefix?: string;
|
|
21
|
+
}
|
|
19
22
|
declare const ControllerMetadata_base: {
|
|
20
23
|
new (): {};
|
|
21
24
|
get<T extends {}>(this: any & import("../Support").Constructor<T>, target: any, defaultValue?: T | undefined): T;
|
package/Router/Metadata.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,qBAAa,cAAc;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACvE,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,GAAG,CAAC,EAAE,CAAK;IAC3D,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,cAAe,SAAQ,cAAc;CACjD;AACD,qBAAa,aAAc,SAAQ,cAAc;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}
|
|
1
|
+
{"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,qBAAa,cAAc;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACvE,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,GAAG,CAAC,EAAE,CAAK;IAC3D,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,cAAe,SAAQ,cAAc;CACjD;AACD,qBAAa,aAAc,SAAQ,cAAc;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;AACD,qBAAa,iBAAiB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}
|
package/Router/Metadata.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ControllerMetadata = exports.RouteMetadata = exports.ActionMetadata = exports.MethodMetadata = void 0;
|
|
3
|
+
exports.ControllerMetadata = exports.ControllerOptions = exports.RouteMetadata = exports.ActionMetadata = exports.MethodMetadata = void 0;
|
|
4
4
|
const Metadata_1 = require("../Support/Metadata");
|
|
5
5
|
class MethodMetadata {
|
|
6
6
|
constructor() {
|
|
@@ -16,6 +16,9 @@ exports.ActionMetadata = ActionMetadata;
|
|
|
16
16
|
class RouteMetadata extends MethodMetadata {
|
|
17
17
|
}
|
|
18
18
|
exports.RouteMetadata = RouteMetadata;
|
|
19
|
+
class ControllerOptions {
|
|
20
|
+
}
|
|
21
|
+
exports.ControllerOptions = ControllerOptions;
|
|
19
22
|
class ControllerMetadata extends Metadata_1.MetadataKey('framework:controller') {
|
|
20
23
|
constructor() {
|
|
21
24
|
super(...arguments);
|
package/Router/Metadata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAOjD,MAAa,cAAc;IAA3B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAsC,EAAE,CAAA;QAC3D,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,wCAMC;AAED,MAAa,cAAe,SAAQ,cAAc;CACjD;AADD,wCACC;AACD,MAAa,aAAc,SAAQ,cAAc;CAGhD;AAHD,sCAGC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,YAAO,GAAoC,EAAE,CAAA;QAC7C,YAAO,GAAoC,EAAE,CAAA;QAC7C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,gDAMC"}
|
|
1
|
+
{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAOjD,MAAa,cAAc;IAA3B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAsC,EAAE,CAAA;QAC3D,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,wCAMC;AAED,MAAa,cAAe,SAAQ,cAAc;CACjD;AADD,wCACC;AACD,MAAa,aAAc,SAAQ,cAAc;CAGhD;AAHD,sCAGC;AACD,MAAa,iBAAiB;CAE7B;AAFD,8CAEC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,YAAO,GAAoC,EAAE,CAAA;QAC7C,YAAO,GAAoC,EAAE,CAAA;QAC7C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,gDAMC"}
|
package/Router/Route.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { Abstract, Constructor, Type } from '../Support';
|
|
1
|
+
import { Abstract, AnyFunction, Constructor, Type } from '../Support';
|
|
2
2
|
import { MiddlewareInterface } from './Middleware';
|
|
3
3
|
import { Guard } from './Guard';
|
|
4
4
|
export declare abstract class Route {
|
|
5
5
|
name: string;
|
|
6
6
|
controller: Constructor;
|
|
7
7
|
controllerMethod: string;
|
|
8
|
-
parametersTypes: (Type<
|
|
8
|
+
parametersTypes: (Type<AnyFunction> | FunctionConstructor)[];
|
|
9
9
|
middleware: Abstract<MiddlewareInterface>[];
|
|
10
10
|
parameters: Record<string, string>;
|
|
11
11
|
guards: (typeof Guard)[];
|
|
12
|
-
constructor(name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<
|
|
12
|
+
constructor(name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<AnyFunction> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=Route.d.ts.map
|
package/Router/Route.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,8BAAsB,KAAK;IAKZ,IAAI;IACJ,UAAU,EAAE,WAAW;IACvB,gBAAgB,EAAE,MAAM;IACxB,eAAe,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAE;IAC5D,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE;IARtD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACvC,MAAM,EAAE,CAAC,OAAO,KAAK,CAAC,EAAE,CAAK;gBAGlB,IAAI,QAAK,EACT,UAAU,EAAE,WAAW,EACvB,gBAAgB,EAAE,MAAM,EACxB,eAAe,GAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAO,EACjE,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;CAG9D"}
|
package/Router/Route.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":";;;AAIA,MAAsB,KAAK;IAIvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,gBAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":";;;AAIA,MAAsB,KAAK;IAIvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,gBAAwB,EACxB,kBAA+D,EAAE,EACjE,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,oBAAe,GAAf,eAAe,CAAkD;QACjE,eAAU,GAAV,UAAU,CAAsC;QAR3D,eAAU,GAA2B,EAAE,CAAA;QACvC,WAAM,GAAqB,EAAE,CAAA;IAS7B,CAAC;CACJ;AAZD,sBAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uNetworking.d.ts","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAE/D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"uNetworking.d.ts","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAE/D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,QA4B/F"}
|
|
@@ -9,7 +9,10 @@ function uNetworkingServer(port, handler) {
|
|
|
9
9
|
// cert_file_name: 'misc/cert.pem',
|
|
10
10
|
// passphrase: '1234'
|
|
11
11
|
})
|
|
12
|
-
.any('
|
|
12
|
+
.any('/*', async (response, request) => {
|
|
13
|
+
response.onAborted(() => {
|
|
14
|
+
console.log('uNetworking response aborted ->', response);
|
|
15
|
+
});
|
|
13
16
|
const appRequest = new Http_1.Request(request.getUrl(), request.getMethod());
|
|
14
17
|
const appResponse = await handler(appRequest);
|
|
15
18
|
Object.keys(appResponse.headers).forEach(header => {
|
|
@@ -18,7 +21,7 @@ function uNetworkingServer(port, handler) {
|
|
|
18
21
|
response.writeHeader(header, String(headerValue));
|
|
19
22
|
}
|
|
20
23
|
});
|
|
21
|
-
response.writeStatus(appResponse.status.toString()).end(
|
|
24
|
+
response.writeStatus(appResponse.status.toString()).end(appResponse.body);
|
|
22
25
|
})
|
|
23
26
|
.listen(port, (token) => {
|
|
24
27
|
if (token) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uNetworking.js","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"uNetworking.js","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":";;;AAAA,mDAA4C;AAC5C,gDAA+D;AAE/D,SAAgB,iBAAiB,CAAC,IAAY,EAAE,OAAgD;IAC5F,MAAM,GAAG,GAAG,uBAAM,CAAC;IACf,iCAAiC;IACjC,mCAAmC;IACnC,qBAAqB;KACxB,CAAC;SACG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QACnC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,QAAQ,CAAC,CAAA;QAC5D,CAAC,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,IAAI,cAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,SAAS,EAAiB,CAAC,CAAA;QACpF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC9C,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC/C,IAAI,WAAW,EAAE;gBACb,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;aACpD;QACL,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAW,CAAC,CAAA;IACpF,CAAC,CAAC;SACD,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;QACpB,IAAI,KAAK,EAAE;YACP,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAA;SAC3C;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,IAAI,CAAC,CAAA;SAClD;IACL,CAAC,CAAC,CAAA;AACV,CAAC;AA5BD,8CA4BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAE7D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,SAAS,CACL,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,MAAM,EAClB,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC7E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAgB9C,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;CAuC1F"}
|
|
@@ -13,8 +13,9 @@ exports.Handler = void 0;
|
|
|
13
13
|
const Container_1 = require("../../Container");
|
|
14
14
|
const Router_1 = require("../../Router");
|
|
15
15
|
const Http_1 = require("../Http");
|
|
16
|
+
const Request_1 = require("../Request");
|
|
16
17
|
const WebsocketRoute_1 = require("./WebsocketRoute");
|
|
17
|
-
const
|
|
18
|
+
const Request_2 = require("@Typetron/Router/Websockets/Request");
|
|
18
19
|
class Handler {
|
|
19
20
|
addAction(name, controller, actionName, parametersTypes = [], middleware = []) {
|
|
20
21
|
const action = new WebsocketRoute_1.WebsocketRoute(name, controller, actionName, parametersTypes, middleware);
|
|
@@ -26,6 +27,7 @@ class Handler {
|
|
|
26
27
|
}
|
|
27
28
|
async handle(container, request) {
|
|
28
29
|
container.set(Request_1.Request, request);
|
|
30
|
+
container.set(Request_2.Request, request);
|
|
29
31
|
let stack = async () => {
|
|
30
32
|
const route = this.router.actions.get(request.name);
|
|
31
33
|
if (!route) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAAkC;
|
|
1
|
+
{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAAkC;AAClC,wCAAmD;AAEnD,qDAAiD;AACjD,iEAA6D;AAE7D,MAAa,OAAO;IAOhB,SAAS,CACL,IAAY,EACZ,UAAuB,EACvB,UAAkB,EAClB,kBAA2E,EAAE,EAC7E,aAA8C,EAAE;QAEhD,MAAM,MAAM,GAAG,IAAI,+BAAc,CAC7B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,CACb,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,mDAAmD,IAAI,GAAG,CAAC,CAAA;SAC9E;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACrC,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAc,SAAoB,EAAE,OAAgB;QAE5D,SAAS,CAAC,GAAG,CAAC,iBAAW,EAAE,OAAO,CAAC,CAAA;QACnC,SAAS,CAAC,GAAG,CAAC,iBAAO,EAAE,OAAO,CAAC,CAAA;QAE/B,IAAI,KAAK,GAAmB,KAAK,IAAI,EAAE;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEnD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,CAAC,IAAI,aAAa,CAAC,CAAA;aACxD;YAED,SAAS,CAAC,GAAG,CAAC,+BAAc,EAAE,KAAK,CAAC,CAAA;YAEpC,IAAI,UAAU,GAAmB,KAAK,IAAI,EAAE;gBACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;gBAE9D,IAAI,OAAO,YAAY,eAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAA;iBACjB;gBAED,OAAO,eAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/B,CAAC,CAAA;YAED,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACjD,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,KAAK,CAAC,OAAO,CAAgB,CAAA;IAC9C,CAAC;CACJ;AAjEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAFlB,0BAmEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketRoute.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAExC,qBAAa,cAAe,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"WebsocketRoute.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAExC,qBAAa,cAAe,SAAQ,KAAK;IAE/B,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YA0BvF,iBAAiB;CAyBlC"}
|
|
@@ -4,15 +4,6 @@ exports.WebsocketRoute = void 0;
|
|
|
4
4
|
const Metadata_1 = require("../Metadata");
|
|
5
5
|
const Router_1 = require("@Typetron/Router");
|
|
6
6
|
class WebsocketRoute extends Router_1.Route {
|
|
7
|
-
// constructor(
|
|
8
|
-
// public name = '',
|
|
9
|
-
// public controller: Constructor,
|
|
10
|
-
// public controllerMethod: string,
|
|
11
|
-
// public parametersTypes: (Type<AnyFunction> | FunctionConstructor)[] = [],
|
|
12
|
-
// public middleware: Abstract<MiddlewareInterface>[] = []
|
|
13
|
-
// ) {
|
|
14
|
-
// super(name, controller, controllerMethod, parametersTypes, middleware)
|
|
15
|
-
// }
|
|
16
7
|
async run(container, requestParameters) {
|
|
17
8
|
const controller = await container.get(this.controller);
|
|
18
9
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketRoute.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":";;;AAEA,0CAAgE;AAChE,6CAAwC;AAExC,MAAa,cAAe,SAAQ,cAAK;IAErC,
|
|
1
|
+
{"version":3,"file":"WebsocketRoute.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":";;;AAEA,0CAAgE;AAChE,6CAAwC;AAExC,MAAa,cAAe,SAAQ,cAAK;IAErC,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA+B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,QAAQ,EAAE,mBAAmB,IAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,gBAAqC,CAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAC/G;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,gBAAgB,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YACxG,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAA4D,EAC5D,SAAwB,EACxB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AArDD,wCAqDC"}
|
package/Testing/TestCase.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ export declare abstract class TestCase {
|
|
|
14
14
|
providersNeedingReboot: (typeof DatabaseProvider)[];
|
|
15
15
|
abstract bootstrapApp(): Promise<Application>;
|
|
16
16
|
before(): Promise<void>;
|
|
17
|
+
after(): Promise<void>;
|
|
17
18
|
loginById(id: ID): Promise<void>;
|
|
18
19
|
/**
|
|
19
20
|
* @deprecated
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA0F,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACjI,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAQ,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAMvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,eAAe,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE5D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA0F,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACjI,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAQ,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAMvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,eAAe,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE5D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAGvC,MAAM;IAaN,KAAK;IAEL,SAAS,CAAC,EAAE,EAAE,EAAE;IAItB;;OAEG;IACG,KAAK,CAAC,IAAI,EAAE,IAAI;IAIhB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAIzB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIpI,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACvC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACxC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIjB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAmC7H,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI;YAIvC,OAAO;IAmDrB,OAAO,CAAC,8BAA8B;CAMzC"}
|
package/Testing/TestCase.js
CHANGED
|
@@ -29,6 +29,7 @@ class TestCase {
|
|
|
29
29
|
ts_mockito_1.when(crypt.compare(ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((first, second) => Promise.resolve(`testing-${first}` === second));
|
|
30
30
|
this.app.set(Encryption_1.Crypt, ts_mockito_1.instance(crypt));
|
|
31
31
|
}
|
|
32
|
+
async after() { }
|
|
32
33
|
async loginById(id) {
|
|
33
34
|
await this.app.get(Auth_1.Auth).loginById(id);
|
|
34
35
|
}
|
package/Testing/TestCase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";;;AAAA,2BAAwB;AACxB,yCAAiI;AAEjI,4CAA4D;AAC5D,sCAAkC;AAClC,4CAA8C;AAE9C,qDAA8E;AAG9E,2CAA2D;AAC3D,qDAA4C;AAC5C,sDAAkD;AAGlD,MAAsB,QAAQ;IAA9B;QAII,kCAAkC;QAClC,oBAAe,GAAG,IAAI,GAAG,EAAmC,CAAA;QAE5D,2BAAsB,GAAG;YACrB,4BAAgB;SACnB,CAAA;
|
|
1
|
+
{"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":"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"}
|