@domain-first/project-structure 8.10.1 → 8.12.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 +17 -7
- package/dist/287.js +406 -788
- package/dist/364.js +79 -0
- package/dist/38.js +31 -14
- package/dist/561.js +179 -96
- package/dist/783.js +1147 -0
- package/dist/{201.js → 878.js} +465 -2
- package/dist/agent-cli.d.ts +17 -6
- package/dist/agent-requests.d.ts +82 -8
- package/dist/config-file.d.ts +25 -1
- package/dist/frontend-cli.d.ts +3 -0
- package/dist/frontend-modules.d.ts +14 -0
- package/dist/graph.cjs +125 -5
- package/dist/graph.js +1 -1
- package/dist/index.cjs +3545 -2930
- package/dist/index.js +1 -1
- package/dist/init.cjs +368 -83
- package/dist/init.js +1 -1
- package/dist/integration.cjs +3545 -2930
- package/dist/integration.js +1 -1
- package/dist/integrations/openapi.d.ts +19 -2
- package/dist/integrations/orval.d.ts +31 -4
- package/dist/integrations/rest-endpoint-generator.d.ts +11 -7
- package/dist/integrations/storybook.d.ts +19 -1
- package/dist/lint.cjs +159 -22
- package/dist/lint.js +2 -2
- package/dist/page-router.d.ts +18 -0
- package/dist/react-module-move.d.ts +47 -14
- package/dist/react.cjs +1645 -999
- package/dist/react.js +2 -102
- package/dist/rest-adapters.d.ts +13 -0
- package/dist/svelte-agent-cli.spec.d.ts +1 -0
- package/dist/svelte.cjs +7373 -0
- package/dist/svelte.d.ts +2 -0
- package/dist/svelte.js +3 -0
- package/dist/sveltekit-app.d.ts +7 -0
- package/dist/upgrade-steps.d.ts +6 -1
- package/dist/upgrade-svelte.d.ts +15 -0
- package/dist/upgrade-svelte.spec.d.ts +1 -0
- package/dist/upgrade.cjs +307 -42
- package/dist/upgrade.js +132 -13
- package/dist/use-cases/add-integration.d.ts +1 -1
- package/dist/use-cases/delete-react-module.d.ts +4 -4
- package/dist/use-cases/index.d.ts +1 -0
- package/dist/use-cases/move-react-module.d.ts +2 -2
- package/dist/use-cases/rest-endpoint-generator.d.ts +6 -4
- package/dist/use-cases/scaffold-svelte-modules.d.ts +27 -0
- package/package.json +2 -1
- package/skills/df-ps-implement/SKILL.md +3 -3
- package/skills/df-ps-plan-feature/SKILL.md +1 -1
- package/skills/df-ps-scaffold/SKILL.md +9 -8
- package/skills/df-ps-scaffold/references/agent-mode.md +1 -1
- package/skills/df-ps-scaffold/references/agent-operations.md +8 -4
- package/skills/df-ps-scaffold/references/generators.md +1 -1
- package/skills/df-ps-scaffold/references/work-plan.md +1 -1
- package/skills/df-ps-svelte/SKILL.md +54 -0
- package/skills/df-ps-svelte/references/generators.md +56 -0
- package/dist/115.js +0 -615
package/dist/364.js
ADDED
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { parseArgs } from "node:util";
|
|
2
|
+
import { select as prompts_select } from "@inquirer/prompts";
|
|
3
|
+
import { frontendOperations, frontendMenu, runCLI } from "./561.js";
|
|
4
|
+
import { outdatedConfigMessage, ProjectRoot, ConfigFile, Folder } from "./878.js";
|
|
5
|
+
import { savePendingChanges } from "./287.js";
|
|
6
|
+
const texts = {
|
|
7
|
+
react: {
|
|
8
|
+
command: 'df-react',
|
|
9
|
+
help: `Usage: df-react
|
|
10
|
+
|
|
11
|
+
Scaffolds React modules of a Domain-First project: pages, widgets, UI-kit
|
|
12
|
+
components and shared hooks, and moves or renames pages and widgets.
|
|
13
|
+
Needs frontend.react in domain-first.project-structure.config.json.`,
|
|
14
|
+
notConfigured: 'React is not configured: run df-init --section frontend or add Storybook with df-integration.'
|
|
15
|
+
},
|
|
16
|
+
svelte: {
|
|
17
|
+
command: 'df-svelte',
|
|
18
|
+
help: `Usage: df-svelte
|
|
19
|
+
|
|
20
|
+
Scaffolds Svelte 5 modules of a Domain-First project: pages, widgets, UI-kit
|
|
21
|
+
components and shared models (create… in .svelte.ts), and moves, renames or deletes
|
|
22
|
+
them. With SvelteKit, pages get their routes in src/routes.
|
|
23
|
+
Needs frontend.svelte in domain-first.project-structure.config.json.`,
|
|
24
|
+
notConfigured: 'Svelte is not configured: run df-init --section frontend.'
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const runFrontendCLI = (framework)=>{
|
|
28
|
+
const { command, help, notConfigured } = texts[framework];
|
|
29
|
+
return runCLI(command, async ()=>{
|
|
30
|
+
const { values } = parseArgs({
|
|
31
|
+
options: {
|
|
32
|
+
help: {
|
|
33
|
+
type: 'boolean',
|
|
34
|
+
short: 'h',
|
|
35
|
+
default: false
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
if (values.help) {
|
|
40
|
+
console.log(`${help}
|
|
41
|
+
|
|
42
|
+
Options:
|
|
43
|
+
--request <json|-> execute an operation without prompts; - reads stdin
|
|
44
|
+
--describe output request schema and project IDs as JSON
|
|
45
|
+
-h, --help show this help`);
|
|
46
|
+
process.exit(0);
|
|
47
|
+
}
|
|
48
|
+
if (!ConfigFile.exists) {
|
|
49
|
+
console.log('No domain-first.project-structure.config.json found: run df-init first to initialize the project.');
|
|
50
|
+
process.exit(1);
|
|
51
|
+
}
|
|
52
|
+
if (ConfigFile.outdated) {
|
|
53
|
+
console.log(outdatedConfigMessage);
|
|
54
|
+
process.exit(1);
|
|
55
|
+
}
|
|
56
|
+
if (!ConfigFile.Instance.data.frontend?.[framework]) {
|
|
57
|
+
console.log(notConfigured);
|
|
58
|
+
process.exit(1);
|
|
59
|
+
}
|
|
60
|
+
const folder = new Folder(new ProjectRoot().path).subitem([
|
|
61
|
+
ConfigFile.Instance.data.project.rootFolder,
|
|
62
|
+
'presentation',
|
|
63
|
+
framework
|
|
64
|
+
]);
|
|
65
|
+
const operation = await prompts_select({
|
|
66
|
+
message: 'Module: ',
|
|
67
|
+
choices: frontendMenu(framework).map(([name, value])=>({
|
|
68
|
+
name,
|
|
69
|
+
value
|
|
70
|
+
}))
|
|
71
|
+
});
|
|
72
|
+
await frontendOperations(folder, framework)[operation]();
|
|
73
|
+
await savePendingChanges();
|
|
74
|
+
}).catch((error)=>{
|
|
75
|
+
console.error(error);
|
|
76
|
+
process.exitCode = 1;
|
|
77
|
+
});
|
|
78
|
+
};
|
|
79
|
+
export { runFrontendCLI };
|
package/dist/38.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import node_fs from "node:fs";
|
|
2
2
|
import node_path from "node:path";
|
|
3
|
-
import { defaultDependencyRules, fileModuleKind,
|
|
3
|
+
import { defaultDependencyRules, fileModuleKind, canDependOn, findWiredModules, splitContextSegments, frontendLogicNaming, readWiredModule, wiredDependencyNames, boundedContextNames, namedImportFiles, moduleKindOf, isCrossContextImplementation, boundedContextPath, crossContextImportAllowed, compilerOption } from "./878.js";
|
|
4
4
|
const readAliases = (projectRoot)=>{
|
|
5
5
|
const tsconfig = node_path.join(projectRoot, 'tsconfig.json');
|
|
6
6
|
const paths = compilerOption(tsconfig, 'paths');
|
|
@@ -31,7 +31,7 @@ const sourceFiles = (folder)=>{
|
|
|
31
31
|
}).flatMap((entry)=>{
|
|
32
32
|
const entryPath = node_path.join(folder, entry.name);
|
|
33
33
|
if (entry.isDirectory()) return 'node_modules' === entry.name ? [] : sourceFiles(entryPath);
|
|
34
|
-
return /\.(c|m)?tsx
|
|
34
|
+
return /\.((c|m)?tsx?|svelte)$/.test(entry.name) && !entry.name.endsWith('.d.ts') ? [
|
|
35
35
|
entryPath
|
|
36
36
|
] : [];
|
|
37
37
|
});
|
|
@@ -97,10 +97,23 @@ const importViolations = (projectRoot, rootFolder, rules)=>{
|
|
|
97
97
|
const root = node_path.resolve(projectRoot, rootFolder);
|
|
98
98
|
const contextsFolder = node_path.join(root, 'bounded-contexts');
|
|
99
99
|
const sharedFolder = node_path.join(root, 'shared-kernel');
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
100
|
+
const frontends = [
|
|
101
|
+
'react',
|
|
102
|
+
'svelte'
|
|
103
|
+
].map((framework)=>{
|
|
104
|
+
const folder = node_path.join(root, 'presentation', framework);
|
|
105
|
+
return {
|
|
106
|
+
check: framework,
|
|
107
|
+
label: `presentation/${framework}`,
|
|
108
|
+
folder,
|
|
109
|
+
uiKit: node_path.join(folder, 'ui-kit'),
|
|
110
|
+
widgets: node_path.join(folder, 'widgets'),
|
|
111
|
+
hooks: node_path.join(folder, ...frontendLogicNaming[framework].shared),
|
|
112
|
+
hooksLabel: 'svelte' === framework ? "[presentation/svelte/shared/model] a shared model imports a bounded context, UI-kit, widget or page:" : "[presentation/react/hooks] a shared hook imports a bounded context, UI-kit, widget or page:",
|
|
113
|
+
widgetFile: 'svelte' === framework ? '-widget.svelte' : '-widget.tsx'
|
|
114
|
+
};
|
|
115
|
+
});
|
|
116
|
+
const frontendOf = (file)=>frontends.find((frontend)=>inside(frontend.folder, file));
|
|
104
117
|
const inMemoryDbFile = node_path.join(sharedFolder, 'infrastructure', 'services', 'in-memory-db-infrastructure-service.ts');
|
|
105
118
|
const aliases = readAliases(projectRoot);
|
|
106
119
|
const violations = [];
|
|
@@ -130,16 +143,18 @@ const importViolations = (projectRoot, rootFolder, rules)=>{
|
|
|
130
143
|
].includes(part) && !/-repository(\.tsx?)?$/.test(node_path.basename(target));
|
|
131
144
|
const widgetFolders = new Map();
|
|
132
145
|
const isWidgetFolder = (folder)=>{
|
|
133
|
-
if (!widgetFolders.has(folder)) widgetFolders.set(folder, node_fs.existsSync(folder) && node_fs.statSync(folder).isDirectory() && node_fs.readdirSync(folder).some((name)=>name.endsWith(
|
|
146
|
+
if (!widgetFolders.has(folder)) widgetFolders.set(folder, node_fs.existsSync(folder) && node_fs.statSync(folder).isDirectory() && node_fs.readdirSync(folder).some((name)=>frontends.some(({ widgetFile })=>name.endsWith(widgetFile))));
|
|
134
147
|
return widgetFolders.get(folder);
|
|
135
148
|
};
|
|
136
149
|
const widgetOf = (file)=>{
|
|
150
|
+
const widgetsFolder = frontendOf(file)?.widgets;
|
|
151
|
+
if (!widgetsFolder) return;
|
|
137
152
|
for(let folder = file; inside(widgetsFolder, folder); folder = node_path.dirname(folder))if (isWidgetFolder(folder)) return folder;
|
|
138
153
|
};
|
|
139
154
|
const files = [
|
|
140
155
|
contextsFolder,
|
|
141
156
|
sharedFolder,
|
|
142
|
-
|
|
157
|
+
...frontends.map(({ folder })=>folder)
|
|
143
158
|
].flatMap(sourceFiles);
|
|
144
159
|
for (const file of files){
|
|
145
160
|
const source = node_fs.readFileSync(file, 'utf8');
|
|
@@ -153,6 +168,7 @@ const importViolations = (projectRoot, rootFolder, rules)=>{
|
|
|
153
168
|
text: node_path.basename(file)
|
|
154
169
|
});
|
|
155
170
|
const ownContext = contextOf(file);
|
|
171
|
+
const frontend = frontendOf(file);
|
|
156
172
|
const directWiring = ownContext && from?.segments[0] === 'wiring' && readWiredModule(file, boundedContextPath(contextsFolder, ownContext))?.implementations.some((implementation)=>isCrossContextImplementation(implementation.file));
|
|
157
173
|
const report = (check, rule, imported)=>violations.push({
|
|
158
174
|
check,
|
|
@@ -172,9 +188,10 @@ const importViolations = (projectRoot, rootFolder, rules)=>{
|
|
|
172
188
|
} else if (inside(sharedFolder, file)) {
|
|
173
189
|
const allowed = !to || 'shared-kernel' === to.owner || 'domain' === to.segments[0] && 'errors' === to.segments[1] || file === inMemoryDbFile && isDomainModel(to.segments, target);
|
|
174
190
|
if (!allowed) report('shared-kernel', '[shared-kernel] imports a bounded context outside its domain/errors (and domain models for the in-memory DB):', imported);
|
|
175
|
-
} else if (inside(
|
|
176
|
-
const [area] = inside(
|
|
177
|
-
const
|
|
191
|
+
} else if (frontend && (inside(frontend.uiKit, file) || inside(frontend.hooks, file))) {
|
|
192
|
+
const [area] = inside(frontend.folder, target) ?? [];
|
|
193
|
+
const inUiKit = inside(frontend.uiKit, file);
|
|
194
|
+
const forbidden = inUiKit ? [
|
|
178
195
|
'widgets',
|
|
179
196
|
'pages'
|
|
180
197
|
] : [
|
|
@@ -182,11 +199,11 @@ const importViolations = (projectRoot, rootFolder, rules)=>{
|
|
|
182
199
|
'widgets',
|
|
183
200
|
'pages'
|
|
184
201
|
];
|
|
185
|
-
if (targetContext || forbidden.includes(area)) report(
|
|
186
|
-
} else if (targetContext && !(imported.typeOnly && to?.segments[0] === 'presentation' && 'rest' === to.segments[1])) report(
|
|
202
|
+
if (targetContext || forbidden.includes(area)) report(frontend.check, inUiKit ? `[${frontend.label}/ui-kit] imports a bounded context, widget or page:` : frontend.hooksLabel, imported);
|
|
203
|
+
} else if (frontend && targetContext && !(imported.typeOnly && to?.segments[0] === 'presentation' && 'rest' === to.segments[1])) report(frontend.check, `[${frontend.label}] imports a context other than \`import type\` from presentation/rest:`, imported);
|
|
187
204
|
const ownWidget = widgetOf(file);
|
|
188
205
|
const targetWidget = widgetOf(target);
|
|
189
|
-
if (ownWidget && targetWidget && targetWidget !== ownWidget) report(
|
|
206
|
+
if (frontend && ownWidget && targetWidget && targetWidget !== ownWidget) report(frontend.check, `[${frontend.label}/widgets] a widget imports another widget:`, imported);
|
|
190
207
|
if (!from || !to) continue;
|
|
191
208
|
if (crossContextAllowed) continue;
|
|
192
209
|
if (isSpec(file)) continue;
|
package/dist/561.js
CHANGED
|
@@ -2,9 +2,9 @@ import node_fs from "node:fs";
|
|
|
2
2
|
import node_path from "node:path";
|
|
3
3
|
import { parseArgs } from "node:util";
|
|
4
4
|
import zod from "zod";
|
|
5
|
-
import { implementationLabelSchema, availableDependencies, discardPendingChanges,
|
|
6
|
-
import { scaffoldNewHandlersRestEndpoint, addIntegration, findContracts, helperImplementationTypes, scaffoldNewAggregateUseCase, scaffoldNewInfrastructureService,
|
|
7
|
-
import { restControllers } from "./
|
|
5
|
+
import { implementationLabelSchema, availableDependencies, discardPendingChanges, frontendKindTitles, filesToOverwrite, ConfigFile, Folder, findWiredModules, implementationKinds, ProjectRoot, pendingChanges, findReactModules, hasNeighboringBoundedContext, boundedContextNames } from "./878.js";
|
|
6
|
+
import { scaffoldNewHandlersRestEndpoint, addIntegration, findContracts, helperImplementationTypes, scaffoldReactUIKitComponent, scaffoldNewAggregateUseCase, scaffoldNewInfrastructureService, scaffoldNewCommand, scaffoldNewQuery, moveBackendUnitUseCase, scaffoldReactSharedHook, moveReactModuleUseCase, deleteBackendUnitUseCase, integrationIds, scaffoldNewApplicationService, frameworkTitles, savedImplementations, deleteReactModuleUseCase, scaffoldNewImplementation, rootControllerChoice, moduleId, scaffoldNewDomainService, scaffoldReactWidget, scaffoldNewErrorUseCase, findRestEndpointGenerator, savePendingChanges, unitId, systemImplementationChoices, scaffoldNewPresentationService, scaffoldNewInfrastructureHelper, integrationSpecsAvailable, integrationSpecFile, findBackendUnits, scaffoldNewUseCase, integrationDescriptions, wireDependency, scaffoldNewDomainObject, scaffoldNewBoundedContextUseCase, scaffoldNewApplicationPort } from "./287.js";
|
|
7
|
+
import { scaffoldSvelteUIKitComponent, scaffoldSveltePage, runWithAnswers, restControllers, RequestError, scaffoldSvelteWidget, scaffoldReactPage, assertAnswersConsumed, scaffoldSvelteSharedModel } from "./783.js";
|
|
8
8
|
const agent_requests_name = implementationLabelSchema;
|
|
9
9
|
const nestedName = zod.string().regex(/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*(?:\/[a-z][a-z0-9]*(?:-[a-z0-9]+)*)*$/);
|
|
10
10
|
const id = zod.string().min(1);
|
|
@@ -144,72 +144,75 @@ const scaffoldRequestSchema = zod.discriminatedUnion('operation', [
|
|
|
144
144
|
aggregate: agent_requests_name.optional()
|
|
145
145
|
})
|
|
146
146
|
]);
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
]);
|
|
147
|
+
const frontendRequestSchema = (router, shared)=>zod.discriminatedUnion('operation', [
|
|
148
|
+
agent_requests_operation('page', {
|
|
149
|
+
...common,
|
|
150
|
+
name: nestedName
|
|
151
|
+
}),
|
|
152
|
+
agent_requests_operation('widget', {
|
|
153
|
+
...common,
|
|
154
|
+
name: nestedName,
|
|
155
|
+
widgetType: zod["enum"]([
|
|
156
|
+
'monolithic',
|
|
157
|
+
'separated',
|
|
158
|
+
'headless'
|
|
159
|
+
]).optional()
|
|
160
|
+
}),
|
|
161
|
+
agent_requests_operation('ui-kit-component', {
|
|
162
|
+
...common,
|
|
163
|
+
name: agent_requests_name
|
|
164
|
+
}),
|
|
165
|
+
agent_requests_operation(shared, {
|
|
166
|
+
...common,
|
|
167
|
+
name: agent_requests_name
|
|
168
|
+
}),
|
|
169
|
+
agent_requests_operation('move-page', {
|
|
170
|
+
...common,
|
|
171
|
+
module: nestedName,
|
|
172
|
+
name: nestedName,
|
|
173
|
+
moveRoute: zod.boolean().optional().describe(`With ${router} and a route at the page path: move it too (default true). Omit it without such a route.`)
|
|
174
|
+
}),
|
|
175
|
+
agent_requests_operation('delete-page', {
|
|
176
|
+
...common,
|
|
177
|
+
module: nestedName,
|
|
178
|
+
deleteRoute: zod.boolean().optional().describe(`With ${router} and the page's own route: delete it too (default true). Omit it without such a route.`)
|
|
179
|
+
}),
|
|
180
|
+
agent_requests_operation('delete-widget', {
|
|
181
|
+
...common,
|
|
182
|
+
module: nestedName
|
|
183
|
+
}),
|
|
184
|
+
agent_requests_operation('move-ui-kit-component', {
|
|
185
|
+
...common,
|
|
186
|
+
module: agent_requests_name,
|
|
187
|
+
name: agent_requests_name
|
|
188
|
+
}),
|
|
189
|
+
agent_requests_operation(`move-${shared}`, {
|
|
190
|
+
...common,
|
|
191
|
+
module: agent_requests_name,
|
|
192
|
+
name: agent_requests_name
|
|
193
|
+
}),
|
|
194
|
+
agent_requests_operation('delete-ui-kit-component', {
|
|
195
|
+
...common,
|
|
196
|
+
module: agent_requests_name
|
|
197
|
+
}),
|
|
198
|
+
agent_requests_operation(`delete-${shared}`, {
|
|
199
|
+
...common,
|
|
200
|
+
module: agent_requests_name
|
|
201
|
+
}),
|
|
202
|
+
agent_requests_operation('move-widget', {
|
|
203
|
+
...common,
|
|
204
|
+
module: nestedName,
|
|
205
|
+
name: nestedName
|
|
206
|
+
})
|
|
207
|
+
]);
|
|
208
|
+
const reactRequestSchema = frontendRequestSchema('Next.js', 'shared-hook');
|
|
209
|
+
const svelteRequestSchema = frontendRequestSchema('SvelteKit', 'shared-model');
|
|
208
210
|
const relativePath = zod.string().regex(/^[a-zA-Z0-9_.-]+(?:\/[a-zA-Z0-9_.-]+)*$/).refine((value)=>!value.split('/').some((part)=>'.' === part || '..' === part), 'Use a project-relative path without . or .. segments.');
|
|
209
211
|
const integrationRequestSchema = agent_requests_operation('add', {
|
|
210
212
|
...common,
|
|
211
213
|
integrations: zod.array(zod["enum"](integrationIds)).min(1),
|
|
212
214
|
nextAdapter: zod.boolean().optional(),
|
|
215
|
+
svelteAdapter: zod.boolean().optional(),
|
|
213
216
|
configureReact: zod.boolean().optional(),
|
|
214
217
|
replaceTestingLibrary: zod.boolean().optional(),
|
|
215
218
|
integrationTestTypes: zod.array(agent_requests_name).optional().describe('testcontainers with wire: saved primary implementation types whose implementations get integration specs. Omitted: the configured list stays.'),
|
|
@@ -232,8 +235,97 @@ const integrationRequestSchema = agent_requests_operation('add', {
|
|
|
232
235
|
const requestSchemaFor = (command)=>({
|
|
233
236
|
'df-scaffold': scaffoldRequestSchema,
|
|
234
237
|
'df-react': reactRequestSchema,
|
|
238
|
+
'df-svelte': svelteRequestSchema,
|
|
235
239
|
'df-integration': integrationRequestSchema
|
|
236
240
|
})[command];
|
|
241
|
+
const sharedLogicOperation = {
|
|
242
|
+
react: 'shared-hook',
|
|
243
|
+
svelte: 'shared-model'
|
|
244
|
+
};
|
|
245
|
+
const frontendOperations = (folder, framework)=>{
|
|
246
|
+
const shared = sharedLogicOperation[framework];
|
|
247
|
+
const scaffold = 'svelte' === framework ? {
|
|
248
|
+
page: scaffoldSveltePage,
|
|
249
|
+
widget: scaffoldSvelteWidget,
|
|
250
|
+
'ui-kit-component': scaffoldSvelteUIKitComponent,
|
|
251
|
+
shared: scaffoldSvelteSharedModel
|
|
252
|
+
} : {
|
|
253
|
+
page: scaffoldReactPage,
|
|
254
|
+
widget: scaffoldReactWidget,
|
|
255
|
+
'ui-kit-component': scaffoldReactUIKitComponent,
|
|
256
|
+
shared: scaffoldReactSharedHook
|
|
257
|
+
};
|
|
258
|
+
const move = (kind)=>()=>moveReactModuleUseCase(folder, kind, framework);
|
|
259
|
+
const remove = (kind)=>()=>deleteReactModuleUseCase(folder, kind, framework);
|
|
260
|
+
return {
|
|
261
|
+
page: ()=>scaffold.page(folder),
|
|
262
|
+
widget: ()=>scaffold.widget(folder),
|
|
263
|
+
'ui-kit-component': ()=>scaffold['ui-kit-component'](folder),
|
|
264
|
+
[shared]: ()=>scaffold.shared(folder),
|
|
265
|
+
'move-page': move('page'),
|
|
266
|
+
'move-widget': move('widget'),
|
|
267
|
+
'move-ui-kit-component': move('ui-kit'),
|
|
268
|
+
[`move-${shared}`]: move('hook'),
|
|
269
|
+
'delete-page': remove('page'),
|
|
270
|
+
'delete-widget': remove('widget'),
|
|
271
|
+
'delete-ui-kit-component': remove('ui-kit'),
|
|
272
|
+
[`delete-${shared}`]: remove('hook')
|
|
273
|
+
};
|
|
274
|
+
};
|
|
275
|
+
const frontendMenu = (framework)=>{
|
|
276
|
+
const shared = sharedLogicOperation[framework];
|
|
277
|
+
const title = 'svelte' === framework ? 'shared model' : 'shared hook';
|
|
278
|
+
return [
|
|
279
|
+
[
|
|
280
|
+
'New widget',
|
|
281
|
+
'widget'
|
|
282
|
+
],
|
|
283
|
+
[
|
|
284
|
+
'New page',
|
|
285
|
+
'page'
|
|
286
|
+
],
|
|
287
|
+
[
|
|
288
|
+
'New UI-kit component',
|
|
289
|
+
'ui-kit-component'
|
|
290
|
+
],
|
|
291
|
+
[
|
|
292
|
+
`New ${title}`,
|
|
293
|
+
shared
|
|
294
|
+
],
|
|
295
|
+
[
|
|
296
|
+
'Move or rename widget',
|
|
297
|
+
'move-widget'
|
|
298
|
+
],
|
|
299
|
+
[
|
|
300
|
+
'Move or rename page',
|
|
301
|
+
'move-page'
|
|
302
|
+
],
|
|
303
|
+
[
|
|
304
|
+
'Move or rename UI-kit component',
|
|
305
|
+
'move-ui-kit-component'
|
|
306
|
+
],
|
|
307
|
+
[
|
|
308
|
+
`Move or rename ${title}`,
|
|
309
|
+
`move-${shared}`
|
|
310
|
+
],
|
|
311
|
+
[
|
|
312
|
+
'Delete widget',
|
|
313
|
+
'delete-widget'
|
|
314
|
+
],
|
|
315
|
+
[
|
|
316
|
+
'Delete page',
|
|
317
|
+
'delete-page'
|
|
318
|
+
],
|
|
319
|
+
[
|
|
320
|
+
'Delete UI-kit component',
|
|
321
|
+
'delete-ui-kit-component'
|
|
322
|
+
],
|
|
323
|
+
[
|
|
324
|
+
`Delete ${title}`,
|
|
325
|
+
`delete-${shared}`
|
|
326
|
+
]
|
|
327
|
+
];
|
|
328
|
+
};
|
|
237
329
|
const requireProject = ()=>{
|
|
238
330
|
try {
|
|
239
331
|
return new ProjectRoot().path;
|
|
@@ -270,12 +362,24 @@ const ownerFor = (context)=>{
|
|
|
270
362
|
});
|
|
271
363
|
return owner.folder;
|
|
272
364
|
};
|
|
365
|
+
const frontendFrameworkOf = (command)=>'df-react' === command ? 'react' : 'df-svelte' === command ? 'svelte' : void 0;
|
|
366
|
+
const frontendModules = (root, rootFolder, framework)=>[
|
|
367
|
+
'page',
|
|
368
|
+
'widget',
|
|
369
|
+
'ui-kit',
|
|
370
|
+
'hook'
|
|
371
|
+
].flatMap((kind)=>findReactModules(node_path.join(root, rootFolder, 'presentation', framework), kind, framework).map((module)=>({
|
|
372
|
+
kind: 'svelte' === framework && 'hook' === kind ? 'model' : kind,
|
|
373
|
+
name: module.name,
|
|
374
|
+
file: node_path.relative(root, module.path).split(node_path.sep).join('/')
|
|
375
|
+
})));
|
|
273
376
|
const precondition = (command)=>{
|
|
274
377
|
requireProject();
|
|
275
378
|
if (!ConfigFile.exists) throw new RequestError('CONFIG_NOT_FOUND', 'Ask the project owner to run df-init.');
|
|
276
379
|
if (ConfigFile.outdated) throw new RequestError('CONFIG_OUTDATED', 'The config has the format of an earlier major version: ask the project owner to run df-upgrade.');
|
|
277
380
|
if ('df-scaffold' === command && !ConfigFile.Instance.data.backend) throw new RequestError('BACKEND_NOT_CONFIGURED', 'Ask the project owner to run df-init --section backend.');
|
|
278
|
-
|
|
381
|
+
const framework = frontendFrameworkOf(command);
|
|
382
|
+
if (framework && !ConfigFile.Instance.data.frontend?.[framework]) throw new RequestError('FRONTEND_NOT_CONFIGURED', 'Ask the project owner to run df-init --section frontend.');
|
|
279
383
|
};
|
|
280
384
|
const describeAgentCommand = (command)=>{
|
|
281
385
|
let root;
|
|
@@ -344,16 +448,8 @@ const describeAgentCommand = (command)=>{
|
|
|
344
448
|
])) : void 0
|
|
345
449
|
})),
|
|
346
450
|
integrations: integrationDescriptionsSafe(configured),
|
|
347
|
-
reactModules: config?.frontend?.react ? [
|
|
348
|
-
|
|
349
|
-
'widget',
|
|
350
|
-
'ui-kit',
|
|
351
|
-
'hook'
|
|
352
|
-
].flatMap((kind)=>findReactModules(node_path.join(root, config.project.rootFolder, 'presentation/react'), kind).map((module)=>({
|
|
353
|
-
kind,
|
|
354
|
-
name: module.name,
|
|
355
|
-
file: relative(module.path)
|
|
356
|
-
}))) : []
|
|
451
|
+
reactModules: config?.frontend?.react ? frontendModules(root, config.project.rootFolder, 'react') : [],
|
|
452
|
+
svelteModules: config?.frontend?.svelte ? frontendModules(root, config.project.rootFolder, 'svelte') : []
|
|
357
453
|
} : null
|
|
358
454
|
};
|
|
359
455
|
};
|
|
@@ -455,29 +551,16 @@ const executeScaffold = async (request, owner)=>{
|
|
|
455
551
|
};
|
|
456
552
|
return actions[request.operation]();
|
|
457
553
|
};
|
|
458
|
-
const
|
|
554
|
+
const executeFrontend = async (request, framework)=>{
|
|
459
555
|
const folder = new Folder(requireProject()).subitem([
|
|
460
556
|
ConfigFile.Instance.data.project.rootFolder,
|
|
461
|
-
'presentation
|
|
557
|
+
'presentation',
|
|
558
|
+
framework
|
|
462
559
|
]);
|
|
463
|
-
const kindOf = (operation)=>operation.endsWith('-page') ? 'page' : operation.endsWith('-widget') ? 'widget' : operation.endsWith('-ui-kit-component') ? 'ui-kit' :
|
|
560
|
+
const kindOf = (operation)=>operation.endsWith('-page') ? 'page' : operation.endsWith('-widget') ? 'widget' : operation.endsWith('-ui-kit-component') ? 'ui-kit' : /-shared-(hook|model)$/.test(operation) ? 'hook' : void 0;
|
|
464
561
|
const kind = /^(move|delete)-/.test(request.operation) ? kindOf(request.operation) : void 0;
|
|
465
|
-
if (kind && !findReactModules(folder.path, kind).length) throw new RequestError('TARGET_NOT_FOUND', `No
|
|
466
|
-
|
|
467
|
-
page: ()=>scaffoldReactPage(folder),
|
|
468
|
-
widget: ()=>scaffoldReactWidget(folder),
|
|
469
|
-
'ui-kit-component': ()=>scaffoldReactUIKitComponent(folder),
|
|
470
|
-
'shared-hook': ()=>scaffoldReactSharedHook(folder),
|
|
471
|
-
'move-page': ()=>moveReactModuleUseCase(folder, 'page'),
|
|
472
|
-
'move-widget': ()=>moveReactModuleUseCase(folder, 'widget'),
|
|
473
|
-
'delete-page': ()=>deleteReactModuleUseCase(folder, 'page'),
|
|
474
|
-
'delete-widget': ()=>deleteReactModuleUseCase(folder, 'widget'),
|
|
475
|
-
'move-ui-kit-component': ()=>moveReactModuleUseCase(folder, 'ui-kit'),
|
|
476
|
-
'move-shared-hook': ()=>moveReactModuleUseCase(folder, 'hook'),
|
|
477
|
-
'delete-ui-kit-component': ()=>deleteReactModuleUseCase(folder, 'ui-kit'),
|
|
478
|
-
'delete-shared-hook': ()=>deleteReactModuleUseCase(folder, 'hook')
|
|
479
|
-
};
|
|
480
|
-
return actions[request.operation]();
|
|
562
|
+
if (kind && !findReactModules(folder.path, kind, framework).length) throw new RequestError('TARGET_NOT_FOUND', `No ${frameworkTitles[framework].title} ${frontendKindTitles(framework)[kind][1]} here.`);
|
|
563
|
+
return frontendOperations(folder, framework)[request.operation]();
|
|
481
564
|
};
|
|
482
565
|
const executeAgentRequest = async (command, value)=>{
|
|
483
566
|
discardPendingChanges();
|
|
@@ -498,7 +581,7 @@ const executeAgentRequest = async (command, value)=>{
|
|
|
498
581
|
let nextSteps = [];
|
|
499
582
|
if ('df-scaffold' === command) if ('bounded-context' === request.operation) await scaffoldNewBoundedContextUseCase();
|
|
500
583
|
else await executeScaffold(request, owner);
|
|
501
|
-
else if (
|
|
584
|
+
else if (frontendFrameworkOf(command)) await executeFrontend(request, frontendFrameworkOf(command));
|
|
502
585
|
else nextSteps = await addIntegration({
|
|
503
586
|
save: false
|
|
504
587
|
});
|
|
@@ -583,4 +666,4 @@ const runCLI = async (command, interactive)=>{
|
|
|
583
666
|
process.exitCode = 1;
|
|
584
667
|
}
|
|
585
668
|
};
|
|
586
|
-
export { runCLI };
|
|
669
|
+
export { frontendMenu, frontendOperations, runCLI };
|