@domain-first/project-structure 8.3.0 → 8.4.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/287.js +118 -30
- package/dist/561.js +59 -33
- package/dist/agent-cli.d.ts +23 -1
- package/dist/agent-requests.d.ts +44 -0
- package/dist/index.cjs +146 -32
- package/dist/integration.cjs +175 -61
- package/dist/react-module-move.d.ts +26 -3
- package/dist/react.cjs +188 -62
- package/dist/react.js +13 -1
- package/package.json +1 -1
- package/skills/df-ps-react/SKILL.md +4 -4
- package/skills/df-ps-react/references/generators.md +4 -0
- package/skills/df-ps-scaffold/SKILL.md +1 -1
- package/skills/df-ps-scaffold/references/agent-operations.md +4 -0
package/dist/integration.cjs
CHANGED
|
@@ -3127,68 +3127,68 @@ const named = {
|
|
|
3127
3127
|
...agent_requests_owner,
|
|
3128
3128
|
name: agent_requests_name
|
|
3129
3129
|
};
|
|
3130
|
-
const
|
|
3130
|
+
const agent_requests_operation = (value, shape)=>external_zod_default().strictObject({
|
|
3131
3131
|
operation: external_zod_default().literal(value),
|
|
3132
3132
|
...shape
|
|
3133
3133
|
});
|
|
3134
3134
|
const scaffoldRequestSchema = external_zod_default().discriminatedUnion('operation', [
|
|
3135
|
-
|
|
3135
|
+
agent_requests_operation('bounded-context', {
|
|
3136
3136
|
...common,
|
|
3137
3137
|
name: agent_requests_name.refine((value)=>'shared-kernel' !== value, 'shared-kernel is reserved for the Shared Kernel.')
|
|
3138
3138
|
}),
|
|
3139
|
-
|
|
3139
|
+
agent_requests_operation('aggregate', {
|
|
3140
3140
|
...named,
|
|
3141
3141
|
withRepository: external_zod_default().boolean().optional(),
|
|
3142
3142
|
implementation: agent_requests_implementation.optional(),
|
|
3143
3143
|
testImplementation: agent_requests_implementation.optional(),
|
|
3144
3144
|
...agent_requests_wired
|
|
3145
3145
|
}),
|
|
3146
|
-
|
|
3146
|
+
agent_requests_operation('entity', {
|
|
3147
3147
|
...named,
|
|
3148
3148
|
aggregate: agent_requests_name.optional()
|
|
3149
3149
|
}),
|
|
3150
|
-
|
|
3150
|
+
agent_requests_operation('value-object', {
|
|
3151
3151
|
...named,
|
|
3152
3152
|
aggregate: agent_requests_name.optional()
|
|
3153
3153
|
}),
|
|
3154
|
-
|
|
3154
|
+
agent_requests_operation('error', {
|
|
3155
3155
|
...named,
|
|
3156
3156
|
namespace: agent_requests_name.optional()
|
|
3157
3157
|
}),
|
|
3158
|
-
|
|
3159
|
-
|
|
3158
|
+
agent_requests_operation('error-namespace', named),
|
|
3159
|
+
agent_requests_operation('domain-service', {
|
|
3160
3160
|
...named,
|
|
3161
3161
|
...agent_requests_wired
|
|
3162
3162
|
}),
|
|
3163
|
-
|
|
3163
|
+
agent_requests_operation('application-service', {
|
|
3164
3164
|
...named,
|
|
3165
3165
|
...agent_requests_wired
|
|
3166
3166
|
}),
|
|
3167
|
-
|
|
3167
|
+
agent_requests_operation('infrastructure-service', {
|
|
3168
3168
|
...named,
|
|
3169
3169
|
...agent_requests_wired
|
|
3170
3170
|
}),
|
|
3171
|
-
|
|
3171
|
+
agent_requests_operation('presentation-service', {
|
|
3172
3172
|
...named,
|
|
3173
3173
|
...agent_requests_wired
|
|
3174
3174
|
}),
|
|
3175
|
-
|
|
3175
|
+
agent_requests_operation('use-case', {
|
|
3176
3176
|
...named,
|
|
3177
3177
|
...agent_requests_wired
|
|
3178
3178
|
}),
|
|
3179
|
-
|
|
3179
|
+
agent_requests_operation('command', {
|
|
3180
3180
|
...named,
|
|
3181
3181
|
...agent_requests_implementations
|
|
3182
3182
|
}),
|
|
3183
|
-
|
|
3183
|
+
agent_requests_operation('query', {
|
|
3184
3184
|
...named,
|
|
3185
3185
|
...agent_requests_implementations
|
|
3186
3186
|
}),
|
|
3187
|
-
|
|
3187
|
+
agent_requests_operation('port', {
|
|
3188
3188
|
...named,
|
|
3189
3189
|
...agent_requests_implementations
|
|
3190
3190
|
}),
|
|
3191
|
-
|
|
3191
|
+
agent_requests_operation('implementation', {
|
|
3192
3192
|
...common,
|
|
3193
3193
|
...agent_requests_owner,
|
|
3194
3194
|
contract: agent_requests_id.describe('Exact contract ID from --describe.'),
|
|
@@ -3196,7 +3196,7 @@ const scaffoldRequestSchema = external_zod_default().discriminatedUnion('operati
|
|
|
3196
3196
|
environments: external_zod_default().array(agent_requests_name).min(1).optional().describe('Required when the contract wire is envBranchedWire; omit it otherwise.'),
|
|
3197
3197
|
...agent_requests_wired
|
|
3198
3198
|
}),
|
|
3199
|
-
|
|
3199
|
+
agent_requests_operation('endpoint', {
|
|
3200
3200
|
...common,
|
|
3201
3201
|
...agent_requests_owner,
|
|
3202
3202
|
controller: agent_requests_name,
|
|
@@ -3210,18 +3210,18 @@ const scaffoldRequestSchema = external_zod_default().discriminatedUnion('operati
|
|
|
3210
3210
|
path: external_zod_default().string().regex(/^(?:\/?(?:[a-zA-Z0-9_-]+|:[a-zA-Z][a-zA-Z0-9_]*))*\/?$/),
|
|
3211
3211
|
handler: agent_requests_id.optional().describe('Exact handler module ID from --describe. Required when the context has wired queries, commands or use cases; omit it otherwise.')
|
|
3212
3212
|
}),
|
|
3213
|
-
|
|
3213
|
+
agent_requests_operation('wire-dependency', {
|
|
3214
3214
|
...common,
|
|
3215
3215
|
...agent_requests_owner,
|
|
3216
3216
|
module: agent_requests_id.describe('Exact wiring target ID, including implementation class, from --describe.'),
|
|
3217
3217
|
dependencies: agent_requests_dependencies
|
|
3218
3218
|
}),
|
|
3219
|
-
|
|
3219
|
+
agent_requests_operation('delete', {
|
|
3220
3220
|
...common,
|
|
3221
3221
|
...agent_requests_owner,
|
|
3222
3222
|
module: agent_requests_id.describe('Exact unit ID from --describe. Refused while other files use it.')
|
|
3223
3223
|
}),
|
|
3224
|
-
|
|
3224
|
+
agent_requests_operation('move', {
|
|
3225
3225
|
...common,
|
|
3226
3226
|
...agent_requests_owner,
|
|
3227
3227
|
module: agent_requests_id.describe('Exact unit ID from --describe.'),
|
|
@@ -3231,11 +3231,11 @@ const scaffoldRequestSchema = external_zod_default().discriminatedUnion('operati
|
|
|
3231
3231
|
})
|
|
3232
3232
|
]);
|
|
3233
3233
|
const reactRequestSchema = external_zod_default().discriminatedUnion('operation', [
|
|
3234
|
-
|
|
3234
|
+
agent_requests_operation('page', {
|
|
3235
3235
|
...common,
|
|
3236
3236
|
name: agent_requests_nestedName
|
|
3237
3237
|
}),
|
|
3238
|
-
|
|
3238
|
+
agent_requests_operation('widget', {
|
|
3239
3239
|
...common,
|
|
3240
3240
|
name: agent_requests_nestedName,
|
|
3241
3241
|
widgetType: external_zod_default()["enum"]([
|
|
@@ -3244,37 +3244,55 @@ const reactRequestSchema = external_zod_default().discriminatedUnion('operation'
|
|
|
3244
3244
|
'headless'
|
|
3245
3245
|
]).optional()
|
|
3246
3246
|
}),
|
|
3247
|
-
|
|
3247
|
+
agent_requests_operation('ui-kit-component', {
|
|
3248
3248
|
...common,
|
|
3249
3249
|
name: agent_requests_name
|
|
3250
3250
|
}),
|
|
3251
|
-
|
|
3251
|
+
agent_requests_operation('shared-hook', {
|
|
3252
3252
|
...common,
|
|
3253
3253
|
name: agent_requests_name
|
|
3254
3254
|
}),
|
|
3255
|
-
|
|
3255
|
+
agent_requests_operation('move-page', {
|
|
3256
3256
|
...common,
|
|
3257
3257
|
module: agent_requests_nestedName,
|
|
3258
3258
|
name: agent_requests_nestedName,
|
|
3259
3259
|
moveRoute: external_zod_default().boolean().optional().describe('With Next.js and a route at the page path: move it too (default true). Omit it without such a route.')
|
|
3260
3260
|
}),
|
|
3261
|
-
|
|
3261
|
+
agent_requests_operation('delete-page', {
|
|
3262
3262
|
...common,
|
|
3263
3263
|
module: agent_requests_nestedName,
|
|
3264
3264
|
deleteRoute: external_zod_default().boolean().optional().describe("With Next.js and the page's own route: delete it too (default true). Omit it without such a route.")
|
|
3265
3265
|
}),
|
|
3266
|
-
|
|
3266
|
+
agent_requests_operation('delete-widget', {
|
|
3267
3267
|
...common,
|
|
3268
3268
|
module: agent_requests_nestedName
|
|
3269
3269
|
}),
|
|
3270
|
-
|
|
3270
|
+
agent_requests_operation('move-ui-kit-component', {
|
|
3271
|
+
...common,
|
|
3272
|
+
module: agent_requests_name,
|
|
3273
|
+
name: agent_requests_name
|
|
3274
|
+
}),
|
|
3275
|
+
agent_requests_operation('move-shared-hook', {
|
|
3276
|
+
...common,
|
|
3277
|
+
module: agent_requests_name,
|
|
3278
|
+
name: agent_requests_name
|
|
3279
|
+
}),
|
|
3280
|
+
agent_requests_operation('delete-ui-kit-component', {
|
|
3281
|
+
...common,
|
|
3282
|
+
module: agent_requests_name
|
|
3283
|
+
}),
|
|
3284
|
+
agent_requests_operation('delete-shared-hook', {
|
|
3285
|
+
...common,
|
|
3286
|
+
module: agent_requests_name
|
|
3287
|
+
}),
|
|
3288
|
+
agent_requests_operation('move-widget', {
|
|
3271
3289
|
...common,
|
|
3272
3290
|
module: agent_requests_nestedName,
|
|
3273
3291
|
name: agent_requests_nestedName
|
|
3274
3292
|
})
|
|
3275
3293
|
]);
|
|
3276
3294
|
const agent_requests_relativePath = external_zod_default().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.');
|
|
3277
|
-
const integrationRequestSchema =
|
|
3295
|
+
const integrationRequestSchema = agent_requests_operation('add', {
|
|
3278
3296
|
...common,
|
|
3279
3297
|
integrations: external_zod_default().array(external_zod_default()["enum"](integrationIds)).min(1),
|
|
3280
3298
|
nextAdapter: external_zod_default().boolean().optional(),
|
|
@@ -3972,6 +3990,66 @@ const inMemoryRepositoryWiring = (ownerFolder, unit, wireFile)=>(implementation,
|
|
|
3972
3990
|
wireInMemoryDb(wireFile, implementation.className);
|
|
3973
3991
|
return true;
|
|
3974
3992
|
};
|
|
3993
|
+
const reactKindLayouts = {
|
|
3994
|
+
page: {
|
|
3995
|
+
folder: 'pages',
|
|
3996
|
+
nested: true,
|
|
3997
|
+
inFolder: false,
|
|
3998
|
+
ownFile: (fileBase)=>new RegExp(`^${escapeRegExp(fileBase)}-page(?:\\.|$)`),
|
|
3999
|
+
target: (reactFolder, { folders, fileName })=>external_node_path_default().join(reactFolder, 'pages', ...folders, `${fileName}-page.tsx`),
|
|
4000
|
+
classPrefix: '(use)?',
|
|
4001
|
+
classSuffix: 'Page'
|
|
4002
|
+
},
|
|
4003
|
+
widget: {
|
|
4004
|
+
folder: 'widgets',
|
|
4005
|
+
nested: true,
|
|
4006
|
+
inFolder: true,
|
|
4007
|
+
target: (reactFolder, { folders, folderName })=>external_node_path_default().join(reactFolder, 'widgets', ...folders, folderName),
|
|
4008
|
+
classPrefix: '(use)?',
|
|
4009
|
+
classSuffix: 'Widget|UIModel',
|
|
4010
|
+
storyTitle: (segments)=>[
|
|
4011
|
+
'Widgets',
|
|
4012
|
+
...segments
|
|
4013
|
+
].join('/')
|
|
4014
|
+
},
|
|
4015
|
+
'ui-kit': {
|
|
4016
|
+
folder: 'ui-kit',
|
|
4017
|
+
nested: false,
|
|
4018
|
+
inFolder: true,
|
|
4019
|
+
target: (reactFolder, { fileName })=>external_node_path_default().join(reactFolder, 'ui-kit', fileName),
|
|
4020
|
+
classPrefix: '()',
|
|
4021
|
+
classSuffix: 'Props(?![\\w$])|(?![\\w$])',
|
|
4022
|
+
storyTitle: (segments)=>`UI-kit/${segments.join('')}`
|
|
4023
|
+
},
|
|
4024
|
+
hook: {
|
|
4025
|
+
folder: 'hooks',
|
|
4026
|
+
nested: false,
|
|
4027
|
+
inFolder: false,
|
|
4028
|
+
ownFile: (fileBase)=>new RegExp(`^use-${escapeRegExp(fileBase)}(?:\\.|$)`),
|
|
4029
|
+
target: (reactFolder, { fileName })=>external_node_path_default().join(reactFolder, 'hooks', `use-${fileName}.ts`),
|
|
4030
|
+
classPrefix: '(use)',
|
|
4031
|
+
classSuffix: '(?![\\w$])'
|
|
4032
|
+
}
|
|
4033
|
+
};
|
|
4034
|
+
const reactKindTitles = {
|
|
4035
|
+
page: [
|
|
4036
|
+
'Page',
|
|
4037
|
+
'pages'
|
|
4038
|
+
],
|
|
4039
|
+
widget: [
|
|
4040
|
+
'Widget',
|
|
4041
|
+
'widgets'
|
|
4042
|
+
],
|
|
4043
|
+
'ui-kit': [
|
|
4044
|
+
'UI-kit component',
|
|
4045
|
+
'UI-kit components'
|
|
4046
|
+
],
|
|
4047
|
+
hook: [
|
|
4048
|
+
'Shared hook',
|
|
4049
|
+
'shared hooks'
|
|
4050
|
+
]
|
|
4051
|
+
};
|
|
4052
|
+
const reactModuleName = (kind, rawName)=>'hook' === kind ? rawName.trim().replace(/^use-/, '') : rawName;
|
|
3975
4053
|
const react_module_move_nestedName = (folders, fileBase)=>{
|
|
3976
4054
|
const prefix = `${folders.join('-')}-`;
|
|
3977
4055
|
const last = folders.length && fileBase.startsWith(prefix) ? fileBase.slice(prefix.length) : fileBase;
|
|
@@ -3985,8 +4063,36 @@ const declaredClassName = (filePath, suffix, name)=>{
|
|
|
3985
4063
|
const declared = content.match(new RegExp(`export\\s+(?:const|function)\\s+(\\w+)${suffix}\\b`))?.[1];
|
|
3986
4064
|
return declared ?? new NestedName(name).ClassName;
|
|
3987
4065
|
};
|
|
4066
|
+
const findUiKit = (reactFolder)=>{
|
|
4067
|
+
const root = external_node_path_default().join(reactFolder, 'ui-kit');
|
|
4068
|
+
if (!external_node_fs_default().existsSync(root)) return [];
|
|
4069
|
+
return external_node_fs_default().readdirSync(root, {
|
|
4070
|
+
withFileTypes: true
|
|
4071
|
+
}).filter((entry)=>entry.isDirectory() && external_node_fs_default().existsSync(external_node_path_default().join(root, entry.name, `${entry.name}.tsx`))).map(({ name })=>({
|
|
4072
|
+
kind: 'ui-kit',
|
|
4073
|
+
name,
|
|
4074
|
+
path: external_node_path_default().join(root, name),
|
|
4075
|
+
fileBase: name,
|
|
4076
|
+
ClassName: declaredClassName(external_node_path_default().join(root, name, `${name}.tsx`), '', name)
|
|
4077
|
+
}));
|
|
4078
|
+
};
|
|
4079
|
+
const findHooks = (reactFolder)=>{
|
|
4080
|
+
const root = external_node_path_default().join(reactFolder, 'hooks');
|
|
4081
|
+
if (!external_node_fs_default().existsSync(root)) return [];
|
|
4082
|
+
return external_node_fs_default().readdirSync(root).filter((file)=>/^use-.+\.tsx?$/.test(file) && !/\.(spec|test)\./.test(file)).map((file)=>{
|
|
4083
|
+
const name = file.replace(/^use-/, '').replace(/\.tsx?$/, '');
|
|
4084
|
+
const content = external_node_fs_default().readFileSync(external_node_path_default().join(root, file), 'utf8');
|
|
4085
|
+
return {
|
|
4086
|
+
kind: 'hook',
|
|
4087
|
+
name,
|
|
4088
|
+
path: external_node_path_default().join(root, file),
|
|
4089
|
+
fileBase: name,
|
|
4090
|
+
ClassName: content.match(/export\s+(?:const|function)\s+use(\w+)\b/)?.[1] ?? new NestedName(name).ClassName
|
|
4091
|
+
};
|
|
4092
|
+
});
|
|
4093
|
+
};
|
|
3988
4094
|
const findReactModules = (reactFolder, kind)=>{
|
|
3989
|
-
const modules = 'page' === kind ? module_move_walk(external_node_path_default().join(reactFolder, 'pages')).filter((file)=>file.endsWith('-page.tsx')).map((file)=>{
|
|
4095
|
+
const modules = 'ui-kit' === kind ? findUiKit(reactFolder) : 'hook' === kind ? findHooks(reactFolder) : 'page' === kind ? module_move_walk(external_node_path_default().join(reactFolder, 'pages')).filter((file)=>file.endsWith('-page.tsx')).map((file)=>{
|
|
3990
4096
|
const folders = external_node_path_default().relative(external_node_path_default().join(reactFolder, 'pages'), external_node_path_default().dirname(file)).split(external_node_path_default().sep).filter((segment)=>!!segment);
|
|
3991
4097
|
const fileBase = external_node_path_default().basename(file, '-page.tsx');
|
|
3992
4098
|
const name = react_module_move_nestedName(folders, fileBase);
|
|
@@ -4010,13 +4116,11 @@ const findReactModules = (reactFolder, kind)=>{
|
|
|
4010
4116
|
});
|
|
4011
4117
|
return modules.sort((a, b)=>a.name.localeCompare(b.name));
|
|
4012
4118
|
};
|
|
4013
|
-
const react_module_move_targetPath = (reactFolder, module, rawName)=>
|
|
4014
|
-
const { folders, folderName, fileName } = new NestedName(rawName);
|
|
4015
|
-
return 'page' === module.kind ? external_node_path_default().join(reactFolder, 'pages', ...folders, `${fileName}-page.tsx`) : external_node_path_default().join(reactFolder, 'widgets', ...folders, folderName);
|
|
4016
|
-
};
|
|
4119
|
+
const react_module_move_targetPath = (reactFolder, module, rawName)=>reactKindLayouts[module.kind].target(reactFolder, new NestedName(reactModuleName(module.kind, rawName)));
|
|
4017
4120
|
const validateMove = (reactFolder, module, rawName)=>{
|
|
4018
4121
|
const nameError = NestedName.validate(rawName);
|
|
4019
4122
|
if (true !== nameError) return nameError;
|
|
4123
|
+
if (!reactKindLayouts[module.kind].nested && /[\\/]/.test(rawName)) return 'UI-kit components and shared hooks have no folders: enter a name without "/"';
|
|
4020
4124
|
const target = react_module_move_targetPath(reactFolder, module, rawName);
|
|
4021
4125
|
if (target !== module.path && external_node_fs_default().existsSync(target)) return `${external_node_path_default().relative(reactFolder, target)} already exists`;
|
|
4022
4126
|
if (target.startsWith(`${module.path}${external_node_path_default().sep}`)) return 'A widget cannot be moved into itself';
|
|
@@ -4030,13 +4134,14 @@ const routeFiles = (folder)=>external_node_fs_default().existsSync(folder) ? ext
|
|
|
4030
4134
|
withFileTypes: true
|
|
4031
4135
|
}).filter((entry)=>entry.isFile()).map((entry)=>external_node_path_default().join(folder, entry.name)) : [];
|
|
4032
4136
|
const moveReactModule = (projectRoot, reactFolder, module, rawName, route)=>{
|
|
4033
|
-
const
|
|
4137
|
+
const layout = reactKindLayouts[module.kind];
|
|
4138
|
+
const newName = new NestedName(reactModuleName(module.kind, rawName));
|
|
4034
4139
|
const target = react_module_move_targetPath(reactFolder, module, rawName);
|
|
4035
4140
|
const newClassName = newName.ClassName;
|
|
4036
|
-
const renameFile = (name)=>name.replace(new RegExp(`^(use-)?${escapeRegExp(module.fileBase)}(?=[-.])`), (_, use = '')=>`${use}${newName.fileName}`);
|
|
4037
|
-
const oldFolder =
|
|
4038
|
-
const newFolder =
|
|
4039
|
-
const ownsPath = (candidate)=>
|
|
4141
|
+
const renameFile = (name)=>name.replace(new RegExp(`^(use-)?${escapeRegExp(module.fileBase)}(?=[-.]|$)`), (_, use = '')=>`${use}${newName.fileName}`);
|
|
4142
|
+
const oldFolder = layout.inFolder ? module.path : external_node_path_default().dirname(module.path);
|
|
4143
|
+
const newFolder = layout.inFolder ? target : external_node_path_default().dirname(target);
|
|
4144
|
+
const ownsPath = (candidate)=>layout.inFolder ? candidate === oldFolder || candidate.startsWith(`${oldFolder}${external_node_path_default().sep}`) : external_node_path_default().dirname(candidate) === oldFolder && layout.ownFile(module.fileBase).test(external_node_path_default().basename(candidate));
|
|
4040
4145
|
const routeFileSet = new Set(route ? routeFiles(route.from) : []);
|
|
4041
4146
|
const routeTarget = (candidate)=>{
|
|
4042
4147
|
if (!route) return;
|
|
@@ -4056,7 +4161,7 @@ const moveReactModule = (projectRoot, reactFolder, module, rawName, route)=>{
|
|
|
4056
4161
|
segments[last] = renameFile(segments[last]);
|
|
4057
4162
|
return external_node_path_default().join(newFolder, ...segments);
|
|
4058
4163
|
};
|
|
4059
|
-
const moduleFiles =
|
|
4164
|
+
const moduleFiles = reactModuleFiles(module);
|
|
4060
4165
|
const moves = new Map([
|
|
4061
4166
|
...moduleFiles,
|
|
4062
4167
|
...routeFileSet
|
|
@@ -4064,14 +4169,14 @@ const moveReactModule = (projectRoot, reactFolder, module, rawName, route)=>{
|
|
|
4064
4169
|
file,
|
|
4065
4170
|
movedPath(file) ?? file
|
|
4066
4171
|
]));
|
|
4067
|
-
const
|
|
4068
|
-
const
|
|
4069
|
-
|
|
4070
|
-
|
|
4071
|
-
const
|
|
4072
|
-
|
|
4073
|
-
|
|
4074
|
-
].
|
|
4172
|
+
const classPattern = new RegExp(`(?<![\\w$])${layout.classPrefix}${escapeRegExp(module.ClassName)}(?=${layout.classSuffix})`, 'g');
|
|
4173
|
+
const oldTitle = layout.storyTitle?.('ui-kit' === module.kind ? [
|
|
4174
|
+
module.ClassName
|
|
4175
|
+
] : module.name.split('/').map((segment)=>new NestedName(segment).ClassName));
|
|
4176
|
+
const titlePattern = oldTitle && new RegExp(`(['"\`])${escapeRegExp(oldTitle)}\\1`, 'g');
|
|
4177
|
+
const newTitle = layout.storyTitle?.('ui-kit' === module.kind ? [
|
|
4178
|
+
newClassName
|
|
4179
|
+
] : newName.classNameSegments);
|
|
4075
4180
|
return stageModuleMove({
|
|
4076
4181
|
projectRoot,
|
|
4077
4182
|
stopAt: reactFolder,
|
|
@@ -4079,8 +4184,8 @@ const moveReactModule = (projectRoot, reactFolder, module, rawName, route)=>{
|
|
|
4079
4184
|
moves,
|
|
4080
4185
|
movedPath,
|
|
4081
4186
|
rename: (content, { moved })=>{
|
|
4082
|
-
const renamed = content.replace(classPattern, (_, use
|
|
4083
|
-
return moved &&
|
|
4187
|
+
const renamed = content.replace(classPattern, (_, use)=>`${use ?? ''}${newClassName}`);
|
|
4188
|
+
return moved && titlePattern ? renamed.replace(titlePattern, (_, quote)=>`${quote}${newTitle}${quote}`) : renamed;
|
|
4084
4189
|
}
|
|
4085
4190
|
});
|
|
4086
4191
|
};
|
|
@@ -4090,9 +4195,10 @@ const pageRouteFolder = (appFolder, page)=>{
|
|
|
4090
4195
|
return external_node_fs_default().existsSync(routePage) && new RegExp(`(?<![\\w$])${page.ClassName}Page(?![\\w$])`).test(external_node_fs_default().readFileSync(routePage, 'utf8')) ? folder : void 0;
|
|
4091
4196
|
};
|
|
4092
4197
|
const reactModuleFiles = (module)=>{
|
|
4093
|
-
|
|
4198
|
+
const layout = reactKindLayouts[module.kind];
|
|
4199
|
+
if (layout.inFolder) return module_move_walk(module.path);
|
|
4094
4200
|
const folder = external_node_path_default().dirname(module.path);
|
|
4095
|
-
const own =
|
|
4201
|
+
const own = layout.ownFile(module.fileBase);
|
|
4096
4202
|
return external_node_fs_default().readdirSync(folder, {
|
|
4097
4203
|
withFileTypes: true
|
|
4098
4204
|
}).filter((entry)=>entry.isFile() && own.test(entry.name)).map((entry)=>external_node_path_default().join(folder, entry.name));
|
|
@@ -4106,7 +4212,7 @@ const deleteReactModule = (projectRoot, reactFolder, module, route)=>{
|
|
|
4106
4212
|
...routeFileList
|
|
4107
4213
|
]);
|
|
4108
4214
|
const stems = new Set(moduleFiles.map((file)=>file.replace(codeExtension, '')));
|
|
4109
|
-
const isModule = (resolved)=>stems.has(resolved) ||
|
|
4215
|
+
const isModule = (resolved)=>stems.has(resolved) || reactKindLayouts[module.kind].inFolder && (resolved === module.path || resolved.startsWith(`${module.path}${external_node_path_default().sep}`));
|
|
4110
4216
|
const { codeFiles, resolve } = projectImports(projectRoot);
|
|
4111
4217
|
const relative = (file)=>toPosix(external_node_path_default().relative(projectRoot, file));
|
|
4112
4218
|
const usedBy = [];
|
|
@@ -4197,11 +4303,11 @@ const deleteBackendUnitUseCase = async (ownerFolder)=>{
|
|
|
4197
4303
|
const deleteReactModuleUseCase = async (presentationReactFolder, kind)=>{
|
|
4198
4304
|
const reactFolder = presentationReactFolder.path;
|
|
4199
4305
|
const modules = findReactModules(reactFolder, kind);
|
|
4200
|
-
if (!modules.length) return void report(`No ${kind}
|
|
4306
|
+
if (!modules.length) return void report(`No ${reactKindTitles[kind][1]} generated by df-react were found.`);
|
|
4201
4307
|
const module = await interaction_select({
|
|
4202
4308
|
key: 'module',
|
|
4203
4309
|
id: (value)=>value.name,
|
|
4204
|
-
message:
|
|
4310
|
+
message: `${reactKindTitles[kind][0]} to delete:`,
|
|
4205
4311
|
choices: modules.map((value)=>({
|
|
4206
4312
|
name: value.name,
|
|
4207
4313
|
value,
|
|
@@ -4367,11 +4473,11 @@ const promptRouteMove = async (root, page, newName)=>{
|
|
|
4367
4473
|
const moveReactModuleUseCase = async (presentationReactFolder, kind)=>{
|
|
4368
4474
|
const reactFolder = presentationReactFolder.path;
|
|
4369
4475
|
const modules = findReactModules(reactFolder, kind);
|
|
4370
|
-
if (!modules.length) return void report(`No ${kind}
|
|
4476
|
+
if (!modules.length) return void report(`No ${reactKindTitles[kind][1]} generated by df-react were found.`);
|
|
4371
4477
|
const module = await interaction_select({
|
|
4372
4478
|
key: 'module',
|
|
4373
4479
|
id: (value)=>value.name,
|
|
4374
|
-
message:
|
|
4480
|
+
message: `${reactKindTitles[kind][0]}:`,
|
|
4375
4481
|
choices: modules.map((value)=>({
|
|
4376
4482
|
name: value.name,
|
|
4377
4483
|
value,
|
|
@@ -4380,7 +4486,7 @@ const moveReactModuleUseCase = async (presentationReactFolder, kind)=>{
|
|
|
4380
4486
|
});
|
|
4381
4487
|
const name = await interaction_input({
|
|
4382
4488
|
key: 'name',
|
|
4383
|
-
message: 'New name (folders split by "/"):',
|
|
4489
|
+
message: reactKindLayouts[kind].nested ? 'New name (folders split by "/"):' : 'New name:',
|
|
4384
4490
|
default: module.name,
|
|
4385
4491
|
validate: (value)=>validateMove(reactFolder, module, value)
|
|
4386
4492
|
});
|
|
@@ -5736,7 +5842,9 @@ const describeAgentCommand = (command)=>{
|
|
|
5736
5842
|
integrations: integrationDescriptionsSafe(configured),
|
|
5737
5843
|
reactModules: config?.frontend?.react ? [
|
|
5738
5844
|
'page',
|
|
5739
|
-
'widget'
|
|
5845
|
+
'widget',
|
|
5846
|
+
'ui-kit',
|
|
5847
|
+
'hook'
|
|
5740
5848
|
].flatMap((kind)=>findReactModules(external_node_path_default().join(root, config.project.rootFolder, 'presentation/react'), kind).map((module)=>({
|
|
5741
5849
|
kind,
|
|
5742
5850
|
name: module.name,
|
|
@@ -5846,7 +5954,9 @@ const executeReact = async (request)=>{
|
|
|
5846
5954
|
config_file_ConfigFile.Instance.data.project.rootFolder,
|
|
5847
5955
|
'presentation/react'
|
|
5848
5956
|
]);
|
|
5849
|
-
|
|
5957
|
+
const kindOf = (operation)=>operation.endsWith('-page') ? 'page' : operation.endsWith('-widget') ? 'widget' : operation.endsWith('-ui-kit-component') ? 'ui-kit' : operation.endsWith('-shared-hook') ? 'hook' : void 0;
|
|
5958
|
+
const kind = /^(move|delete)-/.test(request.operation) ? kindOf(request.operation) : void 0;
|
|
5959
|
+
if (kind && !findReactModules(folder.path, kind).length) throw new RequestError('TARGET_NOT_FOUND', `No React ${reactKindTitles[kind][1]} here.`);
|
|
5850
5960
|
const actions = {
|
|
5851
5961
|
page: ()=>scaffoldReactPage(folder),
|
|
5852
5962
|
widget: ()=>scaffoldReactWidget(folder),
|
|
@@ -5855,7 +5965,11 @@ const executeReact = async (request)=>{
|
|
|
5855
5965
|
'move-page': ()=>moveReactModuleUseCase(folder, 'page'),
|
|
5856
5966
|
'move-widget': ()=>moveReactModuleUseCase(folder, 'widget'),
|
|
5857
5967
|
'delete-page': ()=>deleteReactModuleUseCase(folder, 'page'),
|
|
5858
|
-
'delete-widget': ()=>deleteReactModuleUseCase(folder, 'widget')
|
|
5968
|
+
'delete-widget': ()=>deleteReactModuleUseCase(folder, 'widget'),
|
|
5969
|
+
'move-ui-kit-component': ()=>moveReactModuleUseCase(folder, 'ui-kit'),
|
|
5970
|
+
'move-shared-hook': ()=>moveReactModuleUseCase(folder, 'hook'),
|
|
5971
|
+
'delete-ui-kit-component': ()=>deleteReactModuleUseCase(folder, 'ui-kit'),
|
|
5972
|
+
'delete-shared-hook': ()=>deleteReactModuleUseCase(folder, 'hook')
|
|
5859
5973
|
};
|
|
5860
5974
|
return actions[request.operation]();
|
|
5861
5975
|
};
|
|
@@ -1,16 +1,39 @@
|
|
|
1
1
|
import { type MovePlan } from './module-move';
|
|
2
|
+
import { NestedName } from './nested-name';
|
|
2
3
|
export type { MovePlan } from './module-move';
|
|
3
|
-
export type ReactModuleKind = 'page' | 'widget';
|
|
4
|
+
export type ReactModuleKind = 'page' | 'widget' | 'ui-kit' | 'hook';
|
|
4
5
|
export type ReactModule = {
|
|
5
6
|
kind: ReactModuleKind;
|
|
6
|
-
/**
|
|
7
|
+
/** Name, nested for pages and widgets, e.g. `admin/users`. */
|
|
7
8
|
name: string;
|
|
8
|
-
/** The page file
|
|
9
|
+
/** The page or hook file; the widget or UI-kit folder. */
|
|
9
10
|
path: string;
|
|
10
11
|
/** The name part of file names, e.g. `admin-users` in `admin-users-page.tsx`. */
|
|
11
12
|
fileBase: string;
|
|
12
13
|
ClassName: string;
|
|
13
14
|
};
|
|
15
|
+
type ReactKindLayout = {
|
|
16
|
+
/** Folder under `presentation/react`. */
|
|
17
|
+
folder: string;
|
|
18
|
+
/** Names may contain folders (`admin/users`). */
|
|
19
|
+
nested: boolean;
|
|
20
|
+
/** The module is a folder (widget, UI-kit) rather than files. */
|
|
21
|
+
inFolder: boolean;
|
|
22
|
+
/** For file modules: the files of a module, by file base. */
|
|
23
|
+
ownFile?: (fileBase: string) => RegExp;
|
|
24
|
+
/** Where a module of this name lives. */
|
|
25
|
+
target: (reactFolder: string, name: NestedName) => string;
|
|
26
|
+
/** Code names: a prefix group and what follows the class name. */
|
|
27
|
+
classPrefix: string;
|
|
28
|
+
classSuffix: string;
|
|
29
|
+
/** Generated story title, followed by renames. */
|
|
30
|
+
storyTitle?: (segments: string[]) => string;
|
|
31
|
+
};
|
|
32
|
+
export declare const reactKindLayouts: Record<ReactModuleKind, ReactKindLayout>;
|
|
33
|
+
/** How menus name each kind, singular and plural. */
|
|
34
|
+
export declare const reactKindTitles: Record<ReactModuleKind, [string, string]>;
|
|
35
|
+
/** A hook's name is entered without `use-`, as its generator takes it. */
|
|
36
|
+
export declare const reactModuleName: (kind: ReactModuleKind, rawName: string) => string;
|
|
14
37
|
export declare const findReactModules: (reactFolder: string, kind: ReactModuleKind) => ReactModule[];
|
|
15
38
|
export declare const validateMove: (reactFolder: string, module: ReactModule, rawName: string) => string | true;
|
|
16
39
|
/** A Next.js App Router route folder moved with a page. */
|