npm - bigal - Versions diffs - 10.4.0 → 10.4.2 - Mend

bigal 10.4.0 → 10.4.2

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 (48) hide show

package/CHANGELOG.md +9 -0
package/Entity.d.ts +2 -2
package/ReadonlyRepository.js +12 -9
package/ReadonlyRepository.js.map +1 -1
package/Repository.js +3 -2
package/Repository.js.map +1 -1
package/SqlHelper.js +8 -4
package/SqlHelper.js.map +1 -1
package/decorators/column.d.ts +2 -2
package/decorators/createDateColumn.d.ts +1 -1
package/decorators/primaryColumn.d.ts +2 -2
package/decorators/table.d.ts +1 -1
package/decorators/updateDateColumn.d.ts +1 -1
package/decorators/versionColumn.d.ts +1 -1
package/index.js +14 -10
package/index.js.map +1 -1
package/metadata/ColumnCollectionMetadata.js +27 -27
package/metadata/ColumnCollectionMetadata.js.map +1 -1
package/metadata/ColumnMetadata.d.ts +1 -1
package/metadata/ColumnModelMetadata.js +14 -14
package/metadata/ColumnModelMetadata.js.map +1 -1
package/metadata/ModelMetadata.d.ts +2 -2
package/metadata/ModelMetadata.js +14 -14
package/metadata/ModelMetadata.js.map +1 -1
package/package.json +17 -17
package/query/Comparer.d.ts +1 -1
package/query/CreateOptions.d.ts +3 -3
package/query/CreateUpdateOptions.d.ts +1 -1
package/query/DeleteOptions.d.ts +1 -1
package/query/OnConflictOptions.d.ts +2 -2
package/query/Sort.d.ts +6 -6
package/query/WhereQuery.d.ts +8 -8
package/types/CreateUpdateParams.d.ts +1 -1
package/types/EntityPrimitiveOrId.d.ts +1 -1
package/types/ExcludeEntityCollections.d.ts +1 -1
package/types/ExcludeFunctions.d.ts +1 -1
package/types/GetValueType.d.ts +1 -1
package/types/IncludeFunctions.d.ts +1 -1
package/types/IsValueOfType.d.ts +1 -1
package/types/OmitEntityCollections.d.ts +1 -1
package/types/OmitFunctions.d.ts +1 -1
package/types/PickAsType.d.ts +1 -1
package/types/PickByValueType.d.ts +1 -1
package/types/PickFunctions.d.ts +1 -1
package/types/Populated.d.ts +1 -1
package/types/QueryResult.d.ts +1 -1
package/types/QueryResultOptionalPopulated.d.ts +1 -1
package/types/QueryResultPopulated.d.ts +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,14 @@
 # Change Log
+## 10.4.2 - 2023-01-03
+- Update npms
+- Enable noUncheckedIndexedAccess compiler option
+## 10.4.1 - 2022-12-06
+- Update npms
 ## 10.4.0 - 2022-11-03
 - Fix string comparison where constraint with union values

package/Entity.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { CreateUpdateParams } from './types';
-export declare type EntityFieldValue = boolean[] | Date | number[] | Record<string, unknown> | string[] | boolean | number | string | unknown | null;
+export type EntityFieldValue = boolean[] | Date | number[] | Record<string, unknown> | string[] | boolean | number | string | unknown | null;
 export declare abstract class Entity {
     abstract id: unknown;
     static beforeCreate(values: CreateUpdateParams<Entity>): CreateUpdateParams<Entity> | Promise<CreateUpdateParams<Entity>>;
@@ -8,7 +8,7 @@ export declare abstract class Entity {
 export interface NotEntityBrand {
     _notEntityBrand: void;
 }
-export declare type NotEntity<T> = NotEntityBrand & T;
+export type NotEntity<T> = NotEntityBrand & T;
 export interface EntityStatic<T extends Entity> {
     beforeCreate?: (values: CreateUpdateParams<any>) => CreateUpdateParams<any> | Promise<CreateUpdateParams<any>>;
     beforeUpdate?: (values: CreateUpdateParams<any>) => CreateUpdateParams<any> | Promise<CreateUpdateParams<any>>;

package/ReadonlyRepository.js CHANGED Viewed

@@ -149,8 +149,9 @@ class ReadonlyRepository {
                     });
                     const pool = poolOverride || modelInstance._readonlyPool;
                     const results = await pool.query(query, params);
-                    if (results.rows && results.rows.length) {
-                        const result = modelInstance._buildInstance(results.rows[0]);
+                    const firstResult = lodash_1.default.first(results.rows);
+                    if (firstResult) {
+                        const result = modelInstance._buildInstance(firstResult);
                         if (populates.length) {
                             await modelInstance.populateFields([result], populates);
                         }
@@ -397,7 +398,8 @@ class ReadonlyRepository {
                     });
                     const pool = poolOverride || modelInstance._readonlyPool;
                     const result = await pool.query(query, params);
-                    const originalValue = result.rows[0].count;
+                    const firstResult = lodash_1.default.first(result.rows);
+                    const originalValue = firstResult ? firstResult.count : 0;
                     return await resolve(Number(originalValue));
                 }
                 catch (ex) {
@@ -602,8 +604,10 @@ class ReadonlyRepository {
             pool: populate.pool,
         });
         if (entities.length === 1) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            entities[0][populate.propertyName] = populateResults;
+            for (const entity of entities) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                entity[populate.propertyName] = populateResults;
+            }
         }
         else {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -650,10 +654,9 @@ class ReadonlyRepository {
             const entityId = mapRecord[column.via];
             const populatedId = mapRecord[relatedModelColumn.via];
             populateIds.add(populatedId);
-            if (!populateIdsByEntityId[entityId]) {
-                populateIdsByEntityId[entityId] = [];
-            }
-            populateIdsByEntityId[entityId].push(populatedId);
+            const entityPopulateIds = populateIdsByEntityId[entityId] || [];
+            entityPopulateIds.push(populatedId);
+            populateIdsByEntityId[entityId] = entityPopulateIds;
         }
         const populateWhere = lodash_1.default.merge({
             [populateModelPrimaryKeyPropertyName]: Array.from(populateIds),

package/ReadonlyRepository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ReadonlyRepository.js","sourceRoot":"./","sources":["ReadonlyRepository.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AASvB,2CAA8E;AAuB9E,MAAa,kBAAkB;IAe7B,YAAmB,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,8BAA8B,EAAyB;QAJ3G,qBAAgB,GAAa,EAAE,CAAC;QAEhC,mBAAc,GAAa,EAAE,CAAC;QAGtC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,YAAY,IAAI,IAAI,CAAC;QAC1C,IAAI,CAAC,+BAA+B,GAAG,8BAA8B,CAAC;QAEtE,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,OAAO,EAAE;YAC1C,IAAK,MAA6B,CAAC,IAAI,KAAK,OAAO,EAAE;gBACnD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACjD;iBAAM,IAAK,MAA6B,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC5D,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aAC/C;SACF;IACH,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACI,OAAO,CAAgG,OAA0C,EAAE;QACxJ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC;QAE5D,IAAI,MAA+B,CAAC;QACpC,IAAI,KAAK,GAAkB,EAAE,CAAC;QAC9B,IAAI,IAAI,GAAkC,IAAI,CAAC;QAC/C,IAAI,YAA8B,CAAC;QACnC,oIAAoI;QACpI,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChD,IAAI,eAAe,GAAG,KAAK,CAAC;YAE5B,QAAQ,IAAI,EAAE;gBACZ,KAAK,QAAQ;oBACX,IAAI,KAAK,EAAE;wBACT,MAAM,GAAG,IAAI,GAAG,CAAC,KAAiB,CAAC,CAAC;qBACrC;oBAED,MAAM;gBACR,KAAK,OAAO;oBACV,KAAK,GAAG,KAAsB,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,GAAG,KAA+B,CAAC;oBACvC,MAAM;gBACR,KAAK,MAAM;oBACT,YAAY,GAAG,KAAa,CAAC;oBAC7B,MAAM;gBACR;oBACE,MAAM,GAAG,SAAS,CAAC;oBACnB,KAAK,GAAG,IAAqB,CAAC;oBAC9B,IAAI,GAAG,IAAI,CAAC;oBACZ,eAAe,GAAG,IAAI,CAAC;oBACvB,MAAM;aACT;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM;aACP;SACF;QAED,MAAM,SAAS,GAAe,EAAE,CAAC;QAOjC,MAAM,iBAAiB,GAAuB,EAAE,CAAC;QACjD,MAAM,KAAK,GAAiB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1E,4DAA4D;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC;QAE3B,OAAO;YACL;;;eAGG;YACH,KAAK,CAAC,KAAoB;gBACxB,KAAK,GAAG,KAAK,CAAC;gBAEd,OAAO,IAAI,CAAC;YACd,CAAC;YACD;;;;;;;;;eASG;YACH,QAAQ,CACN,YAAuB,EACvB,OAA0D;gBAE1D,qGAAqG;gBACrG,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;oBACvC,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE;wBAChD,IAAK,MAA8B,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,KAAK,YAAY,EAAE;4BACjF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;yBACjC;qBACF;iBACF;gBAED,SAAS,CAAC,IAAI,CAAC;oBACb,YAAY;oBACZ,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,MAAM,EAAE,OAAO,EAAE,MAAM;oBACvB,IAAI,EAAE,OAAO,EAAE,IAAI;oBACnB,IAAI,EAAE,OAAO,EAAE,IAAI;oBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,YAAY;iBACpC,CAAC,CAAC;gBAEH,OAAO,IAAgH,CAAC;YAC1H,CAAC;YACD;;;eAGG;YACH,IAAI,CAAC,KAAe;gBAClB,IAAI,KAAK,EAAE;oBACT,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC5D;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YACD,4BAA4B,CAAwE,aAAwB;gBAC1H,OAAO,IAAuE,CAAC;YACjF,CAAC;YACD,qBAAqB,CACnB,YAAuB,EACvB,KAAa;gBAEb,iBAAiB,CAAC,IAAI,CAAC;oBACrB,YAAY;oBACZ,KAAK;iBACN,CAAC,CAAC;gBAEH,OAAO,IAAqF,CAAC;YAC/F,CAAC;YACD,KAAK,CAAC,IAAI,CACR,OAAmE,EACnE,MAAkE;gBAElE,IAAI;oBACF,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBACrB,OAAO,MAAM,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;qBACtF;oBAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,mCAAuB,EAAC;wBAChD,8BAA8B,EAAE,aAAa,CAAC,+BAA+B;wBAC7E,KAAK,EAAE,aAAa,CAAC,KAAK;wBAC1B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAgE,CAAC,CAAC,CAAC,SAAS;wBAC/G,KAAK;wBACL,KAAK;wBACL,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,CAAC;qBACR,CAAC,CAAC;oBAEH,MAAM,IAAI,GAAG,YAAY,IAAI,aAAa,CAAC,aAAa,CAAC;oBACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAA0B,KAAK,EAAE,MAAM,CAAC,CAAC;oBACzE,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;wBACvC,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAE7D,IAAI,SAAS,CAAC,MAAM,EAAE;4BACpB,MAAM,aAAa,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;yBACzD;wBAED,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;4BAChD,6DAA6D;4BAC7D,6CAA6C;4BAC7C,MAAM,CAAC,gBAAgB,CAAC,YAAgC,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC;yBACpF;wBAED,OAAO,MAAM,OAAO,CAAC,MAA4B,CAAC,CAAC;qBACpD;oBAED,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;iBAC5B;gBAAC,OAAO,EAAE,EAAE;oBACX,MAAM,cAAc,GAAG,EAAW,CAAC;oBACnC,IAAI,cAAc,CAAC,KAAK,EAAE;wBACxB,cAAc,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE,EAAE,CAAC;qBAC5C;yBAAM;wBACL,cAAc,CAAC,KAAK,GAAG,KAAK,CAAC;qBAC9B;oBAED,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;iBAC/B;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACI,IAAI,CAAgG,OAAuC,EAAE;QAClJ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAC;QAEzD,IAAI,MAA+B,CAAC;QACpC,IAAI,KAAK,GAAkB,EAAE,CAAC;QAC9B,IAAI,IAAI,GAAkC,IAAI,CAAC;QAC/C,IAAI,IAAI,GAAkB,IAAI,CAAC;QAC/B,IAAI,KAAK,GAAkB,IAAI,CAAC;QAChC,IAAI,YAA8B,CAAC;QACnC,iIAAiI;QACjI,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChD,IAAI,eAAe,GAAG,KAAK,CAAC;YAE5B,QAAQ,IAAI,EAAE;gBACZ,KAAK,QAAQ;oBACX,IAAI,KAAK,EAAE;wBACT,MAAM,GAAG,IAAI,GAAG,CAAC,KAAiB,CAAC,CAAC;qBACrC;oBAED,MAAM;gBACR,KAAK,OAAO;oBACV,KAAK,GAAG,KAAsB,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,GAAG,KAA+B,CAAC;oBACvC,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,GAAG,KAAe,CAAC;oBACvB,MAAM;gBACR,KAAK,OAAO;oBACV,KAAK,GAAG,KAAe,CAAC;oBACxB,MAAM;gBACR,KAAK,MAAM;oBACT,YAAY,GAAG,KAAa,CAAC;oBAC7B,MAAM;gBACR;oBACE,MAAM,GAAG,SAAS,CAAC;oBACnB,KAAK,GAAG,IAAqB,CAAC;oBAC9B,IAAI,GAAG,IAAI,CAAC;oBACZ,IAAI,GAAG,IAAI,CAAC;oBACZ,KAAK,GAAG,IAAI,CAAC;oBACb,eAAe,GAAG,IAAI,CAAC;oBACvB,MAAM;aACT;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM;aACP;SACF;QAED,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5D,4DAA4D;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC;QAE3B,OAAO;YACL;;;eAGG;YACH,KAAK,CAAC,KAAoB;gBACxB,KAAK,GAAG,KAAK,CAAC;gBAEd,OAAO,IAAI,CAAC;YACd,CAAC;YACD;;;;;;;;;eASG;YACH,QAAQ,CAIN,YAAuB,EAAE,OAA0D;gBACnF,qGAAqG;gBACrG,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;oBACvC,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE;wBAChD,IAAK,MAA8B,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,KAAK,YAAY,EAAE;4BACjF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;yBACjC;qBACF;iBACF;gBAED,SAAS,CAAC,IAAI,CAAC;oBACb,YAAY;oBACZ,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,MAAM,EAAE,OAAO,EAAE,MAAM;oBACvB,IAAI,EAAE,OAAO,EAAE,IAAI;oBACnB,IAAI,EAAE,OAAO,EAAE,IAAI;oBACnB,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,YAAY;iBACpC,CAAC,CAAC;gBAEH,OAAO,IAAwH,CAAC;YAClI,CAAC;YACD;;;eAGG;YACH,IAAI,CAAC,KAAe;gBAClB,IAAI,KAAK,EAAE;oBACT,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC5D;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YACD;;;eAGG;YACH,KAAK,CAAC,KAAa;gBACjB,KAAK,GAAG,KAAK,CAAC;gBAEd,OAAO,IAAI,CAAC;YACd,CAAC;YACD;;;eAGG;YACH,IAAI,CAAC,KAAa;gBAChB,IAAI,GAAG,KAAK,CAAC;gBAEb,OAAO,IAAI,CAAC;YACd,CAAC;YACD,4BAA4B,CAAwE,aAAwB;gBAC1H,OAAO,IAA+E,CAAC;YACzF,CAAC;YACD;;;;eAIG;YACH,QAAQ,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,aAAa,GAAG,EAAE,EAAmB;gBAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAClF,CAAC;YACD,KAAK,CAAC,IAAI,CACR,OAA8D,EAC9D,MAAkE;gBAElE,IAAI;oBACF,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBACrB,OAAO,MAAM,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;qBACtF;oBAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,mCAAuB,EAAC;wBAChD,8BAA8B,EAAE,aAAa,CAAC,+BAA+B;wBAC7E,KAAK,EAAE,aAAa,CAAC,KAAK;wBAC1B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAgE,CAAC,CAAC,CAAC,SAAS;wBAC/G,KAAK;wBACL,KAAK;wBACL,IAAI,EAAE,IAAI,IAAI,CAAC;wBACf,KAAK,EAAE,KAAK,IAAI,CAAC;qBAClB,CAAC,CAAC;oBAEH,MAAM,IAAI,GAAG,YAAY,IAAI,aAAa,CAAC,aAAa,CAAC;oBACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAA0B,KAAK,EAAE,MAAM,CAAC,CAAC;oBACzE,MAAM,QAAQ,GAAG,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBAE7D,IAAI,SAAS,CAAC,MAAM,EAAE;wBACpB,MAAM,aAAa,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;qBACzD;oBAED,OAAO,MAAM,OAAO,CAAC,QAAgC,CAAC,CAAC;iBACxD;gBAAC,OAAO,EAAE,EAAE;oBACX,MAAM,cAAc,GAAG,EAAW,CAAC;oBACnC,IAAI,cAAc,CAAC,KAAK,EAAE;wBACxB,cAAc,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE,EAAE,CAAC;qBAC5C;yBAAM;wBACL,cAAc,CAAC,KAAK,GAAG,KAAK,CAAC;qBAC9B;oBAED,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;iBAC/B;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAqC,EAAE;QAClD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC;QAE1D,IAAI,KAAK,GAAkB,EAAE,CAAC;QAC9B,IAAI,YAA8B,CAAC;QACnC,oIAAoI;QACpI,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChD,IAAI,eAAe,GAAG,KAAK,CAAC;YAE5B,QAAQ,IAAI,EAAE;gBACZ,KAAK,OAAO;oBACV,KAAK,GAAG,KAAsB,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM;oBACT,YAAY,GAAG,KAAa,CAAC;oBAC7B,MAAM;gBACR;oBACE,KAAK,GAAG,IAAqB,CAAC;oBAC9B,eAAe,GAAG,IAAI,CAAC;oBACvB,MAAM;aACT;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM;aACP;SACF;QAED,4DAA4D;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC;QAE3B,OAAO;YACL;;;eAGG;YACH,KAAK,CAAC,KAAoB;gBACxB,6CAA6C;gBAC7C,KAAK,GAAG,KAAK,CAAC;gBAEd,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,IAAI,CACR,OAA2D,EAC3D,MAAkE;gBAElE,IAAI;oBACF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,kCAAsB,EAAC;wBAC/C,8BAA8B,EAAE,aAAa,CAAC,+BAA+B;wBAC7E,KAAK,EAAE,aAAa,CAAC,KAAK;wBAC1B,KAAK;qBACN,CAAC,CAAC;oBAEH,MAAM,IAAI,GAAG,YAAY,IAAI,aAAa,CAAC,aAAa,CAAC;oBACzD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAoB,KAAK,EAAE,MAAM,CAAC,CAAC;oBAElE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC3C,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;iBAC7C;gBAAC,OAAO,EAAE,EAAE;oBACX,MAAM,cAAc,GAAG,EAAW,CAAC;oBACnC,IAAI,cAAc,CAAC,KAAK,EAAE;wBACxB,cAAc,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE,EAAE,CAAC;qBAC5C;yBAAM;wBACL,cAAc,CAAC,KAAK,GAAG,KAAK,CAAC;qBAC9B;oBAED,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;iBAC/B;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IAES,cAAc,CAAC,GAA4B;QACnD,IAAI,gBAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO,GAAG,CAAC;SACZ;QAED,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAE7B,4GAA4G;QAC5G,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACxC,MAAM,aAAa,GAAG,GAAG,CAAC,IAA4B,CAAuC,CAAC;YAC9F,IAAI,CAAC,gBAAC,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;gBAChE,IAAI;oBACF,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;oBACpC,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,aAAa,EAAE;wBAC3D,6DAA6D;wBAC7D,qDAAqD;wBACrD,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;qBACxB;iBACF;gBAAC,OAAO,EAAE,EAAE;oBACX,qCAAqC;iBACtC;aACF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,EAAE;YACtC,MAAM,aAAa,GAAG,GAAG,CAAC,IAA4B,CAAuC,CAAC;YAC9F,IAAI,CAAC,gBAAC,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;gBAChE,IAAI;oBACF,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;oBACpC,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,aAAa,EAAE;wBAC3D,MAAM,UAAU,GAAG,gBAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBACtC,IAAI,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;4BACpC,6DAA6D;4BAC7D,qDAAqD;4BACrD,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;yBAC7B;qBACF;iBACF;gBAAC,OAAO,EAAE,EAAE;oBACX,qCAAqC;iBACtC;aACF;SACF;QAED,OAAO,QAAqC,CAAC;IAC/C,CAAC;IAES,eAAe,CAAC,IAA+B;QACvD,IAAI,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACjB,OAAO,EAAE,CAAC;SACX;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,CAAC;IAES,sBAAsB,CAAC,KAA6B;QAC5D,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,IAAI,KAAK,EAAE;YACT,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,KAAK,MAAM,IAAI,IAAI,KAAiB,EAAE;oBACpC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACrC,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,EAA4D,CAAC;oBAC7F,MAAM,CAAC,IAAI,CAAC;wBACV,YAAY;wBACZ,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBACzC,CAAC,CAAC;iBACJ;aACF;iBAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACnC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACrC,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,EAA4D,CAAC;oBAC7F,MAAM,CAAC,IAAI,CAAC;wBACV,YAAY;wBACZ,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBACzC,CAAC,CAAC;iBACJ;aACF;iBAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC5B,KAAK,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC9D,IAAI,UAAU,GAAG,KAAK,CAAC;oBACvB,MAAM,KAAK,GAAG,UAA6B,CAAC;oBAC5C,IAAI,KAAK,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,EAAE;wBACvD,UAAU,GAAG,IAAI,CAAC;qBACnB;oBAED,MAAM,CAAC,IAAI,CAAC;wBACV,YAAY,EAAE,YAAsE;wBACpF,UAAU;qBACX,CAAC,CAAC;iBACJ;aACF;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,oCAAoC;IAC1B,KAAK,CAAC,cAAc,CAAC,QAA0B,EAAE,SAAqB;QAC9E,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,OAAO;SACR;QAED,MAAM,eAAe,GAAoB,EAAE,CAAC;QAC5C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACvE,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,YAAY,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,wBAAwB,CAAC,CAAC;aACxG;YAED,MAAM,WAAW,GAAG,MAA6B,CAAC;YAClD,MAAM,gBAAgB,GAAG,MAAkC,CAAC;YAC5D,IAAI,WAAW,CAAC,KAAK,EAAE;gBACrB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;aACvF;iBAAM,IAAI,gBAAgB,CAAC,UAAU,EAAE;gBACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC3G,IAAI,CAAC,kBAAkB,EAAE;oBACvB,MAAM,IAAI,KAAK,CAAC,6DAA6D,gBAAgB,CAAC,UAAU,UAAU,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;iBAC7J;gBAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;gBACxC,IAAI,CAAC,gBAAgB,EAAE;oBACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,YAAY,wCAAwC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;iBACtI;gBAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;gBAC9C,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;oBAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC,YAAoC,CAAqB,CAAC;oBAC7F,IAAI,gBAAC,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;wBACf,MAAM,IAAI,KAAK,CAAC,gBAAgB,gBAAgB,CAAC,YAAY,6BAA6B,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;qBAC7G;oBAED,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBACnB;gBAED,IAAI,gBAAgB,CAAC,OAAO,EAAE;oBAC5B,MAAM,6BAA6B,GAAG,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAChF,IAAI,CAAC,6BAA6B,EAAE;wBAClC,MAAM,IAAI,KAAK,CACb,sBAAsB,gBAAgB,CAAC,UAAU,iBAAiB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,YAAY,wCAAwC,gBAAgB,CAAC,UAAU,EAAE,CAC5K,CAAC;qBACH;oBAED,eAAe,CAAC,IAAI,CAClB,IAAI,CAAC,0BAA0B,CAC7B,QAAQ,EACR,gBAAgB,CAAC,YAAuB,EACxC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EACrB,6BAA6B,CAAC,YAAuB,EACrD,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,CACnB,CACF,CAAC;iBACH;qBAAM;oBACL,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,YAAuB,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC,CAAC;iBACjL;aACF;SACF;QAED,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SACpC;IACH,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,QAA0B,EAAE,QAAkB,EAAE,MAA2B;QACjH,MAAM,kBAAkB,GAAG,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sDAAsD,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;SACrI;QAED,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,YAAY,wCAAwC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;SACxJ;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,YAA6C,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;QAChD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC7B,yGAAyG;YACzG,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAqB,CAAC;YAC5D,IAAI,UAAU,EAAE;gBACd,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAC7B;SACF;QAED,MAAM,aAAa,GAAuB;YACxC,CAAC,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;YACjF,GAAG,QAAQ,CAAC,KAAK;SAClB,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC;YACpD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACA,CAAC,CAAC;QACvB,8DAA8D;QAC9D,MAAM,mBAAmB,GAAG,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAiC,CAAC;QAE7I,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC7B,iJAAiJ;YACjJ,MAAM,CAAC,YAAY,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAQ,CAAC,CAAC;SACzE;IACH,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,QAA0B,EAC1B,sBAA4C,EAC5C,SAA6B,EAC7B,QAAkB,EAClB,MAAgC,EAChC,kBAA+C;QAE/C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YACnF,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,YAAY,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,MAAM,CAAC,GAAG,oCAAoC,CAAC,CAAC;SAC1I;QAED,MAAM,aAAa,GAAG;YACpB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS;YACvB,GAAG,QAAQ,CAAC,KAAK;SAClB,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC;YACpD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACA,CAAC,CAAC;QAEvB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,8DAA8D;YAC7D,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAA6C,CAAS,GAAG,eAAe,CAAC;SAChG;aAAM;YACL,8DAA8D;YAC9D,MAAM,yBAAyB,GAAG,gBAAC,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,CAA2B,CAAC;YACnG,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;gBAC7B,sGAAsG;gBACtG,MAAM,EAAE,GAAG,MAAM,CAAC,sBAAsB,CAAQ,CAAC;gBACjD,8GAA8G;gBAC9G,MAAM,CAAC,QAAQ,CAAC,YAA6C,CAAC,GAAG,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;aACtG;SACF;IACH,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACtC,QAA0B,EAC1B,sBAA4C,EAC5C,SAA6B,EAC7B,mCAAyD,EACzD,QAAkB,EAClB,MAAgC,EAChC,kBAA+C;QAE/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,0EAA0E,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;SACrI;QAED,8DAA8D;QAC9D,MAAM,iBAAiB,GAAG,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAA6B,CAAC;QACzH,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,uDAAuD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;SAC1I;QAED,6BAA6B;QAC7B,IAAI,kBAAwD,CAAC;QAC7D,KAAK,MAAM,mBAAmB,IAAI,kBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE;YAClE,MAAM,EAAE,OAAO,EAAE,GAAG,mBAA+C,CAAC;YACpE,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;gBACrE,kBAAkB,GAAG,mBAA+C,CAAC;gBACrE,MAAM;aACP;SACF;QAED,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,sEAAsE,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;SACzJ;QAED,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC;YAC9C,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,CAAC;YAC5C,KAAK,EAAE;gBACL,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS;aACP;YAClB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAC;QACzC,MAAM,qBAAqB,GAAmC,EAAE,CAAC;QACjE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAc,CAAC;YACpD,MAAM,WAAW,GAAG,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAc,CAAC;YACnE,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC7B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE;gBACpC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;aACtC;YAED,qBAAqB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACnD;QAED,MAAM,aAAa,GAAG,gBAAC,CAAC,KAAK,CAC3B;YACE,CAAC,mCAAmC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;SAC/D,EACD,QAAQ,CAAC,KAAK,CACf,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC;YACpD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACA,CAAC,CAAC;QACvB,8DAA8D;QAC9D,MAAM,mBAAmB,GAAG,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,mCAAmC,CAA8B,CAAC;QAEvH,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC7B,MAAM,cAAc,GAAG,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,sBAAsB,CAAyB,CAAC;YACxE,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnE,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE;gBACrC,MAAM,aAAa,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;gBAC9C,IAAI,aAAa,EAAE;oBACjB,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACpC;aACF;YAED,8DAA8D;YAC7D,MAAM,CAAC,QAAQ,CAAC,YAA6C,CAAS,GAAG,cAAc,CAAC;SAC1F;IACH,CAAC;CACF;AAnzBD,gDAmzBC"}
1	+ {"version":3,"file":"ReadonlyRepository.js","sourceRoot":"./","sources":["ReadonlyRepository.ts"],"names":[],"mappings":"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"}

package/Repository.js CHANGED Viewed

@@ -57,8 +57,9 @@ class Repository extends ReadonlyRepository_1.ReadonlyRepository {
             if (lodash_1.default.isArray(values)) {
                 return this._buildInstances(results.rows);
             }
-            if (results.rows && results.rows.length) {
-                return this._buildInstance(results.rows[0]);
+            const firstResult = lodash_1.default.first(results.rows);
+            if (firstResult) {
+                return this._buildInstance(firstResult);
             }
             throw new Error('Unknown error getting created rows back from the database');
         }

package/Repository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Repository.js","sourceRoot":"./","sources":["Repository.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAcvB,6DAA0D;AAC1D,2CAAwG;AAGxG,MAAa,UAA6B,SAAQ,uCAAqB;IA+BrE;;;;;;;;OAQG;IACI,KAAK,CAAC,MAAM,CAAC,MAAuD,EAAE,OAA0B;QACrG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,CAAC;SACpD;QAED,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvC,OAAO,EAAE,CAAC;SACX;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;YAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACzB,6CAA6C;gBAC7C,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;aACnI;iBAAM;gBACL,6CAA6C;gBAC7C,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;aAChD;SACF;QAED,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,IAAI,YAAoF,CAAC;QACzF,IAAI,OAAO,EAAE;YACX,IAAK,OAA8B,CAAC,aAAa,KAAK,KAAK,EAAE;gBAC3D,aAAa,GAAG,KAAK,CAAC;aACvB;iBAAM,IAAK,OAA2B,CAAC,YAAY,EAAE;gBACpD,YAAY,GAAI,OAA2B,CAAC,YAAY,CAAC;aAC1D;SACF;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,mCAAuB,EAAC;YAChD,8BAA8B,EAAE,IAAI,CAAC,+BAA+B;YACpE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM;YACN,aAAa;YACb,YAAY;YACZ,UAAU,EAAE,OAAO,EAAE,UAAU;SAChC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAA0B,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/E,IAAI,aAAa,EAAE;YACjB,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACrB,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC3C;YAED,~~IAAI~~,~~OAAO~~,CAAC,~~IAAI~~,~~IAAI~~,OAAO,CAAC,IAAI,CAAC,~~MAAM~~,EAAE;~~gBACvC~~,OAAO,IAAI,CAAC,cAAc,CAAC,~~OAAO~~,CAAC,~~IAAI,~~CAAC~~,CAAC,CAAC,CAAC,CAAC~~;~~aAC7C~~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~~AA1PD~~,~~gCA0PC~~"}
1	+ {"version":3,"file":"Repository.js","sourceRoot":"./","sources":["Repository.ts"],"names":[],"mappings":"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"}

package/SqlHelper.js CHANGED Viewed

@@ -238,7 +238,11 @@ function getInsertQueryAndParams({ repositoriesByModelNameLowered, model, values
                     value += '::jsonb';
                 }
             }
-            valueCollections[entityIndex].push(value);
+            const valuesForEntityIndex = valueCollections[entityIndex];
+            if (!valuesForEntityIndex) {
+                throw new Error('Error trying to get insert values for entity index');
+            }
+            valuesForEntityIndex.push(value);
         }
     }
     query += ') VALUES ';
@@ -839,7 +843,7 @@ function buildWhere({ repositoriesByModelNameLowered, model, propertyName, compa
                     // TODO: Validate that when columnType is null, it is expected to return existing constraints
                 }
                 if (orConstraints.length === 1) {
-                    return orConstraints[0];
+                    return orConstraints[0] ?? '';
                 }
                 if (isNegated) {
                     return orConstraints.join(' AND ');
@@ -894,7 +898,7 @@ function buildOrOperatorStatement({ repositoriesByModelNameLowered, model, isNeg
         orClauses.push(`(${orClause})`);
     }
     if (orClauses.length === 1) {
-        return orClauses[0];
+        return orClauses[0] ?? '';
     }
     if (isNegated) {
         return orClauses.join(' AND ');
@@ -941,7 +945,7 @@ function buildLikeOperatorStatement({ model, propertyName, isNegated, value, par
                 }
             }
             if (orConstraints.length === 1) {
-                return orConstraints[0];
+                return orConstraints[0] ?? '';
             }
             if (isNegated) {
                 return orConstraints.join(' AND ');

package/SqlHelper.js.map CHANGED Viewed

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

package/decorators/column.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import type { ColumnCollectionOptions } from './ColumnCollectionOptions';
 import type { ColumnModelOptions } from './ColumnModelOptions';
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ColumnOptions = ColumnCollectionOptions | ColumnModelOptions | ColumnTypeOptions;
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ColumnOptions = ColumnCollectionOptions | ColumnModelOptions | ColumnTypeOptions;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function column(options?: ColumnOptions): ReturnFunctionType;
 export declare function column(dbColumnName: string, options?: ColumnOptions): ReturnFunctionType;
 export {};

package/decorators/createDateColumn.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function createDateColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function createDateColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/decorators/primaryColumn.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { ColumnModelOptions } from './ColumnModelOptions';
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ColumnOptions = ColumnModelOptions | ColumnTypeOptions;
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ColumnOptions = ColumnModelOptions | ColumnTypeOptions;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function primaryColumn(options?: ColumnOptions): ReturnFunctionType;
 export declare function primaryColumn(dbColumnName: string, options?: ColumnOptions): ReturnFunctionType;
 export {};

package/decorators/table.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { TableOptions } from './TableOptions';
-declare type ReturnFunctionType = (object: any) => void;
+type ReturnFunctionType = (object: any) => void;
 export declare function table(options?: TableOptions): ReturnFunctionType;
 export declare function table(dbName: string, options: TableOptions): ReturnFunctionType;
 export {};

package/decorators/updateDateColumn.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function updateDateColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function updateDateColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/decorators/versionColumn.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function versionColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function versionColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/index.js CHANGED Viewed

@@ -74,14 +74,17 @@ function initialize({ models, pool, readonlyPool = pool, connections = {}, expos
     // Add dictionary to quickly find a column by propertyName, for applying ColumnModifierMetadata records
     const columnsByPropertyNameForModel = {};
     for (const column of metadataStorage.columns) {
-        columnsByPropertyNameForModel[column.target] = columnsByPropertyNameForModel[column.target] || {};
-        columnsByPropertyNameForModel[column.target][column.propertyName] = column;
+        const columns = columnsByPropertyNameForModel[column.target] || {};
+        columns[column.propertyName] = column;
+        columnsByPropertyNameForModel[column.target] = columns;
     }
     const columnModifiersByPropertyNameForModel = {};
     for (const columnModifier of metadataStorage.columnModifiers) {
-        columnModifiersByPropertyNameForModel[columnModifier.target] = columnModifiersByPropertyNameForModel[columnModifier.target] || {};
-        columnModifiersByPropertyNameForModel[columnModifier.target][columnModifier.propertyName] = columnModifiersByPropertyNameForModel[columnModifier.target][columnModifier.propertyName] || [];
-        columnModifiersByPropertyNameForModel[columnModifier.target][columnModifier.propertyName].push(columnModifier);
+        const columnModifiersForModel = columnModifiersByPropertyNameForModel[columnModifier.target] || {};
+        const columnModifiersForProperty = columnModifiersForModel[columnModifier.propertyName] || [];
+        columnModifiersForProperty.push(columnModifier);
+        columnModifiersForModel[columnModifier.propertyName] = columnModifiersForProperty;
+        columnModifiersByPropertyNameForModel[columnModifier.target] = columnModifiersForModel;
     }
     // Aggregate columns from inherited classes
     // NOTE: Inherited @columns will be replaced if found on a child class. Column modifiers, however, are additive.
@@ -90,7 +93,7 @@ function initialize({ models, pool, readonlyPool = pool, connections = {}, expos
         let modelMetadata;
         let inheritedColumnsByPropertyName = {};
         const inheritedColumnModifiersByPropertyName = {};
-        for (const inheritedClass of inheritanceTreesByModelName[model.name]) {
+        for (const inheritedClass of inheritanceTreesByModelName[model.name] ?? []) {
             modelMetadata = modelMetadataByModelName[inheritedClass.name] || modelMetadata;
             const columnsByPropertyName = columnsByPropertyNameForModel[inheritedClass.name] || {};
             inheritedColumnsByPropertyName = {
@@ -119,9 +122,9 @@ function initialize({ models, pool, readonlyPool = pool, connections = {}, expos
     }
     // Process all column modifiers to augment any @column definitions
     for (const [modelName, columnModifiersByPropertyName] of Object.entries(columnModifiersByPropertyNameForModel)) {
-        columnsByPropertyNameForModel[modelName] = columnsByPropertyNameForModel[modelName] || {};
+        const columnsByPropertyName = columnsByPropertyNameForModel[modelName] || {};
         for (const [propertyName, columnModifiers] of Object.entries(columnModifiersByPropertyName)) {
-            const column = columnsByPropertyNameForModel[modelName][propertyName];
+            const column = columnsByPropertyName[propertyName];
             if (column) {
                 for (const columnModifier of columnModifiers) {
                     Object.assign(column, lodash_1.default.omit(columnModifier, ['target', 'name', 'propertyName', 'type', 'model']));
@@ -145,14 +148,14 @@ function initialize({ models, pool, readonlyPool = pool, connections = {}, expos
                     throw new Error(`Missing column type for ${modelName}#${propertyName}`);
                 }
                 if (columnDetails.model) {
-                    columnsByPropertyNameForModel[modelName][propertyName] = new metadata_1.ColumnModelMetadata({
+                    columnsByPropertyName[propertyName] = new metadata_1.ColumnModelMetadata({
                         ...columnDetails,
                         name: columnDetails.name,
                         model: columnDetails.model,
                     });
                 }
                 else if (columnDetails.type) {
-                    columnsByPropertyNameForModel[modelName][propertyName] = new metadata_1.ColumnTypeMetadata({
+                    columnsByPropertyName[propertyName] = new metadata_1.ColumnTypeMetadata({
                         ...columnDetails,
                         name: columnDetails.name,
                         type: columnDetails.type,
@@ -160,6 +163,7 @@ function initialize({ models, pool, readonlyPool = pool, connections = {}, expos
                 }
             }
         }
+        columnsByPropertyNameForModel[modelName] = columnsByPropertyName;
     }
     const repositoriesByModelNameLowered = {};
     const repositoriesByModelName = {};

package/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"./","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAOvB,yCAAwG;AACxG,6DAA0D;AAC1D,6CAA0C;AAE1C,+CAA6B;AAC7B,2CAAyB;AACzB,wDAAsC;AACtC,gDAA8B;AAC9B,6CAA2B;AAC3B,uDAAqC;AACrC,+CAA6B;AAC7B,0CAAwB;AAiBxB,uFAAuF;AACvF,SAAS,kBAAkB,CAAC,KAAiB;IAC3C,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAErB,SAAS,wBAAwB,CAAC,YAAwB;QACxD,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,YAAY,CAAe,CAAC;QAChE,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;YACpD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpB,wBAAwB,CAAC,KAAK,CAAC,CAAC;SACjC;IACH,CAAC;IAED,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAEhC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,EAAE,WAAW,GAAG,EAAE,EAAE,MAAM,EAAqB;IAC3G,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;KAC9F;IAED,MAAM,2BAA2B,GAAiC,EAAE,CAAC;IACrE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,kHAAkH;QAClH,4BAA4B;QAC5B,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACpE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC7B;IAED,kEAAkE;IAClE,MAAM,eAAe,GAAG,IAAA,6BAAkB,GAAE,CAAC;IAE7C,MAAM,wBAAwB,GAA0C,EAAE,CAAC;IAC3E,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1C,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;KAC9C;IAGD,uGAAuG;IACvG,MAAM,6BAA6B,GAA0C,EAAE,CAAC;IAChF,KAAK,MAAM,MAAM,IAAI,eAAe,CAAC,OAAO,EAAE;QAC5C,~~6BAA6B,CAAC,~~MAAM,~~CAAC~~,~~MAAM,CAAC,~~GAAG,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;~~QAClG~~,~~6BAA6B~~,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,~~YAAY~~,CAAC,GAAG,~~MAAM~~,CAAC;~~KAC5E~~;IAGD,MAAM,qCAAqC,GAAkD,EAAE,CAAC;IAChG,KAAK,MAAM,cAAc,IAAI,eAAe,CAAC,eAAe,EAAE;QAC5D,~~qCAAqC,CAAC,cAAc,CAAC,~~MAAM,~~CAAC~~,GAAG,qCAAqC,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;~~QAClI~~,~~qCAAqC~~,CAAC,cAAc,CAAC,~~MAAM~~,CAAC,~~CAAC~~,~~cAAc~~,CAAC,~~YAAY~~,CAAC,~~GAAG~~,~~qCAAqC,~~CAAC,cAAc,CAAC,~~MAAM,~~CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,~~IAAI~~,~~EAAE~~,CAAC;~~QAC5L~~,qCAAqC,CAAC,cAAc,CAAC,MAAM,CAAC,~~CAAC~~,~~cAAc~~,CAAC~~,YAAY,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC~~;~~KAChH~~;IAED,2CAA2C;IAC3C,gHAAgH;IAChH,mEAAmE;IACnE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,aAAgD,CAAC;QACrD,IAAI,8BAA8B,GAA0B,EAAE,CAAC;QAC/D,MAAM,sCAAsC,GAAkC,EAAE,CAAC;QACjF,KAAK,MAAM,cAAc,IAAI,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;~~YACpE~~,aAAa,GAAG,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC;YAC/E,MAAM,qBAAqB,GAAG,6BAA6B,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAEvF,8BAA8B,GAAG;gBAC/B,GAAG,8BAA8B;gBACjC,GAAG,qBAAqB;aACzB,CAAC;YAEF,iGAAiG;YACjG,KAAK,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE;gBAClE,OAAO,sCAAsC,CAAC,YAAY,CAAC,CAAC;aAC7D;YAED,MAAM,6BAA6B,GAAG,qCAAqC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvG,KAAK,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE;gBAC3F,sCAAsC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,sCAAsC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;aACtJ;SACF;QAED,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SAC7D;QAED,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,wBAAa,CAAC;YACvD,GAAG,aAAa;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QACH,6BAA6B,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,8BAA8B,CAAC;QAC3E,qCAAqC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,sCAAsC,CAAC;KAC5F;IAED,kEAAkE;IAClE,KAAK,MAAM,CAAC,SAAS,EAAE,6BAA6B,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qCAAqC,CAAC,EAAE;QAC9G,~~6BAA6B~~,~~CAAC~~,~~SAAS,CAAC,~~GAAG,6BAA6B,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;~~QAC1F~~,KAAK,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE;YAC3F,MAAM,MAAM,GAAG,~~6BAA6B~~,CAAC,~~SAAS,CAAC,CAAC,~~YAAY,CAAC,CAAC;~~YACtE~~,IAAI,MAAM,EAAE;gBACV,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC5C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;iBACpG;aACF;iBAAM;gBACL,IAAI,aAAa,GAA2B;oBAC1C,MAAM,EAAE,SAAS;oBACjB,YAAY;iBACb,CAAC;gBACF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC5C,aAAa,GAAG;wBACd,GAAG,aAAa;wBAChB,GAAG,cAAc;qBAClB,CAAC;iBACH;gBAED,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;oBACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,IAAI,YAAY,EAAE,CAAC,CAAC;iBACzE;gBAED,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;oBAC/C,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,IAAI,YAAY,EAAE,CAAC,CAAC;iBACzE;gBAED,IAAI,aAAa,CAAC,KAAK,EAAE;oBACvB,~~6BAA6B~~,CAAC,~~SAAS,CAAC,CAAC,~~YAAY,CAAC,GAAG,IAAI,8BAAmB,CAAC;~~wBAC/E~~,GAAG,aAAa;wBAChB,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,KAAK,EAAE,aAAa,CAAC,KAAK;qBAC3B,CAAC,CAAC;iBACJ;qBAAM,IAAI,aAAa,CAAC,IAAI,EAAE;oBAC7B,~~6BAA6B~~,CAAC,~~SAAS,CAAC,CAAC,~~YAAY,CAAC,GAAG,IAAI,6BAAkB,CAAC;~~wBAC9E~~,GAAG,aAAa;wBAChB,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,IAAI,EAAE,aAAa,CAAC,IAAI;qBACzB,CAAC,CAAC;iBACJ;aACF;SACF;~~KACF~~;IAED,MAAM,8BAA8B,GAAsE,EAAE,CAAC;IAC7G,MAAM,uBAAuB,GAAsE,EAAE,CAAC;IAEtG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,KAAK,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;SAC5D;QAED,MAAM,qBAAqB,GAAG,6BAA6B,CAAC,SAAS,CAAC,CAAC;QACvE,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,2DAA2D,SAAS,EAAE,CAAC,CAAC;SACzF;QAED,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAErD,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,iBAAiB,GAAG,YAAY,CAAC;QAErC,IAAI,KAAK,CAAC,UAAU,EAAE;YACpB,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,CAAC,UAAU,iBAAiB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;aAC9F;YAED,SAAS,GAAG,eAAe,CAAC,IAAI,IAAI,IAAI,CAAC;YACzC,iBAAiB,GAAG,eAAe,CAAC,YAAY,IAAI,SAAS,CAAC;SAC/D;QAED,IAAI,UAA2D,CAAC;QAChE,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,UAAU,GAAG,IAAI,uCAAkB,CAAC;gBAClC,aAAa,EAAE,KAAK;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,8BAA8B;gBAC9B,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,iBAAiB;aAChC,CAAC,CAAC;YAEH,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC;YACtE,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;SAClD;aAAM;YACL,UAAU,GAAG,IAAI,uBAAU,CAAC;gBAC1B,aAAa,EAAE,KAAK;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,8BAA8B;gBAC9B,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,iBAAiB;aAChC,CAAC,CAAC;YAEH,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC;YACtE,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;SAClD;QAED,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;SAC3B;KACF;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC;~~AAxLD~~,~~gCAwLC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"./","sources":["index.ts"],"names":[],"mappings":"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"}

package/metadata/ColumnCollectionMetadata.js CHANGED Viewed

@@ -3,6 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnCollectionMetadata = void 0;
 const ColumnBaseMetadata_1 = require("./ColumnBaseMetadata");
 class ColumnCollectionMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
+    /**
+     * Type of the items in the collection
+     */
+    get collection() {
+        if (this._collectionString) {
+            return this._collectionString;
+        }
+        if (!this._collectionFn) {
+            throw new Error(`Unable to determine collection type for ${this.target}#${this.propertyName}`);
+        }
+        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
+        this._collectionString = this._collectionFn();
+        return this._collectionString;
+    }
+    /**
+     * Name of the junction table for multi-multi associations
+     */
+    get through() {
+        if (this._throughString) {
+            return this._throughString;
+        }
+        if (this._throughFn) {
+            this._throughString = this._throughFn();
+            return this._throughString;
+        }
+        return undefined;
+    }
     constructor({ target, //
     name, propertyName, required, insert, update, primary, createDate, updateDate, version, collection, via, through, }) {
         super({
@@ -31,33 +58,6 @@ class ColumnCollectionMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
             this._throughFn = through;
         }
     }
-    /**
-     * Type of the items in the collection
-     */
-    get collection() {
-        if (this._collectionString) {
-            return this._collectionString;
-        }
-        if (!this._collectionFn) {
-            throw new Error(`Unable to determine collection type for ${this.target}#${this.propertyName}`);
-        }
-        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
-        this._collectionString = this._collectionFn();
-        return this._collectionString;
-    }
-    /**
-     * Name of the junction table for multi-multi associations
-     */
-    get through() {
-        if (this._throughString) {
-            return this._throughString;
-        }
-        if (this._throughFn) {
-            this._throughString = this._throughFn();
-            return this._throughString;
-        }
-        return undefined;
-    }
 }
 exports.ColumnCollectionMetadata = ColumnCollectionMetadata;
 //# sourceMappingURL=ColumnCollectionMetadata.js.map

package/metadata/ColumnCollectionMetadata.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ColumnCollectionMetadata.js","sourceRoot":"./","sources":["metadata/ColumnCollectionMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAiB1D,MAAa,wBAAyB,SAAQ,uCAAkB;~~IA+C9D~~,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,OAAO,GACyB;QAChC,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;SACrC;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;SACjC;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;SAC/B;aAAM,IAAI,OAAO,EAAE;YAClB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;SAC3B;IACH,CAAC;~~IA/ED;;OAEG~~;IACH,IAAW,UAAU;QACnB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAChG;QAED,8EAA8E;QAC9E,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAOD;;OAEG;IACH,IAAW,OAAO;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CA4CF;AAzFD,4DAyFC"}
1	+ {"version":3,"file":"ColumnCollectionMetadata.js","sourceRoot":"./","sources":["metadata/ColumnCollectionMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAiB1D,MAAa,wBAAyB,SAAQ,uCAAkB;IAS9D;;OAEG;IACH,IAAW,UAAU;QACnB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAChG;QAED,8EAA8E;QAC9E,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAOD;;OAEG;IACH,IAAW,OAAO;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,OAAO,GACyB;QAChC,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;SACrC;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;SACjC;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;SAC/B;aAAM,IAAI,OAAO,EAAE;YAClB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;SAC3B;IACH,CAAC;CACF;AAzFD,4DAyFC"}

package/metadata/ColumnMetadata.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { ColumnCollectionMetadata } from './ColumnCollectionMetadata';
 import type { ColumnModelMetadata } from './ColumnModelMetadata';
 import type { ColumnTypeMetadata } from './ColumnTypeMetadata';
-export declare type ColumnMetadata = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
+export type ColumnMetadata = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;

package/metadata/ColumnModelMetadata.js CHANGED Viewed

@@ -3,6 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnModelMetadata = void 0;
 const ColumnBaseMetadata_1 = require("./ColumnBaseMetadata");
 class ColumnModelMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
+    /**
+     * Name of the model represented by this column id
+     */
+    get model() {
+        if (this._modelString) {
+            return this._modelString;
+        }
+        if (!this._modelFn) {
+            throw new Error(`Unable to determine model type for ${this.target}#${this.propertyName}`);
+        }
+        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
+        this._modelString = this._modelFn();
+        return this._modelString;
+    }
     constructor({ target, //
     name, propertyName, required, insert, update, primary, createDate, updateDate, version, model, }) {
         super({
@@ -24,20 +38,6 @@ class ColumnModelMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
             this._modelFn = model;
         }
     }
-    /**
-     * Name of the model represented by this column id
-     */
-    get model() {
-        if (this._modelString) {
-            return this._modelString;
-        }
-        if (!this._modelFn) {
-            throw new Error(`Unable to determine model type for ${this.target}#${this.propertyName}`);
-        }
-        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
-        this._modelString = this._modelFn();
-        return this._modelString;
-    }
 }
 exports.ColumnModelMetadata = ColumnModelMetadata;
 //# sourceMappingURL=ColumnModelMetadata.js.map

package/metadata/ColumnModelMetadata.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ColumnModelMetadata.js","sourceRoot":"./","sources":["metadata/ColumnModelMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAS1D,MAAa,mBAAoB,SAAQ,uCAAkB;~~IAsBzD~~,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,KAAK,GACsB;QAC3B,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACvB;IACH,CAAC;~~IAhDD;;OAEG~~;IACH,IAAW,KAAK;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3F;QAED,8EAA8E;QAC9E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CAkCF;AAtDD,kDAsDC"}
1	+ {"version":3,"file":"ColumnModelMetadata.js","sourceRoot":"./","sources":["metadata/ColumnModelMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAS1D,MAAa,mBAAoB,SAAQ,uCAAkB;IAKzD;;OAEG;IACH,IAAW,KAAK;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3F;QAED,8EAA8E;QAC9E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,KAAK,GACsB;QAC3B,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACvB;IACH,CAAC;CACF;AAtDD,kDAsDC"}

package/metadata/ModelMetadata.d.ts CHANGED Viewed

@@ -2,8 +2,8 @@ import type { Entity, EntityStatic } from '../Entity';
 import type { ColumnCollectionMetadata } from './ColumnCollectionMetadata';
 import type { ColumnModelMetadata } from './ColumnModelMetadata';
 import type { ColumnTypeMetadata } from './ColumnTypeMetadata';
-declare type Column = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
-declare type ColumnByStringId = Record<string, Column>;
+type Column = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
+type ColumnByStringId = Record<string, Column>;
 export interface ModelMetadataOptions<T extends Entity> {
     name: string;
     type: EntityStatic<T>;

package/metadata/ModelMetadata.js CHANGED Viewed

@@ -26,20 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelMetadata = void 0;
 const _ = __importStar(require("lodash"));
 class ModelMetadata {
-    constructor({ name, //
-    type, connection, tableName, readonly = false, }) {
-        this._columns = [];
-        this._createDateColumns = [];
-        this._updateDateColumns = [];
-        this._versionDateColumns = [];
-        this.columnsByColumnName = {};
-        this.columnsByPropertyName = {};
-        this.name = name;
-        this.type = type;
-        this.connection = connection;
-        this.tableName = tableName || _.snakeCase(name);
-        this.readonly = readonly;
-    }
     set columns(columns) {
         this._columns = columns;
         this.columnsByColumnName = {};
@@ -76,6 +62,20 @@ class ModelMetadata {
     get versionColumns() {
         return this._versionDateColumns;
     }
+    constructor({ name, //
+    type, connection, tableName, readonly = false, }) {
+        this._columns = [];
+        this._createDateColumns = [];
+        this._updateDateColumns = [];
+        this._versionDateColumns = [];
+        this.columnsByColumnName = {};
+        this.columnsByPropertyName = {};
+        this.name = name;
+        this.type = type;
+        this.connection = connection;
+        this.tableName = tableName || _.snakeCase(name);
+        this.readonly = readonly;
+    }
 }
 exports.ModelMetadata = ModelMetadata;
 //# sourceMappingURL=ModelMetadata.js.map

package/metadata/ModelMetadata.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModelMetadata.js","sourceRoot":"./","sources":["metadata/ModelMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAmB5B,MAAa,aAAa;~~IAwExB~~,YAAmB,EACjB,IAAI,EAAE,EAAE;IACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GAAG,KAAK,GACQ;QA7ElB,aAAQ,GAAsB,EAAE,CAAC;QAIjC,uBAAkB,GAAa,EAAE,CAAC;QAElC,uBAAkB,GAAa,EAAE,CAAC;QAElC,wBAAmB,GAAa,EAAE,CAAC;QA2DpC,wBAAmB,GAAqB,EAAE,CAAC;QAE3C,0BAAqB,GAAqB,EAAE,CAAC;QASlD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAzED,IAAW,OAAO,CAAC,OAA0B;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YAC/C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEzD,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;~~CA6BF~~;AArFD,sCAqFC"}
1	+ {"version":3,"file":"ModelMetadata.js","sourceRoot":"./","sources":["metadata/ModelMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAmB5B,MAAa,aAAa;IAWxB,IAAW,OAAO,CAAC,OAA0B;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YAC/C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEzD,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAgBD,YAAmB,EACjB,IAAI,EAAE,EAAE;IACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GAAG,KAAK,GACQ;QA7ElB,aAAQ,GAAsB,EAAE,CAAC;QAIjC,uBAAkB,GAAa,EAAE,CAAC;QAElC,uBAAkB,GAAa,EAAE,CAAC;QAElC,wBAAmB,GAAa,EAAE,CAAC;QA2DpC,wBAAmB,GAAqB,EAAE,CAAC;QAE3C,0BAAqB,GAAqB,EAAE,CAAC;QASlD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AArFD,sCAqFC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "10.4.0",
+  "version": "10.4.2",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,42 +19,42 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.187",
+    "@types/lodash": "^4.14.191",
     "@types/node": ">=14",
-    "@types/pg": "^8.6.5",
+    "@types/pg": "^8.6.6",
     "lodash": "^4.17.21",
     "pg": "^8.8.0",
-    "postgres-pool": "^6.0.6"
+    "postgres-pool": "^6.0.8"
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "chai": "^4.3.6",
-    "eslint": "^8.26.0",
+    "@types/chai": "^4.3.4",
+    "@types/mocha": "10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
+    "chai": "^4.3.7",
+    "eslint": "^8.31.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.6.2",
+    "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-mocha": "10.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-security": "^1.5.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.1.0",
     "markdownlint-cli": "^0.32.2",
-    "mocha": "^10.1.0",
+    "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
     "strict-event-emitter-types": "^2.0.0",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.4"
   },
   "scripts": {
     "check:types": "tsc -p tsconfig.lint.json --noEmit",

package/query/Comparer.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export ~~declare~~ type Comparer = '!' \| '<' \| '<=' \| '>' \| '>=' \| 'contains' \| 'endsWith' \| 'like' \| 'or' \| 'startsWith';
1	+ export type Comparer = '!' \| '<' \| '<=' \| '>' \| '>=' \| 'contains' \| 'endsWith' \| 'like' \| 'or' \| 'startsWith';

package/query/CreateOptions.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import type { OmitEntityCollections, OmitFunctions } from '../types';
 import type { DoNotReturnRecords } from './DoNotReturnRecords';
 import type { OnConflictOptions } from './OnConflictOptions';
 import type { ReturnSelect } from './ReturnSelect';
-declare type CreateOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictOptions<T, K> & Partial<DoNotReturnRecords | ReturnSelect<T>>;
-declare type CreateOptionalOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = Partial<OnConflictOptions<T, K>> & (DoNotReturnRecords | ReturnSelect<T>);
-export declare type CreateOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = CreateOnConflictOptions<T, K> | CreateOptionalOnConflictOptions<T, K>;
+type CreateOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictOptions<T, K> & Partial<DoNotReturnRecords | ReturnSelect<T>>;
+type CreateOptionalOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = Partial<OnConflictOptions<T, K>> & (DoNotReturnRecords | ReturnSelect<T>);
+export type CreateOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = CreateOnConflictOptions<T, K> | CreateOptionalOnConflictOptions<T, K>;
 export {};

package/query/CreateUpdateOptions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { Entity } from '../Entity';
 import type { DoNotReturnRecords } from './DoNotReturnRecords';
 import type { ReturnSelect } from './ReturnSelect';
-export declare type CreateUpdateOptions<T extends Entity> = DoNotReturnRecords | ReturnSelect<T>;
+export type CreateUpdateOptions<T extends Entity> = DoNotReturnRecords | ReturnSelect<T>;

package/query/DeleteOptions.d.ts CHANGED Viewed

@@ -8,5 +8,5 @@ interface ReturnRecords<T extends Entity, K extends keyof T> {
     returnRecords: true;
     returnSelect?: (K & string & keyof OmitFunctions<OmitEntityCollections<T>>)[];
 }
-export declare type DeleteOptions<T extends Entity, K extends keyof T = keyof T> = ReturnRecords<T, K> | ReturnSelect<T, K>;
+export type DeleteOptions<T extends Entity, K extends keyof T = keyof T> = ReturnRecords<T, K> | ReturnSelect<T, K>;
 export {};

package/query/OnConflictOptions.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { Entity } from '../Entity';
 import type { OmitEntityCollections, OmitFunctions } from '../types';
 import type { WhereQuery } from './WhereQuery';
-declare type OnConflictTargets<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = K[] | {
+type OnConflictTargets<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = K[] | {
     columns: K[];
     where: WhereQuery<T>;
 };
@@ -21,5 +21,5 @@ export interface OnConflictMergeOptions<T extends Entity, K extends string & key
         };
     };
 }
-export declare type OnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictIgnoreOptions<T, K> | OnConflictMergeOptions<T, K>;
+export type OnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictIgnoreOptions<T, K> | OnConflictMergeOptions<T, K>;
 export {};

package/query/Sort.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
 import type { Entity } from '../Entity';
 import type { ExcludeFunctions, OmitEntityCollections, OmitFunctions } from '../types';
-export declare type SortString<T extends Entity> = `${string & keyof OmitFunctions<OmitEntityCollections<T>>} ASC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} asc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} DESC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} desc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>}`;
-declare type ValidateMultipleSorts<T extends Entity, TNextSortPart extends string, TPreviouslyValidatedSortString extends string, TSortString extends string> = TNextSortPart extends `, ${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TNextSortPart extends `${infer TValidatedSortPart}${TRestSortPart}` ? `${TPreviouslyValidatedSortString}${TValidatedSortPart}` : never, TSortString> : `${TPreviouslyValidatedSortString}, ${SortString<T>}`;
-export declare type MultipleSortString<T extends Entity, TSortString extends string = string> = TSortString extends `${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TSortString extends `${infer TPreviouslyValidatedSortString}${TRestSortPart}` ? TPreviouslyValidatedSortString : never, TSortString> : SortString<T>;
-export declare type SortObjectValue = -1 | 'asc' | 'desc' | 1;
-export declare type SortObject<T extends Entity> = {
+export type SortString<T extends Entity> = `${string & keyof OmitFunctions<OmitEntityCollections<T>>} ASC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} asc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} DESC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} desc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>}`;
+type ValidateMultipleSorts<T extends Entity, TNextSortPart extends string, TPreviouslyValidatedSortString extends string, TSortString extends string> = TNextSortPart extends `, ${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TNextSortPart extends `${infer TValidatedSortPart}${TRestSortPart}` ? `${TPreviouslyValidatedSortString}${TValidatedSortPart}` : never, TSortString> : `${TPreviouslyValidatedSortString}, ${SortString<T>}`;
+export type MultipleSortString<T extends Entity, TSortString extends string = string> = TSortString extends `${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TSortString extends `${infer TPreviouslyValidatedSortString}${TRestSortPart}` ? TPreviouslyValidatedSortString : never, TSortString> : SortString<T>;
+export type SortObjectValue = -1 | 'asc' | 'desc' | 1;
+export type SortObject<T extends Entity> = {
     [K in keyof T as ExcludeFunctions<OmitEntityCollections<T>, K>]?: SortObjectValue;
 };
-export declare type Sort<T extends Entity> = MultipleSortString<T> | SortObject<T>;
+export type Sort<T extends Entity> = MultipleSortString<T> | SortObject<T>;
 export interface OrderBy<T extends Entity> {
     propertyName: string & keyof OmitFunctions<OmitEntityCollections<T>>;
     descending?: boolean;

package/query/WhereQuery.d.ts CHANGED Viewed

@@ -1,19 +1,19 @@
 import type { Entity, NotEntityBrand } from '../Entity';
 import type { ExcludeEntityCollections, ExcludeFunctions } from '../types';
-declare type ExcludeUndefined<T> = Exclude<T, undefined>;
-export declare type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
-export declare type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
-export declare type StringConstraint<TValue extends string> = {
+type ExcludeUndefined<T> = Exclude<T, undefined>;
+export type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
+export type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
+export type StringConstraint<TValue extends string> = {
     [P in 'contains' | 'endsWith' | 'like' | 'startsWith']?: LiteralValues<ExcludeUndefined<TValue>>;
 };
-export declare type NumberOrDateConstraint<TValue extends Date | number> = {
+export type NumberOrDateConstraint<TValue extends Date | number> = {
     [P in '<' | '<=' | '>' | '>=']?: LiteralValues<ExcludeUndefined<TValue>>;
 };
-export declare type NegatableConstraint<TValue> = TValue | {
+export type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
-export declare type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraint<TValue> | WhereClauseValue<TValue>> : NegatableConstraint<WhereClauseValue<TValue>>;
-export declare type WhereQuery<T extends Entity> = {
+export type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends string ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraint<TValue> | WhereClauseValue<TValue>> : NegatableConstraint<WhereClauseValue<TValue>>;
+export type WhereQuery<T extends Entity> = {
     [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<ExcludeUndefined<U>> : NegatableConstraint<LiteralValues<ExcludeUndefined<T[K]>>> | WhereQueryStatement<ExcludeUndefined<T[K]>>;
 } & {
     or?: WhereQuery<T>[];

package/types/CreateUpdateParams.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import type { ExcludeFunctions } from './ExcludeFunctions';
 /**
  * Changes all Entity value properties to Primitive (string|number) | Pick<Entity, 'id'>
  */
-export declare type CreateUpdateParams<T extends Entity> = {
+export type CreateUpdateParams<T extends Entity> = {
     [K in keyof T as ExcludeEntityCollections<NonNullable<T[K]>, ExcludeFunctions<T[K], K>>]?: T[K] extends NotEntityBrand | undefined ? T[K] : Extract<T[K], Entity> extends undefined ? T[K] : Exclude<T[K], Entity> | Pick<Extract<T[K], Entity>, 'id'>;
 };

package/types/EntityPrimitiveOrId.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import type { Entity } from '../Entity';
-export declare type EntityPrimitiveOrId<T> = T extends [] ? T extends (infer U)[] ? EntityPrimitiveOrId<U>[] : T : Extract<NonNullable<T>, Entity> extends undefined ? T : Exclude<NonNullable<T>, Entity> | Pick<Extract<NonNullable<T>, Entity>, 'id'>;
+export type EntityPrimitiveOrId<T> = T extends [] ? T extends (infer U)[] ? EntityPrimitiveOrId<U>[] : T : Extract<NonNullable<T>, Entity> extends undefined ? T : Exclude<NonNullable<T>, Entity> | Pick<Extract<NonNullable<T>, Entity>, 'id'>;

package/types/ExcludeEntityCollections.d.ts CHANGED Viewed

@@ -2,4 +2,4 @@ import type { Entity, NotEntityBrand } from '../Entity';
 /**
  * Removes all entity collection properties. To be used as a re-map key function
  */
-export declare type ExcludeEntityCollections<T, K extends PropertyKey> = T extends NotEntityBrand[] | undefined ? K : T extends Entity[] | undefined ? never : K;
+export type ExcludeEntityCollections<T, K extends PropertyKey> = T extends NotEntityBrand[] | undefined ? K : T extends Entity[] | undefined ? never : K;

package/types/ExcludeFunctions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 /**
  * Removes all functions and entity collection properties. To be used as a re-map key function
  */
-export declare type ExcludeFunctions<T, K extends PropertyKey> = T extends Function ? never : K;
+export type ExcludeFunctions<T, K extends PropertyKey> = T extends Function ? never : K;

package/types/GetValueType.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export ~~declare~~ type GetValueType<T, TValueType> = T extends TValueType[] ? T extends (infer U)[] ? Extract<U, TValueType> : never : T extends TValueType ? T : never;
1	+ export type GetValueType<T, TValueType> = T extends TValueType[] ? T extends (infer U)[] ? Extract<U, TValueType> : never : T extends TValueType ? T : never;

package/types/IncludeFunctions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 /**
  * Returns the key name if the property type is a function
  */
-export declare type IncludeFunctions<T, K extends PropertyKey> = T extends Function ? K : never;
+export type IncludeFunctions<T, K extends PropertyKey> = T extends Function ? K : never;

package/types/IsValueOfType.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export ~~declare~~ type IsValueOfType<T, K extends PropertyKey, TValueType> = T extends TValueType \| TValueType[] \| undefined ? K : never;
1	+ export type IsValueOfType<T, K extends PropertyKey, TValueType> = T extends TValueType \| TValueType[] \| undefined ? K : never;

package/types/OmitEntityCollections.d.ts CHANGED Viewed

@@ -2,6 +2,6 @@ import type { ExcludeEntityCollections } from './ExcludeEntityCollections';
 /**
  * Removes all entity collection properties
  */
-export declare type OmitEntityCollections<T> = {
+export type OmitEntityCollections<T> = {
     [K in keyof T as ExcludeEntityCollections<T[K], K>]: T[K];
 };

package/types/OmitFunctions.d.ts CHANGED Viewed

@@ -2,6 +2,6 @@ import type { ExcludeFunctions } from './ExcludeFunctions';
 /**
  * Removes all functions
  */
-export declare type OmitFunctions<T> = {
+export type OmitFunctions<T> = {
     [K in keyof T as ExcludeFunctions<T[K], K>]: T[K];
 };

package/types/PickAsType.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-export declare type PickAsType<T, K extends keyof T, TValue> = {
+export type PickAsType<T, K extends keyof T, TValue> = {
     [P in K]: Extract<T[P], TValue>;
 };

package/types/PickByValueType.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { GetValueType } from './GetValueType';
 import type { IsValueOfType } from './IsValueOfType';
-export declare type PickByValueType<T, TValueType> = {
+export type PickByValueType<T, TValueType> = {
     [K in keyof T as IsValueOfType<T[K], K, TValueType>]: GetValueType<T[K], TValueType>;
 };

package/types/PickFunctions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { IncludeFunctions } from './IncludeFunctions';
-export declare type PickFunctions<T> = {
+export type PickFunctions<T> = {
     [K in keyof T as IncludeFunctions<T[K], K>]: T[K];
 };

package/types/Populated.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Removes primitives from specified properties and make non-optional. Allow singular Entity properties to be null.
  */
-export declare type Populated<T extends Entity, K extends keyof T, TPropertyType extends Entity, TPropertyKeys extends keyof TPropertyType> = {
+export type Populated<T extends Entity, K extends keyof T, TPropertyType extends Entity, TPropertyKeys extends keyof TPropertyType> = {
     [P in K]-?: Extract<T[P], Entity | Entity[]> extends Entity ? undefined extends T[P] ? QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>> | null : QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>> : QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>>[];
 };

package/types/QueryResult.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import type { ExcludeEntityCollections } from './ExcludeEntityCollections';
  * Changes all properties with Entity values to Primitive (string|number). Removes any properties that with values
  * of Entity arrays
  */
-export declare type QueryResult<T extends Entity> = Extract<{
+export type QueryResult<T extends Entity> = Extract<{
     [K in keyof T as ExcludeEntityCollections<NonNullable<T[K]>, K>]: T[K] extends NotEntityBrand | undefined ? T[K] : Exclude<T[K], Entity>;
 }, T>;

package/types/QueryResultOptionalPopulated.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Allows a QueryResult type with specific properties optionally populated. If the property is populated, only the id property is needed
  */
-export declare type QueryResultOptionalPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
+export type QueryResultOptionalPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
     [P in K]-?: T[P] extends [] ? undefined extends T[P] ? EntityPrimitiveOrId<T[P]> | null : EntityPrimitiveOrId<T[P]> : EntityPrimitiveOrId<T[P]>;
 };

package/types/QueryResultPopulated.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Allows a QueryResult type with specific populated properties
  */
-export declare type QueryResultPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
+export type QueryResultPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
     [P in K]-?: Extract<T[P], Entity | Entity[]> extends Entity ? undefined extends T[P] ? QueryResult<GetValueType<T[P], Entity>> | null : QueryResult<GetValueType<T[P], Entity>> : QueryResult<GetValueType<T[P], Entity>>[];
 };