@matter/model 0.12.0-alpha.0-20241229-9d9c99934 → 0.12.0-alpha.0-20241231-14ac774ba
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/aspects/Constraint.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
5
|
-
"names": ["value", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["value", "Serializer", "Parser", "result"]
|
|
6
6
|
}
|
|
@@ -22,6 +22,12 @@ export declare namespace FieldValue {
|
|
|
22
22
|
type bytes = typeof bytes;
|
|
23
23
|
const none = "none";
|
|
24
24
|
type none = typeof none;
|
|
25
|
+
/**
|
|
26
|
+
* A field value that allows type extension.
|
|
27
|
+
*/
|
|
28
|
+
type Open = FieldValue | {
|
|
29
|
+
type: string;
|
|
30
|
+
};
|
|
25
31
|
/**
|
|
26
32
|
* If a field value isn't a primitive type, it's an object with a type field indicating one of these types.
|
|
27
33
|
*/
|
|
@@ -29,7 +35,7 @@ export declare namespace FieldValue {
|
|
|
29
35
|
/**
|
|
30
36
|
* Test for one of the special placeholder types.
|
|
31
37
|
*/
|
|
32
|
-
function is(value:
|
|
38
|
+
function is(value: Open | undefined, type: Type): boolean | "" | 0 | 0n | null | undefined;
|
|
33
39
|
/**
|
|
34
40
|
* Flag for an invalid value. Not part of the FieldValue union but returned when casting to a field value if the
|
|
35
41
|
* cast is impossible
|
|
@@ -91,7 +97,7 @@ export declare namespace FieldValue {
|
|
|
91
97
|
/**
|
|
92
98
|
* Given a type name as a hint, do our best to convert a field value to a number.
|
|
93
99
|
*/
|
|
94
|
-
function numericValue(value:
|
|
100
|
+
function numericValue(value: Open | undefined, typeName?: string): number | undefined;
|
|
95
101
|
/**
|
|
96
102
|
* Extract object properties from the value.
|
|
97
103
|
*/
|
|
@@ -107,7 +113,7 @@ export declare namespace FieldValue {
|
|
|
107
113
|
/**
|
|
108
114
|
* Get the referenced name if the FieldValue is a reference.
|
|
109
115
|
*/
|
|
110
|
-
function referenced(value:
|
|
116
|
+
function referenced(value: Open | undefined): string | undefined;
|
|
111
117
|
/**
|
|
112
118
|
* Convert an arbitrary value to a proper FieldValue.
|
|
113
119
|
*
|
|
@@ -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,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC;IAE7E;;OAEG;IACH,SAAgB,EAAE,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"FieldValue.d.ts","sourceRoot":"","sources":["../../../src/common/FieldValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ var FieldValue;
|
|
|
73
73
|
return `${value.value}\xB0C`;
|
|
74
74
|
}
|
|
75
75
|
if (is(value, FieldValue2.percent)) {
|
|
76
|
-
return `${value.value}
|
|
76
|
+
return `${value.value}%`;
|
|
77
77
|
}
|
|
78
78
|
if (is(value, FieldValue2.properties)) {
|
|
79
79
|
return (0, import_general.serialize)(value.properties) ?? "?";
|
|
@@ -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;AA4BO,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", "ByteUtils", "stringSerialize", "type"]
|
|
6
6
|
}
|
|
@@ -59,7 +59,7 @@ class ValueValidator extends import_ModelValidator.ModelValidator {
|
|
|
59
59
|
validateAspect(name) {
|
|
60
60
|
const aspect = this.model[name];
|
|
61
61
|
if (aspect?.errors) {
|
|
62
|
-
aspect.errors.forEach((e) => this.model.error(e.code, e.message));
|
|
62
|
+
aspect.errors.forEach((e) => this.model.error(e.code, `${e.source}: ${e.message}`));
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
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,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,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/cjs/parser/Lexer.js
CHANGED
|
@@ -32,7 +32,7 @@ function isNameChar(c) {
|
|
|
32
32
|
}
|
|
33
33
|
class Lexer {
|
|
34
34
|
#keywords;
|
|
35
|
-
constructor(keywords
|
|
35
|
+
constructor(keywords) {
|
|
36
36
|
if (keywords instanceof Set) {
|
|
37
37
|
this.#keywords = keywords;
|
|
38
38
|
} else {
|
|
@@ -111,25 +111,7 @@ function* lex(text, error, keywords) {
|
|
|
111
111
|
}
|
|
112
112
|
return;
|
|
113
113
|
}
|
|
114
|
-
function
|
|
115
|
-
markStart();
|
|
116
|
-
if (sign === -1) {
|
|
117
|
-
next();
|
|
118
|
-
}
|
|
119
|
-
if (current.value === "0") {
|
|
120
|
-
if (peeked.value === "x") {
|
|
121
|
-
next();
|
|
122
|
-
next();
|
|
123
|
-
return tokenizeDigits(16, sign, hexadecimalValueOf);
|
|
124
|
-
} else if (peeked.value === "b") {
|
|
125
|
-
next();
|
|
126
|
-
next();
|
|
127
|
-
return tokenizeDigits(2, sign, binaryValueOf);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
return tokenizeDigits(10, sign, decimalValueOf);
|
|
131
|
-
}
|
|
132
|
-
function tokenizeDigits(base, sign, valueOf) {
|
|
114
|
+
function tokenizeDigits(base, valueOf) {
|
|
133
115
|
let num = valueOf(current.value);
|
|
134
116
|
if (num === void 0) {
|
|
135
117
|
error("INVALID_NUMBER", `Expected digit following numeric suffix`);
|
|
@@ -143,13 +125,25 @@ function* lex(text, error, keywords) {
|
|
|
143
125
|
next();
|
|
144
126
|
num = num * base + digitValue;
|
|
145
127
|
}
|
|
146
|
-
|
|
128
|
+
if (base === 10 && peeked.value === ".") {
|
|
129
|
+
next();
|
|
130
|
+
let fraction = "";
|
|
131
|
+
while (true) {
|
|
132
|
+
const digitValue = valueOf(peeked.value);
|
|
133
|
+
if (digitValue === void 0) {
|
|
134
|
+
break;
|
|
135
|
+
}
|
|
136
|
+
fraction += peeked.value;
|
|
137
|
+
next();
|
|
138
|
+
}
|
|
139
|
+
num = Number.parseFloat(`${num}.${fraction}`);
|
|
140
|
+
}
|
|
147
141
|
if (peeked.value === "%") {
|
|
148
142
|
next();
|
|
149
143
|
return { type: "value", value: import_common.FieldValue.Percent(num), startLine, startChar };
|
|
150
144
|
} else if (peeked.value === "\xB0") {
|
|
151
145
|
next();
|
|
152
|
-
if (peeked.value?.toLowerCase() === "
|
|
146
|
+
if (peeked.value?.toLowerCase() === "c") {
|
|
153
147
|
next();
|
|
154
148
|
}
|
|
155
149
|
return { type: "value", value: import_common.FieldValue.Celsius(num), startLine, startChar };
|
|
@@ -167,20 +161,30 @@ function* lex(text, error, keywords) {
|
|
|
167
161
|
case "]":
|
|
168
162
|
case "(":
|
|
169
163
|
case ")":
|
|
164
|
+
case "{":
|
|
165
|
+
case "}":
|
|
166
|
+
case "-":
|
|
170
167
|
case "+":
|
|
171
168
|
case "/":
|
|
172
169
|
case "*":
|
|
173
170
|
yield { type: current.value, startLine: line, startChar: char };
|
|
174
171
|
break;
|
|
175
|
-
case "-":
|
|
176
|
-
if (peeked.value !== void 0 && (peeked.value >= "0" || peeked.value <= "0")) {
|
|
177
|
-
yield tokenizeNumber(-1);
|
|
178
|
-
} else {
|
|
179
|
-
yield { type: current.value, startLine: line, startChar: char };
|
|
180
|
-
}
|
|
181
|
-
break;
|
|
182
172
|
case "0":
|
|
183
|
-
|
|
173
|
+
markStart();
|
|
174
|
+
if (current.value === "0") {
|
|
175
|
+
if (peeked.value === "x") {
|
|
176
|
+
next();
|
|
177
|
+
next();
|
|
178
|
+
yield tokenizeDigits(16, hexadecimalValueOf);
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
if (peeked.value === "b") {
|
|
182
|
+
next();
|
|
183
|
+
next();
|
|
184
|
+
yield tokenizeDigits(2, binaryValueOf);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
yield tokenizeDigits(10, decimalValueOf);
|
|
184
188
|
break;
|
|
185
189
|
case "1":
|
|
186
190
|
case "2":
|
|
@@ -191,7 +195,7 @@ function* lex(text, error, keywords) {
|
|
|
191
195
|
case "7":
|
|
192
196
|
case "8":
|
|
193
197
|
case "9":
|
|
194
|
-
yield tokenizeDigits(10,
|
|
198
|
+
yield tokenizeDigits(10, decimalValueOf);
|
|
195
199
|
break;
|
|
196
200
|
case "!":
|
|
197
201
|
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,oBAA2B;AAN3B;AAAA;AAAA;AAAA;AAAA;AASA,SAAS,WAAW,GAAW;AAC3B,SAAQ,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAQ,MAAM;AAC/F;AAOO,MAAM,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,oBAA2B;AAN3B;AAAA;AAAA;AAAA;AAAA;AASA,SAAS,WAAW,GAAW;AAC3B,SAAQ,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAS,KAAK,OAAO,KAAK,OAAQ,MAAM;AAC/F;AAOO,MAAM,MAAgE;AAAA,EACzE;AAAA,EAEA,YAAY,UAAe;AACvB,QAAI,oBAAoB,KAAK;AACzB,WAAK,YAAY;AAAA,IACrB,OAAO;AACH,WAAK,YAAY,IAAI,IAAI,QAAQ;AAAA,IACrC;AAAA,EACJ;AAAA,EAEA,IAAI,MAAc,OAAgD;AAC9D,WAAO,IAAI,MAAM,OAAO,KAAK,SAAS;AAAA,EAC1C;AACJ;AAAA,CAEO,CAAUA,WAAV;AACI,EAAMA,OAAA,QAAQ,IAAIA,OAAM;AAAA,GADlB;AAIjB,UAAU,IACN,MACA,OACA,UAC2B;AAC3B,QAAM,IAAI,KAAK,OAAO,QAAQ,EAAE;AAEhC,MAAI,UAAU,EAAE,KAAK;AACrB,MAAI,QAAQ,MAAM;AACd;AAAA,EACJ;AACA,MAAI,SAAS,EAAE,KAAK;AAEpB,MAAI,OAAO;AACX,MAAI,OAAO;AAEX,MAAI,YAAY;AAChB,MAAI,YAAY;AAEhB,WAAS,YAAY;AACjB,gBAAY;AACZ,gBAAY;AAAA,EAChB;AAEA,WAAS,OAAO;AACZ,cAAU;AACV,QAAI,CAAC,QAAQ,MAAM;AACf;AACA,eAAS,EAAE,KAAK;AAAA,IACpB;AAAA,EACJ;AAEA,WAAS,eAAwC;AAC7C,UAAM,QAAQ,CAAC,QAAQ,KAAK;AAC5B,WAAO,OAAO,UAAU,UAAa,WAAW,OAAO,KAAK,GAAG;AAC3D,WAAK;AACL,YAAM,KAAK,QAAQ,KAAK;AAAA,IAC5B;AACA,UAAM,OAAO,MAAM,KAAK,EAAE;AAE1B,QAAI,SAAS,IAAI,IAAI,GAAG;AACpB,aAAO,EAAE,MAAM,MAAM,WAAW,UAAU;AAAA,IAC9C;AAEA,WAAO,EAAE,MAAM,QAAQ,OAAO,MAAM,WAAW,UAAU;AAAA,EAC7D;AAEA,WAAS,cAAc,OAA2B;AAC9C,QAAI,UAAU,KAAK;AACf,aAAO;AAAA,IACX;AACA,QAAI,UAAU,KAAK;AACf,aAAO;AAAA,IACX;AAAA,EACJ;AAEA,WAAS,eAAe,OAA2B;AAC/C,QAAI,UAAU,QAAW;AACrB;AAAA,IACJ;AACA,QAAI,SAAS,OAAO,SAAS,KAAK;AAC9B,aAAO,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC;AAAA,IACjD;AAAA,EACJ;AAEA,WAAS,mBAAmB,OAA2B;AACnD,QAAI,UAAU,QAAW;AACrB;AAAA,IACJ;AACA,QAAI,SAAS,OAAO,SAAS,KAAK;AAC9B,aAAO,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC;AAAA,IACjD;AACA,QAAI,SAAS,OAAO,SAAS,KAAK;AAC9B,aAAO,KAAK,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC;AAAA,IACtD;AACA,QAAI,SAAS,OAAO,SAAS,KAAK;AAC9B,aAAO,KAAK,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC;AAAA,IACtD;AACA;AAAA,EACJ;AAEA,WAAS,eAAe,MAAc,SAA2E;AAE7G,QAAI,MAAM,QAAQ,QAAQ,KAAK;AAC/B,QAAI,QAAQ,QAAW;AACnB,YAAM,kBAAkB,yCAAyC;AACjE,aAAO,EAAE,MAAM,SAAS,OAAO,GAAG,WAAW,UAAU;AAAA,IAC3D;AAGA,WAAO,MAAM;AACT,YAAM,aAAa,QAAQ,OAAO,KAAK;AACvC,UAAI,eAAe,QAAW;AAC1B;AAAA,MACJ;AACA,WAAK;AACL,YAAM,MAAM,OAAO;AAAA,IACvB;AAEA,QAAI,SAAS,MAAM,OAAO,UAAU,KAAK;AACrC,WAAK;AACL,UAAI,WAAW;AACf,aAAO,MAAM;AACT,cAAM,aAAa,QAAQ,OAAO,KAAK;AACvC,YAAI,eAAe,QAAW;AAC1B;AAAA,QACJ;AACA,oBAAY,OAAO;AACnB,aAAK;AAAA,MACT;AACA,YAAM,OAAO,WAAW,GAAG,GAAG,IAAI,QAAQ,EAAE;AAAA,IAChD;AAGA,QAAI,OAAO,UAAU,KAAK;AACtB,WAAK;AACL,aAAO,EAAE,MAAM,SAAS,OAAO,yBAAW,QAAQ,GAAG,GAAG,WAAW,UAAU;AAAA,IACjF,WAAW,OAAO,UAAU,QAAK;AAC7B,WAAK;AACL,UAAI,OAAO,OAAO,YAAY,MAAM,KAAK;AACrC,aAAK;AAAA,MACT;AACA,aAAO,EAAE,MAAM,SAAS,OAAO,yBAAW,QAAQ,GAAG,GAAG,WAAW,UAAU;AAAA,IACjF;AAGA,WAAO,EAAE,MAAM,SAAS,OAAO,KAAK,WAAW,UAAU;AAAA,EAC7D;AAEA,SAAO,CAAC,QAAQ,MAAM;AAClB,YAAQ,QAAQ,OAAO;AAAA,MACnB,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AACD,cAAM,EAAE,MAAM,QAAQ,OAAO,WAAW,MAAM,WAAW,KAAK;AAC9D;AAAA,MAEJ,KAAK;AACD,kBAAU;AAEV,YAAI,QAAQ,UAAU,KAAK;AACvB,cAAI,OAAO,UAAU,KAAK;AACtB,iBAAK;AACL,iBAAK;AACL,kBAAM,eAAe,IAAI,kBAAkB;AAC3C;AAAA,UACJ;AAEA,cAAI,OAAO,UAAU,KAAK;AACtB,iBAAK;AACL,iBAAK;AACL,kBAAM,eAAe,GAAG,aAAa;AAAA,UACzC;AAAA,QACJ;AAEA,cAAM,eAAe,IAAI,cAAc;AACvC;AAAA,MAEJ,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AACD,cAAM,eAAe,IAAI,cAAc;AACvC;AAAA,MAEJ,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AACD;AACI,gBAAM,OAAO,QAAQ;AACrB,cAAI,OAAO,UAAU,KAAK;AACtB,kBAAM,OAAO,GAAG,IAAI,GAAG,OAAO,KAAK;AACnC,iBAAK;AACL,kBAAM;AAAA,cACF;AAAA,cACA,WAAW;AAAA,cACX,WAAW;AAAA,YACf;AAAA,UACJ,OAAO;AACH,kBAAM,EAAE,MAAM,MAAM,WAAW,MAAM,WAAW,KAAK;AAAA,UACzD;AAAA,QACJ;AACA;AAAA,MAEJ,KAAK;AACD,kBAAU;AACV,YAAI,OAAO,UAAU,KAAK;AACtB,eAAK;AAAA,QACT,OAAO;AACH,gBAAM,aAAa,qCAAqC;AAAA,QAC5D;AACA,cAAM,EAAE,MAAM,MAAM,WAAW,UAAU;AACzC;AAAA,MAEJ,KAAK;AACD;AACA,eAAO;AACP;AAAA,MAEJ,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AACD;AAAA,MAEJ;AACI,YAAI,WAAW,QAAQ,KAAK,GAAG;AAC3B,oBAAU;AACV,gBAAM,aAAa;AAAA,QACvB,OAAO;AACH,gBAAM,qBAAqB,yBAAyB,QAAQ,KAAK,GAAG;AAAA,QACxE;AACA;AAAA,IACR;AACA,SAAK;AAAA,EACT;AACJ;",
|
|
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"}
|
|
@@ -53,9 +53,9 @@ function TokenStream(iterator) {
|
|
|
53
53
|
case void 0:
|
|
54
54
|
return "end of statement";
|
|
55
55
|
case "word":
|
|
56
|
-
return `word "${this.token.value}`;
|
|
56
|
+
return `word "${this.token.value}"`;
|
|
57
57
|
case "number":
|
|
58
|
-
return `number "${this.token.value}`;
|
|
58
|
+
return `number "${this.token.value}"`;
|
|
59
59
|
default:
|
|
60
60
|
if (this.token?.type.match(/[a-z]/i)) {
|
|
61
61
|
return `keyword "${this.token?.type}"`;
|
|
@@ -9,17 +9,15 @@ import { Aspect } from "./Aspect.js";
|
|
|
9
9
|
* An operational view of constraints as defined by the Matter specification.
|
|
10
10
|
*
|
|
11
11
|
* A "constraint" limits possible data values.
|
|
12
|
-
*
|
|
13
|
-
* Formally a constraint is not considered a quality by the specification. It is handled similarly to qualities, though,
|
|
14
|
-
* so we keep it in the same section.
|
|
15
12
|
*/
|
|
16
13
|
export declare class Constraint extends Aspect<Constraint.Definition> implements Constraint.Ast {
|
|
17
14
|
desc?: boolean;
|
|
18
|
-
value?:
|
|
19
|
-
min?:
|
|
20
|
-
max?:
|
|
15
|
+
value?: Constraint.Expression;
|
|
16
|
+
min?: Constraint.Expression;
|
|
17
|
+
max?: Constraint.Expression;
|
|
21
18
|
in?: FieldValue;
|
|
22
19
|
entry?: Constraint;
|
|
20
|
+
cpMax?: number;
|
|
23
21
|
parts?: Constraint[];
|
|
24
22
|
/**
|
|
25
23
|
* Initialize from a Constraint.Definition or the constraint DSL defined by the Matter Specification.
|
|
@@ -35,7 +33,7 @@ export declare class Constraint extends Aspect<Constraint.Definition> implements
|
|
|
35
33
|
export declare namespace Constraint {
|
|
36
34
|
type NumberOrIdentifier = number | string;
|
|
37
35
|
/**
|
|
38
|
-
* Parsed
|
|
36
|
+
* Parsed constraint.
|
|
39
37
|
*/
|
|
40
38
|
type Ast = {
|
|
41
39
|
/**
|
|
@@ -45,15 +43,15 @@ export declare namespace Constraint {
|
|
|
45
43
|
/**
|
|
46
44
|
* Constant value.
|
|
47
45
|
*/
|
|
48
|
-
value?:
|
|
46
|
+
value?: Expression;
|
|
49
47
|
/**
|
|
50
48
|
* Lower bound on value or sequence length.
|
|
51
49
|
*/
|
|
52
|
-
min?:
|
|
50
|
+
min?: Expression;
|
|
53
51
|
/**
|
|
54
52
|
* Upper bound on value or sequence length.
|
|
55
53
|
*/
|
|
56
|
-
max?:
|
|
54
|
+
max?: Expression;
|
|
57
55
|
/**
|
|
58
56
|
* Require set membership for the value.
|
|
59
57
|
*/
|
|
@@ -62,21 +60,32 @@ export declare namespace Constraint {
|
|
|
62
60
|
* Constraint on list child element.
|
|
63
61
|
*/
|
|
64
62
|
entry?: Ast;
|
|
63
|
+
/**
|
|
64
|
+
* Constraint on codepoints in a string.
|
|
65
|
+
*/
|
|
66
|
+
cpMax?: number;
|
|
65
67
|
/**
|
|
66
68
|
* List of sub-constraints in a sequence.
|
|
67
69
|
*/
|
|
68
70
|
parts?: Ast[];
|
|
69
71
|
};
|
|
72
|
+
/**
|
|
73
|
+
* Parsed binary operator.
|
|
74
|
+
*/
|
|
75
|
+
interface BinaryOperator {
|
|
76
|
+
type: "+" | "-";
|
|
77
|
+
lhs: Expression;
|
|
78
|
+
rhs: Expression;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Parsed expression.
|
|
82
|
+
*/
|
|
83
|
+
type Expression = FieldValue | BinaryOperator;
|
|
70
84
|
/**
|
|
71
85
|
* These are all ways to describe a constraint.
|
|
72
86
|
*/
|
|
73
87
|
type Definition = (Ast & {
|
|
74
88
|
definition?: Definition;
|
|
75
89
|
}) | string | number | undefined;
|
|
76
|
-
/**
|
|
77
|
-
* Parse constraint DSL. Extremely lenient.
|
|
78
|
-
*/
|
|
79
|
-
function parse(constraint: Constraint, definition: string): Ast;
|
|
80
|
-
function serialize(ast: Ast): string;
|
|
81
90
|
}
|
|
82
91
|
//# sourceMappingURL=Constraint.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constraint.d.ts","sourceRoot":"","sources":["../../../src/aspects/Constraint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
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,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO;IAoFzD,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"}
|