@effect-app/infra 0.197.0 → 0.198.0

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 0.198.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 32b21bf: lazy codeFilter3 statements
8
+
3
9
  ## 0.197.0
4
10
 
5
11
  ### Minor Changes
@@ -101,7 +101,7 @@ const codeFilterStatement = (p, x) => {
101
101
  exports.codeFilterStatement = codeFilterStatement;
102
102
  const codeFilter3 = state => sut => codeFilter3_(state, sut);
103
103
  exports.codeFilter3 = codeFilter3;
104
- const codeFilter3_ = (state, sut) => {
104
+ const codeFilter3_ = (state, sut, statements = []) => {
105
105
  let s = "";
106
106
  let l = 0;
107
107
  const printN = n => {
@@ -112,19 +112,22 @@ const codeFilter3_ = (state, sut) => {
112
112
  for (const e of state) {
113
113
  switch (e.t) {
114
114
  case "where":
115
- s += process(e);
115
+ statements.push(() => process(e));
116
+ s += `statements[${statements.length - 1}]()`;
116
117
  break;
117
118
  case "or":
118
- s += " || " + process(e);
119
+ statements.push(() => process(e));
120
+ s += " || " + `statements[${statements.length - 1}]()`;
119
121
  break;
120
122
  case "and":
121
- s += " && " + process(e);
123
+ statements.push(() => process(e));
124
+ s += " && " + `statements[${statements.length - 1}]()`;
122
125
  break;
123
126
  case "or-scope":
124
127
  {
125
128
  ;
126
129
  ++l;
127
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`;
130
+ s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
128
131
  --l;
129
132
  break;
130
133
  }
@@ -132,14 +135,14 @@ const codeFilter3_ = (state, sut) => {
132
135
  {
133
136
  ;
134
137
  ++l;
135
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`;
138
+ s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
136
139
  --l;
137
140
  break;
138
141
  }
139
142
  case "where-scope":
140
143
  {
141
144
  // ;++l
142
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n)`;
145
+ s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`;
143
146
  // ;--l
144
147
  break;
145
148
  }
@@ -1 +1 @@
1
- {"version":3,"file":"codeFilter.cjs","names":["_utils","require","_utils2","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","codeFilterStatement","p","x","k","path","op","value","includes","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive","toLowerCase","endsWith","startsWith","split","every","_","compare","undefined","some","assertUnreachable","exports","codeFilter3","state","sut","codeFilter3_","s","l","printN","tsplus_module_1","range","map","join","process","result","eval"],"sources":["../../../src/services/Store/codeFilter.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"codeFilter.cjs","names":["_utils","require","_utils2","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","codeFilterStatement","p","x","k","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","tsplus_module_1","range","map","join","process","push","length","result","eval"],"sources":["../../../src/services/Store/codeFilter.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -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) => boolean;
4
+ export declare const codeFilter3_: <E>(state: readonly FilterResult[], sut: E, statements?: any[]) => boolean;
5
5
  //# sourceMappingURL=codeFilter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGjE,eAAO,MAAM,mBAAmB,SAAU,OAAO,KAAK,CAAC,YAgDtD,CAAA;AAgDD,eAAO,MAAM,WAAW,aAAc,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AACtG,eAAO,MAAM,YAAY,aAAc,SAAS,YAAY,EAAE,OAAO,CAAC,KAAG,OA0CxE,CAAA"}
1
+ {"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGjE,eAAO,MAAM,mBAAmB,SAAU,OAAO,KAAK,CAAC,YAgDtD,CAAA;AAgDD,eAAO,MAAM,WAAW,aAAc,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AACtG,eAAO,MAAM,YAAY,aAAc,SAAS,YAAY,EAAE,OAAO,CAAC,eAAc,GAAG,EAAE,KAAQ,OA6ChG,CAAA"}
@@ -94,7 +94,7 @@ export const codeFilterStatement = (p, x) => {
94
94
  // // or<E, NE>(filters, x)
95
95
  // }
96
96
  export const codeFilter3 = (state) => (sut) => codeFilter3_(state, sut);
97
- export const codeFilter3_ = (state, sut) => {
97
+ export const codeFilter3_ = (state, sut, statements = []) => {
98
98
  let s = "";
99
99
  let l = 0;
100
100
  const printN = (n) => {
@@ -105,31 +105,34 @@ export const codeFilter3_ = (state, sut) => {
105
105
  for (const e of state) {
106
106
  switch (e.t) {
107
107
  case "where":
108
- s += process(e);
108
+ statements.push(() => process(e));
109
+ s += `statements[${statements.length - 1}]()`;
109
110
  break;
110
111
  case "or":
111
- s += " || " + process(e);
112
+ statements.push(() => process(e));
113
+ s += " || " + `statements[${statements.length - 1}]()`;
112
114
  break;
113
115
  case "and":
114
- s += " && " + process(e);
116
+ statements.push(() => process(e));
117
+ s += " && " + `statements[${statements.length - 1}]()`;
115
118
  break;
116
119
  case "or-scope": {
117
120
  ;
118
121
  ++l;
119
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`;
122
+ s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
120
123
  --l;
121
124
  break;
122
125
  }
123
126
  case "and-scope": {
124
127
  ;
125
128
  ++l;
126
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`;
129
+ s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`;
127
130
  --l;
128
131
  break;
129
132
  }
130
133
  case "where-scope": {
131
134
  // ;++l
132
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n)`;
135
+ s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`;
133
136
  // ;--l
134
137
  break;
135
138
  }
@@ -137,4 +140,4 @@ export const codeFilter3_ = (state, sut) => {
137
140
  }
138
141
  return eval(s);
139
142
  };
140
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsR0FBRyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsb0JBQW9CLEVBQUUsU0FBUyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRXRHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUksQ0FBVSxFQUFFLENBQUksRUFBRSxFQUFFO0lBQ3pELE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3hCLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ2IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM1QixLQUFLLE9BQU87WUFDVixPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDN0IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLEtBQUs7WUFDUixPQUFPLGtCQUFrQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDdkMsS0FBSyxJQUFJO1lBQ1AsT0FBTyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNoQyxLQUFLLEtBQUs7WUFDUixPQUFPLG9CQUFvQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDekMsS0FBSyxVQUFVO1lBQ2IsT0FBUSxDQUFt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
143
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsR0FBRyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsb0JBQW9CLEVBQUUsU0FBUyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRXRHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUksQ0FBVSxFQUFFLENBQUksRUFBRSxFQUFFO0lBQ3pELE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3hCLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ2IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM1QixLQUFLLE9BQU87WUFDVixPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDN0IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLEtBQUs7WUFDUixPQUFPLGtCQUFrQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDdkMsS0FBSyxJQUFJO1lBQ1AsT0FBTyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNoQyxLQUFLLEtBQUs7WUFDUixPQUFPLG9CQUFvQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDekMsS0FBSyxVQUFVO1lBQ2IsT0FBUSxDQUFt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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "0.197.0",
3
+ "version": "0.198.0",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -21,8 +21,8 @@
21
21
  "@effect-app/core": "0.146.1",
22
22
  "@effect-app/infra-adapters": "0.133.3",
23
23
  "@effect-app/fluent-extensions": "0.139.0",
24
- "@effect-app/schema": "0.197.1",
25
- "effect-app": "0.173.3"
24
+ "effect-app": "0.173.3",
25
+ "@effect-app/schema": "0.197.1"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@babel/cli": "^7.23.9",
@@ -99,7 +99,7 @@ export const codeFilterStatement = <E>(p: FilterR, x: E) => {
99
99
  // }
100
100
 
101
101
  export const codeFilter3 = <E>(state: readonly FilterResult[]) => (sut: E) => codeFilter3_(state, sut)
102
- export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E): boolean => {
102
+ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E, statements: any[] = []): boolean => {
103
103
  let s = ""
104
104
  let l = 0
105
105
  const printN = (n: number) => {
@@ -111,30 +111,33 @@ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E): boolean
111
111
  for (const e of state) {
112
112
  switch (e.t) {
113
113
  case "where":
114
- s += process(e)
114
+ statements.push(() => process(e))
115
+ s += `statements[${statements.length - 1}]()`
115
116
  break
116
117
  case "or":
117
- s += " || " + process(e)
118
+ statements.push(() => process(e))
119
+ s += " || " + `statements[${statements.length - 1}]()`
118
120
  break
119
121
  case "and":
120
- s += " && " + process(e)
122
+ statements.push(() => process(e))
123
+ s += " && " + `statements[${statements.length - 1}]()`
121
124
  break
122
125
  case "or-scope": {
123
126
  ;++l
124
- s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`
127
+ s += ` || (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`
125
128
  ;--l
126
129
  break
127
130
  }
128
131
  case "and-scope": {
129
132
  ;++l
130
- s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n${printN(l)})`
133
+ s += ` && (\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n${printN(l)})`
131
134
  ;--l
132
135
 
133
136
  break
134
137
  }
135
138
  case "where-scope": {
136
139
  // ;++l
137
- s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut)}\n)`
140
+ s += `(\n${printN(l + 1)}${codeFilter3_(e.result, sut, statements)}\n)`
138
141
  // ;--l
139
142
  break
140
143
  }