@effect-app/infra 1.11.1 → 1.11.3

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 (23) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/_cjs/services/RepositoryBase.cjs +1 -1
  3. package/_cjs/services/RepositoryBase.cjs.map +1 -1
  4. package/_cjs/services/Store/codeFilter.cjs +8 -6
  5. package/_cjs/services/Store/codeFilter.cjs.map +1 -1
  6. package/dist/RequestContext.d.ts +1 -1
  7. package/dist/filter/types/errors.d.ts +1 -2
  8. package/dist/filter/types/errors.d.ts.map +1 -1
  9. package/dist/filter/types/fields.d.ts +1 -15
  10. package/dist/filter/types/fields.d.ts.map +1 -1
  11. package/dist/services/Operations.d.ts +1 -1
  12. package/dist/services/Repository/ext.d.ts +11 -11
  13. package/dist/services/RepositoryBase.d.ts +6 -6
  14. package/dist/services/RepositoryBase.js +2 -2
  15. package/dist/services/Store/ContextMapContainer.d.ts +1 -1
  16. package/dist/services/Store/codeFilter.d.ts +1 -1
  17. package/dist/services/Store/codeFilter.d.ts.map +1 -1
  18. package/dist/services/Store/codeFilter.js +9 -7
  19. package/package.json +12 -12
  20. package/src/filter/types/errors.ts +2 -2
  21. package/src/filter/types/fields.ts +19 -19
  22. package/src/services/RepositoryBase.ts +1 -1
  23. package/src/services/Store/codeFilter.ts +13 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 1.11.3
4
+
5
+ ### Patch Changes
6
+
7
+ - 143e3d6: fix: code filter should also delay scope evaluation.
8
+
9
+ ## 1.11.2
10
+
11
+ ### Patch Changes
12
+
13
+ - 87d8393: fix mapped
14
+ - e120966: update packages
15
+ - f6066ac: update packages
16
+ - Updated dependencies [e120966]
17
+ - Updated dependencies [f6066ac]
18
+ - @effect-app/infra-adapters@1.7.2
19
+ - effect-app@1.9.2
20
+ - @effect-app/schema@1.6.1
21
+ - @effect-app/core@1.6.1
22
+
3
23
  ## 1.11.1
4
24
 
5
25
  ### Patch Changes
package/_cjs/services/RepositoryBase.cjs CHANGED
@@ -302,7 +302,7 @@ const makeRepoFunctions = (tag, itemType) => {
302
302
  saveAndPublish,
303
303
  saveManyWithPure
304
304
  } = _effectApp.Effect.serviceFunctions(tag);
305
- const mapped = s => tag.map(_ => _.mapped(s));
305
+ const mapped = s => _effectApp.Effect.map(tag, _ => _.mapped(s));
306
306
  return {
307
307
  itemType,
308
308
  all,
package/_cjs/services/RepositoryBase.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RepositoryBase.cjs","names":["_Repository","require","_Store","_Array","_Effect","_schema","_effectApp","_Pure","_errors","_query","_interopRequireWildcard","Q","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","itemType","constructor","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","changeFeed","mapped","query","RepositoryBaseC3","id","Effect","andThen","_","mapError","NotFoundError","type","log","evt","AnyPureDSL","removeById","save","items","saveWithEvents","events","queryAndSavePure","q","pure","batch","pipe","Array","isArray","undefined","saveManyWithPure_","saveManyWithPureBatched_","saveWithPure_","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure","saveManyWithPure","forEach","chunk_","saveAllWithEffectInt","runTerm","flatMap","item","saveWithPure","map","makeRepo","name","schema","mapFrom","mapTo","mapToPersistenceModel","getEtag","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","gen","$","rctx","context","encodeMany","flow","S","encode","provide","withSpan","decode","decodeMany","store","makeInitial","config","ContextMapContainer","cms","etag","pubCfg","pub","publishEvents","void","PubSub","unbounded","allE","cm","orDie","fieldsSchema","Struct","ast","_tag","Union","types","from","pick","encodeId","findEId","Option","findE","flatMapOption","saveAllE","sync","toNonEmptyArray","ret","batchSet","asVoid","saveAll","fromIterable","suspend","it","Chunk","publish","toArray","remove","parseMany","parseMany2","filter","tap","select","toFilter","eff","mode","getSomes","Unify","unify","ttype","head","NonNegativeInt","length","catchTag","die","attributes","makeQuery","dec","encMany","decMany","xes","withLogSpan","pluralize","s","endsWith","substring","encodeToEncoded","StoreMaker","partitionValue","makeRepoFunctions","tag","serviceConstants","serviceFunctions","use","body","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","b","limit","Error","stackTraceLimit","creationError","Context","assignTag","assign","RepositoryDefaultImpl","makeRequest","repo","_request","Request","tagged","requestResolver","RequestResolver","makeBatched","requests","where","complete","findFirst","match","onNone","Exit","fail","onSome","succeed","discard","catchAllCause","cause","failCause","batchN","contextFromServices","request"],"sources":["../../src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"RepositoryBase.cjs","names":["_Repository","require","_Store","_Array","_Effect","_schema","_effectApp","_Pure","_errors","_query","_interopRequireWildcard","Q","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","itemType","constructor","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","changeFeed","mapped","query","RepositoryBaseC3","id","Effect","andThen","_","mapError","NotFoundError","type","log","evt","AnyPureDSL","removeById","save","items","saveWithEvents","events","queryAndSavePure","q","pure","batch","pipe","Array","isArray","undefined","saveManyWithPure_","saveManyWithPureBatched_","saveWithPure_","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure","saveManyWithPure","forEach","chunk_","saveAllWithEffectInt","runTerm","flatMap","item","saveWithPure","map","makeRepo","name","schema","mapFrom","mapTo","mapToPersistenceModel","getEtag","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","gen","$","rctx","context","encodeMany","flow","S","encode","provide","withSpan","decode","decodeMany","store","makeInitial","config","ContextMapContainer","cms","etag","pubCfg","pub","publishEvents","void","PubSub","unbounded","allE","cm","orDie","fieldsSchema","Struct","ast","_tag","Union","types","from","pick","encodeId","findEId","Option","findE","flatMapOption","saveAllE","sync","toNonEmptyArray","ret","batchSet","asVoid","saveAll","fromIterable","suspend","it","Chunk","publish","toArray","remove","parseMany","parseMany2","filter","tap","select","toFilter","eff","mode","getSomes","Unify","unify","ttype","head","NonNegativeInt","length","catchTag","die","attributes","makeQuery","dec","encMany","decMany","xes","withLogSpan","pluralize","s","endsWith","substring","encodeToEncoded","StoreMaker","partitionValue","makeRepoFunctions","tag","serviceConstants","serviceFunctions","use","body","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","b","limit","Error","stackTraceLimit","creationError","Context","assignTag","assign","RepositoryDefaultImpl","makeRequest","repo","_request","Request","tagged","requestResolver","RequestResolver","makeBatched","requests","where","complete","findFirst","match","onNone","Exit","fail","onSome","succeed","discard","catchAllCause","cause","failCause","batchN","contextFromServices","request"],"sources":["../../src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/_cjs/services/Store/codeFilter.cjs CHANGED
@@ -56,7 +56,7 @@ const codeFilterStatement = (p, x) => {
56
56
  exports.codeFilterStatement = codeFilterStatement;
57
57
  const codeFilter3 = state => sut => codeFilter3_(state, sut);
58
58
  exports.codeFilter3 = codeFilter3;
59
- const codeFilter3_ = (state, sut, statements = []) => {
59
+ const codeFilter3__ = (state, sut, statements) => {
60
60
  let s = "";
61
61
  let l = 0;
62
62
  const printN = n => {
@@ -80,29 +80,31 @@ const codeFilter3_ = (state, sut, statements = []) => {
80
80
  break;
81
81
  case "or-scope":
82
82
  {
83
- ;
84
83
  ++l;
85
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
84
+ s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
86
85
  --l;
87
86
  break;
88
87
  }
89
88
  case "and-scope":
90
89
  {
91
- ;
92
90
  ++l;
93
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
91
+ s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
94
92
  --l;
95
93
  break;
96
94
  }
97
95
  case "where-scope":
98
96
  {
99
97
  // ;++l
100
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`;
98
+ s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n)`;
101
99
  // ;--l
102
100
  break;
103
101
  }
104
102
  }
105
103
  }
104
+ return s;
105
+ };
106
+ const codeFilter3_ = (state, sut) => {
107
+ const s = codeFilter3__(state, sut, []);
106
108
  return eval(s);
107
109
  };
108
110
  exports.codeFilter3_ = codeFilter3_;
package/_cjs/services/Store/codeFilter.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"codeFilter.cjs","names":["_effectApp","require","_utils","_utils2","codeFilterStatement","p","x","k","get","path","op","value","includes","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive","toLowerCase","endsWith","startsWith","split","every","_","compare","undefined","some","assertUnreachable","exports","codeFilter3","state","sut","codeFilter3_","statements","s","l","printN","n","Array","range","map","join","process","e","t","push","length","result","eval"],"sources":["../../../src/services/Store/codeFilter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"codeFilter.cjs","names":["_effectApp","require","_utils","_utils2","codeFilterStatement","p","x","k","get","path","op","value","includes","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive","toLowerCase","endsWith","startsWith","split","every","_","compare","undefined","some","assertUnreachable","exports","codeFilter3","state","sut","codeFilter3_","codeFilter3__","statements","s","l","printN","n","Array","range","map","join","process","e","t","push","length","result","eval"],"sources":["../../../src/services/Store/codeFilter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/dist/RequestContext.d.ts CHANGED
@@ -63,11 +63,11 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, {
63
63
  readonly id?: string & S.NonEmptyString255Brand;
64
64
  readonly name: string & S.NonEmptyString255Brand;
65
65
  readonly createdAt?: Date;
66
+ readonly rootId: NonEmptyString255;
66
67
  readonly userProfile?: {
67
68
  readonly sub: string & S.StringIdBrand & import("effect-app/ids").UserProfileIdBrand;
68
69
  } | undefined;
69
70
  readonly locale: "en" | "de";
70
- readonly rootId: NonEmptyString255;
71
71
  readonly sourceId?: (string & S.NonEmptyString255Brand) | undefined;
72
72
  readonly parent?: RequestContextParent | undefined;
73
73
  readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
package/dist/filter/types/errors.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { FieldValues, InternalFieldName, Ref } from "./fields.js";
1
+ import type { FieldValues, InternalFieldName } from "./fields.js";
2
2
  import type { BrowserNativeObject, IsAny, LiteralUnion, Merge } from "./utils.js";
3
3
  import type { RegisterOptions, ValidateResult } from "./validator.js";
4
4
  export type Message = string;
@@ -10,7 +10,6 @@ export type MultipleFieldErrors = {
10
10
  export type FieldError = {
11
11
  type: LiteralUnion<keyof RegisterOptions, string>;
12
12
  root?: FieldError;
13
- ref?: Ref;
14
13
  types?: MultipleFieldErrors;
15
14
  message?: Message;
16
15
  };
package/dist/filter/types/errors.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/filter/types/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAErE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAA;AAE5B,MAAM,MAAM,mBAAmB,GAC3B;KACC,CAAC,IAAI,MAAM,eAAe,CAAC,CAAC,EAAE,cAAc;CAC9C,GACC;IACA,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;CAC9B,CAAA;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,YAAY,CAAC,MAAM,eAAe,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM,eAAe,EAAE,MAAM,CAAC,CAAA;IAClD,KAAK,CAAC,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,mBAAmB,GAAG,IAAI,GAAG,CAAC,GAClE;KACC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClD,CAAA;AAEH,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;KAChE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,mBAAmB,GAAG,IAAI,GAAG,UAAU,GACjE,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9D,UAAU;CACf,CAAA;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,OAAO,CACpE,WAAW,SAAS,KAAK,CAAC,WAAW,CAAC,GAAG,GAAG,GACxC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CACrC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACvC,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC,CACtC,CAAA"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/filter/types/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAErE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAA;AAE5B,MAAM,MAAM,mBAAmB,GAC3B;KACC,CAAC,IAAI,MAAM,eAAe,CAAC,CAAC,EAAE,cAAc;CAC9C,GACC;IACA,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;CAC9B,CAAA;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,YAAY,CAAC,MAAM,eAAe,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,CAAC,EAAE,UAAU,CAAA;IAEjB,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM,eAAe,EAAE,MAAM,CAAC,CAAA;IAClD,KAAK,CAAC,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,mBAAmB,GAAG,IAAI,GAAG,CAAC,GAClE;KACC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClD,CAAA;AAEH,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;KAChE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,mBAAmB,GAAG,IAAI,GAAG,UAAU,GACjE,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9D,UAAU;CACf,CAAA;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,OAAO,CACpE,WAAW,SAAS,KAAK,CAAC,WAAW,CAAC,GAAG,GAAG,GACxC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CACrC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACvC,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC,CACtC,CAAA"}
package/dist/filter/types/fields.d.ts CHANGED
@@ -1,27 +1,13 @@
1
- import type { IsFlatObject, Noop } from "./utils.js";
1
+ import type { IsFlatObject } from "./utils.js";
2
2
  import type { RegisterOptions } from "./validator.js";
3
3
  export type InternalFieldName = string;
4
4
  export type FieldName<TFieldValues extends FieldValues> = IsFlatObject<TFieldValues> extends true ? Extract<keyof TFieldValues, string> : string;
5
- export type CustomElement<TFieldValues extends FieldValues> = {
6
- name: FieldName<TFieldValues>;
7
- type?: string;
8
- value?: any;
9
- disabled?: boolean;
10
- checked?: boolean;
11
- options?: HTMLOptionsCollection;
12
- files?: FileList | null;
13
- focus?: Noop;
14
- };
15
5
  export type FieldValue<TFieldValues extends FieldValues> = TFieldValues[InternalFieldName];
16
6
  export type FieldValues = Record<string, any>;
17
7
  export type NativeFieldValue = string | number | boolean | null | undefined | unknown[];
18
- export type FieldElement<TFieldValues extends FieldValues = FieldValues> = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement | CustomElement<TFieldValues>;
19
- export type Ref = FieldElement;
20
8
  export type Field = {
21
9
  _f: {
22
- ref: Ref;
23
10
  name: InternalFieldName;
24
- refs?: HTMLInputElement[];
25
11
  mount?: boolean;
26
12
  } & RegisterOptions;
27
13
  };
package/dist/filter/types/fields.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../src/filter/types/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEtC,MAAM,MAAM,SAAS,CAAC,YAAY,SAAS,WAAW,IAAI,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,GAC7F,OAAO,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,GACnC,MAAM,CAAA;AAEV,MAAM,MAAM,aAAa,CAAC,YAAY,SAAS,WAAW,IAAI;IAC5D,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,qBAAqB,CAAA;IAC/B,KAAK,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;IACvB,KAAK,CAAC,EAAE,IAAI,CAAA;CACb,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,YAAY,SAAS,WAAW,IAAI,YAAY,CAAC,iBAAiB,CAAC,CAAA;AAE1F,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE7C,MAAM,MAAM,gBAAgB,GACxB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,GACT,OAAO,EAAE,CAAA;AAEb,MAAM,MAAM,YAAY,CAAC,YAAY,SAAS,WAAW,GAAG,WAAW,IACnE,gBAAgB,GAChB,iBAAiB,GACjB,mBAAmB,GACnB,aAAa,CAAC,YAAY,CAAC,CAAA;AAE/B,MAAM,MAAM,GAAG,GAAG,YAAY,CAAA;AAE9B,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE;QACF,GAAG,EAAE,GAAG,CAAA;QACR,IAAI,EAAE,iBAAiB,CAAA;QACvB,IAAI,CAAC,EAAE,gBAAgB,EAAE,CAAA;QACzB,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,GAAG,eAAe,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../src/filter/types/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEtC,MAAM,MAAM,SAAS,CAAC,YAAY,SAAS,WAAW,IAAI,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,GAC7F,OAAO,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,GACnC,MAAM,CAAA;AAaV,MAAM,MAAM,UAAU,CAAC,YAAY,SAAS,WAAW,IAAI,YAAY,CAAC,iBAAiB,CAAC,CAAA;AAE1F,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE7C,MAAM,MAAM,gBAAgB,GACxB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,GACT,OAAO,EAAE,CAAA;AAUb,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE;QAEF,IAAI,EAAE,iBAAiB,CAAA;QAEvB,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,GAAG,eAAe,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAA"}
package/dist/services/Operations.d.ts CHANGED
@@ -48,7 +48,7 @@ declare const Operations_base: (abstract new (service: {
48
48
  all: Effect<Operation[]>;
49
49
  find: (id: OperationId) => Effect<Option<Operation>>;
50
50
  update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
51
- }) => X) => X extends Effect<infer A_1, infer E_2, infer R_4> ? Effect<A_1, E_2, R_4 | Operations> : Effect<X, never, Operations>;
51
+ }) => X) => X extends Effect<infer A_1, infer E_2, infer R_4> ? Effect<A_1, E_2, Operations | R_4> : Effect<X, never, Operations>;
52
52
  };
53
53
  export declare class Operations extends Operations_base {
54
54
  private static readonly CleanupLive;
package/dist/services/Repository/ext.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare function byIdAndSaveWithPure<T extends {
26
26
  id: unknown;
27
27
  }, Encoded extends {
28
28
  id: string;
29
- }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, Exclude<R, {
29
+ }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, Exclude<R, {
30
30
  env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
31
31
  }>>;
32
32
  /**
@@ -39,7 +39,7 @@ export declare function handleByIdAndSaveWithPure<T extends {
39
39
  id: string;
40
40
  }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): <Req extends {
41
41
  id: T["id"];
42
- }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, Exclude<R, {
42
+ }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, Exclude<R, {
43
43
  env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
44
44
  }>>;
45
45
  /**
@@ -49,7 +49,7 @@ export declare function saveManyWithPure_<R, T extends {
49
49
  id: unknown;
50
50
  }, Encoded extends {
51
51
  id: string;
52
- }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
52
+ }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException, Exclude<R, {
53
53
  env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
54
54
  }>>;
55
55
  /**
@@ -59,14 +59,14 @@ export declare function saveWithPure_<R, T extends {
59
59
  id: unknown;
60
60
  }, Encoded extends {
61
61
  id: string;
62
- }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
62
+ }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
63
63
  env: import("effect-app/Pure").PureEnv<Evt, S1, S2>;
64
64
  }>>;
65
65
  export declare function saveAllWithEffectInt<T extends {
66
66
  id: unknown;
67
67
  }, Encoded extends {
68
68
  id: string;
69
- }, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, R>;
69
+ }, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException, R>;
70
70
  /**
71
71
  * @tsplus fluent Repository saveManyWithPureBatched
72
72
  */
@@ -74,7 +74,7 @@ export declare function saveManyWithPureBatched<T extends {
74
74
  id: unknown;
75
75
  }, Encoded extends {
76
76
  id: string;
77
- }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
77
+ }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
78
78
  env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
79
79
  }>>;
80
80
  /**
@@ -84,7 +84,7 @@ export declare function saveManyWithPureBatched_<R, T extends {
84
84
  id: unknown;
85
85
  }, Encoded extends {
86
86
  id: string;
87
- }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
87
+ }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
88
88
  env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
89
89
  }>>;
90
90
  /**
@@ -94,7 +94,7 @@ export declare function save<T extends {
94
94
  id: unknown;
95
95
  }, Encoded extends {
96
96
  id: string;
97
- }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (items_0: T, ...items_1: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
97
+ }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (items_0: T, ...items_1: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
98
98
  /**
99
99
  * @tsplus getter Repository saveWithEvents
100
100
  */
@@ -102,7 +102,7 @@ export declare function saveWithEvents<T extends {
102
102
  id: unknown;
103
103
  }, Encoded extends {
104
104
  id: string;
105
- }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
105
+ }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
106
106
  /**
107
107
  * @tsplus fluent Repository updateWithEffect
108
108
  */
@@ -110,7 +110,7 @@ export declare function itemUpdateWithEffect<R, E, T extends {
110
110
  id: string;
111
111
  }, Encoded extends {
112
112
  id: string;
113
- }, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, R>;
113
+ }, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E | NotFoundError<ItemType>, R>;
114
114
  /**
115
115
  * @tsplus fluent Repository update
116
116
  */
@@ -118,7 +118,7 @@ export declare function itemUpdate<T extends {
118
118
  id: string;
119
119
  }, Encoded extends {
120
120
  id: string;
121
- }, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, never>;
121
+ }, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, never>;
122
122
  /**
123
123
  * only use this as a shortcut if you don't have the item already
124
124
  * @tsplus fluent Repository removeById
package/dist/services/RepositoryBase.d.ts CHANGED
@@ -88,8 +88,8 @@ export declare class RepositoryBaseC3<T extends {
88
88
  get(id: T["id"]): Effect.Effect<T, NotFoundError<ItemType>, never>;
89
89
  readonly log: (evt: Evt) => import("effect-app/Pure").PureLogT<any>;
90
90
  removeById(id: T["id"]): Effect.Effect<void, NotFoundError<ItemType>, never>;
91
- readonly save: (items_0: T, ...items_1: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
92
- readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
91
+ readonly save: (items_0: T, ...items_1: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
92
+ readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
93
93
  readonly queryAndSavePure: {
94
94
  <A, E2, R2, T2 extends T>(q: (q: Query<Encoded>) => QueryEnd<Encoded, "one">, pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2, Exclude<R2, {
95
95
  env: PureEnv<Evt, T, T2>;
@@ -106,7 +106,7 @@ export declare class RepositoryBaseC3<T extends {
106
106
  */
107
107
  readonly handleByIdAndSaveWithPure: <Req extends {
108
108
  id: T["id"];
109
- }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | NotFoundError<ItemType> | E, Exclude<R, {
109
+ }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E, Exclude<R, {
110
110
  env: PureEnv<Evt, T, S2>;
111
111
  }>>;
112
112
  saveManyWithPure: {
@@ -122,7 +122,7 @@ export declare class RepositoryBaseC3<T extends {
122
122
  env: PureEnv<Evt, T, S2>;
123
123
  }>>;
124
124
  };
125
- saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | E, Exclude<R, {
125
+ saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | E, Exclude<R, {
126
126
  env: PureEnv<Evt, S1, S2>;
127
127
  }>>;
128
128
  }
@@ -145,7 +145,7 @@ export declare function makeRepo<Evt = never>(): <ItemType extends string, R, En
145
145
  config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
146
146
  partitionValue?: (a: Encoded) => string;
147
147
  };
148
- }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, StoreMaker | ContextMapContainer | R | RInitial | R2>;
148
+ }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, R | StoreMaker | ContextMapContainer | RInitial | R2>;
149
149
  Q: Query<Encoded>;
150
150
  };
151
151
  export declare function makeStore<Encoded extends {
@@ -156,7 +156,7 @@ export declare function makeStore<Encoded extends {
156
156
  id: unknown;
157
157
  }>(name: ItemType, schema: S.Schema<T, E, R>, mapTo: (e: E, etag: string | undefined) => Encoded) => <RInitial = never, EInitial = never>(makeInitial?: Effect<readonly T[], EInitial, RInitial>, config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
158
158
  partitionValue?: (a: Encoded) => string;
159
- }) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, StoreMaker | R | RInitial>;
159
+ }) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, R | StoreMaker | RInitial>;
160
160
  export interface Repos<T extends {
161
161
  id: unknown;
162
162
  }, Encoded extends {
package/dist/services/RepositoryBase.js CHANGED
@@ -308,7 +308,7 @@ export function makeStore() {
308
308
  const makeRepoFunctions = (tag, itemType) => {
309
309
  const { all } = Effect.serviceConstants(tag);
310
310
  const { byIdAndSaveWithPure, find, get, query, queryAndSavePure, removeAndPublish, removeById, save, saveAndPublish, saveManyWithPure } = Effect.serviceFunctions(tag);
311
- const mapped = (s) => tag.map((_) => _.mapped(s));
311
+ const mapped = (s) => Effect.map(tag, (_) => _.mapped(s));
312
312
  return {
313
313
  itemType,
314
314
  all,
@@ -380,4 +380,4 @@ export const makeRequest = (repo) => {
380
380
  .pipe(RequestResolver.batchN(20), RequestResolver.contextFromServices(repo));
381
381
  return (id) => Effect.request(_request({ id }), requestResolver);
382
382
  };
383
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
383
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
package/dist/services/Store/ContextMapContainer.d.ts CHANGED
@@ -20,7 +20,7 @@ declare const ContextMapContainer_base: (abstract new (service: {
20
20
  use: <X>(body: (_: {
21
21
  get: Effect<ContextMap>;
22
22
  start: Effect<void>;
23
- }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, R_3 | ContextMapContainer> : Effect<X, never, ContextMapContainer>;
23
+ }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, ContextMapContainer | R_3> : Effect<X, never, ContextMapContainer>;
24
24
  };
25
25
  /**
26
26
  * @tsplus companion ContextMapContainer.Ops
package/dist/services/Store/codeFilter.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { FilterR, FilterResult } from "./filterApi/query.js";
2
2
  export declare const codeFilterStatement: <E>(p: FilterR, x: E) => boolean;
3
3
  export declare const codeFilter3: <E>(state: readonly FilterResult[]) => (sut: E) => boolean;
4
- export declare const codeFilter3_: <E>(state: readonly FilterResult[], sut: E, statements?: any[]) => boolean;
4
+ export declare const codeFilter3_: <E>(state: readonly FilterResult[], sut: E) => boolean;
5
5
  //# sourceMappingURL=codeFilter.d.ts.map
package/dist/services/Store/codeFilter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGjE,eAAO,MAAM,mBAAmB,GAAI,CAAC,KAAK,OAAO,KAAK,CAAC,YAgDtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AACtG,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO,CAAC,eAAc,GAAG,EAAE,KAAQ,OA6ChG,CAAA"}
1
+ {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGjE,eAAO,MAAM,mBAAmB,GAAI,CAAC,KAAK,OAAO,KAAK,CAAC,YAgDtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AAgDtG,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO,CAAC,KAAG,OAGxE,CAAA"}
package/dist/services/Store/codeFilter.js CHANGED
@@ -51,7 +51,7 @@ export const codeFilterStatement = (p, x) => {
51
51
  }
52
52
  };
53
53
  export const codeFilter3 = (state) => (sut) => codeFilter3_(state, sut);
54
- export const codeFilter3_ = (state, sut, statements = []) => {
54
+ const codeFilter3__ = (state, sut, statements) => {
55
55
  let s = "";
56
56
  let l = 0;
57
57
  const printN = (n) => {
@@ -74,27 +74,29 @@ export const codeFilter3_ = (state, sut, statements = []) => {
74
74
  s += " && " + `statements[${statements.length - 1}]()`;
75
75
  break;
76
76
  case "or-scope": {
77
- ;
78
77
  ++l;
79
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
78
+ s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
80
79
  --l;
81
80
  break;
82
81
  }
83
82
  case "and-scope": {
84
- ;
85
83
  ++l;
86
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
84
+ s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
87
85
  --l;
88
86
  break;
89
87
  }
90
88
  case "where-scope": {
91
89
  // ;++l
92
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`;
90
+ s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n)`;
93
91
  // ;--l
94
92
  break;
95
93
  }
96
94
  }
97
95
  }
96
+ return s;
97
+ };
98
+ export const codeFilter3_ = (state, sut) => {
99
+ const s = codeFilter3__(state, sut, []);
98
100
  return eval(s);
99
101
  };
100
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEdBQUcsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXpELE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLG9CQUFvQixFQUFFLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0RyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxDQUFJLENBQVUsRUFBRSxDQUFJLEVBQUUsRUFBRTtJQUN6RCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QixRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNiLEtBQUssSUFBSTtZQUNQLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDNUIsS0FBSyxPQUFPO1lBQ1YsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzdCLEtBQUssSUFBSTtZQUNQLE9BQU8sU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxLQUFLO1lBQ1IsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3ZDLEtBQUssSUFBSTtZQUNQLE9BQU8sV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsS0FBSyxLQUFLO1lBQ1IsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3pDLEtBQUssVUFBVTtZQUNiLE9BQVEsQ0FBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQy9DLEtBQUssYUFBYTtZQUNoQixPQUFPLENBQUUsQ0FBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ2hELEtBQUssVUFBVTtZQUNiLE9BQVEsQ0FBWSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUE7UUFDcEUsS0FBSyxVQUFVO1lBQ2IsT0FBUSxDQUFZLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQTtRQUNwRSxLQUFLLFlBQVk7WUFDZixPQUFRLENBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFBO1FBQ3RFLEtBQUssYUFBYTtZQUNoQixPQUFPLENBQUUsQ0FBWSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUE7UUFDckUsS0FBSyxhQUFhO1lBQ2hCLE9BQU8sQ0FBRSxDQUFZLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQTtRQUNyRSxLQUFLLGVBQWU7WUFDbEIsT0FBTyxDQUFFLENBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFBO1FBQ3ZFLEtBQUssS0FBSztZQUNSLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO2dCQUM1QixDQUFDLENBQUUsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBVztvQkFDMUMsa0JBQWtCO3FCQUNqQixLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3BFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzFCLEtBQUssSUFBSSxDQUFDO1FBQ1YsS0FBSyxTQUFTO1lBQ1osT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7Z0JBQzVCLENBQUMsQ0FBRSxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFXO29CQUMxQyxrQkFBa0I7cUJBQ2pCLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ2xFLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUN6QixPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ1IsT0FBTyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDaEMsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBSSxLQUE4QixFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQU0sRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQTtBQUN0RyxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsQ0FBSSxLQUE4QixFQUFFLEdBQU0sRUFBRSxhQUFvQixFQUFFLEVBQVcsRUFBRTtJQUN6RyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUE7SUFDVixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDVCxNQUFNLE1BQU0sR0FBRyxDQUFDLENBQVMsRUFBRSxFQUFFO1FBQzNCLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ2xFLENBQUMsQ0FBQTtJQUNELHlCQUF5QjtJQUV6QixNQUFNLE9BQU8sR0FBRyxDQUFDLENBQVUsRUFBRSxFQUFFLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQzNELEtBQUssTUFBTSxDQUFDLElBQUksS0FBSyxFQUFFLENBQUM7UUFDdEIsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDWixLQUFLLE9BQU87Z0JBQ1YsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDakMsQ0FBQyxJQUFJLGNBQWMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEtBQUssQ0FBQTtnQkFDN0MsTUFBSztZQUNQLEtBQUssSUFBSTtnQkFDUCxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUNqQyxDQUFDLElBQUksTUFBTSxHQUFHLGNBQWMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEtBQUssQ0FBQTtnQkFDdEQsTUFBSztZQUNQLEtBQUssS0FBSztnQkFDUixVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUNqQyxDQUFDLElBQUksTUFBTSxHQUFHLGNBQWMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEtBQUssQ0FBQTtnQkFDdEQsTUFBSztZQUNQLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDaEIsQ0FBQztnQkFBQSxFQUFFLENBQUMsQ0FBQTtnQkFDSixDQUFDLElBQUksVUFBVSxNQUFNLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxVQUFVLENBQUMsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FDdEY7Z0JBQUEsRUFBRSxDQUFDLENBQUE7Z0JBQ0osTUFBSztZQUNQLENBQUM7WUFDRCxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7Z0JBQ2pCLENBQUM7Z0JBQUEsRUFBRSxDQUFDLENBQUE7Z0JBQ0osQ0FBQyxJQUFJLFVBQVUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsVUFBVSxDQUFDLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQ3RGO2dCQUFBLEVBQUUsQ0FBQyxDQUFBO2dCQUVKLE1BQUs7WUFDUCxDQUFDO1lBQ0QsS0FBSyxhQUFhLENBQUMsQ0FBQyxDQUFDO2dCQUNuQixPQUFPO2dCQUNQLENBQUMsSUFBSSxNQUFNLE1BQU0sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsR0FBRyxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUE7Z0JBQ3ZFLE9BQU87Z0JBQ1AsTUFBSztZQUNQLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2hCLENBQUMsQ0FBQSJ9
102
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEdBQUcsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXpELE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLG9CQUFvQixFQUFFLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0RyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxDQUFJLENBQVUsRUFBRSxDQUFJLEVBQUUsRUFBRTtJQUN6RCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QixRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNiLEtBQUssSUFBSTtZQUNQLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDNUIsS0FBSyxPQUFPO1lBQ1YsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzdCLEtBQUssSUFBSTtZQUNQLE9BQU8sU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxLQUFLO1lBQ1IsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3ZDLEtBQUssSUFBSTtZQUNQLE9BQU8sV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsS0FBSyxLQUFLO1lBQ1IsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUss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
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "1.11.1",
3
+ "version": "1.11.3",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@azure/cosmos": "^4.0.0",
7
+ "@azure/cosmos": "^4.1.0",
8
8
  "@azure/service-bus": "^7.9.5",
9
9
  "express-oauth2-jwt-bearer": "^1.6.0",
10
10
  "@faker-js/faker": "^8.4.1",
@@ -12,22 +12,22 @@
12
12
  "@sendgrid/mail": "^8.1.3",
13
13
  "change-case": "^5.4.4",
14
14
  "cross-fetch": "^4.0.0",
15
- "fast-check": "~3.20.0",
15
+ "fast-check": "~3.21.0",
16
16
  "object-hash": "^3.0.0",
17
17
  "path-parser": "^6.1.0",
18
18
  "proper-lockfile": "^4.1.2",
19
19
  "pure-rand": "6.1.0",
20
20
  "redlock": "^4.2.0",
21
- "@effect-app/core": "1.6.0",
22
- "@effect-app/infra-adapters": "1.7.1",
23
- "@effect-app/schema": "1.6.0",
24
- "effect-app": "1.9.1"
21
+ "effect-app": "1.9.2",
22
+ "@effect-app/infra-adapters": "1.7.2",
23
+ "@effect-app/schema": "1.6.1",
24
+ "@effect-app/core": "1.6.1"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@babel/cli": "^7.24.8",
28
- "@sentry/node": "^8.23.0",
28
+ "@sentry/node": "^8.26.0",
29
29
  "@types/express": "^4.17.21",
30
- "@types/node": "~22.1.0",
30
+ "@types/node": "~22.3.0",
31
31
  "@types/proper-lockfile": "^4.1.4",
32
32
  "@types/redis": "^2.8.32",
33
33
  "@types/redlock": "^4.0.7",
@@ -42,9 +42,9 @@
42
42
  },
43
43
  "peerDependencies": {
44
44
  "express": "^4.19.2",
45
- "@effect/platform": "^0.61.4",
46
- "@effect/schema": "^0.70.2",
47
- "effect": "^3.6.1"
45
+ "@effect/platform": "^0.61.8",
46
+ "@effect/schema": "^0.70.4",
47
+ "effect": "^3.6.3"
48
48
  },
49
49
  "typesVersions": {
50
50
  "*": {
package/src/filter/types/errors.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { FieldValues, InternalFieldName, Ref } from "./fields.js"
1
+ import type { FieldValues, InternalFieldName } from "./fields.js"
2
2
  import type { BrowserNativeObject, IsAny, LiteralUnion, Merge } from "./utils.js"
3
3
  import type { RegisterOptions, ValidateResult } from "./validator.js"
4
4
 
@@ -15,7 +15,7 @@ export type MultipleFieldErrors =
15
15
  export type FieldError = {
16
16
  type: LiteralUnion<keyof RegisterOptions, string>
17
17
  root?: FieldError
18
- ref?: Ref
18
+ // ref?: Ref
19
19
  types?: MultipleFieldErrors
20
20
  message?: Message
21
21
  }
package/src/filter/types/fields.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { IsFlatObject, Noop } from "./utils.js"
1
+ import type { IsFlatObject } from "./utils.js"
2
2
  import type { RegisterOptions } from "./validator.js"
3
3
 
4
4
  export type InternalFieldName = string
@@ -7,16 +7,16 @@ export type FieldName<TFieldValues extends FieldValues> = IsFlatObject<TFieldVal
7
7
  ? Extract<keyof TFieldValues, string>
8
8
  : string
9
9
 
10
- export type CustomElement<TFieldValues extends FieldValues> = {
11
- name: FieldName<TFieldValues>
12
- type?: string
13
- value?: any
14
- disabled?: boolean
15
- checked?: boolean
16
- options?: HTMLOptionsCollection
17
- files?: FileList | null
18
- focus?: Noop
19
- }
10
+ // export type CustomElement<TFieldValues extends FieldValues> = {
11
+ // name: FieldName<TFieldValues>
12
+ // type?: string
13
+ // value?: any
14
+ // disabled?: boolean
15
+ // checked?: boolean
16
+ // options?: HTMLOptionsCollection
17
+ // files?: FileList | null
18
+ // focus?: Noop
19
+ // }
20
20
 
21
21
  export type FieldValue<TFieldValues extends FieldValues> = TFieldValues[InternalFieldName]
22
22
 
@@ -30,19 +30,19 @@ export type NativeFieldValue =
30
30
  | undefined
31
31
  | unknown[]
32
32
 
33
- export type FieldElement<TFieldValues extends FieldValues = FieldValues> =
34
- | HTMLInputElement
35
- | HTMLSelectElement
36
- | HTMLTextAreaElement
37
- | CustomElement<TFieldValues>
33
+ // export type FieldElement<TFieldValues extends FieldValues = FieldValues> =
34
+ // | HTMLInputElement
35
+ // | HTMLSelectElement
36
+ // | HTMLTextAreaElement
37
+ // | CustomElement<TFieldValues>
38
38
 
39
- export type Ref = FieldElement
39
+ // export type Ref = FieldElement
40
40
 
41
41
  export type Field = {
42
42
  _f: {
43
- ref: Ref
43
+ // ref: Ref
44
44
  name: InternalFieldName
45
- refs?: HTMLInputElement[]
45
+ // refs?: HTMLInputElement[]
46
46
  mount?: boolean
47
47
  } & RegisterOptions
48
48
  }
package/src/services/RepositoryBase.ts CHANGED
@@ -908,7 +908,7 @@ const makeRepoFunctions = (tag: any, itemType: any) => {
908
908
  saveManyWithPure
909
909
  } = Effect.serviceFunctions(tag) as any
910
910
 
911
- const mapped = (s: any) => tag.map((_: any) => _.mapped(s))
911
+ const mapped = (s: any) => Effect.map(tag, (_: any) => _.mapped(s))
912
912
 
913
913
  return {
914
914
  itemType,
package/src/services/Store/codeFilter.ts CHANGED
@@ -54,7 +54,7 @@ export const codeFilterStatement = <E>(p: FilterR, x: E) => {
54
54
  }
55
55
 
56
56
  export const codeFilter3 = <E>(state: readonly FilterResult[]) => (sut: E) => codeFilter3_(state, sut)
57
- export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E, statements: any[] = []): boolean => {
57
+ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: any[]): string => {
58
58
  let s = ""
59
59
  let l = 0
60
60
  const printN = (n: number) => {
@@ -78,25 +78,30 @@ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E, statemen
78
78
  s += " && " + `statements[${statements.length - 1}]()`
79
79
  break
80
80
  case "or-scope": {
81
- ;++l
82
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`
83
- ;--l
81
+ ++l
82
+ s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
83
+ --l
84
84
  break
85
85
  }
86
86
  case "and-scope": {
87
- ;++l
88
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`
89
- ;--l
87
+ ++l
88
+ s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
89
+ --l
90
90
 
91
91
  break
92
92
  }
93
93
  case "where-scope": {
94
94
  // ;++l
95
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`
95
+ s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n)`
96
96
  // ;--l
97
97
  break
98
98
  }
99
99
  }
100
100
  }
101
+ return s
102
+ }
103
+
104
+ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E): boolean => {
105
+ const s = codeFilter3__(state, sut, [])
101
106
  return eval(s)
102
107
  }