@azure-net/cli 2.3.3 → 2.3.61

package/bin/azure-net.js

@@ -9,7 +9,8 @@ import {
     initTranslations,
     initSchema,
     initLint,
-    initPresenter
+    initPresenter,
+    migrateStructure
 } from '../src/commands/init/index.js';
 import {
     generateDatasource,
@@ -71,6 +72,11 @@ program
     .description('Initialize presenter factory')
     .action(initPresenter);
 
+program
+    .command('migrate:structure')
+    .description('Migrate existing contexts to new structure with layers and ui folders')
+    .action(migrateStructure);
+
 program
     .command('init')
     .description('Run all initialization steps')

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@azure-net/cli",
-  "version": "2.3.3",
+  "version": "2.3.61",
   "type": "module",
   "bin": {
     "azure-net": "bin/azure-net.js"
   },
   "peerDependencies": {
-    "@azure-net/kit": "^1.3.3"
+    "@azure-net/kit": "^1.3.7"
   },
   "dependencies": {
-    "@azure-net/kit": "^1.3.3",
+    "@azure-net/kit": "^1.3.7",
     "commander": "^11",
     "prompts": "^2"
   },

package/src/commands/generate/generateCrudBase.js

@@ -116,7 +116,7 @@ export default async function generateCrudBase() {
     // Get available datasources
     const contextPath = getContextPath(context);
     const coreDatasources = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/datasources')
+        path.join(process.cwd(), 'src/core/datasources')
     );
     const contextDatasources = await getAvailableFiles(
         path.join(contextPath, 'infrastructure/http/datasources')

package/src/commands/generate/generateCrudPresenter.js

@@ -114,7 +114,7 @@ export default async function generateCrudPresenter() {
 
     // Get schema factory
     const coreSchemas = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/schemas')
+        path.join(process.cwd(), 'src/core/schemas')
     );
 
     const { schemaType } = await prompts({
@@ -129,7 +129,7 @@ export default async function generateCrudPresenter() {
 
     // Get presenter factory
     const corePresenters = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/presenters')
+        path.join(process.cwd(), 'src/core/presenters')
     );
 
     const { presenterType } = await prompts({

package/src/commands/generate/generateDatasource.js

@@ -23,12 +23,12 @@ export default async function generateDatasource() {
 
     const pascalName = toPascalCase(name);
     const contextPath = context === 'core'
-        ? path.join(process.cwd(), 'src/app/core')
+        ? path.join(process.cwd(), 'src/core')
         : getContextPath(context);
 
     // Get available responses
     const coreResponses = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/responses')
+        path.join(process.cwd(), 'src/core/responses')
     );
 
     const contextResponses = context !== 'core'

package/src/commands/generate/generatePresenter.js

@@ -42,7 +42,7 @@ export default async function generatePresenter() {
 
     // Check for core presenters
     const corePresenters = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/presenters')
+        path.join(process.cwd(), 'src/core/presenters')
     );
 
     const presenterChoices = [

package/src/commands/generate/generateRepository.js

@@ -27,7 +27,7 @@ export default async function generateRepository() {
     // Get available datasources
     const contextPath = getContextPath(context);
     const coreDatasources = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/datasources')
+        path.join(process.cwd(), 'src/core/datasources')
     );
     const contextDatasources = await getAvailableFiles(
         path.join(contextPath, 'infrastructure/http/datasources')

package/src/commands/generate/generateResponse.js

@@ -19,7 +19,7 @@ export default async function generateResponse() {
 
     const pascalName = toPascalCase(name);
     const contextPath = context === 'core'
-        ? path.join(process.cwd(), 'src/app/core')
+        ? path.join(process.cwd(), 'src/core')
         : getContextPath(context);
 
     const responsePath = context === 'core'

package/src/commands/generate/generateSchema.js

@@ -45,7 +45,7 @@ export default async function generateSchema() {
 
     // Check for core schemas
     const coreSchemas = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/schemas')
+        path.join(process.cwd(), 'src/core/schemas')
     );
 
     const choices = [

package/src/commands/init/index.js

@@ -5,4 +5,5 @@ export { default as initEdges } from './initEdges.js';
 export { default as initTranslations } from './initTranslations.js';
 export { default as initSchema } from './initSchema.js';
 export { default as initLint } from './initLint.js';
-export { default as initPresenter } from './initPresenter.js';
+export { default as initPresenter } from './initPresenter.js';
+export { default as migrateStructure } from './migrateStructure.js';

package/src/commands/init/initAliases.js

@@ -9,9 +9,11 @@ function generateAliases(config) {
     const contexts = config.contexts || ['app'];
 
     return Object.fromEntries([
-        ...contexts.map(c => [`$${c}`, `./src/app/contexts/${c}`]),
-        ['$shared', './src/app/shared'],
-        ['$core', './src/app/core']
+        ...contexts.flatMap(c => [
+            [`$${c}`, `./src/app/${c}/layers`],
+            [`$${c}/ui`, `./src/app/${c}/ui`]
+        ]),
+        ['$core', './src/core']
     ]);
 }
 

package/src/commands/init/initMiddleware.js

@@ -1,7 +1,7 @@
 import { writeIfNotExists, updateCoreIndex } from '../../utils/fileUtils.js';
 import path from 'path';
 
-const middlewarePath = path.join(process.cwd(), 'src/app/core/middleware/MiddlewareManager.ts');
+const middlewarePath = path.join(process.cwd(), 'src/core/middleware/MiddlewareManager.ts');
 
 const middlewareTemplate = `import { createMiddlewareManager } from '@azure-net/kit';
 
@@ -10,7 +10,7 @@ export const { clientMiddleware, serverMiddleware } = createMiddlewareManager([]
 export default async function initMiddleware() {
     await writeIfNotExists(middlewarePath, middlewareTemplate);
     await writeIfNotExists(
-        path.join(process.cwd(), 'src/app/core/middleware/index.ts'),
+        path.join(process.cwd(), 'src/core/middleware/index.ts'),
         `export * from './MiddlewareManager';`
     );
 

package/src/commands/init/initPresenter.js

@@ -1,7 +1,7 @@
 import {updateCoreIndex, writeIfNotExists} from '../../utils/fileUtils.js';
 import path from 'path';
 
-const presenterPath = path.join(process.cwd(), 'src/app/core/presenters/AppPresenter.ts');
+const presenterPath = path.join(process.cwd(), 'src/core/presenters/AppPresenter.ts');
 
 const presenterTemplate = `import { createPresenterFactory } from '@azure-net/kit/edges';
 import { createAsyncHelpers, createErrorParser } from '@azure-net/kit';
@@ -14,7 +14,7 @@ export const AppPresenter = createPresenterFactory({ ...AsyncHelpers, handleErro
 export default async function initPresenter() {
     await writeIfNotExists(presenterPath, presenterTemplate);
     await writeIfNotExists(
-        path.join(process.cwd(), 'src/app/core/presenters/index.ts'),
+        path.join(process.cwd(), 'src/core/presenters/index.ts'),
         `export * from './AppPresenter';`
     );
 

package/src/commands/init/initSchema.js

@@ -1,7 +1,7 @@
 import { writeIfNotExists, updateCoreIndex } from '../../utils/fileUtils.js';
 import path from 'path';
 
-const schemaPath = path.join(process.cwd(), 'src/app/core/schemas/Schema.ts');
+const schemaPath = path.join(process.cwd(), 'src/core/schemas/Schema.ts');
 
 const schemaTemplate = `import { createSchemaFactory } from '@azure-net/kit';
 import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
@@ -11,7 +11,7 @@ export const Schema = createSchemaFactory(createRules(validationMessagesI18n));`
 export default async function initSchema() {
     await writeIfNotExists(schemaPath, schemaTemplate);
     await writeIfNotExists(
-        path.join(process.cwd(), 'src/app/core/schemas/index.ts'),
+        path.join(process.cwd(), 'src/core/schemas/index.ts'),
         `export * from './Schema';`
     );
 

package/src/commands/init/initStructure.js

@@ -3,10 +3,8 @@ import path from 'path';
 import { loadUserConfig } from '../../utils/loadConfig.js';
 import { updateCoreIndex } from '../../utils/fileUtils.js';
 
-const APP_ROOT = path.join(process.cwd(), 'src', 'app');
-const CONTEXTS_PATH = path.join(APP_ROOT, 'contexts');
-const SHARED_PATH = path.join(APP_ROOT, 'shared');
-const CORE_PATH = path.join(APP_ROOT, 'core');
+const APP_PATH = path.join(process.cwd(), 'src', 'app');
+const CORE_PATH = path.join(process.cwd(), 'src', 'core');
 
 async function createDirIfNotExists(dirPath) {
     try {
@@ -26,12 +24,19 @@ async function createIndexFile(dirPath, exportPatterns = []) {
 }
 
 async function createBaseStructure(root, contextName, contextAlias) {
+    // Create layers and ui folders
+    const layersPath = path.join(root, 'layers');
+    const uiPath = path.join(root, 'ui');
+
+    await createDirIfNotExists(layersPath);
+    await createDirIfNotExists(uiPath);
+
     // Domain - новая структура
-    const domainPath = path.join(root, 'domain');
+    const domainPath = path.join(layersPath, 'domain');
     await createDirIfNotExists(domainPath);
 
     // Infrastructure
-    const infraPath = path.join(root, 'infrastructure');
+    const infraPath = path.join(layersPath, 'infrastructure');
     await createDirIfNotExists(path.join(infraPath, 'http', 'repositories'));
     await createDirIfNotExists(path.join(infraPath, 'http', 'datasources'));
     await createDirIfNotExists(path.join(infraPath, 'providers'));
@@ -63,7 +68,7 @@ export const InfrastructureProvider = createBoundaryProvider(
     );
 
     // Application
-    const appPath = path.join(root, 'application');
+    const appPath = path.join(layersPath, 'application');
     await createDirIfNotExists(path.join(appPath, 'services'));
     await createDirIfNotExists(path.join(appPath, 'providers'));
 
@@ -101,7 +106,7 @@ export const ApplicationProvider = createBoundaryProvider(
     );
 
     // Delivery - organized by modules
-    const deliveryPath = path.join(root, 'delivery');
+    const deliveryPath = path.join(layersPath, 'delivery');
     await createDirIfNotExists(deliveryPath);
 }
 
@@ -111,17 +116,14 @@ export default async function initStructure() {
 
     console.log('📦 Generating architecture...');
 
-    // Create contexts
+    // Create contexts directly in src/app
     for (const context of contexts) {
-        const contextPath = path.join(CONTEXTS_PATH, context);
+        const contextPath = path.join(APP_PATH, context);
         const contextName = context.charAt(0).toUpperCase() + context.slice(1);
         await createBaseStructure(contextPath, contextName, context);
     }
 
-    // Create empty shared folder
-    await createDirIfNotExists(SHARED_PATH);
-
-    // Create core structure with all functionality
+    // Create core structure with all functionality (in src/core, not src/app/core)
     await createDirIfNotExists(CORE_PATH);
     await createDirIfNotExists(path.join(CORE_PATH, 'datasources'));
     await createDirIfNotExists(path.join(CORE_PATH, 'responses'));
@@ -129,6 +131,7 @@ export default async function initStructure() {
     await createDirIfNotExists(path.join(CORE_PATH, 'middleware'));
     await createDirIfNotExists(path.join(CORE_PATH, 'presenters'));
     await createDirIfNotExists(path.join(CORE_PATH, 'translations'));
+    await createDirIfNotExists(path.join(CORE_PATH, 'providers'));
 
     // Update core index
     await updateCoreIndex();

package/src/commands/init/initTranslations.js

@@ -1,7 +1,7 @@
 import { writeIfNotExists, updateCoreIndex } from '../../utils/fileUtils.js';
 import path from 'path';
 
-const translationsPath = path.join(process.cwd(), 'src/app/core/translations');
+const translationsPath = path.join(process.cwd(), 'src/core/translations');
 
 const translationProviderTemplate = `import { messages } from './locales';
 import { createTranslations } from '@azure-net/kit/i18n';

package/src/commands/init/migrateStructure.js

@@ -0,0 +1,144 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { loadUserConfig } from '../../utils/loadConfig.js';
+
+const APP_PATH = path.join(process.cwd(), 'src/app');
+const OLD_CONTEXTS_PATH = path.join(APP_PATH, 'contexts');
+const OLD_CORE_PATH = path.join(APP_PATH, 'core');
+const NEW_CORE_PATH = path.join(process.cwd(), 'src/core');
+
+async function directoryExists(dirPath) {
+    try {
+        const stat = await fs.stat(dirPath);
+        return stat.isDirectory();
+    } catch {
+        return false;
+    }
+}
+
+async function moveDirectory(source, destination) {
+    try {
+        // Check if source exists
+        if (!(await directoryExists(source))) {
+            return false;
+        }
+
+        // Create destination parent directory if needed
+        await fs.mkdir(path.dirname(destination), { recursive: true });
+
+        // Move the directory
+        await fs.rename(source, destination);
+        console.log(`✅ Moved: ${source} -> ${destination}`);
+        return true;
+    } catch (error) {
+        console.error(`❌ Failed to move ${source}:`, error.message);
+        return false;
+    }
+}
+
+async function removeEmptyDir(dirPath) {
+    try {
+        await fs.rmdir(dirPath);
+        console.log(`🗑️  Removed empty directory: ${dirPath}`);
+    } catch {
+        // Directory not empty or doesn't exist
+    }
+}
+
+export default async function migrateStructure() {
+    const config = await loadUserConfig();
+    const contexts = config.contexts || ['app'];
+
+    console.log('🔄 Starting structure migration...\n');
+    console.log('This will reorganize existing structure to the new format:\n');
+    console.log('  - src/app/contexts/{context} -> src/app/{context}');
+    console.log('  - src/app/core -> src/core');
+    console.log('  - Ensure layers and ui folders exist\n');
+
+    // Step 1: Migrate core from src/app/core to src/core
+    if (await directoryExists(OLD_CORE_PATH)) {
+        console.log('📦 Migrating core...');
+
+        // Check if new core already exists
+        if (await directoryExists(NEW_CORE_PATH)) {
+            console.log('⚠️  Core already exists at src/core, skipping core migration...');
+        } else {
+            await moveDirectory(OLD_CORE_PATH, NEW_CORE_PATH);
+        }
+    }
+
+    // Step 2: Migrate contexts
+    for (const context of contexts) {
+        console.log(`\n📁 Migrating context: ${context}`);
+
+        const oldContextPath = path.join(OLD_CONTEXTS_PATH, context);
+        const newContextPath = path.join(APP_PATH, context);
+
+        // Check if context exists in old location (src/app/contexts/{context})
+        if (await directoryExists(oldContextPath)) {
+            // Check if new location already exists
+            if (await directoryExists(newContextPath)) {
+                console.log(`⚠️  Context '${context}' already exists at src/app/${context}, skipping...`);
+                continue;
+            }
+
+            // Move from contexts/{context} to app/{context}
+            await moveDirectory(oldContextPath, newContextPath);
+        }
+
+        // Now ensure the context has layers and ui structure
+        const contextPath = newContextPath;
+
+        if (!(await directoryExists(contextPath))) {
+            console.log(`⚠️  Context '${context}' does not exist, skipping...`);
+            continue;
+        }
+
+        const layersPath = path.join(contextPath, 'layers');
+        const uiPath = path.join(contextPath, 'ui');
+
+        // Check if already has layers structure
+        if (await directoryExists(layersPath)) {
+            console.log(`✓ Context '${context}' already has layers structure`);
+
+            // Just ensure ui folder exists
+            if (!(await directoryExists(uiPath))) {
+                await fs.mkdir(uiPath, { recursive: true });
+                console.log(`✅ Created: ${uiPath}`);
+            }
+
+            continue;
+        }
+
+        // Need to create layers structure
+        console.log(`📦 Creating layers structure for '${context}'...`);
+
+        await fs.mkdir(layersPath, { recursive: true });
+        await fs.mkdir(uiPath, { recursive: true });
+        console.log(`✅ Created: ${layersPath}`);
+        console.log(`✅ Created: ${uiPath}`);
+
+        // Move existing layer folders to layers directory
+        const layerFolders = ['domain', 'infrastructure', 'application', 'delivery'];
+
+        for (const layer of layerFolders) {
+            const sourcePath = path.join(contextPath, layer);
+            const destPath = path.join(layersPath, layer);
+
+            await moveDirectory(sourcePath, destPath);
+        }
+
+        console.log(`✅ Context '${context}' migration completed!`);
+    }
+
+    // Step 3: Clean up old contexts folder if empty
+    if (await directoryExists(OLD_CONTEXTS_PATH)) {
+        await removeEmptyDir(OLD_CONTEXTS_PATH);
+    }
+
+    console.log('\n✅ Structure migration complete!');
+    console.log('\n💡 Next steps:');
+    console.log('   1. Run "azure-net init:aliases" to update path aliases');
+    console.log('   2. Verify all imports are working correctly');
+    console.log('   3. Update any hardcoded paths in your code');
+}

package/src/utils/contextUtils.js

@@ -3,8 +3,8 @@ import path from 'path';
 import prompts from 'prompts';
 import { loadUserConfig } from './loadConfig.js';
 
-const CONTEXTS_PATH = path.join(process.cwd(), 'src/app/contexts');
-const CORE_PATH = path.join(process.cwd(), 'src/app/core');
+const APP_PATH = path.join(process.cwd(), 'src/app');
+const CORE_PATH = path.join(process.cwd(), 'src/core');
 
 export async function selectContext(message = 'Select context:') {
     const config = await loadUserConfig();
@@ -26,7 +26,7 @@ export async function selectContext(message = 'Select context:') {
 export function getContextPath(context) {
     return context === 'core'
         ? CORE_PATH
-        : path.join(CONTEXTS_PATH, context);
+        : path.join(APP_PATH, context, 'layers');
 }
 
 export async function getAvailableFiles(dir, pattern = '.ts') {

package/src/utils/fileUtils.js

@@ -29,7 +29,7 @@ export async function updateIndexTs(dir, filePattern = '.ts', ignore = ['index.t
 }
 
 export async function updateCoreIndex() {
-    const corePath = path.join(process.cwd(), 'src/app/core');
+    const corePath = path.join(process.cwd(), 'src/core');
     try {
         const dirs = await fs.readdir(corePath, { withFileTypes: true });
         const validDirs = [];