@matter/node 0.11.9-alpha.0-20241205-ccf69a00a → 0.11.9-alpha.0-20241207-b604cfa44
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/behavior/cluster/ClusterBehaviorUtil.d.ts.map +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorUtil.js +5 -3
- package/dist/cjs/behavior/cluster/ClusterBehaviorUtil.js.map +1 -1
- package/dist/cjs/behavior/internal/ServerBehaviorBacking.js +1 -1
- package/dist/cjs/behavior/internal/ServerBehaviorBacking.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/BitmapManager.d.ts +1 -1
- package/dist/cjs/behavior/state/managed/values/BitmapManager.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/values/BitmapManager.js +2 -5
- package/dist/cjs/behavior/state/managed/values/BitmapManager.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/StructManager.js +1 -1
- package/dist/cjs/behavior/state/managed/values/StructManager.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ValueCaster.js +1 -4
- package/dist/cjs/behavior/state/managed/values/ValueCaster.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.d.ts +1 -1
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.js +12 -12
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.js.map +1 -1
- package/dist/cjs/behavior/state/transaction/Transaction.d.ts +18 -18
- package/dist/cjs/behavior/state/validation/ValueValidator.d.ts +2 -2
- package/dist/cjs/behavior/state/validation/ValueValidator.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/ValueValidator.js +18 -17
- package/dist/cjs/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/cjs/behavior/state/validation/conformance-compiler.d.ts +3 -2
- package/dist/cjs/behavior/state/validation/conformance-compiler.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/conformance-compiler.js +6 -3
- package/dist/cjs/behavior/state/validation/conformance-compiler.js.map +1 -1
- package/dist/cjs/behavior/state/validation/conformance.d.ts +3 -2
- package/dist/cjs/behavior/state/validation/conformance.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/conformance.js +2 -2
- package/dist/cjs/behavior/state/validation/conformance.js.map +1 -1
- package/dist/cjs/behavior/supervision/BehaviorSupervisor.js +2 -1
- package/dist/cjs/behavior/supervision/BehaviorSupervisor.js.map +1 -1
- package/dist/cjs/behavior/supervision/RootSupervisor.d.ts +8 -1
- package/dist/cjs/behavior/supervision/RootSupervisor.d.ts.map +1 -1
- package/dist/cjs/behavior/supervision/RootSupervisor.js +18 -2
- package/dist/cjs/behavior/supervision/RootSupervisor.js.map +1 -1
- package/dist/cjs/behaviors/pump-configuration-and-control/PumpConfigurationAndControlBehavior.d.ts +1 -0
- package/dist/cjs/behaviors/pump-configuration-and-control/PumpConfigurationAndControlBehavior.d.ts.map +1 -1
- package/dist/cjs/behaviors/refrigerator-alarm/RefrigeratorAlarmInterface.d.ts +2 -2
- package/dist/cjs/behaviors/refrigerator-alarm/RefrigeratorAlarmInterface.d.ts.map +1 -1
- package/dist/cjs/behaviors/rvc-operational-state/RvcOperationalStateInterface.d.ts +2 -2
- package/dist/cjs/behaviors/rvc-operational-state/RvcOperationalStateInterface.d.ts.map +1 -1
- package/dist/cjs/behaviors/thermostat/ThermostatBehavior.d.ts +6 -0
- package/dist/cjs/behaviors/thermostat/ThermostatBehavior.d.ts.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.d.ts +13 -5
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js +28 -14
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/cjs/devices/pump-controller.d.ts +2 -0
- package/dist/cjs/devices/pump-controller.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorUtil.d.ts.map +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorUtil.js +15 -4
- package/dist/esm/behavior/cluster/ClusterBehaviorUtil.js.map +1 -1
- package/dist/esm/behavior/internal/ServerBehaviorBacking.js +1 -1
- package/dist/esm/behavior/internal/ServerBehaviorBacking.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/BitmapManager.d.ts +1 -1
- package/dist/esm/behavior/state/managed/values/BitmapManager.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/values/BitmapManager.js +2 -5
- package/dist/esm/behavior/state/managed/values/BitmapManager.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/StructManager.js +1 -1
- package/dist/esm/behavior/state/managed/values/StructManager.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ValueCaster.js +1 -4
- package/dist/esm/behavior/state/managed/values/ValueCaster.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ValuePatcher.d.ts +1 -1
- package/dist/esm/behavior/state/managed/values/ValuePatcher.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/values/ValuePatcher.js +12 -12
- package/dist/esm/behavior/state/managed/values/ValuePatcher.js.map +1 -1
- package/dist/esm/behavior/state/transaction/Transaction.d.ts +18 -18
- package/dist/esm/behavior/state/validation/ValueValidator.d.ts +2 -2
- package/dist/esm/behavior/state/validation/ValueValidator.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/ValueValidator.js +18 -17
- package/dist/esm/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/esm/behavior/state/validation/conformance-compiler.d.ts +3 -2
- package/dist/esm/behavior/state/validation/conformance-compiler.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/conformance-compiler.js +6 -3
- package/dist/esm/behavior/state/validation/conformance-compiler.js.map +1 -1
- package/dist/esm/behavior/state/validation/conformance.d.ts +3 -2
- package/dist/esm/behavior/state/validation/conformance.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/conformance.js +2 -2
- package/dist/esm/behavior/state/validation/conformance.js.map +1 -1
- package/dist/esm/behavior/supervision/BehaviorSupervisor.js +3 -2
- package/dist/esm/behavior/supervision/BehaviorSupervisor.js.map +1 -1
- package/dist/esm/behavior/supervision/RootSupervisor.d.ts +8 -1
- package/dist/esm/behavior/supervision/RootSupervisor.d.ts.map +1 -1
- package/dist/esm/behavior/supervision/RootSupervisor.js +19 -3
- package/dist/esm/behavior/supervision/RootSupervisor.js.map +1 -1
- package/dist/esm/behaviors/pump-configuration-and-control/PumpConfigurationAndControlBehavior.d.ts +1 -0
- package/dist/esm/behaviors/pump-configuration-and-control/PumpConfigurationAndControlBehavior.d.ts.map +1 -1
- package/dist/esm/behaviors/refrigerator-alarm/RefrigeratorAlarmInterface.d.ts +2 -2
- package/dist/esm/behaviors/refrigerator-alarm/RefrigeratorAlarmInterface.d.ts.map +1 -1
- package/dist/esm/behaviors/rvc-operational-state/RvcOperationalStateInterface.d.ts +2 -2
- package/dist/esm/behaviors/rvc-operational-state/RvcOperationalStateInterface.d.ts.map +1 -1
- package/dist/esm/behaviors/thermostat/ThermostatBehavior.d.ts +6 -0
- package/dist/esm/behaviors/thermostat/ThermostatBehavior.d.ts.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.d.ts +13 -5
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.d.ts.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js +28 -14
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/esm/devices/pump-controller.d.ts +2 -0
- package/dist/esm/devices/pump-controller.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/behavior/cluster/ClusterBehaviorUtil.ts +17 -4
- package/src/behavior/internal/ServerBehaviorBacking.ts +1 -1
- package/src/behavior/state/managed/values/BitmapManager.ts +2 -6
- package/src/behavior/state/managed/values/StructManager.ts +1 -1
- package/src/behavior/state/managed/values/ValueCaster.ts +1 -5
- package/src/behavior/state/managed/values/ValuePatcher.ts +12 -12
- package/src/behavior/state/validation/ValueValidator.ts +22 -17
- package/src/behavior/state/validation/conformance-compiler.ts +7 -7
- package/src/behavior/state/validation/conformance.ts +4 -4
- package/src/behavior/supervision/BehaviorSupervisor.ts +3 -2
- package/src/behavior/supervision/RootSupervisor.ts +24 -3
- package/src/behaviors/refrigerator-alarm/RefrigeratorAlarmInterface.ts +2 -2
- package/src/behaviors/rvc-operational-state/RvcOperationalStateInterface.ts +2 -2
- package/src/behaviors/window-covering/WindowCoveringServer.ts +45 -21
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterBehaviorUtil.d.ts","sourceRoot":"","sources":["../../../../src/behavior/cluster/ClusterBehaviorUtil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"ClusterBehaviorUtil.d.ts","sourceRoot":"","sources":["../../../../src/behavior/cluster/ClusterBehaviorUtil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,OAAO,EAAa,WAAW,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAelD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,4BACW,GAAG,EAAE,KAAK,GAAG,EAClF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,6BAuDvG;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS;IAAE,OAAO,EAAE,MAAM,CAAC,SAAS,WAAW,CAAA;CAAE,GAC7F,CAAC,GACD,WAAW,CAAC,OAAO,CAAC;AAE1B;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS;IAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,CAAA;CAAE,GAC1G,CAAC,GACD,EAAE,CAAC"}
|
|
@@ -84,6 +84,7 @@ function createDerivedState(cluster, schema, base, namesUsed) {
|
|
|
84
84
|
if (BaseState === void 0) {
|
|
85
85
|
throw new import_general.ImplementationError(`No state class defined for behavior class ${base.name}`);
|
|
86
86
|
}
|
|
87
|
+
const scope = (0, import_model.Scope)(schema);
|
|
87
88
|
const oldDefaults = new BaseState();
|
|
88
89
|
let knownDefaults = BaseState[KNOWN_DEFAULTS];
|
|
89
90
|
let featuresAvailable, featuresSupported;
|
|
@@ -96,7 +97,7 @@ function createDerivedState(cluster, schema, base, namesUsed) {
|
|
|
96
97
|
featuresSupported = new import_model.FeatureSet();
|
|
97
98
|
}
|
|
98
99
|
const props = {};
|
|
99
|
-
for (const member of schema
|
|
100
|
+
for (const member of scope.membersOf(schema, { conformance: "deconflicted" })) {
|
|
100
101
|
const name = (0, import_general.camelize)(member.name);
|
|
101
102
|
if (props[name]) {
|
|
102
103
|
props[name].push(member);
|
|
@@ -134,6 +135,7 @@ function createDerivedState(cluster, schema, base, namesUsed) {
|
|
|
134
135
|
continue;
|
|
135
136
|
}
|
|
136
137
|
defaults[name] = selectDefaultValue(
|
|
138
|
+
scope,
|
|
137
139
|
oldDefaults[name] === void 0 ? knownDefaults?.[name] : oldDefaults[name],
|
|
138
140
|
attribute,
|
|
139
141
|
propSchema
|
|
@@ -232,7 +234,7 @@ function createDefaultCommandDescriptors(cluster, base) {
|
|
|
232
234
|
}
|
|
233
235
|
return result;
|
|
234
236
|
}
|
|
235
|
-
function selectDefaultValue(oldDefault, clusterAttr, schemaProp) {
|
|
237
|
+
function selectDefaultValue(scope, oldDefault, clusterAttr, schemaProp) {
|
|
236
238
|
if (oldDefault !== void 0) {
|
|
237
239
|
return oldDefault;
|
|
238
240
|
}
|
|
@@ -248,7 +250,7 @@ function selectDefaultValue(oldDefault, clusterAttr, schemaProp) {
|
|
|
248
250
|
if (schemaProp.nullable) {
|
|
249
251
|
return null;
|
|
250
252
|
}
|
|
251
|
-
const effectiveDefault = schemaProp
|
|
253
|
+
const effectiveDefault = (0, import_model.DefaultValue)(scope, schemaProp);
|
|
252
254
|
if (effectiveDefault) {
|
|
253
255
|
return effectiveDefault;
|
|
254
256
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behavior/cluster/ClusterBehaviorUtil.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA+E;AAC/E,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -62,7 +62,7 @@ class ServerBehaviorBacking extends import_BehaviorBacking.BehaviorBacking {
|
|
|
62
62
|
if (!schema) {
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
-
for (const member of schema
|
|
65
|
+
for (const member of this.type.supervisor.membersOf(schema)) {
|
|
66
66
|
const name = (0, import_general.camelize)(member.name);
|
|
67
67
|
if (state[name] === void 0) {
|
|
68
68
|
const referenced = import_model.FieldValue.referenced(member.default);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behavior/internal/ServerBehaviorBacking.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AACzB,mBAA2B;AAC3B,6BAAgC;AAIhC,6BAAgC;AAZhC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,8BAA8B,uCAAgB;AAAA,EACvD;AAAA,EAEA,IAAa,QAAQ;AACjB,QAAI,CAAC,KAAK,QAAQ;AACd,WAAK,SAAS,KAAK,aAAa,eAC3B,iBAAiB,KAAK,QAAQ,EAC9B,iBAAiB,KAAK,KAAK,EAAE;AAAA,IACtC;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEmB,kBAAkB,UAAoB,SAA4B;AACjF,UAAM,gBAAgB,MAAM;AACxB,WAAK,yBAAyB,SAAS,KAAK;AAI5C,YAAM,UAAU,SAAS;AACzB,WAAK,WAAW,SAAS,SAAS,SAAS,KAAK;AAAA,IACpD;AAEA,UAAM,UAAU,MAAM,kBAAkB,UAAU,OAAO;AACzD,QAAI,SAAS;AACT,aAAO,QAAQ,KAAK,aAAa;AAAA,IACrC;AAEA,kBAAc;AAAA,EAClB;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK,SAAS,IAAI,IAAI,sCAAe;AAAA,EAChD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,yBAAyB,OAAmB;AACxC,UAAM,SAAS,KAAK,KAAK;AACzB,QAAI,CAAC,QAAQ;AACT;AAAA,IACJ;AAEA,eAAW,UAAU,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AACzB,mBAA2B;AAC3B,6BAAgC;AAIhC,6BAAgC;AAZhC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,8BAA8B,uCAAgB;AAAA,EACvD;AAAA,EAEA,IAAa,QAAQ;AACjB,QAAI,CAAC,KAAK,QAAQ;AACd,WAAK,SAAS,KAAK,aAAa,eAC3B,iBAAiB,KAAK,QAAQ,EAC9B,iBAAiB,KAAK,KAAK,EAAE;AAAA,IACtC;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEmB,kBAAkB,UAAoB,SAA4B;AACjF,UAAM,gBAAgB,MAAM;AACxB,WAAK,yBAAyB,SAAS,KAAK;AAI5C,YAAM,UAAU,SAAS;AACzB,WAAK,WAAW,SAAS,SAAS,SAAS,KAAK;AAAA,IACpD;AAEA,UAAM,UAAU,MAAM,kBAAkB,UAAU,OAAO;AACzD,QAAI,SAAS;AACT,aAAO,QAAQ,KAAK,aAAa;AAAA,IACrC;AAEA,kBAAc;AAAA,EAClB;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK,SAAS,IAAI,IAAI,sCAAe;AAAA,EAChD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,yBAAyB,OAAmB;AACxC,UAAM,SAAS,KAAK,KAAK;AACzB,QAAI,CAAC,QAAQ;AACT;AAAA,IACJ;AAEA,eAAW,UAAU,KAAK,KAAK,WAAW,UAAU,MAAM,GAAG;AACzD,YAAM,WAAO,yBAAS,OAAO,IAAI;AACjC,UAAI,MAAM,IAAI,MAAM,QAAW;AAC3B,cAAM,aAAa,wBAAW,WAAW,OAAO,OAAO;AACvD,YAAI,YAAY;AACZ,gBAAM,MAAM,UAAM,yBAAS,UAAU,CAAC;AACtC,cAAI,QAAQ,QAAW;AACnB,kBAAM,IAAI,IAAI;AAAA,UAClB;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -9,5 +9,5 @@ import { ValueSupervisor } from "../../../supervision/ValueSupervisor.js";
|
|
|
9
9
|
/**
|
|
10
10
|
* For bitmaps we generate a class with accessors for each bitmap value or range.
|
|
11
11
|
*/
|
|
12
|
-
export declare function BitmapManager(
|
|
12
|
+
export declare function BitmapManager(owner: RootSupervisor, schema: Schema): ValueSupervisor.Manage;
|
|
13
13
|
//# sourceMappingURL=BitmapManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BitmapManager.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/state/managed/values/BitmapManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAoB1E;;GAEG;AACH,wBAAgB,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"BitmapManager.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/state/managed/values/BitmapManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAoB1E;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,MAAM,CAuD3F"}
|
|
@@ -33,17 +33,14 @@ var import_Internal = require("../Internal.js");
|
|
|
33
33
|
* SPDX-License-Identifier: Apache-2.0
|
|
34
34
|
*/
|
|
35
35
|
const SESSION = Symbol("options");
|
|
36
|
-
function BitmapManager(
|
|
36
|
+
function BitmapManager(owner, schema) {
|
|
37
37
|
const instanceDescriptors = {};
|
|
38
38
|
const byteSize = schema.metabase?.byteSize;
|
|
39
39
|
if (byteSize === void 0) {
|
|
40
40
|
throw new import_errors.SchemaImplementationError((0, import_model.DataModelPath)(schema.path), `Base bitmap type has no byteSize defined`);
|
|
41
41
|
}
|
|
42
42
|
const maxBit = byteSize * 8;
|
|
43
|
-
for (const member of schema
|
|
44
|
-
if (member.isDeprecated) {
|
|
45
|
-
continue;
|
|
46
|
-
}
|
|
43
|
+
for (const member of owner.membersOf(schema)) {
|
|
47
44
|
let name;
|
|
48
45
|
if (schema.id === import_model.FeatureMap.id) {
|
|
49
46
|
name = (0, import_general.camelize)(member.description ?? member.name);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/state/managed/values/BitmapManager.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAmD;AACnD,mBAAsD;AACtD,oBAAkF;AAKlF,wBAA4C;AAC5C,6BAAgC;AAChC,sBAAyB;AAfzB;AAAA;AAAA;AAAA;AAAA;AAiBA,MAAM,UAAU,OAAO,SAAS;AAiBzB,SAAS,cAAc,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAmD;AACnD,mBAAsD;AACtD,oBAAkF;AAKlF,wBAA4C;AAC5C,6BAAgC;AAChC,sBAAyB;AAfzB;AAAA;AAAA;AAAA;AAAA;AAiBA,MAAM,UAAU,OAAO,SAAS;AAiBzB,SAAS,cAAc,OAAuB,QAAwC;AACzF,QAAM,sBAAsB,CAAC;AAE7B,QAAM,WAAY,OAAsB,UAAU;AAClD,MAAI,aAAa,QAAW;AACxB,UAAM,IAAI,4CAA0B,4BAAc,OAAO,IAAI,GAAG,0CAA0C;AAAA,EAC9G;AACA,QAAM,SAAS,WAAW;AAE1B,aAAW,UAAU,MAAM,UAAU,MAAM,GAAG;AAC1C,QAAI;AACJ,QAAI,OAAO,OAAO,wBAAW,IAAI;AAG7B,iBAAO,yBAAS,OAAO,eAAe,OAAO,IAAI;AAAA,IACrD,OAAO;AACH,iBAAO,yBAAS,OAAO,IAAI;AAAA,IAC/B;AAEA,UAAM,aAAa,kBAAkB,MAAM,QAAQ,MAAM;AAEzD,wBAAoB,IAAI,IAAI;AAAA,EAChC;AAEA,QAAM,cAAU,+BAAe;AAAA,IAC3B,MAAM,OAAO;AAAA,IAEb,WAA0B,KAAgC,SAAkC;AAExF,UAAI,KAAC,yBAAS,IAAI,KAAK,GAAG;AACtB,cAAM,IAAI;AAAA,UACN,IAAI;AAAA,UACJ,iBAAiB,OAAO,IAAI,KAAK;AAAA,QACrC;AAAA,MACJ;AAEA,aAAO,iBAAiB,MAAM;AAAA,QAC1B,CAAC,yBAAS,SAAS,GAAG;AAAA,UAClB,OAAO;AAAA,QACX;AAAA,QACA,CAAC,OAAO,GAAG;AAAA,UACP,OAAO;AAAA,QACX;AAAA,MACJ,CAAC;AAED,aAAO,iBAAiB,MAAM,mBAAmB;AAAA,IACrD;AAAA,EACJ,CAAC;AAED,yCAAgB,iBAAiB,OAAO;AAExC,SAAO,CAAC,WAAW,YAAY;AAC3B,cAAU,QAAQ,IAAI,QAAQ,WAAW,OAAO;AAChD,WAAO,UAAU;AAAA,EACrB;AACJ;AAEA,SAAS,kBAAkB,MAAc,QAAgB,QAAoB;AACzE,QAAM,aAAa,OAAO;AAE1B,MAAI,UAAkB;AACtB,MAAI,OAAO,WAAW,UAAU,UAAU;AACtC,eAAW,WAAW;AACtB,cAAU,WAAW;AAAA,EACzB,WAAW,OAAO,WAAW,QAAQ,YAAY,OAAO,WAAW,QAAQ,UAAU;AACjF,eAAW,WAAW;AACtB,cAAU,WAAW;AAErB,QAAI,WAAW,SAAS;AACpB,YAAM,OAAO;AACb,iBAAW;AACX,gBAAU;AAAA,IACd;AAAA,EACJ,OAAO;AACH,UAAM,IAAI,4CAA0B,4BAAc,OAAO,IAAI,GAAG,sCAAsC;AAAA,EAC1G;AAEA,MAAI,UAAU,QAAQ;AAClB,UAAM,IAAI;AAAA,UACN,4BAAc,OAAO,IAAI;AAAA,MACzB,sBAAsB,OAAO,uBAAuB,MAAM;AAAA,IAC9D;AAAA,EACJ;AAEA,QAAM,MAAM,KAAM,UAAU;AAE5B,MAAI,QAAQ,GAAG;AACX,WAAO;AAAA,MACH,YAAY;AAAA,MAEZ,MAAmB;AACf,cAAM,OAAO,KAAK,yBAAS,SAAS,EAAE;AACtC,YAAI,SAAS,QAAW;AACpB,gBAAM,IAAI,oCAAsB,KAAK,yBAAS,SAAS,EAAE,QAAQ;AAAA,QACrE;AACA,eAAO,CAAC,CAAC,KAAK,IAAI;AAAA,MACtB;AAAA,MAEA,IAAmB,OAAY;AAC3B,cAAM,MAAM,KAAK,yBAAS,SAAS;AAEnC,YAAI,UAAU,QAAW;AACrB,+CAAc,OAAO,IAAI,SAAS,IAAI;AAAA,QAC1C;AAEA,YAAI,OAAO,MAAM;AACb,gBAAM,OAAO,IAAI;AACjB,cAAI,SAAS,QAAW;AACpB,kBAAM,IAAI,oCAAsB,KAAK,yBAAS,SAAS,EAAE,QAAQ;AAAA,UACrE;AACA,eAAK,IAAI,IAAI,CAAC,CAAC;AAAA,QACnB,CAAC;AAAA,MACL;AAAA,IACJ;AAAA,EACJ;AAEA,SAAO;AAAA,IACH,YAAY;AAAA,IAEZ,MAAmB;AACf,YAAM,OAAO,KAAK,yBAAS,SAAS,EAAE;AACtC,UAAI,SAAS,QAAW;AACpB,cAAM,IAAI,oCAAsB,KAAK,yBAAS,SAAS,EAAE,QAAQ;AAAA,MACrE;AACA,aAAO,KAAK,IAAI;AAAA,IACpB;AAAA,IAEA,IAAmB,OAAY;AAC3B,YAAM,MAAM,KAAK,yBAAS,SAAS;AAEnC,UAAI,UAAU,QAAW;AACrB,4CAAa,OAAO,IAAI,SAAS,IAAI;AAErC,YAAI,SAAS,KAAK;AACd,gBAAM,IAAI;AAAA,YACN;AAAA,YACA,KAAK,yBAAS,SAAS,EAAE;AAAA,YACzB,SAAS,KAAK;AAAA,UAClB;AAAA,QACJ,WAAW,QAAQ,GAAG;AAClB,gBAAM,IAAI;AAAA,YACN;AAAA,YACA,KAAK,yBAAS,SAAS,EAAE;AAAA,YACzB,0BAA0B,KAAK;AAAA,UACnC;AAAA,QACJ;AAAA,MACJ;AAEA,UAAI,OAAO,MAAM;AACb,cAAM,OAAO,IAAI;AACjB,YAAI,SAAS,QAAW;AACpB,gBAAM,IAAI,oCAAsB,KAAK,yBAAS,SAAS,EAAE,QAAQ;AAAA,QACrE;AACA,aAAK,IAAI,IAAI,QAAQ,QAAQ;AAAA,MACjC,CAAC;AAAA,IACL;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -40,7 +40,7 @@ function StructManager(owner, schema) {
|
|
|
40
40
|
const instanceDescriptors = {};
|
|
41
41
|
const propertyAccessControls = {};
|
|
42
42
|
let hasFabricIndex = false;
|
|
43
|
-
for (const member of schema
|
|
43
|
+
for (const member of owner.membersOf(schema)) {
|
|
44
44
|
const name2 = (0, import_general.camelize)(member.name);
|
|
45
45
|
const { access, descriptor } = configureProperty(owner, member);
|
|
46
46
|
instanceDescriptors[name2] = descriptor;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/state/managed/values/StructManager.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwE;AACxE,mBAAyD;AAGzD,oBAAiE;AAIjE,iBAAoB;AACpB,6BAAgC;AAChC,sBAAyB;AACzB,8BAAiC;AACjC,8BAAiC;AAlBjC;AAAA;AAAA;AAAA;AAAA;AAoBA,MAAM,UAAU,OAAO,SAAS;AAChC,MAAM,iBAAiB,OAAO,gBAAgB;AAKvC,SAAS,cAAc,OAAuB,QAAwC;AACzF,QAAM,sBAAsB,CAAC;AAC7B,QAAM,yBAAyB,CAAC;AAChC,MAAI,iBAAiB;AAGrB,aAAW,UAAU,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["name", "StructManager", "value"]
|
|
6
6
|
}
|
|
@@ -42,10 +42,7 @@ function ValueCaster(schema, owner) {
|
|
|
42
42
|
}
|
|
43
43
|
function StructCaster(schema, owner) {
|
|
44
44
|
const memberConfigs = {};
|
|
45
|
-
for (const member of schema
|
|
46
|
-
if (member.isDeprecated) {
|
|
47
|
-
continue;
|
|
48
|
-
}
|
|
45
|
+
for (const member of owner.membersOf(schema)) {
|
|
49
46
|
const config = { name: (0, import_general.camelize)(member.name), cast: owner.get(member).cast };
|
|
50
47
|
memberConfigs[config.name] = config;
|
|
51
48
|
const lowerName = member.name.toLowerCase();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/state/managed/values/ValueCaster.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AACzB,mBAAwF;AACxF,oBAA0C;AAR1C;AAAA;AAAA;AAAA;AAAA;AAiBO,SAAS,YAAY,QAAgB,OAAuB;AAC/D,QAAM,WAAW,OAAO,qBAAqB,sBAAS;AAEtD,UAAQ,UAAU;AAAA,IACd,KAAK,sBAAS;AACV,aAAO,aAAa,QAAQ,KAAK;AAAA,IAErC,KAAK,sBAAS;AACV,aAAO,WAAW,QAAsB,KAAK;AAAA,IAEjD;AACI,aAAO,sBAAS,KAAK,QAAQ;AAAA,EACrC;AACJ;AAEA,SAAS,aAAa,QAAmC,OAAuB;AAC5E,QAAM,gBAAgB,CAAC;AACvB,aAAW,UAAU,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AACzB,mBAAwF;AACxF,oBAA0C;AAR1C;AAAA;AAAA;AAAA;AAAA;AAiBO,SAAS,YAAY,QAAgB,OAAuB;AAC/D,QAAM,WAAW,OAAO,qBAAqB,sBAAS;AAEtD,UAAQ,UAAU;AAAA,IACd,KAAK,sBAAS;AACV,aAAO,aAAa,QAAQ,KAAK;AAAA,IAErC,KAAK,sBAAS;AACV,aAAO,WAAW,QAAsB,KAAK;AAAA,IAEjD;AACI,aAAO,sBAAS,KAAK,QAAQ;AAAA,EACrC;AACJ;AAEA,SAAS,aAAa,QAAmC,OAAuB;AAC5E,QAAM,gBAAgB,CAAC;AACvB,aAAW,UAAU,MAAM,UAAU,MAAM,GAAG;AAC1C,UAAM,SAAS,EAAE,UAAM,yBAAS,OAAO,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,EAAE,KAAK;AAG3E,kBAAc,OAAO,IAAI,IAAI;AAI7B,UAAM,YAAY,OAAO,KAAK,YAAY;AAC1C,QAAI,CAAC,cAAc,SAAS,GAAG;AAC3B,oBAAc,SAAS,IAAI;AAAA,IAC/B;AAAA,EACJ;AAEA,QAAM,eAAe,sBAAS,KAAK;AAEnC,SAAO,CAAC,UAAe;AACnB,UAAM,QAAQ,aAAa,KAAK;AAChC,UAAM,SAAS,CAAC;AAEhB,eAAW,OAAO,OAAO;AACrB,UAAI,SAAS,cAAc,GAAG;AAC9B,UAAI,WAAW,QAAW;AACtB,iBAAS,cAAc,IAAI,YAAY,CAAC;AAAA,MAC5C;AAEA,UAAI,WAAW,QAAW;AACtB,cAAM,IAAI,kCAAqB,aAAa,GAAG,kBAAkB;AAAA,MACrE;AAEA,aAAO,OAAO,IAAI,IAAI,OAAO,KAAK,MAAM,GAAG,CAAC;AAAA,IAChD;AAEA,WAAO;AAAA,EACX;AACJ;AAEA,SAAS,WAAW,QAAoB,OAAuB;AAC3D,QAAM,QAAQ,OAAO;AACrB,MAAI,UAAU,QAAW;AACrB,UAAM,IAAI,4CAA0B,4BAAc,OAAO,IAAI,GAAG,qCAAqC;AAAA,EACzG;AAEA,QAAM,cAAc,sBAAS,KAAK;AAClC,QAAM,YAAY,MAAM,IAAI,KAAK,EAAE;AAEnC,SAAO,CAAC,UAAe,YAAY,KAAK,EAAE,IAAI,SAAS;AAC3D;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -9,5 +9,5 @@ import { ValueSupervisor } from "../../../supervision/ValueSupervisor.js";
|
|
|
9
9
|
/**
|
|
10
10
|
* Obtain a {@link ValueSupervisor.Patch} function for the given schema.
|
|
11
11
|
*/
|
|
12
|
-
export declare function ValuePatcher(schema: Schema,
|
|
12
|
+
export declare function ValuePatcher(schema: Schema, supervisor: RootSupervisor): ValueSupervisor.Patch;
|
|
13
13
|
//# sourceMappingURL=ValuePatcher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValuePatcher.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/state/managed/values/ValuePatcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"ValuePatcher.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/state/managed/values/ValuePatcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,yBActE"}
|
|
@@ -29,26 +29,26 @@ var import_errors = require("../../../errors.js");
|
|
|
29
29
|
* Copyright 2022-2024 Matter.js Authors
|
|
30
30
|
* SPDX-License-Identifier: Apache-2.0
|
|
31
31
|
*/
|
|
32
|
-
function ValuePatcher(schema,
|
|
32
|
+
function ValuePatcher(schema, supervisor) {
|
|
33
33
|
switch (schema.effectiveMetatype) {
|
|
34
34
|
// "any" means the schema defines no type. Assume it's an object since ValuePatcher is only invoked where
|
|
35
35
|
// an object is expected naturally
|
|
36
36
|
case import_model.Metatype.any:
|
|
37
37
|
case import_model.Metatype.object:
|
|
38
|
-
return StructPatcher(schema,
|
|
38
|
+
return StructPatcher(schema, supervisor);
|
|
39
39
|
case import_model.Metatype.array:
|
|
40
|
-
return ListPatcher(schema,
|
|
40
|
+
return ListPatcher(schema, supervisor);
|
|
41
41
|
default:
|
|
42
42
|
return PrimitivePatcher();
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
const defaultsCache = /* @__PURE__ */ new WeakMap();
|
|
46
|
-
function getDefaults(schema) {
|
|
46
|
+
function getDefaults(supervisor, schema) {
|
|
47
47
|
if (defaultsCache.has(schema)) {
|
|
48
48
|
return defaultsCache.get(schema);
|
|
49
49
|
}
|
|
50
50
|
const defaults = {};
|
|
51
|
-
for (const member of schema
|
|
51
|
+
for (const member of supervisor.membersOf(schema)) {
|
|
52
52
|
if (member.default !== void 0) {
|
|
53
53
|
defaults[(0, import_general.camelize)(member.name)] = member.default;
|
|
54
54
|
continue;
|
|
@@ -61,20 +61,20 @@ function getDefaults(schema) {
|
|
|
61
61
|
defaultsCache.set(schema, defaults);
|
|
62
62
|
return defaults;
|
|
63
63
|
}
|
|
64
|
-
function StructPatcher(schema,
|
|
64
|
+
function StructPatcher(schema, supervisor) {
|
|
65
65
|
const memberPatchers = {};
|
|
66
66
|
const memberDefaults = {};
|
|
67
67
|
const memberArrays = {};
|
|
68
|
-
for (const member of schema
|
|
68
|
+
for (const member of supervisor.membersOf(schema)) {
|
|
69
69
|
const metatype = member.effectiveMetatype;
|
|
70
70
|
let handler;
|
|
71
71
|
if (metatype === import_model.Metatype.object || metatype === import_model.Metatype.array) {
|
|
72
|
-
handler =
|
|
72
|
+
handler = supervisor.get(member).patch;
|
|
73
73
|
}
|
|
74
74
|
const key = (0, import_general.camelize)(member.name);
|
|
75
75
|
memberPatchers[key] = handler;
|
|
76
76
|
if (metatype === import_model.Metatype.object) {
|
|
77
|
-
memberDefaults[key] = getDefaults(member);
|
|
77
|
+
memberDefaults[key] = getDefaults(supervisor, member);
|
|
78
78
|
}
|
|
79
79
|
if (metatype === import_model.Metatype.array) {
|
|
80
80
|
memberArrays[key] = true;
|
|
@@ -114,7 +114,7 @@ function StructPatcher(schema, owner) {
|
|
|
114
114
|
return target;
|
|
115
115
|
};
|
|
116
116
|
}
|
|
117
|
-
function ListPatcher(schema,
|
|
117
|
+
function ListPatcher(schema, supervisor) {
|
|
118
118
|
const entry = schema.listEntry;
|
|
119
119
|
if (entry === void 0) {
|
|
120
120
|
throw new import_errors.SchemaImplementationError((0, import_model.DataModelPath)(schema.path), "List schema has no entry definition");
|
|
@@ -122,11 +122,11 @@ function ListPatcher(schema, owner) {
|
|
|
122
122
|
const entryMetatype = entry?.effectiveMetatype;
|
|
123
123
|
let patchEntry;
|
|
124
124
|
if (entryMetatype === import_model.Metatype.object || entryMetatype === import_model.Metatype.array) {
|
|
125
|
-
patchEntry =
|
|
125
|
+
patchEntry = supervisor.get(entry).patch;
|
|
126
126
|
}
|
|
127
127
|
let entryDefaults;
|
|
128
128
|
if (entryMetatype === import_model.Metatype.object) {
|
|
129
|
-
entryDefaults = getDefaults(entry);
|
|
129
|
+
entryDefaults = getDefaults(supervisor, entry);
|
|
130
130
|
}
|
|
131
131
|
return (changes, target, path) => {
|
|
132
132
|
if (typeof changes !== "object" || changes === null) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/state/managed/values/ValuePatcher.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwD;AACxD,mBAAoD;AACpD,oBAAsD;AARtD;AAAA;AAAA;AAAA;AAAA;AAiBO,SAAS,aAAa,QAAgB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -145,14 +145,14 @@ export declare const Transaction: {
|
|
|
145
145
|
* A read-only transaction you may use without context.
|
|
146
146
|
*/
|
|
147
147
|
ReadOnly: {
|
|
148
|
-
"__#
|
|
149
|
-
"__#
|
|
150
|
-
"__#
|
|
151
|
-
"__#
|
|
152
|
-
"__#
|
|
153
|
-
"__#
|
|
154
|
-
"__#
|
|
155
|
-
"__#
|
|
148
|
+
"__#125735@#participants": Set<Participant>;
|
|
149
|
+
"__#125735@#roles": Map<{}, Participant>;
|
|
150
|
+
"__#125735@#resources": Set<Resource>;
|
|
151
|
+
"__#125735@#status": Status;
|
|
152
|
+
"__#125735@#waitingOn"?: Iterable<Transaction>;
|
|
153
|
+
"__#125735@#via": string;
|
|
154
|
+
"__#125735@#shared"?: import("#general").Observable<[]>;
|
|
155
|
+
"__#125735@#closed"?: import("#general").Observable<[]>;
|
|
156
156
|
close(): void;
|
|
157
157
|
readonly via: string;
|
|
158
158
|
readonly status: Status;
|
|
@@ -171,16 +171,16 @@ export declare const Transaction: {
|
|
|
171
171
|
rollback(): Promise<void> | undefined;
|
|
172
172
|
waitFor(others: Set<Transaction>): Promise<void>;
|
|
173
173
|
toString(): string;
|
|
174
|
-
"__#
|
|
175
|
-
"__#
|
|
176
|
-
"__#
|
|
177
|
-
"__#
|
|
178
|
-
"__#
|
|
179
|
-
"__#
|
|
180
|
-
"__#
|
|
181
|
-
"__#
|
|
182
|
-
"__#
|
|
183
|
-
"__#
|
|
174
|
+
"__#125735@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
|
|
175
|
+
"__#125735@#executePreCommit"(): MaybePromise<void>;
|
|
176
|
+
"__#125735@#executeCommit"(): MaybePromise;
|
|
177
|
+
"__#125735@#executeCommit1"(): MaybePromise;
|
|
178
|
+
"__#125735@#executeCommit2"(): Promise<void> | undefined;
|
|
179
|
+
"__#125735@#executePostCommit"(participants: Participant[]): MaybePromise;
|
|
180
|
+
"__#125735@#executeRollback"(): Promise<void> | undefined;
|
|
181
|
+
"__#125735@#log"(...message: unknown[]): void;
|
|
182
|
+
"__#125735@#locksChanged"(resources: Set<Resource>, how?: string): void;
|
|
183
|
+
"__#125735@#assertAvailable"(): void;
|
|
184
184
|
};
|
|
185
185
|
Status: typeof Status;
|
|
186
186
|
[Symbol.toStringTag]: string;
|
|
@@ -10,7 +10,7 @@ import type { ValueSupervisor } from "../../supervision/ValueSupervisor.js";
|
|
|
10
10
|
* Generate a function that performs data validation.
|
|
11
11
|
*
|
|
12
12
|
* @param schema the schema against which we validate
|
|
13
|
-
* @param
|
|
13
|
+
* @param supervisor used to retrieve validators for sub-properties
|
|
14
14
|
*/
|
|
15
|
-
export declare function ValueValidator(schema: Schema,
|
|
15
|
+
export declare function ValueValidator(schema: Schema, supervisor: RootSupervisor): ValueSupervisor.Validate | undefined;
|
|
16
16
|
//# sourceMappingURL=ValueValidator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAgB5E;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"ValueValidator.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/ValueValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAgB5E;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,GAAG,eAAe,CAAC,QAAQ,GAAG,SAAS,CAwE/G"}
|
|
@@ -35,19 +35,18 @@ var import_constraint = require("./constraint.js");
|
|
|
35
35
|
* Copyright 2022-2024 Matter.js Authors
|
|
36
36
|
* SPDX-License-Identifier: Apache-2.0
|
|
37
37
|
*/
|
|
38
|
-
function ValueValidator(schema,
|
|
38
|
+
function ValueValidator(schema, supervisor) {
|
|
39
39
|
if (schema instanceof import_model.ClusterModel) {
|
|
40
|
-
return createStructValidator(schema,
|
|
41
|
-
});
|
|
40
|
+
return createStructValidator(schema, supervisor);
|
|
42
41
|
}
|
|
43
42
|
let validator;
|
|
44
43
|
const metatype = schema.effectiveMetatype;
|
|
45
44
|
switch (metatype) {
|
|
46
45
|
case import_model.Metatype.enum:
|
|
47
|
-
validator = createEnumValidator(schema);
|
|
46
|
+
validator = createEnumValidator(schema, supervisor);
|
|
48
47
|
break;
|
|
49
48
|
case import_model.Metatype.bitmap:
|
|
50
|
-
validator = createBitmapValidator(schema);
|
|
49
|
+
validator = createBitmapValidator(schema, supervisor);
|
|
51
50
|
break;
|
|
52
51
|
case import_model.Metatype.integer:
|
|
53
52
|
case import_model.Metatype.float:
|
|
@@ -63,10 +62,10 @@ function ValueValidator(schema, factory) {
|
|
|
63
62
|
validator = createSimpleValidator(schema, import_assertions.assertBytes);
|
|
64
63
|
break;
|
|
65
64
|
case import_model.Metatype.object:
|
|
66
|
-
validator = createStructValidator(schema,
|
|
65
|
+
validator = createStructValidator(schema, supervisor);
|
|
67
66
|
break;
|
|
68
67
|
case import_model.Metatype.array:
|
|
69
|
-
validator = createListValidator(schema,
|
|
68
|
+
validator = createListValidator(schema, supervisor);
|
|
70
69
|
break;
|
|
71
70
|
case import_model.Metatype.date:
|
|
72
71
|
case import_model.Metatype.any:
|
|
@@ -74,7 +73,7 @@ function ValueValidator(schema, factory) {
|
|
|
74
73
|
case void 0:
|
|
75
74
|
const type = schema.effectiveType;
|
|
76
75
|
if (type === void 0) {
|
|
77
|
-
if (schema.isDisallowed) {
|
|
76
|
+
if (schema.isDisallowed || schema.isDeprecated && !schema.type) {
|
|
78
77
|
break;
|
|
79
78
|
}
|
|
80
79
|
throw new import_errors.SchemaImplementationError((0, import_model.DataModelPath)(schema.path), `No type defined`);
|
|
@@ -90,7 +89,7 @@ function ValueValidator(schema, factory) {
|
|
|
90
89
|
);
|
|
91
90
|
}
|
|
92
91
|
validator = createNullValidator(schema, validator);
|
|
93
|
-
validator = (0, import_conformance.createConformanceValidator)(schema,
|
|
92
|
+
validator = (0, import_conformance.createConformanceValidator)(schema, supervisor, validator);
|
|
94
93
|
return validator;
|
|
95
94
|
}
|
|
96
95
|
function createNullValidator(schema, nextValidator) {
|
|
@@ -103,8 +102,10 @@ function createNullValidator(schema, nextValidator) {
|
|
|
103
102
|
}
|
|
104
103
|
return nextValidator;
|
|
105
104
|
}
|
|
106
|
-
function createEnumValidator(schema) {
|
|
107
|
-
const valid = new Set(
|
|
105
|
+
function createEnumValidator(schema, supervisor) {
|
|
106
|
+
const valid = new Set(
|
|
107
|
+
supervisor.membersOf(schema).map((member) => member.id).filter((e) => e !== void 0)
|
|
108
|
+
);
|
|
108
109
|
const constraint = schema.effectiveConstraint;
|
|
109
110
|
const constraintValidator = constraint.in ? (0, import_constraint.createConstraintValidator)(schema.effectiveConstraint, schema) : void 0;
|
|
110
111
|
return (value, session, location) => {
|
|
@@ -115,9 +116,9 @@ function createEnumValidator(schema) {
|
|
|
115
116
|
constraintValidator?.(value, session, location);
|
|
116
117
|
};
|
|
117
118
|
}
|
|
118
|
-
function createBitmapValidator(schema) {
|
|
119
|
+
function createBitmapValidator(schema, supervisor) {
|
|
119
120
|
const fields = {};
|
|
120
|
-
for (const field of schema
|
|
121
|
+
for (const field of supervisor.membersOf(schema)) {
|
|
121
122
|
const constraint = field.effectiveConstraint;
|
|
122
123
|
let max;
|
|
123
124
|
if (typeof constraint.min === "number" && typeof constraint.max === "number") {
|
|
@@ -169,13 +170,13 @@ function createSimpleValidator(schema, validateType) {
|
|
|
169
170
|
validateConstraint?.(value, session, location);
|
|
170
171
|
};
|
|
171
172
|
}
|
|
172
|
-
function createStructValidator(schema,
|
|
173
|
+
function createStructValidator(schema, supervisor) {
|
|
173
174
|
const validators = {};
|
|
174
|
-
for (const field of schema
|
|
175
|
-
if (
|
|
175
|
+
for (const field of supervisor.membersOf(schema)) {
|
|
176
|
+
if (import_model.AttributeModel.isGlobal(field) || field.isDeprecated && !field.type) {
|
|
176
177
|
continue;
|
|
177
178
|
}
|
|
178
|
-
const validate =
|
|
179
|
+
const validate = supervisor.get(field).validate;
|
|
179
180
|
if (validate) {
|
|
180
181
|
validators[(0, import_general.camelize)(field.name)] = validate;
|
|
181
182
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/state/validation/ValueValidator.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AACzB,mBAA8F;AAC9F,mBAA2B;AAC3B,oBAA2E;AAI3E,iBAAoB;AACpB,sBAAyB;AACzB,wBAQO;AACP,yBAA2C;AAC3C,wBAA0C;AAzB1C;AAAA;AAAA;AAAA;AAAA;AAkCO,SAAS,eAAe,QAAgB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
* Copyright 2022-2024 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { RootSupervisor } from "#behavior/supervision/RootSupervisor.js";
|
|
7
|
+
import { ValueModel } from "#model";
|
|
7
8
|
import { ValueSupervisor } from "../../supervision/ValueSupervisor.js";
|
|
8
9
|
/**
|
|
9
10
|
* Generates JS function equivalent of a conformance expression.
|
|
@@ -23,5 +24,5 @@ import { ValueSupervisor } from "../../supervision/ValueSupervisor.js";
|
|
|
23
24
|
* - "runtime" means conformance depends on sibling fields in an object. These result in a {@link RuntimeNode} with
|
|
24
25
|
* additional logic that applies to operational state.
|
|
25
26
|
*/
|
|
26
|
-
export declare function astToFunction(schema: ValueModel,
|
|
27
|
+
export declare function astToFunction(schema: ValueModel, supervisor: RootSupervisor): ValueSupervisor.Validate | undefined;
|
|
27
28
|
//# sourceMappingURL=conformance-compiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformance-compiler.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/conformance-compiler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"conformance-compiler.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/conformance-compiler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,EAAgE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAIlG,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAsBvE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,GAAG,eAAe,CAAC,QAAQ,GAAG,SAAS,CA4jBlH"}
|
|
@@ -30,9 +30,12 @@ var import_conformance_util = require("./conformance-util.js");
|
|
|
30
30
|
* Copyright 2022-2024 Matter.js Authors
|
|
31
31
|
* SPDX-License-Identifier: Apache-2.0
|
|
32
32
|
*/
|
|
33
|
-
function astToFunction(schema,
|
|
33
|
+
function astToFunction(schema, supervisor) {
|
|
34
34
|
const ast = schema.conformance.ast;
|
|
35
|
-
const { featuresAvailable, featuresSupported } = import_model.FeatureSet.normalize(
|
|
35
|
+
const { featuresAvailable, featuresSupported } = import_model.FeatureSet.normalize(
|
|
36
|
+
supervisor.featureMap,
|
|
37
|
+
supervisor.supportedFeatures
|
|
38
|
+
);
|
|
36
39
|
const compiledNode = compile(ast);
|
|
37
40
|
let validator;
|
|
38
41
|
switch (compiledNode.code) {
|
|
@@ -325,7 +328,7 @@ function astToFunction(schema, featureMap, supportedFeatures) {
|
|
|
325
328
|
};
|
|
326
329
|
}
|
|
327
330
|
function addEnumMemberValidation(mainValidator) {
|
|
328
|
-
const members = schema
|
|
331
|
+
const members = supervisor.membersOf(schema);
|
|
329
332
|
if (!members.length) {
|
|
330
333
|
return mainValidator;
|
|
331
334
|
}
|