@typetron/framework 0.4.0-rc1 → 0.4.0-rc10

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.
Files changed (316) hide show
  1. package/Database/Drivers/SQLite/SqliteDriver.d.ts.map +1 -1
  2. package/Database/Drivers/SQLite/SqliteDriver.js +4 -1
  3. package/Database/Drivers/SQLite/SqliteDriver.js.map +1 -1
  4. package/Database/Entity.d.ts +1 -1
  5. package/Database/Entity.d.ts.map +1 -1
  6. package/Database/Entity.js +1 -1
  7. package/Database/Entity.js.map +1 -1
  8. package/Database/index.d.ts.map +1 -1
  9. package/Encryption/index.js +1 -1
  10. package/Encryption/index.js.map +1 -1
  11. package/Framework/Application.d.ts +0 -1
  12. package/Framework/Application.d.ts.map +1 -1
  13. package/Framework/Application.js +1 -3
  14. package/Framework/Application.js.map +1 -1
  15. package/Framework/Auth/Auth.d.ts +1 -1
  16. package/Framework/Auth/Auth.d.ts.map +1 -1
  17. package/Framework/Auth/Auth.js +5 -1
  18. package/Framework/Auth/Auth.js.map +1 -1
  19. package/Framework/Auth/index.d.ts +1 -1
  20. package/Framework/Auth/index.d.ts.map +1 -1
  21. package/Framework/Auth/index.js +3 -9
  22. package/Framework/Auth/index.js.map +1 -1
  23. package/Framework/Config/AppConfig.d.ts +8 -2
  24. package/Framework/Config/AppConfig.d.ts.map +1 -1
  25. package/Framework/Config/AppConfig.js +5 -0
  26. package/Framework/Config/AppConfig.js.map +1 -1
  27. package/Framework/Middleware/AuthMiddleware.d.ts +3 -2
  28. package/Framework/Middleware/AuthMiddleware.d.ts.map +1 -1
  29. package/Framework/Middleware/AuthMiddleware.js.map +1 -1
  30. package/Framework/Middleware/CorsMiddleware.d.ts +3 -2
  31. package/Framework/Middleware/CorsMiddleware.d.ts.map +1 -1
  32. package/Framework/Middleware/CorsMiddleware.js +3 -2
  33. package/Framework/Middleware/CorsMiddleware.js.map +1 -1
  34. package/Framework/Middleware/StaticAssetsMiddleware.d.ts +3 -2
  35. package/Framework/Middleware/StaticAssetsMiddleware.d.ts.map +1 -1
  36. package/Framework/Middleware/StaticAssetsMiddleware.js +5 -2
  37. package/Framework/Middleware/StaticAssetsMiddleware.js.map +1 -1
  38. package/Framework/Providers/WebsocketsProvider.d.ts +1 -1
  39. package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
  40. package/Framework/Providers/WebsocketsProvider.js +12 -8
  41. package/Framework/Providers/WebsocketsProvider.js.map +1 -1
  42. package/Framework/Resolvers/AuthResolver.d.ts.map +1 -1
  43. package/Framework/Resolvers/AuthResolver.js +5 -1
  44. package/Framework/Resolvers/AuthResolver.js.map +1 -1
  45. package/Framework/Resolvers/EntityResolver.js +2 -2
  46. package/Framework/Resolvers/EntityResolver.js.map +1 -1
  47. package/Framework/Resolvers/FormResolver.d.ts.map +1 -1
  48. package/Framework/Resolvers/FormResolver.js +2 -1
  49. package/Framework/Resolvers/FormResolver.js.map +1 -1
  50. package/Router/Action.d.ts +17 -0
  51. package/Router/Action.d.ts.map +1 -0
  52. package/Router/Action.js +43 -0
  53. package/Router/Action.js.map +1 -0
  54. package/Router/ActionRequest.d.ts +17 -0
  55. package/Router/ActionRequest.d.ts.map +1 -0
  56. package/Router/ActionRequest.js +43 -0
  57. package/Router/ActionRequest.js.map +1 -0
  58. package/Router/Decorators.d.ts +4 -7
  59. package/Router/Decorators.d.ts.map +1 -1
  60. package/Router/Decorators.js +45 -40
  61. package/Router/Decorators.js.map +1 -1
  62. package/Router/Http/Handler.d.ts +4 -2
  63. package/Router/Http/Handler.d.ts.map +1 -1
  64. package/Router/Http/Handler.js +10 -3
  65. package/Router/Http/Handler.js.map +1 -1
  66. package/Router/Http/HttpRoute.d.ts +23 -0
  67. package/Router/Http/HttpRoute.d.ts.map +1 -0
  68. package/Router/Http/HttpRoute.js +111 -0
  69. package/Router/Http/HttpRoute.js.map +1 -0
  70. package/Router/Http/Middleware.d.ts +7 -0
  71. package/Router/Http/Middleware.d.ts.map +1 -0
  72. package/Router/Http/Middleware.js +8 -0
  73. package/Router/Http/Middleware.js.map +1 -0
  74. package/Router/Http/Request.d.ts +21 -10
  75. package/Router/Http/Request.d.ts.map +1 -1
  76. package/Router/Http/Request.js +70 -59
  77. package/Router/Http/Request.js.map +1 -1
  78. package/Router/Http/Response.d.ts +1 -5
  79. package/Router/Http/Response.d.ts.map +1 -1
  80. package/Router/Http/Response.js +0 -15
  81. package/Router/Http/Response.js.map +1 -1
  82. package/Router/Http/Route.d.ts +24 -0
  83. package/Router/Http/Route.d.ts.map +1 -0
  84. package/Router/Http/Route.js +111 -0
  85. package/Router/Http/Route.js.map +1 -0
  86. package/Router/Metadata.d.ts +15 -6
  87. package/Router/Metadata.d.ts.map +1 -1
  88. package/Router/Metadata.js +12 -5
  89. package/Router/Metadata.js.map +1 -1
  90. package/Router/Middleware.d.ts +9 -2
  91. package/Router/Middleware.d.ts.map +1 -1
  92. package/Router/Middleware.js +4 -0
  93. package/Router/Middleware.js.map +1 -1
  94. package/Router/Request.d.ts +24 -0
  95. package/Router/Request.d.ts.map +1 -0
  96. package/Router/Request.js +43 -0
  97. package/Router/Request.js.map +1 -0
  98. package/Router/Route.d.ts +8 -18
  99. package/Router/Route.d.ts.map +1 -1
  100. package/Router/Route.js +3 -98
  101. package/Router/Route.js.map +1 -1
  102. package/Router/Router.d.ts +12 -6
  103. package/Router/Router.d.ts.map +1 -1
  104. package/Router/Router.js +6 -2
  105. package/Router/Router.js.map +1 -1
  106. package/Router/Servers/node.d.ts.map +1 -1
  107. package/Router/Servers/node.js +29 -2
  108. package/Router/Servers/node.js.map +1 -1
  109. package/Router/Servers/uNetworking.d.ts.map +1 -1
  110. package/Router/Servers/uNetworking.js +140 -14
  111. package/Router/Servers/uNetworking.js.map +1 -1
  112. package/Router/Websockets/ActionRequest.d.ts +17 -0
  113. package/Router/Websockets/ActionRequest.d.ts.map +1 -0
  114. package/Router/Websockets/ActionRequest.js +43 -0
  115. package/Router/Websockets/ActionRequest.js.map +1 -0
  116. package/Router/Websockets/Handler.d.ts +8 -6
  117. package/Router/Websockets/Handler.d.ts.map +1 -1
  118. package/Router/Websockets/Handler.js +19 -13
  119. package/Router/Websockets/Handler.js.map +1 -1
  120. package/Router/Websockets/Middleware.d.ts +7 -0
  121. package/Router/Websockets/Middleware.d.ts.map +1 -0
  122. package/Router/Websockets/Middleware.js +8 -0
  123. package/Router/Websockets/Middleware.js.map +1 -0
  124. package/Router/Websockets/Request.d.ts +4 -0
  125. package/Router/Websockets/Request.d.ts.map +1 -0
  126. package/Router/Websockets/Request.js +8 -0
  127. package/Router/Websockets/Request.js.map +1 -0
  128. package/Router/Websockets/WebsocketAction.d.ts +7 -0
  129. package/Router/Websockets/WebsocketAction.d.ts.map +1 -0
  130. package/Router/Websockets/WebsocketAction.js +55 -0
  131. package/Router/Websockets/WebsocketAction.js.map +1 -0
  132. package/Router/Websockets/WebsocketEvent.js +1 -1
  133. package/Router/Websockets/WebsocketEvent.js.map +1 -1
  134. package/Router/Websockets/WebsocketRequest.d.ts +4 -0
  135. package/Router/Websockets/WebsocketRequest.d.ts.map +1 -0
  136. package/Router/Websockets/WebsocketRequest.js +8 -0
  137. package/Router/Websockets/WebsocketRequest.js.map +1 -0
  138. package/Router/Websockets/WebsocketRoute.d.ts +7 -0
  139. package/Router/Websockets/WebsocketRoute.d.ts.map +1 -0
  140. package/Router/Websockets/WebsocketRoute.js +46 -0
  141. package/Router/Websockets/WebsocketRoute.js.map +1 -0
  142. package/Router/Websockets/index.d.ts +3 -3
  143. package/Router/Websockets/index.d.ts.map +1 -1
  144. package/Router/Websockets/index.js +7 -7
  145. package/Router/Websockets/index.js.map +1 -1
  146. package/Router/Websockets/types.d.ts +6 -6
  147. package/Router/Websockets/types.d.ts.map +1 -1
  148. package/Storage/Storage.d.ts.map +1 -1
  149. package/Storage/Storage.js +4 -3
  150. package/Storage/Storage.js.map +1 -1
  151. package/Support/Array.js +2 -2
  152. package/Support/Array.js.map +1 -1
  153. package/Support/index.d.ts +1 -0
  154. package/Support/index.d.ts.map +1 -1
  155. package/Testing/TestCase.d.ts +5 -4
  156. package/Testing/TestCase.d.ts.map +1 -1
  157. package/Testing/TestCase.js +18 -10
  158. package/Testing/TestCase.js.map +1 -1
  159. package/Validation/RuleInterface.d.ts +1 -1
  160. package/Validation/RuleInterface.d.ts.map +1 -1
  161. package/Validation/Rules/FileExtension.js +2 -2
  162. package/Validation/Rules/FileExtension.js.map +1 -1
  163. package/Validation/Rules/Optional.js +1 -1
  164. package/Validation/Rules/Optional.js.map +1 -1
  165. package/Validation/index.d.ts +1 -0
  166. package/Validation/index.d.ts.map +1 -1
  167. package/Validation/index.js +1 -0
  168. package/Validation/index.js.map +1 -1
  169. package/benchmark.ts +47 -0
  170. package/package.json +4 -4
  171. package/types.d.ts +8 -0
  172. package/Frontend/Angular/index.d.ts +0 -8
  173. package/Frontend/Angular/index.d.ts.map +0 -1
  174. package/Frontend/Angular/index.js +0 -20
  175. package/Frontend/Angular/index.js.map +0 -1
  176. package/Frontend/Websockets/index.js +0 -76
  177. package/Frontend/Websockets/index.js.map +0 -1
  178. package/Router/micro.d.ts +0 -3
  179. package/Router/micro.d.ts.map +0 -1
  180. package/Router/micro.js +0 -44
  181. package/Router/micro.js.map +0 -1
  182. package/benchmark-index.js.map +0 -1
  183. package/benchmark.js.map +0 -1
  184. package/index.d.ts +0 -2
  185. package/index.d.ts.map +0 -1
  186. package/index.js +0 -41
  187. package/index.js.map +0 -1
  188. package/test.js.map +0 -1
  189. package/tests/Cache/DatabaseStoreTest.d.ts +0 -2
  190. package/tests/Cache/DatabaseStoreTest.d.ts.map +0 -1
  191. package/tests/Cache/DatabaseStoreTest.js +0 -137
  192. package/tests/Cache/DatabaseStoreTest.js.map +0 -1
  193. package/tests/Cache/FileStoreTest.d.ts +0 -2
  194. package/tests/Cache/FileStoreTest.d.ts.map +0 -1
  195. package/tests/Cache/FileStoreTest.js +0 -142
  196. package/tests/Cache/FileStoreTest.js.map +0 -1
  197. package/tests/Cache/MemoryStoreTest.d.ts +0 -2
  198. package/tests/Cache/MemoryStoreTest.d.ts.map +0 -1
  199. package/tests/Cache/MemoryStoreTest.js +0 -141
  200. package/tests/Cache/MemoryStoreTest.js.map +0 -1
  201. package/tests/Container/ContainerTest.d.ts +0 -2
  202. package/tests/Container/ContainerTest.d.ts.map +0 -1
  203. package/tests/Container/ContainerTest.js +0 -396
  204. package/tests/Container/ContainerTest.js.map +0 -1
  205. package/tests/Database/Drivers/MySQL/AlterTest.d.ts +0 -2
  206. package/tests/Database/Drivers/MySQL/AlterTest.d.ts.map +0 -1
  207. package/tests/Database/Drivers/MySQL/AlterTest.js +0 -144
  208. package/tests/Database/Drivers/MySQL/AlterTest.js.map +0 -1
  209. package/tests/Database/Drivers/MySQL/CreateTest.d.ts +0 -2
  210. package/tests/Database/Drivers/MySQL/CreateTest.d.ts.map +0 -1
  211. package/tests/Database/Drivers/MySQL/CreateTest.js +0 -64
  212. package/tests/Database/Drivers/MySQL/CreateTest.js.map +0 -1
  213. package/tests/Database/Drivers/MysqlDriverTest.d.ts +0 -2
  214. package/tests/Database/Drivers/MysqlDriverTest.d.ts.map +0 -1
  215. package/tests/Database/Drivers/MysqlDriverTest.js +0 -174
  216. package/tests/Database/Drivers/MysqlDriverTest.js.map +0 -1
  217. package/tests/Database/Drivers/SqliteDriverTest.d.ts +0 -2
  218. package/tests/Database/Drivers/SqliteDriverTest.d.ts.map +0 -1
  219. package/tests/Database/Drivers/SqliteDriverTest.js +0 -156
  220. package/tests/Database/Drivers/SqliteDriverTest.js.map +0 -1
  221. package/tests/Database/Entities/Article.d.ts +0 -11
  222. package/tests/Database/Entities/Article.d.ts.map +0 -1
  223. package/tests/Database/Entities/Article.js +0 -43
  224. package/tests/Database/Entities/Article.js.map +0 -1
  225. package/tests/Database/Entities/Profile.d.ts +0 -11
  226. package/tests/Database/Entities/Profile.d.ts.map +0 -1
  227. package/tests/Database/Entities/Profile.js +0 -39
  228. package/tests/Database/Entities/Profile.js.map +0 -1
  229. package/tests/Database/Entities/Role.d.ts +0 -9
  230. package/tests/Database/Entities/Role.d.ts.map +0 -1
  231. package/tests/Database/Entities/Role.js +0 -31
  232. package/tests/Database/Entities/Role.js.map +0 -1
  233. package/tests/Database/Entities/User.d.ts +0 -16
  234. package/tests/Database/Entities/User.d.ts.map +0 -1
  235. package/tests/Database/Entities/User.js +0 -58
  236. package/tests/Database/Entities/User.js.map +0 -1
  237. package/tests/Database/EntityRelationshipsTest.d.ts +0 -2
  238. package/tests/Database/EntityRelationshipsTest.d.ts.map +0 -1
  239. package/tests/Database/EntityRelationshipsTest.js +0 -548
  240. package/tests/Database/EntityRelationshipsTest.js.map +0 -1
  241. package/tests/Database/EntityTest.d.ts +0 -2
  242. package/tests/Database/EntityTest.d.ts.map +0 -1
  243. package/tests/Database/EntityTest.js +0 -234
  244. package/tests/Database/EntityTest.js.map +0 -1
  245. package/tests/Database/Migrations/RunnerTest.d.ts +0 -2
  246. package/tests/Database/Migrations/RunnerTest.d.ts.map +0 -1
  247. package/tests/Database/Migrations/RunnerTest.js +0 -112
  248. package/tests/Database/Migrations/RunnerTest.js.map +0 -1
  249. package/tests/Database/Migrations/migrations/1.createUserTable.d.ts +0 -6
  250. package/tests/Database/Migrations/migrations/1.createUserTable.d.ts.map +0 -1
  251. package/tests/Database/Migrations/migrations/1.createUserTable.js +0 -14
  252. package/tests/Database/Migrations/migrations/1.createUserTable.js.map +0 -1
  253. package/tests/Database/Migrations/migrations/2.createArticlesTable.d.ts +0 -6
  254. package/tests/Database/Migrations/migrations/2.createArticlesTable.d.ts.map +0 -1
  255. package/tests/Database/Migrations/migrations/2.createArticlesTable.js +0 -14
  256. package/tests/Database/Migrations/migrations/2.createArticlesTable.js.map +0 -1
  257. package/tests/Database/QueryTest.d.ts +0 -2
  258. package/tests/Database/QueryTest.d.ts.map +0 -1
  259. package/tests/Database/QueryTest.js +0 -623
  260. package/tests/Database/QueryTest.js.map +0 -1
  261. package/tests/Database/SchemaTest.d.ts +0 -2
  262. package/tests/Database/SchemaTest.d.ts.map +0 -1
  263. package/tests/Database/SchemaTest.js +0 -46
  264. package/tests/Database/SchemaTest.js.map +0 -1
  265. package/tests/Database/Seeders/RunnerTest.d.ts +0 -2
  266. package/tests/Database/Seeders/RunnerTest.d.ts.map +0 -1
  267. package/tests/Database/Seeders/RunnerTest.js +0 -44
  268. package/tests/Database/Seeders/RunnerTest.js.map +0 -1
  269. package/tests/Database/Seeders/seeders/RandomSeeder.d.ts +0 -5
  270. package/tests/Database/Seeders/seeders/RandomSeeder.d.ts.map +0 -1
  271. package/tests/Database/Seeders/seeders/RandomSeeder.js +0 -14
  272. package/tests/Database/Seeders/seeders/RandomSeeder.js.map +0 -1
  273. package/tests/Database/utils.d.ts +0 -6
  274. package/tests/Database/utils.d.ts.map +0 -1
  275. package/tests/Database/utils.js +0 -19
  276. package/tests/Database/utils.js.map +0 -1
  277. package/tests/Forms/FormsTest.d.ts +0 -2
  278. package/tests/Forms/FormsTest.d.ts.map +0 -1
  279. package/tests/Forms/FormsTest.js +0 -80
  280. package/tests/Forms/FormsTest.js.map +0 -1
  281. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts +0 -2
  282. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts.map +0 -1
  283. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js +0 -166
  284. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js.map +0 -1
  285. package/tests/Framework/Resolvers/EntityResolverTest.d.ts +0 -2
  286. package/tests/Framework/Resolvers/EntityResolverTest.d.ts.map +0 -1
  287. package/tests/Framework/Resolvers/EntityResolverTest.js +0 -60
  288. package/tests/Framework/Resolvers/EntityResolverTest.js.map +0 -1
  289. package/tests/Mail/MailerTest.d.ts +0 -2
  290. package/tests/Mail/MailerTest.d.ts.map +0 -1
  291. package/tests/Mail/MailerTest.js +0 -98
  292. package/tests/Mail/MailerTest.js.map +0 -1
  293. package/tests/Model/ModelTest.d.ts +0 -2
  294. package/tests/Model/ModelTest.d.ts.map +0 -1
  295. package/tests/Model/ModelTest.js +0 -234
  296. package/tests/Model/ModelTest.js.map +0 -1
  297. package/tests/Router/HttpHandlerTest.d.ts +0 -2
  298. package/tests/Router/HttpHandlerTest.d.ts.map +0 -1
  299. package/tests/Router/HttpHandlerTest.js +0 -37
  300. package/tests/Router/HttpHandlerTest.js.map +0 -1
  301. package/tests/Router/WebSocketsHandlerTest.d.ts +0 -2
  302. package/tests/Router/WebSocketsHandlerTest.d.ts.map +0 -1
  303. package/tests/Router/WebSocketsHandlerTest.js +0 -36
  304. package/tests/Router/WebSocketsHandlerTest.js.map +0 -1
  305. package/tests/Support/ArrayTest.d.ts +0 -2
  306. package/tests/Support/ArrayTest.d.ts.map +0 -1
  307. package/tests/Support/ArrayTest.js +0 -259
  308. package/tests/Support/ArrayTest.js.map +0 -1
  309. package/tests/Support/StringTest.d.ts +0 -2
  310. package/tests/Support/StringTest.d.ts.map +0 -1
  311. package/tests/Support/StringTest.js +0 -39
  312. package/tests/Support/StringTest.js.map +0 -1
  313. package/tests/Validation/RulesTest.d.ts +0 -2
  314. package/tests/Validation/RulesTest.d.ts.map +0 -1
  315. package/tests/Validation/RulesTest.js +0 -68
  316. package/tests/Validation/RulesTest.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"AuthResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,YAAa,SAAQ,YAAY;IAEpC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAIpE,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;CAS3C"}
1
+ {"version":3,"file":"AuthResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,YAAa,SAAQ,YAAY;IAEpC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAQpE,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;CAS3C"}
@@ -5,7 +5,11 @@ const Container_1 = require("../../Container");
5
5
  const Auth_1 = require("../Auth");
6
6
  class AuthResolver extends Container_1.BaseResolver {
7
7
  async resolve(abstract, parameters) {
8
- return await this.container.get(Auth_1.Auth).user();
8
+ const auth = this.container.get(Auth_1.Auth);
9
+ if (!auth.id) {
10
+ return undefined;
11
+ }
12
+ return await auth.user();
9
13
  }
10
14
  canResolve(abstract) {
11
15
  return abstract === Auth_1.AuthUserIdentifier;
@@ -1 +1 @@
1
- {"version":3,"file":"AuthResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,kCAAkD;AAElD,MAAa,YAAa,SAAQ,wBAAY;IAE1C,KAAK,CAAC,OAAO,CAAI,QAAgB,EAAE,UAAoB;QACnD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,IAAI,EAAkB,CAAA;IAChE,CAAC;IAED,UAAU,CAAI,QAAgB;QAC1B,OAAO,QAAQ,KAAK,yBAAkB,CAAA;IAC1C,CAAC;CAOJ;AAfD,oCAeC"}
1
+ {"version":3,"file":"AuthResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,kCAAkD;AAElD,MAAa,YAAa,SAAQ,wBAAY;IAE1C,KAAK,CAAC,OAAO,CAAI,QAAgB,EAAE,UAAoB;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACV,OAAO,SAAyB,CAAA;SACnC;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,EAAkB,CAAA;IAC5C,CAAC;IAED,UAAU,CAAI,QAAgB;QAC1B,OAAO,QAAQ,KAAK,yBAAkB,CAAA;IAC1C,CAAC;CAOJ;AAnBD,oCAmBC"}
@@ -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 Http_1 = require("../../Router/Http");
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(Http_1.Request);
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,4CAA2C;AAC3C,+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,cAAO,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
+ {"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;AAG9C,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"}
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(Http_1.Request);
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,4CAA4D;AAE5D,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,cAAO,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"}
1
+ {"version":3,"file":"FormResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/FormResolver.ts"],"names":[],"mappings":";;;AAAA,+CAAwE;AAExE,uCAA8C;AAC9C,4CAAmD;AACnD,kDAA8C;AAE9C,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"}
@@ -0,0 +1,17 @@
1
+ /// <reference types="node" />
2
+ import { IncomingHttpHeaders } from 'http';
3
+ import { File } from '../Storage';
4
+ export declare class Action {
5
+ parameters: Record<string, string | number>;
6
+ private raw;
7
+ private details;
8
+ getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
9
+ constructor(name: string, cookies?: string | Record<string, string | undefined>, body?: string | object, files?: Record<string, File | File[]>);
10
+ get url(): string;
11
+ get body(): string | object | undefined;
12
+ get cookies(): Record<string, string | undefined>;
13
+ set body(body: string | object | undefined);
14
+ get files(): Record<string, File | File[]>;
15
+ set files(files: Record<string, File | File[]>);
16
+ }
17
+ //# sourceMappingURL=Action.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../Router/Action.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,MAAM;IACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAKV;IAID,OAAO,CAAC,OAAO,CAKT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,GAAG,IAAI,MAAM,CAIhB;IAED,IAAI,IAAI,IAYO,MAAM,GAAG,MAAM,GAAG,SAAS,CARzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;CAsBJ"}
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Action = void 0;
4
+ class Action {
5
+ constructor(name, cookies, body, files) {
6
+ this.parameters = {};
7
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
8
+ // @ts-ignore
9
+ this.details = {};
10
+ this.raw = {
11
+ name: name,
12
+ cookies,
13
+ body,
14
+ files,
15
+ };
16
+ }
17
+ get url() {
18
+ return this.details.action ?? (() => {
19
+ return this.details.action = this.raw.name;
20
+ })();
21
+ }
22
+ get body() {
23
+ return this.details.body ?? (() => {
24
+ return this.details.body = this.raw.body;
25
+ })();
26
+ }
27
+ get cookies() {
28
+ return this.details.cookies ?? (() => {
29
+ return { todo: 'parse cookies' };
30
+ })();
31
+ }
32
+ set body(body) {
33
+ this.details.body = body;
34
+ }
35
+ get files() {
36
+ return this.raw.files ?? {};
37
+ }
38
+ set files(files) {
39
+ this.raw.files = files;
40
+ }
41
+ }
42
+ exports.Action = Action;
43
+ //# sourceMappingURL=Action.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Action.js","sourceRoot":"","sources":["../../Router/Action.ts"],"names":[],"mappings":";;;AAGA,MAAa,MAAM;IAqBf,YACI,IAAY,EACZ,OAAqD,EACrD,IAAsB,EACtB,KAAqC;QAxBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACL,YAAO,GAKX,EAAE,CAAA;QAUF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI,EAAE,IAAI;YACV,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC5C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE;YACjC,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,CAAA;QAClC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,KAAoC;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAC1B,CAAC;CAsBJ;AArFD,wBAqFC"}
@@ -0,0 +1,17 @@
1
+ /// <reference types="node" />
2
+ import { IncomingHttpHeaders } from 'http';
3
+ import { File } from '../Storage';
4
+ export declare class Action {
5
+ parameters: Record<string, string | number>;
6
+ private raw;
7
+ private details;
8
+ getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
9
+ constructor(name: string, cookies?: string | Record<string, string | undefined>, body?: string | object, files?: Record<string, File | File[]>);
10
+ get url(): string;
11
+ get body(): string | object | undefined;
12
+ get cookies(): Record<string, string | undefined>;
13
+ set body(body: string | object | undefined);
14
+ get files(): Record<string, File | File[]>;
15
+ set files(files: Record<string, File | File[]>);
16
+ }
17
+ //# sourceMappingURL=ActionRequest.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ActionRequest.d.ts","sourceRoot":"","sources":["../../Router/ActionRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,MAAM;IACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAKV;IAID,OAAO,CAAC,OAAO,CAKT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,GAAG,IAAI,MAAM,CAIhB;IAED,IAAI,IAAI,IAYO,MAAM,GAAG,MAAM,GAAG,SAAS,CARzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;CAsBJ"}
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Action = void 0;
4
+ class Action {
5
+ constructor(name, cookies, body, files) {
6
+ this.parameters = {};
7
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
8
+ // @ts-ignore
9
+ this.details = {};
10
+ this.raw = {
11
+ name: name,
12
+ cookies,
13
+ body,
14
+ files,
15
+ };
16
+ }
17
+ get url() {
18
+ return this.details.action ?? (() => {
19
+ return this.details.action = this.raw.name;
20
+ })();
21
+ }
22
+ get body() {
23
+ return this.details.body ?? (() => {
24
+ return this.details.body = this.raw.body;
25
+ })();
26
+ }
27
+ get cookies() {
28
+ return this.details.cookies ?? (() => {
29
+ return { todo: 'parse cookies' };
30
+ })();
31
+ }
32
+ set body(body) {
33
+ this.details.body = body;
34
+ }
35
+ get files() {
36
+ return this.raw.files ?? {};
37
+ }
38
+ set files(files) {
39
+ this.raw.files = files;
40
+ }
41
+ }
42
+ exports.Action = Action;
43
+ //# sourceMappingURL=ActionRequest.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ActionRequest.js","sourceRoot":"","sources":["../../Router/ActionRequest.ts"],"names":[],"mappings":";;;AAGA,MAAa,MAAM;IAqBf,YACI,IAAY,EACZ,OAAqD,EACrD,IAAsB,EACtB,KAAqC;QAxBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACL,YAAO,GAKX,EAAE,CAAA;QAUF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI,EAAE,IAAI;YACV,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC5C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE;YACjC,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,CAAA;QAClC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,KAAoC;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAC1B,CAAC;CAsBJ;AArFD,wBAqFC"}
@@ -1,11 +1,9 @@
1
1
  import { Abstract, Type } from '../Support';
2
- import { MiddlewareInterface } from './Middleware';
2
+ import { GlobalMiddleware } 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
- export declare function Event(name?: string): (target: object, action: string) => void;
6
+ export declare function Action(name?: string): (target: object, action: string) => void;
9
7
  export declare function OnOpen(target: object, action: string): void;
10
8
  export declare function OnClose(target: object, action: string): void;
11
9
  export declare function Arg(name: string): (target: object, action: string, parameterIndex: number) => void;
@@ -14,9 +12,8 @@ export declare function Post(path?: string, name?: string): (target: object, act
14
12
  export declare function Put(path?: string, name?: string): (target: object, action: string) => void;
15
13
  export declare function Patch(path?: string, name?: string): (target: object, action: string) => void;
16
14
  export declare function Delete(path?: string, name?: string): (target: object, action: string) => void;
17
- export declare function Middleware(...middleware: Abstract<MiddlewareInterface>[]): (target: object, action?: string | undefined) => void;
15
+ export declare function Middleware(...middleware: Abstract<GlobalMiddleware>[]): (target: object, action?: string | undefined) => void;
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;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAK/B,cAAM,iBAAiB;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAgB,UAAU,CAAC,IAAI,SAAK,EAAE,OAAO,oBAAwB,YACjD,MAAM,UAkCzB;AA4BD,wBAAgB,KAAK,CAAC,IAAI,SAAK,YACX,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"}
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,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,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,gBAAgB,CAAC,EAAE,YAClD,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"}
@@ -1,70 +1,74 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Body = exports.Query = exports.AllowIf = exports.Middleware = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.Arg = exports.OnClose = exports.OnOpen = exports.Event = exports.Controller = void 0;
3
+ exports.Body = exports.Query = exports.AllowIf = exports.Middleware = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.Arg = exports.OnClose = exports.OnOpen = exports.Action = exports.Controller = void 0;
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
- const WebsocketEvent_1 = require("./Websockets/WebsocketEvent");
9
- class ControllerOptions {
10
- }
11
- function Controller(path = '', options = new ControllerOptions) {
9
+ const WebsocketRoute_1 = require("./Websockets/WebsocketRoute");
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.prefix || path ? path + '.' : '';
15
- const httpHandler = Framework_1.App.get(Http_1.Handler);
16
- const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
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));
20
20
  route.guards = routeMetadata.guards;
21
21
  });
22
- Object.keys(metadata.events).forEach(action => {
23
- const eventMetadata = metadata.events[action];
24
- const name = prefix + (eventMetadata.name || action);
25
- const event = websocketHandler.addEvent(name, target, action, eventMetadata.parametersTypes, metadata.middleware.concat(eventMetadata.middleware));
26
- event.guards = eventMetadata.guards;
22
+ Object.keys(metadata.actions).forEach(actionName => {
23
+ const actionMetadata = metadata.actions[actionName];
24
+ const name = prefix + (actionMetadata.name || actionName);
25
+ const action = websocketHandler.addAction(name, target, actionName, actionMetadata.parametersTypes, metadata.middleware.concat(actionMetadata.middleware));
26
+ action.guards = actionMetadata.guards;
27
27
  });
28
28
  };
29
29
  }
30
30
  exports.Controller = Controller;
31
- function addEvent(controller, action, name) {
31
+ function addAction(controller, methodName, name) {
32
32
  const metadata = Metadata_1.ControllerMetadata.get(controller);
33
- const event = metadata.events[action] || new Metadata_1.EventMetadata;
34
- event.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, action);
35
- event.name = name;
36
- metadata.events[action] = event;
33
+ const methodMetadata = metadata.methods[methodName];
34
+ const action = new Metadata_1.ActionMetadata();
35
+ Object.assign(action, methodMetadata);
36
+ action.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, methodName);
37
+ action.name = name;
38
+ metadata.actions[methodName] = action;
37
39
  Metadata_1.ControllerMetadata.set(metadata, controller);
38
40
  }
39
- function addRoute(controller, action, method, path, name) {
41
+ function addRoute(controller, methodName, method, path, name) {
40
42
  const metadata = Metadata_1.ControllerMetadata.get(controller);
41
- const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
42
- route.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, action);
43
+ const methodMetadata = metadata.methods[methodName];
44
+ const route = new Metadata_1.RouteMetadata();
45
+ Object.assign(route, methodMetadata);
46
+ route.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, methodName);
43
47
  route.path = path;
44
48
  route.name = name;
45
49
  route.method = method;
46
- metadata.routes[action] = route;
50
+ metadata.routes[methodName] = route;
47
51
  Metadata_1.ControllerMetadata.set(metadata, controller);
48
52
  }
49
- function Event(name = '') {
53
+ function Action(name = '') {
50
54
  return (target, action) => {
51
- addEvent(target.constructor, action, name);
55
+ addAction(target.constructor, action, name);
52
56
  };
53
57
  }
54
- exports.Event = Event;
58
+ exports.Action = Action;
55
59
  function OnOpen(target, action) {
56
60
  const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
57
- websocketHandler.onOpen = new WebsocketEvent_1.WebsocketEvent('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
61
+ websocketHandler.onOpen = new WebsocketRoute_1.WebsocketRoute('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
58
62
  }
59
63
  exports.OnOpen = OnOpen;
60
64
  function OnClose(target, action) {
61
65
  const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
62
- websocketHandler.onClose = new WebsocketEvent_1.WebsocketEvent('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
66
+ websocketHandler.onClose = new WebsocketRoute_1.WebsocketRoute('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
63
67
  }
64
68
  exports.OnClose = OnClose;
65
69
  function Arg(name) {
66
70
  return function (target, action, parameterIndex) {
67
- // addEvent(target.constructor as Constructor, action, name)
71
+ // addAction(target.constructor as Constructor, action, name)
68
72
  };
69
73
  }
70
74
  exports.Arg = Arg;
@@ -105,9 +109,9 @@ function Middleware(...middleware) {
105
109
  }
106
110
  const metadata = Metadata_1.ControllerMetadata.get(target);
107
111
  if (action) {
108
- const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
112
+ const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
109
113
  route.middleware = route.middleware.concat(middleware);
110
- metadata.routes[action] = route;
114
+ metadata.methods[action] = route;
111
115
  }
112
116
  else {
113
117
  metadata.middleware = metadata.middleware.concat(middleware);
@@ -123,9 +127,9 @@ function AllowIf(...guards) {
123
127
  }
124
128
  const metadata = Metadata_1.ControllerMetadata.get(target);
125
129
  if (action) {
126
- const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
130
+ const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
127
131
  route.guards = route.guards.concat(guards);
128
- metadata.routes[action] = route;
132
+ metadata.methods[action] = route;
129
133
  }
130
134
  else {
131
135
  metadata.guards = metadata.guards.concat(guards);
@@ -138,7 +142,7 @@ function Query(name) {
138
142
  return function (target, action, parameterIndex) {
139
143
  const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
140
144
  const parametersTypes = Reflect.getMetadata('design:paramtypes', target, action);
141
- const route = metadata.routes[action] || new Metadata_1.RouteMetadata();
145
+ const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
142
146
  route.parametersOverrides[parameterIndex] = function (container) {
143
147
  const request = container.get(Http_1.Request);
144
148
  const value = request.query[name];
@@ -147,7 +151,7 @@ function Query(name) {
147
151
  }
148
152
  return value;
149
153
  };
150
- metadata.routes[action] = route;
154
+ metadata.methods[action] = route;
151
155
  Metadata_1.ControllerMetadata.set(metadata, target.constructor);
152
156
  };
153
157
  }
@@ -155,15 +159,16 @@ exports.Query = Query;
155
159
  function Body() {
156
160
  return function (target, action, parameterIndex) {
157
161
  const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
158
- const route = metadata.events[action] || new Metadata_1.RouteMetadata();
162
+ const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
159
163
  route.parametersOverrides[parameterIndex] = function (container) {
160
- const request = container.get(Http_1.Request);
161
- if (!request.body) {
162
- throw new Error(`There is no data in the 'body' of the request`);
163
- }
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
+ // }
164
169
  return request.body;
165
170
  };
166
- metadata.events[action] = route;
171
+ metadata.methods[action] = route;
167
172
  Metadata_1.ControllerMetadata.set(metadata, target.constructor);
168
173
  };
169
174
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,15 @@
1
1
  import { Container } from '../../Container';
2
- import { MiddlewareInterface, Route, Router } from '../';
2
+ import { Router } from '../';
3
3
  import { ErrorHandlerInterface, Http, Response } from './';
4
4
  import { Request } from './Request';
5
+ import { HttpRoute as Route } from './HttpRoute';
5
6
  import { Abstract, Constructor, Type } from '@Typetron/Support';
7
+ import { HttpMiddleware } from '@Typetron/Router/Http/Middleware';
6
8
  export declare class Handler {
7
9
  router: Router;
8
10
  errorHandler: ErrorHandlerInterface;
9
11
  cachedRoutes: Record<string, number>;
10
- addRoute(uri: string, method: Http.Method, controller: Constructor, action: string, name: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): Route;
12
+ addRoute(uri: string, method: Http.Method, controller: Constructor, action: string, name: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<HttpMiddleware>[]): Route;
11
13
  startServer(app: Container): void;
12
14
  handle(app: Container, request: Request): Promise<Response>;
13
15
  private findRouteIndex;
@@ -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,EAAkB,KAAK,EAAsB,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,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,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,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;IAwCjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}
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,EAAsC,MAAM,EAAE,MAAM,KAAK,CAAA;AAChE,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;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAOjE,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,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC7E,UAAU,GAAE,QAAQ,CAAC,cAAc,CAAC,EAAO,GAC5C,KAAK;IAkBR,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAa3B,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IA8CjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}
@@ -14,7 +14,9 @@ const Container_1 = require("../../Container");
14
14
  const __1 = require("../");
15
15
  const _1 = require("./");
16
16
  const Request_1 = require("./Request");
17
+ const HttpRoute_1 = require("./HttpRoute");
17
18
  const Framework_1 = require("../../Framework");
19
+ const Request_2 = require("../Request");
18
20
  const Servers_1 = require("@Typetron/Router/Servers");
19
21
  const httpServers = {
20
22
  node: Servers_1.nodeServer,
@@ -26,7 +28,7 @@ class Handler {
26
28
  }
27
29
  addRoute(uri, method, controller, action, name, parametersTypes = [], middleware = []) {
28
30
  uri = this.prepareUri(uri);
29
- const route = new __1.Route(uri, method, controller, action, name, parametersTypes, middleware);
31
+ const route = new HttpRoute_1.HttpRoute(uri, method, name, controller, action, parametersTypes, middleware);
30
32
  if (this.router.routes.find(item => item.uri === uri && item.method === method)) {
31
33
  throw new Error(`There is already a route with the same url: [${method}] '${uri}'`);
32
34
  }
@@ -54,12 +56,13 @@ class Handler {
54
56
  }
55
57
  async handle(app, request) {
56
58
  const container = app.createChildContainer();
59
+ container.set(Request_2.Request, request);
57
60
  container.set(Request_1.Request, request);
58
61
  let stack = async () => {
59
62
  const routeIndex = this.cachedRoutes[`${request.method} ${request.uri}`]
60
63
  ?? this.findRouteIndex(request.uri ?? '', request.method);
61
64
  const route = this.router.routes[routeIndex];
62
- container.set(__1.Route, route);
65
+ container.set(HttpRoute_1.HttpRoute, route);
63
66
  request.parameters = route.parameters;
64
67
  let routeStack = async () => {
65
68
  const content = await route.run(container);
@@ -74,7 +77,11 @@ class Handler {
74
77
  });
75
78
  return routeStack(request);
76
79
  };
77
- this.router.middleware.forEach(middlewareClass => {
80
+ this.router.middleware.global?.forEach(middlewareClass => {
81
+ const middleware = container.get(middlewareClass);
82
+ stack = middleware.handle.bind(middleware, request, stack);
83
+ });
84
+ this.router.middleware.http?.forEach(middlewareClass => {
78
85
  const middleware = container.get(middlewareClass);
79
86
  stack = middleware.handle.bind(middleware, request, stack);
80
87
  });
@@ -1 +1 @@
1
- {"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ import { Container } from '../../Container';
2
+ import { Abstract, Constructor, Type } from '../../Support';
3
+ import { Route } from '@Typetron/Router';
4
+ import { AnyFunction } from '@Typetron/Support';
5
+ import { HttpMiddleware } from '@Typetron/Router/Http/Middleware';
6
+ export declare class HttpRoute extends Route {
7
+ uri: string;
8
+ method: string;
9
+ name: string;
10
+ controller: Constructor;
11
+ controllerMethod: string;
12
+ parametersTypes: (Type<AnyFunction> | FunctionConstructor)[];
13
+ middleware: Abstract<HttpMiddleware>[];
14
+ private readonly uriParts;
15
+ constructor(uri: string, method: string, name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<AnyFunction> | FunctionConstructor)[], middleware?: Abstract<HttpMiddleware>[]);
16
+ run(container: Container): Promise<object | string>;
17
+ matches(uri: string): boolean;
18
+ splitUriParts(): void;
19
+ getUrl(): string;
20
+ private resolveParameters;
21
+ private hasCorrectPrimitiveType;
22
+ }
23
+ //# sourceMappingURL=HttpRoute.d.ts.map