npm - @entity-access/entity-access - Versions diffs - 1.0.547 → 1.1.1 - Mend

@entity-access/entity-access 1.0.547 → 1.1.1

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

package/README.md +34 -43
package/dist/compiler/QueryCompiler.d.ts +4 -4
package/dist/compiler/QueryCompiler.d.ts.map +1 -1
package/dist/compiler/QueryCompiler.js.map +1 -1
package/dist/drivers/sql-server/SqlServerDriver.d.ts.map +1 -1
package/dist/drivers/sql-server/SqlServerDriver.js +3 -2
package/dist/drivers/sql-server/SqlServerDriver.js.map +1 -1
package/dist/model/EntityQuery.d.ts +14 -11
package/dist/model/EntityQuery.d.ts.map +1 -1
package/dist/model/EntityQuery.js +69 -3
package/dist/model/EntityQuery.js.map +1 -1
package/dist/model/EntitySource.d.ts +3 -2
package/dist/model/EntitySource.d.ts.map +1 -1
package/dist/model/EntitySource.js +3 -3
package/dist/model/EntitySource.js.map +1 -1
package/dist/model/IFilterWithParameter.d.ts +32 -17
package/dist/model/IFilterWithParameter.d.ts.map +1 -1
package/dist/model/changes/ChangeEntry.js +1 -1
package/dist/model/changes/ChangeEntry.js.map +1 -1
package/dist/query/parser/ArrowToExpression.d.ts +2 -2
package/dist/query/parser/ArrowToExpression.d.ts.map +1 -1
package/dist/query/parser/ArrowToExpression.js +49 -29
package/dist/query/parser/ArrowToExpression.js.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/workflows/WorkflowStorage.js +20 -20
package/dist/workflows/WorkflowStorage.js.map +1 -1
package/package.json +1 -1
package/src/compiler/QueryCompiler.ts +4 -4
package/src/drivers/sql-server/SqlServerDriver.ts +3 -3
package/src/model/EntityQuery.ts +88 -15
package/src/model/EntitySource.ts +7 -5
package/src/model/IFilterWithParameter.ts +32 -17
package/src/model/changes/ChangeEntry.ts +1 -1
package/src/query/parser/ArrowToExpression.ts +51 -33
package/src/workflows/WorkflowStorage.ts +20 -20

package/dist/model/EntityQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAoB,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAmB,cAAc,EAAyC,aAAa,EAAE,iBAAiB,EAAuB,eAAe,EAAgB,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACvU,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAInE,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW;IAGrB,OAAO,CAAgB;IACvB,IAAI,CAAa;IACjB,eAAe,CAAkB;IACjC,MAAM,CAAe;IACrB,UAAU,CAAyB;IACnC,QAAQ,CAAQ;IAChB,KAAK,CAAwB;IAE5B,QAAQ,GAAG,KAAK,CAAC,CAAC;IAClB,OAAO,GAAG,KAAK,CAAC;IAExB,YAAa,CAA4B;QAErC,uBAAuB;QACvB,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,CAAgB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,CAAM,EAAE,EAAQ;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,EAAgB;QACvB,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAe,CAAC;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkC,CAAC;QACvD,MAAM,MAAM,GAAG,EAAc,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACjD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,KAAK,GAAG,QAAwB,CAAC;YACvC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,IAAI,iBAAiB,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,KAAK,iBAAiB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACzF,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,eAAe,KAAK,CAAC,uBAAuB,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;UAClF,WAAW,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;YACxC,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,WAAW,CAAC,MAAM;SAC7B,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,UAAU,CAAC,UAAe,EAAE,EAAQ;QAChC,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,UAAU,CAAC;YAChB,UAAU,GAAG,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,EAAE,EAAE,CAAC;YACL,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC;QAC1B,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,MAAM,GAAG,EAAkB,CAAC;QAClC,MAAM,WAAW,GAAG,EAAkB,CAAC;QACvC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxD,QAAO,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,qBAAqB;gBACtB,MAAM,GAAG,GAAG,IAA2B,CAAC;gBACxC,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBAEpC,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;oBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;oBAC3C,IAAI,MAAM,EAAE,CAAC;wBACT,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC;wBAC5F,WAAW,CAAC,IAAI,CACZ,UAAU,CAAC,MAAM,CACjB,eAAe,EACf,MAAM,CAAC,mBAAmB,CAAC,CAC9B,CAAC;wBACF,SAAS;oBACb,CAAC;oBAED,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;oBAChC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;wBAC5B,UAAU;wBACV,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;qBAC3D,CAAC,CAAC,CAAC;oBACJ,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CACtB,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EACrF,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACpD,CAAC,CAAC;gBACX,CAAC;gBACD,MAAM;YACV;gBACI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClB,MAAM;QAEd,CAAC;QACD,MAAM,MAAM,GAAG,eAAe,CAAC;QAC/B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAEvB,MAAM,SAAS,GAAG;YACd,GAAI,eAAe;YACnB,MAAM;YACN,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,KAAK,CAAC;YACb,KAAK,EAAE,eAAe,CAAC,KAAK;YAC5B,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,OAAO,EAAE,KAAK,CAAC;YACf,KAAK,EAAE,KAAK,CAAC;YACb,eAAe,EAAE,KAAK,CAAC;YACvB,eAAe;SAClB,CAAC;QACF,OAAQ,SAAiB,CAAC,SAAS,CAAC;QACpC,OAAO,MAAM,CAAC,KAAK,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC;QACrB,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,eAAe,EAAE,SAAS;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,GAAG,CAAC,UAAe,EAAE,EAAQ;QACzB,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,UAAU,CAAC;YAChB,UAAU,GAAG,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACnD,MAAM,MAAM,GAAG,EAAkB,CAAC;YAClC,QAAO,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,KAAK,qBAAqB;oBACtB,MAAM,GAAG,GAAG,IAA2B,CAAC;oBACxC,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;wBACpC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;4BAC5B,UAAU,EAAE,QAAQ,CAAC,UAAU;4BAC/B,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;yBAC3D,CAAC,CAAC,CAAC;oBACR,CAAC;oBACD,MAAM;gBACV;oBACI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClB,MAAM;YAEd,CAAC;YACD,OAAO,EAAE,GAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;QACd,OAAO,CAAC,CAAC;IACb,CAAC;IAED,UAAU,CAAC,MAAmB;QAC1B,OAAO,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,UAAe,EAAE,EAAQ;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,gBAAgB,CAAC,UAAe,EAAE,EAAQ;QACtC,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAe,EAAE,EAAQ;QAC3B,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,UAAU,CAAC;YAChB,UAAU,GAAG,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAClD,GAAI,MAAM;YACV,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA,CAAC,CAAC,IAAI;SACxE,CAAC,CAAC,CAAC;IACR,CAAC;IAED,OAAO,CAAC,CAAM;QACV,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,GAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvD,kBAAkB;SACrB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,CAAC,EAAE,EAAG;QAER,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,CAAC,CAAC;YACP,CAAC,GAAG,KAAK,CAAC,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAE3C,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAS,CAAC;QAExC,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,eAAe,EAAE;gBACb,GAAI,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE;gBAC9B,MAAM,EAAE,UAAU,CAAC,KAAK,CAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC;gBACtE,KAAK;gBACL,MAAM;aACT;SACJ,CAAC,CAAC;IACP,CAAC;IAED,SAAS,CAAC,GAAI,CAAQ;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAE3C,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,eAAe,EAAE;gBACb,GAAI,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE;gBAC9B,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAE,IAAI,CAAC,eAAe,EAAE,GAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;gBACvF,KAAK;gBACL,MAAM;aACT;SACJ,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,GAAI,CAAQ;QAEf,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAE3C,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,eAAe,EAAE;gBACb,GAAI,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE;gBAC9B,MAAM,EAAE,UAAU,CAAC,KAAK,CAAE,IAAI,CAAC,eAAe,EAAE,GAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;gBACpF,KAAK;gBACL,MAAM;aACT;SACJ,CAAC,CAAC;IACP,CAAC;IAGD,MAAM,CAAC,CAAC,EAAE,EAAE;QAER,MAAM,EAAE,GAAG,CAAqB,CAAC;QAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CACnD,EAAE,EACF,IAAI,CAAC,eAAe,CAAC,eAAe,EACpC,EAAE,CAAC,eAAe,CAAC,eAAe,CACrC,CAAC;QAEF,IAAI,OAAO,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;QACvC,OAAO,GAAG,OAAO;YACb,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC;YACtC,CAAC,CAAC,IAAI,CAAC;QAEX,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACnC,MAAM,EAAE;gBACJ,GAAI,EAAE,CAAC,eAAe;gBACtB,KAAK,EAAE,OAAO;aACE;SACvB,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACvC,KAAK,GAAG,KAAK;YACT,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC;YACtC,CAAC,CAAC,MAAM,CAAC;QAEb,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC;YAC3C,GAAI,IAAI,CAAC,eAAe;YACxB,KAAK;SACR,CAAC,CAAC;QAEH,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI;YACR,oDAAoD;YACpD,eAAe;SAClB,CAAC,CAAC;IACP,CAAC;IAED,SAAS,CAAC,CAAC,EAAE,EAAE;QAEX,MAAM,EAAE,GAAG,CAAqB,CAAC;QAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE3D,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;QAEpC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEtF,uDAAuD;QAEvD,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACvC,KAAK,GAAG,KAAK;YACT,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC;YACxC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;QAEf,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAC7B,aAAa,EAAE,OAAO;YACtB,MAAM,EAAE,EAAE,CAAC,eAAe;YAC1B,EAAE;YACF,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC;SAChE,CAAC,CAAC,CAAC;QAEJ,OAAO,IAAI,WAAW,CAAC;YACnB,GAAI,IAAI,EAAE,eAAe,EAAE;gBACvB,GAAI,IAAI,CAAC,eAAe;gBACxB,KAAK;gBACL,KAAK;aACR;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAE;QACd,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACf,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,KAAK,CAAC,CAAC;QACf,CAAC;QACD,IAAI,CAAC,EAAE,CAAC;YACJ,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC;QAEpC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,KAAiB,CAAC;QACtB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAC5B,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACnD,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CACtD,CAAC;YACF,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACpE,CAAC;QAED,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;YAC/B,aAAa,EAAE,OAAO;YACtB,QAAQ,EAAE,OAAO;YACjB,MAAM;YACN,EAAE;YACF,KAAK;SACR,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;YACnC,eAAe,EAAE,EAAE;YACnB,IAAI;SACP,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC;QACvE,IAAI,KAAK,CAAC;QACV,IAAI,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5D,OAAO,CAAC,CAAC,OAAO,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,CAAE,EAAE,CAAE;;;YAGrB,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;gBACf,CAAC,GAAG,CAAC,CAAC;gBACN,CAAC,GAAG,KAAK,CAAC,CAAC;YACf,CAAC;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAE5D,MAAY,KAAK,kCAAG,IAAI,oBAAoB,EAAE,OAAA,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;YACzD,IAAI,KAAqC,CAAC;YAC1C,IAAI,CAAC;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAE3B,qEAAqE;gBAErE,MAAM,EAAE,cAAc,EAAE,CAAC;gBAEzB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAC9E,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1E,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvB,MAAM,OAAO,GAAG,EAAS,CAAC;gBAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;gBAC3C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;oBACnD,0CAA0C;oBAC1C,kBAAkB;oBAClB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC3C,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;oBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAClE,6BAA6B;oBAC7B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAa,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,OAAO,CAAC;YACnB,CAAC;YAAC,OAAM,KAAK,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,KAAK,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC1E,MAAM,KAAK,CAAC;YAChB,CAAC;;;;;;;;;;;KACJ;IAED,KAAK,CAAC,MAAM,CAAC,CAAE,EAAE,CAAE;QAEf,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACf,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,KAAK,CAAC,CAAC;QACf,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;QACzD,IAAI,KAAK,CAAC;QACV,IAAI,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAC9E,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5D,OAAO,CAAC,CAAC,OAAO,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,GAAG,KAAK;QAEzC,IAAI,CAAC,EAAE,CAAC;YACJ,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,EAAkB,CAAC;gBAClC,QAAO,IAAI,CAAC,IAAI,EAAE,CAAC;oBACf,KAAK,qBAAqB;wBACtB,MAAM,GAAG,GAAG,IAA2B,CAAC;wBACxC,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;4BACpC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;gCAC5B,UAAU,EAAE,QAAQ,CAAC,UAAU;gCAC/B,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;6BAC3D,CAAC,CAAC,CAAC;wBACR,CAAC;wBACD,MAAM;oBACV;wBACI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAClB,MAAM;gBACd,CAAC;gBACD,OAAO,EAAE,GAAI,MAAM,EAAE,MAAM,EAAE,CAAC;YAClC,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,YAAY,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;YAC/B,aAAa,EAAE,OAAO;YACtB,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,IAAI,CAAC,eAAe;YAC5B,EAAE;SACL,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,EAAwB,CAAC;QAErC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAE3B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACjD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,GAAG,GAAG,QAAwB,CAAC;YACrC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChI,CAAC;QAED,IAAI,KAAK,GAAG,IAAkB,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAC5B,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACnD,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CACtD,CAAC;YACF,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAChE,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,SAAS;YACb,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC5H,CAAC;QAED,IAAI,aAAa,GAAG,IAAsB,CAAC;QAC3C,IAAG,YAAY,EAAE,CAAC;YACd,aAAa,GAAG,EAAE,CAAC;YACnB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC5B,QAAQ,CAAC,mBAAmB,EAC5B,QAAQ,CAAC,aAAa,CACzB,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC;YAC3C,GAAG;YACH,eAAe,EAAE,EAAE;YACnB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;YACnC,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,KAAK;YACL,IAAI;YACJ,aAAa;SAChB,CAAC,CAAC;QACH,OAAO,eAAe,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI;QACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,GAAG,IAAI,CAAC;QACb,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC;QAClB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACtB,OAAO;YACH,KAAK;YACL,IAAI,EAAC,OAAO;SACf,CAAC;IACN,CAAC;IAED,KAAK,CAAC,CAAC,SAAS;;;YAEZ,MAAY,KAAK,kCAAG,IAAI,oBAAoB,EAAE,OAAA,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC;YACvE,IAAI,KAAqC,CAAC;YAC1C,IAAI,CAAC;gBACD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAE3B,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAElE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC9B,IAAI,OAAO,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;oBAEtB,MAAM,gBAAgB,GAAG,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBAEtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;oBAEvE,wCAAwC;oBACxC,uCAAuC;oBACvC,6BAA6B;oBAC7B,MAAM,OAAO,GAAG,OAAO;yBAClB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAG,CAAC,EAAE,KAAK,CAAC;yBAC1E,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;yBAC1D,IAAI,CAAC,CAAC,CAAC,CAAC;oBACb,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;gBAED,MAAM,EAAE,cAAc,EAAE,CAAC;gBACzB,IAAI,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC;gBAElC,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACvB,yCAAyC;oBACzC,MAAM,MAAM,GAAG,EAAkB,CAAC;oBAClC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;wBACnC,QAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;4BACnB,KAAK,cAAc;gCACf,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gCACtB,SAAS;4BACb,KAAK,kBAAkB;gCACnB,MAAM,EAAE,GAAG,QAA4B,CAAC;gCACxC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAE,EAAE,CAAC,QAAuB,CAAC,KAAK,CAAC,CAAC;gCACjE,IAAI,MAAM,EAAE,CAAC;oCACT,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CACrB,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,mBAAmB,CAAC,EACnE,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oCACjD,SAAS;gCACb,CAAC;wBACT,CAAC;wBACD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC;oBACD,MAAM,GAAG,EAAE,GAAI,MAAM,EAAE,MAAM,EAAE,CAAC;oBAChC,qFAAqF;gBACzF,CAAC;gBAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAChB,MAAM,CAAC,KAAK,EAAE,CAAC;gBACnB,CAAC;gBAED,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;gBAEhE,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACrE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1E,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvB,MAAM,SAAS,GAAG,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;gBAC5C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;oBACnD,QAAQ,EAAE,CAAC;oBACX,IAAG,QAAQ,GAAG,CAAC,EAAE,CAAC;wBACd,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;wBACpB,MAAM;oBACV,CAAC;oBACD,IAAI,IAAI,EAAE,CAAC;wBACP,0CAA0C;wBAC1C,kBAAkB;wBAClB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;wBAC3C,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;wBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;wBAClE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBAC1B,MAAM,KAAK,CAAC,MAAa,CAAC;wBAC1B,SAAS;oBACb,CAAC;oBACD,MAAM,QAAa,CAAC;gBACxB,CAAC;YAEL,CAAC;YAAC,OAAM,KAAK,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,KAAK,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC1E,MAAM,KAAK,CAAC;YAChB,CAAC;;;;;;;;;;;KACJ;IAED,KAAK,CAAC,IAAI,CAAC,cAA8B,EAAE,OAAe,EAAE,MAAuB,EAAE,MAAmB;QACpG,IAAI,KAAuB,CAAC;QAC5B,IAAI,MAAiB,CAAC;QACtB,IAAI,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,EAAE,GAAI,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACtF,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACrE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;YAC1B,MAAM,SAAS,GAAG,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;YAC5C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;gBACnD,wDAAwD;gBACxD,IAAI,SAAS,EAAE,CAAC;oBACZ,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC3C,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;gBACrC,CAAC;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAClE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,kBAAkB,KAAK,EAAE,IAAI,KAAK,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;YACxE,MAAM,KAAK,CAAC;QAChB,CAAC;gBAAS,CAAC;YACP,MAAM,MAAM,EAAE,OAAO,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAY,GAAG,wBAAwB,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,OAAO,EAAE;QACjF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,KAAK,EAAC,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC;YACpD,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,CAAC,UAAe,EAAE,EAAQ;QAC7B,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,UAAU,CAAC;YAChB,UAAU,GAAG,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACpD,GAAI,MAAM;YACV,OAAO,EAAE,MAAM,CAAC,OAAO;gBACnB,CAAC,CAAC,CAAE,GAAI,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAC,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAC,CAAC,CAAC;SAC9C,CAAC,CAAC,CAAC;IACR,CAAC;IACD,iBAAiB,CAAC,UAAe,EAAE,EAAQ;QACvC,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,UAAU,CAAC;YAChB,UAAU,GAAG,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACpD,GAAI,MAAM;YACV,OAAO,EAAE,MAAM,CAAC,OAAO;gBACnB,CAAC,CAAC,CAAE,GAAI,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzE,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;SAC3D,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,UAAkC;QAEpC,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,UAAU,CAAC;YACvB,MAAM,MAAM,GAAG,4EAA4E,CAAC;YAC5F,MAAM,MAAM,GAAG,4EAA4E,CAAC;YAC5F,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;gBAC1B,GAAG,CAAC,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;YACrC,CAAC,CAAC;QACN,CAAC;QAED,OAAO,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,CAAS;QACX,MAAM,EAAE,eAAe,EAAG,EAAE,KAAK,EAAE,YAAY,EAAC,EAAC,GAAG,IAAI,CAAC;QACzD,IAAI,YAAY,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,CAAC,CAAS;QACZ,OAAO,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC,EAAC,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,UAAe,EAAE,EAAQ;;;YAC/B,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YAC1C,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,IAAI,SAAS,CAAC;YAEd,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC9C,IAAI,UAAU,GAAG,KAAK,CAAC;gBACvB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAChC,MAAM,EAAE,GAAG,KAAqB,CAAC;oBACjC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;oBAC3B,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACJ,SAAS,GAAG,IAAI,CAAC;gBACrB,CAAC;gBAED,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;oBAC5B,UAAU,EAAE,UAAU,CAAC,cAAc,CACjC,UAAU,EACV,UAAU,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,EAC5C,aAAa,CAAC,IAAI,CAAC;oBACvB,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBAChD,CAAC,CAAC,CAAC;YACR,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,MAAM;gBAC7C,OAAO,EAAE,KAAK,CAAC;aAClB,CAAC;YAEF,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;YAElE,MAAY,KAAK,kCAAG,IAAI,oBAAoB,EAAE,OAAA,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;YACzD,IAAI,KAAK,CAAC;YACV,IAAI,CAAC;gBACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;gBACnE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAClE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACpB,OAAO,QAAe,CAAC;oBAC3B,CAAC;oBACD,OAAO,QAAQ,CAAC,EAAY,CAAC;gBACjC,CAAC;gBACD,+DAA+D;gBAC/D,kBAAkB;gBAClB,OAAO,CAAC,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC5E,MAAM,KAAK,CAAC;YAChB,CAAC;;;;;;;;;;;KAEJ;IAED,KAAK,CAAC,IAAI;;;YACN,+BAA+B;YAC/B,iDAAiD;YACjD,IAAI;YAEJ,MAAM,MAAM,GAAG,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE;oBAC/C,UAAU,CAAC,EAAE,CACT,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,EAChC,IAAI,CAAC;iBACR;gBACD,OAAO,EAAE,KAAK,CAAC;gBACf,KAAK,EAAE,CAAC;aACX,CAAC;YAEF,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;YAElE,MAAY,KAAK,kCAAG,IAAI,oBAAoB,EAAE,OAAA,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;YACzD,IAAI,KAAK,CAAC;YACV,IAAI,CAAC;gBACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;gBACnE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAClE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBACzC,IAAG,QAAQ,CAAC,EAAY,EAAE,CAAC;wBACvB,OAAO,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;gBACD,+DAA+D;gBAC/D,kBAAkB;gBAClB,OAAO,KAAK,CAAC;YACjB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC5E,MAAM,KAAK,CAAC;YAChB,CAAC;;;;;;;;;;;KAEJ;IAED,KAAK,CAAC,KAAK,EAAE,GAAG;QACZ,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC;YACvB,GAAI,IAAI;YACR,eAAe,EAAE;gBACb,GAAI,IAAI,CAAC,eAAe;gBACxB,KAAK,EAAE,GAAG;gBACV,MAAM,EAAE,KAAK;aAChB;SACJ,CAAC,CAAC;QACH,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAAe,EAAE,EAAQ;;;YACjC,IAAI,UAAU,KAAK,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAC9C,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,GAAI,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE;oBAC/C,YAAY,CAAC,MAAM,CAAC;wBAChB,UAAU,EAAE,cAAc,CAAC,MAAM,CAAC;4BAC9B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;4BAC5C,SAAS,EAAE,CAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;yBACjD,CAAC;wBACF,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;qBACrC,CAAC;iBACD;gBACD,OAAO,EAAE,KAAK,CAAC;aAClB,CAAC;YAEF,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;YAElE,MAAY,KAAK,kCAAG,IAAI,oBAAoB,EAAE,OAAA,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;YACzD,IAAI,KAAK,CAAC;YACV,IAAI,CAAC;gBACD,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;gBACnE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAClE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBACzC,OAAO,QAAQ,CAAC,EAAY,CAAC;gBACjC,CAAC;gBACD,+DAA+D;gBAC/D,kBAAkB;gBAClB,OAAO,CAAC,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC5E,MAAM,KAAK,CAAC;YAChB,CAAC;;;;;;;;;;;KAEJ;IAEO,MAAM,CAAC,UAAe,EAAE,EAAO,EAAE,GAAkE;QACvG,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,EAAE,EAAE,CAAC;YACL,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,EAAE,GAAI,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC;IAC9F,CAAC;CAEJ"}

package/dist/model/EntitySource.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type EntityContext from "./EntityContext.js";
 import type EntityType from "../entity-query/EntityType.js";
-import type { IEntityQuery, IFilterExpression } from "./IFilterWithParameter.js";
+import type { IEntityQuery } from "./IFilterWithParameter.js";
 import { contextSymbol, modelSymbol } from "../common/symbols/symbols.js";
 export type ISaveDirect<T> = {
     keys: Partial<T>;
@@ -60,7 +60,8 @@ export declare class EntitySource<T = any> {
     delete(item: Partial<T>): Partial<T>;
     all(): IEntityQuery<T>;
     filtered(mode?: "read" | "modify"): IEntityQuery<T>;
-    where<P>(...[parameter, fx]: IFilterExpression<P, T>): IEntityQuery<T>;
+    where(fx: (x: T) => boolean): IEntityQuery<T>;
+    where<P>(parameter: P, fx: (x: T, p: P) => boolean): IEntityQuery<T>;
     asQuery(): IEntityQuery<T>;
     toQuery(): "" | {
         text: string;

package/dist/model/EntitySource.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EntitySource.d.ts","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,~~iBAAiB,EAAE,~~MAAM,2BAA2B,CAAC;~~AACjF~~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~~SAAS~~,EAAE,EAAE,CAAC,EAAE,~~iBAAiB~~,CAAC,CAAC,EAAE,CAAC,CAAC;~~IAIpD~~,OAAO,IASG,YAAY,CAAC,CAAC,CAAC;IAIzB,OAAO;;;;CAOjB"}
1	+ {"version":3,"file":"EntitySource.d.ts","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"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"}

package/dist/model/EntitySource.js CHANGED Viewed

@@ -296,7 +296,7 @@ export class EntitySource {
         for (const iterator of this.model.keys) {
             filter.push(`x.${iterator.name} === p.${iterator.name}`);
         }
-        return this.where(keys, `(p) => (x) => ${filter.join(" && ")}`);
+        return this.where(keys, `(x, p) => ${filter.join(" && ")}`);
         // return q.first() as Promise<T>;
     }
     navigation(keys, property) {
@@ -314,7 +314,7 @@ export class EntitySource {
             for (const { fkColumn, relatedKeyColumn } of relatedRelation.fkMap) {
                 filter.push(`x.${fkColumn.name} === p.${relatedKeyColumn.name}`);
             }
-            const query = `(p) => (x) => ${filter.join(" && ")}`;
+            const query = `(x, p) => ${filter.join(" && ")}`;
             // console.log(query);
             return this.context.model.register(relatedEntity.typeClass)
                 .where(keys, query);
@@ -369,7 +369,7 @@ export class EntitySource {
         const events = this.context.eventsFor(this.model.typeClass, true);
         return mode === "modify" ? events.modify(query) : events.filter(query);
     }
-    where(...[parameter, fx]) {
+    where(parameter, fx) {
         return this.asQuery().where(parameter, fx);
     }
     asQuery() {

package/dist/model/EntitySource.js.map CHANGED Viewed

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

package/dist/model/IFilterWithParameter.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { IQueryResult } from "../drivers/base/BaseDriver.js";
 import type { EntitySource } from "./EntitySource.js";
 export type IFilterWithParameter<P = any, T = any> = (p: P) => (x: T) => boolean;
 export type ILambdaExpression<P = any, T = any, TR = any> = [input: P, x: (p: P) => (s: T) => TR];
-export type IFilterExpression<P = any, T = any> = [input: P, x: (p: P) => (s: T) => boolean];
+export type IFilterExpression<P = any, T = any> = [input: P, fx: (x: T, p: P) => boolean];
 export type IFieldsAsNumbers<T> = {
     [P in keyof T]: number;
 };
@@ -11,36 +11,47 @@ export interface IBaseQuery<T> {
     firstOrFail(this: T extends object ? IBaseQuery<T> : never, errorMessage?: string): Promise<T>;
     first(this: T extends object ? IBaseQuery<T> : never): Promise<T>;
     some(): Promise<boolean>;
-    select<P, TR>(parameters: P, fx: (p: P) => (x: T) => TR): IBaseQuery<TR>;
-    map<P, TR>(parameters: P, fx: (p: P) => (x: T) => TR): IBaseQuery<TR>;
+    select<TR>(fx: (x: T) => TR): IBaseQuery<TR>;
+    select<P, TR>(parameters: P, fx: (x: T, p: P) => TR): IBaseQuery<TR>;
+    map<TR>(fx: (x: T) => TR): IBaseQuery<TR>;
+    map<P, TR>(parameters: P, fx: (x: T, p: P) => TR): IBaseQuery<TR>;
     toArray(this: T extends object ? IBaseQuery<T> : never): Promise<T[]>;
+    toPage(this: T extends object ? IBaseQuery<T> : never, start: any, size: any): Promise<{
+        more: boolean;
+        items: T[];
+    }>;
     toQuery(): {
         text: string;
         values: any[];
     };
     limit<DT>(this: DT, limit: number): DT;
     offset<DT>(this: DT, offset: number): DT;
-    where<P, DT>(this: DT, parameters: P, fx: (p: P) => (x: T) => boolean): DT;
+    where<DT>(this: DT, fx: (x: T) => boolean): DT;
+    where<P, DT>(this: DT, parameters: P, fx: (x: T, p: P) => boolean): DT;
+    union<DT>(this: DT, fx: (x: T) => boolean): DT;
     union<P, DT>(this: DT, parameters: P, fx: (p: P) => (x: T) => boolean): DT;
-    selectView<P, DT>(this: DT, parameters: P, fx: (p: P) => (x: T) => Partial<T>): DT;
-    innerJoin<JT, DT>(this: DT, q1: IBaseQuery<JT>, fx: (p: JT) => (x: T) => boolean): DT;
-    exists<JT, DT>(this: DT, q1: IBaseQuery<JT>, fx: (p: JT) => (x: T) => boolean): DT;
+    selectView<DT>(this: DT, fx: (x: T) => Partial<T>): DT;
+    selectView<P, DT>(this: DT, parameters: P, fx: (x: T, p: P) => Partial<T>): DT;
+    innerJoin<JT, DT>(this: DT, q1: IBaseQuery<JT>, fx: (x: T, p: JT) => boolean): DT;
+    exists<JT, DT>(this: DT, q1: IBaseQuery<JT>, fx: (x: T, p: JT) => boolean): DT;
     count(): Promise<number>;
     count<P>(parameters: P, fx: (p: P) => (x: T) => boolean): Promise<number>;
     slice<DT>(this: DT, start?: number, end?: number): DT;
-    sum(): Promise<number>;
-    sum<P>(parameters: P, fx: (p: P) => (x: T) => number): Promise<number>;
-    sum<P, TR>(parameters: P, fx: (p: P) => (x: T) => TR): Promise<IFieldsAsNumbers<TR>>;
+    sum(fx?: (x: T) => number): Promise<number>;
+    sum<P, TR>(parameters: P, fx: (x: T, p: P) => TR): Promise<IFieldsAsNumbers<TR>>;
     withSignal<DT>(this: DT, signal: AbortSignal): DT;
     include<TR>(fx: (x: T) => TR | TR[]): IBaseQuery<T>;
-    update<P>(parameters: P, fx: (p: P) => (x: T) => Partial<T>): Promise<number>;
-    updateSelect<P>(this: T extends object ? IBaseQuery<T> : never, parameters: P, fx: (p: P) => (x: T) => Partial<T>): Promise<T[]>;
+    update(fx: (x: T) => Partial<T>): Promise<number>;
+    update<P>(parameters: P, fx: (x: T, p: P) => Partial<T>): Promise<number>;
+    updateSelect(this: T extends object ? IBaseQuery<T> : never, fx: (x: T) => Partial<T>): Promise<T[]>;
+    updateSelect<P>(this: T extends object ? IBaseQuery<T> : never, parameters: P, fx: (x: T, p: P) => Partial<T>): Promise<T[]>;
     /**
      * Warning !! Be careful, this will delete rows from the database and neither soft delete nor any other events will be invoked.
      * @param parameters parameters to supply
      * @param fx filter expression
      */
-    delete<P>(parameters: P, fx: (p: P) => (x: T) => boolean): Promise<number>;
+    delete(fx: (x: T) => boolean): Promise<number>;
+    delete<P>(parameters: P, fx: (x: T, p: P) => boolean): Promise<number>;
     trace<DT>(this: DT, tracer: (text: string) => void): DT;
     unionsAll<DT>(this: DT, ...p: DT[]): DT;
     unions<DT>(this: DT, ...p: DT[]): DT;
@@ -52,11 +63,15 @@ export interface IBaseQuery<T> {
     insertInTo<DT>(this: DT, destination: EntitySource<Partial<T>>): Promise<IQueryResult>;
 }
 export interface IOrderedEntityQuery<T> extends IBaseQuery<T> {
-    thenBy<P>(parameters: P, fx: (p: P) => (x: T) => any): IOrderedEntityQuery<T>;
-    thenByDescending<P>(parameters: P, fx: (p: P) => (x: T) => any): IOrderedEntityQuery<T>;
+    thenBy(fx: (x: T) => any): IOrderedEntityQuery<T>;
+    thenBy<P>(parameters: P, fx: (x: T, p: P) => any): IOrderedEntityQuery<T>;
+    thenByDescending(fx: (x: T) => any): IOrderedEntityQuery<T>;
+    thenByDescending<P>(parameters: P, fx: (x: T, p: P) => any): IOrderedEntityQuery<T>;
 }
 export interface IEntityQuery<T> extends IBaseQuery<T> {
-    orderBy<P>(parameters: P, fx: (p: P) => (x: T) => any): IOrderedEntityQuery<T>;
-    orderByDescending<P>(parameters: P, fx: (p: P) => (x: T) => any): IOrderedEntityQuery<T>;
+    orderBy(fx: (x: T) => any): IOrderedEntityQuery<T>;
+    orderBy<P>(parameters: P, fx: (x: T, p: P) => any): IOrderedEntityQuery<T>;
+    orderByDescending(fx: (x: T) => any): IOrderedEntityQuery<T>;
+    orderByDescending<P>(parameters: P, fx: (x: T, p: P) => any): IOrderedEntityQuery<T>;
 }
 //# sourceMappingURL=IFilterWithParameter.d.ts.map

package/dist/model/IFilterWithParameter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IFilterWithParameter.d.ts","sourceRoot":"","sources":["../../src/model/IFilterWithParameter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;~~AAEtD~~,MAAM,MAAM,oBAAoB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;AAEjF,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;AAElG,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,~~CAAC~~,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,OAAO,CAAC,CAAC;~~AAE7F~~,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;CAAE,CAAC;AAE7D,MAAM,WAAW,UAAU,CAAC,CAAC;IACzB,SAAS,CAAC,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IAE7E,WAAW,CAAC,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/F,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;~~IACzE~~,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;~~IAEtE~~,OAAO,CAAC,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAEtE,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAA;KAAC,CAAC;IAE1C,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,EAAE,CAAC;IACvC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;IACzC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,EAAE,CAAC;~~IAC3E~~,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,EAAE,CAAC;IAC3E,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;~~IAEnF~~,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,~~KAAK,~~CAAC,~~CAAC~~,EAAE,~~CAAC,~~KAAK,OAAO,GAAG,EAAE,CAAC;~~IAEtF~~,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,~~KAAK,~~CAAC,~~CAAC~~,EAAE,~~CAAC,~~KAAK,OAAO,GAAG,EAAE,CAAC;~~IAEnF~~,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1E,KAAK,CAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IAErD,GAAG,~~IAAI,OAAO,~~CAAC,~~MAAM,CAAC,CAAC;IACvB,GAAG,CAAC,CAAC,~~EAAE,~~UAAU,EAAE,~~CAAC,EAAE,~~EAAE,EAAE,~~CAAC,CAAC,EAAE,CAAC,KAAK,~~CAAC,CAAC,EAAE,CAAC,KAAK,~~MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;~~IACvE~~,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;~~IAGrF~~,UAAU,CAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,MAAM,EAAE,WAAW,GAAG,EAAE,CAAC;IAEjD,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAEpD,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,~~MAAM~~,CAAC,CAAC;~~IAC7E~~,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,~~EAAE~~,CAAC,~~KAAK~~,CAAC,~~CAAC~~,~~EAAC,~~CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;~~IAEhI~~;;;;OAIG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;~~IAE3E~~,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,EAAE,CAAC;IAExD,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAI,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;IACzC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAI,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;IAEtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC1F;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAEzD,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;~~IAC9E~~,gBAAgB,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;~~CAC3F~~;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAElD,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;~~IAC/E~~,iBAAiB,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,~~CAAC,~~EAAE,CAAC,KAAK,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;~~CAC5F~~"}
1	+ {"version":3,"file":"IFilterWithParameter.d.ts","sourceRoot":"","sources":["../../src/model/IFilterWithParameter.ts"],"names":[],"mappings":"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"}

package/dist/model/changes/ChangeEntry.js CHANGED Viewed

@@ -139,7 +139,7 @@ export default class ChangeEntry {
             for (const { fkColumn, relatedKeyColumn } of relatedRelation.fkMap) {
                 filter.push(`x.${fkColumn.name} === p.${relatedKeyColumn.name}`);
             }
-            const query = `(p) => (x) => ${filter.join(" && ")}`;
+            const query = `(x, p) => ${filter.join(" && ")}`;
             // console.log(query);
             await context.model.register(relatedEntity.typeClass)
                 .where(this.entity, query)

package/dist/model/changes/ChangeEntry.js.map CHANGED Viewed

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

package/dist/query/parser/ArrowToExpression.d.ts CHANGED Viewed

@@ -11,13 +11,13 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
      * @param target parameter target
      * @returns Parsed expression
      */
-    static transform(fx: (p: any) => (x: any) => any, target?: ParameterExpression, outerParameter?: ParameterExpression): {
+    static transform(fx: (x: any, p: any) => any, target?: ParameterExpression, outerParameter?: ParameterExpression): {
         params: ParameterExpression[];
         body: Expression;
         target: ParameterExpression;
     };
     /**
-     * Since expression parsed as a different parameter in nested lambda (p) => (x) => x..,
+     * Since expression parsed as a different parameter in nested lambda (x, p) => x..,
      * we need to replace x with provided target to bind x with respective ParameterExpression.
      * As ParameterExpression contains the type and model associated with the table represented by `x`.
      * @param node parsed node

package/dist/query/parser/ArrowToExpression.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArrowToExpression.d.ts","sourceRoot":"","sources":["../../../src/query/parser/ArrowToExpression.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,gBAAgB,EAAE,cAAc,EAAqB,cAAc,EAAE,kBAAkB,EAAyB,QAAQ,EAAE,UAAU,EAA4B,gBAAgB,EAAwD,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC5X,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAQpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY,CAAC,UAAU,CAAC;~~IA0F~~/D,OAAO,CAAC,WAAW;IACZ,MAAM,EAAE,mBAAmB;~~IAzFtC~~;;;;;;OAMG;WACW,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,~~KAAK~~,CAAC,~~CAAC,~~EAAE,GAAG,KAAK,GAAG,EAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,cAAc,CAAC,EAAE,mBAAmB;~~gBAeK~~,mBAAmB,EAAE;cAAQ,UAAU;gBAAU,mBAAmB;;IARpM;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;~~IA6DhC~~,SAAgB,SAAS,EAAE,MAAM,EAAE,CAAM;IAIzC,SAAS,aACG,WAAW,EAAE,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,EAC7B,MAAM,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM;IAYtB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,aAAa;IAI/C,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIjD,mBAAmB,CAAE,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIlD,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW;IAItC,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,aAAa;IAI/C,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIjD,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAQ3D,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe;IAqB9C,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAI3D,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,UAAU;IAiB/D,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAI3D,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB;IAgChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,cAAc;IAiBnE;;;;;;OAMG;IACH,yBAAyB,CAAC,EAAE,EAAE,cAAc;IAwE5C,eAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,UAAU,GAAG,UAAU;IAQ5D,qBAAqB,CAAC,EAAE,MAAM,EAAG,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,GAAG,CAAC,gBAAgB;IAShF,4BAA4B,CAAC,IAAI,EAAE,GAAG,CAAC,uBAAuB,GAAG,UAAU;IAsB3E,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,UAAU;IAyB7D,0BAA0B,CAAC,IAAI,EAAE,GAAG,CAAC,qBAAqB,GAAG,UAAU;IAQvE,OAAO,CAAC,QAAQ;CAqBnB"}
1	+ {"version":3,"file":"ArrowToExpression.d.ts","sourceRoot":"","sources":["../../../src/query/parser/ArrowToExpression.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,gBAAgB,EAAE,cAAc,EAAqB,cAAc,EAAE,kBAAkB,EAAyB,QAAQ,EAAE,UAAU,EAA4B,gBAAgB,EAAwD,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC5X,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAQpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY,CAAC,UAAU,CAAC;IA4G/D,OAAO,CAAC,WAAW;IACZ,MAAM,EAAE,mBAAmB;IA3GtC;;;;;;OAMG;WACW,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,GAAG,EAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,cAAc,CAAC,EAAE,mBAAmB;gBAeS,mBAAmB,EAAE;cAAQ,UAAU;gBAAU,mBAAmB;;IARpM;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA+EhC,SAAgB,SAAS,EAAE,MAAM,EAAE,CAAM;IAIzC,SAAS,aACG,WAAW,EAAE,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,EAC7B,MAAM,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM;IAYtB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,aAAa;IAI/C,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIjD,mBAAmB,CAAE,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIlD,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW;IAItC,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,aAAa;IAI/C,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,cAAc;IAIjD,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAQ3D,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe;IAqB9C,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAI3D,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,iBAAiB,GAAG,UAAU;IAiB/D,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,UAAU;IAI3D,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB;IAgChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,cAAc;IAiBnE;;;;;;OAMG;IACH,yBAAyB,CAAC,EAAE,EAAE,cAAc;IAwE5C,eAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,UAAU,GAAG,UAAU;IAQ5D,qBAAqB,CAAC,EAAE,MAAM,EAAG,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,GAAG,CAAC,gBAAgB;IAShF,4BAA4B,CAAC,IAAI,EAAE,GAAG,CAAC,uBAAuB,GAAG,UAAU;IAsB3E,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,GAAG,UAAU;IAyB7D,0BAA0B,CAAC,IAAI,EAAE,GAAG,CAAC,qBAAqB,GAAG,UAAU;IAQvE,OAAO,CAAC,QAAQ;CAqBnB"}

package/dist/query/parser/ArrowToExpression.js CHANGED Viewed

@@ -21,7 +21,7 @@ export default class ArrowToExpression extends BabelVisitor {
         return this.transformUncached(node, target, outerParameter);
     }
     /**
-     * Since expression parsed as a different parameter in nested lambda (p) => (x) => x..,
+     * Since expression parsed as a different parameter in nested lambda (x, p) => x..,
      * we need to replace x with provided target to bind x with respective ParameterExpression.
      * As ParameterExpression contains the type and model associated with the table represented by `x`.
      * @param node parsed node
@@ -29,43 +29,63 @@ export default class ArrowToExpression extends BabelVisitor {
      * @returns transformed node
      */
     static transformUncached(node, target, outerParameter) {
-        if (node.type !== "ArrowFunctionExpression") {
-            throw new Error("Expecting an arrow function");
-        }
         const paramSet = new Map();
         let firstOuterParam = null;
         const params = [];
-        for (const iterator of node.params) {
-            if (iterator.type !== "Identifier") {
-                throw new Error("Expecting an identifier");
-            }
-            if (!firstOuterParam && outerParameter) {
-                firstOuterParam = iterator.name;
-                paramSet.set(iterator.name, outerParameter);
-                params.push(outerParameter);
-                continue;
-            }
-            const p1 = ParameterExpression.create({ name: iterator.name });
-            paramSet.set(iterator.name, p1);
-            params.push(p1);
-        }
-        if (outerParameter && firstOuterParam) {
-            paramSet.set(firstOuterParam, outerParameter);
-        }
-        let body = node.body;
-        if (body.type !== "ArrowFunctionExpression") {
+        if (node.type !== "ArrowFunctionExpression") {
             throw new Error("Expecting an arrow function");
         }
-        const firstTarget = body.params[0];
         let name = "____x";
-        if (firstTarget) {
-            if (firstTarget.type !== "Identifier") {
-                throw new Error("Expecting an identifier");
+        let body = node.body;
+        let firstTarget;
+        if (body.type === "ArrowFunctionExpression") {
+            firstTarget = body.params[0];
+            if (firstTarget) {
+                if (firstTarget.type !== "Identifier") {
+                    throw new Error("Expecting an identifier");
+                }
+                name = firstTarget.name;
+            }
+            for (const iterator of node.params) {
+                if (iterator.type !== "Identifier") {
+                    throw new Error("Expecting an identifier");
+                }
+                if (!firstOuterParam && outerParameter) {
+                    firstOuterParam = iterator.name;
+                    paramSet.set(iterator.name, outerParameter);
+                    params.push(outerParameter);
+                    continue;
+                }
+                const p1 = ParameterExpression.create({ name: iterator.name });
+                paramSet.set(iterator.name, p1);
+                params.push(p1);
+            }
+            if (outerParameter && firstOuterParam) {
+                paramSet.set(firstOuterParam, outerParameter);
+            }
+            body = body.body;
+        }
+        else {
+            firstTarget = node.params[0];
+            if (firstTarget) {
+                if (firstTarget.type !== "Identifier") {
+                    throw new Error("Expecting an identifier");
+                }
+                name = firstTarget.name;
+            }
+            const lastParam = node.params.at(-1);
+            if (lastParam) {
+                if (outerParameter) {
+                    paramSet.set(lastParam.name, outerParameter);
+                }
+                else {
+                    const p1 = ParameterExpression.create({ name: lastParam.name });
+                    paramSet.set(lastParam.name, p1);
+                    params.push(p1);
+                }
             }
-            name = firstTarget.name;
         }
         target ??= ParameterExpression.create({ name });
-        body = body.body;
         const visitor = new this(paramSet, target, name);
         return {
             params,