@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/dist/index.cjs CHANGED
@@ -3267,6 +3267,24 @@ const reactRequestSchema = external_zod_default().discriminatedUnion('operation'
3267
3267
  ...common,
3268
3268
  module: agent_requests_nestedName
3269
3269
  }),
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
+ }),
3270
3288
  agent_requests_operation('move-widget', {
3271
3289
  ...common,
3272
3290
  module: agent_requests_nestedName,
@@ -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 newName = new NestedName(rawName);
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 = 'page' === module.kind ? external_node_path_default().dirname(module.path) : module.path;
4038
- const newFolder = 'page' === module.kind ? external_node_path_default().dirname(target) : target;
4039
- const ownsPath = (candidate)=>'page' === module.kind ? external_node_path_default().dirname(candidate) === oldFolder && new RegExp(`^${escapeRegExp(module.fileBase)}-page(?:\\.|$)`).test(external_node_path_default().basename(candidate)) : candidate === oldFolder || candidate.startsWith(`${oldFolder}${external_node_path_default().sep}`);
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 = 'page' === module.kind ? external_node_fs_default().readdirSync(oldFolder).map((name)=>external_node_path_default().join(oldFolder, name)).filter((file)=>external_node_fs_default().statSync(file).isFile() && ownsPath(file)) : module_move_walk(oldFolder);
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 suffixes = 'page' === module.kind ? 'Page' : 'Widget|UIModel';
4068
- const classPattern = new RegExp(`(?<![\\w$])(use)?${escapeRegExp(module.ClassName)}(?=${suffixes})`, 'g');
4069
- const oldTitle = `Widgets/${module.name.split('/').map((segment)=>new NestedName(segment).ClassName).join('/')}`;
4070
- const titlePattern = new RegExp(`(['"\`])${escapeRegExp(oldTitle)}\\1`, 'g');
4071
- const newTitle = [
4072
- 'Widgets',
4073
- ...newName.classNameSegments
4074
- ].join('/');
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 = '')=>`${use}${newClassName}`);
4083
- return moved && 'widget' === module.kind ? renamed.replace(titlePattern, (_, quote)=>`${quote}${newTitle}${quote}`) : renamed;
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
- if ('widget' === module.kind) return module_move_walk(module.path);
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 = new RegExp(`^${escapeRegExp(module.fileBase)}-page(?:\\.|$)`);
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) || 'widget' === module.kind && (resolved === module.path || resolved.startsWith(`${module.path}${external_node_path_default().sep}`));
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}s generated by df-react were found.`);
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: 'page' === kind ? 'Page to delete:' : 'Widget to delete:',
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}s generated by df-react were found.`);
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: 'page' === kind ? 'Page:' : 'Widget:',
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
- if (/^(move|delete)-/.test(request.operation) && !findReactModules(folder.path, request.operation.endsWith('-page') ? 'page' : 'widget').length) throw new RequestError('TARGET_NOT_FOUND', `No React ${request.operation.endsWith('-page') ? 'pages' : 'widgets'} here.`);
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
  };