@typetron/framework 0.3.2 → 0.3.6

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 (31) hide show
  1. package/Database/EntityQuery.d.ts +5 -4
  2. package/Database/EntityQuery.d.ts.map +1 -1
  3. package/Database/EntityQuery.js +19 -8
  4. package/Database/EntityQuery.js.map +1 -1
  5. package/Database/Types.d.ts +2 -1
  6. package/Database/Types.d.ts.map +1 -1
  7. package/Forms/Form.js +1 -1
  8. package/Forms/Form.js.map +1 -1
  9. package/Framework/Auth/Auth.d.ts +2 -2
  10. package/Framework/Auth/Auth.d.ts.map +1 -1
  11. package/Framework/Auth/Auth.js +1 -0
  12. package/Framework/Auth/Auth.js.map +1 -1
  13. package/Framework/Config/AppConfig.d.ts.map +1 -1
  14. package/Framework/Config/AppConfig.js +0 -4
  15. package/Framework/Config/AppConfig.js.map +1 -1
  16. package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
  17. package/Framework/Providers/WebsocketsProvider.js +4 -6
  18. package/Framework/Providers/WebsocketsProvider.js.map +1 -1
  19. package/Framework/Resolvers/AuthResolver.d.ts.map +1 -1
  20. package/Framework/Resolvers/AuthResolver.js +0 -8
  21. package/Framework/Resolvers/AuthResolver.js.map +1 -1
  22. package/Router/Websockets/index.d.ts +7 -4
  23. package/Router/Websockets/index.d.ts.map +1 -1
  24. package/Router/Websockets/index.js +9 -1
  25. package/Router/Websockets/index.js.map +1 -1
  26. package/Testing/TestCase.d.ts.map +1 -1
  27. package/Testing/TestCase.js +12 -2
  28. package/Testing/TestCase.js.map +1 -1
  29. package/package.json +5 -6
  30. package/tests/Database/EntityRelationshipsTest.js +16 -0
  31. package/tests/Database/EntityRelationshipsTest.js.map +1 -1
package/Database/EntityQuery.d.ts CHANGED
@@ -4,10 +4,11 @@ import { DotNotationProperties, EntityConstructor, EntityObject, Expression } fr
4
4
  import { KeysOfType } from '../Support';
5
5
  import { BelongsTo, BelongsToMany, HasMany, HasOne } from './Fields';
6
6
  import { List } from './List';
7
+ import { RelationsTreeQuery } from './Types';
7
8
  export declare class EntityQuery<T extends Entity> extends Query<T> {
8
9
  entity: EntityConstructor<T>;
9
- eagerLoad: (string | [string, (query: EntityQuery<any>) => void])[];
10
- eagerLoadCount: (string | [string, (query: EntityQuery<any>) => void])[];
10
+ eagerLoad: (string | [string, RelationsTreeQuery])[];
11
+ eagerLoadCount: (string | [string, RelationsTreeQuery])[];
11
12
  constructor(entity: EntityConstructor<T>);
12
13
  get<K extends keyof T>(...columns: (K | string | Expression)[]): Promise<T[]>;
13
14
  eagerLoadRelationships(entities: T[]): Promise<T[]>;
@@ -16,11 +17,11 @@ export declare class EntityQuery<T extends Entity> extends Query<T> {
16
17
  firstOrNew<K extends keyof T>(properties: Partial<EntityObject<T> | Record<string, any>>, values?: Partial<EntityObject<T>>): Promise<T>;
17
18
  with(...relations: (KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this> | [
18
19
  KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this>,
19
- (query: EntityQuery<any>) => void
20
+ RelationsTreeQuery
20
21
  ])[]): this;
21
22
  withCount<K extends KeysOfType<T, List<Entity>>>(...relations: (KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this> | [
22
23
  KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this>,
23
- (query: EntityQuery<any>) => void
24
+ RelationsTreeQuery
24
25
  ])[]): this;
25
26
  private tree;
26
27
  private treeBack;
package/Database/EntityQuery.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAiB,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE3D,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IAOpC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAJ/C,SAAS,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAK;IAEzD,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAK;gBAE3C,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAIzC,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,GAAG,MAAM,GAAG,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAUtE,sBAAsB,CAAC,QAAQ,EAAE,CAAC,EAAE;IA8CpC,4BAA4B,CAAC,QAAQ,EAAE,CAAC,EAAE;IAoBjD,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,GAAG,MAAM,GAAG,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAYzF,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,EAE9B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAC1D,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAClC,OAAO,CAAC,CAAC,CAAC;IAkBb,IAAI,CACA,GAAG,SAAS,EAAE,CAEV,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAE7G;QAAC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC;QAAE,kBAAkB;KAAC,CAClI,EAAE;IAWX,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,EAC3C,GAAG,SAAS,EAAE,CAEV,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAE7G;QAAC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC;QAAE,kBAAkB;KAAC,CAClI,EAAE;IAQX,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,QAAQ;CAWnB"}
package/Database/EntityQuery.js CHANGED
@@ -24,7 +24,7 @@ class EntityQuery extends Query_1.Query {
24
24
  const relationValue = relationsTree[relationName];
25
25
  const relation = this.entity.metadata.allRelationships[relationName];
26
26
  if (!relation) {
27
- throw new Error(`Relation '${relationName}' doesn not exist on entity '${this.entity.name}'`);
27
+ throw new Error(`Relation '${relationName}' doesn't not exist on entity '${this.entity.name}'`);
28
28
  }
29
29
  // tslint:disable-next-line:no-any
30
30
  let fieldQueryFunction;
@@ -42,7 +42,7 @@ class EntityQuery extends Query_1.Query {
42
42
  });
43
43
  // await this.eagerLoad.forEachAsync(async (field) => {
44
44
  // // tslint:disable-next-line:no-any
45
- // let fieldName: string, fieldQueryFunction: undefined | ((query: EntityQuery<any>) => void)
45
+ // let fieldName: string, fieldQueryFunction: undefined | RelationsTreeQuery
46
46
  // if (field instanceof Array) {
47
47
  // fieldName = field[0]
48
48
  // fieldQueryFunction = field[1]
@@ -122,14 +122,21 @@ class EntityQuery extends Query_1.Query {
122
122
  tree(relations) {
123
123
  const tree = {};
124
124
  relations.forEach(relation => {
125
+ let relationName;
126
+ let relationValue = {};
125
127
  if (relation instanceof Array) {
126
- tree[relation[0]] = relation[1];
127
- return;
128
+ relationName = relation[0];
129
+ relationValue = relation[1];
130
+ }
131
+ else {
132
+ relationName = relation;
128
133
  }
129
134
  let container = tree;
130
- relation.split('.').forEach(part => {
135
+ const relationStringParts = relationName.split('.');
136
+ relationStringParts.forEach((part, index) => {
137
+ const value = index === relationStringParts.length - 1 ? relationValue : {};
131
138
  // @ts-ignore
132
- container = (container[part] ? container[part] : container[part] = {});
139
+ container = (container[part] ? container[part] : container[part] = value);
133
140
  });
134
141
  });
135
142
  return tree;
@@ -137,8 +144,12 @@ class EntityQuery extends Query_1.Query {
137
144
  treeBack(relationsTree) {
138
145
  return Object.keys(relationsTree).map(relationName => {
139
146
  const item = relationsTree[relationName];
140
- const children = item instanceof Function ? item : this.treeBack(item);
141
- return [relationName, children.length ? children : ''].filter(Boolean).join('.');
147
+ if (item instanceof Function) {
148
+ return [relationName, item];
149
+ }
150
+ else {
151
+ return [relationName, this.treeBack(item)].filter(Boolean).join('.');
152
+ }
142
153
  });
143
154
  }
144
155
  }
package/Database/EntityQuery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}
package/Database/Types.d.ts CHANGED
@@ -110,8 +110,9 @@ export declare class WhereSubSelect extends WhereExpression {
110
110
  query: Query;
111
111
  constructor(column: string, operator: Operator, query: Query, boolean: Boolean);
112
112
  }
113
+ export declare type RelationsTreeQuery = (query: EntityQuery<any>) => void;
113
114
  export interface RelationsTree {
114
- [key: string]: RelationsTree | ((query: EntityQuery<any>) => void);
115
+ [key: string]: RelationsTree | RelationsTreeQuery;
115
116
  }
116
117
  export {};
117
118
  //# sourceMappingURL=Types.d.ts.map
package/Database/Types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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"}
package/Forms/Form.js CHANGED
@@ -9,7 +9,7 @@ var Form_1;
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.Form = void 0;
11
11
  const Decorators_1 = require("./Decorators");
12
- const Container_1 = require("@Typetron/Container");
12
+ const Container_1 = require("../Container");
13
13
  let Form = Form_1 = class Form {
14
14
  constructor() {
15
15
  this.errors = {};
package/Forms/Form.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Form.js","sourceRoot":"","sources":["../../Forms/Form.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAA8C;AAI9C,mDAAuD;AAKvD,IAAsB,IAAI,YAA1B,MAAsB,IAAI;IAA1B;QAEa,WAAM,GAA4C,EAAE,CAAA;IA0DjE,CAAC;IAxDG,MAAM,CAAC,MAAM;QACT,OAAO,OAAO,CAAC,WAAW,CAAC,4BAAe,EAAE,IAAI,CAAC,CAAA;IACrD,CAAC;IAED,MAAM;QACF,OAAQ,IAAI,CAAC,WAAiD,CAAC,MAAM,EAAE,CAAA;IAC3E,CAAC;IAED,KAAK;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAA8B,CAAC,CAAC,CAAA;YACzE,IAAI,MAAM,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;aACnC;QACL,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;IAC3C,CAAC;IAED,SAAS;QACL,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClD,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAkB,CAAC,CAAA;YAC5C,IAAI,KAAK,EAAE;gBACP,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;aAC1B;YACD,OAAO,GAAG,CAAA;QACd,CAAC,EAA8B,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,kCAAkC;QAClC,MAAM,KAAK,GAAwB,EAAE,CAAA;QACrC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAA8B,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,IAAI,CAAC,IAA+B;QAChC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,EAAE;gBACpB,aAAa;gBACb,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;aACtC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,EAAE,CAAA;IACvB,CAAC;CACJ,CAAA;AA5DqB,IAAI;IADzB,sBAAU,CAAC,iBAAK,CAAC,SAAS,CAAC;GACN,IAAI,CA4DzB;AA5DqB,oBAAI"}
1
+ {"version":3,"file":"Form.js","sourceRoot":"","sources":["../../Forms/Form.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAA8C;AAI9C,4CAAgD;AAKhD,IAAsB,IAAI,YAA1B,MAAsB,IAAI;IAA1B;QAEa,WAAM,GAA4C,EAAE,CAAA;IA0DjE,CAAC;IAxDG,MAAM,CAAC,MAAM;QACT,OAAO,OAAO,CAAC,WAAW,CAAC,4BAAe,EAAE,IAAI,CAAC,CAAA;IACrD,CAAC;IAED,MAAM;QACF,OAAQ,IAAI,CAAC,WAAiD,CAAC,MAAM,EAAE,CAAA;IAC3E,CAAC;IAED,KAAK;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAA8B,CAAC,CAAC,CAAA;YACzE,IAAI,MAAM,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;aACnC;QACL,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;IAC3C,CAAC;IAED,SAAS;QACL,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClD,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAkB,CAAC,CAAA;YAC5C,IAAI,KAAK,EAAE;gBACP,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;aAC1B;YACD,OAAO,GAAG,CAAA;QACd,CAAC,EAA8B,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,kCAAkC;QAClC,MAAM,KAAK,GAAwB,EAAE,CAAA;QACrC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAA8B,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,IAAI,CAAC,IAA+B;QAChC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAgB,CAAA;QAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,EAAE;gBACpB,aAAa;gBACb,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;aACtC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,EAAE,CAAA;IACvB,CAAC;CACJ,CAAA;AA5DqB,IAAI;IADzB,sBAAU,CAAC,iBAAK,CAAC,SAAS,CAAC;GACN,IAAI,CA4DzB;AA5DqB,oBAAI"}
package/Framework/Auth/Auth.d.ts CHANGED
@@ -11,14 +11,14 @@ export declare class Auth {
11
11
  * This is primarily used in websocket connections so we don't need to pass the auth token for each weboscket message
12
12
  */
13
13
  expiresAt: Date;
14
- private savedUser;
14
+ private savedUser?;
15
15
  get authenticable(): typeof User;
16
16
  user<T extends User>(): Promise<T>;
17
17
  login(username: string, password: string): Promise<string>;
18
18
  loginById(id: ID): Promise<string>;
19
19
  loginUser(authenticable: User): Promise<string>;
20
20
  sign(id: ID, expiresAtTimestampInSeconds?: number): Promise<string>;
21
- register(username: string, password: string): Promise<User>;
21
+ register<T extends User>(username: string, password: string): Promise<T>;
22
22
  verify(token: string): Promise<import("../../Encryption").JWToken<number>>;
23
23
  private set;
24
24
  }
package/Framework/Auth/Auth.d.ts.map CHANGED
@@ -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,MAAM,sBAAsB,CAAA;AAEjD,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,CAAM;IAEvB,IAAI,aAAa,IAAI,OAAO,IAAI,CAE/B;IAEK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;IAYlC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAShE,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,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D,MAAM,CAAC,KAAK,EAAE,MAAM;IAQ1B,OAAO,CAAC,GAAG;CAWd"}
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,MAAM,sBAAsB,CAAA;AAEjD,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;IAEK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;IAYlC,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;IAQ1B,OAAO,CAAC,GAAG;CAWd"}
package/Framework/Auth/Auth.js CHANGED
@@ -37,6 +37,7 @@ let Auth = class Auth {
37
37
  if (!user || !await this.crypt.compare(password, user.password)) {
38
38
  throw new Error('Invalid credentials');
39
39
  }
40
+ delete this.savedUser;
40
41
  return this.sign(this.id = user.id);
41
42
  }
42
43
  loginById(id) {
package/Framework/Auth/Auth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
package/Framework/Config/AppConfig.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,qBAAa,SAAU,SAAQ,UAAU,CAAC,SAAS,CAAC;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,MAAM,CAAO;IAC9B,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAG,CAAA;IAC5B,YAAY,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAC,CAAA;CACpD"}
1
+ {"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,qBAAa,SAAU,SAAQ,UAAU,CAAC,SAAS,CAAC;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAG,CAAA;IAC5B,YAAY,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAC,CAAA;CACpD"}
package/Framework/Config/AppConfig.js CHANGED
@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AppConfig = void 0;
4
4
  const BaseConfig_1 = require("./BaseConfig");
5
5
  class AppConfig extends BaseConfig_1.BaseConfig {
6
- constructor() {
7
- super(...arguments);
8
- this.websocketsPort = 8001;
9
- }
10
6
  }
11
7
  exports.AppConfig = AppConfig;
12
8
  //# sourceMappingURL=AppConfig.js.map
package/Framework/Config/AppConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAKzC,MAAa,SAAU,SAAQ,uBAAqB;IAApD;;QAGI,mBAAc,GAAY,IAAI,CAAA;IAIlC,CAAC;CAAA;AAPD,8BAOC"}
1
+ {"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAKzC,MAAa,SAAU,SAAQ,uBAAqB;CAOnD;AAPD,8BAOC"}
package/Framework/Providers/WebsocketsProvider.d.ts.map CHANGED
@@ -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;AAIrC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQ5D,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YA2ElB,WAAW;CAc5B"}
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;AAIrC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQ5D,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAyElB,WAAW;CAc5B"}
package/Framework/Providers/WebsocketsProvider.js CHANGED
@@ -41,14 +41,12 @@ class WebsocketsProvider extends Provider_1.Provider {
41
41
  compression: uWebSockets_js_1.DEDICATED_COMPRESSOR_3KB,
42
42
  open: (socket) => {
43
43
  var _a;
44
- const socketWrapper = new Websockets_1.WebSocket(socket);
45
- socket.container = this.app.createChildContainer();
46
- socket.container.set(Websockets_1.WebSocket, socketWrapper);
47
- (_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
44
+ const socketWrapper = new Websockets_1.WebSocket(socket, this.app.createChildContainer());
45
+ (_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socketWrapper.connection.container, {});
48
46
  },
49
- close: (socket) => {
47
+ close: async (socket) => {
50
48
  var _a;
51
- (_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
49
+ await ((_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {}));
52
50
  },
53
51
  /* For brevity we skip the other events (upgrade, open, ping, pong, close) */
54
52
  message: async (socket, message, isBinary) => {
package/Framework/Providers/WebsocketsProvider.js.map CHANGED
@@ -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,4CAAiD;AACjD,wDAA4D;AAG5D,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACvB,mCAAS,CAAA;IACT,yCAAe,CAAA;AACnB,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAED,MAAa,kBAAmB,SAAQ,mBAAQ;IAAhD;;QAQI,YAAO,GAAG,IAAI,GAAG,EAA8B,CAAA;IA2FnD,CAAC;IAzFG,QAAQ;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAA;QAE1C,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;SACrE;QAED,MAAM,aAAa,GAAG,IAAI,kBAAW,EAAE,CAAA;QAEvC,MAAM,GAAG,GAAG,oBAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;YAEtB,2CAA2C;YAC3C,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,IAAI;YACrB,gBAAgB,EAAE,IAAI,GAAG,IAAI,GAAG,CAAC;YACjC,WAAW,EAAE,yCAAwB;YAErC,IAAI,EAAE,CAAC,MAAkB,EAAE,EAAE;;gBACzB,MAAM,aAAa,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAA;gBAC3C,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAA;gBAClD,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAS,EAAE,aAAa,CAAC,CAAA;gBAC9C,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,0CAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAC;YAClD,CAAC;YACD,KAAK,EAAE,CAAC,MAAkB,EAAE,EAAE;;gBAC1B,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAC;YACnD,CAAC;YAED,6EAA6E;YAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;;gBACzC,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC9C,IAAI,IAAkB,CAAA;gBACtB,IAAI;oBACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;iBAC9B;gBAAC,WAAM;oBACJ,MAAM,IAAI,KAAK,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAA;iBACjE;gBAED,IAAI;oBACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;oBAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;oBACxB,MAAM,YAAY,GAA2B;wBACzC,KAAK;wBACL,OAAO,EAAE,QAAQ,CAAC,IAAI;wBACtB,MAAM,EAAE,sBAAsB,CAAC,EAAE;qBACpC,CAAA;oBACD,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;wBAClD,YAAY,CAAC,MAAM,GAAG,sBAAsB,CAAC,EAAE,CAAA;qBAClD;yBAAM;wBACH,YAAY,CAAC,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAA;qBACrD;oBAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;iBAE5D;gBAAC,OAAO,KAAK,EAAE;oBACZ,MAAM,YAAY,GAA2B;wBACzC,OAAO,EAAE;4BACL,OAAO,QAAE,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,OAAO;4BACvC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;yBACjC;wBACD,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,MAAM,EAAE,sBAAsB,CAAC,KAAK;qBACvC,CAAA;oBACD,qCAAqC;oBACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;iBAC5D;YAEL,CAAC;SAEJ,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,EAAE;YAC7B,IAAI,YAAY,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAA;aAC1D;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,SAAoB,EAAE,EAAC,KAAK,EAAE,OAAO,EAAe;;QAC1E,MAAM,OAAO,GAAG,IAAI,cAAO,CAAC,KAAK,EAAE,WAAI,CAAC,MAAM,CAAC,GAAG,EAC9C,EAAE,EACF,EAAE,EACF,EAAE,QACF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAc,mCAAI,EAAE,CAChC,CAAA;QAED,+HAA+H;QAC/H,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAE,OAAO,CAAC,SAAS,CAAC,EAAE;YACrC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;QACrD,CAAC,EAAC;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;CACJ;AAhGG;IADC,kBAAM,EAAE;8BACE,kBAAS;qDAAA;AAGpB;IADC,kBAAM,EAAE;8BACA,oBAAO;mDAAA;AANpB,gDAmGC"}
1
+ {"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
package/Framework/Resolvers/AuthResolver.d.ts.map CHANGED
@@ -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;IAOpC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IASpE,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;IAIpE,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;CAS3C"}
package/Framework/Resolvers/AuthResolver.js CHANGED
@@ -4,17 +4,9 @@ exports.AuthResolver = void 0;
4
4
  const Container_1 = require("../../Container");
5
5
  const Auth_1 = require("../Auth");
6
6
  class AuthResolver extends Container_1.BaseResolver {
7
- // constructor(container: Container) {
8
- // super(container);
9
- // this.setScopeToRequest();
10
- // }
11
7
  async resolve(abstract, parameters) {
12
8
  return await this.container.get(Auth_1.Auth).user();
13
9
  }
14
- // // tslint:disable-next-line:no-any
15
- // canResolve<T extends Abstract<any>>(abstract: T): boolean {
16
- // return abstract.prototype instanceof User;
17
- // }
18
10
  canResolve(abstract) {
19
11
  return abstract === Auth_1.AuthUserIdentifier;
20
12
  }
package/Framework/Resolvers/AuthResolver.js.map CHANGED
@@ -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,sCAAsC;IACtC,wBAAwB;IACxB,gCAAgC;IAChC,IAAI;IAEJ,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,qCAAqC;IACrC,8DAA8D;IAC9D,iDAAiD;IACjD,IAAI;IAEJ,UAAU,CAAI,QAAgB;QAC1B,OAAO,QAAQ,KAAK,yBAAkB,CAAA;IAC1C,CAAC;CAOJ;AAzBD,oCAyBC"}
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"}
package/Router/Websockets/index.d.ts CHANGED
@@ -1,13 +1,16 @@
1
1
  import { WebSocket as uWebSocket } from 'uWebSockets.js';
2
+ import { Container } from '@Typetron/Container';
2
3
  export * from './Handler';
3
4
  export * from './types';
4
5
  export declare class WebSocket {
5
6
  connection: uWebSocket;
6
7
  id?: number | string;
7
- constructor(connection: uWebSocket);
8
+ constructor(connection: uWebSocket, container: Container);
8
9
  subscribe(topic: string): void;
9
- publish(topic: string, event: string, body: any): void;
10
- publishAndSend(topic: string, event: string, body: any): void;
11
- send(event: string, body: any): void;
10
+ unsubscribe(topic: string): void;
11
+ reset(container?: Container): void;
12
+ publish(topic: string, event: string, body?: any): void;
13
+ publishAndSend(topic: string, event: string, body?: any): void;
14
+ send(event: string, body?: any): void;
12
15
  }
13
16
  //# sourceMappingURL=index.d.ts.map
package/Router/Websockets/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAGxD,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAIC,UAAU,EAAE,UAAU;IAFzC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU;IAEzC,SAAS,CAAC,KAAK,EAAE,MAAM;IAKvB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAU/C,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAMtD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;CAQhC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAIC,UAAU,EAAE,UAAU;IAFzC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS;IAI/D,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS;IAM3B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAUhD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAMvD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;CAQjC"}
package/Router/Websockets/index.js CHANGED
@@ -15,12 +15,20 @@ const types_1 = require("./types");
15
15
  __exportStar(require("./Handler"), exports);
16
16
  __exportStar(require("./types"), exports);
17
17
  class WebSocket {
18
- constructor(connection) {
18
+ constructor(connection, container) {
19
19
  this.connection = connection;
20
+ this.reset(container);
20
21
  }
21
22
  subscribe(topic) {
22
23
  this.connection.subscribe(topic);
23
24
  }
25
+ unsubscribe(topic) {
26
+ this.connection.unsubscribe(topic);
27
+ }
28
+ reset(container) {
29
+ this.connection.container = container || this.connection.container.parent.createChildContainer();
30
+ this.connection.container.set(WebSocket, this);
31
+ }
24
32
  // tslint:disable-next-line:no-any
25
33
  publish(topic, event, body) {
26
34
  const sentResponse = {
package/Router/Websockets/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,mCAA+D;AAE/D,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAIlB,YAAmB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAE7C,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,IAAS;QAC3C,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,KAAa,EAAE,IAAS;QAClD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,KAAa,EAAE,IAAS;QACzB,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AAnCD,8BAmCC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,mCAA+D;AAG/D,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAIlB,YAAmB,UAAsB,EAAE,SAAoB;QAA5C,eAAU,GAAV,UAAU,CAAY;QACrC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAqB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QAChG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,IAAU;QAC5C,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,KAAa,EAAE,IAAU;QACnD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,KAAa,EAAE,IAAU;QAC1B,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AA9CD,8BA8CC"}
package/Testing/TestCase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA2E,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAClH,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,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAIvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,cAAc,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE3D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAEvC,MAAM;IAcN,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;IAIvB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IA+BpH,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI;YAItC,OAAO;IA4CrB,OAAO,CAAC,8BAA8B;CAMzC"}
1
+ {"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA2E,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAClH,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,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAIvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,cAAc,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE3D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAEvC,MAAM;IAcN,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,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAwC1H,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI;YAItC,OAAO;IA4CrB,OAAO,CAAC,8BAA8B;CAMzC"}
package/Testing/TestCase.js CHANGED
@@ -55,7 +55,7 @@ class TestCase {
55
55
  delete(route, content = {}, headers = {}) {
56
56
  return this.request(Http_1.Http.Method.DELETE, route, content, headers);
57
57
  }
58
- event(event, content) {
58
+ async event(event, content) {
59
59
  var _a, _b;
60
60
  const socketMock = ts_mockito_1.mock(Websockets_1.WebSocket);
61
61
  ts_mockito_1.when(socketMock.publishAndSend(ts_mockito_1.anything(), ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((topic, calledEvent, message) => {
@@ -73,7 +73,17 @@ class TestCase {
73
73
  (_b = content === null || content === void 0 ? void 0 : content.parameters) === null || _b === void 0 ? void 0 : _b.forEach(parameter => {
74
74
  request.parameters[String.random(15)] = parameter;
75
75
  });
76
- return this.app.get(Websockets_1.Handler).handle(container, request);
76
+ try {
77
+ return await this.app.get(Websockets_1.Handler).handle(container, request);
78
+ }
79
+ catch (error) {
80
+ if (error instanceof Http_1.HttpError) {
81
+ const errorResponse = await this.app.get(Http_1.ErrorHandlerInterface).handle(error);
82
+ console.error(errorResponse.body);
83
+ return errorResponse;
84
+ }
85
+ throw error;
86
+ }
77
87
  }
78
88
  on(event, callback) {
79
89
  this.eventListeners.set(event, callback);
package/Testing/TestCase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";;;AAAA,2BAAwB;AACxB,yCAAkH;AAElH,4CAA4D;AAC5D,sCAAkC;AAClC,4CAA8C;AAE9C,qDAA8E;AAG9E,2CAA2D;AAC3D,qDAA4C;AAE5C,MAAsB,QAAQ;IAA9B;QAII,kCAAkC;QAClC,mBAAc,GAAG,IAAI,GAAG,EAAmC,CAAA;QAE3D,2BAAsB,GAAG;YACrB,4BAAgB;SACnB,CAAA;IAmKL,CAAC;IA/JG,KAAK,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACf,QAAQ,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;SAC3C;QACD,MAAM,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QACjE,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAA;QAE9C,MAAM,KAAK,GAAG,iBAAI,CAAC,kBAAK,CAAC,CAAA;QACzB,iBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAQ,EAAE,EAAE,qBAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,CAAA;QAC9E,iBAAI,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAQ,EAAE,EAAE,qBAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,EAAE,KAAK,MAAM,CAAC,CAAC,CAAA;QAEvH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAK,EAAE,qBAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAM;QAClB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,IAAU;QAClB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACrB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IAED,GAAG,CAAwC,SAAiB,EAAE,OAAO,GAAG,EAAE,EAAE,UAA+B,EAAE;QACzG,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC7F,CAAC;IAED,IAAI,CACA,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC1F,CAAC;IAED,KAAK,CACD,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC3F,CAAC;IAED,GAAG,CACC,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IACzF,CAAC;IAED,MAAM,CACF,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,KAAK,CAAwC,KAAa,EAAE,OAAiC;;QAC/F,MAAM,UAAU,GAAG,iBAAI,CAAC,sBAAS,CAAC,CAAA;QAElC,iBAAI,CAAC,UAAU,CAAC,cAAc,CAAC,qBAAQ,EAAE,EAAE,qBAAQ,EAAE,EAAE,qBAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YACzG,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACrD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,OAAO,EAAC;QACvB,CAAC,CAAC,CAAA;QAEF,iBAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAQ,EAAE,EAAE,qBAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE;YAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACrD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,OAAO,EAAC;QACvB,CAAC,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAA;QACjD,SAAS,CAAC,GAAG,CAAC,sBAAS,EAAE,qBAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;QAE9C,MAAM,OAAO,GAAG,IAAI,cAAO,CAAC,KAAK,EAAE,WAAI,CAAC,MAAM,CAAC,GAAG,EAC9C,EAAE,EACF,EAAE,EACF,EAAE,QACF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,EAAE,CACtB,CAAA;QAED,yHAAyH;QACzH,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAE,OAAO,CAAC,SAAS,CAAC,EAAE;YACrC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;QACrD,CAAC,EAAC;QAEF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAiB,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;SAC1E;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,KAAK,YAAY,gBAAS,EAAE;gBAC5B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,4BAAqB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC7E,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACjC,OAAO,aAAa,CAAA;aACvB;YACD,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAED,EAAE,CAAI,KAAa,EAAE,QAA+B;QAChD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC5C,CAAC;IAEO,KAAK,CAAC,OAAO,CACjB,MAAmB,EACnB,SAA6D,EAC7D,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,IAAI,eAAe,GAAG,EAAE,CAAA;QACxB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YAC/B,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,SAAS,CAAA;SAC3C;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAM,CAAC,CAAA;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QACxD,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,aAAa,CAAC,CAAA;SACpD;QACD,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,8BAA8B,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAE7E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtC,OAAO,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;SAC5C;QAED,MAAM,OAAO,GAAG,IAAI,cAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QAE7E,IAAI,QAAkB,CAAA;QACtB,IAAI;YACA,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAW,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAkB,EAAE,OAAO,CAAC,CAAA;YAEnF,IAAI,QAAQ,CAAC,IAAI,YAAY,MAAM,EAAE;gBACjC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAA;aAC3C;YAED,OAAO,QAAQ,CAAA;SAElB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,KAAK,YAAY,gBAAS,EAAE;gBAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,4BAAqB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAC3D;YACD,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,8BAA8B,CAAC,eAAgD;QACnF,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACvC,eAAe,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QACF,OAAO,eAAyC,CAAA;IACpD,CAAC;CACJ;AA5KD,4BA4KC"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@typetron/framework",
3
3
  "description": "Modern Node.js framework for modern apps written in Typescript",
4
4
  "license": "MIT",
5
- "version": "0.3.2",
5
+ "version": "0.3.6",
6
6
  "keywords": [
7
7
  "typetron",
8
8
  "framework",
@@ -16,11 +16,10 @@
16
16
  },
17
17
  "scripts": {
18
18
  "build": "tsc",
19
+ "dev": "tsc --watch",
19
20
  "test": "mocha",
20
- "lint": "eslint",
21
21
  "test:watch": "mocha --watch",
22
- "preversion": "npm test",
23
- "version": "npm run build"
22
+ "preversion": "npm test"
24
23
  },
25
24
  "engines": {
26
25
  "node": ">= 12.13.0"
@@ -31,7 +30,8 @@
31
30
  "jsonwebtoken": "^8.5.1",
32
31
  "mysql": "^2.18.1",
33
32
  "sqlite3": "^5.0.2",
34
- "uWebSockets.js": "github:uNetworking/uWebSockets.js#v19.4.0"
33
+ "uWebSockets.js": "github:uNetworking/uWebSockets.js#v19.4.0",
34
+ "ts-mockito": "^2.6.1"
35
35
  },
36
36
  "devDependencies": {
37
37
  "@testdeck/mocha": "^0.1.2",
@@ -48,7 +48,6 @@
48
48
  "nyc": "^15.1.0",
49
49
  "reflect-metadata": "^0.1.13",
50
50
  "source-map-support": "^0.5.20",
51
- "ts-mockito": "^2.6.1",
52
51
  "ts-node": "^10.2.1",
53
52
  "tsconfig-paths": "^3.11.0",
54
53
  "tslint": "^6.1.3",
package/tests/Database/EntityRelationshipsTest.js CHANGED
@@ -216,6 +216,22 @@ let EntityRelationshipsTest = class EntityRelationshipsTest {
216
216
  const user = await User_1.User.with(['articles', query => query.where('title', 'article1')]).first();
217
217
  chai_1.expect(user.articles).to.have.length(1);
218
218
  }
219
+ // @test
220
+ // async deepBelongsToEagerLoadWithCustomQuery() {
221
+ // const admin = await Role.create(this.admin)
222
+ //
223
+ // const joe = await User.create(this.joe)
224
+ // await joe.profile.save(new Profile({address: 'south address'}))
225
+ // const doe = await User.create(this.doe)
226
+ // await doe.profile.save(new Profile({address: 'east address'}))
227
+ //
228
+ // await admin.users.add(joe, doe)
229
+ //
230
+ // const role = await Role.with(['users.profile', query => query.whereLike('address', '%east%')]).first() as Role
231
+ //
232
+ // expect(role.users).to.have.length(1)
233
+ // expect(role.users[0].name).to.be.equal(doe.name)
234
+ // }
219
235
  async belongsToLoad() {
220
236
  const user = await User_1.User.create(this.joe);
221
237
  let article = new Article_1.Article();
package/tests/Database/EntityRelationshipsTest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EntityRelationshipsTest.js","sourceRoot":"","sources":["../../../tests/Database/EntityRelationshipsTest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EntityRelationshipsTest.js","sourceRoot":"","sources":["../../../tests/Database/EntityRelationshipsTest.ts"],"names":[],"mappings":"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"}