@typetron/framework 0.3.3 → 0.3.7

package/Container/Contracts.d.ts

@@ -1,3 +1,3 @@
 import { Abstract, Constructor } from '../Support';
-export declare type ServiceIdentifier<T> = (string | Constructor<T> | Abstract<T> | Symbol);
+export declare type ServiceIdentifier<T> = string | Constructor<T> | Abstract<T> | Symbol;
 //# sourceMappingURL=Contracts.d.ts.map

package/Container/Contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Contracts.d.ts","sourceRoot":"","sources":["../../Container/Contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAElD,oBAAY,iBAAiB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC"}
+{"version":3,"file":"Contracts.d.ts","sourceRoot":"","sources":["../../Container/Contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAElD,oBAAY,iBAAiB,CAAC,CAAC,IAAI,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC"}

package/Database/EntityQuery.d.ts

@@ -4,10 +4,11 @@ import { DotNotationProperties, EntityConstructor, EntityObject, Expression } fr
 import { KeysOfType } from '../Support';
 import { BelongsTo, BelongsToMany, HasMany, HasOne } from './Fields';
 import { List } from './List';
+import { RelationsTreeQuery } from './Types';
 export declare class EntityQuery<T extends Entity> extends Query<T> {
     entity: EntityConstructor<T>;
-    eagerLoad: (string | [string, (query: EntityQuery<any>) => void])[];
-    eagerLoadCount: (string | [string, (query: EntityQuery<any>) => void])[];
+    eagerLoad: (string | [string, RelationsTreeQuery])[];
+    eagerLoadCount: (string | [string, RelationsTreeQuery])[];
     constructor(entity: EntityConstructor<T>);
     get<K extends keyof T>(...columns: (K | string | Expression)[]): Promise<T[]>;
     eagerLoadRelationships(entities: T[]): Promise<T[]>;
@@ -16,11 +17,11 @@ export declare class EntityQuery<T extends Entity> extends Query<T> {
     firstOrNew<K extends keyof T>(properties: Partial<EntityObject<T> | Record<string, any>>, values?: Partial<EntityObject<T>>): Promise<T>;
     with(...relations: (KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this> | [
         KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this>,
-        (query: EntityQuery<any>) => void
+        RelationsTreeQuery
     ])[]): this;
     withCount<K extends KeysOfType<T, List<Entity>>>(...relations: (KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this> | [
         KeysOfType<T, BelongsTo<any> | HasOne<any> | HasMany<any> | BelongsToMany<any>> | DotNotationProperties<this>,
-        (query: EntityQuery<any>) => void
+        RelationsTreeQuery
     ])[]): this;
     private tree;
     private treeBack;

package/Database/EntityQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}

package/Database/EntityQuery.js

@@ -24,7 +24,7 @@ class EntityQuery extends Query_1.Query {
             const relationValue = relationsTree[relationName];
             const relation = this.entity.metadata.allRelationships[relationName];
             if (!relation) {
-                throw new Error(`Relation '${relationName}' doesn not exist on entity '${this.entity.name}'`);
+                throw new Error(`Relation '${relationName}' doesn't not exist on entity '${this.entity.name}'`);
             }
             // tslint:disable-next-line:no-any
             let fieldQueryFunction;
@@ -42,7 +42,7 @@ class EntityQuery extends Query_1.Query {
         });
         // await this.eagerLoad.forEachAsync(async (field) => {
         //     // tslint:disable-next-line:no-any
-        //     let fieldName: string, fieldQueryFunction: undefined | ((query: EntityQuery<any>) => void)
+        //     let fieldName: string, fieldQueryFunction: undefined | RelationsTreeQuery
         //     if (field instanceof Array) {
         //         fieldName = field[0]
         //         fieldQueryFunction = field[1]
@@ -122,14 +122,21 @@ class EntityQuery extends Query_1.Query {
     tree(relations) {
         const tree = {};
         relations.forEach(relation => {
+            let relationName;
+            let relationValue = {};
             if (relation instanceof Array) {
-                tree[relation[0]] = relation[1];
-                return;
+                relationName = relation[0];
+                relationValue = relation[1];
+            }
+            else {
+                relationName = relation;
             }
             let container = tree;
-            relation.split('.').forEach(part => {
+            const relationStringParts = relationName.split('.');
+            relationStringParts.forEach((part, index) => {
+                const value = index === relationStringParts.length - 1 ? relationValue : {};
                 // @ts-ignore
-                container = (container[part] ? container[part] : container[part] = {});
+                container = (container[part] ? container[part] : container[part] = value);
             });
         });
         return tree;
@@ -137,8 +144,12 @@ class EntityQuery extends Query_1.Query {
     treeBack(relationsTree) {
         return Object.keys(relationsTree).map(relationName => {
             const item = relationsTree[relationName];
-            const children = item instanceof Function ? item : this.treeBack(item);
-            return [relationName, children.length ? children : ''].filter(Boolean).join('.');
+            if (item instanceof Function) {
+                return [relationName, item];
+            }
+            else {
+                return [relationName, this.treeBack(item)].filter(Boolean).join('.');
+            }
         });
     }
 }

package/Database/EntityQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../Database/EntityQuery.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAC/B,qCAAiC;AAOjC,MAAa,WAA8B,SAAQ,aAAQ;IAOvD,YAAmB,MAA4B;QAC3C,KAAK,EAAE,CAAA;QADQ,WAAM,GAAN,MAAM,CAAsB;QAL/C,kCAAkC;QAClC,cAAS,GAA8C,EAAE,CAAA;QACzD,kCAAkC;QAClC,mBAAc,GAA8C,EAAE,CAAA;IAI9D,CAAC;IAED,KAAK,CAAC,GAAG,CAAoB,GAAG,OAAoC;QAChE,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;QAE1C,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;QAE3D,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAEtD,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA;IAC5D,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,QAAa;QAE7C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAE/C,MAAM,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;YACjE,MAAM,aAAa,GAAG,aAAa,CAAC,YAAY,CAAC,CAAA;YACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;YAEpE,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,aAAa,YAAY,kCAAkC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;aAClG;YAED,kCAAkC;YAClC,IAAI,kBAAkD,CAAA;YACtD,IAAI,cAAc,GAAsB,EAAE,CAAA;YAC1C,IAAI,aAAa,YAAY,QAAQ,EAAE;gBACnC,kBAAkB,GAAG,aAAa,CAAA;aACrC;iBAAM;gBACH,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;aAChD;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,kBAA4C,CAAC,CAAA;YAEtH,IAAI,OAAO,CAAC,MAAM,EAAE;gBAChB,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAQ,CAAA;aACtD;QACL,CAAC,CAAC,CAAA;QACF,uDAAuD;QACvD,yCAAyC;QACzC,gFAAgF;QAChF,oCAAoC;QACpC,+BAA+B;QAC/B,wCAAwC;QACxC,eAAe;QACf,4BAA4B;QAC5B,QAAQ;QACR,oDAAoD;QACpD,oEAAoE;QACpE,+HAA+H;QAC/H,4BAA4B;QAC5B,8DAA8D;QAC9D,QAAQ;QACR,KAAK;QACL,OAAO,QAAQ,CAAA;IACnB,CAAC;IAEM,KAAK,CAAC,4BAA4B,CAAC,QAAa;QACnD,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACnD,kCAAkC;YAClC,IAAI,SAAiB,EAAE,kBAAkD,CAAA;YACzE,IAAI,KAAK,YAAY,KAAK,EAAE;gBACxB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBACpB,kBAAkB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;aAChC;iBAAM;gBACH,SAAS,GAAG,KAAK,CAAA;aACpB;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;YACjE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,kBAA8C,CAAC,CAAA;YACxG,IAAI,OAAO,CAAC,MAAM,EAAE;gBAChB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAQ,CAAA;aAC5D;QACL,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CAAoB,GAAG,OAAoC;QAClE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAA;QAChD,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,SAAS,CAAA;SACnB;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAE9C,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAO,CAAA;QAEnE,OAAO,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;IACtE,CAAC;IAED,KAAK,CAAC,UAAU;IACZ,kCAAkC;IAClC,UAA0D,EAC1D,MAAiC;QAEjC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACrD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;YACpG,MAAM,UAAU,GAAG,KAAK,YAAY,eAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;YACjF,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;aAClC;iBAAM;gBACH,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;aAC1C;QACL,CAAC,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;QACnC,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,UAAU,EAAE,GAAG,MAAM,EAAC,CAAC,CAAA;SACrD;QACD,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAA;QACtB,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,IAAI,CACA,GAAG,SAKI;QAEP,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACrC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,kCAAkC;YAClC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAkD,CAAC,CAAC,MAAM,EAAE,CAAA;SACtG;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,SAAS,CACL,GAAG,SAKI;QAEP,aAAa;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAE3D,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,IAAI,CAAC,SAA4B;QACrC,MAAM,IAAI,GAAkB,EAAE,CAAA;QAE9B,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACzB,IAAI,YAAoB,CAAA;YACxB,IAAI,aAAa,GAA4B,EAAE,CAAA;YAC/C,IAAI,QAAQ,YAAY,KAAK,EAAE;gBAC3B,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAC1B,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;aAC9B;iBAAM;gBACH,YAAY,GAAG,QAAQ,CAAA;aAC1B;YAED,IAAI,SAAS,GAAG,IAAI,CAAA;YACpB,MAAM,mBAAmB,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACnD,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACxC,MAAM,KAAK,GAAG,KAAK,KAAK,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC3E,aAAa;gBACb,SAAS,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAA;YAC7E,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,QAAQ,CAAC,aAA4B;QACzC,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACjD,MAAM,IAAI,GAAG,aAAa,CAAC,YAAY,CAAC,CAAA;YAExC,IAAI,IAAI,YAAY,QAAQ,EAAE;gBAC1B,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;aAC9B;iBAAM;gBACH,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACvE;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AA5LD,kCA4LC"}

package/Database/Types.d.ts

@@ -110,8 +110,9 @@ export declare class WhereSubSelect extends WhereExpression {
     query: Query;
     constructor(column: string, operator: Operator, query: Query, boolean: Boolean);
 }
+export declare type RelationsTreeQuery = (query: EntityQuery<any>) => void;
 export interface RelationsTree {
-    [key: string]: RelationsTree | ((query: EntityQuery<any>) => void);
+    [key: string]: RelationsTree | RelationsTreeQuery;
 }
 export {};
 //# sourceMappingURL=Types.d.ts.map

package/Database/Types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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"}

package/Forms/Form.js

@@ -9,7 +9,7 @@ var Form_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Form = void 0;
 const Decorators_1 = require("./Decorators");
-const Container_1 = require("@Typetron/Container");
+const Container_1 = require("../Container");
 let Form = Form_1 = class Form {
     constructor() {
         this.errors = {};

package/Forms/Form.js.map

@@ -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"}
+{"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

@@ -11,14 +11,14 @@ export declare class Auth {
      * This is primarily used in websocket connections so we don't need to pass the auth token for each weboscket message
      */
     expiresAt: Date;
-    private savedUser;
+    private savedUser?;
     get authenticable(): typeof User;
     user<T extends User>(): Promise<T>;
     login(username: string, password: string): Promise<string>;
     loginById(id: ID): Promise<string>;
     loginUser(authenticable: User): Promise<string>;
     sign(id: ID, expiresAtTimestampInSeconds?: number): Promise<string>;
-    register(username: string, password: string): Promise<User>;
+    register<T extends User>(username: string, password: string): Promise<T>;
     verify(token: string): Promise<import("../../Encryption").JWToken<number>>;
     private set;
 }

package/Framework/Auth/Auth.d.ts.map

@@ -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"}
+{"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

@@ -37,6 +37,7 @@ let Auth = class Auth {
         if (!user || !await this.crypt.compare(password, user.password)) {
             throw new Error('Invalid credentials');
         }
+        delete this.savedUser;
         return this.sign(this.id = user.id);
     }
     loginById(id) {

package/Framework/Auth/Auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}

package/Framework/Config/AppConfig.d.ts

@@ -9,7 +9,10 @@ export declare class AppConfig extends BaseConfig<AppConfig> {
     middleware: Abstract<MiddlewareInterface>[];
     providers: Type<Provider>[];
     staticAssets?: {
-        [key: string]: string | string[];
-    };
+        url: string;
+        path: string;
+        basePath?: boolean;
+        indexFile?: string;
+    }[];
 }
 //# sourceMappingURL=AppConfig.d.ts.map

package/Framework/Config/AppConfig.d.ts.map

@@ -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"}
+{"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,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,CAAA;CACvF"}

package/Framework/Config/AppConfig.js

@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
 const BaseConfig_1 = require("./BaseConfig");
 class AppConfig extends BaseConfig_1.BaseConfig {
-    constructor() {
-        super(...arguments);
-        this.websocketsPort = 8001;
-    }
 }
 exports.AppConfig = AppConfig;
 //# sourceMappingURL=AppConfig.js.map

package/Framework/Config/AppConfig.js.map

@@ -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"}
+{"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/Config/DatabaseConfig.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseConfig = void 0;
 const BaseConfig_1 = require("./BaseConfig");
-const Drivers_1 = require("@Typetron/Database/Drivers");
+const Database_1 = require("@Typetron/Database");
 class DatabaseConfig extends BaseConfig_1.BaseConfig {
     constructor() {
         var _a;
@@ -11,8 +11,8 @@ class DatabaseConfig extends BaseConfig_1.BaseConfig {
         this.migrationsDirectory = 'migrations';
         this.driver = (_a = process.env.databaseDriver) !== null && _a !== void 0 ? _a : 'sqlite';
         this.drivers = {
-            sqlite: () => { var _a; return new Drivers_1.SqliteDriver((_a = process.env.database) !== null && _a !== void 0 ? _a : 'database.sqlite'); },
-            mysql: () => new Drivers_1.MysqlDriver({
+            sqlite: () => { var _a; return new Database_1.SqliteDriver((_a = process.env.database) !== null && _a !== void 0 ? _a : 'database.sqlite'); },
+            mysql: () => new Database_1.MysqlDriver({
                 host: process.env.databaseHost,
                 user: process.env.databaseUser,
                 password: process.env.databasePassword,

package/Framework/Config/DatabaseConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseConfig.js","sourceRoot":"","sources":["../../../Framework/Config/DatabaseConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,wDAAsE;AAGtE,MAAa,cAAe,SAAQ,uBAA0B;IAA9D;;;QACI,sBAAiB,GAAG,KAAK,CAAA;QAEzB,wBAAmB,GAAG,YAAY,CAAA;QAClC,WAAM,SAA0B,OAAO,CAAC,GAAG,CAAC,cAAuC,mCAAI,QAAQ,CAAA;QAE/F,YAAO,GAAyC;YAC5C,MAAM,EAAE,GAAG,EAAE,WAAC,OAAA,IAAI,sBAAY,OAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,iBAAiB,CAAC,CAAA,EAAA;YACzE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,qBAAW,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;gBACtC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;aACjC,CAAC;SACL,CAAA;IACL,CAAC;CAAA;AAfD,wCAeC"}
+{"version":3,"file":"DatabaseConfig.js","sourceRoot":"","sources":["../../../Framework/Config/DatabaseConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,iDAA8D;AAG9D,MAAa,cAAe,SAAQ,uBAA0B;IAA9D;;;QACI,sBAAiB,GAAG,KAAK,CAAA;QAEzB,wBAAmB,GAAG,YAAY,CAAA;QAClC,WAAM,SAA0B,OAAO,CAAC,GAAG,CAAC,cAAuC,mCAAI,QAAQ,CAAA;QAE/F,YAAO,GAAyC;YAC5C,MAAM,EAAE,GAAG,EAAE,WAAC,OAAA,IAAI,uBAAY,OAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,iBAAiB,CAAC,CAAA,EAAA;YACzE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,sBAAW,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;gBACtC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;aACjC,CAAC;SACL,CAAA;IACL,CAAC;CAAA;AAfD,wCAeC"}

package/Framework/Middleware/StaticAssetsMiddleware.d.ts

@@ -10,6 +10,6 @@ export declare class StaticAssetsMiddleware implements MiddlewareInterface {
     };
     handle(request: Request, next: RequestHandler): Promise<Response<any>>;
     loadStaticAsset(error: RouteNotFoundError, request: Request): Promise<Response>;
-    getExtension(string: string): string | undefined;
+    private getResponse;
 }
 //# sourceMappingURL=StaticAssetsMiddleware.d.ts.map

package/Framework/Middleware/StaticAssetsMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,qBACa,sBAAuB,YAAW,mBAAmB;IAG9D,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CASjC;IAEK,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc;IAW7C,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IA4BrF,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAOnD"}
+{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,qBACa,sBAAuB,YAAW,mBAAmB;IAG9D,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CASjC;IAEK,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc;IAW7C,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;YA4BvE,WAAW;CAM5B"}

package/Framework/Middleware/StaticAssetsMiddleware.js

@@ -1,10 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -15,6 +34,7 @@ const Router_1 = require("../../Router");
 const Storage_1 = require("../../Storage");
 const Http_1 = require("../../Router/Http");
 const Config_1 = require("../Config");
+const path = __importStar(require("path"));
 let StaticAssetsMiddleware = class StaticAssetsMiddleware {
     constructor() {
         this.mimeTypes = {
@@ -40,36 +60,34 @@ let StaticAssetsMiddleware = class StaticAssetsMiddleware {
         }
     }
     async loadStaticAsset(error, request) {
-        const assetsDirectories = this.appConfig.staticAssets;
-        for (const path in assetsDirectories) {
-            let directories = assetsDirectories[path];
-            if (typeof directories === 'string') {
-                directories = [directories];
+        var _a, _b;
+        const configs = (_a = this.appConfig.staticAssets) !== null && _a !== void 0 ? _a : [];
+        for (const config of configs) {
+            if (!request.uri.match(config.url)) {
+                continue;
             }
-            for (const directory of directories) {
-                const uri = path ? request.uri.replace(`/${path}`, '') : request.uri;
-                let realPath = directory + uri;
-                let extension = this.getExtension(uri);
-                if (!extension) {
-                    realPath += '/index.html';
-                    extension = 'html';
-                }
-                if (!await this.storage.exists(realPath)) {
-                    continue;
+            let realPath = path.join(config.path, request.uri);
+            let extension = path.extname(realPath).substring(1);
+            if (!extension) {
+                realPath = path.join(realPath, 'index.html');
+                extension = 'html';
+            }
+            if (!await this.storage.exists(realPath)) {
+                if (config.basePath) {
+                    const basePath = path.join(config.path, (_b = config.indexFile) !== null && _b !== void 0 ? _b : 'index.html');
+                    return this.getResponse(basePath);
                 }
-                const file = await this.storage.read(realPath);
-                const contentType = this.mimeTypes[extension || 'application/octet-stream'] || this.mimeTypes.txt;
-                return new Http_1.Response(file, Http_1.Http.Status.OK, { 'Content-type': contentType });
+                continue;
             }
+            return this.getResponse(realPath, extension);
         }
         throw error;
     }
-    getExtension(string) {
-        const parts = string.split('.');
-        if (parts.length === 1) {
-            return undefined;
-        }
-        return parts.pop();
+    async getResponse(filePath, extension) {
+        extension = extension !== null && extension !== void 0 ? extension : path.extname(filePath).substring(1);
+        const file = await this.storage.read(filePath);
+        const contentType = this.mimeTypes[extension || 'application/octet-stream'] || this.mimeTypes.txt;
+        return new Http_1.Response(file, Http_1.Http.Status.OK, { 'Content-type': contentType });
     }
 };
 __decorate([

package/Framework/Middleware/StaticAssetsMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,yCAAsF;AACtF,2CAAuC;AACvC,4CAA2D;AAC3D,sCAAqC;AAGrC,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAQI,cAAS,GAA4B;YACjC,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,WAAW;SACrB,CAAA;IAgDL,CAAC;IA9CG,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAoB;QAC/C,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,CAAA;SAC7B;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,OAAO,CAAC,MAAM,KAAK,WAAI,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,YAAY,2BAAkB,EAAE;gBAC3E,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aAC9C;YACD,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAyB,EAAE,OAAgB;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAA;QACrD,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE;YAClC,IAAI,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACjC,WAAW,GAAG,CAAC,WAAW,CAAC,CAAA;aAC9B;YACD,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;gBACjC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;gBACpE,IAAI,QAAQ,GAAG,SAAS,GAAG,GAAG,CAAA;gBAC9B,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;gBACtC,IAAI,CAAC,SAAS,EAAE;oBACZ,QAAQ,IAAI,aAAa,CAAA;oBACzB,SAAS,GAAG,MAAM,CAAA;iBACrB;gBAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBACtC,SAAQ;iBACX;gBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,0BAA0B,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;gBACjG,OAAO,IAAI,eAAQ,CAAC,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAC,cAAc,EAAE,WAAW,EAAC,CAAC,CAAA;aAC3E;SACJ;QAED,MAAM,KAAK,CAAA;IACf,CAAC;IAED,YAAY,CAAC,MAAc;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,SAAS,CAAA;SACnB;QACD,OAAO,KAAK,CAAC,GAAG,EAAE,CAAA;IACtB,CAAC;CACJ,CAAA;AA9DG;IADC,kBAAM,EAAE;8BACE,kBAAS;yDAAA;AAGpB;IADC,kBAAM,EAAE;8BACA,iBAAO;uDAAA;AANP,sBAAsB;IADlC,sBAAU,EAAE;GACA,sBAAsB,CAiElC;AAjEY,wDAAsB"}
+{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"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"}

package/Framework/Providers/WebsocketsProvider.d.ts.map

@@ -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"}
+{"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

@@ -41,14 +41,12 @@ class WebsocketsProvider extends Provider_1.Provider {
             compression: uWebSockets_js_1.DEDICATED_COMPRESSOR_3KB,
             open: (socket) => {
                 var _a;
-                const socketWrapper = new Websockets_1.WebSocket(socket);
-                socket.container = this.app.createChildContainer();
-                socket.container.set(Websockets_1.WebSocket, socketWrapper);
-                (_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
+                const socketWrapper = new Websockets_1.WebSocket(socket, this.app.createChildContainer());
+                (_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socketWrapper.connection.container, {});
             },
-            close: (socket) => {
+            close: async (socket) => {
                 var _a;
-                (_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
+                await ((_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {}));
             },
             /* For brevity we skip the other events (upgrade, open, ping, pong, close) */
             message: async (socket, message, isBinary) => {

package/Framework/Providers/WebsocketsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}

package/Framework/Resolvers/AuthResolver.d.ts.map

@@ -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"}
+{"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

@@ -4,17 +4,9 @@ exports.AuthResolver = void 0;
 const Container_1 = require("../../Container");
 const Auth_1 = require("../Auth");
 class AuthResolver extends Container_1.BaseResolver {
-    // constructor(container: Container) {
-    //     super(container);
-    //     this.setScopeToRequest();
-    // }
     async resolve(abstract, parameters) {
         return await this.container.get(Auth_1.Auth).user();
     }
-    // // tslint:disable-next-line:no-any
-    // canResolve<T extends Abstract<any>>(abstract: T): boolean {
-    //     return abstract.prototype instanceof User;
-    // }
     canResolve(abstract) {
         return abstract === Auth_1.AuthUserIdentifier;
     }

package/Framework/Resolvers/AuthResolver.js.map

@@ -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"}
+{"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

@@ -1,13 +1,16 @@
 import { WebSocket as uWebSocket } from 'uWebSockets.js';
+import { Container } from '@Typetron/Container';
 export * from './Handler';
 export * from './types';
 export declare class WebSocket {
     connection: uWebSocket;
     id?: number | string;
-    constructor(connection: uWebSocket);
+    constructor(connection: uWebSocket, container: Container);
     subscribe(topic: string): void;
-    publish(topic: string, event: string, body: any): void;
-    publishAndSend(topic: string, event: string, body: any): void;
-    send(event: string, body: any): void;
+    unsubscribe(topic: string): void;
+    reset(container?: Container): void;
+    publish(topic: string, event: string, body?: any): void;
+    publishAndSend(topic: string, event: string, body?: any): void;
+    send(event: string, body?: any): void;
 }
 //# sourceMappingURL=index.d.ts.map

package/Router/Websockets/index.d.ts.map

@@ -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"}
+{"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

@@ -15,12 +15,20 @@ const types_1 = require("./types");
 __exportStar(require("./Handler"), exports);
 __exportStar(require("./types"), exports);
 class WebSocket {
-    constructor(connection) {
+    constructor(connection, container) {
         this.connection = connection;
+        this.reset(container);
     }
     subscribe(topic) {
         this.connection.subscribe(topic);
     }
+    unsubscribe(topic) {
+        this.connection.unsubscribe(topic);
+    }
+    reset(container) {
+        this.connection.container = container || this.connection.container.parent.createChildContainer();
+        this.connection.container.set(WebSocket, this);
+    }
     // tslint:disable-next-line:no-any
     publish(topic, event, body) {
         const sentResponse = {

package/Router/Websockets/index.js.map

@@ -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"}
+{"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

@@ -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"}
+{"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"}