@nordcraft/search 1.0.47 → 1.0.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/dist/rules/attributes/unknownComponentAttributeRule.js +11 -15
  2. package/dist/rules/attributes/unknownComponentAttributeRule.js.map +1 -1
  3. package/dist/rules/attributes/unknownComponentAttributeRule.test.js +4 -1
  4. package/dist/rules/attributes/unknownComponentAttributeRule.test.js.map +1 -1
  5. package/dist/rules/logic/noStaticNodeCondition.test.js +20 -2
  6. package/dist/rules/logic/noStaticNodeCondition.test.js.map +1 -1
  7. package/dist/rules/noReferenceNodeRule.js +2 -2
  8. package/dist/rules/noReferenceNodeRule.js.map +1 -1
  9. package/dist/rules/noReferenceNodeRule.test.js +87 -0
  10. package/dist/rules/noReferenceNodeRule.test.js.map +1 -1
  11. package/dist/searchProject.js +22 -0
  12. package/dist/searchProject.js.map +1 -1
  13. package/dist/util/removeUnused.fix.js +22 -7
  14. package/dist/util/removeUnused.fix.js.map +1 -1
  15. package/package.json +2 -2
  16. package/src/rules/attributes/unknownComponentAttributeRule.test.ts +4 -1
  17. package/src/rules/attributes/unknownComponentAttributeRule.ts +12 -15
  18. package/src/rules/logic/noStaticNodeCondition.test.ts +20 -2
  19. package/src/rules/noReferenceNodeRule.test.ts +87 -0
  20. package/src/rules/noReferenceNodeRule.ts +2 -2
  21. package/src/searchProject.ts +24 -0
  22. package/src/types.d.ts +9 -1
  23. package/src/util/removeUnused.fix.ts +27 -14
package/dist/rules/attributes/unknownComponentAttributeRule.js CHANGED
@@ -4,26 +4,22 @@ export const unknownComponentAttributeRule = {
4
4
  code: 'unknown component attribute',
5
5
  level: 'error',
6
6
  category: 'Unknown Reference',
7
- visit: (report, { path, files, value, nodeType }) => {
8
- if (nodeType !== 'component-node' ||
9
- value.type !== 'component' ||
10
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
11
- Object.keys(value.attrs ?? {}).length === 0) {
7
+ visit: (report, args) => {
8
+ if (args.nodeType !== 'component-node-attribute' ||
9
+ args.node.type !== 'component') {
12
10
  return;
13
11
  }
14
- const component = value.package
15
- ? files.packages?.[value.package].components?.[value.name]
16
- : files.components[value.name];
12
+ const { files, value, node, path } = args;
13
+ const component = node.package
14
+ ? files.packages?.[node.package].components?.[node.name]
15
+ : files.components[node.name];
17
16
  if (!component) {
18
17
  return;
19
18
  }
20
- for (const attrKey of Object.keys(value.attrs)) {
21
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
22
- if (!isDefined(component.attributes?.[attrKey])) {
23
- report([...path, 'attrs', attrKey], { name: attrKey }, [
24
- 'delete-component-attribute',
25
- ]);
26
- }
19
+ if (!isDefined(component.attributes?.[value.key])) {
20
+ report(path, { name: value.key, componentName: node.name }, [
21
+ 'delete-component-attribute',
22
+ ]);
27
23
  }
28
24
  },
29
25
  fixes: {
package/dist/rules/attributes/unknownComponentAttributeRule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unknownComponentAttributeRule.js","sourceRoot":"","sources":["../../../src/rules/attributes/unknownComponentAttributeRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAE/D,MAAM,CAAC,MAAM,6BAA6B,GAErC;IACH,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,mBAAmB;IAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAClD,IACE,QAAQ,KAAK,gBAAgB;YAC7B,KAAK,CAAC,IAAI,KAAK,WAAW;YAC1B,uEAAuE;YACvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAC3C,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO;YAC7B,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;YAC1D,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAM;QACR,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,uEAAuE;YACvE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBAChD,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;oBACrD,4BAA4B;iBAC7B,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,4BAA4B,EAAE,iBAAiB;KAChD;CACF,CAAA"}
1
+ {"version":3,"file":"unknownComponentAttributeRule.js","sourceRoot":"","sources":["../../../src/rules/attributes/unknownComponentAttributeRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAE/D,MAAM,CAAC,MAAM,6BAA6B,GAGrC;IACH,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,mBAAmB;IAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACtB,IACE,IAAI,CAAC,QAAQ,KAAK,0BAA0B;YAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAC9B,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO;YAC5B,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YACxD,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAM;QACR,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE;gBAC1D,4BAA4B;aAC7B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACD,KAAK,EAAE;QACL,4BAA4B,EAAE,iBAAiB;KAChD;CACF,CAAA"}
package/dist/rules/attributes/unknownComponentAttributeRule.test.js CHANGED
@@ -51,7 +51,10 @@ describe('find unknownComponentAttribute', () => {
51
51
  }));
52
52
  expect(problems).toHaveLength(1);
53
53
  expect(problems[0].code).toBe('unknown component attribute');
54
- expect(problems[0].details).toEqual({ name: 'third' });
54
+ expect(problems[0].details).toEqual({
55
+ name: 'third',
56
+ componentName: 'referenced',
57
+ });
55
58
  });
56
59
  test('should not report component attributes that exist', () => {
57
60
  const problems = Array.from(searchProject({
package/dist/rules/attributes/unknownComponentAttributeRule.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unknownComponentAttributeRule.test.js","sourceRoot":"","sources":["../../../src/rules/attributes/unknownComponentAttributeRule.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unknownComponentAttributeRule.test.js","sourceRoot":"","sources":["../../../src/rules/attributes/unknownComponentAttributeRule.test.ts"],"names":[],"mappings":"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"}
package/dist/rules/logic/noStaticNodeCondition.test.js CHANGED
@@ -173,7 +173,7 @@ describe('noStaticNodeCondition', () => {
173
173
  }
174
174
  `);
175
175
  });
176
- test("should fix static falsy condition by removing the node and any parents' references to it", () => {
176
+ test('should fix static falsy condition by removing the node and any references to it', () => {
177
177
  const files = {
178
178
  components: {
179
179
  test: {
@@ -194,7 +194,7 @@ describe('noStaticNodeCondition', () => {
194
194
  classes: {},
195
195
  events: {},
196
196
  tag: 'div',
197
- children: [],
197
+ children: ['child'],
198
198
  style: {},
199
199
  condition: {
200
200
  type: 'value',
@@ -214,6 +214,24 @@ describe('noStaticNodeCondition', () => {
214
214
  path: ['Variables', 'maybe'],
215
215
  },
216
216
  },
217
+ child: {
218
+ type: 'element',
219
+ attrs: {},
220
+ classes: {},
221
+ events: {},
222
+ tag: 'div',
223
+ children: ['childsChild'],
224
+ style: {},
225
+ },
226
+ childsChild: {
227
+ type: 'element',
228
+ attrs: {},
229
+ classes: {},
230
+ events: {},
231
+ tag: 'div',
232
+ children: [],
233
+ style: {},
234
+ },
217
235
  },
218
236
  formulas: {},
219
237
  apis: {},
package/dist/rules/logic/noStaticNodeCondition.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"noStaticNodeCondition.test.js","sourceRoot":"","sources":["../../../src/rules/logic/noStaticNodeCondition.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"noStaticNodeCondition.test.js","sourceRoot":"","sources":["../../../src/rules/logic/noStaticNodeCondition.test.ts"],"names":[],"mappings":"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"}
package/dist/rules/noReferenceNodeRule.js CHANGED
@@ -1,4 +1,4 @@
1
- import { removeFromPathFix } from '../util/removeUnused.fix';
1
+ import { removeNodeFromPathFix } from '../util/removeUnused.fix';
2
2
  export const noReferenceNodeRule = {
3
3
  code: 'no-reference node',
4
4
  level: 'warning',
@@ -18,7 +18,7 @@ export const noReferenceNodeRule = {
18
18
  }
19
19
  },
20
20
  fixes: {
21
- 'delete-orphan-node': removeFromPathFix,
21
+ 'delete-orphan-node': removeNodeFromPathFix,
22
22
  },
23
23
  };
24
24
  //# sourceMappingURL=noReferenceNodeRule.js.map
package/dist/rules/noReferenceNodeRule.js.map CHANGED
@@ -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,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"}
1
+ {"version":3,"file":"noReferenceNodeRule.js","sourceRoot":"","sources":["../../src/rules/noReferenceNodeRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAEhE,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,qBAAqB;KAC5C;CACF,CAAA"}
package/dist/rules/noReferenceNodeRule.test.js CHANGED
@@ -127,5 +127,92 @@ describe('fix noReferenceNodeRule', () => {
127
127
  'used',
128
128
  ]);
129
129
  });
130
+ test('should remove children of orphan node', () => {
131
+ const files = {
132
+ formulas: {},
133
+ components: {
134
+ test: {
135
+ name: 'test',
136
+ nodes: {
137
+ root: {
138
+ id: 'root',
139
+ type: 'element',
140
+ tag: 'div',
141
+ children: ['used'],
142
+ attrs: {},
143
+ style: {},
144
+ events: {},
145
+ classes: {},
146
+ },
147
+ orphan: {
148
+ type: 'element',
149
+ tag: 'div',
150
+ children: ['child-of-orphan'],
151
+ attrs: {},
152
+ style: {},
153
+ events: {},
154
+ classes: {},
155
+ },
156
+ 'child-of-orphan': {
157
+ id: 'child-of-orphan',
158
+ type: 'text',
159
+ value: { type: 'value', value: 'I am child of orphan' },
160
+ },
161
+ used: {
162
+ id: 'used',
163
+ type: 'text',
164
+ value: { type: 'value', value: 'I am used' },
165
+ },
166
+ },
167
+ formulas: {},
168
+ apis: {},
169
+ attributes: {},
170
+ variables: {},
171
+ },
172
+ },
173
+ };
174
+ const fixedFiles = fixProject({
175
+ files,
176
+ rule: noReferenceNodeRule,
177
+ fixType: 'delete-orphan-node',
178
+ pathsToVisit: [['components', 'test', 'nodes', 'orphan']],
179
+ });
180
+ expect(fixedFiles).toMatchInlineSnapshot(`
181
+ {
182
+ "components": {
183
+ "test": {
184
+ "apis": {},
185
+ "attributes": {},
186
+ "formulas": {},
187
+ "name": "test",
188
+ "nodes": {
189
+ "root": {
190
+ "attrs": {},
191
+ "children": [
192
+ "used",
193
+ ],
194
+ "classes": {},
195
+ "events": {},
196
+ "id": "root",
197
+ "style": {},
198
+ "tag": "div",
199
+ "type": "element",
200
+ },
201
+ "used": {
202
+ "id": "used",
203
+ "type": "text",
204
+ "value": {
205
+ "type": "value",
206
+ "value": "I am used",
207
+ },
208
+ },
209
+ },
210
+ "variables": {},
211
+ },
212
+ },
213
+ "formulas": {},
214
+ }
215
+ `);
216
+ });
130
217
  });
131
218
  //# sourceMappingURL=noReferenceNodeRule.test.js.map
package/dist/rules/noReferenceNodeRule.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"noReferenceNodeRule.test.js","sourceRoot":"","sources":["../../src/rules/noReferenceNodeRule.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"noReferenceNodeRule.test.js","sourceRoot":"","sources":["../../src/rules/noReferenceNodeRule.test.ts"],"names":[],"mappings":"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"}
package/dist/searchProject.js CHANGED
@@ -369,6 +369,28 @@ function* visitNode({ args, state, fixOptions, }) {
369
369
  state,
370
370
  fixOptions: fixOptions,
371
371
  });
372
+ if (value.nodes[key].type === 'component' ||
373
+ value.nodes[key].type === 'element') {
374
+ // Visit attributes on component and element nodes
375
+ for (const attrKey in value.nodes[key].attrs) {
376
+ const attr = value.nodes[key].attrs[attrKey];
377
+ yield* visitNode({
378
+ args: {
379
+ nodeType: 'component-node-attribute',
380
+ value: { key: attrKey, value: attr },
381
+ path: [...path, 'nodes', key, 'attrs', attrKey],
382
+ rules,
383
+ files,
384
+ pathsToVisit,
385
+ useExactPaths,
386
+ memo,
387
+ node: value.nodes[key],
388
+ },
389
+ state,
390
+ fixOptions: fixOptions,
391
+ });
392
+ }
393
+ }
372
394
  }
373
395
  for (const { path: formulaPath, formula, } of component.formulasInComponent()) {
374
396
  yield* visitNode({
package/dist/searchProject.js.map CHANGED
@@ -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":"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"}
package/dist/util/removeUnused.fix.js CHANGED
@@ -1,20 +1,35 @@
1
1
  import { get, omit, set } from '@nordcraft/core/dist/utils/collections';
2
2
  export const removeFromPathFix = ({ path, files }) => omit(files, path);
3
3
  /**
4
- * Same as removeFromPathFix, but also removes the node from its parent's children.
4
+ * Same as removeFromPathFix, but also cleans up any references to the removed node.
5
5
  */
6
6
  export const removeNodeFromPathFix = (data) => {
7
7
  if (data.nodeType !== 'component-node') {
8
8
  throw new Error('removeNodeFromPathFix can only be used on component nodes');
9
9
  }
10
- const componentNodesPath = data.path.slice(0, -1).map(String);
11
- const filesWithoutNode = removeFromPathFix(data);
12
- const nodes = get(filesWithoutNode, componentNodesPath);
10
+ const componentNodesPath = data.path.map(String);
11
+ const nodeId = componentNodesPath.pop();
12
+ const nodes = get(data.files, componentNodesPath);
13
+ // Clean parent reference
13
14
  for (const key in nodes) {
14
- if (nodes[key].children?.includes(data.path[data.path.length - 1])) {
15
- nodes[key].children = nodes[key].children.filter((p) => p !== data.path[data.path.length - 1]);
15
+ if (nodes[key].children?.includes(nodeId)) {
16
+ nodes[key].children = nodes[key].children.filter((p) => p !== nodeId);
16
17
  }
17
18
  }
18
- return set(filesWithoutNode, componentNodesPath, nodes);
19
+ // Clean children recursively
20
+ const removeNodeAndChildren = (nodeId) => {
21
+ const node = nodes[nodeId];
22
+ if (!node) {
23
+ return;
24
+ }
25
+ if (node.children) {
26
+ for (const childId of node.children) {
27
+ removeNodeAndChildren(childId);
28
+ }
29
+ }
30
+ delete nodes[nodeId];
31
+ };
32
+ removeNodeAndChildren(nodeId);
33
+ return set(data.files, componentNodesPath, nodes);
19
34
  };
20
35
  //# sourceMappingURL=removeUnused.fix.js.map
package/dist/util/removeUnused.fix.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"removeUnused.fix.js","sourceRoot":"","sources":["../../src/util/removeUnused.fix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,wCAAwC,CAAA;AAGvE,MAAM,CAAC,MAAM,iBAAiB,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC1E,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAEnB;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAA0B,CAAC,IAAI,EAAE,EAAE;IACnE,IAAI,IAAI,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC9E,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,GAAG,CAAC,gBAAgB,EAAE,kBAAkB,CAGrD,CAAA;IACD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IACE,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC,EACxE,CAAC;YACD,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAC7C,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAA;AACzD,CAAC,CAAA"}
1
+ {"version":3,"file":"removeUnused.fix.js","sourceRoot":"","sources":["../../src/util/removeUnused.fix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,wCAAwC,CAAA;AAGvE,MAAM,CAAC,MAAM,iBAAiB,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC1E,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAEnB;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAA0B,CAAC,IAAI,EAAE,EAAE;IACnE,IAAI,IAAI,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC9E,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAChD,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,EAAG,CAAA;IACxC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAA8B,CAAA;IAE9E,yBAAyB;IACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1C,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;QACvE,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAA0B,CAAA;QACnD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAM;QACR,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,qBAAqB,CAAC,OAAO,CAAC,CAAA;YAChC,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAE7B,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAA;AACnD,CAAC,CAAA"}
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.47",
8
+ "@nordcraft/ssr": "1.0.48",
9
9
  "jsondiffpatch": "0.7.3",
10
10
  "postcss": "8.5.6"
11
11
  },
@@ -19,5 +19,5 @@
19
19
  "test:watch:only": "bun test --watch --only"
20
20
  },
21
21
  "files": ["dist", "src"],
22
- "version": "1.0.47"
22
+ "version": "1.0.48"
23
23
  }
package/src/rules/attributes/unknownComponentAttributeRule.test.ts CHANGED
@@ -57,7 +57,10 @@ describe('find unknownComponentAttribute', () => {
57
57
 
58
58
  expect(problems).toHaveLength(1)
59
59
  expect(problems[0].code).toBe('unknown component attribute')
60
- expect(problems[0].details).toEqual({ name: 'third' })
60
+ expect(problems[0].details).toEqual({
61
+ name: 'third',
62
+ componentName: 'referenced',
63
+ })
61
64
  })
62
65
 
63
66
  test('should not report component attributes that exist', () => {
package/src/rules/attributes/unknownComponentAttributeRule.ts CHANGED
@@ -4,32 +4,29 @@ import { removeFromPathFix } from '../../util/removeUnused.fix'
4
4
 
5
5
  export const unknownComponentAttributeRule: Rule<{
6
6
  name: string
7
+ componentName: string
7
8
  }> = {
8
9
  code: 'unknown component attribute',
9
10
  level: 'error',
10
11
  category: 'Unknown Reference',
11
- visit: (report, { path, files, value, nodeType }) => {
12
+ visit: (report, args) => {
12
13
  if (
13
- nodeType !== 'component-node' ||
14
- value.type !== 'component' ||
15
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
16
- Object.keys(value.attrs ?? {}).length === 0
14
+ args.nodeType !== 'component-node-attribute' ||
15
+ args.node.type !== 'component'
17
16
  ) {
18
17
  return
19
18
  }
20
- const component = value.package
21
- ? files.packages?.[value.package].components?.[value.name]
22
- : files.components[value.name]
19
+ const { files, value, node, path } = args
20
+ const component = node.package
21
+ ? files.packages?.[node.package].components?.[node.name]
22
+ : files.components[node.name]
23
23
  if (!component) {
24
24
  return
25
25
  }
26
- for (const attrKey of Object.keys(value.attrs)) {
27
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
28
- if (!isDefined(component.attributes?.[attrKey])) {
29
- report([...path, 'attrs', attrKey], { name: attrKey }, [
30
- 'delete-component-attribute',
31
- ])
32
- }
26
+ if (!isDefined(component.attributes?.[value.key])) {
27
+ report(path, { name: value.key, componentName: node.name }, [
28
+ 'delete-component-attribute',
29
+ ])
33
30
  }
34
31
  },
35
32
  fixes: {
package/src/rules/logic/noStaticNodeCondition.test.ts CHANGED
@@ -188,7 +188,7 @@ describe('noStaticNodeCondition', () => {
188
188
  `)
189
189
  })
190
190
 
191
- test("should fix static falsy condition by removing the node and any parents' references to it", () => {
191
+ test('should fix static falsy condition by removing the node and any references to it', () => {
192
192
  const files: ProjectFiles = {
193
193
  components: {
194
194
  test: {
@@ -209,7 +209,7 @@ describe('noStaticNodeCondition', () => {
209
209
  classes: {},
210
210
  events: {},
211
211
  tag: 'div',
212
- children: [],
212
+ children: ['child'],
213
213
  style: {},
214
214
  condition: {
215
215
  type: 'value',
@@ -229,6 +229,24 @@ describe('noStaticNodeCondition', () => {
229
229
  path: ['Variables', 'maybe'],
230
230
  },
231
231
  },
232
+ child: {
233
+ type: 'element',
234
+ attrs: {},
235
+ classes: {},
236
+ events: {},
237
+ tag: 'div',
238
+ children: ['childsChild'],
239
+ style: {},
240
+ },
241
+ childsChild: {
242
+ type: 'element',
243
+ attrs: {},
244
+ classes: {},
245
+ events: {},
246
+ tag: 'div',
247
+ children: [],
248
+ style: {},
249
+ },
232
250
  },
233
251
  formulas: {},
234
252
  apis: {},
package/src/rules/noReferenceNodeRule.test.ts CHANGED
@@ -137,4 +137,91 @@ describe('fix noReferenceNodeRule', () => {
137
137
  'used',
138
138
  ])
139
139
  })
140
+ test('should remove children of orphan node', () => {
141
+ const files: ProjectFiles = {
142
+ formulas: {},
143
+ components: {
144
+ test: {
145
+ name: 'test',
146
+ nodes: {
147
+ root: {
148
+ id: 'root',
149
+ type: 'element',
150
+ tag: 'div',
151
+ children: ['used'],
152
+ attrs: {},
153
+ style: {},
154
+ events: {},
155
+ classes: {},
156
+ },
157
+ orphan: {
158
+ type: 'element',
159
+ tag: 'div',
160
+ children: ['child-of-orphan'],
161
+ attrs: {},
162
+ style: {},
163
+ events: {},
164
+ classes: {},
165
+ },
166
+ 'child-of-orphan': {
167
+ id: 'child-of-orphan',
168
+ type: 'text',
169
+ value: { type: 'value', value: 'I am child of orphan' },
170
+ },
171
+ used: {
172
+ id: 'used',
173
+ type: 'text',
174
+ value: { type: 'value', value: 'I am used' },
175
+ },
176
+ },
177
+ formulas: {},
178
+ apis: {},
179
+ attributes: {},
180
+ variables: {},
181
+ },
182
+ },
183
+ }
184
+ const fixedFiles = fixProject({
185
+ files,
186
+ rule: noReferenceNodeRule,
187
+ fixType: 'delete-orphan-node',
188
+ pathsToVisit: [['components', 'test', 'nodes', 'orphan']],
189
+ })
190
+ expect(fixedFiles).toMatchInlineSnapshot(`
191
+ {
192
+ "components": {
193
+ "test": {
194
+ "apis": {},
195
+ "attributes": {},
196
+ "formulas": {},
197
+ "name": "test",
198
+ "nodes": {
199
+ "root": {
200
+ "attrs": {},
201
+ "children": [
202
+ "used",
203
+ ],
204
+ "classes": {},
205
+ "events": {},
206
+ "id": "root",
207
+ "style": {},
208
+ "tag": "div",
209
+ "type": "element",
210
+ },
211
+ "used": {
212
+ "id": "used",
213
+ "type": "text",
214
+ "value": {
215
+ "type": "value",
216
+ "value": "I am used",
217
+ },
218
+ },
219
+ },
220
+ "variables": {},
221
+ },
222
+ },
223
+ "formulas": {},
224
+ }
225
+ `)
226
+ })
140
227
  })
package/src/rules/noReferenceNodeRule.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { Rule } from '../types'
2
- import { removeFromPathFix } from '../util/removeUnused.fix'
2
+ import { removeNodeFromPathFix } from '../util/removeUnused.fix'
3
3
 
4
4
  export const noReferenceNodeRule: Rule<{ node: string }> = {
5
5
  code: 'no-reference node',
@@ -27,7 +27,7 @@ export const noReferenceNodeRule: Rule<{ node: string }> = {
27
27
  }
28
28
  },
29
29
  fixes: {
30
- 'delete-orphan-node': removeFromPathFix,
30
+ 'delete-orphan-node': removeNodeFromPathFix,
31
31
  },
32
32
  }
33
33
 
package/src/searchProject.ts CHANGED
@@ -480,6 +480,30 @@ function* visitNode({
480
480
  state,
481
481
  fixOptions: fixOptions as any,
482
482
  })
483
+ if (
484
+ value.nodes[key].type === 'component' ||
485
+ value.nodes[key].type === 'element'
486
+ ) {
487
+ // Visit attributes on component and element nodes
488
+ for (const attrKey in value.nodes[key].attrs) {
489
+ const attr = value.nodes[key].attrs[attrKey]
490
+ yield* visitNode({
491
+ args: {
492
+ nodeType: 'component-node-attribute',
493
+ value: { key: attrKey, value: attr },
494
+ path: [...path, 'nodes', key, 'attrs', attrKey],
495
+ rules,
496
+ files,
497
+ pathsToVisit,
498
+ useExactPaths,
499
+ memo,
500
+ node: value.nodes[key],
501
+ },
502
+ state,
503
+ fixOptions: fixOptions as any,
504
+ })
505
+ }
506
+ }
483
507
  }
484
508
 
485
509
  for (const {
package/src/types.d.ts CHANGED
@@ -6,6 +6,7 @@ import type {
6
6
  ComponentEvent as _ComponentEvent,
7
7
  ActionModel,
8
8
  Component,
9
+ ComponentNodeModel,
9
10
  ElementNodeModel,
10
11
  NodeModel,
11
12
  StyleVariant,
@@ -255,6 +256,12 @@ type ComponentVariableNode = {
255
256
  component: ToddleComponent<Function>
256
257
  } & Base
257
258
 
259
+ type ComponentNodeAttributeNode = {
260
+ nodeType: 'component-node-attribute'
261
+ value: { key: string; value?: Formula }
262
+ node: ComponentNodeModel | ElementNodeModel
263
+ } & Base
264
+
258
265
  type ComponentAttributeNode = {
259
266
  nodeType: 'component-attribute'
260
267
  value: Component['attributes'][0]
@@ -327,6 +334,7 @@ export type NodeType =
327
334
  | ComponentEvent
328
335
  | ComponentFormulaNode
329
336
  | ComponentNode
337
+ | ComponentNodeAttributeNode
330
338
  | ComponentNodeNode
331
339
  | ComponentVariableNode
332
340
  | ComponentWorkflowNode
@@ -335,8 +343,8 @@ export type NodeType =
335
343
  | ProjectApiService
336
344
  | ProjectConfigNode
337
345
  | ProjectFormulaNode
338
- | ProjectThemeNode
339
346
  | ProjectRoute
347
+ | ProjectThemeNode
340
348
  | StyleNode
341
349
  | StyleVariantNode
342
350
 
package/src/util/removeUnused.fix.ts CHANGED
@@ -6,28 +6,41 @@ export const removeFromPathFix: FixFunction<NodeType> = ({ path, files }) =>
6
6
  omit(files, path)
7
7
 
8
8
  /**
9
- * Same as removeFromPathFix, but also removes the node from its parent's children.
9
+ * Same as removeFromPathFix, but also cleans up any references to the removed node.
10
10
  */
11
11
  export const removeNodeFromPathFix: FixFunction<NodeType> = (data) => {
12
12
  if (data.nodeType !== 'component-node') {
13
13
  throw new Error('removeNodeFromPathFix can only be used on component nodes')
14
14
  }
15
15
 
16
- const componentNodesPath = data.path.slice(0, -1).map(String)
17
- const filesWithoutNode = removeFromPathFix(data)
18
- const nodes = get(filesWithoutNode, componentNodesPath) as Record<
19
- string,
20
- NodeModel
21
- >
16
+ const componentNodesPath = data.path.map(String)
17
+ const nodeId = componentNodesPath.pop()!
18
+ const nodes = get(data.files, componentNodesPath) as Record<string, NodeModel>
19
+
20
+ // Clean parent reference
22
21
  for (const key in nodes) {
23
- if (
24
- nodes[key].children?.includes(data.path[data.path.length - 1] as string)
25
- ) {
26
- nodes[key].children = nodes[key].children.filter(
27
- (p) => p !== data.path[data.path.length - 1],
28
- )
22
+ if (nodes[key].children?.includes(nodeId)) {
23
+ nodes[key].children = nodes[key].children.filter((p) => p !== nodeId)
24
+ }
25
+ }
26
+
27
+ // Clean children recursively
28
+ const removeNodeAndChildren = (nodeId: string) => {
29
+ const node = nodes[nodeId] as NodeModel | undefined
30
+ if (!node) {
31
+ return
29
32
  }
33
+
34
+ if (node.children) {
35
+ for (const childId of node.children) {
36
+ removeNodeAndChildren(childId)
37
+ }
38
+ }
39
+
40
+ delete nodes[nodeId]
30
41
  }
31
42
 
32
- return set(filesWithoutNode, componentNodesPath, nodes)
43
+ removeNodeAndChildren(nodeId)
44
+
45
+ return set(data.files, componentNodesPath, nodes)
33
46
  }