@reekon-tools/boldr-utils 1.0.9 → 1.0.11
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/dist/formulas/createFormulaScope.js +3 -3
- package/dist/formulas/createFormulaScope.js.map +1 -1
- package/dist/formulas/evaluateColumnValue.js +4 -5
- package/dist/formulas/evaluateColumnValue.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/utils/evaluateFormula.js +2 -2
- package/dist/utils/evaluateFormula.js.map +1 -1
- package/package.json +11 -11
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FractionalTolerance, DecimalTolerance } from '..';
|
|
2
2
|
import { ColumnType } from '..';
|
|
3
|
-
import { convertMicrometers } from '../utils/micrometersToUnit
|
|
3
|
+
import { convertMicrometers } from '../utils/micrometersToUnit';
|
|
4
4
|
export function createFormulaScope({ group, mappings, columns, measurementMap, unit, // user preferred unit, e.g., 'in' or 'cm'
|
|
5
5
|
}) {
|
|
6
6
|
const scope = {};
|
|
@@ -8,10 +8,10 @@ export function createFormulaScope({ group, mappings, columns, measurementMap, u
|
|
|
8
8
|
const rawValue = group.columns.get(columnId);
|
|
9
9
|
const columnDef = columns.find((c) => c.id === columnId);
|
|
10
10
|
let parsedValue;
|
|
11
|
-
if (
|
|
11
|
+
if (columnDef?.type === ColumnType.Measurement) {
|
|
12
12
|
const groupMeasurements = measurementMap.get(group.id) || [];
|
|
13
13
|
const measurement = groupMeasurements.find((m) => m.id === rawValue);
|
|
14
|
-
if (
|
|
14
|
+
if (measurement?.value !== undefined) {
|
|
15
15
|
// Here, the unit
|
|
16
16
|
parsedValue = parseFloat(convertMicrometers(measurement.value, unit, FractionalTolerance.Sixteenth, DecimalTolerance.Hundredth).value);
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFormulaScope.js","sourceRoot":"","sources":["../../src/formulas/createFormulaScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAS,MAAM,IAAI,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"createFormulaScope.js","sourceRoot":"","sources":["../../src/formulas/createFormulaScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAS,MAAM,IAAI,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,MAAM,UAAU,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,EACR,OAAO,EACP,cAAc,EACd,IAAI,EAAE,0CAA0C;EAOjD;IACC,MAAM,KAAK,GAA2B,EAAE,CAAC;IAEzC,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;QAEzD,IAAI,WAA+B,CAAC;QAEpC,IAAI,SAAS,EAAE,IAAI,KAAK,UAAU,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAC7D,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YACrE,IAAI,WAAW,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;gBACrC,kBAAkB;gBAClB,WAAW,GAAG,UAAU,CAAC,kBAAkB,CACvC,WAAW,CAAC,KAAK,EACjB,IAAa,EACb,mBAAmB,CAAC,SAAS,EAC7B,gBAAgB,CAAC,SAAS,CAC3B,CAAC,KAAK,CAAC,CAAC;YACb,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW;gBACT,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,WAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAY,CAAC;IAC3D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import { ColumnType } from '..';
|
|
2
|
-
import { createFormulaScope } from './createFormulaScope
|
|
2
|
+
import { createFormulaScope } from './createFormulaScope';
|
|
3
3
|
import { compile, unit as mathUnit } from 'mathjs';
|
|
4
|
-
import { normalizeUnitForMathJS } from './mathUnitMap
|
|
4
|
+
import { normalizeUnitForMathJS } from './mathUnitMap';
|
|
5
5
|
export function evaluateColumnValue({ group, col, formulas, columns, measurementMap, userUnit, }) {
|
|
6
|
-
var _a;
|
|
7
6
|
// Normalize immediately
|
|
8
7
|
const normalizedUnit = normalizeUnitForMathJS(userUnit);
|
|
9
8
|
if (col.type === ColumnType.Measurement) {
|
|
10
9
|
const value = group.columns.get(col.id);
|
|
11
10
|
const groupMeasurements = measurementMap.get(group.id) || [];
|
|
12
11
|
const measurement = groupMeasurements.find((m) => m.id === value);
|
|
13
|
-
return measurement
|
|
12
|
+
return measurement ?? value;
|
|
14
13
|
}
|
|
15
14
|
if (col.type === ColumnType.Formula) {
|
|
16
15
|
const formula = formulas.find((f) => f.id === col.formulaId);
|
|
@@ -43,6 +42,6 @@ export function evaluateColumnValue({ group, col, formulas, columns, measurement
|
|
|
43
42
|
return null;
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
|
-
return
|
|
45
|
+
return group.columns.get(col.id) ?? '';
|
|
47
46
|
}
|
|
48
47
|
//# sourceMappingURL=evaluateColumnValue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateColumnValue.js","sourceRoot":"","sources":["../../src/formulas/evaluateColumnValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAgB,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"evaluateColumnValue.js","sourceRoot":"","sources":["../../src/formulas/evaluateColumnValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAgB,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,UAAU,mBAAmB,CAAC,EAClC,KAAK,EACL,GAAG,EACH,QAAQ,EACR,OAAO,EACP,cAAc,EACd,QAAQ,GAQT;IACC,wBAAwB;IACxB,MAAM,cAAc,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;QAClE,OAAO,WAAW,IAAI,KAAK,CAAC;IAC9B,CAAC;IAED,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YACzD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,kBAAkB,CAAC;gBAC/B,KAAK;gBACL,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,OAAO;gBACP,cAAc;gBACd,IAAI,EAAE,cAAc,EAAE,gBAAgB;aACvC,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAExC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YAEhD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,WAAW,EAAE,2BAA2B,cAAc,EAAE,CAAC,CAAC;YACzG,CAAC;YAED,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;AACzC,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './types/firestore
|
|
2
|
-
export { evaluateColumnValue } from './formulas/evaluateColumnValue
|
|
1
|
+
export * from './types/firestore';
|
|
2
|
+
export { evaluateColumnValue } from './formulas/evaluateColumnValue';
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
export { evaluateColumnValue } from './formulas/evaluateColumnValue.js';
|
|
1
|
+
export * from './types/firestore';
|
|
2
|
+
export { evaluateColumnValue } from './formulas/evaluateColumnValue';
|
|
4
3
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC"}
|
|
@@ -5,10 +5,10 @@ export function evaluateFormula({ expression, mappings, group, columns, measurem
|
|
|
5
5
|
for (const [variable, columnId] of Object.entries(mappings)) {
|
|
6
6
|
const rawValue = group.columns.get(columnId);
|
|
7
7
|
const columnDef = columns.find((c) => c.id === columnId);
|
|
8
|
-
if (
|
|
8
|
+
if (columnDef?.type === 'Measurement') {
|
|
9
9
|
const groupMeasurements = measurementMap.get(group.id) || [];
|
|
10
10
|
const measurement = groupMeasurements.find((m) => m.id === rawValue);
|
|
11
|
-
if (
|
|
11
|
+
if (measurement?.value !== undefined) {
|
|
12
12
|
scope[variable] = math.unit(measurement.value, defaultUnit);
|
|
13
13
|
continue;
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateFormula.js","sourceRoot":"","sources":["../../src/utils/evaluateFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAQ,MAAM,QAAQ,CAAC;AAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;AAazB,MAAM,UAAU,eAAe,CAAC,EAC9B,UAAU,EACV,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,EACd,WAAW,GAAG,IAAI,GACO;IACzB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;QAEzD,IAAI,
|
|
1
|
+
{"version":3,"file":"evaluateFormula.js","sourceRoot":"","sources":["../../src/utils/evaluateFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAQ,MAAM,QAAQ,CAAC;AAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;AAazB,MAAM,UAAU,eAAe,CAAC,EAC9B,UAAU,EACV,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,EACd,WAAW,GAAG,IAAI,GACO;IACzB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;QAEzD,IAAI,SAAS,EAAE,IAAI,KAAK,aAAa,EAAE,CAAC;YACtC,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAC7D,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YACrE,IAAI,WAAW,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;gBACrC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBAC5D,SAAS;YACX,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GACf,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACvE,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACzD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QACjD,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reekon-tools/boldr-utils",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.11",
|
|
4
4
|
"description": "Shared utilities for Boldr projects in Reekon Tools",
|
|
5
|
-
"
|
|
6
|
-
"
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "./dist/index.js",
|
|
7
|
+
"types": "./dist/index.d.ts",
|
|
8
|
+
"exports": {
|
|
9
|
+
".": {
|
|
10
|
+
"import": "./dist/index.js",
|
|
11
|
+
"types": "./dist/index.d.ts"
|
|
12
|
+
}
|
|
13
|
+
},
|
|
7
14
|
"files": [
|
|
8
15
|
"dist"
|
|
9
16
|
],
|
|
@@ -30,12 +37,5 @@
|
|
|
30
37
|
"ts-node": "^10.9.2",
|
|
31
38
|
"typescript": "^5.8.3"
|
|
32
39
|
},
|
|
33
|
-
"
|
|
34
|
-
"exports": {
|
|
35
|
-
".": {
|
|
36
|
-
"import": "./dist/index.js",
|
|
37
|
-
"types": "./dist/index.d.ts"
|
|
38
|
-
}
|
|
39
|
-
},
|
|
40
|
-
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
|
40
|
+
"packageManager": "yarn@1.22.22"
|
|
41
41
|
}
|