@nordcraft/search 1.0.40 → 1.0.41

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 (10) hide show
  1. package/dist/rules/actions/legacyActionRule.js +29 -5
  2. package/dist/rules/actions/legacyActionRule.js.map +1 -1
  3. package/dist/rules/actions/legacyActionRule.test.js +69 -0
  4. package/dist/rules/actions/legacyActionRule.test.js.map +1 -1
  5. package/dist/util/helpers.js +1 -0
  6. package/dist/util/helpers.js.map +1 -1
  7. package/package.json +2 -2
  8. package/src/rules/actions/legacyActionRule.test.ts +71 -0
  9. package/src/rules/actions/legacyActionRule.ts +30 -5
  10. package/src/util/helpers.ts +1 -0
package/dist/rules/actions/legacyActionRule.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { valueFormula } from '@nordcraft/core/dist/formula/formulaUtils';
1
2
  import { set } from '@nordcraft/core/dist/utils/collections';
2
3
  import { isLegacyAction, renameArguments } from '../../util/helpers';
3
4
  export const legacyActionRule = {
@@ -67,7 +68,8 @@ export const legacyActionRule = {
67
68
  };
68
69
  break;
69
70
  }
70
- case 'UpdateVariable': {
71
+ case 'UpdateVariable':
72
+ case 'Update Variable': {
71
73
  const variableName = value.arguments?.[0]?.formula.type === 'value'
72
74
  ? value.arguments[0].formula.value
73
75
  : undefined;
@@ -140,6 +142,27 @@ export const legacyActionRule = {
140
142
  };
141
143
  break;
142
144
  }
145
+ case 'FocusElement': {
146
+ newAction = {
147
+ name: '@toddle/focus',
148
+ arguments: [
149
+ {
150
+ name: 'Element',
151
+ formula: {
152
+ type: 'function',
153
+ name: '@toddle/getElementById',
154
+ arguments: [
155
+ {
156
+ name: 'Id',
157
+ formula: value.arguments?.[0]?.formula ?? valueFormula(null),
158
+ },
159
+ ],
160
+ },
161
+ },
162
+ ],
163
+ label: 'Focus',
164
+ };
165
+ }
143
166
  }
144
167
  if (newAction) {
145
168
  return set(files, path, newAction);
@@ -150,14 +173,15 @@ export const legacyActionRule = {
150
173
  // These actions take a first argument which is a formula as the name
151
174
  // of the thing to update/trigger. We can only safely autofix these if
152
175
  // the argument is a value operation and a string
153
- const formulaNamedActions = ['UpdateVariable', 'TriggerEvent'];
176
+ const formulaNamedActions = [
177
+ 'UpdateVariable',
178
+ 'Update Variable',
179
+ 'TriggerEvent',
180
+ ];
154
181
  const unfixableLegacyActions = new Set([
155
182
  'CopyToClipboard', // Previously, this action would JSON stringify non-string inputs
156
183
  'Update URL parameter', // The user will need to pick a history mode (push/replace)
157
184
  '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
185
  '@toddle/setSessionCookies', // The new 'Set cookie' action takes more arguments
162
186
  ]);
163
187
  //# sourceMappingURL=legacyActionRule.js.map
package/dist/rules/actions/legacyActionRule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"legacyActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"legacyActionRule.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.ts"],"names":[],"mappings":"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"}
package/dist/rules/actions/legacyActionRule.test.js CHANGED
@@ -318,5 +318,74 @@ describe('fix legacyActions', () => {
318
318
  }
319
319
  `);
320
320
  });
321
+ test('should replace the TriggerEvent action with the builtin action', () => {
322
+ const legacyAction = {
323
+ name: 'FocusElement',
324
+ arguments: [
325
+ {
326
+ name: 'elementId',
327
+ formula: { type: 'value', value: 'my-id' },
328
+ },
329
+ ],
330
+ };
331
+ const projectFiles = {
332
+ formulas: {},
333
+ components: {
334
+ apiComponent: {
335
+ name: 'test',
336
+ nodes: {
337
+ root: {
338
+ tag: 'p',
339
+ type: 'element',
340
+ attrs: {},
341
+ style: {},
342
+ events: {
343
+ click: {
344
+ trigger: 'click',
345
+ actions: [legacyAction],
346
+ },
347
+ },
348
+ classes: {},
349
+ children: [],
350
+ },
351
+ },
352
+ formulas: {},
353
+ apis: {},
354
+ attributes: {},
355
+ variables: {},
356
+ },
357
+ },
358
+ };
359
+ const fixedProject = fixProject({
360
+ files: projectFiles,
361
+ rule: legacyActionRule,
362
+ fixType: 'replace-legacy-action',
363
+ });
364
+ const fixedAction = (fixedProject.components['apiComponent']?.nodes['root']).events['click'].actions[0];
365
+ expect(fixedAction).toMatchInlineSnapshot(`
366
+ {
367
+ "arguments": [
368
+ {
369
+ "formula": {
370
+ "arguments": [
371
+ {
372
+ "formula": {
373
+ "type": "value",
374
+ "value": "my-id",
375
+ },
376
+ "name": "Id",
377
+ },
378
+ ],
379
+ "name": "@toddle/getElementById",
380
+ "type": "function",
381
+ },
382
+ "name": "Element",
383
+ },
384
+ ],
385
+ "label": "Focus",
386
+ "name": "@toddle/focus",
387
+ }
388
+ `);
389
+ });
321
390
  });
322
391
  //# sourceMappingURL=legacyActionRule.test.js.map
package/dist/rules/actions/legacyActionRule.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"legacyActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"legacyActionRule.test.js","sourceRoot":"","sources":["../../../src/rules/actions/legacyActionRule.test.ts"],"names":[],"mappings":"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"}
package/dist/util/helpers.js CHANGED
@@ -34,6 +34,7 @@ const LEGACY_CUSTOM_ACTIONS = new Set([
34
34
  'StopPropagation',
35
35
  'CopyToClipboard',
36
36
  'UpdateVariable',
37
+ 'Update Variable',
37
38
  'Update URL parameter',
38
39
  'updateUrlParameters',
39
40
  'UpdateQueryParam',
package/dist/util/helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/util/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/util/helpers.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.40",
8
+ "@nordcraft/ssr": "1.0.41",
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.40"
21
+ "version": "1.0.41"
22
22
  }
package/src/rules/actions/legacyActionRule.test.ts CHANGED
@@ -333,4 +333,75 @@ describe('fix legacyActions', () => {
333
333
  }
334
334
  `)
335
335
  })
336
+ test('should replace the TriggerEvent action with the builtin action', () => {
337
+ const legacyAction: ActionModel = {
338
+ name: 'FocusElement',
339
+ arguments: [
340
+ {
341
+ name: 'elementId',
342
+ formula: { type: 'value', value: 'my-id' },
343
+ },
344
+ ],
345
+ }
346
+ const projectFiles: ProjectFiles = {
347
+ formulas: {},
348
+ components: {
349
+ apiComponent: {
350
+ name: 'test',
351
+ nodes: {
352
+ root: {
353
+ tag: 'p',
354
+ type: 'element',
355
+ attrs: {},
356
+ style: {},
357
+ events: {
358
+ click: {
359
+ trigger: 'click',
360
+ actions: [legacyAction],
361
+ },
362
+ },
363
+ classes: {},
364
+ children: [],
365
+ },
366
+ },
367
+ formulas: {},
368
+ apis: {},
369
+ attributes: {},
370
+ variables: {},
371
+ },
372
+ },
373
+ }
374
+ const fixedProject = fixProject({
375
+ files: projectFiles,
376
+ rule: legacyActionRule,
377
+ fixType: 'replace-legacy-action',
378
+ })
379
+ const fixedAction = (
380
+ fixedProject.components['apiComponent']?.nodes['root'] as ElementNodeModel
381
+ ).events['click'].actions[0]
382
+ expect(fixedAction).toMatchInlineSnapshot(`
383
+ {
384
+ "arguments": [
385
+ {
386
+ "formula": {
387
+ "arguments": [
388
+ {
389
+ "formula": {
390
+ "type": "value",
391
+ "value": "my-id",
392
+ },
393
+ "name": "Id",
394
+ },
395
+ ],
396
+ "name": "@toddle/getElementById",
397
+ "type": "function",
398
+ },
399
+ "name": "Element",
400
+ },
401
+ ],
402
+ "label": "Focus",
403
+ "name": "@toddle/focus",
404
+ }
405
+ `)
406
+ })
336
407
  })
package/src/rules/actions/legacyActionRule.ts CHANGED
@@ -2,6 +2,7 @@ import type {
2
2
  ActionModel,
3
3
  CustomActionArgument,
4
4
  } from '@nordcraft/core/dist/component/component.types'
5
+ import { valueFormula } from '@nordcraft/core/dist/formula/formulaUtils'
5
6
  import { set } from '@nordcraft/core/dist/utils/collections'
6
7
  import type { Rule } from '../../types'
7
8
  import { isLegacyAction, renameArguments } from '../../util/helpers'
@@ -81,7 +82,8 @@ export const legacyActionRule: Rule<{
81
82
  }
82
83
  break
83
84
  }
84
- case 'UpdateVariable': {
85
+ case 'UpdateVariable':
86
+ case 'Update Variable': {
85
87
  const variableName =
86
88
  value.arguments?.[0]?.formula.type === 'value'
87
89
  ? value.arguments[0].formula.value
@@ -162,6 +164,28 @@ export const legacyActionRule: Rule<{
162
164
  }
163
165
  break
164
166
  }
167
+ case 'FocusElement': {
168
+ newAction = {
169
+ name: '@toddle/focus',
170
+ arguments: [
171
+ {
172
+ name: 'Element',
173
+ formula: {
174
+ type: 'function',
175
+ name: '@toddle/getElementById',
176
+ arguments: [
177
+ {
178
+ name: 'Id',
179
+ formula:
180
+ value.arguments?.[0]?.formula ?? valueFormula(null),
181
+ },
182
+ ],
183
+ },
184
+ },
185
+ ],
186
+ label: 'Focus',
187
+ }
188
+ }
165
189
  }
166
190
  if (newAction) {
167
191
  return set(files, path, newAction)
@@ -173,15 +197,16 @@ export const legacyActionRule: Rule<{
173
197
  // These actions take a first argument which is a formula as the name
174
198
  // of the thing to update/trigger. We can only safely autofix these if
175
199
  // the argument is a value operation and a string
176
- const formulaNamedActions = ['UpdateVariable', 'TriggerEvent']
200
+ const formulaNamedActions = [
201
+ 'UpdateVariable',
202
+ 'Update Variable',
203
+ 'TriggerEvent',
204
+ ]
177
205
 
178
206
  const unfixableLegacyActions = new Set([
179
207
  'CopyToClipboard', // Previously, this action would JSON stringify non-string inputs
180
208
  'Update URL parameter', // The user will need to pick a history mode (push/replace)
181
209
  'Fetch', // This was mainly used for APIs v1
182
- 'FocusElement', // The new 'Focus' action takes an element as input - not a selector
183
- 'UpdateVariable', // The variable name could be a formula in the legacy version
184
- 'TriggerEvent', // The name of the event could be a formula in the legacy version
185
210
  '@toddle/setSessionCookies', // The new 'Set cookie' action takes more arguments
186
211
  ])
187
212
 
package/src/util/helpers.ts CHANGED
@@ -65,6 +65,7 @@ const LEGACY_CUSTOM_ACTIONS = new Set([
65
65
  'StopPropagation',
66
66
  'CopyToClipboard',
67
67
  'UpdateVariable',
68
+ 'Update Variable',
68
69
  'Update URL parameter',
69
70
  'updateUrlParameters',
70
71
  'UpdateQueryParam',