@nordcraft/search 1.0.44 → 1.0.46
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/problems.worker.js +13 -5
- package/dist/problems.worker.js.map +1 -1
- package/dist/rules/actions/legacyActionRule.test.js +3 -3
- package/dist/rules/actions/legacyActionRule.test.js.map +1 -1
- package/dist/rules/events/duplicateEventTriggerRule.js +2 -1
- package/dist/rules/events/duplicateEventTriggerRule.js.map +1 -1
- package/dist/rules/logic/noStaticNodeCondition.js +29 -0
- package/dist/rules/logic/noStaticNodeCondition.js.map +1 -0
- package/dist/rules/logic/noStaticNodeCondition.test.js +274 -0
- package/dist/rules/logic/noStaticNodeCondition.test.js.map +1 -0
- package/dist/rules/logic/noUnnecessaryConditionFalsy.js +5 -1
- package/dist/rules/logic/noUnnecessaryConditionFalsy.js.map +1 -1
- package/dist/rules/logic/noUnnecessaryConditionTruthy.js +8 -4
- package/dist/rules/logic/noUnnecessaryConditionTruthy.js.map +1 -1
- package/dist/rules/logic/noUnnecessaryConditionTruthy.test.js +33 -4
- package/dist/rules/logic/noUnnecessaryConditionTruthy.test.js.map +1 -1
- package/dist/rules/noReferenceNodeRule.js +24 -0
- package/dist/rules/noReferenceNodeRule.js.map +1 -0
- package/dist/rules/noReferenceNodeRule.test.js +131 -0
- package/dist/rules/noReferenceNodeRule.test.js.map +1 -0
- package/dist/rules/style/invalidStyleSyntaxRule.js +28 -0
- package/dist/rules/style/invalidStyleSyntaxRule.js.map +1 -0
- package/dist/rules/style/invalidStyleSyntaxRule.test.js +100 -0
- package/dist/rules/style/invalidStyleSyntaxRule.test.js.map +1 -0
- package/dist/searchProject.js +22 -1
- package/dist/searchProject.js.map +1 -1
- package/dist/util/contextlessEvaluateFormula.js +77 -0
- package/dist/util/contextlessEvaluateFormula.js.map +1 -0
- package/dist/util/contextlessEvaluateFormula.test.js +152 -0
- package/dist/util/contextlessEvaluateFormula.test.js.map +1 -0
- package/dist/util/removeUnused.fix.js +18 -1
- package/dist/util/removeUnused.fix.js.map +1 -1
- package/package.json +4 -3
- package/src/problems.worker.ts +20 -7
- package/src/rules/actions/legacyActionRule.test.ts +3 -3
- package/src/rules/events/duplicateEventTriggerRule.ts +2 -1
- package/src/rules/logic/noStaticNodeCondition.test.ts +290 -0
- package/src/rules/logic/noStaticNodeCondition.ts +43 -0
- package/src/rules/logic/noUnnecessaryConditionFalsy.ts +5 -4
- package/src/rules/logic/noUnnecessaryConditionTruthy.test.ts +37 -4
- package/src/rules/logic/noUnnecessaryConditionTruthy.ts +10 -8
- package/src/rules/noReferenceNodeRule.test.ts +140 -0
- package/src/rules/noReferenceNodeRule.ts +34 -0
- package/src/rules/style/invalidStyleSyntaxRule.test.ts +106 -0
- package/src/rules/style/invalidStyleSyntaxRule.ts +35 -0
- package/src/searchProject.ts +25 -1
- package/src/types.d.ts +20 -2
- package/src/util/contextlessEvaluateFormula.test.ts +190 -0
- package/src/util/contextlessEvaluateFormula.ts +110 -0
- package/src/util/removeUnused.fix.ts +29 -1
- package/dist/memos/getAllCustomPropertiesBySyntax.js +0 -43
- package/dist/memos/getAllCustomPropertiesBySyntax.js.map +0 -1
- package/dist/rules/style-variables/ambiguousStyleVariableSyntaxRule.js +0 -50
- package/dist/rules/style-variables/ambiguousStyleVariableSyntaxRule.js.map +0 -1
- package/dist/rules/style-variables/ambiguousStyleVariableSyntaxRule.test.js +0 -265
- package/dist/rules/style-variables/ambiguousStyleVariableSyntaxRule.test.js.map +0 -1
- package/src/memos/getAllCustomPropertiesBySyntax.ts +0 -68
- package/src/rules/style-variables/ambiguousStyleVariableSyntaxRule.test.ts +0 -278
- package/src/rules/style-variables/ambiguousStyleVariableSyntaxRule.ts +0 -65
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { removeFromPathFix } from '../util/removeUnused.fix';
|
|
2
|
+
export const noReferenceNodeRule = {
|
|
3
|
+
code: 'no-reference node',
|
|
4
|
+
level: 'warning',
|
|
5
|
+
category: 'No References',
|
|
6
|
+
visit: (report, args) => {
|
|
7
|
+
if (args.nodeType !== 'component-node') {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
const { path, component } = args;
|
|
11
|
+
const nodeId = path.at(-1);
|
|
12
|
+
if (typeof nodeId !== 'string') {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const referencedNodesInComponent = args.memo(`node-references-${component.name}`, () => new Set(Object.values(component.nodes).flatMap((node) => node.children ?? [])));
|
|
16
|
+
if (nodeId !== 'root' && !referencedNodesInComponent.has(nodeId)) {
|
|
17
|
+
report(path, { node: nodeId }, ['delete-orphan-node']);
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
fixes: {
|
|
21
|
+
'delete-orphan-node': removeFromPathFix,
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=noReferenceNodeRule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"noReferenceNodeRule.js","sourceRoot":"","sources":["../../src/rules/noReferenceNodeRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,CAAC,MAAM,mBAAmB,GAA2B;IACzD,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,eAAe;IACzB,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI,IAAI,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YACvC,OAAM;QACR,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAM;QACR,CAAC;QACD,MAAM,0BAA0B,GAAG,IAAI,CAAC,IAAI,CAC1C,mBAAmB,SAAS,CAAC,IAAI,EAAE,EACnC,GAAG,EAAE,CACH,IAAI,GAAG,CACL,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CACtE,CACJ,CAAA;QAED,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,oBAAoB,EAAE,iBAAiB;KACxC;CACF,CAAA"}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { describe, expect, test } from 'bun:test';
|
|
2
|
+
import { fixProject } from '../fixProject';
|
|
3
|
+
import { searchProject } from '../searchProject';
|
|
4
|
+
import { noReferenceNodeRule } from './noReferenceNodeRule';
|
|
5
|
+
describe('find noReferenceNodeRule', () => {
|
|
6
|
+
test('should detect nodes with no references', () => {
|
|
7
|
+
const problems = Array.from(searchProject({
|
|
8
|
+
files: {
|
|
9
|
+
formulas: {},
|
|
10
|
+
components: {
|
|
11
|
+
test: {
|
|
12
|
+
name: 'test',
|
|
13
|
+
nodes: {
|
|
14
|
+
root: {
|
|
15
|
+
id: 'root',
|
|
16
|
+
type: 'element',
|
|
17
|
+
tag: 'div',
|
|
18
|
+
children: [],
|
|
19
|
+
attrs: {},
|
|
20
|
+
style: {},
|
|
21
|
+
events: {},
|
|
22
|
+
classes: {},
|
|
23
|
+
},
|
|
24
|
+
'1LisbD0eCjsuccoUwajn1': {
|
|
25
|
+
id: 'XdhwPGsdFNI4s8A0oMwre',
|
|
26
|
+
type: 'text',
|
|
27
|
+
value: { type: 'value', value: 'Clone the project' },
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
formulas: {},
|
|
31
|
+
apis: {},
|
|
32
|
+
attributes: {},
|
|
33
|
+
variables: {},
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
rules: [noReferenceNodeRule],
|
|
38
|
+
}));
|
|
39
|
+
expect(problems).toHaveLength(1);
|
|
40
|
+
expect(problems[0].details).toEqual({ node: '1LisbD0eCjsuccoUwajn1' });
|
|
41
|
+
expect(problems[0].path).toEqual([
|
|
42
|
+
'components',
|
|
43
|
+
'test',
|
|
44
|
+
'nodes',
|
|
45
|
+
'1LisbD0eCjsuccoUwajn1',
|
|
46
|
+
]);
|
|
47
|
+
});
|
|
48
|
+
test('should not detect nodes with references', () => {
|
|
49
|
+
const problems = Array.from(searchProject({
|
|
50
|
+
files: {
|
|
51
|
+
formulas: {},
|
|
52
|
+
components: {
|
|
53
|
+
test: {
|
|
54
|
+
name: 'test',
|
|
55
|
+
nodes: {
|
|
56
|
+
root: {
|
|
57
|
+
id: 'root',
|
|
58
|
+
type: 'element',
|
|
59
|
+
tag: 'div',
|
|
60
|
+
children: ['1LisbD0eCjsuccoUwajn1'],
|
|
61
|
+
attrs: {},
|
|
62
|
+
style: {},
|
|
63
|
+
events: {},
|
|
64
|
+
classes: {},
|
|
65
|
+
},
|
|
66
|
+
'1LisbD0eCjsuccoUwajn1': {
|
|
67
|
+
id: 'XdhwPGsdFNI4s8A0oMwre',
|
|
68
|
+
type: 'text',
|
|
69
|
+
value: { type: 'value', value: 'Clone the project' },
|
|
70
|
+
},
|
|
71
|
+
},
|
|
72
|
+
formulas: {},
|
|
73
|
+
apis: {},
|
|
74
|
+
attributes: {},
|
|
75
|
+
variables: {},
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
rules: [noReferenceNodeRule],
|
|
80
|
+
}));
|
|
81
|
+
expect(problems).toEqual([]);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe('fix noReferenceNodeRule', () => {
|
|
85
|
+
test('should delete nodes with no references', () => {
|
|
86
|
+
const files = {
|
|
87
|
+
formulas: {},
|
|
88
|
+
components: {
|
|
89
|
+
test: {
|
|
90
|
+
name: 'test',
|
|
91
|
+
nodes: {
|
|
92
|
+
root: {
|
|
93
|
+
id: 'root',
|
|
94
|
+
type: 'element',
|
|
95
|
+
tag: 'div',
|
|
96
|
+
children: ['used'],
|
|
97
|
+
attrs: {},
|
|
98
|
+
style: {},
|
|
99
|
+
events: {},
|
|
100
|
+
classes: {},
|
|
101
|
+
},
|
|
102
|
+
'1LisbD0eCjsuccoUwajn1': {
|
|
103
|
+
id: 'XdhwPGsdFNI4s8A0oMwre',
|
|
104
|
+
type: 'text',
|
|
105
|
+
value: { type: 'value', value: 'Clone the project' },
|
|
106
|
+
},
|
|
107
|
+
used: {
|
|
108
|
+
id: 'used',
|
|
109
|
+
type: 'text',
|
|
110
|
+
value: { type: 'value', value: 'I am used' },
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
formulas: {},
|
|
114
|
+
apis: {},
|
|
115
|
+
attributes: {},
|
|
116
|
+
variables: {},
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
const fixedFiles = fixProject({
|
|
121
|
+
files,
|
|
122
|
+
rule: noReferenceNodeRule,
|
|
123
|
+
fixType: 'delete-orphan-node',
|
|
124
|
+
});
|
|
125
|
+
expect(Object.keys(fixedFiles.components.test.nodes)).toEqual([
|
|
126
|
+
'root',
|
|
127
|
+
'used',
|
|
128
|
+
]);
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
//# sourceMappingURL=noReferenceNodeRule.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"noReferenceNodeRule.test.js","sourceRoot":"","sources":["../../src/rules/noReferenceNodeRule.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { parse } from 'postcss';
|
|
2
|
+
import { removeFromPathFix } from '../../util/removeUnused.fix';
|
|
3
|
+
export const invalidStyleSyntaxRule = {
|
|
4
|
+
code: 'invalid style syntax',
|
|
5
|
+
level: 'error',
|
|
6
|
+
category: 'Quality',
|
|
7
|
+
visit: (report, { nodeType, value, path, memo }) => {
|
|
8
|
+
if (nodeType !== 'style-declaration') {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const valid = memo(`valid-style-${value.styleProperty}:${value.styleValue}`, () => {
|
|
12
|
+
try {
|
|
13
|
+
parse(`${value.styleProperty}: ${value.styleValue}`);
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
if (!valid) {
|
|
21
|
+
report(path, { property: value.styleProperty }, ['delete-style-property']);
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
fixes: {
|
|
25
|
+
'delete-style-property': removeFromPathFix,
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
//# sourceMappingURL=invalidStyleSyntaxRule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invalidStyleSyntaxRule.js","sourceRoot":"","sources":["../../../src/rules/style/invalidStyleSyntaxRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAE/D,MAAM,CAAC,MAAM,sBAAsB,GAE9B;IACH,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACjD,IAAI,QAAQ,KAAK,mBAAmB,EAAE,CAAC;YACrC,OAAM;QACR,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAChB,eAAe,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,UAAU,EAAE,EACxD,GAAG,EAAE;YACH,IAAI,CAAC;gBACH,KAAK,CAAC,GAAG,KAAK,CAAC,aAAa,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC,CAAA;gBACpD,OAAO,IAAI,CAAA;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC,CACF,CAAA;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAA;QAC5E,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,uBAAuB,EAAE,iBAAiB;KAC3C;CACF,CAAA"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { describe, expect, test } from 'bun:test';
|
|
2
|
+
import { fixProject } from '../../fixProject';
|
|
3
|
+
import { searchProject } from '../../searchProject';
|
|
4
|
+
import { invalidStyleSyntaxRule } from './invalidStyleSyntaxRule';
|
|
5
|
+
describe('find invalidStyleSyntaxRule', () => {
|
|
6
|
+
test('should find invalid style syntax', () => {
|
|
7
|
+
const problems = Array.from(searchProject({
|
|
8
|
+
files: {
|
|
9
|
+
formulas: {},
|
|
10
|
+
components: {
|
|
11
|
+
test: {
|
|
12
|
+
name: 'test',
|
|
13
|
+
nodes: {
|
|
14
|
+
root: {
|
|
15
|
+
tag: 'ul',
|
|
16
|
+
type: 'element',
|
|
17
|
+
attrs: {},
|
|
18
|
+
style: {
|
|
19
|
+
gap: '8px',
|
|
20
|
+
width: '100%',
|
|
21
|
+
'max-width': 'calc(NOT VALID',
|
|
22
|
+
height: '/* 100px */ 22px',
|
|
23
|
+
'{': '100px',
|
|
24
|
+
'border-width': '--my-var',
|
|
25
|
+
},
|
|
26
|
+
events: {},
|
|
27
|
+
classes: {},
|
|
28
|
+
children: [],
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
formulas: {},
|
|
32
|
+
apis: {},
|
|
33
|
+
attributes: {},
|
|
34
|
+
variables: {},
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
rules: [invalidStyleSyntaxRule],
|
|
39
|
+
}));
|
|
40
|
+
expect(problems).toHaveLength(2);
|
|
41
|
+
expect(problems[0].code).toBe('invalid style syntax');
|
|
42
|
+
expect(problems[0].path).toEqual([
|
|
43
|
+
'components',
|
|
44
|
+
'test',
|
|
45
|
+
'nodes',
|
|
46
|
+
'root',
|
|
47
|
+
'style',
|
|
48
|
+
'max-width',
|
|
49
|
+
]);
|
|
50
|
+
expect(problems[0].details.property).toBe('max-width');
|
|
51
|
+
expect(problems[1].details.property).toBe('{');
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
describe('fix invalidStyleSyntaxRule', () => {
|
|
55
|
+
test('should remove an invalid style property', () => {
|
|
56
|
+
const files = {
|
|
57
|
+
formulas: {},
|
|
58
|
+
components: {
|
|
59
|
+
test: {
|
|
60
|
+
name: 'test',
|
|
61
|
+
nodes: {
|
|
62
|
+
root: {
|
|
63
|
+
tag: 'ul',
|
|
64
|
+
type: 'element',
|
|
65
|
+
attrs: {},
|
|
66
|
+
style: {
|
|
67
|
+
gap: '8px',
|
|
68
|
+
width: '100%',
|
|
69
|
+
'max-width': 'calc(NOT VALID',
|
|
70
|
+
height: '/* 100px */ 22px',
|
|
71
|
+
'{': '100px',
|
|
72
|
+
},
|
|
73
|
+
events: {},
|
|
74
|
+
classes: {},
|
|
75
|
+
children: [],
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
formulas: {},
|
|
79
|
+
apis: {},
|
|
80
|
+
attributes: {},
|
|
81
|
+
variables: {},
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
const fixedFiles = fixProject({
|
|
86
|
+
files,
|
|
87
|
+
rule: invalidStyleSyntaxRule,
|
|
88
|
+
fixType: 'delete-style-property',
|
|
89
|
+
});
|
|
90
|
+
expect(fixedFiles.components.test.nodes.root.style)
|
|
91
|
+
.toMatchInlineSnapshot(`
|
|
92
|
+
{
|
|
93
|
+
"gap": "8px",
|
|
94
|
+
"height": "/* 100px */ 22px",
|
|
95
|
+
"width": "100%",
|
|
96
|
+
}
|
|
97
|
+
`);
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
//# sourceMappingURL=invalidStyleSyntaxRule.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invalidStyleSyntaxRule.test.js","sourceRoot":"","sources":["../../../src/rules/style/invalidStyleSyntaxRule.test.ts"],"names":[],"mappings":"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"}
|
package/dist/searchProject.js
CHANGED
|
@@ -164,7 +164,10 @@ function* visitNode({ args, state, fixOptions, }) {
|
|
|
164
164
|
fixes?.includes(fixOptions.fixType) &&
|
|
165
165
|
// The rule must have an implementation for the fix
|
|
166
166
|
rule.fixes?.[fixOptions.fixType]) {
|
|
167
|
-
const ruleFixes = rule.fixes[fixOptions.fixType]?.(
|
|
167
|
+
const ruleFixes = rule.fixes[fixOptions.fixType]?.(
|
|
168
|
+
// We must use the path from the report, not the original path
|
|
169
|
+
// because the report might be for a subpath
|
|
170
|
+
{ ...data, path }, state);
|
|
168
171
|
if (ruleFixes) {
|
|
169
172
|
fixedFiles = ruleFixes;
|
|
170
173
|
}
|
|
@@ -452,6 +455,24 @@ function* visitNode({ args, state, fixOptions, }) {
|
|
|
452
455
|
});
|
|
453
456
|
}
|
|
454
457
|
}
|
|
458
|
+
for (const [styleKey, styleValue] of Object.entries(
|
|
459
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
460
|
+
value.style ?? {})) {
|
|
461
|
+
yield* visitNode({
|
|
462
|
+
args: {
|
|
463
|
+
nodeType: 'style-declaration',
|
|
464
|
+
value: { styleProperty: styleKey, styleValue, element: value },
|
|
465
|
+
path: [...path, 'style', styleKey],
|
|
466
|
+
rules,
|
|
467
|
+
files,
|
|
468
|
+
pathsToVisit,
|
|
469
|
+
useExactPaths,
|
|
470
|
+
memo,
|
|
471
|
+
},
|
|
472
|
+
state,
|
|
473
|
+
fixOptions: fixOptions,
|
|
474
|
+
});
|
|
475
|
+
}
|
|
455
476
|
}
|
|
456
477
|
break;
|
|
457
478
|
case 'api-service': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchProject.js","sourceRoot":"","sources":["../src/searchProject.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"searchProject.js","sourceRoot":"","sources":["../src/searchProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAA;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAE7D,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAgCvE,MAAM,SAAS,CAAC,CAAC,aAAa,CAAC,EAC7B,KAAK,EACL,KAAK,EACL,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,KAAK,EACrB,KAAK,EACL,UAAU,GAQX;IACC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAe,CAAA;IACpC,MAAM,IAAI,GAAG,CAAC,GAAsB,EAAE,EAAa,EAAE,EAAE;QACrD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QAC1D,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAC7B,CAAC;QAED,MAAM,MAAM,GAAG,EAAE,EAAE,CAAA;QACnB,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC5B,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,CAAC,CAAC,SAAS,CAAC;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,WAAW;oBACrB,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC;oBACzB,KAAK;oBACL,KAAK;oBACL,YAAY;oBACZ,aAAa;oBACb,IAAI;iBACL;gBACD,KAAK;gBACL,UAAU,EAAE,UAAiB;aAC9B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjC,KAAK,CAAC,CAAC,SAAS,CAAC;YACf,IAAI,EAAE;gBACJ,QAAQ,EAAE,iBAAiB;gBAC3B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC1B,IAAI,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC;gBACvB,KAAK;gBACL,KAAK;gBACL,YAAY;gBACZ,aAAa;gBACb,IAAI;aACL;YACD,KAAK;YACL,UAAU,EAAE,UAAiB;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChC,KAAK,CAAC,CAAC,SAAS,CAAC;YACf,IAAI,EAAE;gBACJ,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;gBACzB,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC;gBACtB,KAAK;gBACL,KAAK;gBACL,YAAY;gBACZ,aAAa;gBACb,IAAI;aACL;YACD,KAAK;YACL,UAAU,EAAE,UAAiB;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC/B,KAAK,CAAC,CAAC,SAAS,CAAC;YACf,IAAI,EAAE;gBACJ,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC;gBACrB,KAAK;gBACL,KAAK;gBACL,YAAY;gBACZ,aAAa;gBACb,IAAI;aACL;YACD,KAAK;YACL,UAAU,EAAE,UAAiB;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,SAAS,CAAC;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAC1B,IAAI,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC;oBACvB,KAAK;oBACL,KAAK;oBACL,YAAY;oBACZ,aAAa;oBACb,IAAI;iBACL;gBACD,KAAK;gBACL,UAAU,EAAE,UAAiB;aAC9B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,SAAS,CAAC;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,eAAe;oBACzB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;oBACxB,SAAS,EAAE,GAAG;oBACd,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC;oBACrB,KAAK;oBACL,KAAK;oBACL,YAAY;oBACZ,aAAa;oBACb,IAAI;iBACL;gBACD,KAAK;gBACL,UAAU,EAAE,UAAiB;aAC9B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,CAAC,SAAS,CAAC;QACf,IAAI,EAAE;YACJ,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,KAAK,CAAC,MAAM;YACnB,IAAI,EAAE,CAAC,QAAQ,CAAC;YAChB,KAAK;YACL,KAAK;YACL,YAAY;YACZ,aAAa;YACb,IAAI;SACL;QACD,KAAK;QACL,UAAU,EAAE,UAAiB;KAC9B,CAAC,CAAA;AACJ,CAAC;AAwBD,QAAQ,CAAC,CAAC,SAAS,CAAC,EAClB,IAAI,EACJ,KAAK,EACL,UAAU,GAWX;IACC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;IAC5D,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACnD,IACE,CAAC,eAAe,CAAC;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,YAAY;KACb,CAAC,EACF,CAAC;QACD,2DAA2D;QAC3D,OAAM;IACR,CAAC;IAED,IACE,CAAC,aAAa;QACd,qBAAqB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,EACxD,CAAC;QACD,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,IAAI,UAAoC,CAAA;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,sCAAsC;YACtC,OAAO,CAAC,SAAS,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC/C,IAAI,CAAC,KAAK;YACR,wCAAwC;YACxC,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBACvB,IAAI,UAAU,EAAE,CAAC;oBACf,sBAAsB;oBACtB;oBACE,+DAA+D;oBAC/D,CAAC,UAAU;wBACX,oDAAoD;wBACpD,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC;wBACnC,mDAAmD;wBACnD,IAAI,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAChC,CAAC;wBACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;wBAChD,8DAA8D;wBAC9D,4CAA4C;wBAC5C,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,EACjB,KAAK,CACN,CAAA;wBACD,IAAI,SAAS,EAAE,CAAC;4BACd,UAAU,GAAG,SAAS,CAAA;wBACxB,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,yBAAyB;oBACzB,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,IAAI;wBACJ,OAAO;wBACP,KAAK;qBACN,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC,EACD,IAAI,EACJ,KAAK,CACN,CAAA;YACD,IAAI,UAAU,EAAE,CAAC;gBACf,oDAAoD;gBACpD,MAAK;YACP,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,UAAU,CAAA;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAA;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,SAAS,GAAG,IAAI,eAAe,CAAS;gBAC5C,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,SAAS;gBACtB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC9C,cAAc,EAAE;oBACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB;aACF,CAAC,CAAA;YAEF,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,qBAAqB;wBAC/B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;wBAC5B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC;wBAClC,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,oBAAoB;wBAC9B,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;wBAC3B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC;wBACjC,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC7B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC3B,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,eAAe;wBACzB,KAAK,EAAE,GAAG;wBACV,SAAS;wBACT,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC;wBAC5B,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;qBACL;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;gBACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC3D,KAAK,CAAC,CAAC,SAAS,CAAC;4BACf,IAAI,EAAE;gCACJ,QAAQ,EAAE,qBAAqB;gCAC/B,KAAK,EAAE,KAAK;gCACZ,GAAG;gCACH,SAAS;gCACT,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC;gCAChD,KAAK;gCACL,KAAK;gCACL,YAAY;gCACZ,aAAa;gCACb,IAAI;6BACL;4BACD,KAAK;4BACL,UAAU,EAAE,UAAiB;yBAC9B,CAAC,CAAA;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACjC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,mBAAmB;wBAC7B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;wBAC1B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC;wBAChC,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,oBAAoB;wBAC9B,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;wBAC3B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC;wBACjC,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC/B,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,CAAC,CAAC,SAAS,CAAC;wBACf,IAAI,EAAE;4BACJ,QAAQ,EAAE,iBAAiB;4BAC3B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;4BAC5B,KAAK;4BACL,KAAK;4BACL,YAAY;4BACZ,aAAa;4BACb,IAAI;4BACJ,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;yBAC5B;wBACD,KAAK;wBACL,UAAU,EAAE,UAAiB;qBAC9B,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACjC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,mBAAmB;wBAC7B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;wBAC1B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC;wBAChC,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;qBACL;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAC9B,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,gBAAgB;wBAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACvB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC;wBAC7B,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,EACT,IAAI,EAAE,WAAW,EACjB,OAAO,GACR,IAAI,SAAS,CAAC,mBAAmB,EAAE,EAAE,CAAC;gBACrC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;wBAC/B,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,SAAS,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBACvE,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,cAAc;wBACxB,KAAK,EAAE,MAAM;wBACb,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;wBAC9B,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;wBACJ,SAAS;qBACV;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YACD,MAAK;QACP,CAAC;QAED,KAAK,iBAAiB;YACpB,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC;oBAChC,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,cAAc,EAAE;wBACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;qBACzB;iBACF,CAAC,CAAA;gBACF,KAAK,MAAM,EACT,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,CAAC,GACX,IAAI,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;oBACjC,KAAK,CAAC,CAAC,SAAS,CAAC;wBACf,IAAI,EAAE;4BACJ,QAAQ,EAAE,SAAS;4BACnB,KAAK,EAAE,CAAC;4BACR,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;4BAC1C,KAAK;4BACL,KAAK;4BACL,YAAY;4BACZ,aAAa;4BACb,IAAI;yBACL;wBACD,KAAK;wBACL,UAAU,EAAE,UAAiB;qBAC9B,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YACD,MAAK;QAEP,KAAK,gBAAgB;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;gBAC/B,IAAI,QAAQ,EAAE,CAAC;oBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;wBAC3B,KAAK,CAAC,CAAC,SAAS,CAAC;4BACf,IAAI,EAAE;gCACJ,QAAQ,EAAE,eAAe;gCACzB,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;gCAClC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gCAC9B,KAAK;gCACL,KAAK;gCACL,YAAY;gCACZ,aAAa;gCACb,IAAI;6BACL;4BACD,KAAK;4BACL,UAAU,EAAE,UAAiB;yBAC9B,CAAC,CAAA;oBACJ,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO;gBACjD,uEAAuE;gBACvE,KAAK,CAAC,KAAK,IAAI,EAAE,CAClB,EAAE,CAAC;oBACF,KAAK,CAAC,CAAC,SAAS,CAAC;wBACf,IAAI,EAAE;4BACJ,QAAQ,EAAE,mBAAmB;4BAC7B,KAAK,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE;4BAC9D,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC;4BAClC,KAAK;4BACL,KAAK;4BACL,YAAY;4BACZ,aAAa;4BACb,IAAI;yBACL;wBACD,KAAK;wBACL,UAAU,EAAE,UAAiB;qBAC9B,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAS;gBAC9C,OAAO,EAAE,KAAK;gBACd,cAAc,EAAE;oBACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB;aACF,CAAC,CAAA;YACF,KAAK,MAAM,EACT,IAAI,EAAE,WAAW,EACjB,OAAO,GACR,IAAI,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBACpC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;wBAC/B,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;qBACL;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YACD,MAAK;QACP,CAAC;QAED,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,MAAM,YAAY,GAAG,IAAI,WAAW,CAAS;gBAC3C,KAAK,EAAE,KAAK;gBACZ,cAAc,EAAE;oBACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB;aACF,CAAC,CAAA;YACF,KAAK,MAAM,EACT,IAAI,EAAE,WAAW,EACjB,OAAO,GACR,IAAI,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC;gBACpC,KAAK,CAAC,CAAC,SAAS,CAAC;oBACf,IAAI,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;wBAC1C,KAAK;wBACL,KAAK;wBACL,YAAY;wBACZ,aAAa;wBACb,IAAI;qBACL;oBACD,KAAK;oBACL,UAAU,EAAE,UAAiB;iBAC9B,CAAC,CAAA;YACJ,CAAC;YACD,MAAK;QACP,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import {} from '@nordcraft/core/dist/formula/formula';
|
|
2
|
+
/**
|
|
3
|
+
* Static evaluation of a formula.
|
|
4
|
+
*
|
|
5
|
+
* Can be used by issues to determine if a formula or sub-formula can be reduced to a static value.
|
|
6
|
+
* When sophisticated enough, it can be used during compile-time to reduce all static subgraphs of a formula to static values, greatly reducing payload and improving runtime performance.
|
|
7
|
+
*
|
|
8
|
+
* @returns {
|
|
9
|
+
* isStatic: boolean; // Whether the formula is static (i.e., does not depend on any variables, context AND only use pure formulas (no Random, Date, etc.))
|
|
10
|
+
* result: unknown; // The evaluated value of the formula
|
|
11
|
+
* }
|
|
12
|
+
*
|
|
13
|
+
* TODO: Make this function more capable of evaluating pure core formulas.
|
|
14
|
+
* TODO: Memoize the results (using path or a fast hash) to avoid re-evaluating any similar sub-graphs multiple times.
|
|
15
|
+
* TODO: Add a complex test-suite to ensure it works and develops as expected.
|
|
16
|
+
*/
|
|
17
|
+
export const contextlessEvaluateFormula = (formula) => {
|
|
18
|
+
// Very basic implementation, just to get started.
|
|
19
|
+
switch (formula.type) {
|
|
20
|
+
case 'value': {
|
|
21
|
+
return {
|
|
22
|
+
isStatic: true,
|
|
23
|
+
result: formula.value,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
case 'array': {
|
|
27
|
+
const results = formula.arguments.map((arg) => contextlessEvaluateFormula(arg.formula));
|
|
28
|
+
return {
|
|
29
|
+
isStatic: results.every((res) => res.isStatic),
|
|
30
|
+
result: results.map((res) => res.result),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
case 'record': {
|
|
34
|
+
const entries = Object.entries(formula.entries).map(([key, arg]) => [key, contextlessEvaluateFormula(arg.formula)]);
|
|
35
|
+
const results = entries.map(([, res]) => res);
|
|
36
|
+
return {
|
|
37
|
+
isStatic: results.every((res) => res.isStatic),
|
|
38
|
+
result: Object.fromEntries(entries.map(([key, res]) => [key, res.result])),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
// Static if:
|
|
42
|
+
// - ALL conditions are static AND truthy
|
|
43
|
+
// - ANY condition is static and falsy
|
|
44
|
+
// - EMPTY argument list is always true
|
|
45
|
+
case 'and': {
|
|
46
|
+
const results = formula.arguments.map((arg) => contextlessEvaluateFormula(arg.formula));
|
|
47
|
+
const alwaysTrue = results.length === 0 ||
|
|
48
|
+
results.every((res) => res.isStatic && Boolean(res.result) === true);
|
|
49
|
+
const alwaysFalsy = results.some((res) => res.isStatic && Boolean(res.result) === false);
|
|
50
|
+
return {
|
|
51
|
+
isStatic: alwaysTrue || alwaysFalsy,
|
|
52
|
+
result: alwaysTrue ? true : alwaysFalsy ? false : undefined,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
// Static if:
|
|
56
|
+
// - ANY condition is static AND truthy
|
|
57
|
+
// - ALL conditions are static AND falsy
|
|
58
|
+
// - EMPTY argument list is always false
|
|
59
|
+
case 'or': {
|
|
60
|
+
const results = formula.arguments.map((arg) => contextlessEvaluateFormula(arg.formula));
|
|
61
|
+
const alwaysFalsy = results.length === 0 ||
|
|
62
|
+
results.every((res) => res.isStatic && Boolean(res.result) === false);
|
|
63
|
+
const alwaysTrue = results.some((res) => res.isStatic && Boolean(res.result) === true);
|
|
64
|
+
return {
|
|
65
|
+
isStatic: alwaysTrue || alwaysFalsy,
|
|
66
|
+
result: alwaysFalsy ? false : alwaysTrue ? true : undefined,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
default:
|
|
70
|
+
// For now, we assume that any other formula is not static.
|
|
71
|
+
return {
|
|
72
|
+
isStatic: false,
|
|
73
|
+
result: undefined,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
//# sourceMappingURL=contextlessEvaluateFormula.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contextlessEvaluateFormula.js","sourceRoot":"","sources":["../../src/util/contextlessEvaluateFormula.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { describe, expect, test } from 'bun:test';
|
|
2
|
+
import { contextlessEvaluateFormula } from './contextlessEvaluateFormula';
|
|
3
|
+
describe('contextlessEvaluateFormula', () => {
|
|
4
|
+
test('should return `true` when the formula is a simple value formula', () => {
|
|
5
|
+
expect(contextlessEvaluateFormula({
|
|
6
|
+
type: 'value',
|
|
7
|
+
value: true,
|
|
8
|
+
})).toEqual({
|
|
9
|
+
isStatic: true,
|
|
10
|
+
result: true,
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
test('should not return a result and have `isStatic: false` when the formula uses a non-pure formula ("randomNumber", "Now")', () => {
|
|
14
|
+
expect(contextlessEvaluateFormula({
|
|
15
|
+
type: 'apply',
|
|
16
|
+
name: 'randomNumber',
|
|
17
|
+
arguments: [],
|
|
18
|
+
})).toEqual({
|
|
19
|
+
isStatic: false,
|
|
20
|
+
result: undefined,
|
|
21
|
+
});
|
|
22
|
+
expect(contextlessEvaluateFormula({
|
|
23
|
+
type: 'apply',
|
|
24
|
+
name: 'now',
|
|
25
|
+
arguments: [],
|
|
26
|
+
})).toEqual({
|
|
27
|
+
isStatic: false,
|
|
28
|
+
result: undefined,
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
test('should not return a result and have `isStatic: false` when the formula depends on a variable', () => {
|
|
32
|
+
expect(contextlessEvaluateFormula({
|
|
33
|
+
type: 'path',
|
|
34
|
+
path: ['Variables', 'myVariable'],
|
|
35
|
+
})).toEqual({
|
|
36
|
+
isStatic: false,
|
|
37
|
+
result: undefined,
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
test('should return a result and static for an array formula where all args are array or value types', () => {
|
|
41
|
+
expect(contextlessEvaluateFormula({
|
|
42
|
+
type: 'array',
|
|
43
|
+
arguments: [
|
|
44
|
+
{ formula: { type: 'value', value: 1 } },
|
|
45
|
+
{
|
|
46
|
+
formula: {
|
|
47
|
+
type: 'array',
|
|
48
|
+
arguments: [{ formula: { type: 'value', value: 2 } }],
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
|
+
],
|
|
52
|
+
})).toEqual({
|
|
53
|
+
isStatic: true,
|
|
54
|
+
result: [1, [2]],
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
test('should return `isStatic: false` for an array formula with a non-static argument', () => {
|
|
58
|
+
expect(contextlessEvaluateFormula({
|
|
59
|
+
type: 'array',
|
|
60
|
+
arguments: [
|
|
61
|
+
{ formula: { type: 'value', value: 1 } },
|
|
62
|
+
{ formula: { type: 'apply', name: 'randomNumber', arguments: [] } },
|
|
63
|
+
],
|
|
64
|
+
})).toEqual({
|
|
65
|
+
isStatic: false,
|
|
66
|
+
result: [
|
|
67
|
+
1,
|
|
68
|
+
undefined, // The second argument was not static
|
|
69
|
+
],
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
test('should be static true for `And` formulas with no arguments', () => {
|
|
73
|
+
expect(contextlessEvaluateFormula({
|
|
74
|
+
type: 'and',
|
|
75
|
+
arguments: [],
|
|
76
|
+
})).toEqual({
|
|
77
|
+
isStatic: true,
|
|
78
|
+
result: true,
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
test('should be static false for `Or` formulas with no arguments', () => {
|
|
82
|
+
expect(contextlessEvaluateFormula({
|
|
83
|
+
type: 'or',
|
|
84
|
+
arguments: [],
|
|
85
|
+
})).toEqual({
|
|
86
|
+
isStatic: true,
|
|
87
|
+
result: false,
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
test('should be static true for `And` formulas with all static truthy arguments', () => {
|
|
91
|
+
expect(contextlessEvaluateFormula({
|
|
92
|
+
type: 'and',
|
|
93
|
+
arguments: [
|
|
94
|
+
{ formula: { type: 'value', value: true } },
|
|
95
|
+
{ formula: { type: 'value', value: true } },
|
|
96
|
+
],
|
|
97
|
+
})).toEqual({
|
|
98
|
+
isStatic: true,
|
|
99
|
+
result: true,
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
test('should not be static for `And` where any dynamic value exist', () => {
|
|
103
|
+
expect(contextlessEvaluateFormula({
|
|
104
|
+
type: 'and',
|
|
105
|
+
arguments: [
|
|
106
|
+
{ formula: { type: 'value', value: true } },
|
|
107
|
+
{ formula: { type: 'apply', name: 'randomNumber', arguments: [] } },
|
|
108
|
+
],
|
|
109
|
+
})).toEqual({
|
|
110
|
+
isStatic: false,
|
|
111
|
+
result: undefined,
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
test('should be static false for `And` when any argument is static false, even when dynamic arguments exist', () => {
|
|
115
|
+
expect(contextlessEvaluateFormula({
|
|
116
|
+
type: 'and',
|
|
117
|
+
arguments: [
|
|
118
|
+
{ formula: { type: 'value', value: true } },
|
|
119
|
+
{ formula: { type: 'path', path: ['Variables', 'myVariable'] } },
|
|
120
|
+
{ formula: { type: 'value', value: false } },
|
|
121
|
+
],
|
|
122
|
+
})).toEqual({
|
|
123
|
+
isStatic: true,
|
|
124
|
+
result: false,
|
|
125
|
+
});
|
|
126
|
+
});
|
|
127
|
+
test('should not be static for `Or` when any argument is dynamic and all static are falsy', () => {
|
|
128
|
+
expect(contextlessEvaluateFormula({
|
|
129
|
+
type: 'or',
|
|
130
|
+
arguments: [
|
|
131
|
+
{ formula: { type: 'value', value: false } },
|
|
132
|
+
{ formula: { type: 'apply', name: 'randomNumber', arguments: [] } },
|
|
133
|
+
],
|
|
134
|
+
})).toEqual({
|
|
135
|
+
isStatic: false,
|
|
136
|
+
result: undefined,
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
test('should be static true for `Or` when any argument is static true, even when dynamic arguments exist', () => {
|
|
140
|
+
expect(contextlessEvaluateFormula({
|
|
141
|
+
type: 'or',
|
|
142
|
+
arguments: [
|
|
143
|
+
{ formula: { type: 'value', value: true } },
|
|
144
|
+
{ formula: { type: 'apply', name: 'randomNumber', arguments: [] } },
|
|
145
|
+
],
|
|
146
|
+
})).toEqual({
|
|
147
|
+
isStatic: true,
|
|
148
|
+
result: true,
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
//# sourceMappingURL=contextlessEvaluateFormula.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contextlessEvaluateFormula.test.js","sourceRoot":"","sources":["../../src/util/contextlessEvaluateFormula.test.ts"],"names":[],"mappings":"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"}
|