@domain-first/project-structure 2.7.1 → 2.7.3

package/dist/index.cjs

@@ -282,23 +282,6 @@ describe('${aggregateNaming.withSpaces}', () => {
     if (withRepository) {
         aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.ts`, `export abstract class ${aggregateNaming.ClassName}Repository { }`);
         barrelFile.addLine(`export * from './${aggregateNaming.fileName}-repository'`);
-        if (scaffoldUnitTests) aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { wire${aggregateNaming.ClassName}Repository } from '../../../wiring/repositories/wire-${aggregateNaming.fileName}-repository'
-import type { ${aggregateNaming.ClassName}Repository } from './${aggregateNaming.fileName}-repository'
-
-let ${aggregateNaming.variableName}Repository: ${aggregateNaming.ClassName}Repository
-
-beforeEach(() => {
-    ${aggregateNaming.variableName}Repository = wire${aggregateNaming.ClassName}Repository()
-})
-
-describe('${aggregateNaming.withSpaces} repository', () => {
-    test('can be wired', () => {
-        expect(${aggregateNaming.variableName}Repository).toBeDefined()
-    })
-})
-                `.trim());
         const infrastructureImplementationType = await (0, prompts_namespaceObject.input)({
             message: 'Repository infrastructure implementation type:',
             default: 'prisma'
@@ -333,6 +316,28 @@ export class ${naming.ClassName}${aggregateNaming.ClassName}Repository implement
 
                         `.trim());
         }
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(infrastructureImplementationType);
+            aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `import { wire${aggregateNaming.ClassName}Repository } from '../../../wiring/repositories/wire-${aggregateNaming.fileName}-repository'
+import type { ${aggregateNaming.ClassName}Repository } from './${aggregateNaming.fileName}-repository'` : `import { ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository } from '../../../infrastructure/repositories/${implementationNaming.fileName}/${implementationNaming.fileName}-${aggregateNaming.fileName}-repository'
+
+type ${aggregateNaming.ClassName}Repository = ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository`}
+
+let ${aggregateNaming.variableName}Repository: ${aggregateNaming.ClassName}Repository
+
+beforeEach(() => {
+    ${aggregateNaming.variableName}Repository = ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `wire${aggregateNaming.ClassName}Repository()` : `new ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository()`}
+})
+
+describe('${aggregateNaming.withSpaces} repository', () => {
+    test('can be ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? 'wired' : 'created via constructor'}', () => {
+        expect(${aggregateNaming.variableName}Repository).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(infrastructureImplementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -366,7 +371,7 @@ const scaffoldNewApplicationPort = async (boundedContextFolder)=>{
     });
     const wiringFolder = boundedContextFolder.subitem([
         'wiring',
-        'appication-ports'
+        'application-ports'
     ]);
     const applicationPortsFolder = boundedContextFolder.subitem([
         'application',
@@ -377,23 +382,6 @@ export abstract class ${naming.ClassName} {
 
 }
             `.trim());
-    if (scaffoldUnitTests) applicationPortsFolder.createFile(`${naming.fileName}.spec.ts`, `
-import { define, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName} } from './${naming.fileName}'
-import { wire${naming.ClassName} } from '../../wiring/ports/wire-${naming.fileName}'
-
-let ${naming.variableName}: ${naming.ClassName}
-
-beforeEach(() => {
-    ${naming.variableName} = wire${naming.ClassName}()
-})
-
-define('${naming.withSpaces}', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}).toBeDefined()
-    })
-})
-    `.trim());
     const implementationType = await (0, prompts_namespaceObject.input)({
         message: 'Adapter implementation type:',
         default: 'api'
@@ -426,6 +414,28 @@ export class ${currentNaming.ClassName} extends ${naming.ClassName} {
 }
             `);
     }
+    if (scaffoldUnitTests) {
+        const implementationNaming = new UnknownFormatNaming(implementationType);
+        applicationPortsFolder.createFile(`${naming.fileName}.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `import { type ${naming.ClassName} } from './${naming.fileName}'
+import { wire${naming.ClassName} } from '../../wiring/application-ports/wire-${naming.fileName}'` : `import { ${implementationNaming.ClassName}${naming.ClassName} } from '../../infrastructure/application-adapters/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}'
+
+type ${naming.ClassName} = ${implementationNaming.ClassName}${naming.ClassName}`}
+
+let ${naming.variableName}: ${naming.ClassName}
+
+beforeEach(() => {
+    ${naming.variableName} = ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `wire${naming.ClassName}()` : `new ${implementationNaming.ClassName}${naming.ClassName}()`}
+})
+
+describe('${naming.withSpaces}', () => {
+    test('can be ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}).toBeDefined()
+    })
+})
+            `.trim());
+    }
     if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) wiringFolder.createFile(`wire-${naming.fileName}.ts`, `
 import { wireClass } from '@domain-first/wire'
 import { envBranchedWire } from '../../../${'shared' === boundedContextFolder.name ? '' : '../'}shared/wiring/env-branched-wire'
@@ -544,25 +554,7 @@ const scaffoldNewCommand = async (boundedContextFolder)=>{
         message: 'Command type'
     });
     const isOrchestrator = 'Orchestrator (no infrastructure implementation)' === commandType;
-    if (scaffoldUnitTests) commandsFolder.subitem([
-        isOrchestrator ? 'orchestration' : 'execution'
-    ]).createFile(`${naming.fileName}-command.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
-import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'
-
-let ${naming.variableName}Command: ${naming.ClassName}Command
-
-beforeEach(() => {
-    ${naming.variableName}Command = wire${naming.ClassName}Command()
-})
-
-describe('${naming.withSpaces} command', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}Command).toBeDefined()
-    })
-})
-                `.trim());
+    const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
     if (!isOrchestrator) {
         const implementationType = await (0, prompts_namespaceObject.input)({
             message: 'Command infrastructure implementation type:',
@@ -603,7 +595,7 @@ export class ${formatNaming.ClassName}${naming.ClassName}Command extends ${namin
     })
 }
         `.trim() : `
-import { ${naming.ClassName}Command } from '../../../domain/commands/${naming.fileName}-command'
+import { ${naming.ClassName}Command } from '../../../application/commands/execution/${naming.fileName}-command'
 
 export class ${formatNaming.ClassName}${naming.ClassName}Command extends ${naming.ClassName}Command {
     constructor() {
@@ -624,10 +616,36 @@ export abstract class ${naming.ClassName}Command {
     abstract handle: Handler<typeof ${naming.ClassName}Command.inputSchema, typeof ${naming.ClassName}Command.outputSchema>
 }
                     `.trim());
-        else commandsFolder.createFile(`${naming.fileName}-command.ts`, `
+        else commandsFolder.subitem([
+            'execution'
+        ]).createFile(`${naming.fileName}-command.ts`, `
 export abstract class ${naming.ClassName}Command {
 
 }`.trim());
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(implementationType);
+            commandsFolder.subitem([
+                'execution'
+            ]).createFile(`${naming.fileName}-command.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
+import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'` : `import { ${implementationNaming.ClassName}${naming.ClassName}Command } from '../../../infrastructure/commands/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}-command'
+
+type ${naming.ClassName}Command = ${implementationNaming.ClassName}${naming.ClassName}Command`}
+
+let ${naming.variableName}Command: ${naming.ClassName}Command
+
+beforeEach(() => {
+    ${naming.variableName}Command = ${withWiring ? `wire${naming.ClassName}Command()` : `new ${implementationNaming.ClassName}${naming.ClassName}Command()`}
+})
+
+describe('${naming.withSpaces} command', () => {
+    test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}Command).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(implementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -683,6 +701,25 @@ import { ${naming.ClassName}Command } from '../../application/commands/orchestra
 
 export const wire${naming.ClassName}Command = wireClass(${naming.ClassName}Command, [])
 `.trim());
+    if (scaffoldUnitTests) commandsFolder.subitem([
+        'orchestration'
+    ]).createFile(`${naming.fileName}-command.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
+import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'` : `import { ${naming.ClassName}Command } from './${naming.fileName}-command'`}
+
+let ${naming.variableName}Command: ${naming.ClassName}Command
+
+beforeEach(() => {
+${naming.variableName}Command = ${withWiring ? `wire${naming.ClassName}Command()` : `new ${naming.ClassName}Command()`}
+})
+
+describe('${naming.withSpaces} command', () => {
+test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+    expect(${naming.variableName}Command).toBeDefined()
+})
+})
+        `.trim());
 };
 const scaffoldNewDomainService = async (boundedContextFolder)=>{
     const portName = await (0, prompts_namespaceObject.input)({
@@ -998,25 +1035,7 @@ const scaffoldNewQuery = async (boundedContextFolder)=>{
         message: 'Query type'
     });
     const isOrchestrator = 'Orchestrator (no infrastructure implementation)' === queryType;
-    if (scaffoldUnitTests) queriesFolder.subitem([
-        isOrchestrator ? 'orchestration' : 'execution'
-    ]).createFile(`${naming.fileName}-query.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
-import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'
-
-let ${naming.variableName}Query: ${naming.ClassName}Query
-
-beforeEach(() => {
-    ${naming.variableName}Query = wire${naming.ClassName}Query()
-})
-
-describe('${naming.withSpaces} query', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}Query).toBeDefined()
-    })
-})
-                `.trim());
+    const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
     if (!isOrchestrator) {
         const implementationType = await (0, prompts_namespaceObject.input)({
             message: 'Query infrastructure implementation type:',
@@ -1057,7 +1076,7 @@ export class ${formatNaming.ClassName}${naming.ClassName}Query extends ${naming.
     })
 }
         `.trim() : `
-import { ${naming.ClassName}Query } from '../../../domain/queries/${naming.fileName}-query'
+import { ${naming.ClassName}Query } from '../../../application/queries/execution/${naming.fileName}-query'
 
 export class ${formatNaming.ClassName}${naming.ClassName}Query extends ${naming.ClassName}Query {
     constructor() {
@@ -1078,10 +1097,36 @@ export abstract class ${naming.ClassName}Query {
     abstract handle: Handler<typeof ${naming.ClassName}Query.inputSchema, typeof ${naming.ClassName}Query.outputSchema>
 }
                     `.trim());
-        else queriesFolder.createFile(`${naming.fileName}-query.ts`, `
+        else queriesFolder.subitem([
+            'execution'
+        ]).createFile(`${naming.fileName}-query.ts`, `
 export abstract class ${naming.ClassName}Query {
 
 }`.trim());
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(implementationType);
+            queriesFolder.subitem([
+                'execution'
+            ]).createFile(`${naming.fileName}-query.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
+import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'` : `import { ${implementationNaming.ClassName}${naming.ClassName}Query } from '../../../infrastructure/queries/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}-query'
+
+type ${naming.ClassName}Query = ${implementationNaming.ClassName}${naming.ClassName}Query`}
+
+let ${naming.variableName}Query: ${naming.ClassName}Query
+
+beforeEach(() => {
+    ${naming.variableName}Query = ${withWiring ? `wire${naming.ClassName}Query()` : `new ${implementationNaming.ClassName}${naming.ClassName}Query()`}
+})
+
+describe('${naming.withSpaces} query', () => {
+    test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}Query).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(implementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -1137,6 +1182,25 @@ import { ${naming.ClassName}Query } from '../../application/queries/orchestratio
 
 export const wire${naming.ClassName}Query = wireClass(${naming.ClassName}Query, [])
 `.trim());
+    if (scaffoldUnitTests) queriesFolder.subitem([
+        'orchestration'
+    ]).createFile(`${naming.fileName}-query.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
+import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'` : `import { ${naming.ClassName}Query } from './${naming.fileName}-query'`}
+
+let ${naming.variableName}Query: ${naming.ClassName}Query
+
+beforeEach(() => {
+${naming.variableName}Query = ${withWiring ? `wire${naming.ClassName}Query()` : `new ${naming.ClassName}Query()`}
+})
+
+describe('${naming.withSpaces} query', () => {
+test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+    expect(${naming.variableName}Query).toBeDefined()
+})
+})
+        `.trim());
 };
 const scaffoldNewUseCase = async (boundedContextFolder)=>{
     const useCasesFolder = boundedContextFolder.subitem([

package/dist/index.js

@@ -252,23 +252,6 @@ describe('${aggregateNaming.withSpaces}', () => {
     if (withRepository) {
         aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.ts`, `export abstract class ${aggregateNaming.ClassName}Repository { }`);
         barrelFile.addLine(`export * from './${aggregateNaming.fileName}-repository'`);
-        if (scaffoldUnitTests) aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { wire${aggregateNaming.ClassName}Repository } from '../../../wiring/repositories/wire-${aggregateNaming.fileName}-repository'
-import type { ${aggregateNaming.ClassName}Repository } from './${aggregateNaming.fileName}-repository'
-
-let ${aggregateNaming.variableName}Repository: ${aggregateNaming.ClassName}Repository
-
-beforeEach(() => {
-    ${aggregateNaming.variableName}Repository = wire${aggregateNaming.ClassName}Repository()
-})
-
-describe('${aggregateNaming.withSpaces} repository', () => {
-    test('can be wired', () => {
-        expect(${aggregateNaming.variableName}Repository).toBeDefined()
-    })
-})
-                `.trim());
         const infrastructureImplementationType = await input({
             message: 'Repository infrastructure implementation type:',
             default: 'prisma'
@@ -303,6 +286,28 @@ export class ${naming.ClassName}${aggregateNaming.ClassName}Repository implement
 
                         `.trim());
         }
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(infrastructureImplementationType);
+            aggregatesFolder.createFile(`${aggregateNaming.fileName}-repository.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `import { wire${aggregateNaming.ClassName}Repository } from '../../../wiring/repositories/wire-${aggregateNaming.fileName}-repository'
+import type { ${aggregateNaming.ClassName}Repository } from './${aggregateNaming.fileName}-repository'` : `import { ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository } from '../../../infrastructure/repositories/${implementationNaming.fileName}/${implementationNaming.fileName}-${aggregateNaming.fileName}-repository'
+
+type ${aggregateNaming.ClassName}Repository = ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository`}
+
+let ${aggregateNaming.variableName}Repository: ${aggregateNaming.ClassName}Repository
+
+beforeEach(() => {
+    ${aggregateNaming.variableName}Repository = ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `wire${aggregateNaming.ClassName}Repository()` : `new ${implementationNaming.ClassName}${aggregateNaming.ClassName}Repository()`}
+})
+
+describe('${aggregateNaming.withSpaces} repository', () => {
+    test('can be ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? 'wired' : 'created via constructor'}', () => {
+        expect(${aggregateNaming.variableName}Repository).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(infrastructureImplementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -336,7 +341,7 @@ const scaffoldNewApplicationPort = async (boundedContextFolder)=>{
     });
     const wiringFolder = boundedContextFolder.subitem([
         'wiring',
-        'appication-ports'
+        'application-ports'
     ]);
     const applicationPortsFolder = boundedContextFolder.subitem([
         'application',
@@ -347,23 +352,6 @@ export abstract class ${naming.ClassName} {
 
 }
             `.trim());
-    if (scaffoldUnitTests) applicationPortsFolder.createFile(`${naming.fileName}.spec.ts`, `
-import { define, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName} } from './${naming.fileName}'
-import { wire${naming.ClassName} } from '../../wiring/ports/wire-${naming.fileName}'
-
-let ${naming.variableName}: ${naming.ClassName}
-
-beforeEach(() => {
-    ${naming.variableName} = wire${naming.ClassName}()
-})
-
-define('${naming.withSpaces}', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}).toBeDefined()
-    })
-})
-    `.trim());
     const implementationType = await input({
         message: 'Adapter implementation type:',
         default: 'api'
@@ -396,6 +384,28 @@ export class ${currentNaming.ClassName} extends ${naming.ClassName} {
 }
             `);
     }
+    if (scaffoldUnitTests) {
+        const implementationNaming = new UnknownFormatNaming(implementationType);
+        applicationPortsFolder.createFile(`${naming.fileName}.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `import { type ${naming.ClassName} } from './${naming.fileName}'
+import { wire${naming.ClassName} } from '../../wiring/application-ports/wire-${naming.fileName}'` : `import { ${implementationNaming.ClassName}${naming.ClassName} } from '../../infrastructure/application-adapters/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}'
+
+type ${naming.ClassName} = ${implementationNaming.ClassName}${naming.ClassName}`}
+
+let ${naming.variableName}: ${naming.ClassName}
+
+beforeEach(() => {
+    ${naming.variableName} = ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? `wire${naming.ClassName}()` : `new ${implementationNaming.ClassName}${naming.ClassName}()`}
+})
+
+describe('${naming.withSpaces}', () => {
+    test('can be ${ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire') ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}).toBeDefined()
+    })
+})
+            `.trim());
+    }
     if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) wiringFolder.createFile(`wire-${naming.fileName}.ts`, `
 import { wireClass } from '@domain-first/wire'
 import { envBranchedWire } from '../../../${'shared' === boundedContextFolder.name ? '' : '../'}shared/wiring/env-branched-wire'
@@ -514,25 +524,7 @@ const scaffoldNewCommand = async (boundedContextFolder)=>{
         message: 'Command type'
     });
     const isOrchestrator = 'Orchestrator (no infrastructure implementation)' === commandType;
-    if (scaffoldUnitTests) commandsFolder.subitem([
-        isOrchestrator ? 'orchestration' : 'execution'
-    ]).createFile(`${naming.fileName}-command.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
-import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'
-
-let ${naming.variableName}Command: ${naming.ClassName}Command
-
-beforeEach(() => {
-    ${naming.variableName}Command = wire${naming.ClassName}Command()
-})
-
-describe('${naming.withSpaces} command', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}Command).toBeDefined()
-    })
-})
-                `.trim());
+    const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
     if (!isOrchestrator) {
         const implementationType = await input({
             message: 'Command infrastructure implementation type:',
@@ -573,7 +565,7 @@ export class ${formatNaming.ClassName}${naming.ClassName}Command extends ${namin
     })
 }
         `.trim() : `
-import { ${naming.ClassName}Command } from '../../../domain/commands/${naming.fileName}-command'
+import { ${naming.ClassName}Command } from '../../../application/commands/execution/${naming.fileName}-command'
 
 export class ${formatNaming.ClassName}${naming.ClassName}Command extends ${naming.ClassName}Command {
     constructor() {
@@ -594,10 +586,36 @@ export abstract class ${naming.ClassName}Command {
     abstract handle: Handler<typeof ${naming.ClassName}Command.inputSchema, typeof ${naming.ClassName}Command.outputSchema>
 }
                     `.trim());
-        else commandsFolder.createFile(`${naming.fileName}-command.ts`, `
+        else commandsFolder.subitem([
+            'execution'
+        ]).createFile(`${naming.fileName}-command.ts`, `
 export abstract class ${naming.ClassName}Command {
 
 }`.trim());
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(implementationType);
+            commandsFolder.subitem([
+                'execution'
+            ]).createFile(`${naming.fileName}-command.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
+import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'` : `import { ${implementationNaming.ClassName}${naming.ClassName}Command } from '../../../infrastructure/commands/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}-command'
+
+type ${naming.ClassName}Command = ${implementationNaming.ClassName}${naming.ClassName}Command`}
+
+let ${naming.variableName}Command: ${naming.ClassName}Command
+
+beforeEach(() => {
+    ${naming.variableName}Command = ${withWiring ? `wire${naming.ClassName}Command()` : `new ${implementationNaming.ClassName}${naming.ClassName}Command()`}
+})
+
+describe('${naming.withSpaces} command', () => {
+    test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}Command).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(implementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -653,6 +671,25 @@ import { ${naming.ClassName}Command } from '../../application/commands/orchestra
 
 export const wire${naming.ClassName}Command = wireClass(${naming.ClassName}Command, [])
 `.trim());
+    if (scaffoldUnitTests) commandsFolder.subitem([
+        'orchestration'
+    ]).createFile(`${naming.fileName}-command.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Command } from './${naming.fileName}-command'
+import { wire${naming.ClassName}Command } from '../../../wiring/commands/wire-${naming.fileName}-command'` : `import { ${naming.ClassName}Command } from './${naming.fileName}-command'`}
+
+let ${naming.variableName}Command: ${naming.ClassName}Command
+
+beforeEach(() => {
+${naming.variableName}Command = ${withWiring ? `wire${naming.ClassName}Command()` : `new ${naming.ClassName}Command()`}
+})
+
+describe('${naming.withSpaces} command', () => {
+test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+    expect(${naming.variableName}Command).toBeDefined()
+})
+})
+        `.trim());
 };
 const scaffoldNewDomainService = async (boundedContextFolder)=>{
     const portName = await input({
@@ -968,25 +1005,7 @@ const scaffoldNewQuery = async (boundedContextFolder)=>{
         message: 'Query type'
     });
     const isOrchestrator = 'Orchestrator (no infrastructure implementation)' === queryType;
-    if (scaffoldUnitTests) queriesFolder.subitem([
-        isOrchestrator ? 'orchestration' : 'execution'
-    ]).createFile(`${naming.fileName}-query.spec.ts`, `
-import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
-import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
-import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'
-
-let ${naming.variableName}Query: ${naming.ClassName}Query
-
-beforeEach(() => {
-    ${naming.variableName}Query = wire${naming.ClassName}Query()
-})
-
-describe('${naming.withSpaces} query', () => {
-    test('can be wired', () => {
-        expect(${naming.variableName}Query).toBeDefined()
-    })
-})
-                `.trim());
+    const withWiring = ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire');
     if (!isOrchestrator) {
         const implementationType = await input({
             message: 'Query infrastructure implementation type:',
@@ -1027,7 +1046,7 @@ export class ${formatNaming.ClassName}${naming.ClassName}Query extends ${naming.
     })
 }
         `.trim() : `
-import { ${naming.ClassName}Query } from '../../../domain/queries/${naming.fileName}-query'
+import { ${naming.ClassName}Query } from '../../../application/queries/execution/${naming.fileName}-query'
 
 export class ${formatNaming.ClassName}${naming.ClassName}Query extends ${naming.ClassName}Query {
     constructor() {
@@ -1048,10 +1067,36 @@ export abstract class ${naming.ClassName}Query {
     abstract handle: Handler<typeof ${naming.ClassName}Query.inputSchema, typeof ${naming.ClassName}Query.outputSchema>
 }
                     `.trim());
-        else queriesFolder.createFile(`${naming.fileName}-query.ts`, `
+        else queriesFolder.subitem([
+            'execution'
+        ]).createFile(`${naming.fileName}-query.ts`, `
 export abstract class ${naming.ClassName}Query {
 
 }`.trim());
+        if (scaffoldUnitTests) {
+            const implementationNaming = new UnknownFormatNaming(implementationType);
+            queriesFolder.subitem([
+                'execution'
+            ]).createFile(`${naming.fileName}-query.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
+import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'` : `import { ${implementationNaming.ClassName}${naming.ClassName}Query } from '../../../infrastructure/queries/${implementationNaming.fileName}/${implementationNaming.fileName}-${naming.fileName}-query'
+
+type ${naming.ClassName}Query = ${implementationNaming.ClassName}${naming.ClassName}Query`}
+
+let ${naming.variableName}Query: ${naming.ClassName}Query
+
+beforeEach(() => {
+    ${naming.variableName}Query = ${withWiring ? `wire${naming.ClassName}Query()` : `new ${implementationNaming.ClassName}${naming.ClassName}Query()`}
+})
+
+describe('${naming.withSpaces} query', () => {
+    test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+        expect(${naming.variableName}Query).toBeDefined()
+    })
+})
+                `.trim());
+        }
         if (ConfigFile.Instance.data.domainFirstPackages.includes('@domain-first/wire')) {
             const implementationNaming = new UnknownFormatNaming(implementationType);
             const testImplementationNaming = new UnknownFormatNaming(testImplementationType);
@@ -1107,6 +1152,25 @@ import { ${naming.ClassName}Query } from '../../application/queries/orchestratio
 
 export const wire${naming.ClassName}Query = wireClass(${naming.ClassName}Query, [])
 `.trim());
+    if (scaffoldUnitTests) queriesFolder.subitem([
+        'orchestration'
+    ]).createFile(`${naming.fileName}-query.spec.ts`, `
+import { describe, test, expect, beforeEach } from '${ConfigFile.Instance.data.testingLibrary}'
+${withWiring ? `import { type ${naming.ClassName}Query } from './${naming.fileName}-query'
+import { wire${naming.ClassName}Query } from '../../../wiring/queries/wire-${naming.fileName}-query'` : `import { ${naming.ClassName}Query } from './${naming.fileName}-query'`}
+
+let ${naming.variableName}Query: ${naming.ClassName}Query
+
+beforeEach(() => {
+${naming.variableName}Query = ${withWiring ? `wire${naming.ClassName}Query()` : `new ${naming.ClassName}Query()`}
+})
+
+describe('${naming.withSpaces} query', () => {
+test('can be ${withWiring ? 'wired' : 'created via constructor'}', () => {
+    expect(${naming.variableName}Query).toBeDefined()
+})
+})
+        `.trim());
 };
 const scaffoldNewUseCase = async (boundedContextFolder)=>{
     const useCasesFolder = boundedContextFolder.subitem([

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@domain-first/project-structure",
     "description": "Build and manage your Domain-First project structure with CLI",
-    "version": "2.7.1",
+    "version": "2.7.3",
     "type": "module",
     "repository": {
         "type": "git",