@domain-first/project-structure 2.16.1 → 2.16.2

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
@@ -2483,12 +2483,18 @@ export const restHandlers = restWires.map(x => x().handle)
2483
2483
  const routeSegments = (await (0, prompts_namespaceObject.input)({
2484
2484
  message: 'Relative path (split by "/"):'
2485
2485
  })).split('/').filter((x)=>!!x);
2486
+ const pathParameterAsName = (segment)=>segment.startsWith(':') ? `_${segment.slice(1)}_` : segment;
2486
2487
  const controllerFolder = restPresentationFolder.subitem([
2487
2488
  controller
2488
2489
  ]);
2489
- const endpointFolder = controllerFolder.subitem(routeSegments);
2490
- const nameBase = `${controller}-${routeSegments.length ? `${routeSegments.join('-')}-` : ''}${method}-endpoint`;
2491
- const endpointNaming = new UnknownFormatNaming(nameBase);
2490
+ const endpointFolder = controllerFolder.subitem(routeSegments.map(pathParameterAsName));
2491
+ const nameBase = `${controller}-${routeSegments.length ? `${routeSegments.map(pathParameterAsName).join('-')}-` : ''}${method}-endpoint`;
2492
+ const endpointClassName = [
2493
+ controller,
2494
+ ...routeSegments,
2495
+ method,
2496
+ 'endpoint'
2497
+ ].map((segment)=>segment.startsWith(':') ? pathParameterAsName(segment) : new UnknownFormatNaming(segment).ClassName).join('');
2492
2498
  const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
2493
2499
  const { endpointGenerator, handler } = withWiring ? await promptEndpointDependencies(boundedContextFolder) : {
2494
2500
  endpointGenerator: void 0,
@@ -2499,7 +2505,7 @@ export const restHandlers = restWires.map(x => x().handle)
2499
2505
  ${endpointGenerator ? `import type { ${endpointGenerator.typeName} } from '${relativeImport(endpointFile, endpointGenerator.typeFile)}'` : "import { EndpointGenerator } from '@domain-first/handlers-rest'"}${handler ? `
2500
2506
  import type { ${handler.typeName} } from '${relativeImport(endpointFile, handler.typeFile)}'` : ''}
2501
2507
 
2502
- export class ${endpointNaming.ClassName} {
2508
+ export class ${endpointClassName} {
2503
2509
  constructor(
2504
2510
  private readonly endpointGenerator: ${endpointGenerator?.typeName ?? 'EndpointGenerator'},
2505
2511
  private readonly handler: ${handler?.typeName ?? 'never'}
@@ -2529,11 +2535,11 @@ export class ${endpointNaming.ClassName} {
2529
2535
  ].filter((x)=>!!x) : [];
2530
2536
  wiringFolder.createFile(`${wireNaming.fileName}.ts`, `
2531
2537
  import { wireClass } from '@domain-first/wire'
2532
- import { ${endpointNaming.ClassName} } from '${relativeImport(wireFile, endpointFile)}'
2538
+ import { ${endpointClassName} } from '${relativeImport(wireFile, endpointFile)}'
2533
2539
  ${dependencies.map((x)=>`import { ${x.wireName} } from '${relativeImport(wireFile, x.wireFile)}'`).join('\n')}
2534
2540
 
2535
- export const wire${endpointNaming.ClassName} = wireClass(
2536
- ${endpointNaming.ClassName},
2541
+ export const wire${endpointClassName} = wireClass(
2542
+ ${endpointClassName},
2537
2543
  [${dependencies.map((x)=>x.wireName).join(', ')}]
2538
2544
  )
2539
2545
  `.trim());
package/dist/index.js CHANGED
@@ -2453,12 +2453,18 @@ export const restHandlers = restWires.map(x => x().handle)
2453
2453
  const routeSegments = (await input({
2454
2454
  message: 'Relative path (split by "/"):'
2455
2455
  })).split('/').filter((x)=>!!x);
2456
+ const pathParameterAsName = (segment)=>segment.startsWith(':') ? `_${segment.slice(1)}_` : segment;
2456
2457
  const controllerFolder = restPresentationFolder.subitem([
2457
2458
  controller
2458
2459
  ]);
2459
- const endpointFolder = controllerFolder.subitem(routeSegments);
2460
- const nameBase = `${controller}-${routeSegments.length ? `${routeSegments.join('-')}-` : ''}${method}-endpoint`;
2461
- const endpointNaming = new UnknownFormatNaming(nameBase);
2460
+ const endpointFolder = controllerFolder.subitem(routeSegments.map(pathParameterAsName));
2461
+ const nameBase = `${controller}-${routeSegments.length ? `${routeSegments.map(pathParameterAsName).join('-')}-` : ''}${method}-endpoint`;
2462
+ const endpointClassName = [
2463
+ controller,
2464
+ ...routeSegments,
2465
+ method,
2466
+ 'endpoint'
2467
+ ].map((segment)=>segment.startsWith(':') ? pathParameterAsName(segment) : new UnknownFormatNaming(segment).ClassName).join('');
2462
2468
  const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
2463
2469
  const { endpointGenerator, handler } = withWiring ? await promptEndpointDependencies(boundedContextFolder) : {
2464
2470
  endpointGenerator: void 0,
@@ -2469,7 +2475,7 @@ export const restHandlers = restWires.map(x => x().handle)
2469
2475
  ${endpointGenerator ? `import type { ${endpointGenerator.typeName} } from '${relativeImport(endpointFile, endpointGenerator.typeFile)}'` : "import { EndpointGenerator } from '@domain-first/handlers-rest'"}${handler ? `
2470
2476
  import type { ${handler.typeName} } from '${relativeImport(endpointFile, handler.typeFile)}'` : ''}
2471
2477
 
2472
- export class ${endpointNaming.ClassName} {
2478
+ export class ${endpointClassName} {
2473
2479
  constructor(
2474
2480
  private readonly endpointGenerator: ${endpointGenerator?.typeName ?? 'EndpointGenerator'},
2475
2481
  private readonly handler: ${handler?.typeName ?? 'never'}
@@ -2499,11 +2505,11 @@ export class ${endpointNaming.ClassName} {
2499
2505
  ].filter((x)=>!!x) : [];
2500
2506
  wiringFolder.createFile(`${wireNaming.fileName}.ts`, `
2501
2507
  import { wireClass } from '@domain-first/wire'
2502
- import { ${endpointNaming.ClassName} } from '${relativeImport(wireFile, endpointFile)}'
2508
+ import { ${endpointClassName} } from '${relativeImport(wireFile, endpointFile)}'
2503
2509
  ${dependencies.map((x)=>`import { ${x.wireName} } from '${relativeImport(wireFile, x.wireFile)}'`).join('\n')}
2504
2510
 
2505
- export const wire${endpointNaming.ClassName} = wireClass(
2506
- ${endpointNaming.ClassName},
2511
+ export const wire${endpointClassName} = wireClass(
2512
+ ${endpointClassName},
2507
2513
  [${dependencies.map((x)=>x.wireName).join(', ')}]
2508
2514
  )
2509
2515
  `.trim());
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@domain-first/project-structure",
3
3
  "description": "Build and manage your Domain-First project structure with CLI",
4
- "version": "2.16.1",
4
+ "version": "2.16.2",
5
5
  "type": "module",
6
6
  "repository": {
7
7
  "type": "git",