@matter/model 0.12.0-alpha.0-20241229-9d9c99934 → 0.12.0-alpha.0-20241231-9ac20db97
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 +24 -15
- package/dist/cjs/aspects/Constraint.d.ts.map +1 -1
- package/dist/cjs/aspects/Constraint.js +268 -198
- package/dist/cjs/aspects/Constraint.js.map +2 -2
- package/dist/cjs/common/FieldValue.d.ts +9 -3
- package/dist/cjs/common/FieldValue.d.ts.map +1 -1
- package/dist/cjs/common/FieldValue.js +1 -1
- package/dist/cjs/common/FieldValue.js.map +1 -1
- package/dist/cjs/logic/definition-validation/ValueValidator.js +1 -1
- package/dist/cjs/logic/definition-validation/ValueValidator.js.map +1 -1
- package/dist/cjs/parser/Lexer.d.ts +3 -3
- package/dist/cjs/parser/Lexer.d.ts.map +1 -1
- package/dist/cjs/parser/Lexer.js +35 -31
- package/dist/cjs/parser/Lexer.js.map +1 -1
- package/dist/cjs/parser/Token.d.ts +5 -2
- package/dist/cjs/parser/Token.d.ts.map +1 -1
- package/dist/cjs/parser/TokenStream.js +2 -2
- package/dist/esm/aspects/Constraint.d.ts +24 -15
- package/dist/esm/aspects/Constraint.d.ts.map +1 -1
- package/dist/esm/aspects/Constraint.js +269 -199
- package/dist/esm/aspects/Constraint.js.map +2 -2
- package/dist/esm/common/FieldValue.d.ts +9 -3
- package/dist/esm/common/FieldValue.d.ts.map +1 -1
- package/dist/esm/common/FieldValue.js +1 -1
- package/dist/esm/common/FieldValue.js.map +1 -1
- package/dist/esm/logic/definition-validation/ValueValidator.js +1 -1
- package/dist/esm/logic/definition-validation/ValueValidator.js.map +1 -1
- package/dist/esm/parser/Lexer.d.ts +3 -3
- package/dist/esm/parser/Lexer.d.ts.map +1 -1
- package/dist/esm/parser/Lexer.js +35 -31
- package/dist/esm/parser/Lexer.js.map +1 -1
- package/dist/esm/parser/Token.d.ts +5 -2
- package/dist/esm/parser/Token.d.ts.map +1 -1
- package/dist/esm/parser/TokenStream.js +2 -2
- package/package.json +4 -4
- package/src/aspects/Constraint.ts +340 -215
- package/src/common/FieldValue.ts +9 -4
- package/src/logic/definition-validation/ValueValidator.ts +1 -1
- package/src/parser/Lexer.ts +38 -40
- package/src/parser/Token.ts +11 -1
- package/src/parser/TokenStream.ts +2 -2
|
@@ -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;AAsB/E,IAAU;AAAA,CAAV,CAAUA,gBAAV;AAGI,EAAMA,YAAA,UAAU;AAGhB,EAAMA,YAAA,UAAU;AAGhB,EAAMA,YAAA,YAAY;AAGlB,EAAMA,YAAA,aAAa;AAGnB,EAAMA,YAAA,QAAQ;AAGd,EAAMA,YAAA,OAAO;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FieldValue", "type"]
|
|
6
6
|
}
|
|
@@ -36,7 +36,7 @@ class ValueValidator extends ModelValidator {
|
|
|
36
36
|
validateAspect(name) {
|
|
37
37
|
const aspect = this.model[name];
|
|
38
38
|
if (aspect?.errors) {
|
|
39
|
-
aspect.errors.forEach((e) => this.model.error(e.code, e.message));
|
|
39
|
+
aspect.errors.forEach((e) => this.model.error(e.code, `${e.source}: ${e.message}`));
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
validateType() {
|
|
@@ -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,eAA2B;AAClD,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B;AAK9B,MAAM,uBAA6C,eAAkB;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,WAAW,CAAC;AAC9D,SAAK,iBAAiB,EAAE,MAAM,eAAe,MAAM,YAAY,CAAC;AAChE,SAAK,iBAAiB,EAAE,MAAM,UAAU,MAAM,OAAO,CAAC;AACtD,SAAK,iBAAiB,EAAE,MAAM,WAAW,MAAM,QAAQ,CAAC;AACxD,SAAK,iBAAiB,EAAE,MAAM,YAAY,MAAM,SAAS,CAAC;AAE1D,SAAK,eAAe,aAAa;AACjC,SAAK,MAAM,YAAY,mBAAmB,MAAM,UAAQ;AAEpD,UAAI,KAAK,MAAM,eAAe,GAAG;AAE7B,cAAM,UAAU,KAAK,MAAM,MAAM,YAAY;AAC7C,eAAO,CAAC,CAAC,SAAS,SAAS,KAAK,OAAK,EAAE,SAAS,IAAI;AAAA,MACxD,OAAO;AAEH,eAAO,CAAC,CAAC,KAAK,MAAM,QAAQ,OAAO,IAAI;AAAA,MAC3C;AAAA,IACJ,CAAC;AAED,SAAK,eAAe,YAAY;AAChC,SAAK,eAAe,QAAQ;AAC5B,SAAK,eAAe,SAAS;AAE7B,SAAK,aAAa;AAClB,SAAK,gBAAgB;AAErB,UAAM,SAAS;AAAA,EACnB;AAAA,EAEQ,eAAe,MAAc;AACjC,UAAM,SAAU,KAAK,MAAc,IAAI;AACvC,QAAI,QAAQ,QAAQ;AAChB,aAAO,OAAO,QAAQ,CAAC,MAAuB,KAAK,MAAM,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -9,12 +9,12 @@ import { BasicToken } from "./Token.js";
|
|
|
9
9
|
*
|
|
10
10
|
* Tokenizes simple text dialects. Currently sufficient for Matter conformance and constraint tokenization.
|
|
11
11
|
*/
|
|
12
|
-
export declare class Lexer<T extends BasicToken> {
|
|
12
|
+
export declare class Lexer<T extends BasicToken<KW>, const KW extends string[] = []> {
|
|
13
13
|
#private;
|
|
14
|
-
constructor(keywords?:
|
|
14
|
+
constructor(keywords?: KW);
|
|
15
15
|
lex(text: string, error: (code: string, message: string) => void): Iterator<T>;
|
|
16
16
|
}
|
|
17
17
|
export declare namespace Lexer {
|
|
18
|
-
const Basic: Lexer<BasicToken>;
|
|
18
|
+
const Basic: Lexer<BasicToken<[]>, []>;
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=Lexer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lexer.d.ts","sourceRoot":"","sources":["../../../src/parser/Lexer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAS,MAAM,YAAY,CAAC;AAM/C;;;;GAIG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,UAAU
|
|
1
|
+
{"version":3,"file":"Lexer.d.ts","sourceRoot":"","sources":["../../../src/parser/Lexer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAS,MAAM,YAAY,CAAC;AAM/C;;;;GAIG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,EAAE;;gBAG3D,QAAQ,CAAC,EAAE,EAAE;IAQzB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACjB,QAAQ,CAAC,CAAC,CAAC;CAE7D;AAED,yBAAiB,KAAK,CAAC;IACZ,MAAM,KAAK,2BAAc,CAAC;CACpC"}
|
package/dist/esm/parser/Lexer.js
CHANGED
|
@@ -9,7 +9,7 @@ function isNameChar(c) {
|
|
|
9
9
|
}
|
|
10
10
|
class Lexer {
|
|
11
11
|
#keywords;
|
|
12
|
-
constructor(keywords
|
|
12
|
+
constructor(keywords) {
|
|
13
13
|
if (keywords instanceof Set) {
|
|
14
14
|
this.#keywords = keywords;
|
|
15
15
|
} else {
|
|
@@ -88,25 +88,7 @@ function* lex(text, error, keywords) {
|
|
|
88
88
|
}
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
|
-
function
|
|
92
|
-
markStart();
|
|
93
|
-
if (sign === -1) {
|
|
94
|
-
next();
|
|
95
|
-
}
|
|
96
|
-
if (current.value === "0") {
|
|
97
|
-
if (peeked.value === "x") {
|
|
98
|
-
next();
|
|
99
|
-
next();
|
|
100
|
-
return tokenizeDigits(16, sign, hexadecimalValueOf);
|
|
101
|
-
} else if (peeked.value === "b") {
|
|
102
|
-
next();
|
|
103
|
-
next();
|
|
104
|
-
return tokenizeDigits(2, sign, binaryValueOf);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
return tokenizeDigits(10, sign, decimalValueOf);
|
|
108
|
-
}
|
|
109
|
-
function tokenizeDigits(base, sign, valueOf) {
|
|
91
|
+
function tokenizeDigits(base, valueOf) {
|
|
110
92
|
let num = valueOf(current.value);
|
|
111
93
|
if (num === void 0) {
|
|
112
94
|
error("INVALID_NUMBER", `Expected digit following numeric suffix`);
|
|
@@ -120,13 +102,25 @@ function* lex(text, error, keywords) {
|
|
|
120
102
|
next();
|
|
121
103
|
num = num * base + digitValue;
|
|
122
104
|
}
|
|
123
|
-
|
|
105
|
+
if (base === 10 && peeked.value === ".") {
|
|
106
|
+
next();
|
|
107
|
+
let fraction = "";
|
|
108
|
+
while (true) {
|
|
109
|
+
const digitValue = valueOf(peeked.value);
|
|
110
|
+
if (digitValue === void 0) {
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
113
|
+
fraction += peeked.value;
|
|
114
|
+
next();
|
|
115
|
+
}
|
|
116
|
+
num = Number.parseFloat(`${num}.${fraction}`);
|
|
117
|
+
}
|
|
124
118
|
if (peeked.value === "%") {
|
|
125
119
|
next();
|
|
126
120
|
return { type: "value", value: FieldValue.Percent(num), startLine, startChar };
|
|
127
121
|
} else if (peeked.value === "\xB0") {
|
|
128
122
|
next();
|
|
129
|
-
if (peeked.value?.toLowerCase() === "
|
|
123
|
+
if (peeked.value?.toLowerCase() === "c") {
|
|
130
124
|
next();
|
|
131
125
|
}
|
|
132
126
|
return { type: "value", value: FieldValue.Celsius(num), startLine, startChar };
|
|
@@ -144,20 +138,30 @@ function* lex(text, error, keywords) {
|
|
|
144
138
|
case "]":
|
|
145
139
|
case "(":
|
|
146
140
|
case ")":
|
|
141
|
+
case "{":
|
|
142
|
+
case "}":
|
|
143
|
+
case "-":
|
|
147
144
|
case "+":
|
|
148
145
|
case "/":
|
|
149
146
|
case "*":
|
|
150
147
|
yield { type: current.value, startLine: line, startChar: char };
|
|
151
148
|
break;
|
|
152
|
-
case "-":
|
|
153
|
-
if (peeked.value !== void 0 && (peeked.value >= "0" || peeked.value <= "0")) {
|
|
154
|
-
yield tokenizeNumber(-1);
|
|
155
|
-
} else {
|
|
156
|
-
yield { type: current.value, startLine: line, startChar: char };
|
|
157
|
-
}
|
|
158
|
-
break;
|
|
159
149
|
case "0":
|
|
160
|
-
|
|
150
|
+
markStart();
|
|
151
|
+
if (current.value === "0") {
|
|
152
|
+
if (peeked.value === "x") {
|
|
153
|
+
next();
|
|
154
|
+
next();
|
|
155
|
+
yield tokenizeDigits(16, hexadecimalValueOf);
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
if (peeked.value === "b") {
|
|
159
|
+
next();
|
|
160
|
+
next();
|
|
161
|
+
yield tokenizeDigits(2, binaryValueOf);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
yield tokenizeDigits(10, decimalValueOf);
|
|
161
165
|
break;
|
|
162
166
|
case "1":
|
|
163
167
|
case "2":
|
|
@@ -168,7 +172,7 @@ function* lex(text, error, keywords) {
|
|
|
168
172
|
case "7":
|
|
169
173
|
case "8":
|
|
170
174
|
case "9":
|
|
171
|
-
yield tokenizeDigits(10,
|
|
175
|
+
yield tokenizeDigits(10, decimalValueOf);
|
|
172
176
|
break;
|
|
173
177
|
case "!":
|
|
174
178
|
case ">":
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/parser/Lexer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kBAAkB;AAG3B,SAAS,WAAW,GAAW;AAC3B,SAAQ,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAQ,MAAM;AAC/F;AAOO,MAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Lexer"]
|
|
6
6
|
}
|
|
@@ -15,7 +15,7 @@ export interface Token {
|
|
|
15
15
|
/**
|
|
16
16
|
* The base token produced by the tokenizer.
|
|
17
17
|
*/
|
|
18
|
-
export type BasicToken = BasicToken.Special | BasicToken.Word | BasicToken.Number
|
|
18
|
+
export type BasicToken<KW extends string[] = []> = BasicToken.Special | BasicToken.Word | BasicToken.Number | BasicToken.Keyword<KW>;
|
|
19
19
|
/**
|
|
20
20
|
* A {@link BasicToken} with additional keywords.
|
|
21
21
|
*/
|
|
@@ -23,7 +23,7 @@ export type ExtendedToken<K extends string> = BasicToken | (Token & {
|
|
|
23
23
|
type: K[number];
|
|
24
24
|
});
|
|
25
25
|
export declare namespace BasicToken {
|
|
26
|
-
type Operator = "!" | "==" | "!=" | "|" | "^" | "&" | "." | "," | "[" | "]" | "(" | ")" | "-" | "+" | "*" | "/" | ">" | "<" | ">=" | "<=";
|
|
26
|
+
type Operator = "!" | "==" | "!=" | "|" | "^" | "&" | "." | "," | "[" | "]" | "(" | ")" | "{" | "}" | "-" | "+" | "*" | "/" | ">" | "<" | ">=" | "<=";
|
|
27
27
|
interface Special extends Token {
|
|
28
28
|
type: Operator;
|
|
29
29
|
}
|
|
@@ -35,5 +35,8 @@ export declare namespace BasicToken {
|
|
|
35
35
|
type: "value";
|
|
36
36
|
value: FieldValue;
|
|
37
37
|
}
|
|
38
|
+
interface Keyword<T extends string[]> extends Token {
|
|
39
|
+
type: T[number];
|
|
40
|
+
}
|
|
38
41
|
}
|
|
39
42
|
//# sourceMappingURL=Token.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../../src/parser/Token.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../../src/parser/Token.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,EAAE,IACzC,UAAU,CAAC,OAAO,GAClB,UAAU,CAAC,IAAI,GACf,UAAU,CAAC,MAAM,GACjB,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI,UAAU,GAAG,CAAC,KAAK,GAAG;IAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,CAAC;AAEzF,yBAAiB,UAAU,CAAC;IACxB,KAAY,QAAQ,GACd,GAAG,GACH,IAAI,GACJ,IAAI,GACJ,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,IAAI,GACJ,IAAI,CAAC;IAEX,UAAiB,OAAQ,SAAQ,KAAK;QAClC,IAAI,EAAE,QAAQ,CAAC;KAClB;IAED,UAAiB,IAAK,SAAQ,KAAK;QAC/B,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACjB;IAED,UAAiB,MAAO,SAAQ,KAAK;QACjC,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,UAAU,CAAC;KACrB;IAED,UAAiB,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,CAAE,SAAQ,KAAK;QACtD,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;KACnB;CACJ"}
|
|
@@ -30,9 +30,9 @@ function TokenStream(iterator) {
|
|
|
30
30
|
case void 0:
|
|
31
31
|
return "end of statement";
|
|
32
32
|
case "word":
|
|
33
|
-
return `word "${this.token.value}`;
|
|
33
|
+
return `word "${this.token.value}"`;
|
|
34
34
|
case "number":
|
|
35
|
-
return `number "${this.token.value}`;
|
|
35
|
+
return `number "${this.token.value}"`;
|
|
36
36
|
default:
|
|
37
37
|
if (this.token?.type.match(/[a-z]/i)) {
|
|
38
38
|
return `keyword "${this.token?.type}"`;
|
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-20241231-9ac20db97",
|
|
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-20241231-9ac20db97",
|
|
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-20241231-9ac20db97",
|
|
41
|
+
"@matter/testing": "0.12.0-alpha.0-20241231-9ac20db97"
|
|
42
42
|
},
|
|
43
43
|
"files": [
|
|
44
44
|
"dist/**/*",
|