@nordcraft/search 1.0.41 → 1.0.43
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/rules/actions/noReferenceProjectActionRule.js +40 -29
- package/dist/rules/actions/noReferenceProjectActionRule.js.map +1 -1
- package/dist/rules/actions/noReferenceProjectActionRule.test.js +32 -1
- package/dist/rules/actions/noReferenceProjectActionRule.test.js.map +1 -1
- package/dist/rules/formulas/noReferenceProjectFormulaRule.js +4 -6
- package/dist/rules/formulas/noReferenceProjectFormulaRule.js.map +1 -1
- package/package.json +2 -2
- package/src/rules/actions/noReferenceProjectActionRule.test.ts +34 -1
- package/src/rules/actions/noReferenceProjectActionRule.ts +48 -34
- package/src/rules/formulas/noReferenceProjectFormulaRule.ts +4 -6
- package/src/types.d.ts +2 -0
|
@@ -1,40 +1,51 @@
|
|
|
1
1
|
import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent';
|
|
2
|
+
import { omit } from '@nordcraft/core/dist/utils/collections';
|
|
2
3
|
export const noReferenceProjectActionRule = {
|
|
3
4
|
code: 'no-reference project action',
|
|
4
5
|
level: 'warning',
|
|
5
6
|
category: 'No References',
|
|
6
|
-
visit: (report,
|
|
7
|
-
if (
|
|
8
|
-
|
|
7
|
+
visit: (report, details) => {
|
|
8
|
+
if (!hasReferences(details)) {
|
|
9
|
+
report(details.path, undefined, ['delete-project-action']);
|
|
9
10
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
11
|
+
},
|
|
12
|
+
fixes: {
|
|
13
|
+
'delete-project-action': (data) => {
|
|
14
|
+
if (!hasReferences(data)) {
|
|
15
|
+
return omit(data.files, data.path);
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
const hasReferences = ({ value, files, nodeType, memo }) => {
|
|
21
|
+
if (nodeType !== 'project-action' || value.exported === true) {
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
const projectActionReferences = memo('projectActionReferences', () => {
|
|
25
|
+
const usedActions = new Set();
|
|
26
|
+
for (const component of Object.values(files.components)) {
|
|
27
|
+
const c = new ToddleComponent({
|
|
28
|
+
// Enforce that the component is not undefined since we're iterating
|
|
29
|
+
component: component,
|
|
30
|
+
getComponent: (name, packageName) => packageName
|
|
31
|
+
? files.packages?.[packageName]?.components[name]
|
|
32
|
+
: files.components[name],
|
|
33
|
+
packageName: undefined,
|
|
34
|
+
globalFormulas: {
|
|
35
|
+
formulas: files.formulas,
|
|
36
|
+
packages: files.packages,
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
for (const [, action] of c.actionModelsInComponent()) {
|
|
40
|
+
if (action.type === 'Custom' ||
|
|
41
|
+
action.type === 'function' ||
|
|
42
|
+
action.type === undefined) {
|
|
43
|
+
usedActions.add(action.name);
|
|
31
44
|
}
|
|
32
45
|
}
|
|
33
|
-
return usedActions;
|
|
34
|
-
});
|
|
35
|
-
if (!projectActionReferences.has(value.name)) {
|
|
36
|
-
report(path);
|
|
37
46
|
}
|
|
38
|
-
|
|
47
|
+
return usedActions;
|
|
48
|
+
});
|
|
49
|
+
return projectActionReferences.has(value.name);
|
|
39
50
|
};
|
|
40
51
|
//# sourceMappingURL=noReferenceProjectActionRule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noReferenceProjectActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/noReferenceProjectActionRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;
|
|
1
|
+
{"version":3,"file":"noReferenceProjectActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/noReferenceProjectActionRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAA;AAG7D,MAAM,CAAC,MAAM,4BAA4B,GAAe;IACtD,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,eAAe;IACzB,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACzB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,uBAAuB,EAAE,CAAC,IAAI,EAAE,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;KACF;CACF,CAAA;AAID,MAAM,aAAa,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAY,EAAE,EAAE;IACnE,IAAI,QAAQ,KAAK,gBAAgB,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACnE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;QACrC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,GAAG,IAAI,eAAe,CAAC;gBAC5B,oEAAoE;gBACpE,SAAS,EAAE,SAAU;gBACrB,YAAY,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAClC,WAAW;oBACT,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;oBACjD,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC5B,WAAW,EAAE,SAAS;gBACtB,cAAc,EAAE;oBACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB;aACF,CAAC,CAAA;YACF,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBACrD,IACE,MAAM,CAAC,IAAI,KAAK,QAAQ;oBACxB,MAAM,CAAC,IAAI,KAAM,UAAkB;oBACnC,MAAM,CAAC,IAAI,KAAK,SAAS,EACzB,CAAC;oBACD,WAAW,CAAC,GAAG,CAAE,MAA4B,CAAC,IAAI,CAAC,CAAA;gBACrD,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,WAAW,CAAA;IACpB,CAAC,CAAC,CAAA;IAEF,OAAO,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAChD,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 { noReferenceProjectActionRule } from './noReferenceProjectActionRule';
|
|
4
|
-
describe('noReferenceProjectAction', () => {
|
|
5
|
+
describe('find noReferenceProjectAction', () => {
|
|
5
6
|
test('should detect unused global actions', () => {
|
|
6
7
|
const problems = Array.from(searchProject({
|
|
7
8
|
files: {
|
|
@@ -117,4 +118,34 @@ describe('noReferenceProjectAction', () => {
|
|
|
117
118
|
});
|
|
118
119
|
});
|
|
119
120
|
});
|
|
121
|
+
describe('fix noReferenceProjectAction', () => {
|
|
122
|
+
test('should remove unused global actions', () => {
|
|
123
|
+
const files = {
|
|
124
|
+
actions: {
|
|
125
|
+
'my-action': {
|
|
126
|
+
name: 'my-action',
|
|
127
|
+
arguments: [],
|
|
128
|
+
handler: '() => console.log("test")',
|
|
129
|
+
variableArguments: false,
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
components: {
|
|
133
|
+
test: {
|
|
134
|
+
name: 'test',
|
|
135
|
+
nodes: {},
|
|
136
|
+
formulas: {},
|
|
137
|
+
apis: {},
|
|
138
|
+
attributes: {},
|
|
139
|
+
variables: {},
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
};
|
|
143
|
+
const fixedProject = fixProject({
|
|
144
|
+
files,
|
|
145
|
+
rule: noReferenceProjectActionRule,
|
|
146
|
+
fixType: 'delete-project-action',
|
|
147
|
+
});
|
|
148
|
+
expect(fixedProject.actions).toEqual({});
|
|
149
|
+
});
|
|
150
|
+
});
|
|
120
151
|
//# sourceMappingURL=noReferenceProjectActionRule.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noReferenceProjectActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/noReferenceProjectActionRule.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"noReferenceProjectActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/noReferenceProjectActionRule.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,15 @@ export const noReferenceProjectFormulaRule = {
|
|
|
8
8
|
level: 'warning',
|
|
9
9
|
category: 'No References',
|
|
10
10
|
visit: (report, details) => {
|
|
11
|
-
if (hasReferences(details)) {
|
|
12
|
-
|
|
11
|
+
if (!hasReferences(details)) {
|
|
12
|
+
report(details.path, undefined, ['delete-project-formula']);
|
|
13
13
|
}
|
|
14
|
-
report(details.path, undefined, ['delete-project-formula']);
|
|
15
14
|
},
|
|
16
15
|
fixes: {
|
|
17
16
|
'delete-project-formula': (data) => {
|
|
18
|
-
if (hasReferences(data)) {
|
|
19
|
-
return;
|
|
17
|
+
if (!hasReferences(data)) {
|
|
18
|
+
return omit(data.files, data.path);
|
|
20
19
|
}
|
|
21
|
-
return omit(data.files, data.path);
|
|
22
20
|
},
|
|
23
21
|
},
|
|
24
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noReferenceProjectFormulaRule.js","sourceRoot":"","sources":["../../../src/rules/formulas/noReferenceProjectFormulaRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAG7D,MAAM,CAAC,MAAM,6BAA6B,GAAe;IACvD,IAAI,EAAE,8BAA8B;IACpC,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,eAAe;IACzB,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACzB,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"noReferenceProjectFormulaRule.js","sourceRoot":"","sources":["../../../src/rules/formulas/noReferenceProjectFormulaRule.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://github.com/nordcraftengine/nordcraft",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@nordcraft/ssr": "1.0.
|
|
8
|
+
"@nordcraft/ssr": "1.0.43",
|
|
9
9
|
"jsondiffpatch": "0.7.3"
|
|
10
10
|
},
|
|
11
11
|
"scripts": {
|
|
@@ -18,5 +18,5 @@
|
|
|
18
18
|
"test:watch:only": "bun test --watch --only"
|
|
19
19
|
},
|
|
20
20
|
"files": ["dist", "src"],
|
|
21
|
-
"version": "1.0.
|
|
21
|
+
"version": "1.0.43"
|
|
22
22
|
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { ProjectFiles } from '@nordcraft/ssr/dist/ssr.types'
|
|
1
2
|
import { describe, expect, test } from 'bun:test'
|
|
3
|
+
import { fixProject } from '../../fixProject'
|
|
2
4
|
import { searchProject } from '../../searchProject'
|
|
3
5
|
import { noReferenceProjectActionRule } from './noReferenceProjectActionRule'
|
|
4
6
|
|
|
5
|
-
describe('noReferenceProjectAction', () => {
|
|
7
|
+
describe('find noReferenceProjectAction', () => {
|
|
6
8
|
test('should detect unused global actions', () => {
|
|
7
9
|
const problems = Array.from(
|
|
8
10
|
searchProject({
|
|
@@ -129,3 +131,34 @@ describe('noReferenceProjectAction', () => {
|
|
|
129
131
|
})
|
|
130
132
|
})
|
|
131
133
|
})
|
|
134
|
+
|
|
135
|
+
describe('fix noReferenceProjectAction', () => {
|
|
136
|
+
test('should remove unused global actions', () => {
|
|
137
|
+
const files: ProjectFiles = {
|
|
138
|
+
actions: {
|
|
139
|
+
'my-action': {
|
|
140
|
+
name: 'my-action',
|
|
141
|
+
arguments: [],
|
|
142
|
+
handler: '() => console.log("test")',
|
|
143
|
+
variableArguments: false,
|
|
144
|
+
},
|
|
145
|
+
},
|
|
146
|
+
components: {
|
|
147
|
+
test: {
|
|
148
|
+
name: 'test',
|
|
149
|
+
nodes: {},
|
|
150
|
+
formulas: {},
|
|
151
|
+
apis: {},
|
|
152
|
+
attributes: {},
|
|
153
|
+
variables: {},
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
}
|
|
157
|
+
const fixedProject = fixProject({
|
|
158
|
+
files,
|
|
159
|
+
rule: noReferenceProjectActionRule,
|
|
160
|
+
fixType: 'delete-project-action',
|
|
161
|
+
})
|
|
162
|
+
expect(fixedProject.actions).toEqual({})
|
|
163
|
+
})
|
|
164
|
+
})
|
|
@@ -1,47 +1,61 @@
|
|
|
1
1
|
import type { CustomActionModel } from '@nordcraft/core/dist/component/component.types'
|
|
2
2
|
import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent'
|
|
3
|
-
import
|
|
3
|
+
import { omit } from '@nordcraft/core/dist/utils/collections'
|
|
4
|
+
import type { NodeType, Rule } from '../../types'
|
|
4
5
|
|
|
5
6
|
export const noReferenceProjectActionRule: Rule<void> = {
|
|
6
7
|
code: 'no-reference project action',
|
|
7
8
|
level: 'warning',
|
|
8
9
|
category: 'No References',
|
|
9
|
-
visit: (report,
|
|
10
|
-
if (
|
|
11
|
-
|
|
10
|
+
visit: (report, details) => {
|
|
11
|
+
if (!hasReferences(details)) {
|
|
12
|
+
report(details.path, undefined, ['delete-project-action'])
|
|
12
13
|
}
|
|
14
|
+
},
|
|
15
|
+
fixes: {
|
|
16
|
+
'delete-project-action': (data) => {
|
|
17
|
+
if (!hasReferences(data)) {
|
|
18
|
+
return omit(data.files, data.path)
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export type NoReferenceProjectActionRuleFix = 'delete-project-action'
|
|
13
25
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
26
|
+
const hasReferences = ({ value, files, nodeType, memo }: NodeType) => {
|
|
27
|
+
if (nodeType !== 'project-action' || value.exported === true) {
|
|
28
|
+
return true
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const projectActionReferences = memo('projectActionReferences', () => {
|
|
32
|
+
const usedActions = new Set<string>()
|
|
33
|
+
for (const component of Object.values(files.components)) {
|
|
34
|
+
const c = new ToddleComponent({
|
|
35
|
+
// Enforce that the component is not undefined since we're iterating
|
|
36
|
+
component: component!,
|
|
37
|
+
getComponent: (name, packageName) =>
|
|
38
|
+
packageName
|
|
39
|
+
? files.packages?.[packageName]?.components[name]
|
|
40
|
+
: files.components[name],
|
|
41
|
+
packageName: undefined,
|
|
42
|
+
globalFormulas: {
|
|
43
|
+
formulas: files.formulas,
|
|
44
|
+
packages: files.packages,
|
|
45
|
+
},
|
|
46
|
+
})
|
|
47
|
+
for (const [, action] of c.actionModelsInComponent()) {
|
|
48
|
+
if (
|
|
49
|
+
action.type === 'Custom' ||
|
|
50
|
+
action.type === ('function' as any) ||
|
|
51
|
+
action.type === undefined
|
|
52
|
+
) {
|
|
53
|
+
usedActions.add((action as CustomActionModel).name)
|
|
38
54
|
}
|
|
39
55
|
}
|
|
40
|
-
return usedActions
|
|
41
|
-
})
|
|
42
|
-
|
|
43
|
-
if (!projectActionReferences.has(value.name)) {
|
|
44
|
-
report(path)
|
|
45
56
|
}
|
|
46
|
-
|
|
57
|
+
return usedActions
|
|
58
|
+
})
|
|
59
|
+
|
|
60
|
+
return projectActionReferences.has(value.name)
|
|
47
61
|
}
|
|
@@ -11,17 +11,15 @@ export const noReferenceProjectFormulaRule: Rule<void> = {
|
|
|
11
11
|
level: 'warning',
|
|
12
12
|
category: 'No References',
|
|
13
13
|
visit: (report, details) => {
|
|
14
|
-
if (hasReferences(details)) {
|
|
15
|
-
|
|
14
|
+
if (!hasReferences(details)) {
|
|
15
|
+
report(details.path, undefined, ['delete-project-formula'])
|
|
16
16
|
}
|
|
17
|
-
report(details.path, undefined, ['delete-project-formula'])
|
|
18
17
|
},
|
|
19
18
|
fixes: {
|
|
20
19
|
'delete-project-formula': (data) => {
|
|
21
|
-
if (hasReferences(data)) {
|
|
22
|
-
return
|
|
20
|
+
if (!hasReferences(data)) {
|
|
21
|
+
return omit(data.files, data.path)
|
|
23
22
|
}
|
|
24
|
-
return omit(data.files, data.path)
|
|
25
23
|
},
|
|
26
24
|
},
|
|
27
25
|
}
|
package/src/types.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ import type {
|
|
|
22
22
|
ToddleProject,
|
|
23
23
|
} from '@nordcraft/ssr/dist/ssr.types'
|
|
24
24
|
import type { LegacyActionRuleFix } from './rules/actions/legacyActionRule'
|
|
25
|
+
import type { NoReferenceProjectActionRuleFix } from './rules/actions/noReferenceProjectActionRule'
|
|
25
26
|
import type { NoReferenceComponentRuleFix } from './rules/components/noReferenceComponentRule'
|
|
26
27
|
import type { LegacyFormulaRuleFix } from './rules/formulas/legacyFormulaRule'
|
|
27
28
|
import type { NoReferenceProjectFormulaRuleFix } from './rules/formulas/noReferenceProjectFormulaRule'
|
|
@@ -318,6 +319,7 @@ type FixType =
|
|
|
318
319
|
| LegacyActionRuleFix
|
|
319
320
|
| NoReferenceComponentRuleFix
|
|
320
321
|
| NoReferenceProjectFormulaRuleFix
|
|
322
|
+
| NoReferenceProjectActionRuleFix
|
|
321
323
|
|
|
322
324
|
export interface Rule<T = unknown, V = NodeType> {
|
|
323
325
|
category: Category
|