@azure-net/cli 5.1.1 → 6.0.0-next.2

package/src/init/initEdges.js

@@ -1,59 +1,84 @@
 import fs from 'node:fs/promises';
-import fsSync from 'node:fs';
 import path from 'node:path';
-const EDGES_IMPORT = `import { edgesPlugin } from '@azure-net/kit/edges/plugin';`;
-function resolveViteConfigPath() {
-	const cwd = process.cwd();
-	const candidates = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs', 'vite.config.cjs'].map((filename) => path.join(cwd, filename));
-	for (const filepath of candidates) {
-		if (fsSync.existsSync(filepath)) {
-			return filepath;
-		}
-	}
-	return null;
-}
-function injectEdgesImport(content) {
-	if (content.includes(EDGES_IMPORT)) return content;
-	const svelteImportRegex = /import\s+\{\s*sveltekit\s*\}\s+from\s+['"]@sveltejs\/kit\/vite['"]\s*;?/m;
-	if (svelteImportRegex.test(content)) {
-		return content.replace(svelteImportRegex, (line) => `${line}\n${EDGES_IMPORT}`);
-	}
-	return `${EDGES_IMPORT}\n${content}`;
-}
-function injectEdgesPlugin(content) {
-	if (/edgesPlugin\s*\(\s*\)/.test(content)) return content;
-	const pluginsRegex = /plugins\s*:\s*\[([\s\S]*?)\]/m;
-	const pluginsMatch = content.match(pluginsRegex);
-	if (!pluginsMatch) {
-		throw new Error('plugins array was not found in vite.config');
-	}
-	const pluginsBody = pluginsMatch[1] ?? '';
-	let nextPluginsBody = pluginsBody;
-	if (/sveltekit\s*\(\s*\)/.test(pluginsBody)) {
-		nextPluginsBody = pluginsBody.replace(/sveltekit\s*\(\s*\)\s*,?/, (matched) => {
-			const hasComma = matched.trim().endsWith(',');
-			return hasComma ? `${matched} edgesPlugin(),` : `${matched}, edgesPlugin()`;
-		});
-	} else {
-		const trimmed = pluginsBody.trim();
-		if (!trimmed.length) {
-			nextPluginsBody = 'edgesPlugin()';
-		} else {
-			const withComma = /\s*,\s*$/.test(pluginsBody) ? pluginsBody : `${pluginsBody},`;
-			nextPluginsBody = `${withComma} edgesPlugin()`;
-		}
-	}
-	return content.replace(pluginsRegex, `plugins: [${nextPluginsBody}]`);
+import ts from 'typescript';
+import { VITE_CONFIGS, formatConfig, enableHydratable } from '../utils/viteConfig.js';
+export function configureAzureNetPlugin(content) {
+    const source = ts.createSourceFile('vite.config.ts', content, ts.ScriptTarget.Latest, true);
+    const edits = [];
+    let pluginName = 'AzureNetPlugin';
+    let imported = false;
+    const legacyNames = new Set();
+    for (const statement of source.statements) {
+        if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier))
+            continue;
+        const bindings = statement.importClause?.namedBindings;
+        if (!bindings || !ts.isNamedImports(bindings))
+            continue;
+        if (statement.moduleSpecifier.text === '@azure-net/kit/plugin') {
+            for (const item of bindings.elements)
+                if ((item.propertyName?.text ?? item.name.text) === 'AzureNetPlugin') {
+                    pluginName = item.name.text;
+                    imported = true;
+                }
+        }
+        if (statement.moduleSpecifier.text === '@azure-net/kit/edges/plugin') {
+            for (const item of bindings.elements)
+                if ((item.propertyName?.text ?? item.name.text) === 'edgesPlugin')
+                    legacyNames.add(item.name.text);
+            if (bindings.elements.some((item) => (item.propertyName?.text ?? item.name.text) !== 'edgesPlugin'))
+                throw new Error('Remove unsupported legacy edges/plugin imports from Vite config first.');
+            edits.push({ start: statement.getStart(source), end: statement.end, text: '' });
+        }
+    }
+    let plugins;
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) &&
+            (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
+            node.name.text === 'plugins' &&
+            ts.isArrayLiteralExpression(node.initializer))
+            plugins ??= node.initializer;
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    if (!plugins)
+        throw new Error('Cannot safely configure AzureNetPlugin: use a literal plugins array in vite.config.');
+    const existing = plugins.elements.some((element) => ts.isCallExpression(element) && ts.isIdentifier(element.expression) && element.expression.text === pluginName);
+    let replacedLegacy = false;
+    for (const element of plugins.elements) {
+        if (!ts.isCallExpression(element) || !ts.isIdentifier(element.expression) || !legacyNames.has(element.expression.text))
+            continue;
+        if (existing || replacedLegacy)
+            throw new Error('Both legacy and AzureNet plugins are configured. Remove the legacy plugin call first.');
+        edits.push({ start: element.getStart(source), end: element.end, text: `${pluginName}()` });
+        replacedLegacy = true;
+    }
+    if (!existing && !replacedLegacy) {
+        const last = plugins.elements.at(-1);
+        edits.push({ start: plugins.end - 1, end: plugins.end - 1, text: `\n${pluginName}()\n` });
+        if (last && !plugins.elements.hasTrailingComma)
+            edits.push({ start: last.end, end: last.end, text: ',' });
+    }
+    for (const edit of edits.sort((a, b) => b.start - a.start))
+        content = content.slice(0, edit.start) + edit.text + content.slice(edit.end);
+    if (!imported)
+        content = `import { AzureNetPlugin } from '@azure-net/kit/plugin';\n${content}`;
+    return enableHydratable(content);
 }
 export default async function initEdges() {
-	const viteConfigPath = resolveViteConfigPath();
-	if (!viteConfigPath) {
-		console.error('❌ vite.config.(ts|js|mjs|cjs) was not found');
-		return;
-	}
-	let content = await fs.readFile(viteConfigPath, 'utf-8');
-	content = injectEdgesImport(content);
-	content = injectEdgesPlugin(content);
-	await fs.writeFile(viteConfigPath, content, 'utf-8');
-	console.log(`✅ Edges plugin initialized in ${path.basename(viteConfigPath)}`);
+    for (const name of VITE_CONFIGS) {
+        const file = path.resolve(name);
+        let content;
+        try {
+            content = await fs.readFile(file, 'utf8');
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                continue;
+            throw error;
+        }
+        await fs.writeFile(file, await formatConfig(configureAzureNetPlugin(content), file));
+        console.log(`AzureNetPlugin configured in ${name}`);
+        return;
+    }
+    throw new Error('vite.config.(ts|js|mjs) was not found. Initialize a SvelteKit project first.');
 }

package/src/init/initStructure.js

@@ -1,149 +1,35 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { loadUserConfig } from '../utils/loadConfig.js';
-import initAliases, { normalizeContexts } from './initAliases.js';
-import { getSharedEssentialsPath } from '../utils/sharedFoundation.js';
-const ROOT = path.join(process.cwd(), 'src');
-const APP_ROOT = path.join(ROOT, 'app');
-const CONTEXT_DIRS = [
-	'ui',
-	'layers',
-	'layers/domain',
-	'layers/application',
-	'layers/application/providers',
-	'layers/application/use-cases',
-	'layers/infrastructure',
-	'layers/infrastructure/providers',
-	'layers/infrastructure/http',
-	'layers/infrastructure/http/repositories',
-	'layers/presentation'
-];
-const SHARED_ESSENTIALS_DIRS = [
-	'',
-	'foundation',
-	'foundation/abstracts',
-	'foundation/constants',
-	'foundation/constructs',
-	'foundation/constructs/datasource',
-	'foundation/constructs/presenter',
-	'foundation/constructs/provider',
-	'foundation/constructs/response',
-	'foundation/constructs/schema',
-	'foundation/constructs/schema/custom-rules',
-	'foundation/helpers',
-	'localization',
-	'pipelines'
-];
-const ensureDir = async (dirPath) => {
-	try {
-		await fs.mkdir(dirPath, { recursive: true });
-	} catch (error) {
-		console.warn(`⚠️ Failed to create directory: ${dirPath}`, error);
-	}
-};
-const ensureFile = async (filePath, content) => {
-	try {
-		await fs.access(filePath);
-		return;
-	} catch {
-		// File is missing
-	}
-	try {
-		await fs.mkdir(path.dirname(filePath), { recursive: true });
-		await fs.writeFile(filePath, content, 'utf-8');
-	} catch (error) {
-		console.warn(`⚠️ Failed to create file: ${filePath}`, error);
-	}
-};
-const toPascalCase = (value) =>
-	value
-		.split(/[-_\s]+/)
-		.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-		.join('');
-const createInfrastructureProvider = (contextName) => `import { createBoundaryProvider } from '@azure-net/kit';
-
-export const ${contextName}InfrastructureProvider = createBoundaryProvider('${contextName}InfrastructureProvider', {
-\tregister: () => ({})
-});
-`;
-const createApplicationProvider = (contextName) => `import { createBoundaryProvider } from '@azure-net/kit';
-import { ${contextName}InfrastructureProvider } from '../../infrastructure/providers';
-
-export const ${contextName}ApplicationProvider = createBoundaryProvider('${contextName}ApplicationProvider', {
-\tdependsOn: { ${contextName}InfrastructureProvider },
-\tregister: () => ({})
-});
-`;
-const printContextsError = () => {
-	console.error('❌ Cannot generate folders structure: `contexts` is missing or empty in azure-net.config.ts/js');
-	console.error('Add contexts first, for example:');
-	console.error('export default {');
-	console.error("\tcontexts: ['web', 'admin']");
-	console.error('\t// or');
-	console.error("\t// contexts: [{ name: 'web', alias: '$web' }, { name: 'admin', alias: '$admin' }]");
-	console.error('};');
-};
-const printSharedAliasError = () => {
-	console.error('❌ Cannot generate folders structure: `sharedAlias` is missing in azure-net.config.ts/js');
-	console.error('Add shared context and alias first, for example:');
-	console.error('export default {');
-	console.error("\tsharedAlias: '$shared-kernel',");
-	console.error("\tcontexts: [{ name: 'shared-kernel', alias: '$shared-kernel' }, 'public']");
-	console.error('};');
-};
-const ensureSharedEssentialsStructure = async (contexts, sharedAlias) => {
-	const normalizedSharedAlias = sharedAlias.startsWith('$') ? sharedAlias : `$${sharedAlias}`;
-	const sharedContext = contexts.find((context) => context.alias === normalizedSharedAlias);
-	if (!sharedContext) {
-		console.error(`❌ sharedAlias "${normalizedSharedAlias}" does not point to any configured context.`);
-		return false;
-	}
-	const essentialsRoot = getSharedEssentialsPath(sharedContext.name);
-	for (const dir of SHARED_ESSENTIALS_DIRS) {
-		await ensureDir(path.join(essentialsRoot, dir));
-	}
-	return true;
-};
-const ensureContextStructure = async (context) => {
-	const contextRoot = path.join(APP_ROOT, context.name);
-	for (const dir of CONTEXT_DIRS) {
-		await ensureDir(path.join(contextRoot, dir));
-	}
-	const contextName = toPascalCase(context.name);
-	const infraProviderPath = path.join(contextRoot, 'layers', 'infrastructure', 'providers', 'InfrastructureProvider.ts');
-	const infraProviderIndex = path.join(contextRoot, 'layers', 'infrastructure', 'providers', 'index.ts');
-	const appProviderPath = path.join(contextRoot, 'layers', 'application', 'providers', 'ApplicationProvider.ts');
-	const appProviderIndex = path.join(contextRoot, 'layers', 'application', 'providers', 'index.ts');
-	const repositoriesIndex = path.join(contextRoot, 'layers', 'infrastructure', 'http', 'repositories', 'index.ts');
-	const useCasesIndex = path.join(contextRoot, 'layers', 'application', 'use-cases', 'index.ts');
-	await ensureFile(infraProviderPath, createInfrastructureProvider(contextName));
-	await ensureFile(infraProviderIndex, `export * from './InfrastructureProvider';\n`);
-	await ensureFile(appProviderPath, createApplicationProvider(contextName));
-	await ensureFile(appProviderIndex, `export * from './ApplicationProvider';\n`);
-	await ensureFile(repositoriesIndex, '');
-	await ensureFile(useCasesIndex, '');
-};
+import { initializeConfigDefaults, loadUserConfig } from '../utils/loadConfig.js';
+import { discoverContexts, discoverPresentationWorkspaces, ensureContextStructure, ensurePresentationStructure, getPlatformPath, getPresentationPath, normalizePascalName, SHARED_CONTEXT, SHARED_WORKSPACE } from '../utils/architecture.js';
+import { writeIfNotExists } from '../utils/fileUtils.js';
+import initAliases from './initAliases.js';
 export default async function initStructure() {
-	const config = await loadUserConfig();
-	const contexts = normalizeContexts(config.contexts);
-	if (!contexts.length) {
-		printContextsError();
-		return;
-	}
-	const sharedAlias = String(config.sharedAlias ?? '').trim();
-	if (!sharedAlias.length) {
-		printSharedAliasError();
-		process.exitCode = 1;
-		return;
-	}
-	for (const context of contexts) {
-		await ensureContextStructure(context);
-	}
-	const sharedCreated = await ensureSharedEssentialsStructure(contexts, sharedAlias);
-	if (!sharedCreated) {
-		process.exitCode = 1;
-		return;
-	}
-	await initAliases();
-	console.log('✅ Folders structure initialized');
+    await initializeConfigDefaults();
+    const config = await loadUserConfig();
+    for (const name of new Set([SHARED_CONTEXT, ...(await discoverContexts())]))
+        await ensureContextStructure(name);
+    let initial = false;
+    try {
+        initial = (await fs.readdir(getPresentationPath())).length === 0;
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            throw error;
+        initial = true;
+    }
+    const workspaces = initial ? (config.presentationWorkspaces ?? []).map(normalizePascalName) : await discoverPresentationWorkspaces();
+    if (workspaces.length) {
+        for (const workspace of new Set([...workspaces, SHARED_WORKSPACE]))
+            await ensurePresentationStructure(workspace);
+    }
+    else
+        await ensurePresentationStructure();
+    const platform = getPlatformPath();
+    for (const dir of ['Foundation/Datasource', 'Foundation/Response', 'Foundation/Schema/CustomRules', 'Foundation/DI', 'Bootstrap'])
+        await fs.mkdir(path.join(platform, dir), { recursive: true });
+    await writeIfNotExists(path.join(platform, 'Foundation/DI/ApplicationProvider.ts'), `import { CreateDiContainer } from '@azure-net/kit';\n\nexport const ApplicationProvider = CreateDiContainer('ApplicationProvider', {\n\tregister: () => ({})\n});\n`);
+    await writeIfNotExists(path.join(platform, 'Foundation/DI/index.ts'), "export * from './ApplicationProvider';\n");
+    await initAliases();
+    console.log('Folders structure initialized');
 }

package/src/install/configureCommitTools.js

@@ -0,0 +1 @@
+export { default } from '../plugins/addLint.js';

package/src/install/installFresh.js

@@ -1,77 +1,48 @@
 import prompts from 'prompts';
-import { addLint } from '../plugins/index.js';
+import configureCommitTools from './configureCommitTools.js';
 import initEdges from '../init/initEdges.js';
 import initStructure from '../init/initStructure.js';
-import { normalizeContexts } from '../init/initAliases.js';
-import { loadUserConfig } from '../utils/loadConfig.js';
-import {
-	createCoreSchema,
-	createDatasource,
-	createDatasourceProvider,
-	createPresenterFactory,
-	createProgram,
-	createResponse,
-	createTranslationManager
-} from '../scaffolds/index.js';
-const printContextsError = () => {
-	console.error('❌ Cannot run "install fresh": `contexts` is missing or empty in azure-net.config.ts/js');
-	console.error('Add contexts first, for example:');
-	console.error('export default {');
-	console.error("\tcontexts: ['web', 'admin']");
-	console.error('\t// or');
-	console.error("\t// contexts: [{ name: 'web', alias: '$web' }, { name: 'admin', alias: '$admin' }]");
-	console.error('};');
-};
+import { createCoreSchema, createDatasource, createProgram, createResponse, createTranslationManager } from '../scaffolds/index.js';
 const askConfirm = async (message) => {
-	const result = await prompts({
-		type: 'confirm',
-		name: 'confirmed',
-		message,
-		initial: true
-	});
-	return Boolean(result.confirmed);
+    const result = await prompts({
+        type: 'confirm',
+        name: 'confirmed',
+        message,
+        initial: true
+    });
+    return Boolean(result.confirmed);
 };
 const runOptionalStep = async (question, action) => {
-	const shouldRun = await askConfirm(question);
-	if (!shouldRun) return;
-	try {
-		await action();
-	} catch (error) {
-		console.warn(`⚠️ Step failed: ${question}`);
-		console.warn(error);
-	}
+    const shouldRun = await askConfirm(question);
+    if (!shouldRun)
+        return;
+    try {
+        await action();
+    }
+    catch (error) {
+        throw new Error(`Step failed: ${question}`, { cause: error });
+    }
+    if (process.exitCode)
+        throw new Error(`Step failed: ${question}`);
 };
 export default async function installFresh() {
-	const config = await loadUserConfig();
-	const contexts = normalizeContexts(config.contexts);
-	if (!contexts.length) {
-		printContextsError();
-		process.exitCode = 1;
-		return;
-	}
-	await initStructure();
-	await initEdges();
-	await createProgram();
-	await runOptionalStep('Add commit tools (lint/commit conventions)?', async () => {
-		await addLint();
-	});
-	await runOptionalStep('Create schema factory?', async () => {
-		await createCoreSchema();
-	});
-	await runOptionalStep('Create presenter factory?', async () => {
-		await createPresenterFactory();
-	});
-	await runOptionalStep('Create API response?', async () => {
-		await createResponse();
-	});
-	await runOptionalStep('Create datasource?', async () => {
-		await createDatasource();
-	});
-	await runOptionalStep('Create datasource provider?', async () => {
-		await createDatasourceProvider();
-	});
-	await runOptionalStep('Create translation manager (i18n)?', async () => {
-		await createTranslationManager();
-	});
-	console.log('✅ install fresh completed');
+    await initStructure();
+    await initEdges();
+    await createProgram();
+    await runOptionalStep('Add commit tools (lint/commit conventions)?', async () => {
+        await configureCommitTools();
+    });
+    await runOptionalStep('Create schema factory?', async () => {
+        await createCoreSchema();
+    });
+    await runOptionalStep('Create API response?', async () => {
+        await createResponse();
+    });
+    await runOptionalStep('Create datasource?', async () => {
+        await createDatasource();
+    });
+    await runOptionalStep('Create translation manager (i18n)?', async () => {
+        await createTranslationManager();
+    });
+    console.log('✅ install fresh completed');
 }