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

package/src/checks/checkInternal.js

@@ -8,32 +8,35 @@ import checkImports from './checkImports.js';
 import checkHooks from './checkHooks.js';
 import checkLayerImports from './checkLayerImports.js';
 const tasks = [
-	{ name: 'presenter-names', run: checkPresenterNames },
-	{ name: 'provider-names', run: checkProviderNames },
-	{ name: 'provider-graph', run: checkProviderGraph },
-	{ name: 'domain', run: checkDomain },
-	{ name: 'imports', run: checkImports },
-	{ name: 'hooks', run: checkHooks },
-	{ name: 'layer-imports', run: checkLayerImports },
-	{ name: 'layer-boundaries', run: checkLayerBoundaries },
-	{ name: 'folders-structure', run: checkFoldersStructure }
+    { name: 'presenter-names', run: checkPresenterNames },
+    { name: 'provider-names', run: checkProviderNames },
+    { name: 'provider-graph', run: checkProviderGraph },
+    { name: 'domain', run: checkDomain },
+    { name: 'imports', run: checkImports },
+    { name: 'hooks', run: checkHooks },
+    { name: 'layer-imports', run: checkLayerImports },
+    { name: 'layer-boundaries', run: checkLayerBoundaries },
+    { name: 'folders-structure', run: checkFoldersStructure }
 ];
 const runTask = async (task) => {
-	console.log(`\n▶ Running check ${task.name}...`);
-	process.exitCode = 0;
-	await task.run();
-	if ((process.exitCode ?? 0) !== 0) {
-		throw new Error(`Check "${task.name}" failed`);
-	}
+    console.log(`\n▶ Running check ${task.name}...`);
+    process.exitCode = 0;
+    await task.run();
+    if ((process.exitCode ?? 0) !== 0) {
+        throw new Error(`Check "${task.name}" failed`);
+    }
 };
 export default async function checkInternal() {
-	try {
-		for (const task of tasks) {
-			await runTask(task);
-		}
-		console.log('\n✅ Internal checks passed.');
-	} catch (error) {
-		console.error(`\n❌ Internal checks failed: ${error instanceof Error ? error.message : String(error)}`);
-		process.exitCode = 1;
-	}
+    let failed = false;
+    for (const task of tasks) {
+        try {
+            await runTask(task);
+        }
+        catch (error) {
+            failed = true;
+            console.error(error instanceof Error ? error.message : String(error));
+        }
+    }
+    process.exitCode = failed ? 1 : 0;
+    console[failed ? 'error' : 'log'](failed ? 'Internal checks failed.' : 'Internal checks passed.');
 }

package/src/checks/checkLayerBoundaries.js

@@ -1,199 +1,24 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { loadUserConfig } from '../utils/loadConfig.js';
-import { normalizeContexts } from '../init/initAliases.js';
-import { SHARED_ESSENTIALS_DIR_NAME } from '../utils/sharedFoundation.js';
-const TARGET_EXTENSIONS = new Set(['.ts', '.js', '.svelte']);
-const IGNORED_DIRS = new Set(['node_modules', 'dist', '.svelte-kit', '.git']);
-const IMPORT_FROM_PATTERN = /\bimport\s+(?:type\s+)?[\s\S]*?\sfrom\s*['"]([^'"]+)['"]/g;
-const EXPORT_FROM_PATTERN = /\bexport\s+(?:type\s+)?\{[\s\S]*?\}\sfrom\s*['"]([^'"]+)['"]/g;
-const DYNAMIC_IMPORT_PATTERN = /\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
-const toPosixPath = (value) => value.split(path.sep).join('/');
-const normalizeAlias = (value, fallback = '') => {
-	const raw = String(value ?? '').trim();
-	if (!raw.length) return fallback;
-	return raw.startsWith('$') ? raw : `$${raw}`;
-};
-const findLineByIndex = (content, index) => {
-	let line = 1;
-	for (let i = 0; i < index; i += 1) {
-		if (content[i] === '\n') line += 1;
-	}
-	return line;
-};
-const getRelativePath = (filePath) => toPosixPath(path.relative(process.cwd(), filePath));
-const listFiles = async (rootDir) => {
-	const files = [];
-	const stack = [rootDir];
-	while (stack.length) {
-		const current = stack.pop();
-		if (!current) continue;
-		let entries = [];
-		try {
-			entries = await fs.readdir(current, { withFileTypes: true });
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			if (entry.isDirectory()) {
-				if (!IGNORED_DIRS.has(entry.name)) {
-					stack.push(path.join(current, entry.name));
-				}
-				continue;
-			}
-			if (!entry.isFile()) continue;
-			const filePath = path.join(current, entry.name);
-			if (!TARGET_EXTENSIONS.has(path.extname(filePath))) continue;
-			files.push(filePath);
-		}
-	}
-	return files;
-};
-const extractImports = (content) => {
-	const matches = [];
-	const patterns = [IMPORT_FROM_PATTERN, EXPORT_FROM_PATTERN, DYNAMIC_IMPORT_PATTERN];
-	for (const pattern of patterns) {
-		const regex = new RegExp(pattern.source, 'g');
-		let match;
-		while ((match = regex.exec(content)) !== null) {
-			const value = match[1];
-			if (!value) continue;
-			matches.push({ value, line: findLineByIndex(content, match.index) });
-		}
-	}
-	return matches;
-};
-const resolveAliasFromImport = (importPath, aliases) => {
-	const sorted = [...aliases].sort((a, b) => b.length - a.length);
-	for (const alias of sorted) {
-		if (importPath === alias || importPath.startsWith(`${alias}/`)) {
-			return alias;
-		}
-	}
-	return null;
-};
-const resolveContextFromRelativeImport = (filePath, importPath, contexts) => {
-	if (!importPath.startsWith('.')) return null;
-	const absoluteImportPath = path.resolve(path.dirname(filePath), importPath);
-	const appRoot = path.join(process.cwd(), 'src', 'app');
-	for (const context of contexts) {
-		const contextRoot = path.join(appRoot, context.name);
-		if (absoluteImportPath === contextRoot || absoluteImportPath.startsWith(`${contextRoot}${path.sep}`)) {
-			return context;
-		}
-	}
-	return null;
-};
-const isInside = (targetPath, rootPath) => targetPath === rootPath || targetPath.startsWith(`${rootPath}${path.sep}`);
-const resolveAbsoluteRelativeImport = (filePath, importPath) => {
-	if (!importPath.startsWith('.')) return null;
-	return path.resolve(path.dirname(filePath), importPath);
-};
+import { checkDependencies } from './architecture.js';
+const common = new Set(['Ui', 'Scopes', 'Shell', 'routes', 'Routes']);
 export default async function checkLayerBoundaries() {
-	const config = await loadUserConfig();
-	const contexts = normalizeContexts(config.contexts);
-	if (!contexts.length) {
-		console.error('❌ No contexts found in azure-net.config.ts/js. Fill `contexts` first.');
-		process.exitCode = 1;
-		return;
-	}
-	const sharedAliasRaw = normalizeAlias(config.sharedAlias, '');
-	const sharedAlias = sharedAliasRaw.length ? sharedAliasRaw : null;
-	if (!sharedAlias) {
-		console.error('❌ sharedAlias is missing in azure-net.config.ts/js. Set it explicitly to the shared context alias.');
-		process.exitCode = 1;
-		return;
-	}
-	const aliasToContext = new Map();
-	for (const context of contexts) {
-		aliasToContext.set(context.alias, context);
-	}
-	const knownAliases = [...contexts.map((context) => context.alias)];
-	const sharedContext = aliasToContext.get(sharedAlias);
-	if (!sharedContext) {
-		console.error(`❌ sharedAlias "${sharedAlias}" does not point to any configured context.`);
-		process.exitCode = 1;
-		return;
-	}
-	const issues = [];
-	for (const context of contexts) {
-		const contextRoot = path.join(process.cwd(), 'src', 'app', context.name);
-		const isSharedContext = context.alias === sharedAlias;
-		const sharedEssentialsRoot = isSharedContext ? path.join(contextRoot, SHARED_ESSENTIALS_DIR_NAME) : null;
-		try {
-			await fs.access(contextRoot);
-		} catch {
-			continue;
-		}
-		const files = await listFiles(contextRoot);
-		const allowedAliases = new Set([context.alias]);
-		if (context.alias !== sharedAlias) {
-			allowedAliases.add(sharedAlias);
-		}
-		for (const filePath of files) {
-			const content = await fs.readFile(filePath, 'utf-8');
-			const imports = extractImports(content);
-			const isSharedEssentialsFile = Boolean(sharedEssentialsRoot && isInside(filePath, sharedEssentialsRoot));
-			for (const entry of imports) {
-				const targetAlias = resolveAliasFromImport(entry.value, knownAliases);
-				if (!targetAlias) continue;
-				if (isSharedEssentialsFile && targetAlias === sharedAlias) {
-					const importRest = entry.value.slice(sharedAlias.length).replace(/^\/+/, '');
-					if (importRest.length && !importRest.startsWith(`${SHARED_ESSENTIALS_DIR_NAME}/`)) {
-						issues.push({
-							file: filePath,
-							line: entry.line,
-							message: `Layer boundary violation: shared essentials cannot import from shared "${importRest}". Essentials may depend only on shared essentials code.`
-						});
-						continue;
-					}
-				}
-				if (allowedAliases.has(targetAlias)) continue;
-				const targetContext = aliasToContext.get(targetAlias);
-				const baseMessage = targetContext
-					? `Layer boundary violation: context "${context.name}" cannot import from context "${targetContext.name}" (${targetAlias})`
-					: `Layer boundary violation: context "${context.name}" cannot import from "${targetAlias}"`;
-				issues.push({
-					file: filePath,
-					line: entry.line,
-					message: baseMessage
-				});
-			}
-			for (const entry of imports) {
-				const absoluteRelativeImport = resolveAbsoluteRelativeImport(filePath, entry.value);
-				if (
-					isSharedEssentialsFile &&
-					absoluteRelativeImport &&
-					sharedEssentialsRoot &&
-					isInside(absoluteRelativeImport, contextRoot) &&
-					!isInside(absoluteRelativeImport, sharedEssentialsRoot)
-				) {
-					issues.push({
-						file: filePath,
-						line: entry.line,
-						message: 'Layer boundary violation: shared essentials cannot import from shared layers/ui via relative path.'
-					});
-					continue;
-				}
-				const relativeTargetContext = resolveContextFromRelativeImport(filePath, entry.value, contexts);
-				if (!relativeTargetContext || relativeTargetContext.name === context.name) continue;
-				if (context.alias !== sharedAlias && relativeTargetContext.alias === sharedAlias) continue;
-				const baseMessage = `Layer boundary violation: context "${context.name}" cannot import from context "${relativeTargetContext.name}" via relative path`;
-				issues.push({
-					file: filePath,
-					line: entry.line,
-					message: baseMessage
-				});
-			}
-		}
-	}
-	if (!issues.length) {
-		console.log('✅ Layer boundaries check passed.');
-		return;
-	}
-	console.error('❌ Layer boundaries check failed:');
-	for (const issue of issues) {
-		console.error(`• ${getRelativePath(issue.file)}:${issue.line} — ${issue.message}`);
-	}
-	process.exitCode = 1;
+    await checkDependencies('Layer boundaries', (source, target) => {
+        if (source[0] === 'Contexts') {
+            if (target[0] === 'Presentation')
+                return 'Contexts cannot import Presentation';
+            if (target[0] === 'Contexts' &&
+                source[1] !== target[1] &&
+                target[1] &&
+                (source[1] === 'SharedKernel' || target[1] !== 'SharedKernel')) {
+                return `Context "${source[1]}" cannot import context "${target[1]}"; only SharedKernel is shared`;
+            }
+        }
+        if (source[0] === 'Presentation' && target[0] === 'Presentation') {
+            const from = source[1];
+            const to = target[1];
+            if (from && to && source.length > 2 && !common.has(from) && !common.has(to) && from !== to && to !== 'Shared') {
+                return `Presentation workspace "${from}" cannot import workspace "${to}"`;
+            }
+        }
+        return null;
+    });
 }

package/src/checks/checkLayerImports.js

@@ -1,136 +1,16 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { normalizeContexts } from '../init/initAliases.js';
-import { loadUserConfig } from '../utils/loadConfig.js';
-const TARGET_EXTENSIONS = new Set(['.ts', '.js', '.svelte']);
-const IGNORED_DIRS = new Set(['node_modules', 'dist', '.svelte-kit', '.git']);
-const LAYERS = ['domain', 'application', 'infrastructure', 'presentation'];
-const FORBIDDEN_LAYER_IMPORTS = {
-	infrastructure: ['application', 'presentation'],
-	application: ['presentation'],
-	domain: ['application', 'infrastructure', 'presentation'],
-	presentation: []
-};
-const IMPORT_FROM_PATTERN = /\bimport\s+(?:type\s+)?[\s\S]*?\sfrom\s*['"]([^'"]+)['"]/g;
-const EXPORT_FROM_PATTERN = /\bexport\s+(?:type\s+)?\{[\s\S]*?\}\sfrom\s*['"]([^'"]+)['"]/g;
-const DYNAMIC_IMPORT_PATTERN = /\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
-const toPosixPath = (value) => value.split(path.sep).join('/');
-const findLineByIndex = (content, index) => {
-	let line = 1;
-	for (let i = 0; i < index; i += 1) {
-		if (content[i] === '\n') line += 1;
-	}
-	return line;
-};
-const getRelativePath = (filePath) => toPosixPath(path.relative(process.cwd(), filePath));
-const listFiles = async (rootDir) => {
-	const files = [];
-	const stack = [rootDir];
-	while (stack.length) {
-		const current = stack.pop();
-		if (!current) continue;
-		let entries = [];
-		try {
-			entries = await fs.readdir(current, { withFileTypes: true });
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			if (entry.isDirectory()) {
-				if (!IGNORED_DIRS.has(entry.name)) {
-					stack.push(path.join(current, entry.name));
-				}
-				continue;
-			}
-			if (!entry.isFile()) continue;
-			const filePath = path.join(current, entry.name);
-			if (!TARGET_EXTENSIONS.has(path.extname(filePath))) continue;
-			files.push(filePath);
-		}
-	}
-	return files;
-};
-const extractImports = (content) => {
-	const matches = [];
-	const patterns = [IMPORT_FROM_PATTERN, EXPORT_FROM_PATTERN, DYNAMIC_IMPORT_PATTERN];
-	for (const pattern of patterns) {
-		const regex = new RegExp(pattern.source, 'g');
-		let match;
-		while ((match = regex.exec(content)) !== null) {
-			const value = match[1];
-			if (!value) continue;
-			matches.push({ value, line: findLineByIndex(content, match.index) });
-		}
-	}
-	return matches;
-};
-const getLayerFromPath = (filePath, contextRoot) => {
-	for (const layer of LAYERS) {
-		const layerRoot = path.join(contextRoot, 'layers', layer);
-		if (filePath === layerRoot || filePath.startsWith(`${layerRoot}${path.sep}`)) {
-			return layer;
-		}
-	}
-	return null;
-};
-const getLayerFromAliasImport = (importPath, context) => {
-	if (importPath !== context.alias && !importPath.startsWith(`${context.alias}/`)) return null;
-	const withoutAlias = importPath.slice(context.alias.length).replace(/^\/+/, '');
-	for (const layer of LAYERS) {
-		if (withoutAlias === `layers/${layer}` || withoutAlias.startsWith(`layers/${layer}/`)) return layer;
-		if (withoutAlias === layer || withoutAlias.startsWith(`${layer}/`)) return layer;
-	}
-	return null;
-};
-const getLayerFromRelativeImport = (filePath, importPath, contextRoot) => {
-	if (!importPath.startsWith('.')) return null;
-	const absoluteImportPath = path.resolve(path.dirname(filePath), importPath);
-	return getLayerFromPath(absoluteImportPath, contextRoot);
-};
-const createMessage = (sourceLayer, targetLayer, context) =>
-	`Layer import violation: "${context.name}" ${sourceLayer} layer cannot import from ${targetLayer} layer`;
+import { checkDependencies } from './architecture.js';
 export default async function checkLayerImports() {
-	const config = await loadUserConfig();
-	const contexts = normalizeContexts(config.contexts);
-	if (!contexts.length) {
-		console.error('❌ No contexts found in azure-net.config.ts/js. Fill `contexts` first.');
-		process.exitCode = 1;
-		return;
-	}
-	const issues = [];
-	for (const context of contexts) {
-		const contextRoot = path.join(process.cwd(), 'src', 'app', context.name);
-		try {
-			await fs.access(contextRoot);
-		} catch {
-			continue;
-		}
-		const files = await listFiles(path.join(contextRoot, 'layers'));
-		for (const filePath of files) {
-			const sourceLayer = getLayerFromPath(filePath, contextRoot);
-			if (!sourceLayer) continue;
-			const forbiddenLayers = FORBIDDEN_LAYER_IMPORTS[sourceLayer];
-			if (!forbiddenLayers.length) continue;
-			const content = await fs.readFile(filePath, 'utf-8');
-			const imports = extractImports(content);
-			for (const entry of imports) {
-				const targetLayer = getLayerFromAliasImport(entry.value, context) ?? getLayerFromRelativeImport(filePath, entry.value, contextRoot);
-				if (!targetLayer || !forbiddenLayers.includes(targetLayer)) continue;
-				issues.push({
-					file: filePath,
-					line: entry.line,
-					message: createMessage(sourceLayer, targetLayer, context)
-				});
-			}
-		}
-	}
-	if (!issues.length) {
-		console.log('✅ Layer imports check passed.');
-		return;
-	}
-	console.error('❌ Layer imports check failed:');
-	for (const issue of issues) {
-		console.error(`• ${getRelativePath(issue.file)}:${issue.line} — ${issue.message}`);
-	}
-	process.exitCode = 1;
+    await checkDependencies('Layer imports', (source, target) => {
+        if (source[0] !== 'Contexts')
+            return null;
+        if (target[0] === 'Presentation')
+            return 'Contexts cannot import Presentation';
+        if (target[0] !== 'Contexts')
+            return null;
+        const from = source[2];
+        const to = target[2];
+        if ((from === 'Domain' && (to === 'Application' || to === 'Infrastructure')) || (from === 'Infrastructure' && to === 'Application'))
+            return `${from} cannot import ${to}`;
+        return null;
+    });
 }