@domain-first/project-structure 8.12.0 → 8.13.0
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/README.md +1 -1
- package/dist/783.js +13 -45
- package/dist/878.js +2 -4
- package/dist/graph.cjs +2 -4
- package/dist/index.cjs +15 -49
- package/dist/init.cjs +2 -4
- package/dist/integration.cjs +15 -49
- package/dist/lint.cjs +2 -4
- package/dist/react-module-move.d.ts +0 -2
- package/dist/react.cjs +15 -49
- package/dist/svelte.cjs +15 -49
- package/dist/upgrade-svelte.d.ts +10 -3
- package/dist/upgrade.cjs +104 -19
- package/dist/upgrade.js +102 -15
- package/dist/use-cases/scaffold-svelte-modules.d.ts +0 -4
- package/package.json +1 -1
- package/skills/df-ps-scaffold/SKILL.md +1 -1
- package/skills/df-ps-svelte/SKILL.md +8 -8
- package/skills/df-ps-svelte/references/generators.md +4 -3
package/README.md
CHANGED
|
@@ -276,7 +276,7 @@ With Next.js, a new page also gets its App Router route, `app/admin/panel/users/
|
|
|
276
276
|
|
|
277
277
|
### How to scaffold Svelte modules
|
|
278
278
|
|
|
279
|
-
With `frontend.svelte` configured (Svelte or SvelteKit), run `npx df-svelte`: the same pages, widgets and UI-kit components as `df-react`, written as Svelte 5 components with runes into `presentation/svelte`. Svelte has no hooks: reusable logic is a shared model, `shared/model/create-<name>.svelte.ts`, and a widget
|
|
279
|
+
With `frontend.svelte` configured (Svelte or SvelteKit), run `npx df-svelte`: the same pages, widgets and UI-kit components as `df-react`, written as Svelte 5 components with runes into `presentation/svelte`. Svelte has no hooks: reusable logic is a shared model, `shared/model/create-<name>.svelte.ts`, and a widget maps its props to UI props with `toUIProps`, called in its markup (`<OrdersWidgetUI {...toUIProps()} />`), so the UI follows props and state. Components export their props types from `<script lang="ts" module>`, and stories follow `@storybook/svelte-vite` or `@storybook/sveltekit`.
|
|
280
280
|
|
|
281
281
|
```text
|
|
282
282
|
admin/panel/users → pages/admin/panel/admin-panel-users-page.svelte (AdminPanelUsersPage)
|
package/dist/783.js
CHANGED
|
@@ -497,7 +497,7 @@ const svelteComponentContent = (propsType)=>`
|
|
|
497
497
|
let props: ${propsType} = $props()
|
|
498
498
|
</script>
|
|
499
499
|
`.trim();
|
|
500
|
-
const svelteStory = (storybookFramework, componentName, componentFile, title)=>`
|
|
500
|
+
const svelteStory = (storybookFramework, componentName, componentFile, title, propsType)=>`
|
|
501
501
|
import type { Meta, StoryObj } from '${storybookFramework}'
|
|
502
502
|
import ${componentName} from './${componentFile}'
|
|
503
503
|
|
|
@@ -511,31 +511,10 @@ export default meta
|
|
|
511
511
|
type Story = StoryObj<typeof meta>
|
|
512
512
|
|
|
513
513
|
export const Default: Story = {
|
|
514
|
+
// fill required props of ${propsType}
|
|
514
515
|
args: {}
|
|
515
516
|
}
|
|
516
517
|
`.trim();
|
|
517
|
-
const svelteUIModelContent = (ClassName, propsType)=>`
|
|
518
|
-
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from '../types'
|
|
519
|
-
|
|
520
|
-
/**
|
|
521
|
-
* - widgetProps is the $props() proxy as a whole: destructuring it in the
|
|
522
|
-
* signature (({ a }) =>) or copying it ({ ...props }) loses reactivity
|
|
523
|
-
* - values depending on props: $derived, exposed through getters only
|
|
524
|
-
* - local state: $state; methods: plain functions of the returned object
|
|
525
|
-
* - getters satisfy ${ClassName}WidgetUIProps
|
|
526
|
-
*/
|
|
527
|
-
export const create${ClassName}UIModel = (
|
|
528
|
-
widgetProps: ${propsType},
|
|
529
|
-
): ${ClassName}WidgetUIProps => {
|
|
530
|
-
// derived values go here
|
|
531
|
-
// const value = $derived(widgetProps.value)
|
|
532
|
-
|
|
533
|
-
return {
|
|
534
|
-
// expose values via getters to keep reactivity:
|
|
535
|
-
// get value() { return value },
|
|
536
|
-
}
|
|
537
|
-
}
|
|
538
|
-
`.trim();
|
|
539
518
|
const scaffold_svelte_modules_storybookFramework = ()=>ConfigFile.Instance.data.frontend?.svelte?.storybookFramework;
|
|
540
519
|
const svelteKitRouteContent = (ClassName, pageImport)=>`
|
|
541
520
|
<script lang="ts">
|
|
@@ -601,7 +580,6 @@ const scaffoldSvelteWidget = async (presentationSvelteFolder)=>{
|
|
|
601
580
|
].join('/');
|
|
602
581
|
const widgetFileName = `${fileName}-widget`;
|
|
603
582
|
const uiFileName = `${fileName}-widget-ui`;
|
|
604
|
-
const uiModelFileName = `create-${fileName}-ui-model`;
|
|
605
583
|
if ('monolithic' === widgetType) {
|
|
606
584
|
folder.createFile('index.ts', `
|
|
607
585
|
export { default as ${ClassName}Widget } from './${widgetFileName}.svelte'
|
|
@@ -622,17 +600,15 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
622
600
|
`.trim());
|
|
623
601
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
624
602
|
<script lang="ts">
|
|
625
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
603
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
626
604
|
import ${ClassName}WidgetUI from './ui/${uiFileName}.svelte'
|
|
627
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
628
605
|
|
|
629
606
|
let props: ${ClassName}WidgetProps = $props()
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
const uiModel = create${ClassName}UIModel(props)
|
|
607
|
+
|
|
608
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
633
609
|
</script>
|
|
634
610
|
|
|
635
|
-
<${ClassName}WidgetUI {...
|
|
611
|
+
<${ClassName}WidgetUI {...toUIProps()} />
|
|
636
612
|
`.trim());
|
|
637
613
|
folder.subitem([
|
|
638
614
|
'ui'
|
|
@@ -646,10 +622,7 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
646
622
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
647
623
|
if (framework) folder.subitem([
|
|
648
624
|
'ui'
|
|
649
|
-
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle));
|
|
650
|
-
folder.subitem([
|
|
651
|
-
'model'
|
|
652
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `${ClassName}WidgetProps`));
|
|
625
|
+
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle, `${ClassName}WidgetUIProps`));
|
|
653
626
|
return;
|
|
654
627
|
}
|
|
655
628
|
folder.createFile('types.ts', `
|
|
@@ -663,20 +636,15 @@ export type ${ClassName}WidgetProps = {
|
|
|
663
636
|
`.trim());
|
|
664
637
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
665
638
|
<script lang="ts">
|
|
666
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
667
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
639
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
668
640
|
|
|
669
|
-
let { UI, ...
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
const uiModel = create${ClassName}UIModel(widgetProps)
|
|
641
|
+
let { UI, ...rest }: ${ClassName}WidgetProps = $props()
|
|
642
|
+
|
|
643
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
673
644
|
</script>
|
|
674
645
|
|
|
675
|
-
<UI {...
|
|
646
|
+
<UI {...toUIProps()} />
|
|
676
647
|
`.trim());
|
|
677
|
-
folder.subitem([
|
|
678
|
-
'model'
|
|
679
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `Omit<${ClassName}WidgetProps, 'UI'>`));
|
|
680
648
|
};
|
|
681
649
|
const scaffoldSvelteUIKitComponent = async (presentationSvelteFolder)=>{
|
|
682
650
|
const name = await interaction_input({
|
|
@@ -694,7 +662,7 @@ export type { ${ClassName}Props } from './${fileName}.svelte'
|
|
|
694
662
|
`.trim());
|
|
695
663
|
componentFolder.createFile(`${fileName}.svelte`, svelteComponentContent(`${ClassName}Props`));
|
|
696
664
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
697
|
-
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`));
|
|
665
|
+
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`, `${ClassName}Props`));
|
|
698
666
|
};
|
|
699
667
|
const scaffoldSvelteSharedModel = async (presentationSvelteFolder)=>{
|
|
700
668
|
const name = await interaction_input({
|
package/dist/878.js
CHANGED
|
@@ -1198,16 +1198,14 @@ const frontendLogicNaming = {
|
|
|
1198
1198
|
prefix: 'use',
|
|
1199
1199
|
shared: [
|
|
1200
1200
|
'hooks'
|
|
1201
|
-
]
|
|
1202
|
-
widgetModel: 'hooks'
|
|
1201
|
+
]
|
|
1203
1202
|
},
|
|
1204
1203
|
svelte: {
|
|
1205
1204
|
prefix: 'create',
|
|
1206
1205
|
shared: [
|
|
1207
1206
|
'shared',
|
|
1208
1207
|
'model'
|
|
1209
|
-
]
|
|
1210
|
-
widgetModel: 'model'
|
|
1208
|
+
]
|
|
1211
1209
|
}
|
|
1212
1210
|
};
|
|
1213
1211
|
const kindLayouts = (framework)=>{
|
package/dist/graph.cjs
CHANGED
|
@@ -424,16 +424,14 @@ const react_module_move_frontendLogicNaming = {
|
|
|
424
424
|
prefix: 'use',
|
|
425
425
|
shared: [
|
|
426
426
|
'hooks'
|
|
427
|
-
]
|
|
428
|
-
widgetModel: 'hooks'
|
|
427
|
+
]
|
|
429
428
|
},
|
|
430
429
|
svelte: {
|
|
431
430
|
prefix: 'create',
|
|
432
431
|
shared: [
|
|
433
432
|
'shared',
|
|
434
433
|
'model'
|
|
435
|
-
]
|
|
436
|
-
widgetModel: 'model'
|
|
434
|
+
]
|
|
437
435
|
}
|
|
438
436
|
};
|
|
439
437
|
const kindLayouts = (framework)=>{
|
package/dist/index.cjs
CHANGED
|
@@ -1841,16 +1841,14 @@ const frontendLogicNaming = {
|
|
|
1841
1841
|
prefix: 'use',
|
|
1842
1842
|
shared: [
|
|
1843
1843
|
'hooks'
|
|
1844
|
-
]
|
|
1845
|
-
widgetModel: 'hooks'
|
|
1844
|
+
]
|
|
1846
1845
|
},
|
|
1847
1846
|
svelte: {
|
|
1848
1847
|
prefix: 'create',
|
|
1849
1848
|
shared: [
|
|
1850
1849
|
'shared',
|
|
1851
1850
|
'model'
|
|
1852
|
-
]
|
|
1853
|
-
widgetModel: 'model'
|
|
1851
|
+
]
|
|
1854
1852
|
}
|
|
1855
1853
|
};
|
|
1856
1854
|
const kindLayouts = (framework)=>{
|
|
@@ -2147,7 +2145,7 @@ const svelteComponentContent = (propsType)=>`
|
|
|
2147
2145
|
let props: ${propsType} = $props()
|
|
2148
2146
|
</script>
|
|
2149
2147
|
`.trim();
|
|
2150
|
-
const svelteStory = (storybookFramework, componentName, componentFile, title)=>`
|
|
2148
|
+
const svelteStory = (storybookFramework, componentName, componentFile, title, propsType)=>`
|
|
2151
2149
|
import type { Meta, StoryObj } from '${storybookFramework}'
|
|
2152
2150
|
import ${componentName} from './${componentFile}'
|
|
2153
2151
|
|
|
@@ -2161,31 +2159,10 @@ export default meta
|
|
|
2161
2159
|
type Story = StoryObj<typeof meta>
|
|
2162
2160
|
|
|
2163
2161
|
export const Default: Story = {
|
|
2162
|
+
// fill required props of ${propsType}
|
|
2164
2163
|
args: {}
|
|
2165
2164
|
}
|
|
2166
2165
|
`.trim();
|
|
2167
|
-
const svelteUIModelContent = (ClassName, propsType)=>`
|
|
2168
|
-
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from '../types'
|
|
2169
|
-
|
|
2170
|
-
/**
|
|
2171
|
-
* - widgetProps is the $props() proxy as a whole: destructuring it in the
|
|
2172
|
-
* signature (({ a }) =>) or copying it ({ ...props }) loses reactivity
|
|
2173
|
-
* - values depending on props: $derived, exposed through getters only
|
|
2174
|
-
* - local state: $state; methods: plain functions of the returned object
|
|
2175
|
-
* - getters satisfy ${ClassName}WidgetUIProps
|
|
2176
|
-
*/
|
|
2177
|
-
export const create${ClassName}UIModel = (
|
|
2178
|
-
widgetProps: ${propsType},
|
|
2179
|
-
): ${ClassName}WidgetUIProps => {
|
|
2180
|
-
// derived values go here
|
|
2181
|
-
// const value = $derived(widgetProps.value)
|
|
2182
|
-
|
|
2183
|
-
return {
|
|
2184
|
-
// expose values via getters to keep reactivity:
|
|
2185
|
-
// get value() { return value },
|
|
2186
|
-
}
|
|
2187
|
-
}
|
|
2188
|
-
`.trim();
|
|
2189
2166
|
const scaffold_svelte_modules_storybookFramework = ()=>config_file_ConfigFile.Instance.data.frontend?.svelte?.storybookFramework;
|
|
2190
2167
|
const svelteKitRouteContent = (ClassName, pageImport)=>`
|
|
2191
2168
|
<script lang="ts">
|
|
@@ -2251,7 +2228,6 @@ const scaffoldSvelteWidget = async (presentationSvelteFolder)=>{
|
|
|
2251
2228
|
].join('/');
|
|
2252
2229
|
const widgetFileName = `${fileName}-widget`;
|
|
2253
2230
|
const uiFileName = `${fileName}-widget-ui`;
|
|
2254
|
-
const uiModelFileName = `create-${fileName}-ui-model`;
|
|
2255
2231
|
if ('monolithic' === widgetType) {
|
|
2256
2232
|
folder.createFile('index.ts', `
|
|
2257
2233
|
export { default as ${ClassName}Widget } from './${widgetFileName}.svelte'
|
|
@@ -2272,17 +2248,15 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2272
2248
|
`.trim());
|
|
2273
2249
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2274
2250
|
<script lang="ts">
|
|
2275
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2251
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2276
2252
|
import ${ClassName}WidgetUI from './ui/${uiFileName}.svelte'
|
|
2277
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2278
2253
|
|
|
2279
2254
|
let props: ${ClassName}WidgetProps = $props()
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
const uiModel = create${ClassName}UIModel(props)
|
|
2255
|
+
|
|
2256
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2283
2257
|
</script>
|
|
2284
2258
|
|
|
2285
|
-
<${ClassName}WidgetUI {...
|
|
2259
|
+
<${ClassName}WidgetUI {...toUIProps()} />
|
|
2286
2260
|
`.trim());
|
|
2287
2261
|
folder.subitem([
|
|
2288
2262
|
'ui'
|
|
@@ -2296,10 +2270,7 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2296
2270
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2297
2271
|
if (framework) folder.subitem([
|
|
2298
2272
|
'ui'
|
|
2299
|
-
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle));
|
|
2300
|
-
folder.subitem([
|
|
2301
|
-
'model'
|
|
2302
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `${ClassName}WidgetProps`));
|
|
2273
|
+
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle, `${ClassName}WidgetUIProps`));
|
|
2303
2274
|
return;
|
|
2304
2275
|
}
|
|
2305
2276
|
folder.createFile('types.ts', `
|
|
@@ -2313,20 +2284,15 @@ export type ${ClassName}WidgetProps = {
|
|
|
2313
2284
|
`.trim());
|
|
2314
2285
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2315
2286
|
<script lang="ts">
|
|
2316
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2317
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2287
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2318
2288
|
|
|
2319
|
-
let { UI, ...
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
const uiModel = create${ClassName}UIModel(widgetProps)
|
|
2289
|
+
let { UI, ...rest }: ${ClassName}WidgetProps = $props()
|
|
2290
|
+
|
|
2291
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2323
2292
|
</script>
|
|
2324
2293
|
|
|
2325
|
-
<UI {...
|
|
2294
|
+
<UI {...toUIProps()} />
|
|
2326
2295
|
`.trim());
|
|
2327
|
-
folder.subitem([
|
|
2328
|
-
'model'
|
|
2329
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `Omit<${ClassName}WidgetProps, 'UI'>`));
|
|
2330
2296
|
};
|
|
2331
2297
|
const scaffoldSvelteUIKitComponent = async (presentationSvelteFolder)=>{
|
|
2332
2298
|
const name = await interaction_input({
|
|
@@ -2344,7 +2310,7 @@ export type { ${ClassName}Props } from './${fileName}.svelte'
|
|
|
2344
2310
|
`.trim());
|
|
2345
2311
|
componentFolder.createFile(`${fileName}.svelte`, svelteComponentContent(`${ClassName}Props`));
|
|
2346
2312
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2347
|
-
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`));
|
|
2313
|
+
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`, `${ClassName}Props`));
|
|
2348
2314
|
};
|
|
2349
2315
|
const scaffoldSvelteSharedModel = async (presentationSvelteFolder)=>{
|
|
2350
2316
|
const name = await interaction_input({
|
package/dist/init.cjs
CHANGED
|
@@ -902,16 +902,14 @@ const frontendLogicNaming = {
|
|
|
902
902
|
prefix: 'use',
|
|
903
903
|
shared: [
|
|
904
904
|
'hooks'
|
|
905
|
-
]
|
|
906
|
-
widgetModel: 'hooks'
|
|
905
|
+
]
|
|
907
906
|
},
|
|
908
907
|
svelte: {
|
|
909
908
|
prefix: 'create',
|
|
910
909
|
shared: [
|
|
911
910
|
'shared',
|
|
912
911
|
'model'
|
|
913
|
-
]
|
|
914
|
-
widgetModel: 'model'
|
|
912
|
+
]
|
|
915
913
|
}
|
|
916
914
|
};
|
|
917
915
|
const react_module_move_kindLayouts = (framework)=>{
|
package/dist/integration.cjs
CHANGED
|
@@ -1841,16 +1841,14 @@ const frontendLogicNaming = {
|
|
|
1841
1841
|
prefix: 'use',
|
|
1842
1842
|
shared: [
|
|
1843
1843
|
'hooks'
|
|
1844
|
-
]
|
|
1845
|
-
widgetModel: 'hooks'
|
|
1844
|
+
]
|
|
1846
1845
|
},
|
|
1847
1846
|
svelte: {
|
|
1848
1847
|
prefix: 'create',
|
|
1849
1848
|
shared: [
|
|
1850
1849
|
'shared',
|
|
1851
1850
|
'model'
|
|
1852
|
-
]
|
|
1853
|
-
widgetModel: 'model'
|
|
1851
|
+
]
|
|
1854
1852
|
}
|
|
1855
1853
|
};
|
|
1856
1854
|
const kindLayouts = (framework)=>{
|
|
@@ -2147,7 +2145,7 @@ const svelteComponentContent = (propsType)=>`
|
|
|
2147
2145
|
let props: ${propsType} = $props()
|
|
2148
2146
|
</script>
|
|
2149
2147
|
`.trim();
|
|
2150
|
-
const svelteStory = (storybookFramework, componentName, componentFile, title)=>`
|
|
2148
|
+
const svelteStory = (storybookFramework, componentName, componentFile, title, propsType)=>`
|
|
2151
2149
|
import type { Meta, StoryObj } from '${storybookFramework}'
|
|
2152
2150
|
import ${componentName} from './${componentFile}'
|
|
2153
2151
|
|
|
@@ -2161,31 +2159,10 @@ export default meta
|
|
|
2161
2159
|
type Story = StoryObj<typeof meta>
|
|
2162
2160
|
|
|
2163
2161
|
export const Default: Story = {
|
|
2162
|
+
// fill required props of ${propsType}
|
|
2164
2163
|
args: {}
|
|
2165
2164
|
}
|
|
2166
2165
|
`.trim();
|
|
2167
|
-
const svelteUIModelContent = (ClassName, propsType)=>`
|
|
2168
|
-
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from '../types'
|
|
2169
|
-
|
|
2170
|
-
/**
|
|
2171
|
-
* - widgetProps is the $props() proxy as a whole: destructuring it in the
|
|
2172
|
-
* signature (({ a }) =>) or copying it ({ ...props }) loses reactivity
|
|
2173
|
-
* - values depending on props: $derived, exposed through getters only
|
|
2174
|
-
* - local state: $state; methods: plain functions of the returned object
|
|
2175
|
-
* - getters satisfy ${ClassName}WidgetUIProps
|
|
2176
|
-
*/
|
|
2177
|
-
export const create${ClassName}UIModel = (
|
|
2178
|
-
widgetProps: ${propsType},
|
|
2179
|
-
): ${ClassName}WidgetUIProps => {
|
|
2180
|
-
// derived values go here
|
|
2181
|
-
// const value = $derived(widgetProps.value)
|
|
2182
|
-
|
|
2183
|
-
return {
|
|
2184
|
-
// expose values via getters to keep reactivity:
|
|
2185
|
-
// get value() { return value },
|
|
2186
|
-
}
|
|
2187
|
-
}
|
|
2188
|
-
`.trim();
|
|
2189
2166
|
const scaffold_svelte_modules_storybookFramework = ()=>config_file_ConfigFile.Instance.data.frontend?.svelte?.storybookFramework;
|
|
2190
2167
|
const svelteKitRouteContent = (ClassName, pageImport)=>`
|
|
2191
2168
|
<script lang="ts">
|
|
@@ -2251,7 +2228,6 @@ const scaffoldSvelteWidget = async (presentationSvelteFolder)=>{
|
|
|
2251
2228
|
].join('/');
|
|
2252
2229
|
const widgetFileName = `${fileName}-widget`;
|
|
2253
2230
|
const uiFileName = `${fileName}-widget-ui`;
|
|
2254
|
-
const uiModelFileName = `create-${fileName}-ui-model`;
|
|
2255
2231
|
if ('monolithic' === widgetType) {
|
|
2256
2232
|
folder.createFile('index.ts', `
|
|
2257
2233
|
export { default as ${ClassName}Widget } from './${widgetFileName}.svelte'
|
|
@@ -2272,17 +2248,15 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2272
2248
|
`.trim());
|
|
2273
2249
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2274
2250
|
<script lang="ts">
|
|
2275
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2251
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2276
2252
|
import ${ClassName}WidgetUI from './ui/${uiFileName}.svelte'
|
|
2277
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2278
2253
|
|
|
2279
2254
|
let props: ${ClassName}WidgetProps = $props()
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
const uiModel = create${ClassName}UIModel(props)
|
|
2255
|
+
|
|
2256
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2283
2257
|
</script>
|
|
2284
2258
|
|
|
2285
|
-
<${ClassName}WidgetUI {...
|
|
2259
|
+
<${ClassName}WidgetUI {...toUIProps()} />
|
|
2286
2260
|
`.trim());
|
|
2287
2261
|
folder.subitem([
|
|
2288
2262
|
'ui'
|
|
@@ -2296,10 +2270,7 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2296
2270
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2297
2271
|
if (framework) folder.subitem([
|
|
2298
2272
|
'ui'
|
|
2299
|
-
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle));
|
|
2300
|
-
folder.subitem([
|
|
2301
|
-
'model'
|
|
2302
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `${ClassName}WidgetProps`));
|
|
2273
|
+
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle, `${ClassName}WidgetUIProps`));
|
|
2303
2274
|
return;
|
|
2304
2275
|
}
|
|
2305
2276
|
folder.createFile('types.ts', `
|
|
@@ -2313,20 +2284,15 @@ export type ${ClassName}WidgetProps = {
|
|
|
2313
2284
|
`.trim());
|
|
2314
2285
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2315
2286
|
<script lang="ts">
|
|
2316
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2317
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2287
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2318
2288
|
|
|
2319
|
-
let { UI, ...
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
const uiModel = create${ClassName}UIModel(widgetProps)
|
|
2289
|
+
let { UI, ...rest }: ${ClassName}WidgetProps = $props()
|
|
2290
|
+
|
|
2291
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2323
2292
|
</script>
|
|
2324
2293
|
|
|
2325
|
-
<UI {...
|
|
2294
|
+
<UI {...toUIProps()} />
|
|
2326
2295
|
`.trim());
|
|
2327
|
-
folder.subitem([
|
|
2328
|
-
'model'
|
|
2329
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `Omit<${ClassName}WidgetProps, 'UI'>`));
|
|
2330
2296
|
};
|
|
2331
2297
|
const scaffoldSvelteUIKitComponent = async (presentationSvelteFolder)=>{
|
|
2332
2298
|
const name = await interaction_input({
|
|
@@ -2344,7 +2310,7 @@ export type { ${ClassName}Props } from './${fileName}.svelte'
|
|
|
2344
2310
|
`.trim());
|
|
2345
2311
|
componentFolder.createFile(`${fileName}.svelte`, svelteComponentContent(`${ClassName}Props`));
|
|
2346
2312
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2347
|
-
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`));
|
|
2313
|
+
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`, `${ClassName}Props`));
|
|
2348
2314
|
};
|
|
2349
2315
|
const scaffoldSvelteSharedModel = async (presentationSvelteFolder)=>{
|
|
2350
2316
|
const name = await interaction_input({
|
package/dist/lint.cjs
CHANGED
|
@@ -493,16 +493,14 @@ const frontendLogicNaming = {
|
|
|
493
493
|
prefix: 'use',
|
|
494
494
|
shared: [
|
|
495
495
|
'hooks'
|
|
496
|
-
]
|
|
497
|
-
widgetModel: 'hooks'
|
|
496
|
+
]
|
|
498
497
|
},
|
|
499
498
|
svelte: {
|
|
500
499
|
prefix: 'create',
|
|
501
500
|
shared: [
|
|
502
501
|
'shared',
|
|
503
502
|
'model'
|
|
504
|
-
]
|
|
505
|
-
widgetModel: 'model'
|
|
503
|
+
]
|
|
506
504
|
}
|
|
507
505
|
};
|
|
508
506
|
const kindLayouts = (framework)=>{
|
|
@@ -22,8 +22,6 @@ export declare const frontendLogicNaming: Record<FrontendFramework, {
|
|
|
22
22
|
prefix: 'use' | 'create';
|
|
23
23
|
/** Folder of shared hooks (models), under `presentation/<framework>`. */
|
|
24
24
|
shared: string[];
|
|
25
|
-
/** Folder of a widget's UI model, inside the widget. */
|
|
26
|
-
widgetModel: string;
|
|
27
25
|
}>;
|
|
28
26
|
export type ReactModule = {
|
|
29
27
|
kind: ReactModuleKind;
|
package/dist/react.cjs
CHANGED
|
@@ -1841,16 +1841,14 @@ const frontendLogicNaming = {
|
|
|
1841
1841
|
prefix: 'use',
|
|
1842
1842
|
shared: [
|
|
1843
1843
|
'hooks'
|
|
1844
|
-
]
|
|
1845
|
-
widgetModel: 'hooks'
|
|
1844
|
+
]
|
|
1846
1845
|
},
|
|
1847
1846
|
svelte: {
|
|
1848
1847
|
prefix: 'create',
|
|
1849
1848
|
shared: [
|
|
1850
1849
|
'shared',
|
|
1851
1850
|
'model'
|
|
1852
|
-
]
|
|
1853
|
-
widgetModel: 'model'
|
|
1851
|
+
]
|
|
1854
1852
|
}
|
|
1855
1853
|
};
|
|
1856
1854
|
const kindLayouts = (framework)=>{
|
|
@@ -2147,7 +2145,7 @@ const svelteComponentContent = (propsType)=>`
|
|
|
2147
2145
|
let props: ${propsType} = $props()
|
|
2148
2146
|
</script>
|
|
2149
2147
|
`.trim();
|
|
2150
|
-
const svelteStory = (storybookFramework, componentName, componentFile, title)=>`
|
|
2148
|
+
const svelteStory = (storybookFramework, componentName, componentFile, title, propsType)=>`
|
|
2151
2149
|
import type { Meta, StoryObj } from '${storybookFramework}'
|
|
2152
2150
|
import ${componentName} from './${componentFile}'
|
|
2153
2151
|
|
|
@@ -2161,31 +2159,10 @@ export default meta
|
|
|
2161
2159
|
type Story = StoryObj<typeof meta>
|
|
2162
2160
|
|
|
2163
2161
|
export const Default: Story = {
|
|
2162
|
+
// fill required props of ${propsType}
|
|
2164
2163
|
args: {}
|
|
2165
2164
|
}
|
|
2166
2165
|
`.trim();
|
|
2167
|
-
const svelteUIModelContent = (ClassName, propsType)=>`
|
|
2168
|
-
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from '../types'
|
|
2169
|
-
|
|
2170
|
-
/**
|
|
2171
|
-
* - widgetProps is the $props() proxy as a whole: destructuring it in the
|
|
2172
|
-
* signature (({ a }) =>) or copying it ({ ...props }) loses reactivity
|
|
2173
|
-
* - values depending on props: $derived, exposed through getters only
|
|
2174
|
-
* - local state: $state; methods: plain functions of the returned object
|
|
2175
|
-
* - getters satisfy ${ClassName}WidgetUIProps
|
|
2176
|
-
*/
|
|
2177
|
-
export const create${ClassName}UIModel = (
|
|
2178
|
-
widgetProps: ${propsType},
|
|
2179
|
-
): ${ClassName}WidgetUIProps => {
|
|
2180
|
-
// derived values go here
|
|
2181
|
-
// const value = $derived(widgetProps.value)
|
|
2182
|
-
|
|
2183
|
-
return {
|
|
2184
|
-
// expose values via getters to keep reactivity:
|
|
2185
|
-
// get value() { return value },
|
|
2186
|
-
}
|
|
2187
|
-
}
|
|
2188
|
-
`.trim();
|
|
2189
2166
|
const scaffold_svelte_modules_storybookFramework = ()=>config_file_ConfigFile.Instance.data.frontend?.svelte?.storybookFramework;
|
|
2190
2167
|
const svelteKitRouteContent = (ClassName, pageImport)=>`
|
|
2191
2168
|
<script lang="ts">
|
|
@@ -2251,7 +2228,6 @@ const scaffoldSvelteWidget = async (presentationSvelteFolder)=>{
|
|
|
2251
2228
|
].join('/');
|
|
2252
2229
|
const widgetFileName = `${fileName}-widget`;
|
|
2253
2230
|
const uiFileName = `${fileName}-widget-ui`;
|
|
2254
|
-
const uiModelFileName = `create-${fileName}-ui-model`;
|
|
2255
2231
|
if ('monolithic' === widgetType) {
|
|
2256
2232
|
folder.createFile('index.ts', `
|
|
2257
2233
|
export { default as ${ClassName}Widget } from './${widgetFileName}.svelte'
|
|
@@ -2272,17 +2248,15 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2272
2248
|
`.trim());
|
|
2273
2249
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2274
2250
|
<script lang="ts">
|
|
2275
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2251
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2276
2252
|
import ${ClassName}WidgetUI from './ui/${uiFileName}.svelte'
|
|
2277
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2278
2253
|
|
|
2279
2254
|
let props: ${ClassName}WidgetProps = $props()
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
const uiModel = create${ClassName}UIModel(props)
|
|
2255
|
+
|
|
2256
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2283
2257
|
</script>
|
|
2284
2258
|
|
|
2285
|
-
<${ClassName}WidgetUI {...
|
|
2259
|
+
<${ClassName}WidgetUI {...toUIProps()} />
|
|
2286
2260
|
`.trim());
|
|
2287
2261
|
folder.subitem([
|
|
2288
2262
|
'ui'
|
|
@@ -2296,10 +2270,7 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2296
2270
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2297
2271
|
if (framework) folder.subitem([
|
|
2298
2272
|
'ui'
|
|
2299
|
-
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle));
|
|
2300
|
-
folder.subitem([
|
|
2301
|
-
'model'
|
|
2302
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `${ClassName}WidgetProps`));
|
|
2273
|
+
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle, `${ClassName}WidgetUIProps`));
|
|
2303
2274
|
return;
|
|
2304
2275
|
}
|
|
2305
2276
|
folder.createFile('types.ts', `
|
|
@@ -2313,20 +2284,15 @@ export type ${ClassName}WidgetProps = {
|
|
|
2313
2284
|
`.trim());
|
|
2314
2285
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2315
2286
|
<script lang="ts">
|
|
2316
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2317
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2287
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2318
2288
|
|
|
2319
|
-
let { UI, ...
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
const uiModel = create${ClassName}UIModel(widgetProps)
|
|
2289
|
+
let { UI, ...rest }: ${ClassName}WidgetProps = $props()
|
|
2290
|
+
|
|
2291
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2323
2292
|
</script>
|
|
2324
2293
|
|
|
2325
|
-
<UI {...
|
|
2294
|
+
<UI {...toUIProps()} />
|
|
2326
2295
|
`.trim());
|
|
2327
|
-
folder.subitem([
|
|
2328
|
-
'model'
|
|
2329
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `Omit<${ClassName}WidgetProps, 'UI'>`));
|
|
2330
2296
|
};
|
|
2331
2297
|
const scaffoldSvelteUIKitComponent = async (presentationSvelteFolder)=>{
|
|
2332
2298
|
const name = await interaction_input({
|
|
@@ -2344,7 +2310,7 @@ export type { ${ClassName}Props } from './${fileName}.svelte'
|
|
|
2344
2310
|
`.trim());
|
|
2345
2311
|
componentFolder.createFile(`${fileName}.svelte`, svelteComponentContent(`${ClassName}Props`));
|
|
2346
2312
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2347
|
-
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`));
|
|
2313
|
+
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`, `${ClassName}Props`));
|
|
2348
2314
|
};
|
|
2349
2315
|
const scaffoldSvelteSharedModel = async (presentationSvelteFolder)=>{
|
|
2350
2316
|
const name = await interaction_input({
|
package/dist/svelte.cjs
CHANGED
|
@@ -1841,16 +1841,14 @@ const frontendLogicNaming = {
|
|
|
1841
1841
|
prefix: 'use',
|
|
1842
1842
|
shared: [
|
|
1843
1843
|
'hooks'
|
|
1844
|
-
]
|
|
1845
|
-
widgetModel: 'hooks'
|
|
1844
|
+
]
|
|
1846
1845
|
},
|
|
1847
1846
|
svelte: {
|
|
1848
1847
|
prefix: 'create',
|
|
1849
1848
|
shared: [
|
|
1850
1849
|
'shared',
|
|
1851
1850
|
'model'
|
|
1852
|
-
]
|
|
1853
|
-
widgetModel: 'model'
|
|
1851
|
+
]
|
|
1854
1852
|
}
|
|
1855
1853
|
};
|
|
1856
1854
|
const kindLayouts = (framework)=>{
|
|
@@ -2147,7 +2145,7 @@ const svelteComponentContent = (propsType)=>`
|
|
|
2147
2145
|
let props: ${propsType} = $props()
|
|
2148
2146
|
</script>
|
|
2149
2147
|
`.trim();
|
|
2150
|
-
const svelteStory = (storybookFramework, componentName, componentFile, title)=>`
|
|
2148
|
+
const svelteStory = (storybookFramework, componentName, componentFile, title, propsType)=>`
|
|
2151
2149
|
import type { Meta, StoryObj } from '${storybookFramework}'
|
|
2152
2150
|
import ${componentName} from './${componentFile}'
|
|
2153
2151
|
|
|
@@ -2161,31 +2159,10 @@ export default meta
|
|
|
2161
2159
|
type Story = StoryObj<typeof meta>
|
|
2162
2160
|
|
|
2163
2161
|
export const Default: Story = {
|
|
2162
|
+
// fill required props of ${propsType}
|
|
2164
2163
|
args: {}
|
|
2165
2164
|
}
|
|
2166
2165
|
`.trim();
|
|
2167
|
-
const svelteUIModelContent = (ClassName, propsType)=>`
|
|
2168
|
-
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from '../types'
|
|
2169
|
-
|
|
2170
|
-
/**
|
|
2171
|
-
* - widgetProps is the $props() proxy as a whole: destructuring it in the
|
|
2172
|
-
* signature (({ a }) =>) or copying it ({ ...props }) loses reactivity
|
|
2173
|
-
* - values depending on props: $derived, exposed through getters only
|
|
2174
|
-
* - local state: $state; methods: plain functions of the returned object
|
|
2175
|
-
* - getters satisfy ${ClassName}WidgetUIProps
|
|
2176
|
-
*/
|
|
2177
|
-
export const create${ClassName}UIModel = (
|
|
2178
|
-
widgetProps: ${propsType},
|
|
2179
|
-
): ${ClassName}WidgetUIProps => {
|
|
2180
|
-
// derived values go here
|
|
2181
|
-
// const value = $derived(widgetProps.value)
|
|
2182
|
-
|
|
2183
|
-
return {
|
|
2184
|
-
// expose values via getters to keep reactivity:
|
|
2185
|
-
// get value() { return value },
|
|
2186
|
-
}
|
|
2187
|
-
}
|
|
2188
|
-
`.trim();
|
|
2189
2166
|
const scaffold_svelte_modules_storybookFramework = ()=>config_file_ConfigFile.Instance.data.frontend?.svelte?.storybookFramework;
|
|
2190
2167
|
const svelteKitRouteContent = (ClassName, pageImport)=>`
|
|
2191
2168
|
<script lang="ts">
|
|
@@ -2251,7 +2228,6 @@ const scaffoldSvelteWidget = async (presentationSvelteFolder)=>{
|
|
|
2251
2228
|
].join('/');
|
|
2252
2229
|
const widgetFileName = `${fileName}-widget`;
|
|
2253
2230
|
const uiFileName = `${fileName}-widget-ui`;
|
|
2254
|
-
const uiModelFileName = `create-${fileName}-ui-model`;
|
|
2255
2231
|
if ('monolithic' === widgetType) {
|
|
2256
2232
|
folder.createFile('index.ts', `
|
|
2257
2233
|
export { default as ${ClassName}Widget } from './${widgetFileName}.svelte'
|
|
@@ -2272,17 +2248,15 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2272
2248
|
`.trim());
|
|
2273
2249
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2274
2250
|
<script lang="ts">
|
|
2275
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2251
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2276
2252
|
import ${ClassName}WidgetUI from './ui/${uiFileName}.svelte'
|
|
2277
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2278
2253
|
|
|
2279
2254
|
let props: ${ClassName}WidgetProps = $props()
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
const uiModel = create${ClassName}UIModel(props)
|
|
2255
|
+
|
|
2256
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2283
2257
|
</script>
|
|
2284
2258
|
|
|
2285
|
-
<${ClassName}WidgetUI {...
|
|
2259
|
+
<${ClassName}WidgetUI {...toUIProps()} />
|
|
2286
2260
|
`.trim());
|
|
2287
2261
|
folder.subitem([
|
|
2288
2262
|
'ui'
|
|
@@ -2296,10 +2270,7 @@ export type ${ClassName}WidgetUIProps = { }
|
|
|
2296
2270
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2297
2271
|
if (framework) folder.subitem([
|
|
2298
2272
|
'ui'
|
|
2299
|
-
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle));
|
|
2300
|
-
folder.subitem([
|
|
2301
|
-
'model'
|
|
2302
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `${ClassName}WidgetProps`));
|
|
2273
|
+
]).createFile(`${uiFileName}.stories.ts`, svelteStory(framework, `${ClassName}WidgetUI`, `${uiFileName}.svelte`, storyTitle, `${ClassName}WidgetUIProps`));
|
|
2303
2274
|
return;
|
|
2304
2275
|
}
|
|
2305
2276
|
folder.createFile('types.ts', `
|
|
@@ -2313,20 +2284,15 @@ export type ${ClassName}WidgetProps = {
|
|
|
2313
2284
|
`.trim());
|
|
2314
2285
|
folder.createFile(`${widgetFileName}.svelte`, `
|
|
2315
2286
|
<script lang="ts">
|
|
2316
|
-
import type { ${ClassName}WidgetProps } from './types'
|
|
2317
|
-
import { create${ClassName}UIModel } from './model/${uiModelFileName}.svelte'
|
|
2287
|
+
import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from './types'
|
|
2318
2288
|
|
|
2319
|
-
let { UI, ...
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
const uiModel = create${ClassName}UIModel(widgetProps)
|
|
2289
|
+
let { UI, ...rest }: ${ClassName}WidgetProps = $props()
|
|
2290
|
+
|
|
2291
|
+
const toUIProps = (): ${ClassName}WidgetUIProps => ({})
|
|
2323
2292
|
</script>
|
|
2324
2293
|
|
|
2325
|
-
<UI {...
|
|
2294
|
+
<UI {...toUIProps()} />
|
|
2326
2295
|
`.trim());
|
|
2327
|
-
folder.subitem([
|
|
2328
|
-
'model'
|
|
2329
|
-
]).createFile(`${uiModelFileName}.svelte.ts`, svelteUIModelContent(ClassName, `Omit<${ClassName}WidgetProps, 'UI'>`));
|
|
2330
2296
|
};
|
|
2331
2297
|
const scaffoldSvelteUIKitComponent = async (presentationSvelteFolder)=>{
|
|
2332
2298
|
const name = await interaction_input({
|
|
@@ -2344,7 +2310,7 @@ export type { ${ClassName}Props } from './${fileName}.svelte'
|
|
|
2344
2310
|
`.trim());
|
|
2345
2311
|
componentFolder.createFile(`${fileName}.svelte`, svelteComponentContent(`${ClassName}Props`));
|
|
2346
2312
|
const framework = scaffold_svelte_modules_storybookFramework();
|
|
2347
|
-
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`));
|
|
2313
|
+
if (framework) componentFolder.createFile(`${fileName}.stories.ts`, svelteStory(framework, ClassName, `${fileName}.svelte`, `UI-kit/${ClassName}`, `${ClassName}Props`));
|
|
2348
2314
|
};
|
|
2349
2315
|
const scaffoldSvelteSharedModel = async (presentationSvelteFolder)=>{
|
|
2350
2316
|
const name = await interaction_input({
|
package/dist/upgrade-svelte.d.ts
CHANGED
|
@@ -8,8 +8,15 @@ export declare const svelteSwaggerPageStep: UpgradeStep;
|
|
|
8
8
|
/** Packages of the old Svelte Swagger UI page, to replace by hand. */
|
|
9
9
|
export declare const svelteSwaggerPackagesStep: UpgradeStep;
|
|
10
10
|
/**
|
|
11
|
-
* Svelte has no hooks:
|
|
12
|
-
*
|
|
13
|
-
* `createN`, and imports follow.
|
|
11
|
+
* Svelte has no hooks: shared hooks move to `shared/model/create-*.svelte.ts`,
|
|
12
|
+
* `useN` becomes `createN`, and imports follow.
|
|
14
13
|
*/
|
|
15
14
|
export declare const svelteModelsStep: UpgradeStep;
|
|
15
|
+
/**
|
|
16
|
+
* Widgets map their props to UI props with `toUIProps`, called in the
|
|
17
|
+
* markup, so Svelte re-runs it on every change: a UI model file that only
|
|
18
|
+
* maps props moves into the widget and is deleted.
|
|
19
|
+
*/
|
|
20
|
+
export declare const svelteToUIPropsStep: UpgradeStep;
|
|
21
|
+
/** UI models with logic of their own: state, getters, other imports. */
|
|
22
|
+
export declare const svelteToUIPropsManualStep: UpgradeStep;
|
package/dist/upgrade.cjs
CHANGED
|
@@ -926,16 +926,14 @@ const frontendLogicNaming = {
|
|
|
926
926
|
prefix: 'use',
|
|
927
927
|
shared: [
|
|
928
928
|
'hooks'
|
|
929
|
-
]
|
|
930
|
-
widgetModel: 'hooks'
|
|
929
|
+
]
|
|
931
930
|
},
|
|
932
931
|
svelte: {
|
|
933
932
|
prefix: 'create',
|
|
934
933
|
shared: [
|
|
935
934
|
'shared',
|
|
936
935
|
'model'
|
|
937
|
-
]
|
|
938
|
-
widgetModel: 'model'
|
|
936
|
+
]
|
|
939
937
|
}
|
|
940
938
|
};
|
|
941
939
|
const kindLayouts = (framework)=>{
|
|
@@ -1110,21 +1108,12 @@ const legacyFunctionNames = (file)=>[
|
|
|
1110
1108
|
const legacyModels = (context)=>{
|
|
1111
1109
|
const folder = svelteFolder(context);
|
|
1112
1110
|
if (!folder) return [];
|
|
1113
|
-
const isModule = (file)=>/^use-.+\.svelte\.[jt]s$/.test(external_node_path_default().basename(file)) && !/\.(spec|test)\./.test(file);
|
|
1114
|
-
const renamed = (file)=>external_node_path_default().basename(file).replace(/^use-/, 'create-');
|
|
1115
|
-
const widgetModels = module_move_walk(external_node_path_default().join(folder, 'widgets')).filter((file)=>'hooks' === external_node_path_default().basename(external_node_path_default().dirname(file)) && /-ui-model\./.test(file) && isModule(file)).map((file)=>({
|
|
1116
|
-
from: file,
|
|
1117
|
-
to: external_node_path_default().join(external_node_path_default().dirname(external_node_path_default().dirname(file)), 'model', renamed(file))
|
|
1118
|
-
}));
|
|
1119
1111
|
const sharedFolder = external_node_path_default().join(folder, 'hooks');
|
|
1120
|
-
|
|
1112
|
+
if (!external_node_fs_default().existsSync(sharedFolder)) return [];
|
|
1113
|
+
return external_node_fs_default().readdirSync(sharedFolder).map((name)=>external_node_path_default().join(sharedFolder, name)).filter((file)=>/^use-.+\.svelte\.[jt]s$/.test(external_node_path_default().basename(file)) && !/\.(spec|test)\./.test(file)).map((file)=>({
|
|
1121
1114
|
from: file,
|
|
1122
|
-
to: external_node_path_default().join(folder, 'shared', 'model',
|
|
1123
|
-
}))
|
|
1124
|
-
return [
|
|
1125
|
-
...widgetModels,
|
|
1126
|
-
...sharedHooks
|
|
1127
|
-
].filter(({ to })=>!external_node_fs_default().existsSync(to)).map((move)=>({
|
|
1115
|
+
to: external_node_path_default().join(folder, 'shared', 'model', external_node_path_default().basename(file).replace(/^use-/, 'create-'))
|
|
1116
|
+
})).filter(({ to })=>!external_node_fs_default().existsSync(to)).map((move)=>({
|
|
1128
1117
|
...move,
|
|
1129
1118
|
names: legacyFunctionNames(move.from)
|
|
1130
1119
|
}));
|
|
@@ -1132,7 +1121,7 @@ const legacyModels = (context)=>{
|
|
|
1132
1121
|
const svelteModelsStep = {
|
|
1133
1122
|
id: 'svelte-models',
|
|
1134
1123
|
kind: 'optional',
|
|
1135
|
-
title: 'Rename Svelte hooks to models: model/create-*.svelte.ts',
|
|
1124
|
+
title: 'Rename Svelte shared hooks to shared models: shared/model/create-*.svelte.ts',
|
|
1136
1125
|
detect: (context)=>legacyModels(context).length > 0,
|
|
1137
1126
|
plan: (context)=>legacyModels(context).flatMap(({ from, to, names })=>[
|
|
1138
1127
|
`${upgrade_svelte_relative(from)} → ${upgrade_svelte_relative(to)}`,
|
|
@@ -1160,6 +1149,100 @@ const svelteModelsStep = {
|
|
|
1160
1149
|
});
|
|
1161
1150
|
}
|
|
1162
1151
|
};
|
|
1152
|
+
const withoutLineComments = (text)=>text.split('\n').filter((line)=>!/^\s*\/\//.test(line)).join('\n');
|
|
1153
|
+
const closesAtEnd = (text)=>{
|
|
1154
|
+
let depth = 0;
|
|
1155
|
+
let quote;
|
|
1156
|
+
for(let index = 0; index < text.length; index++){
|
|
1157
|
+
const char = text[index];
|
|
1158
|
+
if (quote) {
|
|
1159
|
+
if ('\\' === char) index++;
|
|
1160
|
+
else if (char === quote) quote = void 0;
|
|
1161
|
+
continue;
|
|
1162
|
+
}
|
|
1163
|
+
if ("'" === char || '"' === char || '`' === char) quote = char;
|
|
1164
|
+
else if ('{' === char) depth++;
|
|
1165
|
+
else if ('}' === char && 0 === --depth) return index === text.length - 1;
|
|
1166
|
+
}
|
|
1167
|
+
return false;
|
|
1168
|
+
};
|
|
1169
|
+
const mappedObject = (content)=>{
|
|
1170
|
+
const lines = content.replace(/\/\*[\s\S]*?\*\//g, '').split('\n');
|
|
1171
|
+
const exportAt = lines.findIndex((line)=>/^export\s/.test(line));
|
|
1172
|
+
if (exportAt < 0) return;
|
|
1173
|
+
const onlyTypeImports = lines.slice(0, exportAt).filter((line)=>line.trim() && !/^\s*\/\//.test(line)).every((line)=>/^import\s+type\s*\{[^}]*\}\s*from\s*['"]\.\.\/types['"];?\s*$/.test(line));
|
|
1174
|
+
const declaration = lines.slice(exportAt).join('\n').trim().match(/^export\s+const\s+(?:use|create)(\w+)UIModel\s*=\s*\(\s*([\w$]+)\s*(?::[^)]*)?\)\s*(?::[^=]+?)?=>\s*([\s\S]*?);?$/);
|
|
1175
|
+
if (!onlyTypeImports || !declaration) return;
|
|
1176
|
+
const [, ClassName, param, rawBody] = declaration;
|
|
1177
|
+
const body = rawBody.trim();
|
|
1178
|
+
const object = body.startsWith('(') && body.endsWith(')') ? body.slice(1, -1).trim() : body.startsWith('{') && body.endsWith('}') ? withoutLineComments(body.slice(1, -1)).trim().match(/^return\s*(\{[\s\S]*\})\s*;?$/)?.[1] : void 0;
|
|
1179
|
+
if (!object || !closesAtEnd(object)) return;
|
|
1180
|
+
if (/\b(?:get|set)\s+[\w$]+\s*\(|\$(?:state|derived|effect)\b/.test(object)) return;
|
|
1181
|
+
const ownProps = new RegExp(`(?<![\\w$.])${module_move_escapeRegExp(param)}\\.`, 'g');
|
|
1182
|
+
if (new RegExp(`(?<![\\w$])${module_move_escapeRegExp(param)}(?![\\w$])`).test(object.replace(ownProps, ''))) return;
|
|
1183
|
+
return {
|
|
1184
|
+
ClassName,
|
|
1185
|
+
object: '{}' === withoutLineComments(object).replace(/\s/g, '') ? '{}' : object,
|
|
1186
|
+
ownProps
|
|
1187
|
+
};
|
|
1188
|
+
};
|
|
1189
|
+
const inlineModel = (widget, model)=>{
|
|
1190
|
+
const mapped = mappedObject(external_node_fs_default().readFileSync(model, 'utf8'));
|
|
1191
|
+
if (!mapped) return;
|
|
1192
|
+
const { ClassName, object, ownProps } = mapped;
|
|
1193
|
+
const content = external_node_fs_default().readFileSync(widget, 'utf8');
|
|
1194
|
+
const importLine = new RegExp(`^[ \\t]*import\\s*\\{\\s*(?:use|create)${ClassName}UIModel\\s*\\}\\s*from\\s*['"]\\./(?:hooks|model)/[^'"]+['"];?[ \\t]*\\n`, 'm');
|
|
1195
|
+
const call = new RegExp(`^(?:[ \\t]*// The (?:\\$props\\(\\) proxy|rest of \\$props\\(\\)).*\\n)?(?:[ \\t]*// svelte-ignore state_referenced_locally\\n)?([ \\t]*)const\\s+uiModel\\s*=\\s*(?:use|create)${ClassName}UIModel\\(\\s*([\\w$]+)\\s*\\);?[ \\t]*\\n`, 'm');
|
|
1196
|
+
const typesImport = new RegExp(`import\\s+type\\s*\\{\\s*${ClassName}WidgetProps\\s*\\}\\s*from\\s*(['"])\\./types\\1`);
|
|
1197
|
+
const callMatch = content.match(call);
|
|
1198
|
+
if (!importLine.test(content) || !callMatch || !typesImport.test(content) || !content.includes('{...uiModel}')) return;
|
|
1199
|
+
const [, indent, argument] = callMatch;
|
|
1200
|
+
const objectLines = object.replace(ownProps, `${argument}.`).split('\n');
|
|
1201
|
+
const closingIndent = objectLines.at(-1).match(/^\s*/)[0].length;
|
|
1202
|
+
const shift = indent.length - closingIndent;
|
|
1203
|
+
const reindented = objectLines.map((line, index)=>0 === index ? line : shift >= 0 ? `${' '.repeat(shift)}${line}` : line.replace(new RegExp(`^ {0,${-shift}}`), '')).join('\n');
|
|
1204
|
+
const inlined = content.replace(importLine, '').replace(call, `${indent}const toUIProps = (): ${ClassName}WidgetUIProps => (${reindented})\n`).replace(typesImport, (_, quote)=>`import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from ${quote}./types${quote}`).replaceAll('{...uiModel}', '{...toUIProps()}');
|
|
1205
|
+
return /(?<![\w$])uiModel(?![\w$])/.test(inlined) ? void 0 : inlined;
|
|
1206
|
+
};
|
|
1207
|
+
const widgetModels = (context)=>{
|
|
1208
|
+
const folder = svelteFolder(context);
|
|
1209
|
+
if (!folder) return [];
|
|
1210
|
+
return module_move_walk(external_node_path_default().join(folder, 'widgets')).filter((file)=>[
|
|
1211
|
+
'hooks',
|
|
1212
|
+
'model'
|
|
1213
|
+
].includes(external_node_path_default().basename(external_node_path_default().dirname(file))) && /^(?:use|create)-.+-ui-model\.svelte\.[jt]s$/.test(external_node_path_default().basename(file))).map((model)=>{
|
|
1214
|
+
const widgetFolder = external_node_path_default().dirname(external_node_path_default().dirname(model));
|
|
1215
|
+
const widgetName = external_node_fs_default().readdirSync(widgetFolder).find((name)=>name.endsWith('-widget.svelte'));
|
|
1216
|
+
const widget = widgetName && external_node_path_default().join(widgetFolder, widgetName);
|
|
1217
|
+
const specifier = external_node_path_default().basename(model).replace(module_move_codeExtension, '');
|
|
1218
|
+
const usedElsewhere = module_move_walk(widgetFolder).some((file)=>file !== widget && file !== model && module_move_codeExtension.test(file) && external_node_fs_default().readFileSync(file, 'utf8').includes(specifier));
|
|
1219
|
+
return {
|
|
1220
|
+
model,
|
|
1221
|
+
widget,
|
|
1222
|
+
inlined: widget && !usedElsewhere ? inlineModel(widget, model) : void 0
|
|
1223
|
+
};
|
|
1224
|
+
});
|
|
1225
|
+
};
|
|
1226
|
+
const svelteToUIPropsStep = {
|
|
1227
|
+
id: 'svelte-to-ui-props',
|
|
1228
|
+
kind: 'optional',
|
|
1229
|
+
title: 'Map Svelte widget props with toUIProps in the widget',
|
|
1230
|
+
detect: (context)=>widgetModels(context).some(({ inlined })=>void 0 !== inlined),
|
|
1231
|
+
plan: (context)=>widgetModels(context).filter(({ inlined })=>void 0 !== inlined).map(({ model, widget })=>`${upgrade_svelte_relative(model)} → toUIProps in ${upgrade_svelte_relative(widget)}; the model file is deleted`),
|
|
1232
|
+
apply: (context)=>{
|
|
1233
|
+
for (const { model, widget, inlined } of widgetModels(context))if (void 0 !== inlined) {
|
|
1234
|
+
new file_system_File(widget).update(inlined);
|
|
1235
|
+
new file_system_File(model).delete(external_node_path_default().dirname(widget));
|
|
1236
|
+
}
|
|
1237
|
+
}
|
|
1238
|
+
};
|
|
1239
|
+
const svelteToUIPropsManualStep = {
|
|
1240
|
+
id: 'svelte-to-ui-props-manual',
|
|
1241
|
+
kind: 'manual',
|
|
1242
|
+
title: 'Move Svelte widget UI models into toUIProps by hand',
|
|
1243
|
+
detect: (context)=>widgetModels(context).some(({ inlined })=>void 0 === inlined),
|
|
1244
|
+
plan: (context)=>widgetModels(context).filter(({ inlined })=>void 0 === inlined).map(({ model, widget })=>widget ? `${upgrade_svelte_relative(model)}: move its state and methods into the <script> of ${upgrade_svelte_relative(widget)}, map props in toUIProps and render {...toUIProps()}, then delete the model` : `${upgrade_svelte_relative(model)}: no widget file next to it; map props with toUIProps in the widget`)
|
|
1245
|
+
};
|
|
1163
1246
|
const upgrade_steps_record = (value)=>'object' != typeof value || null === value || Array.isArray(value) ? {} : value;
|
|
1164
1247
|
const flatConfigSchema = external_zod_default().object({
|
|
1165
1248
|
rootFolder: external_zod_default().string().min(1),
|
|
@@ -1284,7 +1367,9 @@ const upgradeSteps = [
|
|
|
1284
1367
|
inMemoryDbWithIdStep,
|
|
1285
1368
|
svelteSwaggerPageStep,
|
|
1286
1369
|
svelteSwaggerPackagesStep,
|
|
1287
|
-
svelteModelsStep
|
|
1370
|
+
svelteModelsStep,
|
|
1371
|
+
svelteToUIPropsStep,
|
|
1372
|
+
svelteToUIPropsManualStep
|
|
1288
1373
|
];
|
|
1289
1374
|
const skillsNote = 'Update the agent skills to this version: npx df-skills';
|
|
1290
1375
|
const planUpgrade = async (config, acceptOptional = ()=>true, steps = upgradeSteps)=>{
|
package/dist/upgrade.js
CHANGED
|
@@ -266,21 +266,12 @@ const legacyFunctionNames = (file)=>[
|
|
|
266
266
|
const legacyModels = (context)=>{
|
|
267
267
|
const folder = svelteFolder(context);
|
|
268
268
|
if (!folder) return [];
|
|
269
|
-
const isModule = (file)=>/^use-.+\.svelte\.[jt]s$/.test(node_path.basename(file)) && !/\.(spec|test)\./.test(file);
|
|
270
|
-
const renamed = (file)=>node_path.basename(file).replace(/^use-/, 'create-');
|
|
271
|
-
const widgetModels = module_move_walk(node_path.join(folder, 'widgets')).filter((file)=>'hooks' === node_path.basename(node_path.dirname(file)) && /-ui-model\./.test(file) && isModule(file)).map((file)=>({
|
|
272
|
-
from: file,
|
|
273
|
-
to: node_path.join(node_path.dirname(node_path.dirname(file)), 'model', renamed(file))
|
|
274
|
-
}));
|
|
275
269
|
const sharedFolder = node_path.join(folder, 'hooks');
|
|
276
|
-
|
|
270
|
+
if (!node_fs.existsSync(sharedFolder)) return [];
|
|
271
|
+
return node_fs.readdirSync(sharedFolder).map((name)=>node_path.join(sharedFolder, name)).filter((file)=>/^use-.+\.svelte\.[jt]s$/.test(node_path.basename(file)) && !/\.(spec|test)\./.test(file)).map((file)=>({
|
|
277
272
|
from: file,
|
|
278
|
-
to: node_path.join(folder, 'shared', 'model',
|
|
279
|
-
}))
|
|
280
|
-
return [
|
|
281
|
-
...widgetModels,
|
|
282
|
-
...sharedHooks
|
|
283
|
-
].filter(({ to })=>!node_fs.existsSync(to)).map((move)=>({
|
|
273
|
+
to: node_path.join(folder, 'shared', 'model', node_path.basename(file).replace(/^use-/, 'create-'))
|
|
274
|
+
})).filter(({ to })=>!node_fs.existsSync(to)).map((move)=>({
|
|
284
275
|
...move,
|
|
285
276
|
names: legacyFunctionNames(move.from)
|
|
286
277
|
}));
|
|
@@ -288,7 +279,7 @@ const legacyModels = (context)=>{
|
|
|
288
279
|
const svelteModelsStep = {
|
|
289
280
|
id: 'svelte-models',
|
|
290
281
|
kind: 'optional',
|
|
291
|
-
title: 'Rename Svelte hooks to models: model/create-*.svelte.ts',
|
|
282
|
+
title: 'Rename Svelte shared hooks to shared models: shared/model/create-*.svelte.ts',
|
|
292
283
|
detect: (context)=>legacyModels(context).length > 0,
|
|
293
284
|
plan: (context)=>legacyModels(context).flatMap(({ from, to, names })=>[
|
|
294
285
|
`${upgrade_svelte_relative(from)} → ${upgrade_svelte_relative(to)}`,
|
|
@@ -316,6 +307,100 @@ const svelteModelsStep = {
|
|
|
316
307
|
});
|
|
317
308
|
}
|
|
318
309
|
};
|
|
310
|
+
const withoutLineComments = (text)=>text.split('\n').filter((line)=>!/^\s*\/\//.test(line)).join('\n');
|
|
311
|
+
const closesAtEnd = (text)=>{
|
|
312
|
+
let depth = 0;
|
|
313
|
+
let quote;
|
|
314
|
+
for(let index = 0; index < text.length; index++){
|
|
315
|
+
const char = text[index];
|
|
316
|
+
if (quote) {
|
|
317
|
+
if ('\\' === char) index++;
|
|
318
|
+
else if (char === quote) quote = void 0;
|
|
319
|
+
continue;
|
|
320
|
+
}
|
|
321
|
+
if ("'" === char || '"' === char || '`' === char) quote = char;
|
|
322
|
+
else if ('{' === char) depth++;
|
|
323
|
+
else if ('}' === char && 0 === --depth) return index === text.length - 1;
|
|
324
|
+
}
|
|
325
|
+
return false;
|
|
326
|
+
};
|
|
327
|
+
const mappedObject = (content)=>{
|
|
328
|
+
const lines = content.replace(/\/\*[\s\S]*?\*\//g, '').split('\n');
|
|
329
|
+
const exportAt = lines.findIndex((line)=>/^export\s/.test(line));
|
|
330
|
+
if (exportAt < 0) return;
|
|
331
|
+
const onlyTypeImports = lines.slice(0, exportAt).filter((line)=>line.trim() && !/^\s*\/\//.test(line)).every((line)=>/^import\s+type\s*\{[^}]*\}\s*from\s*['"]\.\.\/types['"];?\s*$/.test(line));
|
|
332
|
+
const declaration = lines.slice(exportAt).join('\n').trim().match(/^export\s+const\s+(?:use|create)(\w+)UIModel\s*=\s*\(\s*([\w$]+)\s*(?::[^)]*)?\)\s*(?::[^=]+?)?=>\s*([\s\S]*?);?$/);
|
|
333
|
+
if (!onlyTypeImports || !declaration) return;
|
|
334
|
+
const [, ClassName, param, rawBody] = declaration;
|
|
335
|
+
const body = rawBody.trim();
|
|
336
|
+
const object = body.startsWith('(') && body.endsWith(')') ? body.slice(1, -1).trim() : body.startsWith('{') && body.endsWith('}') ? withoutLineComments(body.slice(1, -1)).trim().match(/^return\s*(\{[\s\S]*\})\s*;?$/)?.[1] : void 0;
|
|
337
|
+
if (!object || !closesAtEnd(object)) return;
|
|
338
|
+
if (/\b(?:get|set)\s+[\w$]+\s*\(|\$(?:state|derived|effect)\b/.test(object)) return;
|
|
339
|
+
const ownProps = new RegExp(`(?<![\\w$.])${escapeRegExp(param)}\\.`, 'g');
|
|
340
|
+
if (new RegExp(`(?<![\\w$])${escapeRegExp(param)}(?![\\w$])`).test(object.replace(ownProps, ''))) return;
|
|
341
|
+
return {
|
|
342
|
+
ClassName,
|
|
343
|
+
object: '{}' === withoutLineComments(object).replace(/\s/g, '') ? '{}' : object,
|
|
344
|
+
ownProps
|
|
345
|
+
};
|
|
346
|
+
};
|
|
347
|
+
const inlineModel = (widget, model)=>{
|
|
348
|
+
const mapped = mappedObject(node_fs.readFileSync(model, 'utf8'));
|
|
349
|
+
if (!mapped) return;
|
|
350
|
+
const { ClassName, object, ownProps } = mapped;
|
|
351
|
+
const content = node_fs.readFileSync(widget, 'utf8');
|
|
352
|
+
const importLine = new RegExp(`^[ \\t]*import\\s*\\{\\s*(?:use|create)${ClassName}UIModel\\s*\\}\\s*from\\s*['"]\\./(?:hooks|model)/[^'"]+['"];?[ \\t]*\\n`, 'm');
|
|
353
|
+
const call = new RegExp(`^(?:[ \\t]*// The (?:\\$props\\(\\) proxy|rest of \\$props\\(\\)).*\\n)?(?:[ \\t]*// svelte-ignore state_referenced_locally\\n)?([ \\t]*)const\\s+uiModel\\s*=\\s*(?:use|create)${ClassName}UIModel\\(\\s*([\\w$]+)\\s*\\);?[ \\t]*\\n`, 'm');
|
|
354
|
+
const typesImport = new RegExp(`import\\s+type\\s*\\{\\s*${ClassName}WidgetProps\\s*\\}\\s*from\\s*(['"])\\./types\\1`);
|
|
355
|
+
const callMatch = content.match(call);
|
|
356
|
+
if (!importLine.test(content) || !callMatch || !typesImport.test(content) || !content.includes('{...uiModel}')) return;
|
|
357
|
+
const [, indent, argument] = callMatch;
|
|
358
|
+
const objectLines = object.replace(ownProps, `${argument}.`).split('\n');
|
|
359
|
+
const closingIndent = objectLines.at(-1).match(/^\s*/)[0].length;
|
|
360
|
+
const shift = indent.length - closingIndent;
|
|
361
|
+
const reindented = objectLines.map((line, index)=>0 === index ? line : shift >= 0 ? `${' '.repeat(shift)}${line}` : line.replace(new RegExp(`^ {0,${-shift}}`), '')).join('\n');
|
|
362
|
+
const inlined = content.replace(importLine, '').replace(call, `${indent}const toUIProps = (): ${ClassName}WidgetUIProps => (${reindented})\n`).replace(typesImport, (_, quote)=>`import type { ${ClassName}WidgetProps, ${ClassName}WidgetUIProps } from ${quote}./types${quote}`).replaceAll('{...uiModel}', '{...toUIProps()}');
|
|
363
|
+
return /(?<![\w$])uiModel(?![\w$])/.test(inlined) ? void 0 : inlined;
|
|
364
|
+
};
|
|
365
|
+
const widgetModels = (context)=>{
|
|
366
|
+
const folder = svelteFolder(context);
|
|
367
|
+
if (!folder) return [];
|
|
368
|
+
return module_move_walk(node_path.join(folder, 'widgets')).filter((file)=>[
|
|
369
|
+
'hooks',
|
|
370
|
+
'model'
|
|
371
|
+
].includes(node_path.basename(node_path.dirname(file))) && /^(?:use|create)-.+-ui-model\.svelte\.[jt]s$/.test(node_path.basename(file))).map((model)=>{
|
|
372
|
+
const widgetFolder = node_path.dirname(node_path.dirname(model));
|
|
373
|
+
const widgetName = node_fs.readdirSync(widgetFolder).find((name)=>name.endsWith('-widget.svelte'));
|
|
374
|
+
const widget = widgetName && node_path.join(widgetFolder, widgetName);
|
|
375
|
+
const specifier = node_path.basename(model).replace(codeExtension, '');
|
|
376
|
+
const usedElsewhere = module_move_walk(widgetFolder).some((file)=>file !== widget && file !== model && codeExtension.test(file) && node_fs.readFileSync(file, 'utf8').includes(specifier));
|
|
377
|
+
return {
|
|
378
|
+
model,
|
|
379
|
+
widget,
|
|
380
|
+
inlined: widget && !usedElsewhere ? inlineModel(widget, model) : void 0
|
|
381
|
+
};
|
|
382
|
+
});
|
|
383
|
+
};
|
|
384
|
+
const svelteToUIPropsStep = {
|
|
385
|
+
id: 'svelte-to-ui-props',
|
|
386
|
+
kind: 'optional',
|
|
387
|
+
title: 'Map Svelte widget props with toUIProps in the widget',
|
|
388
|
+
detect: (context)=>widgetModels(context).some(({ inlined })=>void 0 !== inlined),
|
|
389
|
+
plan: (context)=>widgetModels(context).filter(({ inlined })=>void 0 !== inlined).map(({ model, widget })=>`${upgrade_svelte_relative(model)} → toUIProps in ${upgrade_svelte_relative(widget)}; the model file is deleted`),
|
|
390
|
+
apply: (context)=>{
|
|
391
|
+
for (const { model, widget, inlined } of widgetModels(context))if (void 0 !== inlined) {
|
|
392
|
+
new File(widget).update(inlined);
|
|
393
|
+
new File(model).delete(node_path.dirname(widget));
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
};
|
|
397
|
+
const svelteToUIPropsManualStep = {
|
|
398
|
+
id: 'svelte-to-ui-props-manual',
|
|
399
|
+
kind: 'manual',
|
|
400
|
+
title: 'Move Svelte widget UI models into toUIProps by hand',
|
|
401
|
+
detect: (context)=>widgetModels(context).some(({ inlined })=>void 0 === inlined),
|
|
402
|
+
plan: (context)=>widgetModels(context).filter(({ inlined })=>void 0 === inlined).map(({ model, widget })=>widget ? `${upgrade_svelte_relative(model)}: move its state and methods into the <script> of ${upgrade_svelte_relative(widget)}, map props in toUIProps and render {...toUIProps()}, then delete the model` : `${upgrade_svelte_relative(model)}: no widget file next to it; map props with toUIProps in the widget`)
|
|
403
|
+
};
|
|
319
404
|
const upgrade_steps_record = (value)=>'object' != typeof value || null === value || Array.isArray(value) ? {} : value;
|
|
320
405
|
const flatConfigSchema = zod.object({
|
|
321
406
|
rootFolder: zod.string().min(1),
|
|
@@ -440,7 +525,9 @@ const upgradeSteps = [
|
|
|
440
525
|
inMemoryDbWithIdStep,
|
|
441
526
|
svelteSwaggerPageStep,
|
|
442
527
|
svelteSwaggerPackagesStep,
|
|
443
|
-
svelteModelsStep
|
|
528
|
+
svelteModelsStep,
|
|
529
|
+
svelteToUIPropsStep,
|
|
530
|
+
svelteToUIPropsManualStep
|
|
444
531
|
];
|
|
445
532
|
const skillsNote = 'Update the agent skills to this version: npx df-skills';
|
|
446
533
|
const planUpgrade = async (config, acceptOptional = ()=>true, steps = upgradeSteps)=>{
|
|
@@ -5,10 +5,6 @@ import { NestedName } from '../nested-name';
|
|
|
5
5
|
* script, so importers can use it as with `export type` in React.
|
|
6
6
|
*/
|
|
7
7
|
export declare const svelteComponentContent: (propsType: string) => string;
|
|
8
|
-
/**
|
|
9
|
-
* The UI model of a widget: props → UI props, reactive through getters.
|
|
10
|
-
*/
|
|
11
|
-
export declare const svelteUIModelContent: (ClassName: string, propsType: string) => string;
|
|
12
8
|
/** A thin SvelteKit route that renders the page component. */
|
|
13
9
|
export declare const svelteKitRouteContent: (ClassName: string, pageImport: string) => string;
|
|
14
10
|
/**
|
package/package.json
CHANGED
|
@@ -40,7 +40,7 @@ Every new file is created by `df-scaffold` (React modules: `df-react`; Svelte mo
|
|
|
40
40
|
| --- | --- | --- | --- |
|
|
41
41
|
| 1 | Missing spec | `<component>.spec.ts` next to the component | Exactly from "Spec templates" in `references/generators.md`. |
|
|
42
42
|
| 2 | Output of project tools | where the tool puts it | Migrations, codegen: run the project's script, use its output as-is; never hand-write or edit it. No approval needed for these files. |
|
|
43
|
-
| 3 | Widget hooks / UI | `…/presentation/react/widgets/<name>/hooks/**`, `ui/**` (Svelte: `…/presentation/svelte/widgets/<name>/
|
|
43
|
+
| 3 | Widget hooks / UI | `…/presentation/react/widgets/<name>/hooks/**`, `ui/**` (Svelte: `…/presentation/svelte/widgets/<name>/ui/**`; logic stays in the widget's `toUIProps`) | Widget generated by df-react or df-svelte. |
|
|
44
44
|
| 4 | Widget/page/UI-kit support files | inside the widget folder or `ui-kit/<name>/`: styles, assets, `*.test.tsx`, `*.stories.tsx`; next to a page: `pages/<name>-page.module.css`, for a nested page in its folder (`pages/admin/admin-users-page.module.css`) (layout of its widgets only) | Widget/page/UI-kit component generated by df-react. Details and story templates: `df-ps-react`. |
|
|
45
45
|
| 5 | App bootstrap and config | outside `<rootFolder>/{bounded-contexts,shared-kernel,presentation}/`: entry point, HTTP server setup registering `restHandlers`, tool configs | Bootstrapping only. Domain/application/infrastructure logic never goes there. |
|
|
46
46
|
|
|
@@ -33,7 +33,7 @@ Moving, renaming and deleting go through df-svelte, never by hand, with an appro
|
|
|
33
33
|
|
|
34
34
|
Only these (`df-ps-scaffold`, rule 2, exceptions 3–4), for modules generated by df-svelte:
|
|
35
35
|
|
|
36
|
-
- Widget
|
|
36
|
+
- Widget UI parts: `…/svelte/widgets/<name>/ui/**`. A widget's own logic stays in its `<script>` (`toUIProps`); no model files next to it.
|
|
37
37
|
- Support files inside the widget folder or `ui-kit/<name>/`: styles, assets, `*.test.ts`, `*.stories.ts`. A missing UI-kit or widget UI story: exactly from "Story templates" in `references/generators.md`.
|
|
38
38
|
- A page stays one `.svelte` file that composes widgets; its `<style>` block lays out its widgets only. Its own state, UI parts or types mean a widget is missing, so generate it.
|
|
39
39
|
- SvelteKit route files next to a generated route (`+page.ts`, `+layout.svelte`, `+error.svelte`) for loading and layout; the route's `+page.svelte` only renders the page component.
|
|
@@ -41,14 +41,14 @@ Only these (`df-ps-scaffold`, rule 2, exceptions 3–4), for modules generated b
|
|
|
41
41
|
## Implementing
|
|
42
42
|
|
|
43
43
|
- Svelte 5 with runes: props through `$props()`, state through `$state`, derived values through `$derived`. Each component exports its props type from `<script lang="ts" module>`.
|
|
44
|
-
- Separated UI widget:
|
|
45
|
-
-
|
|
46
|
-
-
|
|
47
|
-
-
|
|
48
|
-
-
|
|
49
|
-
- Headless: the same
|
|
44
|
+
- Separated UI widget: props → UI props in `toUIProps` of `n-widget.svelte`, rendered as `<NWidgetUI {...toUIProps()} />`; `ui/` stays presentational. Keep it reactive:
|
|
45
|
+
- call `toUIProps()` in the markup only; `const ui = toUIProps()` in `<script>` reads the values once (`state_referenced_locally` warns);
|
|
46
|
+
- local state (`$state`), methods, `$effect`, `getContext`, `createQuery` are declared in the widget's `<script>`; `toUIProps` only returns them: `({ title: props.title, open, toggle })`;
|
|
47
|
+
- heavy computations go to `$derived`: `toUIProps` rebuilds the whole object on any change;
|
|
48
|
+
- no getters, `svelte-ignore` or model files are needed.
|
|
49
|
+
- Headless: the same `toUIProps`, reading `rest` of `let { UI, ...rest } = $props()` (it stays reactive); the consumer passes `UI` (a `Component<UIProps>`).
|
|
50
50
|
- UI-kit components and shared models (`…/svelte/shared/model/create-<name>.svelte.ts`, `create<Name>`): the same limits as in `df-ps-react` — driven only by props or arguments; no API client, no data loading, no imports from widgets, pages or contexts.
|
|
51
|
-
- Stories (`frontend.svelte.storybookFramework`): fill `args` of `Default` with valid props and add one story per meaningful state. Keep `meta`, the file name and the title (`UI-kit/N` or `Widgets/N`).
|
|
51
|
+
- Stories (`frontend.svelte.storybookFramework`): fill `args` of `Default` with valid props (the generated `// fill required props of …` marks the place; svelte-check fails on empty `args` once a prop is required) and add one story per meaningful state. Keep `meta`, the file name and the title (`UI-kit/N` or `Widgets/N`).
|
|
52
52
|
- Talking to the backend: as in `df-ps-react` ("Talking to the backend") — a generated API client first (Orval's Svelte Query `createQuery`/`createMutation` in `<rootFolder>/presentation/svelte/data-layer/orval`, or its typed client in `<rootFolder>/presentation/data-layer`; queries need `QueryProvider` from `…/svelte/data-layer/query-provider.svelte` above them, which SvelteKit's root `+layout.svelte` provides), `import type` of endpoint contracts only without one. SvelteKit `+page.ts`/`+page.server.ts` loads call the client, not bounded contexts.
|
|
53
53
|
|
|
54
54
|
`npx df-lint` (check `svelte`) reports a widget importing another widget, UI-kit importing widgets, pages or contexts, shared models importing UI-kit, widgets, pages or contexts, and Svelte importing contexts beyond the contract types. Fix every finding.
|
|
@@ -12,8 +12,8 @@ Notation: `…/svelte/` = `<rootFolder>/presentation/svelte/`. `n` = the entered
|
|
|
12
12
|
|
|
13
13
|
`…/svelte/widgets/n/`:
|
|
14
14
|
|
|
15
|
-
- `with separated ui` (default): `n-widget.svelte`, `types.ts`, `ui/n-widget-ui.svelte
|
|
16
|
-
- `headless`: `n-widget.svelte` (renders `<UI {...
|
|
15
|
+
- `with separated ui` (default): `n-widget.svelte`, `types.ts`, `ui/n-widget-ui.svelte`; the widget declares `const toUIProps = (): NWidgetUIProps => ({})` and renders `<NWidgetUI {...toUIProps()} />`; with `storybookFramework`: `ui/n-widget-ui.stories.ts` (CSF3: `title: 'Widgets/N'`, `component: NWidgetUI`, story `Default` with `// fill required props of NWidgetUIProps` above `args: {}`)
|
|
16
|
+
- `headless`: `n-widget.svelte` (`let { UI, ...rest } = $props()`, renders `<UI {...toUIProps()} />`), `types.ts` (props include `UI: Component<NWidgetUIProps>`)
|
|
17
17
|
- `monolithic`: `n-widget.svelte` (`NWidgetProps`)
|
|
18
18
|
- every type: `index.ts` (`export { default as NWidget } from './n-widget.svelte'` and the props type)
|
|
19
19
|
|
|
@@ -29,7 +29,7 @@ Operation `shared-model`: `…/svelte/shared/model/create-n.svelte.ts` (`const c
|
|
|
29
29
|
|
|
30
30
|
## Move, rename, delete
|
|
31
31
|
|
|
32
|
-
As in df-react: files, `<Name>Page` / `<Name>Widget…` /
|
|
32
|
+
As in df-react: files, `<Name>Page` / `<Name>Widget…` / `<Name>` / `create<Name>`, story titles and every import (with or without the `.svelte` extension, relative or through `tsconfig` aliases) follow a move; a delete is refused while other files import the module. With SvelteKit, the page's own route folder files move or are deleted too when confirmed.
|
|
33
33
|
|
|
34
34
|
## Story templates
|
|
35
35
|
|
|
@@ -51,6 +51,7 @@ export default meta;
|
|
|
51
51
|
type Story = StoryObj<typeof meta>;
|
|
52
52
|
|
|
53
53
|
export const Default: Story = {
|
|
54
|
+
// fill required props of NProps
|
|
54
55
|
args: {},
|
|
55
56
|
};
|
|
56
57
|
```
|