@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/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import node_path from "node:path";
|
|
3
3
|
import { select as prompts_select } from "@inquirer/prompts";
|
|
4
4
|
import { runCLI } from "./561.js";
|
|
5
|
-
import { boundedContextNames, Folder, ProjectRoot, outdatedConfigMessage, ConfigFile } from "./
|
|
5
|
+
import { boundedContextNames, Folder, ProjectRoot, outdatedConfigMessage, ConfigFile } from "./878.js";
|
|
6
6
|
import { scaffoldNewDomainService, scaffoldNewErrorUseCase, scaffoldNewAggregateUseCase, scaffoldNewQuery, scaffoldNewInfrastructureService, scaffoldNewHandlersRestEndpoint, savePendingChanges, moveBackendUnitUseCase, scaffoldNewCommand, scaffoldNewPresentationService, scaffoldNewInfrastructureHelper, deleteBackendUnitUseCase, scaffoldNewApplicationService, scaffoldNewUseCase, scaffoldNewImplementation, wireDependency, scaffoldNewBoundedContextUseCase, scaffoldNewDomainObject, scaffoldNewApplicationPort } from "./287.js";
|
|
7
7
|
const main = async ()=>{
|
|
8
8
|
if (!ConfigFile.exists) {
|
package/dist/init.cjs
CHANGED
|
@@ -306,6 +306,7 @@ const lintChecks = [
|
|
|
306
306
|
'layers',
|
|
307
307
|
'dependencies',
|
|
308
308
|
'react',
|
|
309
|
+
'svelte',
|
|
309
310
|
'clock',
|
|
310
311
|
'config'
|
|
311
312
|
];
|
|
@@ -350,8 +351,16 @@ const reactConfigSchema = external_zod_default().object({
|
|
|
350
351
|
]).optional(),
|
|
351
352
|
storybookFramework: external_zod_default().string().optional()
|
|
352
353
|
}).passthrough();
|
|
354
|
+
const svelteConfigSchema = external_zod_default().object({
|
|
355
|
+
framework: external_zod_default()["enum"]([
|
|
356
|
+
'svelte',
|
|
357
|
+
'sveltekit'
|
|
358
|
+
]).optional(),
|
|
359
|
+
storybookFramework: external_zod_default().string().optional()
|
|
360
|
+
}).passthrough();
|
|
353
361
|
const frontendConfigSchema = external_zod_default().object({
|
|
354
|
-
react: reactConfigSchema.optional()
|
|
362
|
+
react: reactConfigSchema.optional(),
|
|
363
|
+
svelte: svelteConfigSchema.optional()
|
|
355
364
|
}).passthrough();
|
|
356
365
|
const configSchema = external_zod_default().object({
|
|
357
366
|
project: projectConfigSchema,
|
|
@@ -860,7 +869,123 @@ const next_app_nextAppFolder = (root)=>[
|
|
|
860
869
|
'app',
|
|
861
870
|
'src/app'
|
|
862
871
|
].find((folder)=>new file_system_Folder(external_node_path_default().join(root, folder)).exists) ?? 'app';
|
|
872
|
+
const sveltekit_app_usesSvelteKit = ()=>config_file_ConfigFile.exists && config_file_ConfigFile.Instance.data.frontend?.svelte?.framework === 'sveltekit';
|
|
873
|
+
const sveltekit_app_svelteKitRoutesFolder = (root)=>[
|
|
874
|
+
'src/routes',
|
|
875
|
+
'routes'
|
|
876
|
+
].find((folder)=>new file_system_Folder(external_node_path_default().join(root, folder)).exists) ?? 'src/routes';
|
|
863
877
|
require("node:module");
|
|
878
|
+
new Set([
|
|
879
|
+
'node_modules',
|
|
880
|
+
'.git',
|
|
881
|
+
'.next',
|
|
882
|
+
'.svelte-kit',
|
|
883
|
+
'dist',
|
|
884
|
+
'build',
|
|
885
|
+
'out',
|
|
886
|
+
'coverage',
|
|
887
|
+
'storybook-static'
|
|
888
|
+
]);
|
|
889
|
+
const module_move_escapeRegExp = (value)=>value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
890
|
+
const frontendExtensions = {
|
|
891
|
+
react: {
|
|
892
|
+
component: '.tsx',
|
|
893
|
+
hook: '.ts'
|
|
894
|
+
},
|
|
895
|
+
svelte: {
|
|
896
|
+
component: '.svelte',
|
|
897
|
+
hook: '.svelte.ts'
|
|
898
|
+
}
|
|
899
|
+
};
|
|
900
|
+
const frontendLogicNaming = {
|
|
901
|
+
react: {
|
|
902
|
+
prefix: 'use',
|
|
903
|
+
shared: [
|
|
904
|
+
'hooks'
|
|
905
|
+
],
|
|
906
|
+
widgetModel: 'hooks'
|
|
907
|
+
},
|
|
908
|
+
svelte: {
|
|
909
|
+
prefix: 'create',
|
|
910
|
+
shared: [
|
|
911
|
+
'shared',
|
|
912
|
+
'model'
|
|
913
|
+
],
|
|
914
|
+
widgetModel: 'model'
|
|
915
|
+
}
|
|
916
|
+
};
|
|
917
|
+
const react_module_move_kindLayouts = (framework)=>{
|
|
918
|
+
const { component, hook } = frontendExtensions[framework];
|
|
919
|
+
const { prefix, shared } = frontendLogicNaming[framework];
|
|
920
|
+
return {
|
|
921
|
+
page: {
|
|
922
|
+
folder: 'pages',
|
|
923
|
+
nested: true,
|
|
924
|
+
inFolder: false,
|
|
925
|
+
ownFile: (fileBase)=>new RegExp(`^${module_move_escapeRegExp(fileBase)}-page(?:\\.|$)`),
|
|
926
|
+
target: (reactFolder, { folders, fileName })=>external_node_path_default().join(reactFolder, 'pages', ...folders, `${fileName}-page${component}`),
|
|
927
|
+
classPrefix: `(${prefix})?`,
|
|
928
|
+
classSuffix: 'Page'
|
|
929
|
+
},
|
|
930
|
+
widget: {
|
|
931
|
+
folder: 'widgets',
|
|
932
|
+
nested: true,
|
|
933
|
+
inFolder: true,
|
|
934
|
+
target: (reactFolder, { folders, folderName })=>external_node_path_default().join(reactFolder, 'widgets', ...folders, folderName),
|
|
935
|
+
classPrefix: `(${prefix})?`,
|
|
936
|
+
classSuffix: 'Widget|UIModel',
|
|
937
|
+
storyTitle: (segments)=>[
|
|
938
|
+
'Widgets',
|
|
939
|
+
...segments
|
|
940
|
+
].join('/')
|
|
941
|
+
},
|
|
942
|
+
'ui-kit': {
|
|
943
|
+
folder: 'ui-kit',
|
|
944
|
+
nested: false,
|
|
945
|
+
inFolder: true,
|
|
946
|
+
target: (reactFolder, { fileName })=>external_node_path_default().join(reactFolder, 'ui-kit', fileName),
|
|
947
|
+
classPrefix: '()',
|
|
948
|
+
classSuffix: 'Props(?![\\w$])|(?![\\w$])',
|
|
949
|
+
storyTitle: (segments)=>`UI-kit/${segments.join('')}`
|
|
950
|
+
},
|
|
951
|
+
hook: {
|
|
952
|
+
folder: shared.join('/'),
|
|
953
|
+
nested: false,
|
|
954
|
+
inFolder: false,
|
|
955
|
+
ownFile: (fileBase)=>new RegExp(`^${prefix}-${module_move_escapeRegExp(fileBase)}(?:\\.|$)`),
|
|
956
|
+
target: (reactFolder, { fileName })=>external_node_path_default().join(reactFolder, ...shared, `${prefix}-${fileName}${hook}`),
|
|
957
|
+
classPrefix: `(${prefix})`,
|
|
958
|
+
classSuffix: '(?![\\w$])'
|
|
959
|
+
}
|
|
960
|
+
};
|
|
961
|
+
};
|
|
962
|
+
react_module_move_kindLayouts('react');
|
|
963
|
+
react_module_move_kindLayouts('svelte');
|
|
964
|
+
const reactKindTitles = {
|
|
965
|
+
page: [
|
|
966
|
+
'Page',
|
|
967
|
+
'pages'
|
|
968
|
+
],
|
|
969
|
+
widget: [
|
|
970
|
+
'Widget',
|
|
971
|
+
'widgets'
|
|
972
|
+
],
|
|
973
|
+
'ui-kit': [
|
|
974
|
+
'UI-kit component',
|
|
975
|
+
'UI-kit components'
|
|
976
|
+
],
|
|
977
|
+
hook: [
|
|
978
|
+
'Shared hook',
|
|
979
|
+
'shared hooks'
|
|
980
|
+
]
|
|
981
|
+
};
|
|
982
|
+
({
|
|
983
|
+
...reactKindTitles,
|
|
984
|
+
hook: [
|
|
985
|
+
'Shared model',
|
|
986
|
+
'shared models'
|
|
987
|
+
]
|
|
988
|
+
});
|
|
864
989
|
const gitignore_addGitignoreEntry = (root, entry)=>{
|
|
865
990
|
const gitignore = new file_system_File(external_node_path_default().join(root, '.gitignore'));
|
|
866
991
|
const ignored = gitignore.exists ? gitignore.data : '';
|
|
@@ -868,6 +993,28 @@ const gitignore_addGitignoreEntry = (root, entry)=>{
|
|
|
868
993
|
const newline = ignored.includes('\r\n') ? '\r\n' : '\n';
|
|
869
994
|
gitignore.update(`${ignored}${ignored && !ignored.endsWith('\n') ? newline : ''}${entry}${newline}`);
|
|
870
995
|
};
|
|
996
|
+
JSON.stringify({
|
|
997
|
+
private: true,
|
|
998
|
+
dependencies: {
|
|
999
|
+
'@tanstack/svelte-query': '^6.0.0'
|
|
1000
|
+
}
|
|
1001
|
+
}, null, 4);
|
|
1002
|
+
const rest_adapters_restAdapters = {
|
|
1003
|
+
next: {
|
|
1004
|
+
package: '@domain-first/handlers-next',
|
|
1005
|
+
adapter: 'nextAdapter',
|
|
1006
|
+
endpoints: 'nextEndpoints',
|
|
1007
|
+
key: 'nextAdapter',
|
|
1008
|
+
routePath: (root)=>external_node_path_default().posix.join(next_app_nextAppFolder(root), 'api/[...path]/route.ts')
|
|
1009
|
+
},
|
|
1010
|
+
svelte: {
|
|
1011
|
+
package: '@domain-first/handlers-svelte',
|
|
1012
|
+
adapter: 'svelteAdapter',
|
|
1013
|
+
endpoints: 'svelteEndpoints',
|
|
1014
|
+
key: 'svelteAdapter',
|
|
1015
|
+
routePath: (root)=>external_node_path_default().posix.join(sveltekit_app_svelteKitRoutesFolder(root), 'api/[...path]/+server.ts')
|
|
1016
|
+
}
|
|
1017
|
+
};
|
|
871
1018
|
class unknown_format_naming_UnknownFormatNaming {
|
|
872
1019
|
rawSource;
|
|
873
1020
|
camelCase;
|
|
@@ -942,15 +1089,16 @@ export const wire${naming.ClassName}PresentationService = wireClass(
|
|
|
942
1089
|
`.trim());
|
|
943
1090
|
};
|
|
944
1091
|
const rest_endpoint_generator_name = 'rest-endpoint-generator';
|
|
945
|
-
const scaffoldRestEndpointGenerator = (sharedFolder, {
|
|
946
|
-
const
|
|
1092
|
+
const scaffoldRestEndpointGenerator = (sharedFolder, { adapter: framework } = {})=>createPresentationService(sharedFolder, rest_endpoint_generator_name, (className)=>{
|
|
1093
|
+
const known = framework && rest_adapters_restAdapters[framework];
|
|
1094
|
+
const adapter = known ? known.adapter : 'adapter';
|
|
947
1095
|
return `
|
|
948
1096
|
import {
|
|
949
|
-
${
|
|
1097
|
+
${known ? '' : ' type Adapter,\n'} type EndpointGenerator,
|
|
950
1098
|
createEndpoint,
|
|
951
1099
|
invalidRequest
|
|
952
1100
|
} from '@domain-first/handlers-rest'
|
|
953
|
-
${
|
|
1101
|
+
${known ? `import { ${known.adapter} } from '${known.package}'` : `
|
|
954
1102
|
/**
|
|
955
1103
|
* The adapter of your HTTP framework.
|
|
956
1104
|
*/
|
|
@@ -975,16 +1123,17 @@ const rest_endpoint_generator_findRestEndpointGenerator = (sharedFolder)=>{
|
|
|
975
1123
|
wireFile: external_node_path_default().join(sharedFolder.path, 'wiring', 'presentation-services', `wire-${rest_endpoint_generator_name}-presentation-service.ts`)
|
|
976
1124
|
};
|
|
977
1125
|
};
|
|
978
|
-
const
|
|
979
|
-
const
|
|
980
|
-
|
|
1126
|
+
const catchAllRoute = (adapter, restHandlersImport)=>{
|
|
1127
|
+
const { endpoints, package: packageName } = rest_adapters_restAdapters[adapter];
|
|
1128
|
+
return `
|
|
1129
|
+
import { ${endpoints} } from '${packageName}'
|
|
981
1130
|
${restHandlersImport ? `import { restHandlers } from '${restHandlersImport}'
|
|
982
1131
|
|
|
983
|
-
const handler =
|
|
1132
|
+
const handler = ${endpoints}(restHandlers)` : `
|
|
984
1133
|
/**
|
|
985
1134
|
* Pass the endpoints' handle here; their paths are relative to this route's folder.
|
|
986
1135
|
*/
|
|
987
|
-
const handler =
|
|
1136
|
+
const handler = ${endpoints}([])`}
|
|
988
1137
|
|
|
989
1138
|
export const GET = handler
|
|
990
1139
|
export const POST = handler
|
|
@@ -992,14 +1141,15 @@ export const PUT = handler
|
|
|
992
1141
|
export const PATCH = handler
|
|
993
1142
|
export const DELETE = handler
|
|
994
1143
|
`.trim();
|
|
995
|
-
|
|
1144
|
+
};
|
|
1145
|
+
const scaffoldCatchAllRoute = (root, adapter)=>{
|
|
996
1146
|
const { rootFolder } = config_file_ConfigFile.Instance.data.project;
|
|
997
1147
|
const { domainFirstPackages } = config_file_ConfigFile.backend;
|
|
998
|
-
const routePath =
|
|
1148
|
+
const routePath = rest_adapters_restAdapters[adapter].routePath(root);
|
|
999
1149
|
const routeFile = external_node_path_default().join(root, routePath);
|
|
1000
1150
|
if (new file_system_File(routeFile).exists) return [];
|
|
1001
1151
|
if (!domainFirstPackages.includes('@domain-first/wire')) {
|
|
1002
|
-
new file_system_File(routeFile).data =
|
|
1152
|
+
new file_system_File(routeFile).data = catchAllRoute(adapter, void 0);
|
|
1003
1153
|
return [];
|
|
1004
1154
|
}
|
|
1005
1155
|
const restFolder = new file_system_Folder(root).subitem([
|
|
@@ -1007,16 +1157,21 @@ const rest_endpoint_generator_scaffoldNextRoute = (root)=>{
|
|
|
1007
1157
|
'presentation',
|
|
1008
1158
|
'rest'
|
|
1009
1159
|
]);
|
|
1010
|
-
new file_system_File(routeFile).data =
|
|
1160
|
+
new file_system_File(routeFile).data = catchAllRoute(adapter, wiring_relativeImport(routeFile, restFolder.path));
|
|
1011
1161
|
return new file_system_File(external_node_path_default().join(restFolder.path, 'index.ts')).exists ? [] : [
|
|
1012
1162
|
`${routePath} serves restHandlers from ${external_node_path_default().posix.join(rootFolder.replaceAll('\\', '/'), 'presentation/rest/index.ts')}, which appears with the first REST endpoint — generate one with df-scaffold (Presentation → New Handlers-REST Endpoint) and the route compiles`
|
|
1013
1163
|
];
|
|
1014
1164
|
};
|
|
1015
|
-
const
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
}
|
|
1019
|
-
|
|
1165
|
+
const frameworkRestAdapter = ()=>next_app_usesNext() ? 'next' : sveltekit_app_usesSvelteKit() ? 'svelte' : void 0;
|
|
1166
|
+
const askRestAdapter = async ({ adapter = frameworkRestAdapter() } = {})=>{
|
|
1167
|
+
if (!adapter) return;
|
|
1168
|
+
const { key, package: packageName } = rest_adapters_restAdapters[adapter];
|
|
1169
|
+
return await interaction_confirm({
|
|
1170
|
+
key,
|
|
1171
|
+
message: `Use ${packageName} for REST endpoints`
|
|
1172
|
+
}) ? adapter : void 0;
|
|
1173
|
+
};
|
|
1174
|
+
const scaffoldRestEndpointGeneratorFiles = ({ adapter })=>{
|
|
1020
1175
|
const root = new project_root_ProjectRoot().path;
|
|
1021
1176
|
const generatorExisted = rest_endpoint_generator_restEndpointGeneratorApplied();
|
|
1022
1177
|
const routeNotes = file_system_withoutOverwrites(()=>{
|
|
@@ -1024,18 +1179,19 @@ const scaffoldRestEndpointGeneratorFiles = ({ withNextAdapter })=>{
|
|
|
1024
1179
|
config_file_ConfigFile.Instance.data.project.rootFolder,
|
|
1025
1180
|
'shared-kernel'
|
|
1026
1181
|
]), {
|
|
1027
|
-
|
|
1182
|
+
adapter
|
|
1028
1183
|
});
|
|
1029
|
-
return
|
|
1184
|
+
return adapter ? scaffoldCatchAllRoute(root, adapter) : [];
|
|
1030
1185
|
});
|
|
1031
|
-
if (!
|
|
1186
|
+
if (!adapter) return [];
|
|
1187
|
+
const { adapter: adapterName, package: packageName } = rest_adapters_restAdapters[adapter];
|
|
1032
1188
|
return [
|
|
1033
1189
|
...missingPackages([
|
|
1034
|
-
|
|
1190
|
+
packageName
|
|
1035
1191
|
]),
|
|
1036
1192
|
...routeNotes,
|
|
1037
1193
|
...generatorExisted ? [
|
|
1038
|
-
|
|
1194
|
+
`the existing endpoint generator was kept — pass ${adapterName} from ${packageName} to its createEndpoint calls`
|
|
1039
1195
|
] : []
|
|
1040
1196
|
];
|
|
1041
1197
|
};
|
|
@@ -1044,6 +1200,73 @@ const rest_endpoint_generator_restEndpointGeneratorApplied = ()=>Boolean(rest_en
|
|
|
1044
1200
|
'shared-kernel'
|
|
1045
1201
|
])));
|
|
1046
1202
|
const storybookFrameworkPackage = '@storybook/react-vite';
|
|
1203
|
+
const svelteStorybookPackages = {
|
|
1204
|
+
svelte: '@storybook/svelte-vite',
|
|
1205
|
+
sveltekit: '@storybook/sveltekit'
|
|
1206
|
+
};
|
|
1207
|
+
const storybookPackageFor = (framework)=>'svelte' === framework || 'sveltekit' === framework ? svelteStorybookPackages[framework] : storybookFrameworkPackage;
|
|
1208
|
+
const storybookPreview = (frameworkPackage)=>`import type { Preview } from '${frameworkPackage}';
|
|
1209
|
+
|
|
1210
|
+
const preview: Preview = {
|
|
1211
|
+
parameters: {
|
|
1212
|
+
controls: {
|
|
1213
|
+
matchers: {
|
|
1214
|
+
color: /(background|color)$/i,
|
|
1215
|
+
date: /Date$/i
|
|
1216
|
+
}
|
|
1217
|
+
}
|
|
1218
|
+
}
|
|
1219
|
+
};
|
|
1220
|
+
|
|
1221
|
+
export default preview;
|
|
1222
|
+
`;
|
|
1223
|
+
const svelteStorybookFiles = (relativeProjectRoot, frameworkPackage)=>{
|
|
1224
|
+
const withPlugin = frameworkPackage === svelteStorybookPackages.svelte;
|
|
1225
|
+
return {
|
|
1226
|
+
'main.ts': `import { resolve } from 'node:path';
|
|
1227
|
+
import type { StorybookConfig } from '${frameworkPackage}';
|
|
1228
|
+
|
|
1229
|
+
const projectRoot = resolve(import.meta.dirname, ${JSON.stringify(relativeProjectRoot)});
|
|
1230
|
+
|
|
1231
|
+
const config: StorybookConfig = {
|
|
1232
|
+
stories: ['../**/*.mdx', '../**/*.stories.@(ts|svelte)'],
|
|
1233
|
+
framework: {
|
|
1234
|
+
name: '${frameworkPackage}',
|
|
1235
|
+
options: {}
|
|
1236
|
+
},
|
|
1237
|
+
core: {
|
|
1238
|
+
disableTelemetry: true
|
|
1239
|
+
},
|
|
1240
|
+
async viteFinal(viteConfig) {
|
|
1241
|
+
const { mergeConfig } = await import('vite');
|
|
1242
|
+
${withPlugin ? ` const { svelte } = await import('@sveltejs/vite-plugin-svelte');
|
|
1243
|
+
const hasSvelte = (viteConfig.plugins ?? [])
|
|
1244
|
+
.flat(Infinity)
|
|
1245
|
+
.some(
|
|
1246
|
+
(plugin) =>
|
|
1247
|
+
!!plugin &&
|
|
1248
|
+
typeof plugin === 'object' &&
|
|
1249
|
+
'name' in plugin &&
|
|
1250
|
+
String(plugin.name).startsWith('vite-plugin-svelte')
|
|
1251
|
+
);
|
|
1252
|
+
|
|
1253
|
+
return mergeConfig(viteConfig, {
|
|
1254
|
+
plugins: hasSvelte ? [] : [svelte()],` : `
|
|
1255
|
+
return mergeConfig(viteConfig, {`}
|
|
1256
|
+
resolve: {
|
|
1257
|
+
alias: {
|
|
1258
|
+
'@': projectRoot
|
|
1259
|
+
}
|
|
1260
|
+
}
|
|
1261
|
+
});
|
|
1262
|
+
}
|
|
1263
|
+
};
|
|
1264
|
+
|
|
1265
|
+
export default config;
|
|
1266
|
+
`,
|
|
1267
|
+
'preview.ts': storybookPreview(frameworkPackage)
|
|
1268
|
+
};
|
|
1269
|
+
};
|
|
1047
1270
|
const storybookFiles = (relativeProjectRoot)=>({
|
|
1048
1271
|
'main.ts': `import { resolve } from 'node:path';
|
|
1049
1272
|
import react from '@vitejs/plugin-react';
|
|
@@ -1076,32 +1299,79 @@ const config: StorybookConfig = {
|
|
|
1076
1299
|
|
|
1077
1300
|
export default config;
|
|
1078
1301
|
`,
|
|
1079
|
-
'preview.ts':
|
|
1080
|
-
|
|
1081
|
-
const preview: Preview = {
|
|
1082
|
-
parameters: {
|
|
1083
|
-
controls: {
|
|
1084
|
-
matchers: {
|
|
1085
|
-
color: /(background|color)$/i,
|
|
1086
|
-
date: /Date$/i
|
|
1087
|
-
}
|
|
1088
|
-
}
|
|
1089
|
-
}
|
|
1090
|
-
};
|
|
1091
|
-
|
|
1092
|
-
export default preview;
|
|
1093
|
-
`
|
|
1302
|
+
'preview.ts': storybookPreview(storybookFrameworkPackage)
|
|
1094
1303
|
});
|
|
1095
|
-
const storybookScripts = (rootFolder)=>{
|
|
1096
|
-
const folder = external_node_path_default().posix.join(rootFolder.replaceAll('\\', '/'),
|
|
1304
|
+
const storybookScripts = (rootFolder, family = 'react')=>{
|
|
1305
|
+
const folder = external_node_path_default().posix.join(rootFolder.replaceAll('\\', '/'), `presentation/${family}`);
|
|
1097
1306
|
const quote = (value)=>JSON.stringify(value);
|
|
1098
1307
|
return {
|
|
1099
1308
|
storybook: `storybook dev -p 6006 -c ${quote(`${folder}/.storybook`)}`,
|
|
1100
1309
|
'build-storybook': `storybook build -c ${quote(`${folder}/.storybook`)} -o ${quote(`${folder}/storybook-static`)}`
|
|
1101
1310
|
};
|
|
1102
1311
|
};
|
|
1312
|
+
const addSvelteStorybook = async ()=>{
|
|
1313
|
+
const config = config_file_ConfigFile.Instance.data;
|
|
1314
|
+
const svelte = config.frontend?.svelte ?? {};
|
|
1315
|
+
const frameworkPackage = svelteStorybookPackages['sveltekit' === svelte.framework ? 'sveltekit' : 'svelte'];
|
|
1316
|
+
const root = new project_root_ProjectRoot().path;
|
|
1317
|
+
const manifestFile = new file_system_File(external_node_path_default().join(root, 'package.json'));
|
|
1318
|
+
const manifest = JSON.parse(manifestFile.data);
|
|
1319
|
+
const selected = await package_scripts_addPackageScripts(manifestFile, storybookScripts(config.project.rootFolder, 'svelte'));
|
|
1320
|
+
const folder = new file_system_Folder(root).subitem([
|
|
1321
|
+
config.project.rootFolder,
|
|
1322
|
+
'presentation',
|
|
1323
|
+
'svelte',
|
|
1324
|
+
'.storybook'
|
|
1325
|
+
]);
|
|
1326
|
+
for (const [name, content] of Object.entries(svelteStorybookFiles(external_node_path_default().relative(folder.path, root).split(external_node_path_default().sep).join('/'), frameworkPackage))){
|
|
1327
|
+
const file = new file_system_File(external_node_path_default().join(folder.path, name));
|
|
1328
|
+
if (!file.exists || file.data !== content) file.data = content;
|
|
1329
|
+
}
|
|
1330
|
+
if (svelte.storybookFramework !== frameworkPackage) config_file_ConfigFile.update({
|
|
1331
|
+
frontend: {
|
|
1332
|
+
...config.frontend,
|
|
1333
|
+
svelte: {
|
|
1334
|
+
...svelte,
|
|
1335
|
+
storybookFramework: frameworkPackage
|
|
1336
|
+
}
|
|
1337
|
+
}
|
|
1338
|
+
});
|
|
1339
|
+
const buildFolder = external_node_path_default().posix.join(config.project.rootFolder.replaceAll('\\', '/'), 'presentation/svelte/storybook-static');
|
|
1340
|
+
gitignore_addGitignoreEntry(root, `/${buildFolder}/`);
|
|
1341
|
+
const dependencies = {
|
|
1342
|
+
...manifest.dependencies,
|
|
1343
|
+
...manifest.devDependencies
|
|
1344
|
+
};
|
|
1345
|
+
const missing = [
|
|
1346
|
+
'storybook',
|
|
1347
|
+
frameworkPackage,
|
|
1348
|
+
'vite',
|
|
1349
|
+
...frameworkPackage === svelteStorybookPackages.svelte ? [
|
|
1350
|
+
'@sveltejs/vite-plugin-svelte'
|
|
1351
|
+
] : []
|
|
1352
|
+
].filter((name)=>!dependencies[name]);
|
|
1353
|
+
const missingSvelte = ('sveltekit' === svelte.framework ? [
|
|
1354
|
+
'@sveltejs/kit',
|
|
1355
|
+
'svelte'
|
|
1356
|
+
] : [
|
|
1357
|
+
'svelte'
|
|
1358
|
+
]).filter((name)=>!dependencies[name]);
|
|
1359
|
+
return [
|
|
1360
|
+
...missing.length ? [
|
|
1361
|
+
`npm install --save-dev ${missing.join(' ')}`
|
|
1362
|
+
] : [],
|
|
1363
|
+
...missingSvelte.length ? [
|
|
1364
|
+
`npm install ${missingSvelte.join(' ')}`
|
|
1365
|
+
] : [],
|
|
1366
|
+
...package_scripts_describeScripts(selected, {
|
|
1367
|
+
storybook: 'start Storybook on http://localhost:6006',
|
|
1368
|
+
'build-storybook': `build static Storybook into ${buildFolder}`
|
|
1369
|
+
})
|
|
1370
|
+
];
|
|
1371
|
+
};
|
|
1103
1372
|
const storybook_addStorybook = async ()=>{
|
|
1104
1373
|
const config = config_file_ConfigFile.Instance.data;
|
|
1374
|
+
if (config.frontend?.svelte) return addSvelteStorybook();
|
|
1105
1375
|
if ((!config.frontend?.react || config.frontend?.react?.storybookFramework && config.frontend?.react?.storybookFramework !== storybookFrameworkPackage) && !await interaction_confirm({
|
|
1106
1376
|
key: 'configureReact',
|
|
1107
1377
|
requestRequired: true,
|
|
@@ -1160,16 +1430,6 @@ const storybook_addStorybook = async ()=>{
|
|
|
1160
1430
|
})
|
|
1161
1431
|
];
|
|
1162
1432
|
};
|
|
1163
|
-
new Set([
|
|
1164
|
-
'node_modules',
|
|
1165
|
-
'.git',
|
|
1166
|
-
'.next',
|
|
1167
|
-
'dist',
|
|
1168
|
-
'build',
|
|
1169
|
-
'out',
|
|
1170
|
-
'coverage',
|
|
1171
|
-
'storybook-static'
|
|
1172
|
-
]);
|
|
1173
1433
|
const serviceLayout = (layer)=>({
|
|
1174
1434
|
title: `${layer[0].toUpperCase()}${layer.slice(1)} services`,
|
|
1175
1435
|
core: (ClassName)=>`${ClassName}${layer[0].toUpperCase()}${layer.slice(1)}Service`,
|
|
@@ -1397,9 +1657,27 @@ const configureBackend = async (config)=>{
|
|
|
1397
1657
|
if (envBranches && !envBranchedWireExisted) notes.push(`${rootFolderName}/shared-kernel/wiring/env-branched-wire.ts doesn't compile until you write currentBranch: return the branch this process runs in (${envBranches.names.join(', ')})`);
|
|
1398
1658
|
return notes;
|
|
1399
1659
|
};
|
|
1660
|
+
const frontendPackages = {
|
|
1661
|
+
react: [
|
|
1662
|
+
'react',
|
|
1663
|
+
'react-dom'
|
|
1664
|
+
],
|
|
1665
|
+
next: [
|
|
1666
|
+
'next',
|
|
1667
|
+
'react',
|
|
1668
|
+
'react-dom'
|
|
1669
|
+
],
|
|
1670
|
+
svelte: [
|
|
1671
|
+
'svelte'
|
|
1672
|
+
],
|
|
1673
|
+
sveltekit: [
|
|
1674
|
+
'@sveltejs/kit',
|
|
1675
|
+
'svelte'
|
|
1676
|
+
]
|
|
1677
|
+
};
|
|
1678
|
+
const savedFrontendChoice = ({ frontend })=>frontend?.react?.framework ?? frontend?.svelte?.framework ?? (frontend?.react ? 'react' : frontend?.svelte ? 'svelte' : void 0);
|
|
1400
1679
|
const configureFrontend = async (config)=>{
|
|
1401
|
-
const
|
|
1402
|
-
const framework = await (0, prompts_namespaceObject.select)({
|
|
1680
|
+
const choice = await (0, prompts_namespaceObject.select)({
|
|
1403
1681
|
message: 'Frontend framework:',
|
|
1404
1682
|
choices: [
|
|
1405
1683
|
{
|
|
@@ -1409,51 +1687,58 @@ const configureFrontend = async (config)=>{
|
|
|
1409
1687
|
{
|
|
1410
1688
|
name: 'Next.js',
|
|
1411
1689
|
value: 'next'
|
|
1690
|
+
},
|
|
1691
|
+
{
|
|
1692
|
+
name: 'Svelte',
|
|
1693
|
+
value: 'svelte'
|
|
1694
|
+
},
|
|
1695
|
+
{
|
|
1696
|
+
name: 'SvelteKit',
|
|
1697
|
+
value: 'sveltekit'
|
|
1412
1698
|
}
|
|
1413
1699
|
],
|
|
1414
|
-
default:
|
|
1700
|
+
default: savedFrontendChoice(config) ?? (hasDependency('next') ? 'next' : hasDependency('@sveltejs/kit') ? 'sveltekit' : hasDependency('svelte') ? 'svelte' : 'react')
|
|
1415
1701
|
});
|
|
1416
|
-
const
|
|
1417
|
-
|
|
1418
|
-
|
|
1702
|
+
const family = 'react' === choice || 'next' === choice ? 'react' : 'svelte';
|
|
1703
|
+
const adapter = 'next' === choice ? 'next' : 'sveltekit' === choice ? 'svelte' : void 0;
|
|
1704
|
+
const restAdapter = adapter && config.backend ? {
|
|
1705
|
+
adapter: await askRestAdapter({
|
|
1706
|
+
adapter
|
|
1707
|
+
})
|
|
1708
|
+
} : {
|
|
1709
|
+
adapter: void 0
|
|
1710
|
+
};
|
|
1711
|
+
const current = config.frontend?.[family];
|
|
1419
1712
|
const withStorybook = await (0, prompts_namespaceObject.confirm)({
|
|
1420
1713
|
message: 'Use Storybook',
|
|
1421
|
-
default:
|
|
1714
|
+
default: current ? Boolean(current.storybookFramework) : true
|
|
1422
1715
|
});
|
|
1423
|
-
const
|
|
1716
|
+
const { react, svelte, ...otherSettings } = config.frontend ?? {};
|
|
1424
1717
|
config_file_ConfigFile.update({
|
|
1425
1718
|
frontend: {
|
|
1426
|
-
...
|
|
1427
|
-
|
|
1428
|
-
...
|
|
1429
|
-
framework,
|
|
1430
|
-
storybookFramework
|
|
1719
|
+
...otherSettings,
|
|
1720
|
+
[family]: {
|
|
1721
|
+
...current,
|
|
1722
|
+
framework: choice,
|
|
1723
|
+
storybookFramework: withStorybook ? storybookPackageFor(choice) : void 0
|
|
1431
1724
|
}
|
|
1432
1725
|
}
|
|
1433
1726
|
});
|
|
1434
1727
|
return {
|
|
1435
|
-
|
|
1728
|
+
restAdapter,
|
|
1436
1729
|
nextSteps: [
|
|
1437
|
-
...missingPackages(
|
|
1438
|
-
'next',
|
|
1439
|
-
'react',
|
|
1440
|
-
'react-dom'
|
|
1441
|
-
] : [
|
|
1442
|
-
'react',
|
|
1443
|
-
'react-dom'
|
|
1444
|
-
]),
|
|
1730
|
+
...missingPackages(frontendPackages[choice]),
|
|
1445
1731
|
...withStorybook ? await storybook_addStorybook() : []
|
|
1446
1732
|
]
|
|
1447
1733
|
};
|
|
1448
1734
|
};
|
|
1449
|
-
const configureRest = async (
|
|
1735
|
+
const configureRest = async (restAdapter)=>{
|
|
1450
1736
|
const backend = config_file_ConfigFile.Instance.data.backend;
|
|
1451
1737
|
if (!backend) return [];
|
|
1452
1738
|
const withRest = backend.domainFirstPackages.includes('@domain-first/handlers-rest');
|
|
1453
|
-
const
|
|
1454
|
-
if (
|
|
1455
|
-
if (
|
|
1456
|
-
if (withNextAdapter && !withRest) config_file_ConfigFile.update({
|
|
1739
|
+
const adapter = restAdapter?.adapter ?? (restAdapter ? void 0 : await askRestAdapter());
|
|
1740
|
+
if (!withRest && !adapter) return [];
|
|
1741
|
+
if (adapter && !withRest) config_file_ConfigFile.update({
|
|
1457
1742
|
backend: {
|
|
1458
1743
|
...backend,
|
|
1459
1744
|
domainFirstPackages: [
|
|
@@ -1463,7 +1748,7 @@ const configureRest = async (withNextAdapter)=>{
|
|
|
1463
1748
|
}
|
|
1464
1749
|
});
|
|
1465
1750
|
return scaffoldRestEndpointGeneratorFiles({
|
|
1466
|
-
|
|
1751
|
+
adapter
|
|
1467
1752
|
});
|
|
1468
1753
|
};
|
|
1469
1754
|
const initializeUseCase = async (section)=>{
|
|
@@ -1500,7 +1785,7 @@ const initializeUseCase = async (section)=>{
|
|
|
1500
1785
|
}
|
|
1501
1786
|
const nextSteps = [];
|
|
1502
1787
|
let backendConfigured = false;
|
|
1503
|
-
let
|
|
1788
|
+
let restAdapter;
|
|
1504
1789
|
for (const currentSection of sections){
|
|
1505
1790
|
console.log(`\n${currentSection[0].toUpperCase()}${currentSection.slice(1)} configuration`);
|
|
1506
1791
|
if (!section && sections.length > 1 && !await (0, prompts_namespaceObject.confirm)({
|
|
@@ -1523,14 +1808,14 @@ const initializeUseCase = async (section)=>{
|
|
|
1523
1808
|
case 'frontend':
|
|
1524
1809
|
{
|
|
1525
1810
|
const frontend = await configureFrontend(config);
|
|
1526
|
-
|
|
1811
|
+
restAdapter = frontend.restAdapter;
|
|
1527
1812
|
nextSteps.push(...frontend.nextSteps);
|
|
1528
1813
|
break;
|
|
1529
1814
|
}
|
|
1530
1815
|
}
|
|
1531
1816
|
}
|
|
1532
|
-
if (backendConfigured ||
|
|
1533
|
-
const restSteps = await configureRest(
|
|
1817
|
+
if (backendConfigured || restAdapter?.adapter) {
|
|
1818
|
+
const restSteps = await configureRest(restAdapter);
|
|
1534
1819
|
nextSteps.push(...missingDomainFirstPackages(), ...restSteps);
|
|
1535
1820
|
}
|
|
1536
1821
|
return nextSteps;
|
package/dist/init.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { parseArgs } from "node:util";
|
|
3
|
-
import { ConfigFile, outdatedConfigMessage } from "./
|
|
3
|
+
import { ConfigFile, outdatedConfigMessage } from "./878.js";
|
|
4
4
|
import { printNextSteps, configurationSections, initializeUseCase, savePendingChanges } from "./287.js";
|
|
5
5
|
const help = `Usage: df-init [--section project|backend|frontend]
|
|
6
6
|
|