pacc 4.7.3 → 4.9.0

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.
Files changed (6) hide show
  1. package/package.json +2 -2
  2. package/src/expression.mjs +135 -0
  3. package/src/settergetter.mjs +17 -21
  4. package/src/tokens.mjs +30 -21
  5. package/types/expression.d.mts +1 -0
  6. package/types/tokens.d.mts +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pacc",
3
- "version": "4.7.3",
3
+ "version": "4.9.0",
4
4
  "publishConfig": {
5
5
  "access": "public",
6
6
  "provenance": true
@@ -41,7 +41,7 @@
41
41
  "typescript": "^5.9.2"
42
42
  },
43
43
  "engines": {
44
- "node": ">=22.18.0"
44
+ "node": ">=22.19.0"
45
45
  },
46
46
  "repository": {
47
47
  "type": "git",
package/src/expression.mjs ADDED
@@ -0,0 +1,135 @@
1
+ import {
2
+ tokens,
3
+ EQUAL,
4
+ NOT_EQUAL,
5
+ DOT,
6
+ OPEN_ROUND,
7
+ CLOSE_ROUND,
8
+ OPEN_BRACKET,
9
+ CLOSE_BRACKET,
10
+ LESS,
11
+ LESS_EQUAL,
12
+ GREATER,
13
+ GREATER_EQUAL,
14
+ STAR,
15
+ DIVIDE,
16
+ PLUS,
17
+ MINUS,
18
+ EOF
19
+ } from "./tokens.mjs";
20
+
21
+ export function parse(context) {
22
+ let node, token;
23
+
24
+ const advance = () => {
25
+ const { value, done } = context.tokens.next();
26
+ token = done ? EOF : value;
27
+ };
28
+
29
+ const expect = expected => {
30
+ if (token !== expected) {
31
+ const error = new Error(
32
+ `unexpected '${token.str}' expecting '${expected.str}'`
33
+ );
34
+ throw error;
35
+ }
36
+ advance();
37
+ };
38
+
39
+ const nud = (token, left) => {
40
+ switch (token.type) {
41
+ case "prefix":
42
+ switch (token) {
43
+ case OPEN_ROUND: {
44
+ const node = expression(0);
45
+ expect(CLOSE_ROUND);
46
+ return node;
47
+ }
48
+ case OPEN_BRACKET: {
49
+ const node = expression(0);
50
+ expect(CLOSE_BRACKET);
51
+ return node;
52
+ }
53
+ }
54
+ return { token, left, right: expression(token.precedence) };
55
+ }
56
+
57
+ switch (typeof token) {
58
+ case "string":
59
+ return { path: [token] };
60
+ case "number":
61
+ return token;
62
+ }
63
+
64
+ return { token };
65
+ };
66
+
67
+ const led = (token, left) => {
68
+ switch (token.type) {
69
+ case "infix":
70
+ const right = expression(token.precedence);
71
+ if (typeof left === "number" && typeof right === "number") {
72
+ switch (token) {
73
+ case PLUS:
74
+ return left + right;
75
+ case MINUS:
76
+ return left - right;
77
+ case STAR:
78
+ return left * right;
79
+ case DIVIDE:
80
+ return left / right;
81
+ }
82
+ }
83
+ if (token === DOT) {
84
+ if (left.path) {
85
+ left.path.push(...right.path);
86
+ return left;
87
+ }
88
+ return { path: [left.token, right.token] };
89
+ }
90
+
91
+ return {
92
+ token,
93
+ left,
94
+ right
95
+ };
96
+
97
+ case "infixr":
98
+ return {
99
+ token,
100
+ left,
101
+ right: expression(token.precedence - 1)
102
+ };
103
+
104
+ case "prefix":
105
+ switch (token) {
106
+ case OPEN_BRACKET: {
107
+ const predicate = expression(0);
108
+ expect(CLOSE_BRACKET);
109
+ left.path.push(predicate);
110
+ return left;
111
+ }
112
+ }
113
+ }
114
+
115
+ return { token };
116
+ };
117
+
118
+ const expression = precedence => {
119
+ const last = token;
120
+ advance();
121
+ node = nud(last, node);
122
+
123
+ while (token.precedence > precedence) {
124
+ const last = token;
125
+ advance();
126
+ node = led(last, node);
127
+ }
128
+
129
+ return node;
130
+ };
131
+
132
+ advance();
133
+
134
+ return expression(token.precedence ?? 0);
135
+ }
package/src/settergetter.mjs CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  /**
3
2
  * @typedef {import('./tokens.mjs').Token} Token
4
3
  */
@@ -16,6 +15,7 @@ import {
16
15
  GREATER_EQUAL,
17
16
  STAR
18
17
  } from "./tokens.mjs";
18
+ import { parse } from "./expression.mjs";
19
19
 
20
20
  /**
21
21
  * Set object attribute.
@@ -25,29 +25,23 @@ import {
25
25
  * @param {any} value
26
26
  */
27
27
  export function setAttribute(object, expression, value) {
28
- let anchor, anchorKey;
28
+ const { path } = parse({ tokens: tokens(expression) });
29
29
 
30
- for (const token of tokens(expression)) {
31
- switch (token) {
32
- case DOT:
33
- case OPEN_BRACKET:
34
- case CLOSE_BRACKET:
35
- break;
30
+ let anchor, anchorKey;
36
31
 
37
- default:
38
- if (anchor) {
39
- anchor[anchorKey] = object = typeof token === "string" ? {} : [];
40
- anchor = undefined;
41
- }
32
+ for (const key of path) {
33
+ if (anchor) {
34
+ anchor[anchorKey] = object = typeof key === "string" ? {} : [];
35
+ anchor = undefined;
36
+ }
42
37
 
43
- const next = object[token];
38
+ const next = object[key];
44
39
 
45
- if (next === undefined || typeof next !== "object") {
46
- anchor = object;
47
- anchorKey = token;
48
- } else {
49
- object = next;
50
- }
40
+ if (next === undefined || typeof next !== "object") {
41
+ anchor = object;
42
+ anchorKey = key;
43
+ } else {
44
+ object = next;
51
45
  }
52
46
  }
53
47
 
@@ -91,7 +85,9 @@ export function getAttributeAndOperator(object, expression) {
91
85
  let predicateTokens;
92
86
  let op = EQUAL;
93
87
 
94
- for (const token of tokens(expression)) {
88
+ const next = tokens(expression);
89
+
90
+ for (const token of next) {
95
91
  switch (token) {
96
92
  case GREATER_EQUAL:
97
93
  case LESS_EQUAL:
package/src/tokens.mjs CHANGED
@@ -13,38 +13,47 @@ const lookup = {};
13
13
  * @param {string} str
14
14
  * @returns {Token}
15
15
  */
16
- function createToken(str) {
17
- const token = { str };
16
+ function createToken(str, precedence = 0, type) {
17
+ const token = { str, precedence, type };
18
18
  lookup[str] = token;
19
19
  return token;
20
20
  }
21
21
 
22
- export /** @type {Token} */ const PLUS = createToken("+");
23
- export /** @type {Token} */ const MINUS = createToken("-");
24
- export /** @type {Token} */ const STAR = createToken("*");
25
- export /** @type {Token} */ const DIVIDE = createToken("/");
22
+ export /** @type {Token} */ const PLUS = createToken("+", 50, "infix");
23
+ export /** @type {Token} */ const MINUS = createToken("-", 50, "infix");
24
+ export /** @type {Token} */ const STAR = createToken("*", 60, "infix");
25
+ export /** @type {Token} */ const DIVIDE = createToken("/", 60, "infix");
26
26
  export /** @type {Token} */ const NOT = createToken("!");
27
- export /** @type {Token} */ const NOT_EQUAL = createToken("!=");
28
- export /** @type {Token} */ const GREATER = createToken(">");
29
- export /** @type {Token} */ const GREATER_EQUAL = createToken(">=");
30
- export /** @type {Token} */ const LESS = createToken("<");
31
- export /** @type {Token} */ const LESS_EQUAL = createToken("<=");
32
- export /** @type {Token} */ const EQUAL = createToken("=");
33
- export /** @type {Token} */ const OPEN_ROUND = createToken("(");
34
- export /** @type {Token} */ const CLOSE_ROUND = createToken(")");
35
- export /** @type {Token} */ const OPEN_BRACKET = createToken("[");
36
- export /** @type {Token} */ const CLOSE_BRACKET = createToken("]");
27
+ export /** @type {Token} */ const NOT_EQUAL = createToken("!=", 40, "infixr");
28
+ export /** @type {Token} */ const GREATER = createToken(">", 40, "infixr");
29
+ export /** @type {Token} */ const GREATER_EQUAL = createToken(
30
+ ">=",
31
+ 40,
32
+ "infixr"
33
+ );
34
+ export /** @type {Token} */ const LESS = createToken("<", 40, "infixr");
35
+ export /** @type {Token} */ const LESS_EQUAL = createToken("<=", 40, "infixr");
36
+ export /** @type {Token} */ const EQUAL = createToken("=", 40);
37
+ export /** @type {Token} */ const OPEN_ROUND = createToken("(", 0, "prefix");
38
+ export /** @type {Token} */ const CLOSE_ROUND = createToken(")", 0, "infix");
39
+ export /** @type {Token} */ const OPEN_BRACKET = createToken("[", 10, "prefix");
40
+ export /** @type {Token} */ const CLOSE_BRACKET = createToken("]", 0, "infix");
37
41
  export /** @type {Token} */ const OPEN_CURLY = createToken("{");
38
42
  export /** @type {Token} */ const CLOSE_CURLY = createToken("}");
39
- export /** @type {Token} */ const QUESTION = createToken("?");
40
- export /** @type {Token} */ const COLON = createToken(":");
43
+ export /** @type {Token} */ const QUESTION = createToken("?", 20, "infix");
44
+ export /** @type {Token} */ const COLON = createToken(":", "infix");
41
45
  export /** @type {Token} */ const SEMICOLON = createToken(";");
42
46
  export /** @type {Token} */ const COMMA = createToken(",");
43
- export /** @type {Token} */ const DOT = createToken(".");
47
+ export /** @type {Token} */ const DOT = createToken(".", 80, "infix");
44
48
  export /** @type {Token} */ const AMPERSAND = createToken("&");
45
- export /** @type {Token} */ const DOUBLE_AMPERSAND = createToken("&&");
49
+ export /** @type {Token} */ const DOUBLE_AMPERSAND = createToken(
50
+ "&&",
51
+ 30,
52
+ "infixr"
53
+ );
46
54
  export /** @type {Token} */ const BAR = createToken("|");
47
- export /** @type {Token} */ const DOUBLE_BAR = createToken("||");
55
+ export /** @type {Token} */ const DOUBLE_BAR = createToken("||", 30, "infixr");
56
+ export /** @type {Token} */ const EOF = createToken("EOF", -1);
48
57
 
49
58
  /**
50
59
  * Split property path into tokens
package/types/expression.d.mts ADDED
@@ -0,0 +1 @@
1
+ export function parse(context: any): any;
package/types/tokens.d.mts CHANGED
@@ -33,6 +33,7 @@ export namespace AMPERSAND { }
33
33
  export namespace DOUBLE_AMPERSAND { }
34
34
  export namespace BAR { }
35
35
  export namespace DOUBLE_BAR { }
36
+ export namespace EOF { }
36
37
  export type Token = {
37
38
  str: string;
38
39
  };