@itwin/presentation-shared 2.0.0-alpha.2 → 2.0.0-alpha.4
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 +18 -5
- package/README.md +0 -6
- package/lib/cjs/shared/Values.d.ts.map +1 -1
- package/lib/cjs/shared/Values.js +3 -2
- package/lib/cjs/shared/Values.js.map +1 -1
- package/lib/esm/shared/Values.d.ts.map +1 -1
- package/lib/esm/shared/Values.js +3 -2
- package/lib/esm/shared/Values.js.map +1 -1
- package/package.json +12 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @itwin/presentation-shared
|
|
2
2
|
|
|
3
|
+
## 2.0.0-alpha.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- e9ef80880c776522ce3b2632c8c3c461e62d6444: Fix `InstanceKey` methods `equals` and `compare` not handling different schema-class separators and casing.
|
|
8
|
+
|
|
9
|
+
## 2.0.0-alpha.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#1112](https://github.com/iTwin/presentation/pull/1112): Version bump
|
|
14
|
+
|
|
3
15
|
## 2.0.0-alpha.2
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -17,7 +29,6 @@
|
|
|
17
29
|
### Major Changes
|
|
18
30
|
|
|
19
31
|
- [#954](https://github.com/iTwin/presentation/pull/954): Add additional requirements for types in `EC` metadata namespace, whose objects are returned by `ECSchemaProvider`.
|
|
20
|
-
|
|
21
32
|
- `EC.Schema`, `EC.Class` and `EC.Property` now all have an async `getCustomAttributes()` method that returns an `EC.CustomAttributeSet`, allowing consumers to access custom attributes of these schema items.
|
|
22
33
|
- `EC.Class` now additionally has these members:
|
|
23
34
|
- `baseClass: Promise<Class | undefined>`
|
|
@@ -27,6 +38,12 @@
|
|
|
27
38
|
|
|
28
39
|
In reality, consumers will likely use `@itwin/presentation-core-interop` package for creating them, and the package has been updated to handle the change, so reacting to the breaking change is as simple as bumping the version of `@itwin/presentation-core-interop` package in the consumer's `package.json`.
|
|
29
40
|
|
|
41
|
+
## 1.2.4
|
|
42
|
+
|
|
43
|
+
### Patch Changes
|
|
44
|
+
|
|
45
|
+
- [#1124](https://github.com/iTwin/presentation/pull/1124): Bump dependencies.
|
|
46
|
+
|
|
30
47
|
## 1.2.3
|
|
31
48
|
|
|
32
49
|
### Patch Changes
|
|
@@ -50,7 +67,6 @@
|
|
|
50
67
|
### Minor Changes
|
|
51
68
|
|
|
52
69
|
- [#791](https://github.com/iTwin/presentation/pull/791): Added a number of mapped types:
|
|
53
|
-
|
|
54
70
|
- `Props<TFunc>` obtains the type of the first `TFunc` function argument.
|
|
55
71
|
|
|
56
72
|
```ts
|
|
@@ -104,12 +120,10 @@
|
|
|
104
120
|
- [#703](https://github.com/iTwin/presentation/pull/703): **BREAKING:** Removed the option to specify value + ECProperty identifier when creating a `ConcatenatedValue`.
|
|
105
121
|
|
|
106
122
|
The change provides two benefits:
|
|
107
|
-
|
|
108
123
|
1. Access to schema is not required to format `ConcatenatedValue` parts as they already contain all the necessary metadata required for formatting the value. This is a step towards supporting multiple data sources, where schema information might be not available during formatting.
|
|
109
124
|
2. Previously, the property type information had to be extracted for every row in the result set, which was inefficient. Now, the type information is extracted only once, when creating an ECSql query.
|
|
110
125
|
|
|
111
126
|
Full list of changes:
|
|
112
|
-
|
|
113
127
|
- `ConcatenatedValuePart.isProperty` - removed, as the "property" type was removed from the type union.
|
|
114
128
|
- `ECSql.createConcatenatedValueJsonSelector` and `ECSql.createConcatenatedValueStringSelector` don't accept an option to specify value + ECProperty identifier as a selector argument anymore. Instead, the option that specifies value selector + type information should be used. The latter kind of selector can be created using the newly added `ECSql.createPrimitivePropertyValueSelectorProps` function (see below).
|
|
115
129
|
- Added `ECSql.createPrimitivePropertyValueSelectorProps` function to help create a selector that specifies a value selector + type information. See README for more details.
|
|
@@ -185,7 +199,6 @@
|
|
|
185
199
|
### Minor Changes
|
|
186
200
|
|
|
187
201
|
- [#628](https://github.com/iTwin/presentation/pull/628): Added support for nested concatenated values by adding `ConcatenatedValue` to the `ConcatenatedValuePart` union. In addition:
|
|
188
|
-
|
|
189
202
|
- A type guard `ConcatenatedValuePart.isConcatenatedValue` has been added to distinguish it from other types of `ConcatenatedValuePart`.
|
|
190
203
|
- `ConcatenatedValue.serialize` has been modified to handle the new type of part seamlessly, so the `partFormatter` prop function receives the same 3 types of `ConcatenatedValuePart`, expanded from nested `ConcatenatedValue` if necessary.
|
|
191
204
|
|
package/README.md
CHANGED
|
@@ -125,7 +125,6 @@ The ECSql utilities group contains a number of functions to help create complex
|
|
|
125
125
|
```
|
|
126
126
|
|
|
127
127
|
- `createRawPrimitiveValueSelector` - creates an ECSQL selector for a raw primitive value.
|
|
128
|
-
|
|
129
128
|
- `undefined` is selected as `NULL`.
|
|
130
129
|
- `Date` values are selected in julian day format.
|
|
131
130
|
- `Point2d` and `Point3d` values are selected as serialized JSON objects, e.g. `{ x: 1, y: 2, z: 3 }`.
|
|
@@ -273,21 +272,17 @@ The APIs in Values group contain various value types and utilities to work with
|
|
|
273
272
|
- `InstanceKey` - a pair of full ECClass name and ECInstance ID, uniquely identifying an ECInstance in an iModel.
|
|
274
273
|
|
|
275
274
|
- `PrimitiveValue` - a union of different supported primitive values. Also, a namespace, containing the following utilities:
|
|
276
|
-
|
|
277
275
|
- `isPoint2d` - type guard to check if the given `PrimitiveValue` is a `Point2d`.
|
|
278
276
|
- `isPoint3d` - type guard to check if the given `PrimitiveValue` is a `Point3d`.
|
|
279
277
|
|
|
280
278
|
- `TypedPrimitiveValue` - a union of all supported combinations of `PrimitiveValue` and its type, possibly with some extra metadata like extended type name or units-related information. Also, a namespace, containing the following utilities:
|
|
281
|
-
|
|
282
279
|
- `create` - given a `PrimitiveValue`, its type and, optionally, extra information, validates the input and creates a `TypedPrimitiveValue`.
|
|
283
280
|
|
|
284
281
|
- `ConcatenatedValuePart` - a union of different types that may be used to create a single, combined value: nested `ConcatenatedValue`, `TypedPrimitiveValue` or just plain string. Also, a namespace, containing the following utilities:
|
|
285
|
-
|
|
286
282
|
- `isString` - type guard to check if the given `ConcatenatedValuePart` is a `string`.
|
|
287
283
|
- `isPrimitive` - type guard to check if the given `ConcatenatedValuePart` is a `TypedPrimitiveValue`.
|
|
288
284
|
|
|
289
285
|
- `ConcatenatedValue` - an array of `ConcatenatedValuePart`. Also, a namespace containing the following utilities:
|
|
290
|
-
|
|
291
286
|
- `serialize` - joins the given `ConcatenatedValue` parts using provided formatter and separator.
|
|
292
287
|
|
|
293
288
|
- `IPrimitiveValueFormatter` - an interface for a function that knows how to format a `TypedPrimitiveValue` into a string.
|
|
@@ -443,7 +438,6 @@ The package also delivers a number of utility types and functions:
|
|
|
443
438
|
```
|
|
444
439
|
|
|
445
440
|
- `trimWhitespace` - trims all extra whitespace from the given string, including:
|
|
446
|
-
|
|
447
441
|
- consecutive spaces,
|
|
448
442
|
- spaces before closing parentheses and comma,
|
|
449
443
|
- spaces after opening parentheses,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Values.d.ts","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Values.d.ts","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB;IACpB,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,cAAc;AACd,yBAAiB,WAAW,CAAC;IAC3B;;;OAGG;IACH,SAAgB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAElE;IACD;;;;;;OAMG;IACH,SAAgB,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CASlE;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/F,cAAc;AAEd,yBAAiB,cAAc,CAAC;IAC9B;;;;OAIG;IACH,SAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,OAAO,CAMjE;IAED;;;OAGG;IACH,SAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,OAAO,CAMjE;CACF;AAED;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAC9B;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;CACZ,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;CAChB,GACD;IACE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,UAAU,CAAC;CAClB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CACJ,GAAG;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,cAAc;AAEd,yBAAiB,mBAAmB,CAAC;IACnC;;;;OAIG;IACH,SAAgB,MAAM,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,mBAAmB,CA8EpI;CACF"}
|
package/lib/cjs/shared/Values.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.TypedPrimitiveValue = exports.PrimitiveValue = exports.InstanceKey = void 0;
|
|
8
8
|
const core_bentley_1 = require("@itwin/core-bentley");
|
|
9
|
+
const Utils_js_1 = require("./Utils.js");
|
|
9
10
|
/** @public */
|
|
10
11
|
var InstanceKey;
|
|
11
12
|
(function (InstanceKey) {
|
|
@@ -14,7 +15,7 @@ var InstanceKey;
|
|
|
14
15
|
* @public
|
|
15
16
|
*/
|
|
16
17
|
function equals(lhs, rhs) {
|
|
17
|
-
return lhs
|
|
18
|
+
return compare(lhs, rhs) === 0;
|
|
18
19
|
}
|
|
19
20
|
InstanceKey.equals = equals;
|
|
20
21
|
/**
|
|
@@ -25,7 +26,7 @@ var InstanceKey;
|
|
|
25
26
|
*- `positive value` if lhs key is more than rhs key
|
|
26
27
|
*/
|
|
27
28
|
function compare(lhs, rhs) {
|
|
28
|
-
const classNameCompareResult = (0, core_bentley_1.compareStrings)(lhs.className, rhs.className);
|
|
29
|
+
const classNameCompareResult = (0, core_bentley_1.compareStrings)((0, Utils_js_1.normalizeFullClassName)(lhs.className).toLocaleLowerCase(), (0, Utils_js_1.normalizeFullClassName)(rhs.className).toLocaleLowerCase());
|
|
29
30
|
if (classNameCompareResult !== 0) {
|
|
30
31
|
return classNameCompareResult;
|
|
31
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Values.js","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,sDAAuE;
|
|
1
|
+
{"version":3,"file":"Values.js","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Values.d.ts","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Values.d.ts","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB;IACpB,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,cAAc;AACd,yBAAiB,WAAW,CAAC;IAC3B;;;OAGG;IACH,SAAgB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAElE;IACD;;;;;;OAMG;IACH,SAAgB,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CASlE;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/F,cAAc;AAEd,yBAAiB,cAAc,CAAC;IAC9B;;;;OAIG;IACH,SAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,OAAO,CAMjE;IAED;;;OAGG;IACH,SAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,OAAO,CAMjE;CACF;AAED;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAC9B;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;CACZ,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;CAChB,GACD;IACE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,UAAU,CAAC;CAClB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,GACD;IACE,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CACJ,GAAG;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,cAAc;AAEd,yBAAiB,mBAAmB,CAAC;IACnC;;;;OAIG;IACH,SAAgB,MAAM,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,mBAAmB,CA8EpI;CACF"}
|
package/lib/esm/shared/Values.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
5
|
import { compareStrings, Id64 } from "@itwin/core-bentley";
|
|
6
|
+
import { normalizeFullClassName } from "./Utils.js";
|
|
6
7
|
/** @public */
|
|
7
8
|
export var InstanceKey;
|
|
8
9
|
(function (InstanceKey) {
|
|
@@ -11,7 +12,7 @@ export var InstanceKey;
|
|
|
11
12
|
* @public
|
|
12
13
|
*/
|
|
13
14
|
function equals(lhs, rhs) {
|
|
14
|
-
return lhs
|
|
15
|
+
return compare(lhs, rhs) === 0;
|
|
15
16
|
}
|
|
16
17
|
InstanceKey.equals = equals;
|
|
17
18
|
/**
|
|
@@ -22,7 +23,7 @@ export var InstanceKey;
|
|
|
22
23
|
*- `positive value` if lhs key is more than rhs key
|
|
23
24
|
*/
|
|
24
25
|
function compare(lhs, rhs) {
|
|
25
|
-
const classNameCompareResult = compareStrings(lhs.className, rhs.className);
|
|
26
|
+
const classNameCompareResult = compareStrings(normalizeFullClassName(lhs.className).toLocaleLowerCase(), normalizeFullClassName(rhs.className).toLocaleLowerCase());
|
|
26
27
|
if (classNameCompareResult !== 0) {
|
|
27
28
|
return classNameCompareResult;
|
|
28
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Values.js","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,cAAc,EAAE,IAAI,EAAc,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Values.js","sourceRoot":"","sources":["../../../src/shared/Values.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@itwin/presentation-shared",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.4",
|
|
4
4
|
"description": "The package contains types and utilities used across different iTwin.js Presentation packages.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": {
|
|
@@ -32,25 +32,25 @@
|
|
|
32
32
|
"./package.json": "./package.json"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@itwin/core-bentley": "^5.
|
|
35
|
+
"@itwin/core-bentley": "^5.3.3"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@itwin/build-tools": "^5.
|
|
38
|
+
"@itwin/build-tools": "^5.3.3",
|
|
39
39
|
"@itwin/eslint-plugin": "5.1.0",
|
|
40
|
-
"@types/chai": "^5.2.
|
|
40
|
+
"@types/chai": "^5.2.3",
|
|
41
41
|
"@types/chai-as-promised": "^8.0.2",
|
|
42
42
|
"@types/mocha": "^10.0.10",
|
|
43
|
-
"@types/node": "^22.
|
|
43
|
+
"@types/node": "^22.19.1",
|
|
44
44
|
"@types/sinon": "^17.0.4",
|
|
45
45
|
"@types/sinon-chai": "^4.0.0",
|
|
46
46
|
"c8": "^10.1.3",
|
|
47
|
-
"chai": "^5.
|
|
48
|
-
"chai-as-promised": "^8.0.
|
|
49
|
-
"eslint": "^9.
|
|
50
|
-
"mocha": "^11.
|
|
51
|
-
"rimraf": "^6.
|
|
52
|
-
"sinon": "^19.0.
|
|
53
|
-
"sinon-chai": "^4.0.
|
|
47
|
+
"chai": "^5.3.3",
|
|
48
|
+
"chai-as-promised": "^8.0.2",
|
|
49
|
+
"eslint": "^9.39.1",
|
|
50
|
+
"mocha": "^11.7.5",
|
|
51
|
+
"rimraf": "^6.1.2",
|
|
52
|
+
"sinon": "^19.0.5",
|
|
53
|
+
"sinon-chai": "^4.0.1",
|
|
54
54
|
"typescript": "~5.7.3",
|
|
55
55
|
"presentation-test-utilities": "^0.0.0"
|
|
56
56
|
},
|