@azure-net/cli 2.0.0 → 2.0.2

package/src/commands/generate/generateSchema.js

@@ -1,10 +1,11 @@
 import prompts from 'prompts';
 import path from 'path';
+import fs from 'fs/promises';
 import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
-const schemaWithCoreTemplate = `import { {{coreSchema}} } from '$core/Schemas/index.js';
-import type { I{{name}}Request } from '../../Domain/Ports/{{name}}/index.js';
+const schemaWithCoreTemplate = `import { {{coreSchema}} } from '\$core/Schema';
+import type { I{{name}}Request } from '\${{context}}/Domain/Ports/{{entity}}';
 
 export const {{name}}Schema = {{coreSchema}}<I{{name}}Request>()
 \t.rules((rules) => ({
@@ -12,10 +13,13 @@ export const {{name}}Schema = {{coreSchema}}<I{{name}}Request>()
 \t}))
 \t.create();`;
 
-const schemaWithPackageTemplate = `import { schema } from '@azure-net/kit';
-import type { I{{name}}Request } from '../../Domain/Ports/{{name}}/index.js';
+const schemaWithPackageTemplate = `import { createSchemaFactory } from '@azure-net/kit';
+import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
+import type { I{{name}}Request } from '\${{context}}/Domain/Ports/{{entity}}';
 
-export const {{name}}Schema = schema<I{{name}}Request>()
+const Schema = createSchemaFactory(createRules(validationMessagesI18n));
+
+export const {{name}}Schema = Schema<I{{name}}Request>()
 \t.rules((rules) => ({
 \t\t// Add validation rules here
 \t}))
@@ -29,6 +33,12 @@ export default async function generateSchema() {
         return;
     }
 
+    const { module } = await prompts({
+        type: 'text',
+        name: 'module',
+        message: 'Module name (folder in Delivery):'
+    });
+
     const { name } = await prompts({
         type: 'text',
         name: 'name',
@@ -37,11 +47,11 @@ 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/app/core/Schema')
     );
 
     const choices = [
-        { title: 'Use schema from package', value: 'package' },
+        { title: 'Use createSchemaFactory from package', value: 'package' },
         ...coreSchemas.map(s => ({ title: `Use ${s} from core`, value: s }))
     ];
 
@@ -53,18 +63,34 @@ export default async function generateSchema() {
     });
 
     const pascalName = toPascalCase(name);
+    const moduleName = toPascalCase(module);
     const contextPath = getContextPath(context);
-    const schemaPath = path.join(contextPath, 'Delivery', 'Schemas');
+    const schemaPath = path.join(contextPath, 'Delivery', moduleName, 'Schema');
     const filePath = path.join(schemaPath, `${pascalName}Schema.ts`);
 
     const content = schemaType === 'package'
-        ? schemaWithPackageTemplate.replace(/{{name}}/g, pascalName)
+        ? schemaWithPackageTemplate
+            .replace(/{{name}}/g, pascalName)
+            .replace(/{{context}}/g, context)
+            .replace(/{{entity}}/g, moduleName)
         : schemaWithCoreTemplate
             .replace(/{{name}}/g, pascalName)
+            .replace(/{{context}}/g, context)
+            .replace(/{{entity}}/g, moduleName)
             .replace(/{{coreSchema}}/g, schemaType);
 
     await writeIfNotExists(filePath, content);
     await updateIndexTs(schemaPath);
 
+    // Update module index
+    const moduleIndexPath = path.join(contextPath, 'Delivery', moduleName, 'index.ts');
+    if (await fs.access(moduleIndexPath).then(() => true).catch(() => false)) {
+        let indexContent = await fs.readFile(moduleIndexPath, 'utf-8');
+        if (!indexContent.includes(`export * from './Schema'`)) {
+            indexContent += `\nexport * from './Schema';`;
+            await fs.writeFile(moduleIndexPath, indexContent, 'utf-8');
+        }
+    }
+
     console.log(`✅ Schema created at ${filePath}`);
 }

package/src/commands/generate/generateService.js

@@ -6,7 +6,7 @@ import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 import { ensureProvider, addToProvider } from '../../utils/providerUtils.js';
 
 const serviceTemplate = `import { ClassMirror } from '@azure-net/kit';
-import { {{repository}} } from '../../Infrastructure/Repositories/index.js';
+import { {{repository}} } from '../../Infrastructure/Http/Repositories';
 
 export class {{name}}Service extends ClassMirror<{{repository}}> {
 \tconstructor(private {{repositoryVar}}: {{repository}}) {
@@ -42,12 +42,12 @@ export default async function generateService() {
     // Get available repositories
     const contextPath = getContextPath(context);
     const repositories = await getAvailableFiles(
-        path.join(contextPath, 'Infrastructure', 'Repositories')
+        path.join(contextPath, 'Infrastructure', 'Http', 'Repositories')
     );
 
     const choices = [
         { title: 'Without repository', value: null },
-        ...repositories.map(r => ({ title: `${r}Repository`, value: `${r}Repository` }))
+        ...repositories.map(r => ({ title: `${r}`, value: r }))
     ];
 
     const { repository } = await prompts({
@@ -74,19 +74,20 @@ export default async function generateService() {
 
     // Ensure ApplicationProvider exists and add service
     const appProvider = await ensureProvider(context, 'Application', { infrastructure: true });
-    await addToProvider(
-        appProvider.path,
-        `${pascalName}Service`,
-        '../Services/index.js'
-    );
 
-    // Add repository dependency if selected
     if (repository) {
-        let providerContent = await fs.readFile(appProvider.path, 'utf-8');
-        const serviceFactory = `${pascalName}Service: () => new ${pascalName}Service()`;
-        const serviceWithRepo = `${pascalName}Service: () => new ${pascalName}Service(InfrastructureProvider.${repository})`;
-        providerContent = providerContent.replace(serviceFactory, serviceWithRepo);
-        await fs.writeFile(appProvider.path, providerContent, 'utf-8');
+        await addToProvider(
+            appProvider.path,
+            `${pascalName}Service`,
+            '../Services',
+            `InfrastructureProvider.${repository}`
+        );
+    } else {
+        await addToProvider(
+            appProvider.path,
+            `${pascalName}Service`,
+            '../Services'
+        );
     }
 
     console.log(`✅ Service created at ${filePath}`);

package/src/commands/init/index.js

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

package/src/commands/init/initLint.js

@@ -0,0 +1,138 @@
+import fs from 'fs';
+import path from 'path';
+import { execSync } from 'child_process';
+import prompts from 'prompts';
+
+const dependencies = [
+    '@commitlint/cli',
+    'semantic-release',
+    '@semantic-release/git',
+    'git-cz',
+    'husky',
+    'commitizen',
+    'env-cmd'
+];
+
+const scriptsToAdd = {
+    precommit: 'pnpm lint && pnpm check',
+    'semantic-release': 'env-cmd semantic-release',
+    commit: 'pnpm format && git add . && git-cz && git push',
+    release: 'pnpm commit && pnpm semantic-release'
+};
+
+const commitlintConfig = `export default {
+	rules: {
+		'body-leading-blank': [2, 'always'],
+		'footer-leading-blank': [2, 'always'],
+		'header-max-length': [2, 'always', 72],
+		'subject-empty': [2, 'never'],
+		'subject-full-stop': [2, 'never', '.'],
+		'type-case': [2, 'always', 'lower-case'],
+		'type-empty': [2, 'never'],
+		'type-enum': [2, 'always', ['feat', 'fix', 'refactor', 'perf', 'chore', 'docs', 'style', 'test', 'ci']]
+	}
+};
+`;
+
+const releaseConfig = `export default {
+	branches: ['main', 'dev'],
+	dryRun: false,
+	ci: false,
+	plugins: [
+		[
+			'@semantic-release/commit-analyzer',
+			{
+				releaseRules: [
+					{ type: 'release', release: 'major' },
+					{ type: 'feature', release: 'minor' },
+					{ type: 'perf', release: false },
+					{ type: 'refactor', release: false },
+					{ type: 'fix', release: 'patch' },
+					{ type: 'chore', release: false },
+					{ type: 'ci', release: false },
+					{ type: 'docs', scope: 'README', release: false },
+					{ type: 'test', release: false },
+					{ type: 'style', release: false }
+				]
+			}
+		],
+		'@semantic-release/release-notes-generator'
+	]
+};
+`;
+
+const prettierConfig = `{
+	"useTabs": true,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"tabWidth": 2,
+	"semi": true,
+	"printWidth": 150,
+	"plugins": ["prettier-plugin-svelte"],
+	"overrides": [
+		{
+			"files": "*.svelte",
+			"options": {
+				"parser": "svelte"
+			}
+		}
+	]
+}
+`;
+
+export default async function initLint() {
+    const cwd = process.cwd();
+    const pkgPath = path.join(cwd, 'package.json');
+
+    if (!fs.existsSync(pkgPath)) {
+        console.error('❌ package.json not found in this directory');
+        process.exit(1);
+    }
+
+    const { manager } = await prompts({
+        type: 'select',
+        name: 'manager',
+        message: 'Choose your package manager:',
+        choices: [
+            { title: 'pnpm', value: 'pnpm' },
+            { title: 'npm', value: 'npm' },
+            { title: 'yarn', value: 'yarn' }
+        ],
+        initial: 0
+    });
+
+    const installCommand =
+        manager === 'pnpm'
+            ? `pnpm add -D ${dependencies.join(' ')}`
+            : manager === 'npm'
+                ? `npm install -D ${dependencies.join(' ')}`
+                : `yarn add -D ${dependencies.join(' ')}`;
+
+    console.log(`📦 Installing packages with ${manager}...`);
+    execSync(installCommand, { stdio: 'inherit' });
+
+    console.log('📁 Updating package.json...');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+
+    pkg.scripts = {
+        ...pkg.scripts,
+        ...scriptsToAdd
+    };
+
+    pkg.config = pkg.config || {};
+    pkg.config.commitizen = {
+        path: 'git-cz'
+    };
+
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 4));
+
+    // Write config files
+    fs.writeFileSync(path.join(cwd, 'commitlint.config.ts'), commitlintConfig);
+    fs.writeFileSync(path.join(cwd, 'release.config.ts'), releaseConfig);
+    fs.writeFileSync(path.join(cwd, '.prettierrc'), prettierConfig);
+
+    console.log('🔧 Initializing Husky...');
+    execSync(`${manager === 'npm' ? 'npx' : manager} husky`, { stdio: 'inherit' });
+    execSync('npm run format', { stdio: 'inherit' });
+    console.log('✅ Linting and release setup completed! Change your prepare script in package.json: node -e \"if (process.env.NODE_ENV !== \'production\'){process.exit(1)} \" || (husky && svelte-kit sync)');
+}

package/src/commands/init/initMiddleware.js

@@ -5,37 +5,22 @@ const middlewarePath = path.join(process.cwd(), 'src/app/core/Middleware/Middlew
 const hooksServerPath = path.join(process.cwd(), 'src/hooks.server.ts');
 const layoutPath = path.join(process.cwd(), 'src/routes/+layout.svelte');
 
-const middlewareTemplate = `import { createMiddlewareManager, type IMiddleware } from '@azure-net/kit';
-
-const AuthMiddleware: IMiddleware = async ({ next, page, event, isServer, cookies }) => {
-\tconst user = isServer ? event?.locals?.user : page?.data?.user;
-\tif (isServer && !user && cookies.get('token') && event) {
-\t\t// Add auth logic here
-\t}
-\tnext();
-};
-
-const GuardMiddleware: IMiddleware = async ({ next, page, event, isServer, to }) => {
-\tconst user = isServer ? event?.locals?.user : page?.data?.user;
-\tif (!user && !to.pathname.startsWith('/login')) {
-\t\tnext('/login');
-\t}
-\tif (user && to.pathname.startsWith('/login')) {
-\t\tnext('/');
-\t}
-\tnext();
-};
-
-export const { clientMiddleware, serverMiddleware } = createMiddlewareManager([AuthMiddleware, GuardMiddleware]);`;
+const middlewareTemplate = `import { createMiddlewareManager } from '@azure-net/kit';
+
+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'),
+        `export * from './MiddlewareManager';`
+    );
 
     // Add to hooks.server.ts
     await injectIntoFile(
         hooksServerPath,
-        `import { serverMiddleware } from '$core/Middleware/index.js';`,
         'import',
+        `import { serverMiddleware } from '$core';`,
         'before'
     );
 
@@ -50,7 +35,7 @@ export default async function initMiddleware() {
     await injectIntoFile(
         layoutPath,
         '<script',
-        `\timport { clientMiddleware } from '$core/Middleware/index.js';\n\tclientMiddleware();`,
+        `\timport { clientMiddleware } from '$core';\n\tclientMiddleware();`,
         'after'
     );
 

package/src/commands/init/initSchema.js

@@ -3,7 +3,7 @@ import path from 'path';
 
 const schemaPath = path.join(process.cwd(), 'src/app/core/Schemas/Schema.ts');
 
-const schemaTemplate = `import { createSchemaFactory } from '@azure-net/kit/schema';
+const schemaTemplate = `import { createSchemaFactory } from '@azure-net/kit';
 import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
 
 export const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
@@ -12,7 +12,7 @@ export default async function initSchema() {
     await writeIfNotExists(schemaPath, schemaTemplate);
     await writeIfNotExists(
         path.join(process.cwd(), 'src/app/core/Schemas/index.ts'),
-        `export * from './Schema.js';`
+        `export * from './Schema';`
     );
 
     console.log('✅ Schema factory initialized');

package/src/commands/init/initStructure.js

@@ -2,7 +2,6 @@ import fs from 'fs/promises';
 import path from 'path';
 import { loadUserConfig } from '../../utils/loadConfig.js';
 
-const BASE_STRUCTURE = ['Domain', 'Infrastructure', 'Application', 'Delivery'];
 const APP_ROOT = path.join(process.cwd(), 'src', 'app');
 const CONTEXTS_PATH = path.join(APP_ROOT, 'contexts');
 const CORE_PATH = path.join(APP_ROOT, 'core');
@@ -16,31 +15,34 @@ async function createDirIfNotExists(dirPath) {
     }
 }
 
+async function createIndexFile(dirPath, exportPatterns = []) {
+    const indexPath = path.join(dirPath, 'index.ts');
+    if (exportPatterns.length > 0) {
+        const content = exportPatterns.map(pattern => `export * from '${pattern}';`).join('\n') + '\n';
+        await fs.writeFile(indexPath, content, 'utf-8');
+    }
+}
+
 async function createBaseStructure(root) {
-    for (const section of BASE_STRUCTURE) {
-        const sectionPath = path.join(root, section);
-        await createDirIfNotExists(sectionPath);
+    // Domain
+    const domainPath = path.join(root, 'Domain');
+    await createDirIfNotExists(path.join(domainPath, 'Entities'));
+    await createDirIfNotExists(path.join(domainPath, 'Ports'));
 
-        if (section === 'Infrastructure') {
-            await createDirIfNotExists(path.join(sectionPath, 'Repositories'));
-            await createDirIfNotExists(path.join(sectionPath, 'Datasources'));
-            await createDirIfNotExists(path.join(sectionPath, 'Providers'));
-        }
-        if (section === 'Application') {
-            await createDirIfNotExists(path.join(sectionPath, 'Services'));
-            await createDirIfNotExists(path.join(sectionPath, 'Providers'));
-        }
-        if (section === 'Domain') {
-            await createDirIfNotExists(path.join(sectionPath, 'Entities'));
-            await createDirIfNotExists(path.join(sectionPath, 'Ports'));
-        }
-        if (section === 'Delivery') {
-            await createDirIfNotExists(path.join(sectionPath, 'Presenters'));
-            await createDirIfNotExists(path.join(sectionPath, 'Schemas'));
-            await createDirIfNotExists(path.join(sectionPath, 'Actions'));
-            await createDirIfNotExists(path.join(sectionPath, 'Stores'));
-        }
-    }
+    // Infrastructure
+    const infraPath = path.join(root, 'Infrastructure');
+    await createDirIfNotExists(path.join(infraPath, 'Http', 'Repositories'));
+    await createDirIfNotExists(path.join(infraPath, 'Http', 'Datasource'));
+    await createDirIfNotExists(path.join(infraPath, 'Providers'));
+
+    // Application
+    const appPath = path.join(root, 'Application');
+    await createDirIfNotExists(path.join(appPath, 'Services'));
+    await createDirIfNotExists(path.join(appPath, 'Providers'));
+
+    // Delivery - organized by modules, not by type
+    const deliveryPath = path.join(root, 'Delivery');
+    await createDirIfNotExists(deliveryPath);
 }
 
 export default async function initStructure() {
@@ -57,12 +59,21 @@ export default async function initStructure() {
 
     // Create core structure
     await createDirIfNotExists(CORE_PATH);
-    await createDirIfNotExists(path.join(CORE_PATH, 'Datasources'));
-    await createDirIfNotExists(path.join(CORE_PATH, 'Responses'));
-    await createDirIfNotExists(path.join(CORE_PATH, 'Schemas'));
+    await createDirIfNotExists(path.join(CORE_PATH, 'Datasource'));
+    await createDirIfNotExists(path.join(CORE_PATH, 'Response'));
+    await createDirIfNotExists(path.join(CORE_PATH, 'Schema'));
     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, 'Presenter'));
+    await createDirIfNotExists(path.join(CORE_PATH, 'Translation'));
+
+    // Create core index.ts that exports all subdirectories
+    await createIndexFile(CORE_PATH, [
+        './Schema',
+        './Datasource',
+        './Response',
+        './Middleware',
+        './Translation'
+    ]);
 
     console.log('✅ Structure initialization complete!');
 }

package/src/commands/init/initTranslations.js

@@ -1,11 +1,11 @@
 import { writeIfNotExists, updateIndexTs, injectIntoFile } 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/app/core/Translation');
 const layoutServerPath = path.join(process.cwd(), 'src/routes/+layout.server.ts');
 const layoutTsPath = path.join(process.cwd(), 'src/routes/+layout.ts');
 
-const translationProviderTemplate = `import { messages } from './Locales/index.js';
+const translationProviderTemplate = `import { messages } from './Locales';
 import { createTranslations } from '@azure-net/kit/i18n';
 
 export const Translation = createTranslations({ 
@@ -28,8 +28,8 @@ const ruLocaleTemplate = `export default {
 };`;
 
 const localesIndexTemplate = `export const messages = {
-\ten: () => import('./en.js').then((res) => res.default),
-\tru: () => import('./ru.js').then((res) => res.default)
+\ten: () => import('./en').then((res) => res.default),
+\tru: () => import('./ru').then((res) => res.default)
 };`;
 
 export default async function initTranslations() {
@@ -54,13 +54,11 @@ export default async function initTranslations() {
         localesIndexTemplate
     );
 
-    await updateIndexTs(translationsPath);
-
     // Add to hooks.server.ts
     await injectIntoFile(
         path.join(process.cwd(), 'src/hooks.server.ts'),
         'import',
-        `import { Translation } from '$core/Translations/index.js';`,
+        `import { Translation } from '$core';`,
         'before'
     );
 
@@ -71,18 +69,25 @@ export default async function initTranslations() {
         'after'
     );
 
+    await injectIntoFile(
+        path.join(process.cwd(), 'src/hooks.server.ts'),
+        'transformPageChunk: ({ html })',
+        ' => {\n\t\t\t\tconst serialized = serialize(html);\n\t\t\t\treturn applyHtmlLocaleAttr(serialized);\n\t\t\t}',
+        'after'
+    );
+
     // Add to layout files
     await injectIntoFile(
         layoutServerPath,
         'export const load',
-        `\treturn { lang: locals.lang, user: locals.user };`,
+        `\treturn { lang: locals.lang };`,
         'after'
     );
 
     await injectIntoFile(
         layoutTsPath,
         'import',
-        `import { Translation } from '$core/Translations/index.js';`,
+        `import { Translation } from '$core';\nimport { browser } from '$app/environment';`,
         'before'
     );
 

package/src/utils/fileUtils.js

@@ -20,7 +20,7 @@ export async function updateIndexTs(dir, filePattern = '.ts', ignore = ['index.t
             f.endsWith(filePattern) && !ignore.includes(f)
         );
         const content = files
-            .map(f => `export * from './${f.replace('.ts', '')}.js';`)
+            .map(f => `export * from './${f.replace('.ts', '')}';`)
             .join('\n') + '\n';
         await fs.writeFile(path.join(dir, 'index.ts'), content, 'utf-8');
     } catch (error) {
@@ -28,6 +28,25 @@ export async function updateIndexTs(dir, filePattern = '.ts', ignore = ['index.t
     }
 }
 
+export async function ensureIndexExports(layerPath) {
+    try {
+        const subdirs = await fs.readdir(layerPath, { withFileTypes: true });
+        const exportLines = subdirs
+            .filter(d => d.isDirectory())
+            .map(d => `export * from './${d.name}';`);
+
+        if (exportLines.length > 0) {
+            await fs.writeFile(
+                path.join(layerPath, 'index.ts'),
+                exportLines.join('\n') + '\n',
+                'utf-8'
+            );
+        }
+    } catch (error) {
+        // Directory doesn't exist
+    }
+}
+
 export async function injectIntoFile(filepath, searchPattern, newContent, position = 'after') {
     try {
         let content = await fs.readFile(filepath, 'utf-8');