@genesislcap/foundation-ui 14.251.2 → 14.251.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.
@@ -121,7 +121,7 @@ export declare function groupToRuleExpression(group: ExpressionBuilderTypes.Grou
121
121
  *
122
122
  * @internal
123
123
  **/
124
- export declare function transformServerNameToOperatorName(op: RuleExpression.Operation): Operators;
124
+ export declare function transformServerNameToOperatorName(op: RuleExpression.Operation, rulePartialField: Pick<ExpressionBuilderTypes.Rule, 'field'>): Operators;
125
125
  /**
126
126
  * Converts a server field value to a client field value
127
127
  *
@@ -143,7 +143,7 @@ export declare function rebuildRuleValue(rule: Omit<ExpressionBuilderTypes.Rule,
143
143
  *
144
144
  * @internal
145
145
  **/
146
- export declare function rebuildOperator(binExpr: RuleExpression.Expression['BinaryExpression']): ExpressionBuilderTypes.Operator;
146
+ export declare function rebuildOperator(rulePartialField: Pick<ExpressionBuilderTypes.Rule, 'field'>, binExpr: RuleExpression.Expression['BinaryExpression']): Omit<ExpressionBuilderTypes.Rule, 'value'>;
147
147
  /**
148
148
  * Converts a server BinaryExpression to a client BinaryOperator
149
149
  *
@@ -1 +1 @@
1
- {"version":3,"file":"rule-expression-builder.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/rule-expression-builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rule-expression-builder.d.ts","sourceRoot":"","sources":["../../../src/expression-builder/rule-expression-builder.ts"],"names":[],"mappings":"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"}
@@ -375,7 +375,10 @@ export function groupToRuleExpression(group) {
375
375
  *
376
376
  * @internal
377
377
  **/
378
- export function transformServerNameToOperatorName(op) {
378
+ export function transformServerNameToOperatorName(op, rulePartialField) {
379
+ const useDateOperatorNames = rulePartialField.field.type === 'date' || rulePartialField.field.type === 'date-time';
380
+ if (!useDateOperatorNames)
381
+ return op;
379
382
  switch (op) {
380
383
  case 'LESS_THAN':
381
384
  return 'IS_BEFORE';
@@ -430,21 +433,24 @@ export function rebuildRuleValue(rule, rhs) {
430
433
  *
431
434
  * @internal
432
435
  **/
433
- export function rebuildOperator(binExpr) {
434
- if (binExpr.RIGHT.TYPE === 'NULL') {
435
- const op = binExpr.OPERATION === 'EQUALS'
436
- ? clientOperators[clientOperators.IS_NULL]
437
- : clientOperators[clientOperators.NOT_NULL];
438
- return logicalOperators.find((o) => o.type === op);
439
- }
440
- if (binExpr.RIGHT.TYPE === 'STRING' && binExpr.RIGHT.VALUE === '') {
441
- const op = binExpr.OPERATION === 'EQUALS'
442
- ? clientOperators[clientOperators.IS_BLANK]
443
- : clientOperators[clientOperators.NOT_BLANK];
444
- return logicalOperators.find((o) => o.type === op);
445
- }
446
- const clientOperatorName = transformServerNameToOperatorName(binExpr.OPERATION);
447
- return logicalOperators.find((o) => o.type === clientOperatorName);
436
+ export function rebuildOperator(rulePartialField, binExpr) {
437
+ const operator = (() => {
438
+ if (binExpr.RIGHT.TYPE === 'NULL') {
439
+ const op = binExpr.OPERATION === 'EQUALS'
440
+ ? clientOperators[clientOperators.IS_NULL]
441
+ : clientOperators[clientOperators.NOT_NULL];
442
+ return logicalOperators.find((o) => o.type === op);
443
+ }
444
+ if (binExpr.RIGHT.TYPE === 'STRING' && binExpr.RIGHT.VALUE === '') {
445
+ const op = binExpr.OPERATION === 'EQUALS'
446
+ ? clientOperators[clientOperators.IS_BLANK]
447
+ : clientOperators[clientOperators.NOT_BLANK];
448
+ return logicalOperators.find((o) => o.type === op);
449
+ }
450
+ const clientOperatorName = transformServerNameToOperatorName(binExpr.OPERATION, rulePartialField);
451
+ return logicalOperators.find((o) => o.type === clientOperatorName);
452
+ })();
453
+ return Object.assign(Object.assign({}, rulePartialField), { operator });
448
454
  }
449
455
  /**
450
456
  * Converts a server BinaryExpression to a client BinaryOperator
@@ -457,10 +463,9 @@ export function fromBinaryExpression(fields, binExpr) {
457
463
  throw new Error('BinaryExpression LHS must be TYPE === FIELD');
458
464
  if (!['STRING', 'NUMBER', 'BOOLEAN', 'NULL'].includes(binExpr.RIGHT.TYPE))
459
465
  throw new Error('BinaryExpression RHS must be TYPE === NUMBER | STRING | BOOLEAN | NULL');
460
- return rebuildRuleValue({
466
+ return rebuildRuleValue(rebuildOperator({
461
467
  field: fields.find((f) => f.fieldId === binExpr.LEFT.NAME),
462
- operator: rebuildOperator(binExpr),
463
- }, binExpr.RIGHT);
468
+ }, binExpr), binExpr.RIGHT);
464
469
  }
465
470
  /**
466
471
  * Converts a server MethodExpression to a client BinaryOperator
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@genesislcap/foundation-ui",
3
3
  "description": "Genesis Foundation UI",
4
- "version": "14.251.2",
4
+ "version": "14.251.3",
5
5
  "sideEffects": false,
6
6
  "license": "SEE LICENSE IN license.txt",
7
7
  "main": "dist/esm/index.js",
@@ -83,13 +83,13 @@
83
83
  }
84
84
  },
85
85
  "devDependencies": {
86
- "@genesislcap/foundation-testing": "14.251.2",
87
- "@genesislcap/genx": "14.251.2",
88
- "@genesislcap/rollup-builder": "14.251.2",
89
- "@genesislcap/ts-builder": "14.251.2",
90
- "@genesislcap/uvu-playwright-builder": "14.251.2",
91
- "@genesislcap/vite-builder": "14.251.2",
92
- "@genesislcap/webpack-builder": "14.251.2",
86
+ "@genesislcap/foundation-testing": "14.251.3",
87
+ "@genesislcap/genx": "14.251.3",
88
+ "@genesislcap/rollup-builder": "14.251.3",
89
+ "@genesislcap/ts-builder": "14.251.3",
90
+ "@genesislcap/uvu-playwright-builder": "14.251.3",
91
+ "@genesislcap/vite-builder": "14.251.3",
92
+ "@genesislcap/webpack-builder": "14.251.3",
93
93
  "copyfiles": "^2.4.1",
94
94
  "rimraf": "^5.0.0",
95
95
  "rxjs": "^7.5.4"
@@ -100,15 +100,15 @@
100
100
  "@fortawesome/free-regular-svg-icons": "^6.2.1",
101
101
  "@fortawesome/free-solid-svg-icons": "^6.2.1",
102
102
  "@genesiscommunitysuccess/analyzer-import-alias-plugin": "^5.0.3",
103
- "@genesislcap/expression-builder": "14.251.2",
104
- "@genesislcap/foundation-comms": "14.251.2",
105
- "@genesislcap/foundation-criteria": "14.251.2",
106
- "@genesislcap/foundation-errors": "14.251.2",
107
- "@genesislcap/foundation-events": "14.251.2",
108
- "@genesislcap/foundation-logger": "14.251.2",
109
- "@genesislcap/foundation-notifications": "14.251.2",
110
- "@genesislcap/foundation-user": "14.251.2",
111
- "@genesislcap/foundation-utils": "14.251.2",
103
+ "@genesislcap/expression-builder": "14.251.3",
104
+ "@genesislcap/foundation-comms": "14.251.3",
105
+ "@genesislcap/foundation-criteria": "14.251.3",
106
+ "@genesislcap/foundation-errors": "14.251.3",
107
+ "@genesislcap/foundation-events": "14.251.3",
108
+ "@genesislcap/foundation-logger": "14.251.3",
109
+ "@genesislcap/foundation-notifications": "14.251.3",
110
+ "@genesislcap/foundation-user": "14.251.3",
111
+ "@genesislcap/foundation-utils": "14.251.3",
112
112
  "@microsoft/fast-colors": "5.3.1",
113
113
  "@microsoft/fast-components": "2.30.6",
114
114
  "@microsoft/fast-element": "1.14.0",
@@ -130,5 +130,5 @@
130
130
  "access": "public"
131
131
  },
132
132
  "customElements": "dist/custom-elements.json",
133
- "gitHead": "328275e4c0bc2bf60422f750f9a0dc4e081a81b4"
133
+ "gitHead": "5a56f509e59932ae9709b00538706f06a52121c5"
134
134
  }