@nordcraft/search 1.0.45 → 1.0.47
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 +11 -3
- package/dist/problems.worker.js.map +1 -1
- package/dist/rules/attributes/unknownComponentAttributeRule.js +33 -0
- package/dist/rules/attributes/unknownComponentAttributeRule.js.map +1 -0
- package/dist/rules/attributes/unknownComponentAttributeRule.test.js +145 -0
- package/dist/rules/attributes/unknownComponentAttributeRule.test.js.map +1 -0
- 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 +10 -8
- package/dist/rules/noReferenceNodeRule.js.map +1 -1
- package/dist/rules/noReferenceNodeRule.test.js +1 -1
- package/dist/rules/style/invalidStyleSyntaxRule.js +2 -2
- package/dist/rules/style/invalidStyleSyntaxRule.test.js +1 -1
- package/dist/rules/workflows/noPostNavigateAction.js +13 -2
- package/dist/rules/workflows/noPostNavigateAction.js.map +1 -1
- package/dist/rules/workflows/noPostNavigateAction.test.js +102 -1
- package/dist/rules/workflows/noPostNavigateAction.test.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/helpers.test.js +1 -1
- package/dist/util/helpers.test.js.map +1 -1
- package/dist/util/removeUnused.fix.js +18 -1
- package/dist/util/removeUnused.fix.js.map +1 -1
- package/package.json +2 -2
- package/src/problems.worker.ts +18 -5
- package/src/rules/attributes/unknownComponentAttributeRule.test.ts +156 -0
- package/src/rules/attributes/unknownComponentAttributeRule.ts +40 -0
- 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 +1 -1
- package/src/rules/noReferenceNodeRule.ts +17 -10
- package/src/rules/style/invalidStyleSyntaxRule.test.ts +1 -1
- package/src/rules/style/invalidStyleSyntaxRule.ts +3 -3
- package/src/rules/workflows/noPostNavigateAction.test.ts +111 -1
- package/src/rules/workflows/noPostNavigateAction.ts +20 -3
- package/src/types.d.ts +12 -0
- package/src/util/contextlessEvaluateFormula.test.ts +190 -0
- package/src/util/contextlessEvaluateFormula.ts +110 -0
- package/src/util/helpers.test.ts +1 -1
- package/src/util/removeUnused.fix.ts +29 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { contextlessEvaluateFormula } from '../../util/contextlessEvaluateFormula';
|
|
1
2
|
export const noUnnecessaryConditionTruthy = {
|
|
2
3
|
code: 'no-unnecessary-condition-truthy',
|
|
3
4
|
level: 'info',
|
|
@@ -6,11 +7,14 @@ export const noUnnecessaryConditionTruthy = {
|
|
|
6
7
|
if (nodeType !== 'formula' || value.type !== 'or') {
|
|
7
8
|
return;
|
|
8
9
|
}
|
|
9
|
-
if (value.arguments.some((arg) =>
|
|
10
|
-
Boolean(arg.formula.value) === true) ||
|
|
10
|
+
if (value.arguments.some((arg) => {
|
|
11
11
|
// Objects and arrays, even empty ones, are always truthy
|
|
12
|
-
arg.formula.type === 'object' ||
|
|
13
|
-
|
|
12
|
+
if (arg.formula.type === 'object' || arg.formula.type === 'array') {
|
|
13
|
+
return true;
|
|
14
|
+
}
|
|
15
|
+
const { result, isStatic } = contextlessEvaluateFormula(arg.formula);
|
|
16
|
+
return isStatic && Boolean(result) === true;
|
|
17
|
+
})) {
|
|
14
18
|
report(path);
|
|
15
19
|
}
|
|
16
20
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noUnnecessaryConditionTruthy.js","sourceRoot":"","sources":["../../../src/rules/logic/noUnnecessaryConditionTruthy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"noUnnecessaryConditionTruthy.js","sourceRoot":"","sources":["../../../src/rules/logic/noUnnecessaryConditionTruthy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAElF,MAAM,CAAC,MAAM,4BAA4B,GAAS;IAChD,IAAI,EAAE,iCAAiC;IACvC,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC3C,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAClD,OAAM;QACR,CAAC;QAED,IACE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3B,yDAAyD;YACzD,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClE,OAAO,IAAI,CAAA;YACb,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACpE,OAAO,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;QAC7C,CAAC,CAAC,EACF,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,CAAA;QACd,CAAC;IACH,CAAC;CACF,CAAA"}
|
|
@@ -30,7 +30,37 @@ describe('noUnnecessaryConditionTruthy', () => {
|
|
|
30
30
|
},
|
|
31
31
|
],
|
|
32
32
|
},
|
|
33
|
-
|
|
33
|
+
},
|
|
34
|
+
classes: {},
|
|
35
|
+
events: {},
|
|
36
|
+
tag: 'div',
|
|
37
|
+
children: [],
|
|
38
|
+
style: {},
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
formulas: {},
|
|
42
|
+
apis: {},
|
|
43
|
+
attributes: {},
|
|
44
|
+
variables: {},
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
rules: [noUnnecessaryConditionTruthy],
|
|
49
|
+
}));
|
|
50
|
+
expect(problems).toHaveLength(1);
|
|
51
|
+
expect(problems[0].code).toBe('no-unnecessary-condition-truthy');
|
|
52
|
+
});
|
|
53
|
+
test('should report unnecessary truthy conditions when a value is of type object or array as they are always consider truthy', () => {
|
|
54
|
+
const problems = Array.from(searchProject({
|
|
55
|
+
files: {
|
|
56
|
+
components: {
|
|
57
|
+
test: {
|
|
58
|
+
name: 'test',
|
|
59
|
+
nodes: {
|
|
60
|
+
root: {
|
|
61
|
+
type: 'element',
|
|
62
|
+
attrs: {
|
|
63
|
+
test1: {
|
|
34
64
|
type: 'or',
|
|
35
65
|
arguments: [
|
|
36
66
|
{
|
|
@@ -41,7 +71,7 @@ describe('noUnnecessaryConditionTruthy', () => {
|
|
|
41
71
|
},
|
|
42
72
|
],
|
|
43
73
|
},
|
|
44
|
-
|
|
74
|
+
test2: {
|
|
45
75
|
type: 'or',
|
|
46
76
|
arguments: [
|
|
47
77
|
{
|
|
@@ -69,10 +99,9 @@ describe('noUnnecessaryConditionTruthy', () => {
|
|
|
69
99
|
},
|
|
70
100
|
rules: [noUnnecessaryConditionTruthy],
|
|
71
101
|
}));
|
|
72
|
-
expect(problems).toHaveLength(
|
|
102
|
+
expect(problems).toHaveLength(2);
|
|
73
103
|
expect(problems[0].code).toBe('no-unnecessary-condition-truthy');
|
|
74
104
|
expect(problems[1].code).toBe('no-unnecessary-condition-truthy');
|
|
75
|
-
expect(problems[2].code).toBe('no-unnecessary-condition-truthy');
|
|
76
105
|
});
|
|
77
106
|
test('should not report necessary truthy conditions', () => {
|
|
78
107
|
const problems = Array.from(searchProject({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noUnnecessaryConditionTruthy.test.js","sourceRoot":"","sources":["../../../src/rules/logic/noUnnecessaryConditionTruthy.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAE7E,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,aAAa,CAAC;YACZ,KAAK,EAAE;gBACL,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE;4BACL,IAAI,EAAE;gCACJ,IAAI,EAAE,SAAS;gCACf,KAAK,EAAE;oCACL,IAAI,EAAE;wCACJ,IAAI,EAAE,IAAI;wCACV,SAAS,EAAE;4CACT;gDACE,OAAO,EAAE;oDACP,IAAI,EAAE,OAAO;oDACb,IAAI,EAAE,OAAO;oDACb,SAAS,EAAE,EAAE;iDACd;6CACF;4CACD;gDACE,OAAO,EAAE;oDACP,IAAI,EAAE,OAAO;oDACb,KAAK,EAAE,IAAI;iDACZ;6CACF;yCACF;qCACF;
|
|
1
|
+
{"version":3,"file":"noUnnecessaryConditionTruthy.test.js","sourceRoot":"","sources":["../../../src/rules/logic/noUnnecessaryConditionTruthy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,19 +4,21 @@ export const noReferenceNodeRule = {
|
|
|
4
4
|
level: 'warning',
|
|
5
5
|
category: 'No References',
|
|
6
6
|
visit: (report, args) => {
|
|
7
|
-
if (args.nodeType !== 'component') {
|
|
7
|
+
if (args.nodeType !== 'component-node') {
|
|
8
8
|
return;
|
|
9
9
|
}
|
|
10
|
-
const { path,
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
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']);
|
|
16
18
|
}
|
|
17
19
|
},
|
|
18
20
|
fixes: {
|
|
19
|
-
'delete
|
|
21
|
+
'delete-orphan-node': removeFromPathFix,
|
|
20
22
|
},
|
|
21
23
|
};
|
|
22
24
|
//# sourceMappingURL=noReferenceNodeRule.js.map
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -120,7 +120,7 @@ describe('fix noReferenceNodeRule', () => {
|
|
|
120
120
|
const fixedFiles = fixProject({
|
|
121
121
|
files,
|
|
122
122
|
rule: noReferenceNodeRule,
|
|
123
|
-
fixType: 'delete
|
|
123
|
+
fixType: 'delete-orphan-node',
|
|
124
124
|
});
|
|
125
125
|
expect(Object.keys(fixedFiles.components.test.nodes)).toEqual([
|
|
126
126
|
'root',
|
|
@@ -18,11 +18,11 @@ export const invalidStyleSyntaxRule = {
|
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
if (!valid) {
|
|
21
|
-
report(path, { property: value.styleProperty }, ['delete
|
|
21
|
+
report(path, { property: value.styleProperty }, ['delete-style-property']);
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
fixes: {
|
|
25
|
-
'delete
|
|
25
|
+
'delete-style-property': removeFromPathFix,
|
|
26
26
|
},
|
|
27
27
|
};
|
|
28
28
|
//# sourceMappingURL=invalidStyleSyntaxRule.js.map
|
|
@@ -85,7 +85,7 @@ describe('fix invalidStyleSyntaxRule', () => {
|
|
|
85
85
|
const fixedFiles = fixProject({
|
|
86
86
|
files,
|
|
87
87
|
rule: invalidStyleSyntaxRule,
|
|
88
|
-
fixType: 'delete
|
|
88
|
+
fixType: 'delete-style-property',
|
|
89
89
|
});
|
|
90
90
|
expect(fixedFiles.components.test.nodes.root.style)
|
|
91
91
|
.toMatchInlineSnapshot(`
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { get } from '@nordcraft/core/dist/utils/collections';
|
|
1
|
+
import { get, set } from '@nordcraft/core/dist/utils/collections';
|
|
2
2
|
export const noPostNavigateAction = {
|
|
3
3
|
code: 'no post navigate action',
|
|
4
4
|
level: 'warning',
|
|
@@ -21,8 +21,19 @@ export const noPostNavigateAction = {
|
|
|
21
21
|
const actionIndex = Number(_actionIndex);
|
|
22
22
|
if (actionIndex < actions.length - 1) {
|
|
23
23
|
// If the action is not the last one in the array, report it
|
|
24
|
-
report(path);
|
|
24
|
+
report(path, undefined, ['delete-following-actions']);
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
|
+
fixes: {
|
|
28
|
+
'delete-following-actions': ({ path, files }) => {
|
|
29
|
+
const actionsArrayPath = path.slice(0, -1).map((p) => String(p));
|
|
30
|
+
const actions = get(files, actionsArrayPath);
|
|
31
|
+
const actionIndex = path.at(-1);
|
|
32
|
+
if (actionIndex === undefined || !Array.isArray(actions)) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
return set(files, actionsArrayPath, actions.slice(0, Number(actionIndex) + 1));
|
|
36
|
+
},
|
|
37
|
+
},
|
|
27
38
|
};
|
|
28
39
|
//# sourceMappingURL=noPostNavigateAction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noPostNavigateAction.js","sourceRoot":"","sources":["../../../src/rules/workflows/noPostNavigateAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,wCAAwC,CAAA;
|
|
1
|
+
{"version":3,"file":"noPostNavigateAction.js","sourceRoot":"","sources":["../../../src/rules/workflows/noPostNavigateAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,wCAAwC,CAAA;AAGjE,MAAM,CAAC,MAAM,oBAAoB,GAAgC;IAC/D,IAAI,EAAE,yBAAyB;IAC/B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QAClD,IACE,QAAQ,KAAK,cAAc;YAC3B,KAAK,CAAC,IAAI,KAAK,SAAS;YACxB,KAAK,CAAC,IAAI,KAAK,kBAAkB,EACjC,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAChE,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;QAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAM;QACR,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAChC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAM;QACR,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;QACxC,IAAI,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,4DAA4D;YAC5D,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,0BAA0B,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAmB,EAAE,EAAE;YAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YAChE,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;YAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/B,IAAI,WAAW,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzD,OAAM;YACR,CAAC;YACD,OAAO,GAAG,CACR,KAAK,EACL,gBAAgB,EAChB,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAC1C,CAAA;QACH,CAAC;KACF;CACF,CAAA"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { describe, expect, test } from 'bun:test';
|
|
2
|
+
import { fixProject } from '../../fixProject';
|
|
2
3
|
import { searchProject } from '../../searchProject';
|
|
3
4
|
import { noPostNavigateAction } from './noPostNavigateAction';
|
|
4
|
-
describe('noPostNavigateAction', () => {
|
|
5
|
+
describe('find noPostNavigateAction', () => {
|
|
5
6
|
test('should detect actions after a url navigate action', () => {
|
|
6
7
|
const problems = Array.from(searchProject({
|
|
7
8
|
files: {
|
|
@@ -444,4 +445,104 @@ describe('noPostNavigateAction', () => {
|
|
|
444
445
|
expect(problems).toHaveLength(0);
|
|
445
446
|
});
|
|
446
447
|
});
|
|
448
|
+
describe('fix noPostNavigateAction', () => {
|
|
449
|
+
test('should remove actions after a url navigate action', () => {
|
|
450
|
+
const files = {
|
|
451
|
+
formulas: {},
|
|
452
|
+
components: {
|
|
453
|
+
nav: {
|
|
454
|
+
attributes: {},
|
|
455
|
+
events: [],
|
|
456
|
+
formulas: {},
|
|
457
|
+
nodes: {
|
|
458
|
+
root: {
|
|
459
|
+
type: 'element',
|
|
460
|
+
tag: 'div',
|
|
461
|
+
attrs: {},
|
|
462
|
+
classes: {},
|
|
463
|
+
events: {},
|
|
464
|
+
children: ['wkPXF99C3qdRgZmUcnHO_'],
|
|
465
|
+
style: {},
|
|
466
|
+
},
|
|
467
|
+
wkPXF99C3qdRgZmUcnHO_: {
|
|
468
|
+
tag: 'button',
|
|
469
|
+
type: 'element',
|
|
470
|
+
attrs: {},
|
|
471
|
+
style: {
|
|
472
|
+
color: 'var(--grey-200, #E5E5E5)',
|
|
473
|
+
'border-radius': '6px',
|
|
474
|
+
'background-color': 'var(--blue-600, #2563EB)',
|
|
475
|
+
'padding-left': '8px',
|
|
476
|
+
'padding-right': '8px',
|
|
477
|
+
'padding-top': '8px',
|
|
478
|
+
'padding-bottom': '8px',
|
|
479
|
+
width: 'fit-content',
|
|
480
|
+
cursor: 'pointer',
|
|
481
|
+
},
|
|
482
|
+
events: {
|
|
483
|
+
click: {
|
|
484
|
+
trigger: 'click',
|
|
485
|
+
actions: [
|
|
486
|
+
{
|
|
487
|
+
name: '@toddle/gotToURL',
|
|
488
|
+
arguments: [
|
|
489
|
+
{
|
|
490
|
+
name: 'URL',
|
|
491
|
+
formula: {
|
|
492
|
+
type: 'value',
|
|
493
|
+
value: 'https://example.com',
|
|
494
|
+
},
|
|
495
|
+
},
|
|
496
|
+
],
|
|
497
|
+
label: 'Go to URL',
|
|
498
|
+
},
|
|
499
|
+
{
|
|
500
|
+
name: '@toddle/logToConsole',
|
|
501
|
+
arguments: [
|
|
502
|
+
{
|
|
503
|
+
name: 'Label',
|
|
504
|
+
formula: {
|
|
505
|
+
type: 'value',
|
|
506
|
+
value: '',
|
|
507
|
+
},
|
|
508
|
+
},
|
|
509
|
+
{
|
|
510
|
+
name: 'Data',
|
|
511
|
+
formula: {
|
|
512
|
+
type: 'value',
|
|
513
|
+
value: '<Data>',
|
|
514
|
+
},
|
|
515
|
+
},
|
|
516
|
+
],
|
|
517
|
+
label: 'Log to console',
|
|
518
|
+
},
|
|
519
|
+
],
|
|
520
|
+
},
|
|
521
|
+
},
|
|
522
|
+
classes: {},
|
|
523
|
+
children: ['zFhmZR6YnLy089HmlK-Yn'],
|
|
524
|
+
variants: [],
|
|
525
|
+
},
|
|
526
|
+
'zFhmZR6YnLy089HmlK-Yn': {
|
|
527
|
+
type: 'text',
|
|
528
|
+
value: {
|
|
529
|
+
type: 'value',
|
|
530
|
+
value: 'Button',
|
|
531
|
+
},
|
|
532
|
+
},
|
|
533
|
+
},
|
|
534
|
+
variables: {},
|
|
535
|
+
apis: {},
|
|
536
|
+
name: 'nav',
|
|
537
|
+
},
|
|
538
|
+
},
|
|
539
|
+
};
|
|
540
|
+
const fixedProject = fixProject({
|
|
541
|
+
files,
|
|
542
|
+
rule: noPostNavigateAction,
|
|
543
|
+
fixType: 'delete-following-actions',
|
|
544
|
+
});
|
|
545
|
+
expect(fixedProject.components.nav?.nodes['wkPXF99C3qdRgZmUcnHO_']?.events?.click?.actions).toHaveLength(1);
|
|
546
|
+
});
|
|
547
|
+
});
|
|
447
548
|
//# sourceMappingURL=noPostNavigateAction.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noPostNavigateAction.test.js","sourceRoot":"","sources":["../../../src/rules/workflows/noPostNavigateAction.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"noPostNavigateAction.test.js","sourceRoot":"","sources":["../../../src/rules/workflows/noPostNavigateAction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -38,7 +38,7 @@ describe('shouldSearchPath', () => {
|
|
|
38
38
|
});
|
|
39
39
|
});
|
|
40
40
|
describe('shouldSearchExactPath', () => {
|
|
41
|
-
test
|
|
41
|
+
test('should only return true for exact matches', () => {
|
|
42
42
|
const pathsToVisit = [
|
|
43
43
|
['components', 'Button'],
|
|
44
44
|
['components', 'Input'],
|