@nordcraft/search 1.0.38 → 1.0.40
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/fixProject.js +32 -0
- package/dist/fixProject.js.map +1 -0
- package/dist/problems.worker.js +45 -8
- package/dist/problems.worker.js.map +1 -1
- package/dist/rules/actions/legacyActionRule.js +144 -2
- package/dist/rules/actions/legacyActionRule.js.map +1 -1
- package/dist/rules/actions/legacyActionRule.test.js +235 -1
- package/dist/rules/actions/legacyActionRule.test.js.map +1 -1
- package/dist/rules/components/noReferenceComponentRule.js +31 -17
- package/dist/rules/components/noReferenceComponentRule.js.map +1 -1
- package/dist/rules/components/noReferenceComponentRule.test.js +86 -1
- package/dist/rules/components/noReferenceComponentRule.test.js.map +1 -1
- package/dist/rules/formulas/legacyFormulaRule.js +602 -6
- package/dist/rules/formulas/legacyFormulaRule.js.map +1 -1
- package/dist/rules/formulas/legacyFormulaRule.test.js +232 -1
- package/dist/rules/formulas/legacyFormulaRule.test.js.map +1 -1
- package/dist/rules/formulas/noReferenceProjectFormulaRule.js +73 -58
- package/dist/rules/formulas/noReferenceProjectFormulaRule.js.map +1 -1
- package/dist/rules/formulas/noReferenceProjectFormulaRule.test.js +34 -1
- package/dist/rules/formulas/noReferenceProjectFormulaRule.test.js.map +1 -1
- package/dist/searchProject.js +338 -217
- package/dist/searchProject.js.map +1 -1
- package/dist/util/helpers.js +31 -5
- package/dist/util/helpers.js.map +1 -1
- package/dist/util/helpers.test.js +58 -0
- package/dist/util/helpers.test.js.map +1 -0
- package/package.json +3 -2
- package/src/fixProject.ts +47 -0
- package/src/problems.worker.ts +90 -12
- package/src/rules/actions/legacyActionRule.test.ts +245 -1
- package/src/rules/actions/legacyActionRule.ts +166 -4
- package/src/rules/components/noReferenceComponentRule.test.ts +87 -1
- package/src/rules/components/noReferenceComponentRule.ts +38 -23
- package/src/rules/formulas/legacyFormulaRule.test.ts +242 -1
- package/src/rules/formulas/legacyFormulaRule.ts +697 -10
- package/src/rules/formulas/noReferenceProjectFormulaRule.test.ts +36 -1
- package/src/rules/formulas/noReferenceProjectFormulaRule.ts +78 -64
- package/src/searchProject.ts +217 -98
- package/src/types.d.ts +20 -3
- package/src/util/helpers.test.ts +80 -0
- package/src/util/helpers.ts +61 -9
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { searchProject } from './searchProject';
|
|
2
|
+
/**
|
|
3
|
+
* Uses searchProject to apply 1 fix at a time. Finally ends up with the resulting
|
|
4
|
+
* ProjectFiles that are returned.
|
|
5
|
+
* @returns ProjectFiles - updated files after fixes have been applied (if any)
|
|
6
|
+
*/
|
|
7
|
+
export const fixProject = ({ files, rule, fixType, pathsToVisit = [], useExactPaths = false, state, }) => {
|
|
8
|
+
let updatedFiles = files;
|
|
9
|
+
let iterations = 0;
|
|
10
|
+
const maxIterations = 100;
|
|
11
|
+
// Apply 1 fix per iteration for ${maxIterations} iterations
|
|
12
|
+
// After every fix, the updated files are used for the next iteration
|
|
13
|
+
while (iterations++ < maxIterations) {
|
|
14
|
+
const { value: suggestedFiles } = searchProject({
|
|
15
|
+
files: updatedFiles,
|
|
16
|
+
rules: [rule],
|
|
17
|
+
fixOptions: { mode: 'FIX', fixType },
|
|
18
|
+
pathsToVisit,
|
|
19
|
+
useExactPaths,
|
|
20
|
+
state,
|
|
21
|
+
}).next();
|
|
22
|
+
if (suggestedFiles) {
|
|
23
|
+
updatedFiles = suggestedFiles;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
// No more fixes could be applied
|
|
27
|
+
break;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return updatedFiles;
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=fixProject.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixProject.js","sourceRoot":"","sources":["../src/fixProject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,KAAK,EACL,IAAI,EACJ,OAAO,EACP,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,KAAK,EACrB,KAAK,GAQN,EAAE,EAAE;IACH,IAAI,YAAY,GAAG,KAAK,CAAA;IACxB,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,MAAM,aAAa,GAAG,GAAG,CAAA;IACzB,4DAA4D;IAC5D,qEAAqE;IACrE,OAAO,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;QACpC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC;YAC9C,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,CAAC,IAAI,CAAC;YACb,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE;YACpC,YAAY;YACZ,aAAa;YACb,KAAK;SACN,CAAC,CAAC,IAAI,EAAE,CAAA;QACT,IAAI,cAAc,EAAE,CAAC;YACnB,YAAY,GAAG,cAAc,CAAA;QAC/B,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,MAAK;QACP,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA"}
|
package/dist/problems.worker.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { create } from 'jsondiffpatch';
|
|
2
|
+
import { fixProject } from './fixProject';
|
|
1
3
|
import { createActionNameRule } from './rules/actions/createActionNameRule';
|
|
2
4
|
import { legacyActionRule } from './rules/actions/legacyActionRule';
|
|
3
5
|
import { noReferenceProjectActionRule } from './rules/actions/noReferenceProjectActionRule';
|
|
@@ -141,11 +143,9 @@ const RULES = [
|
|
|
141
143
|
unknownWorkflowParameterRule,
|
|
142
144
|
ambiguousStyleVariableSyntaxRule,
|
|
143
145
|
];
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
onmessage = (event) => {
|
|
148
|
-
const { files, options = {} } = event.data;
|
|
146
|
+
const respond = (data) => postMessage(data);
|
|
147
|
+
const findProblems = (data) => {
|
|
148
|
+
const { files, options = {} } = data;
|
|
149
149
|
const rules = RULES.filter((rule) => (!options.categories || options.categories.includes(rule.category)) &&
|
|
150
150
|
(!options.levels || options.levels.includes(rule.level)) &&
|
|
151
151
|
!options.rulesToExclude?.includes(rule.code));
|
|
@@ -156,6 +156,7 @@ onmessage = (event) => {
|
|
|
156
156
|
files,
|
|
157
157
|
rules,
|
|
158
158
|
pathsToVisit: options.pathsToVisit,
|
|
159
|
+
useExactPaths: options.useExactPaths,
|
|
159
160
|
state: options.state,
|
|
160
161
|
})) {
|
|
161
162
|
switch (options.batchSize) {
|
|
@@ -166,7 +167,7 @@ onmessage = (event) => {
|
|
|
166
167
|
case 'per-file': {
|
|
167
168
|
if (fileType !== problem.path[0] || fileName !== problem.path[1]) {
|
|
168
169
|
if (batch.length > 0) {
|
|
169
|
-
|
|
170
|
+
respond(batch);
|
|
170
171
|
}
|
|
171
172
|
batch = [];
|
|
172
173
|
fileType = problem.path[0];
|
|
@@ -178,7 +179,7 @@ onmessage = (event) => {
|
|
|
178
179
|
default: {
|
|
179
180
|
batch.push(problem);
|
|
180
181
|
if (batch.length >= (options.batchSize ?? 1)) {
|
|
181
|
-
|
|
182
|
+
respond(batch);
|
|
182
183
|
batch = [];
|
|
183
184
|
}
|
|
184
185
|
break;
|
|
@@ -186,6 +187,42 @@ onmessage = (event) => {
|
|
|
186
187
|
}
|
|
187
188
|
}
|
|
188
189
|
// Send the remaining results
|
|
189
|
-
|
|
190
|
+
respond(batch);
|
|
191
|
+
};
|
|
192
|
+
const fixProblems = (data) => {
|
|
193
|
+
const { files, options = {}, fixRule } = data;
|
|
194
|
+
const rule = RULES.find((r) => r.code === fixRule);
|
|
195
|
+
if (!rule) {
|
|
196
|
+
throw new Error(`Unknown fix rule: ${data.fixRule}`);
|
|
197
|
+
}
|
|
198
|
+
const updatedFiles = fixProject({
|
|
199
|
+
files,
|
|
200
|
+
rule,
|
|
201
|
+
fixType: data.fixType,
|
|
202
|
+
pathsToVisit: options.pathsToVisit,
|
|
203
|
+
useExactPaths: options.useExactPaths,
|
|
204
|
+
state: options.state,
|
|
205
|
+
});
|
|
206
|
+
// Calculate diff
|
|
207
|
+
const jsonDiffPatch = create({ omitRemovedValues: true });
|
|
208
|
+
const diff = jsonDiffPatch.diff(files, updatedFiles);
|
|
209
|
+
// Send diff + metadata to main thread
|
|
210
|
+
respond({
|
|
211
|
+
id: data.id,
|
|
212
|
+
patch: diff,
|
|
213
|
+
fixRule: data.fixRule,
|
|
214
|
+
fixType: data.fixType,
|
|
215
|
+
});
|
|
216
|
+
};
|
|
217
|
+
/**
|
|
218
|
+
* This function is a web worker that checks for problems in the files.
|
|
219
|
+
*/
|
|
220
|
+
onmessage = (event) => {
|
|
221
|
+
if ('fixRule' in event.data) {
|
|
222
|
+
fixProblems(event.data);
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
findProblems(event.data);
|
|
226
|
+
}
|
|
190
227
|
};
|
|
191
228
|
//# sourceMappingURL=problems.worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"problems.worker.js","sourceRoot":"","sources":["../src/problems.worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"problems.worker.js","sourceRoot":"","sources":["../src/problems.worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { set } from '@nordcraft/core/dist/utils/collections';
|
|
2
|
+
import { isLegacyAction, renameArguments } from '../../util/helpers';
|
|
2
3
|
export const legacyActionRule = {
|
|
3
4
|
code: 'legacy action',
|
|
4
5
|
level: 'warning',
|
|
@@ -14,8 +15,149 @@ export const legacyActionRule = {
|
|
|
14
15
|
name: value.name,
|
|
15
16
|
};
|
|
16
17
|
}
|
|
17
|
-
report(path, details)
|
|
18
|
+
report(path, details, unfixableLegacyActions.has(value.name)
|
|
19
|
+
? undefined
|
|
20
|
+
: !formulaNamedActions.includes(value.name) ||
|
|
21
|
+
// Check if the first argument is a value formula with a string value
|
|
22
|
+
(value.arguments?.[0].formula.type === 'value' &&
|
|
23
|
+
typeof value.arguments[0].formula.value === 'string')
|
|
24
|
+
? ['replace-legacy-action']
|
|
25
|
+
: undefined);
|
|
18
26
|
}
|
|
19
27
|
},
|
|
28
|
+
fixes: {
|
|
29
|
+
'replace-legacy-action': ({ path, value, nodeType, files }) => {
|
|
30
|
+
if (nodeType !== 'action-model') {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
if (!isLegacyAction(value)) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
let newAction;
|
|
37
|
+
switch (value.name) {
|
|
38
|
+
case 'If': {
|
|
39
|
+
const trueActions = value.events?.['true']?.actions ?? [];
|
|
40
|
+
const falseActions = value.events?.['false']?.actions ?? [];
|
|
41
|
+
const trueCondition = (value.arguments ?? [])[0];
|
|
42
|
+
newAction = {
|
|
43
|
+
type: 'Switch',
|
|
44
|
+
cases: [
|
|
45
|
+
{
|
|
46
|
+
condition: trueCondition?.formula ?? null,
|
|
47
|
+
actions: trueActions,
|
|
48
|
+
},
|
|
49
|
+
],
|
|
50
|
+
default: { actions: falseActions },
|
|
51
|
+
};
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
54
|
+
case 'PreventDefault': {
|
|
55
|
+
newAction = {
|
|
56
|
+
name: '@toddle/preventDefault',
|
|
57
|
+
arguments: [],
|
|
58
|
+
label: 'Prevent default',
|
|
59
|
+
};
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
case 'StopPropagation': {
|
|
63
|
+
newAction = {
|
|
64
|
+
name: '@toddle/stopPropagation',
|
|
65
|
+
arguments: [],
|
|
66
|
+
label: 'Stop propagation',
|
|
67
|
+
};
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
case 'UpdateVariable': {
|
|
71
|
+
const variableName = value.arguments?.[0]?.formula.type === 'value'
|
|
72
|
+
? value.arguments[0].formula.value
|
|
73
|
+
: undefined;
|
|
74
|
+
if (typeof variableName !== 'string') {
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
const variableValue = value.arguments?.[1]?.formula;
|
|
78
|
+
if (!variableValue) {
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
81
|
+
newAction = {
|
|
82
|
+
type: 'SetVariable',
|
|
83
|
+
variable: variableName,
|
|
84
|
+
data: variableValue,
|
|
85
|
+
};
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
case 'SetTimeout': {
|
|
89
|
+
newAction = {
|
|
90
|
+
...value,
|
|
91
|
+
name: '@toddle/sleep',
|
|
92
|
+
arguments: renameArguments({ 'Delay in ms': 'Delay in milliseconds' }, value.arguments),
|
|
93
|
+
events: value.events?.['timeout']
|
|
94
|
+
? { tick: value.events.timeout }
|
|
95
|
+
: undefined,
|
|
96
|
+
label: 'Sleep',
|
|
97
|
+
};
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
case 'SetInterval': {
|
|
101
|
+
newAction = {
|
|
102
|
+
...value,
|
|
103
|
+
name: '@toddle/interval',
|
|
104
|
+
arguments: renameArguments({ 'Interval in ms': 'Interval in milliseconds' }, value.arguments),
|
|
105
|
+
label: 'Interval',
|
|
106
|
+
};
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
case 'Debug': {
|
|
110
|
+
newAction = {
|
|
111
|
+
...value,
|
|
112
|
+
name: '@toddle/logToConsole',
|
|
113
|
+
label: 'Log to console',
|
|
114
|
+
};
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
case 'GoToURL': {
|
|
118
|
+
newAction = {
|
|
119
|
+
name: '@toddle/gotToURL', // Yes, the typo is in the action name
|
|
120
|
+
arguments: renameArguments({ url: 'URL' }, value.arguments),
|
|
121
|
+
label: 'Go to URL',
|
|
122
|
+
};
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
case 'TriggerEvent': {
|
|
126
|
+
const eventName = value.arguments?.[0]?.formula.type === 'value'
|
|
127
|
+
? value.arguments[0].formula.value
|
|
128
|
+
: undefined;
|
|
129
|
+
if (typeof eventName !== 'string') {
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
const eventData = value.arguments?.[1]?.formula;
|
|
133
|
+
if (!eventData) {
|
|
134
|
+
break;
|
|
135
|
+
}
|
|
136
|
+
newAction = {
|
|
137
|
+
type: 'TriggerEvent',
|
|
138
|
+
event: eventName,
|
|
139
|
+
data: eventData,
|
|
140
|
+
};
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (newAction) {
|
|
145
|
+
return set(files, path, newAction);
|
|
146
|
+
}
|
|
147
|
+
},
|
|
148
|
+
},
|
|
20
149
|
};
|
|
150
|
+
// These actions take a first argument which is a formula as the name
|
|
151
|
+
// of the thing to update/trigger. We can only safely autofix these if
|
|
152
|
+
// the argument is a value operation and a string
|
|
153
|
+
const formulaNamedActions = ['UpdateVariable', 'TriggerEvent'];
|
|
154
|
+
const unfixableLegacyActions = new Set([
|
|
155
|
+
'CopyToClipboard', // Previously, this action would JSON stringify non-string inputs
|
|
156
|
+
'Update URL parameter', // The user will need to pick a history mode (push/replace)
|
|
157
|
+
'Fetch', // This was mainly used for APIs v1
|
|
158
|
+
'FocusElement', // The new 'Focus' action takes an element as input - not a selector
|
|
159
|
+
'UpdateVariable', // The variable name could be a formula in the legacy version
|
|
160
|
+
'TriggerEvent', // The name of the event could be a formula in the legacy version
|
|
161
|
+
'@toddle/setSessionCookies', // The new 'Set cookie' action takes more arguments
|
|
162
|
+
]);
|
|
21
163
|
//# sourceMappingURL=legacyActionRule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacyActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"legacyActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,wCAAwC,CAAA;AAE5D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpE,MAAM,CAAC,MAAM,gBAAgB,GAExB;IACH,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC3C,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;YAChC,OAAM;QACR,CAAC;QACD,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,OAAqC,CAAA;YACzC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;gBACpB,OAAO,GAAG;oBACR,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB,CAAA;YACH,CAAC;YACD,MAAM,CACJ,IAAI,EACJ,OAAO,EACP,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBACpC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;oBACvC,qEAAqE;oBACrE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO;wBAC5C,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC;oBACzD,CAAC,CAAC,CAAC,uBAAuB,CAAC;oBAC3B,CAAC,CAAC,SAAS,CAChB,CAAA;QACH,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,uBAAuB,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;YAC5D,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAChC,OAAM;YACR,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAM;YACR,CAAC;YAED,IAAI,SAAkC,CAAA;YACtC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,IAAI,CAAC,CAAC,CAAC;oBACV,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,IAAI,EAAE,CAAA;oBACzD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,IAAI,EAAE,CAAA;oBAC3D,MAAM,aAAa,GACjB,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC5B,SAAS,GAAG;wBACV,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE;4BACL;gCACE,SAAS,EAAE,aAAa,EAAE,OAAO,IAAI,IAAI;gCACzC,OAAO,EAAE,WAAW;6BACrB;yBACF;wBACD,OAAO,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE;qBACnC,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;oBACtB,SAAS,GAAG;wBACV,IAAI,EAAE,wBAAwB;wBAC9B,SAAS,EAAE,EAAE;wBACb,KAAK,EAAE,iBAAiB;qBACzB,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,iBAAiB,CAAC,CAAC,CAAC;oBACvB,SAAS,GAAG;wBACV,IAAI,EAAE,yBAAyB;wBAC/B,SAAS,EAAE,EAAE;wBACb,KAAK,EAAE,kBAAkB;qBAC1B,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;oBACtB,MAAM,YAAY,GAChB,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,KAAK,OAAO;wBAC5C,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;wBAClC,CAAC,CAAC,SAAS,CAAA;oBACf,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;wBACrC,MAAK;oBACP,CAAC;oBACD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAA;oBACnD,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,MAAK;oBACP,CAAC;oBACD,SAAS,GAAG;wBACV,IAAI,EAAE,aAAa;wBACnB,QAAQ,EAAE,YAAY;wBACtB,IAAI,EAAE,aAAa;qBACpB,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,YAAY,CAAC,CAAC,CAAC;oBAClB,SAAS,GAAG;wBACV,GAAG,KAAK;wBACR,IAAI,EAAE,eAAe;wBACrB,SAAS,EAAE,eAAe,CACxB,EAAE,aAAa,EAAE,uBAAuB,EAAE,EAC1C,KAAK,CAAC,SAAS,CAChB;wBACD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC;4BAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE;4BAChC,CAAC,CAAC,SAAS;wBACb,KAAK,EAAE,OAAO;qBACf,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,SAAS,GAAG;wBACV,GAAG,KAAK;wBACR,IAAI,EAAE,kBAAkB;wBACxB,SAAS,EAAE,eAAe,CACxB,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,EAChD,KAAK,CAAC,SAAS,CAChB;wBACD,KAAK,EAAE,UAAU;qBAClB,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,SAAS,GAAG;wBACV,GAAG,KAAK;wBACR,IAAI,EAAE,sBAAsB;wBAC5B,KAAK,EAAE,gBAAgB;qBACxB,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,SAAS,GAAG;wBACV,IAAI,EAAE,kBAAkB,EAAE,sCAAsC;wBAChE,SAAS,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC;wBAC3D,KAAK,EAAE,WAAW;qBACnB,CAAA;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,cAAc,CAAC,CAAC,CAAC;oBACpB,MAAM,SAAS,GACb,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,KAAK,OAAO;wBAC5C,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;wBAClC,CAAC,CAAC,SAAS,CAAA;oBACf,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;wBAClC,MAAK;oBACP,CAAC;oBACD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAA;oBAC/C,IAAI,CAAC,SAAS,EAAE,CAAC;wBACf,MAAK;oBACP,CAAC;oBACD,SAAS,GAAG;wBACV,IAAI,EAAE,cAAc;wBACpB,KAAK,EAAE,SAAS;wBAChB,IAAI,EAAE,SAAS;qBAChB,CAAA;oBACD,MAAK;gBACP,CAAC;YACH,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;KACF;CACF,CAAA;AAED,qEAAqE;AACrE,sEAAsE;AACtE,iDAAiD;AACjD,MAAM,mBAAmB,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;AAE9D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,iBAAiB,EAAE,iEAAiE;IACpF,sBAAsB,EAAE,2DAA2D;IACnF,OAAO,EAAE,mCAAmC;IAC5C,cAAc,EAAE,oEAAoE;IACpF,gBAAgB,EAAE,6DAA6D;IAC/E,cAAc,EAAE,iEAAiE;IACjF,2BAA2B,EAAE,mDAAmD;CACjF,CAAC,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 { legacyActionRule } from './legacyActionRule';
|
|
4
|
-
describe('
|
|
5
|
+
describe('find legacyActions', () => {
|
|
5
6
|
test('should detect legacy actions used in components', () => {
|
|
6
7
|
const problems = Array.from(searchProject({
|
|
7
8
|
files: {
|
|
@@ -85,4 +86,237 @@ describe('legacyAction', () => {
|
|
|
85
86
|
expect(problems).toHaveLength(0);
|
|
86
87
|
});
|
|
87
88
|
});
|
|
89
|
+
describe('fix legacyActions', () => {
|
|
90
|
+
test('should replace the If action with a Switch action', () => {
|
|
91
|
+
const legacyIfAction = {
|
|
92
|
+
name: 'If',
|
|
93
|
+
events: {
|
|
94
|
+
true: {
|
|
95
|
+
actions: [
|
|
96
|
+
{
|
|
97
|
+
name: '@toddle/logToConsole',
|
|
98
|
+
arguments: [
|
|
99
|
+
{
|
|
100
|
+
name: 'Label',
|
|
101
|
+
description: 'A label for the message.',
|
|
102
|
+
formula: { type: 'value', value: '' },
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
name: 'Data',
|
|
106
|
+
type: { type: 'Any' },
|
|
107
|
+
description: 'The data you want to log to the console.',
|
|
108
|
+
formula: {
|
|
109
|
+
type: 'value',
|
|
110
|
+
value: '<Data>',
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
],
|
|
114
|
+
label: 'Log to console',
|
|
115
|
+
group: 'debugging',
|
|
116
|
+
description: 'Log a message to the browser console.',
|
|
117
|
+
},
|
|
118
|
+
],
|
|
119
|
+
},
|
|
120
|
+
false: {
|
|
121
|
+
actions: [
|
|
122
|
+
{
|
|
123
|
+
name: '@toddle/logToConsole',
|
|
124
|
+
arguments: [
|
|
125
|
+
{
|
|
126
|
+
name: 'Label',
|
|
127
|
+
description: 'A label for the message.',
|
|
128
|
+
formula: { type: 'value', value: '' },
|
|
129
|
+
},
|
|
130
|
+
{
|
|
131
|
+
name: 'Data',
|
|
132
|
+
type: { type: 'Any' },
|
|
133
|
+
description: 'The data you want to log to the console.',
|
|
134
|
+
formula: {
|
|
135
|
+
type: 'value',
|
|
136
|
+
value: '<Data>',
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
],
|
|
140
|
+
label: 'Log to console',
|
|
141
|
+
group: 'debugging',
|
|
142
|
+
description: 'Log a message to the browser console.',
|
|
143
|
+
},
|
|
144
|
+
],
|
|
145
|
+
},
|
|
146
|
+
},
|
|
147
|
+
arguments: [
|
|
148
|
+
{
|
|
149
|
+
name: 'Condition',
|
|
150
|
+
formula: { type: 'value', value: true },
|
|
151
|
+
},
|
|
152
|
+
],
|
|
153
|
+
};
|
|
154
|
+
const projectFiles = {
|
|
155
|
+
formulas: {},
|
|
156
|
+
components: {
|
|
157
|
+
apiComponent: {
|
|
158
|
+
name: 'test',
|
|
159
|
+
nodes: {
|
|
160
|
+
root: {
|
|
161
|
+
tag: 'p',
|
|
162
|
+
type: 'element',
|
|
163
|
+
attrs: {},
|
|
164
|
+
style: {},
|
|
165
|
+
events: {
|
|
166
|
+
click: {
|
|
167
|
+
trigger: 'click',
|
|
168
|
+
actions: [legacyIfAction],
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
classes: {},
|
|
172
|
+
children: [],
|
|
173
|
+
},
|
|
174
|
+
},
|
|
175
|
+
formulas: {},
|
|
176
|
+
apis: {},
|
|
177
|
+
attributes: {},
|
|
178
|
+
variables: {},
|
|
179
|
+
},
|
|
180
|
+
},
|
|
181
|
+
};
|
|
182
|
+
const fixedProject = fixProject({
|
|
183
|
+
files: projectFiles,
|
|
184
|
+
rule: legacyActionRule,
|
|
185
|
+
fixType: 'replace-legacy-action',
|
|
186
|
+
});
|
|
187
|
+
const fixedAction = (fixedProject.components['apiComponent']?.nodes['root']).events['click'].actions[0];
|
|
188
|
+
expect(fixedAction).toMatchInlineSnapshot(`
|
|
189
|
+
{
|
|
190
|
+
"cases": [
|
|
191
|
+
{
|
|
192
|
+
"actions": [
|
|
193
|
+
{
|
|
194
|
+
"arguments": [
|
|
195
|
+
{
|
|
196
|
+
"description": "A label for the message.",
|
|
197
|
+
"formula": {
|
|
198
|
+
"type": "value",
|
|
199
|
+
"value": "",
|
|
200
|
+
},
|
|
201
|
+
"name": "Label",
|
|
202
|
+
},
|
|
203
|
+
{
|
|
204
|
+
"description": "The data you want to log to the console.",
|
|
205
|
+
"formula": {
|
|
206
|
+
"type": "value",
|
|
207
|
+
"value": "<Data>",
|
|
208
|
+
},
|
|
209
|
+
"name": "Data",
|
|
210
|
+
"type": {
|
|
211
|
+
"type": "Any",
|
|
212
|
+
},
|
|
213
|
+
},
|
|
214
|
+
],
|
|
215
|
+
"description": "Log a message to the browser console.",
|
|
216
|
+
"group": "debugging",
|
|
217
|
+
"label": "Log to console",
|
|
218
|
+
"name": "@toddle/logToConsole",
|
|
219
|
+
},
|
|
220
|
+
],
|
|
221
|
+
"condition": {
|
|
222
|
+
"type": "value",
|
|
223
|
+
"value": true,
|
|
224
|
+
},
|
|
225
|
+
},
|
|
226
|
+
],
|
|
227
|
+
"default": {
|
|
228
|
+
"actions": [
|
|
229
|
+
{
|
|
230
|
+
"arguments": [
|
|
231
|
+
{
|
|
232
|
+
"description": "A label for the message.",
|
|
233
|
+
"formula": {
|
|
234
|
+
"type": "value",
|
|
235
|
+
"value": "",
|
|
236
|
+
},
|
|
237
|
+
"name": "Label",
|
|
238
|
+
},
|
|
239
|
+
{
|
|
240
|
+
"description": "The data you want to log to the console.",
|
|
241
|
+
"formula": {
|
|
242
|
+
"type": "value",
|
|
243
|
+
"value": "<Data>",
|
|
244
|
+
},
|
|
245
|
+
"name": "Data",
|
|
246
|
+
"type": {
|
|
247
|
+
"type": "Any",
|
|
248
|
+
},
|
|
249
|
+
},
|
|
250
|
+
],
|
|
251
|
+
"description": "Log a message to the browser console.",
|
|
252
|
+
"group": "debugging",
|
|
253
|
+
"label": "Log to console",
|
|
254
|
+
"name": "@toddle/logToConsole",
|
|
255
|
+
},
|
|
256
|
+
],
|
|
257
|
+
},
|
|
258
|
+
"type": "Switch",
|
|
259
|
+
}
|
|
260
|
+
`);
|
|
261
|
+
});
|
|
262
|
+
test('should replace the TriggerEvent action with the builtin action', () => {
|
|
263
|
+
const legacyAction = {
|
|
264
|
+
name: 'TriggerEvent',
|
|
265
|
+
arguments: [
|
|
266
|
+
{
|
|
267
|
+
name: 'name',
|
|
268
|
+
formula: { type: 'value', value: 'sdfsdf' },
|
|
269
|
+
},
|
|
270
|
+
{
|
|
271
|
+
name: 'data',
|
|
272
|
+
formula: { type: 'value', value: 'test' },
|
|
273
|
+
},
|
|
274
|
+
],
|
|
275
|
+
};
|
|
276
|
+
const projectFiles = {
|
|
277
|
+
formulas: {},
|
|
278
|
+
components: {
|
|
279
|
+
apiComponent: {
|
|
280
|
+
name: 'test',
|
|
281
|
+
nodes: {
|
|
282
|
+
root: {
|
|
283
|
+
tag: 'p',
|
|
284
|
+
type: 'element',
|
|
285
|
+
attrs: {},
|
|
286
|
+
style: {},
|
|
287
|
+
events: {
|
|
288
|
+
click: {
|
|
289
|
+
trigger: 'click',
|
|
290
|
+
actions: [legacyAction],
|
|
291
|
+
},
|
|
292
|
+
},
|
|
293
|
+
classes: {},
|
|
294
|
+
children: [],
|
|
295
|
+
},
|
|
296
|
+
},
|
|
297
|
+
formulas: {},
|
|
298
|
+
apis: {},
|
|
299
|
+
attributes: {},
|
|
300
|
+
variables: {},
|
|
301
|
+
},
|
|
302
|
+
},
|
|
303
|
+
};
|
|
304
|
+
const fixedProject = fixProject({
|
|
305
|
+
files: projectFiles,
|
|
306
|
+
rule: legacyActionRule,
|
|
307
|
+
fixType: 'replace-legacy-action',
|
|
308
|
+
});
|
|
309
|
+
const fixedAction = (fixedProject.components['apiComponent']?.nodes['root']).events['click'].actions[0];
|
|
310
|
+
expect(fixedAction).toMatchInlineSnapshot(`
|
|
311
|
+
{
|
|
312
|
+
"data": {
|
|
313
|
+
"type": "value",
|
|
314
|
+
"value": "test",
|
|
315
|
+
},
|
|
316
|
+
"event": "sdfsdf",
|
|
317
|
+
"type": "TriggerEvent",
|
|
318
|
+
}
|
|
319
|
+
`);
|
|
320
|
+
});
|
|
321
|
+
});
|
|
88
322
|
//# sourceMappingURL=legacyActionRule.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacyActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"legacyActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,43 @@
|
|
|
1
|
+
import { omit } from '@nordcraft/core/dist/utils/collections';
|
|
1
2
|
import { isDefined } from '@nordcraft/core/dist/utils/util';
|
|
2
3
|
export const noReferenceComponentRule = {
|
|
3
4
|
code: 'no-reference component',
|
|
4
5
|
level: 'warning',
|
|
5
6
|
category: 'No References',
|
|
6
|
-
visit: (report,
|
|
7
|
-
|
|
8
|
-
if (nodeType !== 'component' ||
|
|
9
|
-
isPage(value) ||
|
|
10
|
-
(state?.projectDetails?.type === 'package' && value.exported === true)) {
|
|
7
|
+
visit: (report, data, state) => {
|
|
8
|
+
if (hasReferences(data, state)) {
|
|
11
9
|
return;
|
|
12
10
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
// not count as a reference
|
|
20
|
-
node.name !== component.name) {
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
11
|
+
report(data.path, undefined, ['delete-component']);
|
|
12
|
+
},
|
|
13
|
+
fixes: {
|
|
14
|
+
'delete-component': (data, state) => {
|
|
15
|
+
if (hasReferences(data, state)) {
|
|
16
|
+
return;
|
|
23
17
|
}
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
return omit(data.files, data.path);
|
|
19
|
+
},
|
|
26
20
|
},
|
|
27
21
|
};
|
|
22
|
+
const hasReferences = (data, state) => {
|
|
23
|
+
if (data.nodeType !== 'component' ||
|
|
24
|
+
isPage(data.value) ||
|
|
25
|
+
(state?.projectDetails?.type === 'package' && data.value.exported === true)) {
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
for (const component of Object.values(data.files.components)) {
|
|
29
|
+
// Enforce that the component is not undefined since we're iterating
|
|
30
|
+
for (const node of Object.values(component.nodes ?? {})) {
|
|
31
|
+
if (node.type === 'component' &&
|
|
32
|
+
node.name === data.value.name &&
|
|
33
|
+
// Circular references from a component to itself should
|
|
34
|
+
// not count as a reference
|
|
35
|
+
node.name !== component.name) {
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return false;
|
|
41
|
+
};
|
|
28
42
|
const isPage = (value) => isDefined(value.route);
|
|
29
43
|
//# sourceMappingURL=noReferenceComponentRule.js.map
|