@matter/model 0.12.0-alpha.0-20241231-9ac20db97 → 0.12.0-alpha.0-20250101-22e7c1044
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/cjs/aspects/Constraint.d.ts +1 -1
- package/dist/cjs/aspects/Constraint.d.ts.map +1 -1
- package/dist/cjs/aspects/Constraint.js +3 -3
- package/dist/cjs/aspects/Constraint.js.map +1 -1
- package/dist/cjs/common/FieldValue.d.ts +6 -0
- package/dist/cjs/common/FieldValue.d.ts.map +1 -1
- package/dist/cjs/common/FieldValue.js +15 -1
- package/dist/cjs/common/FieldValue.js.map +1 -1
- package/dist/cjs/logic/definition-validation/ValueValidator.d.ts.map +1 -1
- package/dist/cjs/logic/definition-validation/ValueValidator.js +16 -2
- package/dist/cjs/logic/definition-validation/ValueValidator.js.map +1 -1
- package/dist/cjs/models/ScopeModel.d.ts +3 -0
- package/dist/cjs/models/ScopeModel.d.ts.map +1 -1
- package/dist/cjs/models/ScopeModel.js +3 -0
- package/dist/cjs/models/ScopeModel.js.map +1 -1
- package/dist/cjs/models/ValueModel.d.ts +1 -1
- package/dist/cjs/models/ValueModel.d.ts.map +1 -1
- package/dist/cjs/standard/elements/MicrowaveOvenControl.js +1 -1
- package/dist/cjs/standard/elements/MicrowaveOvenControl.js.map +1 -1
- package/dist/esm/aspects/Constraint.d.ts +1 -1
- package/dist/esm/aspects/Constraint.d.ts.map +1 -1
- package/dist/esm/aspects/Constraint.js +3 -3
- package/dist/esm/aspects/Constraint.js.map +1 -1
- package/dist/esm/common/FieldValue.d.ts +6 -0
- package/dist/esm/common/FieldValue.d.ts.map +1 -1
- package/dist/esm/common/FieldValue.js +15 -1
- package/dist/esm/common/FieldValue.js.map +1 -1
- package/dist/esm/logic/definition-validation/ValueValidator.d.ts.map +1 -1
- package/dist/esm/logic/definition-validation/ValueValidator.js +17 -3
- package/dist/esm/logic/definition-validation/ValueValidator.js.map +1 -1
- package/dist/esm/models/ScopeModel.d.ts +3 -0
- package/dist/esm/models/ScopeModel.d.ts.map +1 -1
- package/dist/esm/models/ScopeModel.js +3 -0
- package/dist/esm/models/ScopeModel.js.map +1 -1
- package/dist/esm/models/ValueModel.d.ts +1 -1
- package/dist/esm/models/ValueModel.d.ts.map +1 -1
- package/dist/esm/standard/elements/MicrowaveOvenControl.js +1 -1
- package/dist/esm/standard/elements/MicrowaveOvenControl.js.map +1 -1
- package/package.json +4 -4
- package/src/aspects/Constraint.ts +4 -4
- package/src/common/FieldValue.ts +25 -0
- package/src/logic/definition-validation/ValueValidator.ts +27 -4
- package/src/models/ScopeModel.ts +3 -0
- package/src/models/ValueModel.ts +1 -1
- package/src/standard/elements/MicrowaveOvenControl.ts +1 -1
|
@@ -26,7 +26,7 @@ export declare class Constraint extends Aspect<Constraint.Definition> implements
|
|
|
26
26
|
/**
|
|
27
27
|
* Test a value against a constraint. Does not recurse into arrays.
|
|
28
28
|
*/
|
|
29
|
-
test(value: FieldValue,
|
|
29
|
+
test(value: FieldValue, nameResolver?: (name: string) => unknown): boolean;
|
|
30
30
|
toString(): string;
|
|
31
31
|
protected freeze(): void;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constraint.d.ts","sourceRoot":"","sources":["../../../src/aspects/Constraint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAE,YAAW,UAAU,CAAC,GAAG;IAC3E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAE7B;;OAEG;gBACS,UAAU,EAAE,UAAU,CAAC,UAAU;IA2D7C;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"Constraint.d.ts","sourceRoot":"","sources":["../../../src/aspects/Constraint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAE,YAAW,UAAU,CAAC,GAAG;IAC3E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAE7B;;OAEG;gBACS,UAAU,EAAE,UAAU,CAAC,UAAU;IA2D7C;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO;IAoFjE,QAAQ;cAOE,MAAM;CAM5B;AAED,yBAAiB,UAAU,CAAC;IACxB,KAAY,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAC;IAEjD;;OAEG;IACH,KAAY,GAAG,GAAG;QACd;;WAEG;QACH,IAAI,CAAC,EAAE,OAAO,CAAC;QAEf;;WAEG;QACH,KAAK,CAAC,EAAE,UAAU,CAAC;QAEnB;;WAEG;QACH,GAAG,CAAC,EAAE,UAAU,CAAC;QAEjB;;WAEG;QACH,GAAG,CAAC,EAAE,UAAU,CAAC;QAEjB;;WAEG;QACH,EAAE,CAAC,EAAE,UAAU,CAAC;QAEhB;;WAEG;QACH,KAAK,CAAC,EAAE,GAAG,CAAC;QAEZ;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf;;WAEG;QACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;KACjB,CAAC;IAEF;;OAEG;IACH,UAAiB,cAAc;QAC3B,IAAI,EAAE,GAAG,GAAG,GAAG,CAAC;QAEhB,GAAG,EAAE,UAAU,CAAC;QAEhB,GAAG,EAAE,UAAU,CAAC;KACnB;IAED;;OAEG;IACH,KAAY,UAAU,GAAG,UAAU,GAAG,cAAc,CAAC;IAErD;;OAEG;IACH,KAAY,UAAU,GAAG,CAAC,GAAG,GAAG;QAAE,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC9F"}
|
|
@@ -87,7 +87,7 @@ class Constraint extends import_Aspect.Aspect {
|
|
|
87
87
|
/**
|
|
88
88
|
* Test a value against a constraint. Does not recurse into arrays.
|
|
89
89
|
*/
|
|
90
|
-
test(value,
|
|
90
|
+
test(value, nameResolver) {
|
|
91
91
|
function valueOf(value2, raw = false) {
|
|
92
92
|
if (!raw && (typeof value2 === "string" || Array.isArray(value2))) {
|
|
93
93
|
return value2.length;
|
|
@@ -97,7 +97,7 @@ class Constraint extends import_Aspect.Aspect {
|
|
|
97
97
|
switch (type) {
|
|
98
98
|
case import_common.FieldValue.reference:
|
|
99
99
|
if (typeof value2.name === "string") {
|
|
100
|
-
value2 =
|
|
100
|
+
value2 = (0, import_common.FieldValue)(nameResolver?.((0, import_general.camelize)(value2.name)));
|
|
101
101
|
}
|
|
102
102
|
break;
|
|
103
103
|
case "+":
|
|
@@ -153,7 +153,7 @@ class Constraint extends import_Aspect.Aspect {
|
|
|
153
153
|
return false;
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
|
-
if (this.parts?.every((part) => part.test(value,
|
|
156
|
+
if (this.parts?.every((part) => part.test(value, nameResolver) === false)) {
|
|
157
157
|
return false;
|
|
158
158
|
}
|
|
159
159
|
return true;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/aspects/Constraint.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,mBAAsB;AAEtB,yBAA4B;AAC5B,qBAAyB;AACzB,oBAA2B;AAC3B,oBAAuB;AAXvB;AAAA;AAAA;AAAA;AAAA;AAkBO,MAAM,mBAAmB,qBAAwD;AAAA;AAAA;AAAA;AAAA,EAapF,YAAY,YAAmC;AAC3C,UAAM,UAAU;AAEhB,QAAI;AACJ,YAAQ,OAAO,YAAY;AAAA,MACvB,KAAK;AAID,YAAI,WAAW,MAAM,uDAAuD,GAAG;AAC3E;AAAA,QACJ;AACA,cAAM,OAAO,MAAM,MAAM,UAAU;AACnC;AAAA,MAEJ,KAAK;AACD,cAAM,EAAE,OAAO,WAAW;AAC1B;AAAA,MAEJ;AACI,cAAM;AACN,YAAI,KAAK,YAAY;AACjB,eAAK,aAAa,IAAI;AAAA,QAC1B;AACA;AAAA,IACR;AAEA,QAAI,CAAC,KAAK;AACN;AAAA,IACJ;AAEA,QAAI,IAAI,SAAS,QAAW;AACxB,WAAK,OAAO,IAAI;AAAA,IACpB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI;AAAA,IACrB;AACA,QAAI,IAAI,QAAQ,QAAW;AACvB,WAAK,MAAM,IAAI;AAAA,IACnB;AACA,QAAI,IAAI,QAAQ,QAAW;AACvB,WAAK,MAAM,IAAI;AAAA,IACnB;AACA,QAAI,IAAI,OAAO,QAAW;AACtB,WAAK,KAAK,IAAI;AAAA,IAClB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI,WAAW,IAAI,KAAK;AAAA,IACzC;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI;AAAA,IACrB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI,MAAM,IAAI,OAAK,IAAI,WAAW,CAAC,CAAC;AAAA,IACrD;AAEA,SAAK,OAAO;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA,EAKA,KAAK,OAAmB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value", "Serializer", "Parser", "result"]
|
|
6
6
|
}
|
|
@@ -9,6 +9,12 @@ import type { Metatype } from "./Metatype.js";
|
|
|
9
9
|
* specialized typed objects so we can capture the original semantic meaning.
|
|
10
10
|
*/
|
|
11
11
|
export type FieldValue = null | string | number | bigint | boolean | Date | FieldValue[] | FieldValue.Properties | FieldValue.Reference | FieldValue.Percent | FieldValue.Celsius | FieldValue.Bytes | FieldValue.None;
|
|
12
|
+
/**
|
|
13
|
+
* Create a FieldValue (or undefined) from a naked JavaScript value.
|
|
14
|
+
*
|
|
15
|
+
* Assumes that objects and arrays already contain valid FieldValues.
|
|
16
|
+
*/
|
|
17
|
+
export declare function FieldValue(value: unknown): FieldValue | undefined;
|
|
12
18
|
export declare namespace FieldValue {
|
|
13
19
|
const percent = "percent";
|
|
14
20
|
type percent = typeof percent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldValue.d.ts","sourceRoot":"","sources":["../../../src/common/FieldValue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAChB,IAAI,GACJ,MAAM,GACN,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,UAAU,EAAE,GACZ,UAAU,CAAC,UAAU,GACrB,UAAU,CAAC,SAAS,GACpB,UAAU,CAAC,OAAO,GAClB,UAAU,CAAC,OAAO,GAClB,UAAU,CAAC,KAAK,GAChB,UAAU,CAAC,IAAI,CAAC;AAEtB,yBAAiB,UAAU,CAAC;IAGjB,MAAM,OAAO,YAAY,CAAC;IACjC,KAAY,OAAO,GAAG,OAAO,OAAO,CAAC;IAE9B,MAAM,OAAO,YAAY,CAAC;IACjC,KAAY,OAAO,GAAG,OAAO,OAAO,CAAC;IAE9B,MAAM,SAAS,cAAc,CAAC;IACrC,KAAY,SAAS,GAAG,OAAO,SAAS,CAAC;IAElC,MAAM,UAAU,eAAe,CAAC;IACvC,KAAY,UAAU,GAAG,OAAO,UAAU,CAAC;IAEpC,MAAM,KAAK,UAAU,CAAC;IAC7B,KAAY,KAAK,GAAG,OAAO,KAAK,CAAC;IAE1B,MAAM,IAAI,SAAS,CAAC;IAC3B,KAAY,IAAI,GAAG,OAAO,IAAI,CAAC;IAE/B;;OAEG;IACH,KAAY,IAAI,GAAG,UAAU,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAEjD;;OAEG;IACH,KAAY,IAAI,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC;IAE7E;;OAEG;IACH,SAAgB,EAAE,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,IAAI,4CAErD;IAED;;;OAGG;IACI,MAAM,OAAO,EAAE,OAAO,MAA0B,CAAC;IACxD,KAAY,OAAO,GAAG,OAAO,OAAO,CAAC;IAErC;;OAEG;IACH,KAAY,IAAI,GAAG;QACf,IAAI,EAAE,IAAI,CAAC;KACd,CAAC;IAEK,MAAM,IAAI,EAAE,IAElB,CAAC;IAEF;;OAEG;IACH,KAAY,SAAS,GAAG;QACpB,IAAI,EAAE,SAAS,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,SAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAEjD;IAED;;OAEG;IACH,KAAY,OAAO,GAAG;QAClB,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF,SAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE9C;IAED;;OAEG;IACH,KAAY,OAAO,GAAG;QAClB,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF,SAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE9C;IAED;;OAEG;IACH,KAAY,UAAU,GAAG;QACrB,IAAI,EAAE,UAAU,CAAC;QACjB,UAAU,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAA;SAAE,CAAC;KAC9C,CAAC;IAEF;;OAEG;IACH,KAAY,KAAK,GAAG;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF,SAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,KAAK,CAEvD;IAED;;OAEG;IACH,SAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAoBnD;IAED;;OAEG;IACH,SAAgB,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,sBAiCtE;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS;;kBAIxD;IAED;;OAEG;IACH,SAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM;;yBA2BtE;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,sBAIjD;IAED;;;;;;;OAOG;IACH,SAAgB,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,UAAU,GAAG,UAAU,CAAC,OAAO,GAAG,SAAS,CA0J/G;CACJ"}
|
|
1
|
+
{"version":3,"file":"FieldValue.d.ts","sourceRoot":"","sources":["../../../src/common/FieldValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,21 @@ var import_general = require("@matter/general");
|
|
|
27
27
|
* Copyright 2022-2024 Matter.js Authors
|
|
28
28
|
* SPDX-License-Identifier: Apache-2.0
|
|
29
29
|
*/
|
|
30
|
-
|
|
30
|
+
function FieldValue(value) {
|
|
31
|
+
if (typeof value === "function") {
|
|
32
|
+
throw new import_general.UnexpectedDataError("Cannot cast function to FieldValue");
|
|
33
|
+
}
|
|
34
|
+
if (typeof value === "object" && value !== null) {
|
|
35
|
+
if (Array.isArray(value)) {
|
|
36
|
+
return value;
|
|
37
|
+
}
|
|
38
|
+
if (value instanceof Date) {
|
|
39
|
+
return value;
|
|
40
|
+
}
|
|
41
|
+
return value;
|
|
42
|
+
}
|
|
43
|
+
return value;
|
|
44
|
+
}
|
|
31
45
|
((FieldValue2) => {
|
|
32
46
|
FieldValue2.percent = "percent";
|
|
33
47
|
FieldValue2.celsius = "celsius";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/common/FieldValue.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAsF;AANtF;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FieldValue", "ByteUtils", "stringSerialize", "type"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../src/logic/definition-validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAyB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;GAEG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC9D,QAAQ;
|
|
1
|
+
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../src/logic/definition-validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAyB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;GAEG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC9D,QAAQ;IAqCjB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,YAAY;IAqGpB,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,sBAAsB;CAkCjC"}
|
|
@@ -45,9 +45,13 @@ class ValueValidator extends import_ModelValidator.ModelValidator {
|
|
|
45
45
|
if (name.match(/^[A-Z0-9_$]+$/)) {
|
|
46
46
|
const cluster = this.model.owner(import_models.ClusterModel);
|
|
47
47
|
return !!cluster?.features.find((f) => f.name === name);
|
|
48
|
-
} else {
|
|
49
|
-
return !!this.model.parent?.member(name);
|
|
50
48
|
}
|
|
49
|
+
for (let model = this.model.parent; model; model = model.parent) {
|
|
50
|
+
if (model.member(name) !== void 0) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return false;
|
|
51
55
|
});
|
|
52
56
|
this.validateAspect("constraint");
|
|
53
57
|
this.validateAspect("access");
|
|
@@ -99,6 +103,16 @@ class ValueValidator extends import_ModelValidator.ModelValidator {
|
|
|
99
103
|
return;
|
|
100
104
|
}
|
|
101
105
|
const cast = import_common.FieldValue.cast(metatype, defaultValue);
|
|
106
|
+
if (typeof defaultValue === "string") {
|
|
107
|
+
let referenced = this.model?.member(defaultValue);
|
|
108
|
+
if (referenced === void 0) {
|
|
109
|
+
referenced = this.model.owner(import_models.ClusterModel)?.member(defaultValue);
|
|
110
|
+
}
|
|
111
|
+
if (referenced instanceof import_models.ValueModel && referenced.effectiveType === this.model.effectiveType) {
|
|
112
|
+
this.model.default = import_common.FieldValue.Reference(referenced.name);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
102
116
|
if (cast === import_common.FieldValue.Invalid) {
|
|
103
117
|
this.error("INVALID_VALUE", `Value "${defaultValue}" is not a ${metatype}`);
|
|
104
118
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/logic/definition-validation/ValueValidator.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAiE;AACjE,oBAAsD;AACtD,oBAAkD;AAClD,4BAA+B;AAC/B,kCAAqC;AAVrC;AAAA;AAAA;AAAA;AAAA;AAeO,MAAM,uBAA6C,qCAAkB;AAAA,EAC/D,WAAW;AAChB,SAAK,iBAAiB,EAAE,MAAM,QAAQ,MAAM,SAAS,CAAC;AACtD,SAAK,iBAAiB,EAAE,MAAM,YAAY,MAAM,SAAS,CAAC;AAC1D,SAAK,iBAAiB,EAAE,MAAM,cAAc,MAAM,0BAAW,CAAC;AAC9D,SAAK,iBAAiB,EAAE,MAAM,eAAe,MAAM,2BAAY,CAAC;AAChE,SAAK,iBAAiB,EAAE,MAAM,UAAU,MAAM,sBAAO,CAAC;AACtD,SAAK,iBAAiB,EAAE,MAAM,WAAW,MAAM,uBAAQ,CAAC;AACxD,SAAK,iBAAiB,EAAE,MAAM,YAAY,MAAM,uBAAS,CAAC;AAE1D,SAAK,eAAe,aAAa;AACjC,SAAK,MAAM,YAAY,mBAAmB,MAAM,UAAQ;AAEpD,UAAI,KAAK,MAAM,eAAe,GAAG;AAE7B,cAAM,UAAU,KAAK,MAAM,MAAM,0BAAY;AAC7C,eAAO,CAAC,CAAC,SAAS,SAAS,KAAK,OAAK,EAAE,SAAS,IAAI;AAAA,MACxD
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -14,6 +14,9 @@ import { Model } from "./Model.js";
|
|
|
14
14
|
export declare abstract class ScopeModel<T extends BaseElement = BaseElement> extends Model<T> {
|
|
15
15
|
#private;
|
|
16
16
|
readonly isScope = true;
|
|
17
|
+
/**
|
|
18
|
+
* Obtain the {@link Scope} for this model.
|
|
19
|
+
*/
|
|
17
20
|
get scope(): Scope;
|
|
18
21
|
freeze(): this;
|
|
19
22
|
static is(model: Model): model is ScopeModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeModel.d.ts","sourceRoot":"","sources":["../../../src/models/ScopeModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;;GAIG;AACH,8BAAsB,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;;IAGlF,QAAQ,CAAC,OAAO,QAAQ;IAExB,IAAI,KAAK,UAKR;IAEQ,MAAM;IAQf,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,IAAI,UAAU;IAI5C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK;CAazB"}
|
|
1
|
+
{"version":3,"file":"ScopeModel.d.ts","sourceRoot":"","sources":["../../../src/models/ScopeModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;;GAIG;AACH,8BAAsB,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;;IAGlF,QAAQ,CAAC,OAAO,QAAQ;IAExB;;OAEG;IACH,IAAI,KAAK,UAKR;IAEQ,MAAM;IAQf,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,IAAI,UAAU;IAI5C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK;CAazB"}
|
|
@@ -33,6 +33,9 @@ var import_Model = require("./Model.js");
|
|
|
33
33
|
class ScopeModel extends import_Model.Model {
|
|
34
34
|
#operationalScope;
|
|
35
35
|
isScope = true;
|
|
36
|
+
/**
|
|
37
|
+
* Obtain the {@link Scope} for this model.
|
|
38
|
+
*/
|
|
36
39
|
get scope() {
|
|
37
40
|
if (this.#operationalScope !== void 0) {
|
|
38
41
|
return this.#operationalScope;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/models/ScopeModel.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,oBAA0C;AAE1C,4BAA+B;AAC/B,mBAAsB;AACtB,mBAAsB;AAVtB;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAe,mBAAwD,mBAAS;AAAA,EACnF;AAAA,EAES,UAAU;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,oBAA0C;AAE1C,4BAA+B;AAC/B,mBAAsB;AACtB,mBAAsB;AAVtB;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAe,mBAAwD,mBAAS;AAAA,EACnF;AAAA,EAES,UAAU;AAAA;AAAA;AAAA;AAAA,EAKnB,IAAI,QAAQ;AACR,QAAI,KAAK,sBAAsB,QAAW;AACtC,aAAO,KAAK;AAAA,IAChB;AACA,eAAO,oBAAM,IAAI;AAAA,EACrB;AAAA,EAES,SAAS;AACd,QAAI,CAAC,KAAK,mBAAmB;AACzB,WAAK,wBAAoB,oBAAM,IAAI;AAAA,IACvC;AACA,UAAM,OAAO;AACb,WAAO;AAAA,EACX;AAAA,EAEA,OAAO,GAAG,OAAmC;AACzC,WAAO,CAAC,CAAE,MAAqB;AAAA,EACnC;AAAA,EAEA,OAAO,GAAG,OAAc;AACpB,QAAK,MAAqB,SAAS;AAC/B,aAAO;AAAA,IACX;AAEA,UAAM,QAAQ,IAAI,qCAAe,EAAE,UAAU,KAAK;AAElD,QAAI,UAAU,QAAW;AACrB,YAAM,IAAI,wCAA0B,OAAO,iBAAiB;AAAA,IAChE;AAEA,WAAO;AAAA,EACX;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,7 +7,7 @@ import { Access, Aspect, Conformance, Constraint, Quality } from "../aspects/ind
|
|
|
7
7
|
import { ElementTag, FieldValue, Metatype } from "../common/index.js";
|
|
8
8
|
import { BaseElement, ValueElement } from "../elements/index.js";
|
|
9
9
|
import { Model } from "./Model.js";
|
|
10
|
-
import { PropertyModel } from "./PropertyModel.js";
|
|
10
|
+
import type { PropertyModel } from "./PropertyModel.js";
|
|
11
11
|
import { Children } from "./Children.js";
|
|
12
12
|
import { type FieldModel } from "./FieldModel.js";
|
|
13
13
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueModel.d.ts","sourceRoot":"","sources":["../../../src/models/ValueModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ValueModel.d.ts","sourceRoot":"","sources":["../../../src/models/ValueModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -200,7 +200,7 @@ const MicrowaveOvenControl = (0, import_elements.ClusterElement)(
|
|
|
200
200
|
type: "uint8",
|
|
201
201
|
conformance: "[PWRNUM].a+",
|
|
202
202
|
constraint: "minPower to maxPower",
|
|
203
|
-
default: "MaxPower",
|
|
203
|
+
default: { type: "reference", name: "MaxPower" },
|
|
204
204
|
details: "This field shall indicate the PowerSetting associated with the operation of the device. The value of this field shall be subject to the constraints of the PowerSetting attribute of this cluster. If the PowerSetting field does not conform to the constraints of the PowerSetting attribute, the server shall return a CONSTRAINT_ERROR status.\nIf this field is missing, the PowerSetting attribute shall be set to 100 if MaxPower is not supported by the server, otherwise it shall be set to MaxPower if the MaxPower attribute is supported by the server.",
|
|
205
205
|
xref: { document: "cluster", section: "8.13.6.2.3" }
|
|
206
206
|
}),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/standard/elements/MicrowaveOvenControl.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Cluster", "Attribute", "Field", "Command"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ export declare class Constraint extends Aspect<Constraint.Definition> implements
|
|
|
26
26
|
/**
|
|
27
27
|
* Test a value against a constraint. Does not recurse into arrays.
|
|
28
28
|
*/
|
|
29
|
-
test(value: FieldValue,
|
|
29
|
+
test(value: FieldValue, nameResolver?: (name: string) => unknown): boolean;
|
|
30
30
|
toString(): string;
|
|
31
31
|
protected freeze(): void;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constraint.d.ts","sourceRoot":"","sources":["../../../src/aspects/Constraint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAE,YAAW,UAAU,CAAC,GAAG;IAC3E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAE7B;;OAEG;gBACS,UAAU,EAAE,UAAU,CAAC,UAAU;IA2D7C;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"Constraint.d.ts","sourceRoot":"","sources":["../../../src/aspects/Constraint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAE,YAAW,UAAU,CAAC,GAAG;IAC3E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC;IAC5B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAE7B;;OAEG;gBACS,UAAU,EAAE,UAAU,CAAC,UAAU;IA2D7C;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO;IAoFjE,QAAQ;cAOE,MAAM;CAM5B;AAED,yBAAiB,UAAU,CAAC;IACxB,KAAY,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAC;IAEjD;;OAEG;IACH,KAAY,GAAG,GAAG;QACd;;WAEG;QACH,IAAI,CAAC,EAAE,OAAO,CAAC;QAEf;;WAEG;QACH,KAAK,CAAC,EAAE,UAAU,CAAC;QAEnB;;WAEG;QACH,GAAG,CAAC,EAAE,UAAU,CAAC;QAEjB;;WAEG;QACH,GAAG,CAAC,EAAE,UAAU,CAAC;QAEjB;;WAEG;QACH,EAAE,CAAC,EAAE,UAAU,CAAC;QAEhB;;WAEG;QACH,KAAK,CAAC,EAAE,GAAG,CAAC;QAEZ;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf;;WAEG;QACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;KACjB,CAAC;IAEF;;OAEG;IACH,UAAiB,cAAc;QAC3B,IAAI,EAAE,GAAG,GAAG,GAAG,CAAC;QAEhB,GAAG,EAAE,UAAU,CAAC;QAEhB,GAAG,EAAE,UAAU,CAAC;KACnB;IAED;;OAEG;IACH,KAAY,UAAU,GAAG,UAAU,GAAG,cAAc,CAAC;IAErD;;OAEG;IACH,KAAY,UAAU,GAAG,CAAC,GAAG,GAAG;QAAE,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC9F"}
|
|
@@ -64,7 +64,7 @@ class Constraint extends Aspect {
|
|
|
64
64
|
/**
|
|
65
65
|
* Test a value against a constraint. Does not recurse into arrays.
|
|
66
66
|
*/
|
|
67
|
-
test(value,
|
|
67
|
+
test(value, nameResolver) {
|
|
68
68
|
function valueOf(value2, raw = false) {
|
|
69
69
|
if (!raw && (typeof value2 === "string" || Array.isArray(value2))) {
|
|
70
70
|
return value2.length;
|
|
@@ -74,7 +74,7 @@ class Constraint extends Aspect {
|
|
|
74
74
|
switch (type) {
|
|
75
75
|
case FieldValue.reference:
|
|
76
76
|
if (typeof value2.name === "string") {
|
|
77
|
-
value2 =
|
|
77
|
+
value2 = FieldValue(nameResolver?.(camelize(value2.name)));
|
|
78
78
|
}
|
|
79
79
|
break;
|
|
80
80
|
case "+":
|
|
@@ -130,7 +130,7 @@ class Constraint extends Aspect {
|
|
|
130
130
|
return false;
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
|
-
if (this.parts?.every((part) => part.test(value,
|
|
133
|
+
if (this.parts?.every((part) => part.test(value, nameResolver) === false)) {
|
|
134
134
|
return false;
|
|
135
135
|
}
|
|
136
136
|
return true;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/aspects/Constraint.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,aAAa;AAEtB,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAC3B,SAAS,cAAc;AAOhB,MAAM,mBAAmB,OAAwD;AAAA;AAAA;AAAA;AAAA,EAapF,YAAY,YAAmC;AAC3C,UAAM,UAAU;AAEhB,QAAI;AACJ,YAAQ,OAAO,YAAY;AAAA,MACvB,KAAK;AAID,YAAI,WAAW,MAAM,uDAAuD,GAAG;AAC3E;AAAA,QACJ;AACA,cAAM,OAAO,MAAM,MAAM,UAAU;AACnC;AAAA,MAEJ,KAAK;AACD,cAAM,EAAE,OAAO,WAAW;AAC1B;AAAA,MAEJ;AACI,cAAM;AACN,YAAI,KAAK,YAAY;AACjB,eAAK,aAAa,IAAI;AAAA,QAC1B;AACA;AAAA,IACR;AAEA,QAAI,CAAC,KAAK;AACN;AAAA,IACJ;AAEA,QAAI,IAAI,SAAS,QAAW;AACxB,WAAK,OAAO,IAAI;AAAA,IACpB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI;AAAA,IACrB;AACA,QAAI,IAAI,QAAQ,QAAW;AACvB,WAAK,MAAM,IAAI;AAAA,IACnB;AACA,QAAI,IAAI,QAAQ,QAAW;AACvB,WAAK,MAAM,IAAI;AAAA,IACnB;AACA,QAAI,IAAI,OAAO,QAAW;AACtB,WAAK,KAAK,IAAI;AAAA,IAClB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI,WAAW,IAAI,KAAK;AAAA,IACzC;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI;AAAA,IACrB;AACA,QAAI,IAAI,UAAU,QAAW;AACzB,WAAK,QAAQ,IAAI,MAAM,IAAI,OAAK,IAAI,WAAW,CAAC,CAAC;AAAA,IACrD;AAEA,SAAK,OAAO;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA,EAKA,KAAK,OAAmB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value", "Serializer", "Parser", "result"]
|
|
6
6
|
}
|
|
@@ -9,6 +9,12 @@ import type { Metatype } from "./Metatype.js";
|
|
|
9
9
|
* specialized typed objects so we can capture the original semantic meaning.
|
|
10
10
|
*/
|
|
11
11
|
export type FieldValue = null | string | number | bigint | boolean | Date | FieldValue[] | FieldValue.Properties | FieldValue.Reference | FieldValue.Percent | FieldValue.Celsius | FieldValue.Bytes | FieldValue.None;
|
|
12
|
+
/**
|
|
13
|
+
* Create a FieldValue (or undefined) from a naked JavaScript value.
|
|
14
|
+
*
|
|
15
|
+
* Assumes that objects and arrays already contain valid FieldValues.
|
|
16
|
+
*/
|
|
17
|
+
export declare function FieldValue(value: unknown): FieldValue | undefined;
|
|
12
18
|
export declare namespace FieldValue {
|
|
13
19
|
const percent = "percent";
|
|
14
20
|
type percent = typeof percent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldValue.d.ts","sourceRoot":"","sources":["../../../src/common/FieldValue.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FieldValue.d.ts","sourceRoot":"","sources":["../../../src/common/FieldValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,21 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Bytes as ByteUtils, serialize as stringSerialize, UnexpectedDataError } from "@matter/general";
|
|
7
|
-
|
|
7
|
+
function FieldValue(value) {
|
|
8
|
+
if (typeof value === "function") {
|
|
9
|
+
throw new UnexpectedDataError("Cannot cast function to FieldValue");
|
|
10
|
+
}
|
|
11
|
+
if (typeof value === "object" && value !== null) {
|
|
12
|
+
if (Array.isArray(value)) {
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
if (value instanceof Date) {
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
return value;
|
|
19
|
+
}
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
8
22
|
((FieldValue2) => {
|
|
9
23
|
FieldValue2.percent = "percent";
|
|
10
24
|
FieldValue2.celsius = "celsius";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/common/FieldValue.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,SAAS,WAAW,aAAa,iBAAiB,2BAA2B;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FieldValue", "type"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../src/logic/definition-validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAyB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;GAEG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC9D,QAAQ;
|
|
1
|
+
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../src/logic/definition-validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAyB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;GAEG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC9D,QAAQ;IAqCjB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,YAAY;IAqGpB,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,sBAAsB;CAkCjC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Access, Conformance, Constraint, Quality } from "../../aspects/index.js";
|
|
7
7
|
import { FieldValue, Metatype } from "../../common/index.js";
|
|
8
|
-
import { ClusterModel, Globals } from "../../models/index.js";
|
|
8
|
+
import { ClusterModel, Globals, ValueModel } from "../../models/index.js";
|
|
9
9
|
import { ModelValidator } from "./ModelValidator.js";
|
|
10
10
|
import { ValidationExceptions } from "./ValidationExceptions.js";
|
|
11
11
|
class ValueValidator extends ModelValidator {
|
|
@@ -22,9 +22,13 @@ class ValueValidator extends ModelValidator {
|
|
|
22
22
|
if (name.match(/^[A-Z0-9_$]+$/)) {
|
|
23
23
|
const cluster = this.model.owner(ClusterModel);
|
|
24
24
|
return !!cluster?.features.find((f) => f.name === name);
|
|
25
|
-
} else {
|
|
26
|
-
return !!this.model.parent?.member(name);
|
|
27
25
|
}
|
|
26
|
+
for (let model = this.model.parent; model; model = model.parent) {
|
|
27
|
+
if (model.member(name) !== void 0) {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return false;
|
|
28
32
|
});
|
|
29
33
|
this.validateAspect("constraint");
|
|
30
34
|
this.validateAspect("access");
|
|
@@ -76,6 +80,16 @@ class ValueValidator extends ModelValidator {
|
|
|
76
80
|
return;
|
|
77
81
|
}
|
|
78
82
|
const cast = FieldValue.cast(metatype, defaultValue);
|
|
83
|
+
if (typeof defaultValue === "string") {
|
|
84
|
+
let referenced = this.model?.member(defaultValue);
|
|
85
|
+
if (referenced === void 0) {
|
|
86
|
+
referenced = this.model.owner(ClusterModel)?.member(defaultValue);
|
|
87
|
+
}
|
|
88
|
+
if (referenced instanceof ValueModel && referenced.effectiveType === this.model.effectiveType) {
|
|
89
|
+
this.model.default = FieldValue.Reference(referenced.name);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
79
93
|
if (cast === FieldValue.Invalid) {
|
|
80
94
|
this.error("INVALID_VALUE", `Value "${defaultValue}" is not a ${metatype}`);
|
|
81
95
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/logic/definition-validation/ValueValidator.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,QAAgB,aAAa,YAAY,eAAe;AACjE,SAA0B,YAAY,gBAAgB;AACtD,SAAS,cAAc,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -14,6 +14,9 @@ import { Model } from "./Model.js";
|
|
|
14
14
|
export declare abstract class ScopeModel<T extends BaseElement = BaseElement> extends Model<T> {
|
|
15
15
|
#private;
|
|
16
16
|
readonly isScope = true;
|
|
17
|
+
/**
|
|
18
|
+
* Obtain the {@link Scope} for this model.
|
|
19
|
+
*/
|
|
17
20
|
get scope(): Scope;
|
|
18
21
|
freeze(): this;
|
|
19
22
|
static is(model: Model): model is ScopeModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeModel.d.ts","sourceRoot":"","sources":["../../../src/models/ScopeModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;;GAIG;AACH,8BAAsB,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;;IAGlF,QAAQ,CAAC,OAAO,QAAQ;IAExB,IAAI,KAAK,UAKR;IAEQ,MAAM;IAQf,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,IAAI,UAAU;IAI5C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK;CAazB"}
|
|
1
|
+
{"version":3,"file":"ScopeModel.d.ts","sourceRoot":"","sources":["../../../src/models/ScopeModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;;GAIG;AACH,8BAAsB,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;;IAGlF,QAAQ,CAAC,OAAO,QAAQ;IAExB;;OAEG;IACH,IAAI,KAAK,UAKR;IAEQ,MAAM;IAQf,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,IAAI,UAAU;IAI5C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK;CAazB"}
|
|
@@ -10,6 +10,9 @@ import { Model } from "./Model.js";
|
|
|
10
10
|
class ScopeModel extends Model {
|
|
11
11
|
#operationalScope;
|
|
12
12
|
isScope = true;
|
|
13
|
+
/**
|
|
14
|
+
* Obtain the {@link Scope} for this model.
|
|
15
|
+
*/
|
|
13
16
|
get scope() {
|
|
14
17
|
if (this.#operationalScope !== void 0) {
|
|
15
18
|
return this.#operationalScope;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/models/ScopeModel.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,iCAAiC;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,aAAa;AACtB,SAAS,aAAa;AAOf,MAAe,mBAAwD,MAAS;AAAA,EACnF;AAAA,EAES,UAAU;AAAA,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,iCAAiC;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,aAAa;AACtB,SAAS,aAAa;AAOf,MAAe,mBAAwD,MAAS;AAAA,EACnF;AAAA,EAES,UAAU;AAAA;AAAA;AAAA;AAAA,EAKnB,IAAI,QAAQ;AACR,QAAI,KAAK,sBAAsB,QAAW;AACtC,aAAO,KAAK;AAAA,IAChB;AACA,WAAO,MAAM,IAAI;AAAA,EACrB;AAAA,EAES,SAAS;AACd,QAAI,CAAC,KAAK,mBAAmB;AACzB,WAAK,oBAAoB,MAAM,IAAI;AAAA,IACvC;AACA,UAAM,OAAO;AACb,WAAO;AAAA,EACX;AAAA,EAEA,OAAO,GAAG,OAAmC;AACzC,WAAO,CAAC,CAAE,MAAqB;AAAA,EACnC;AAAA,EAEA,OAAO,GAAG,OAAc;AACpB,QAAK,MAAqB,SAAS;AAC/B,aAAO;AAAA,IACX;AAEA,UAAM,QAAQ,IAAI,eAAe,EAAE,UAAU,KAAK;AAElD,QAAI,UAAU,QAAW;AACrB,YAAM,IAAI,0BAA0B,OAAO,iBAAiB;AAAA,IAChE;AAEA,WAAO;AAAA,EACX;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,7 +7,7 @@ import { Access, Aspect, Conformance, Constraint, Quality } from "../aspects/ind
|
|
|
7
7
|
import { ElementTag, FieldValue, Metatype } from "../common/index.js";
|
|
8
8
|
import { BaseElement, ValueElement } from "../elements/index.js";
|
|
9
9
|
import { Model } from "./Model.js";
|
|
10
|
-
import { PropertyModel } from "./PropertyModel.js";
|
|
10
|
+
import type { PropertyModel } from "./PropertyModel.js";
|
|
11
11
|
import { Children } from "./Children.js";
|
|
12
12
|
import { type FieldModel } from "./FieldModel.js";
|
|
13
13
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueModel.d.ts","sourceRoot":"","sources":["../../../src/models/ValueModel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ValueModel.d.ts","sourceRoot":"","sources":["../../../src/models/ValueModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -182,7 +182,7 @@ const MicrowaveOvenControl = Cluster(
|
|
|
182
182
|
type: "uint8",
|
|
183
183
|
conformance: "[PWRNUM].a+",
|
|
184
184
|
constraint: "minPower to maxPower",
|
|
185
|
-
default: "MaxPower",
|
|
185
|
+
default: { type: "reference", name: "MaxPower" },
|
|
186
186
|
details: "This field shall indicate the PowerSetting associated with the operation of the device. The value of this field shall be subject to the constraints of the PowerSetting attribute of this cluster. If the PowerSetting field does not conform to the constraints of the PowerSetting attribute, the server shall return a CONSTRAINT_ERROR status.\nIf this field is missing, the PowerSetting attribute shall be set to 100 if MaxPower is not supported by the server, otherwise it shall be set to MaxPower if the MaxPower attribute is supported by the server.",
|
|
187
187
|
xref: { document: "cluster", section: "8.13.6.2.3" }
|
|
188
188
|
}),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/standard/elements/MicrowaveOvenControl.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,wBAAwB;AACjC;AAAA,EACI,kBAAkB;AAAA,EAClB,oBAAoB;AAAA,EACpB,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,OACf;AAEA,MAAM,uBAAuB;AAAA,EAChC;AAAA,IACI,MAAM;AAAA,IAAwB,IAAI;AAAA,IAAM,gBAAgB;AAAA,IAAe,MAAM;AAAA,IAC7E,SAAS;AAAA,IAKT,MAAM,EAAE,UAAU,WAAW,SAAS,OAAO;AAAA,EACjD;AAAA,EAEA,UAAU,EAAE,MAAM,mBAAmB,IAAI,OAAQ,MAAM,mBAAmB,SAAS,EAAE,CAAC;AAAA,EAEtF;AAAA,IACI,EAAE,MAAM,cAAc,IAAI,OAAQ,MAAM,cAAc,MAAM,EAAE,UAAU,WAAW,SAAS,SAAS,EAAE;AAAA,IACvG,MAAM;AAAA,MACF,MAAM;AAAA,MAAU,aAAa;AAAA,MAAO,YAAY;AAAA,MAAK,aAAa;AAAA,MAClE,SAAS;AAAA,IACb,CAAC;AAAA,IACD,MAAM;AAAA,MACF,MAAM;AAAA,MAAS,aAAa;AAAA,MAAU,YAAY;AAAA,MAAK,aAAa;AAAA,MACpE,SAAS;AAAA,IACb,CAAC;AAAA,IACD,MAAM;AAAA,MACF,MAAM;AAAA,MAAW,aAAa;AAAA,MAAY,YAAY;AAAA,MAAK,aAAa;AAAA,MACxE,SAAS;AAAA,IACb,CAAC;AAAA,EACL;AAAA,EAEA,UAAU;AAAA,IACN,MAAM;AAAA,IAAY,IAAI;AAAA,IAAK,MAAM;AAAA,IAAa,QAAQ;AAAA,IAAO,aAAa;AAAA,IAC1E,YAAY;AAAA,IAAoB,SAAS;AAAA,IACzC,SAAS;AAAA,IAIT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAe,IAAI;AAAA,IAAK,MAAM;AAAA,IAAa,QAAQ;AAAA,IAAO,aAAa;AAAA,IAC7E,YAAY;AAAA,IAAc,SAAS;AAAA,IACnC,SAAS;AAAA,IACT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAgB,IAAI;AAAA,IAAK,MAAM;AAAA,IAAS,QAAQ;AAAA,IAAO,aAAa;AAAA,IAC1E,YAAY;AAAA,IAEZ,SAAS;AAAA,IAYT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAY,IAAI;AAAA,IAAK,MAAM;AAAA,IAAS,QAAQ;AAAA,IAAO,aAAa;AAAA,IACtE,YAAY;AAAA,IAAiB,SAAS;AAAA,IAAI,SAAS;AAAA,IACnD,SAAS;AAAA,IAIT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAY,IAAI;AAAA,IAAK,MAAM;AAAA,IAAS,QAAQ;AAAA,IAAO,aAAa;AAAA,IACtE,YAAY;AAAA,IAAmB,SAAS;AAAA,IAAK,SAAS;AAAA,IACtD,SAAS;AAAA,IAGT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAa,IAAI;AAAA,IAAK,MAAM;AAAA,IAAS,QAAQ;AAAA,IAAO,aAAa;AAAA,IACvE,YAAY;AAAA,IAA8B,SAAS;AAAA,IAAI,SAAS;AAAA,IAChE,SAAS;AAAA,IAIT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED;AAAA,IACI;AAAA,MACI,MAAM;AAAA,MAAkB,IAAI;AAAA,MAAK,MAAM;AAAA,MAAQ,QAAQ;AAAA,MAAO,aAAa;AAAA,MAC3E,YAAY;AAAA,MAAW,SAAS;AAAA,MAChC,SAAS;AAAA,MACT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,IACrD;AAAA,IAEA,MAAM,EAAE,MAAM,SAAS,MAAM,SAAS,CAAC;AAAA,EAC3C;AAAA,EAEA,UAAU;AAAA,IACN,MAAM;AAAA,IAAqB,IAAI;AAAA,IAAK,MAAM;AAAA,IAAS,QAAQ;AAAA,IAAO,aAAa;AAAA,IAC/E,YAAY;AAAA,IACZ,SAAS;AAAA,IAGT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED,UAAU;AAAA,IACN,MAAM;AAAA,IAAc,IAAI;AAAA,IAAK,MAAM;AAAA,IAAU,QAAQ;AAAA,IAAO,aAAa;AAAA,IAAK,SAAS;AAAA,IACvF,SAAS;AAAA,IAIT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,EACrD,CAAC;AAAA,EAED;AAAA,IACI;AAAA,MACI,MAAM;AAAA,MAAwB,IAAI;AAAA,MAAK,QAAQ;AAAA,MAAK,aAAa;AAAA,MAAK,WAAW;AAAA,MACjF,UAAU;AAAA,MACV,SAAS;AAAA,MAGT,MAAM,EAAE,UAAU,WAAW,SAAS,WAAW;AAAA,IACrD;AAAA,IAEA,MAAM;AAAA,MACF,MAAM;AAAA,MAAY,IAAI;AAAA,MAAK,MAAM;AAAA,MAAS,aAAa;AAAA,MAAQ,YAAY;AAAA,MAE3E,SAAS;AAAA,MAOT,MAAM,EAAE,UAAU,WAAW,SAAS,aAAa;AAAA,IACvD,CAAC;AAAA,IAED,MAAM;AAAA,MACF,MAAM;AAAA,MAAY,IAAI;AAAA,MAAK,MAAM;AAAA,MAAa,aAAa;AAAA,MAAQ,YAAY;AAAA,MAC/E,SAAS;AAAA,MACT,SAAS;AAAA,MAIT,MAAM,EAAE,UAAU,WAAW,SAAS,aAAa;AAAA,IACvD,CAAC;AAAA,IAED,MAAM;AAAA,MACF,MAAM;AAAA,MAAgB,IAAI;AAAA,MAAK,MAAM;AAAA,MAAS,aAAa;AAAA,MAC3D,YAAY;AAAA,MAAwB,SAAS;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/model",
|
|
3
|
-
"version": "0.12.0-alpha.0-
|
|
3
|
+
"version": "0.12.0-alpha.0-20250101-22e7c1044",
|
|
4
4
|
"description": "Matter data model",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -33,12 +33,12 @@
|
|
|
33
33
|
"embed-examples": "embedme **/README.md"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@matter/general": "0.12.0-alpha.0-
|
|
36
|
+
"@matter/general": "0.12.0-alpha.0-20250101-22e7c1044",
|
|
37
37
|
"@noble/curves": "^1.7.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@matter/tools": "0.12.0-alpha.0-
|
|
41
|
-
"@matter/testing": "0.12.0-alpha.0-
|
|
40
|
+
"@matter/tools": "0.12.0-alpha.0-20250101-22e7c1044",
|
|
41
|
+
"@matter/testing": "0.12.0-alpha.0-20250101-22e7c1044"
|
|
42
42
|
},
|
|
43
43
|
"files": [
|
|
44
44
|
"dist/**/*",
|
|
@@ -91,8 +91,8 @@ export class Constraint extends Aspect<Constraint.Definition> implements Constra
|
|
|
91
91
|
/**
|
|
92
92
|
* Test a value against a constraint. Does not recurse into arrays.
|
|
93
93
|
*/
|
|
94
|
-
test(value: FieldValue,
|
|
95
|
-
//
|
|
94
|
+
test(value: FieldValue, nameResolver?: (name: string) => unknown): boolean {
|
|
95
|
+
// Expression evaluator. This is for constraints such as "min FieldName"
|
|
96
96
|
function valueOf(value: Constraint.Expression | undefined, raw = false): FieldValue | undefined {
|
|
97
97
|
if (!raw && (typeof value === "string" || Array.isArray(value))) {
|
|
98
98
|
return value.length;
|
|
@@ -102,7 +102,7 @@ export class Constraint extends Aspect<Constraint.Definition> implements Constra
|
|
|
102
102
|
switch (type) {
|
|
103
103
|
case FieldValue.reference:
|
|
104
104
|
if (typeof value.name === "string") {
|
|
105
|
-
value =
|
|
105
|
+
value = FieldValue(nameResolver?.(camelize(value.name)));
|
|
106
106
|
}
|
|
107
107
|
break;
|
|
108
108
|
|
|
@@ -168,7 +168,7 @@ export class Constraint extends Aspect<Constraint.Definition> implements Constra
|
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
170
|
|
|
171
|
-
if (this.parts?.every(part => part.test(value,
|
|
171
|
+
if (this.parts?.every(part => part.test(value, nameResolver) === false)) {
|
|
172
172
|
return false;
|
|
173
173
|
}
|
|
174
174
|
|
package/src/common/FieldValue.ts
CHANGED
|
@@ -26,6 +26,31 @@ export type FieldValue =
|
|
|
26
26
|
| FieldValue.Bytes
|
|
27
27
|
| FieldValue.None;
|
|
28
28
|
|
|
29
|
+
/**
|
|
30
|
+
* Create a FieldValue (or undefined) from a naked JavaScript value.
|
|
31
|
+
*
|
|
32
|
+
* Assumes that objects and arrays already contain valid FieldValues.
|
|
33
|
+
*/
|
|
34
|
+
export function FieldValue(value: unknown): FieldValue | undefined {
|
|
35
|
+
if (typeof value === "function") {
|
|
36
|
+
throw new UnexpectedDataError("Cannot cast function to FieldValue");
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
if (typeof value === "object" && value !== null) {
|
|
40
|
+
if (Array.isArray(value)) {
|
|
41
|
+
return value as FieldValue[];
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
if (value instanceof Date) {
|
|
45
|
+
return value;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
return value as FieldValue.Properties;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return value as FieldValue;
|
|
52
|
+
}
|
|
53
|
+
|
|
29
54
|
export namespace FieldValue {
|
|
30
55
|
// Typing with constants should be just as type safe as using an enum but simplifies type definitions
|
|
31
56
|
|
|
@@ -30,10 +30,15 @@ export class ValueValidator<T extends ValueModel> extends ModelValidator<T> {
|
|
|
30
30
|
// Feature lookup
|
|
31
31
|
const cluster = this.model.owner(ClusterModel);
|
|
32
32
|
return !!cluster?.features.find(f => f.name === name);
|
|
33
|
-
} else {
|
|
34
|
-
// Field lookup
|
|
35
|
-
return !!this.model.parent?.member(name);
|
|
36
33
|
}
|
|
34
|
+
|
|
35
|
+
// Field lookup
|
|
36
|
+
for (let model = this.model.parent; model; model = model.parent) {
|
|
37
|
+
if (model.member(name) !== undefined) {
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return false;
|
|
37
42
|
});
|
|
38
43
|
|
|
39
44
|
this.validateAspect("constraint");
|
|
@@ -98,7 +103,7 @@ export class ValueValidator<T extends ValueModel> extends ModelValidator<T> {
|
|
|
98
103
|
return;
|
|
99
104
|
}
|
|
100
105
|
|
|
101
|
-
//
|
|
106
|
+
// Special case for string "empty"
|
|
102
107
|
if (metatype === Metatype.string && defaultValue === "empty") {
|
|
103
108
|
// Metatype doesn't handle this case because otherwise you'd never be able to have a string called "empty".
|
|
104
109
|
// In this case though the data likely comes from the spec so we're going to take a flyer and say you can
|
|
@@ -106,7 +111,25 @@ export class ValueValidator<T extends ValueModel> extends ModelValidator<T> {
|
|
|
106
111
|
delete this.model.default;
|
|
107
112
|
return;
|
|
108
113
|
}
|
|
114
|
+
|
|
115
|
+
// Attempt to cast to correct value
|
|
109
116
|
const cast = FieldValue.cast(metatype, defaultValue);
|
|
117
|
+
|
|
118
|
+
// Special case for field names
|
|
119
|
+
if (typeof defaultValue === "string") {
|
|
120
|
+
// Here we are converting any exact match of a default value to a field name to be a dynamic default
|
|
121
|
+
// referencing the named field. If we ever have a default value that is the same as a field name then this
|
|
122
|
+
// will be incorrect but likely we never will as string defaults are uncommon
|
|
123
|
+
let referenced = this.model?.member(defaultValue);
|
|
124
|
+
if (referenced === undefined) {
|
|
125
|
+
referenced = this.model.owner(ClusterModel)?.member(defaultValue);
|
|
126
|
+
}
|
|
127
|
+
if (referenced instanceof ValueModel && referenced.effectiveType === this.model.effectiveType) {
|
|
128
|
+
this.model.default = FieldValue.Reference(referenced.name);
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
110
133
|
if (cast === FieldValue.Invalid) {
|
|
111
134
|
this.error("INVALID_VALUE", `Value "${defaultValue}" is not a ${metatype}`);
|
|
112
135
|
return;
|
package/src/models/ScopeModel.ts
CHANGED
|
@@ -20,6 +20,9 @@ export abstract class ScopeModel<T extends BaseElement = BaseElement> extends Mo
|
|
|
20
20
|
|
|
21
21
|
readonly isScope = true;
|
|
22
22
|
|
|
23
|
+
/**
|
|
24
|
+
* Obtain the {@link Scope} for this model.
|
|
25
|
+
*/
|
|
23
26
|
get scope() {
|
|
24
27
|
if (this.#operationalScope !== undefined) {
|
|
25
28
|
return this.#operationalScope;
|
package/src/models/ValueModel.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { BaseElement, ValueElement } from "../elements/index.js";
|
|
|
10
10
|
import { ModelTraversal } from "../logic/ModelTraversal.js";
|
|
11
11
|
import { Aspects } from "./Aspects.js";
|
|
12
12
|
import { Model } from "./Model.js";
|
|
13
|
-
import { PropertyModel } from "./PropertyModel.js";
|
|
13
|
+
import type { PropertyModel } from "./PropertyModel.js";
|
|
14
14
|
|
|
15
15
|
// These are circular dependencies so just to be safe we only import the types. We also need the class, though, at
|
|
16
16
|
// runtime. So we use the references in the Model.constructors factory pool.
|
|
@@ -172,7 +172,7 @@ export const MicrowaveOvenControl = Cluster(
|
|
|
172
172
|
|
|
173
173
|
Field({
|
|
174
174
|
name: "PowerSetting", id: 0x2, type: "uint8", conformance: "[PWRNUM].a+",
|
|
175
|
-
constraint: "minPower to maxPower", default: "MaxPower",
|
|
175
|
+
constraint: "minPower to maxPower", default: { type: "reference", name: "MaxPower" },
|
|
176
176
|
|
|
177
177
|
details: "This field shall indicate the PowerSetting associated with the operation of the device. The value " +
|
|
178
178
|
"of this field shall be subject to the constraints of the PowerSetting attribute of this cluster. If " +
|