@azure-net/cli 2.3.3 → 2.3.6

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

package/src/commands/init/initStructure.js

@@ -26,12 +26,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 +70,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 +108,7 @@ export const ApplicationProvider = createBoundaryProvider(
     );
 
     // Delivery - organized by modules
-    const deliveryPath = path.join(root, 'delivery');
+    const deliveryPath = path.join(layersPath, 'delivery');
     await createDirIfNotExists(deliveryPath);
 }
 

package/src/commands/init/migrateStructure.js

@@ -0,0 +1,84 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { loadUserConfig } from '../../utils/loadConfig.js';
+
+const CONTEXTS_PATH = path.join(process.cwd(), 'src/app/contexts');
+
+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;
+    }
+}
+
+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 contexts to use layers and ui folders.\n');
+
+    for (const context of contexts) {
+        const contextPath = path.join(CONTEXTS_PATH, context);
+
+        // Check if context exists
+        if (!(await directoryExists(contextPath))) {
+            console.log(`⚠️  Context '${context}' does not exist, skipping...`);
+            continue;
+        }
+
+        console.log(`\n📁 Migrating context: ${context}`);
+
+        // Check if already migrated (has layers folder)
+        const layersPath = path.join(contextPath, 'layers');
+        if (await directoryExists(layersPath)) {
+            console.log(`⚠️  Context '${context}' already migrated, skipping...`);
+            continue;
+        }
+
+        // Create layers and ui folders
+        await fs.mkdir(layersPath, { recursive: true });
+        await fs.mkdir(path.join(contextPath, 'ui'), { recursive: true });
+        console.log(`✅ Created: ${layersPath}`);
+        console.log(`✅ Created: ${path.join(contextPath, 'ui')}`);
+
+        // 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!`);
+    }
+
+    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');
+}

package/src/utils/contextUtils.js

@@ -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(CONTEXTS_PATH, context, 'layers');
 }
 
 export async function getAvailableFiles(dir, pattern = '.ts') {