@azure-net/cli 5.0.0-1 → 5.0.0

package/src/checks/checkPresenterNames.js

@@ -1,20 +1,15 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-
 const TARGET_EXTENSIONS = new Set(['.ts', '.js', '.svelte']);
 const IGNORED_DIRS = new Set(['node_modules', 'dist', '.svelte-kit', '.git']);
-
 const CREATE_FACTORY_PATTERN = '(?:export\\s+)?(?:const|let|var)\\s+([A-Za-z_$][A-Za-z0-9_$]*)\\s*=\\s*createPresenterFactory\\s*\\(';
 const IMPORT_FROM_PRESENTER_PATTERN = 'import\\s*\\{([^}]+)\\}\\s*from\\s*[\'"]([^\'"]+)[\'"]';
 const PRESENTER_CALL_PATTERN = '\\b([A-Za-z_$][A-Za-z0-9_$]*)\\s*\\(\\s*([\'"`])([^\'"`]*)\\2';
-
 const toPosixPath = (value) => value.split(path.sep).join('/');
-
 const isPresenterImportPath = (importPath) => {
 	const normalized = importPath.replace(/\\/g, '/');
 	return /(^|\/)presenter(\/|$)/.test(normalized);
 };
-
 const parseImportLocals = (rawImports) => {
 	const locals = [];
 	for (const segment of rawImports.split(',')) {
@@ -25,7 +20,6 @@ const parseImportLocals = (rawImports) => {
 			locals.push(aliasMatch[2]);
 			continue;
 		}
-
 		const directMatch = item.match(/^([A-Za-z_$][A-Za-z0-9_$]*)$/);
 		if (directMatch?.[1]) {
 			locals.push(directMatch[1]);
@@ -33,22 +27,18 @@ const parseImportLocals = (rawImports) => {
 	}
 	return locals;
 };
-
 const listSourceFiles = async (rootDir) => {
 	const result = [];
 	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)) {
@@ -56,7 +46,6 @@ const listSourceFiles = async (rootDir) => {
 				}
 				continue;
 			}
-
 			if (!entry.isFile()) continue;
 			const fullPath = path.join(current, entry.name);
 			const extension = path.extname(fullPath);
@@ -64,10 +53,8 @@ const listSourceFiles = async (rootDir) => {
 			result.push(fullPath);
 		}
 	}
-
 	return result;
 };
-
 const getLineByIndex = (content, index) => {
 	let line = 1;
 	for (let i = 0; i < index; i += 1) {
@@ -75,7 +62,6 @@ const getLineByIndex = (content, index) => {
 	}
 	return line;
 };
-
 const extractFactoryNamesFromContent = (content) => {
 	const createFactoryRegex = new RegExp(CREATE_FACTORY_PATTERN, 'g');
 	const names = [];
@@ -86,7 +72,6 @@ const extractFactoryNamesFromContent = (content) => {
 	}
 	return names;
 };
-
 const extractImportedPresenterFactories = (content) => {
 	const importFromPresenterRegex = new RegExp(IMPORT_FROM_PRESENTER_PATTERN, 'g');
 	const names = [];
@@ -100,12 +85,10 @@ const extractImportedPresenterFactories = (content) => {
 	}
 	return names;
 };
-
 const collectPresenterOccurrences = (content, filePath, knownFactories) => {
 	const presenterCallRegex = new RegExp(PRESENTER_CALL_PATTERN, 'g');
 	const occurrences = [];
 	const availableCallees = new Set(['createPresenter']);
-
 	for (const name of extractFactoryNamesFromContent(content)) {
 		availableCallees.add(name);
 	}
@@ -115,7 +98,6 @@ const collectPresenterOccurrences = (content, filePath, knownFactories) => {
 	for (const name of knownFactories) {
 		availableCallees.add(name);
 	}
-
 	let match;
 	while ((match = presenterCallRegex.exec(content)) !== null) {
 		const callee = match[1];
@@ -124,7 +106,6 @@ const collectPresenterOccurrences = (content, filePath, knownFactories) => {
 		if (!callee || !presenterId) continue;
 		if (!availableCallees.has(callee)) continue;
 		if (quote === '`' && presenterId.includes('${')) continue;
-
 		occurrences.push({
 			id: presenterId,
 			file: filePath,
@@ -132,10 +113,8 @@ const collectPresenterOccurrences = (content, filePath, knownFactories) => {
 			callee
 		});
 	}
-
 	return occurrences;
 };
-
 export default async function checkPresenterNames() {
 	const srcPath = path.join(process.cwd(), 'src');
 	try {
@@ -145,51 +124,37 @@ export default async function checkPresenterNames() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const files = await listSourceFiles(srcPath);
 	const fileContents = new Map();
-
 	for (const filePath of files) {
-		// eslint-disable-next-line no-await-in-loop
 		const content = await fs.readFile(filePath, 'utf-8');
 		fileContents.set(filePath, content);
 	}
-
 	const globalFactoryNames = new Set();
-	for (const [filePath, content] of fileContents.entries()) {
+	for (const content of fileContents.values()) {
 		for (const name of extractFactoryNamesFromContent(content)) {
 			globalFactoryNames.add(name);
 		}
-		if (filePath.endsWith(path.join('core', 'presenter', 'index.ts')) || filePath.endsWith(path.join('core', 'presenter', 'index.js'))) {
-			for (const name of extractImportedPresenterFactories(content)) {
-				globalFactoryNames.add(name);
-			}
-		}
 	}
-
 	const occurrences = [];
 	for (const [filePath, content] of fileContents.entries()) {
 		occurrences.push(...collectPresenterOccurrences(content, filePath, globalFactoryNames));
 	}
-
 	if (!occurrences.length) {
 		console.log('✅ No presenter declarations found.');
 		return;
 	}
-
 	const grouped = new Map();
 	for (const occurrence of occurrences) {
 		const list = grouped.get(occurrence.id) ?? [];
 		list.push(occurrence);
 		grouped.set(occurrence.id, list);
 	}
-
 	const duplicated = Array.from(grouped.entries()).filter(([, list]) => list.length > 1);
 	if (!duplicated.length) {
 		console.log(`✅ Presenter names are unique (${occurrences.length} found).`);
 		return;
 	}
-
 	console.error('❌ Duplicate presenter names found:');
 	for (const [presenterId, list] of duplicated) {
 		console.error(`\n- "${presenterId}"`);
@@ -197,6 +162,5 @@ export default async function checkPresenterNames() {
 			console.error(`  • ${toPosixPath(path.relative(process.cwd(), item.file))}:${item.line} (${item.callee})`);
 		}
 	}
-
 	process.exitCode = 1;
 }

package/src/checks/checkPresenterNames.ts

@@ -162,15 +162,10 @@ export default async function checkPresenterNames(): Promise<void> {
 	}
 
 	const globalFactoryNames = new Set<string>();
-	for (const [filePath, content] of fileContents.entries()) {
+	for (const content of fileContents.values()) {
 		for (const name of extractFactoryNamesFromContent(content)) {
 			globalFactoryNames.add(name);
 		}
-		if (filePath.endsWith(path.join('core', 'presenter', 'index.ts')) || filePath.endsWith(path.join('core', 'presenter', 'index.js'))) {
-			for (const name of extractImportedPresenterFactories(content)) {
-				globalFactoryNames.add(name);
-			}
-		}
 	}
 
 	const occurrences: PresenterOccurrence[] = [];

package/src/checks/checkProject.js

@@ -1,15 +1,12 @@
 import { execSync } from 'node:child_process';
 import { loadUserConfig } from '../utils/loadConfig.js';
 import checkInternal from './checkInternal.js';
-
 const isPackageManager = (value) => typeof value === 'string' && ['pnpm', 'npm', 'yarn', 'bun'].includes(value);
-
 const runScript = (manager, script) => {
 	const command = `${manager} run ${script}`;
 	console.log(`\n▶ Running: ${command}`);
 	execSync(command, { stdio: 'inherit' });
 };
-
 const runInternalChecks = async () => {
 	console.log('\n▶ Running: azure-net check internal');
 	process.exitCode = 0;
@@ -18,17 +15,14 @@ const runInternalChecks = async () => {
 		throw new Error('azure-net check internal failed');
 	}
 };
-
 export default async function checkProject() {
 	const config = await loadUserConfig();
 	const manager = config.packageManager;
-
 	if (!isPackageManager(manager)) {
 		console.error('❌ packageManager is missing or invalid in azure-net.config.ts/js. Use one of: bun, pnpm, npm, yarn');
 		process.exitCode = 1;
 		return;
 	}
-
 	try {
 		runScript(manager, 'format');
 		await runInternalChecks();

package/src/checks/checkProviderGraph.js

@@ -1,11 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-
 const TARGET_EXTENSIONS = new Set(['.ts', '.js']);
 const IGNORED_DIRS = new Set(['node_modules', 'dist', '.svelte-kit', '.git']);
-
 const toPosixPath = (value) => value.split(path.sep).join('/');
-
 const getLineByIndex = (content, index) => {
 	let line = 1;
 	for (let i = 0; i < index; i += 1) {
@@ -13,38 +10,31 @@ const getLineByIndex = (content, index) => {
 	}
 	return line;
 };
-
 const listSourceFiles = 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 findMatchingBracket = (content, startIndex, openChar, closeChar) => {
 	let depth = 0;
 	for (let i = startIndex; i < content.length; i += 1) {
@@ -57,11 +47,9 @@ const findMatchingBracket = (content, startIndex, openChar, closeChar) => {
 	}
 	return -1;
 };
-
 const extractDependsOn = (configBlock) => {
 	const dependsOnMatch = configBlock.match(/dependsOn\s*:\s*\{([\s\S]*?)\}/m);
 	if (!dependsOnMatch?.[1]) return [];
-
 	const block = dependsOnMatch[1];
 	const deps = new Set();
 	const keyRegex = /([A-Za-z_$][A-Za-z0-9_$]*)\s*:/g;
@@ -72,20 +60,16 @@ const extractDependsOn = (configBlock) => {
 	}
 	return [...deps];
 };
-
 const parseProviderGraphFromFile = (content, filePath) => {
 	const nodes = [];
 	const token = 'createBoundaryProvider(';
 	let fromIndex = 0;
-
 	while (fromIndex < content.length) {
 		const start = content.indexOf(token, fromIndex);
 		if (start === -1) break;
-
 		const openParenIndex = start + token.length - 1;
 		const closeParenIndex = findMatchingBracket(content, openParenIndex, '(', ')');
 		if (closeParenIndex === -1) break;
-
 		const fullCall = content.slice(openParenIndex + 1, closeParenIndex);
 		const idMatch = fullCall.match(/^\s*(['"`])([^'"`]+)\1\s*,/m);
 		const providerName = idMatch?.[2];
@@ -96,7 +80,6 @@ const parseProviderGraphFromFile = (content, filePath) => {
 				const absoluteObjectEnd = findMatchingBracket(content, absoluteObjectStart, '{', '}');
 				const configBlock =
 					absoluteObjectEnd !== -1 ? content.slice(absoluteObjectStart, absoluteObjectEnd + 1) : fullCall.slice(objectStartInCall);
-
 				nodes.push({
 					name: providerName,
 					file: filePath,
@@ -112,24 +95,19 @@ const parseProviderGraphFromFile = (content, filePath) => {
 				});
 			}
 		}
-
 		fromIndex = closeParenIndex + 1;
 	}
-
 	return nodes;
 };
-
 const findCycles = (graph) => {
 	const cycles = [];
 	const visited = new Set();
 	const inStack = new Set();
 	const stack = [];
-
 	const dfs = (node) => {
 		visited.add(node);
 		inStack.add(node);
 		stack.push(node);
-
 		const neighbors = graph.get(node) ?? [];
 		for (const next of neighbors) {
 			if (!graph.has(next)) continue;
@@ -142,18 +120,14 @@ const findCycles = (graph) => {
 				if (idx !== -1) cycles.push([...stack.slice(idx), next]);
 			}
 		}
-
 		stack.pop();
 		inStack.delete(node);
 	};
-
 	for (const node of graph.keys()) {
 		if (!visited.has(node)) dfs(node);
 	}
-
 	return cycles;
 };
-
 export default async function checkProviderGraph() {
 	const srcPath = path.join(process.cwd(), 'src');
 	try {
@@ -163,40 +137,32 @@ export default async function checkProviderGraph() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const files = await listSourceFiles(srcPath);
 	const providers = [];
-
 	for (const filePath of files) {
 		const content = await fs.readFile(filePath, 'utf-8');
 		providers.push(...parseProviderGraphFromFile(content, filePath));
 	}
-
 	if (!providers.length) {
 		console.log('✅ No createBoundaryProvider declarations found.');
 		return;
 	}
-
 	const graph = new Map();
 	const issues = [];
 	const byName = new Map();
-
 	for (const provider of providers) {
 		if (byName.has(provider.name)) {
 			const existing = byName.get(provider.name);
 			issues.push({
 				file: provider.file,
 				line: provider.line,
-				message: `Provider graph ambiguity: duplicate provider id "${provider.name}" (first declared at ${toPosixPath(
-					path.relative(process.cwd(), existing.file)
-				)}:${existing.line})`
+				message: `Provider graph ambiguity: duplicate provider id "${provider.name}" (first declared at ${toPosixPath(path.relative(process.cwd(), existing.file))}:${existing.line})`
 			});
 			continue;
 		}
 		byName.set(provider.name, provider);
 		graph.set(provider.name, provider.dependsOn);
 	}
-
 	const cycles = findCycles(graph);
 	for (const cycle of cycles) {
 		const firstNode = byName.get(cycle[0] ?? '');
@@ -206,16 +172,13 @@ export default async function checkProviderGraph() {
 			message: `Circular provider dependency detected: ${cycle.join(' -> ')}`
 		});
 	}
-
 	if (!issues.length) {
 		console.log(`✅ Provider graph check passed (${providers.length} providers).`);
 		return;
 	}
-
 	console.error('❌ Provider graph check failed:');
 	for (const issue of issues) {
 		console.error(`• ${toPosixPath(path.relative(process.cwd(), issue.file))}:${issue.line} — ${issue.message}`);
 	}
-
 	process.exitCode = 1;
 }

package/src/checks/checkProviderNames.js

@@ -1,47 +1,38 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-
 const TARGET_EXTENSIONS = new Set(['.ts', '.js', '.svelte']);
 const IGNORED_DIRS = new Set(['node_modules', 'dist', '.svelte-kit', '.git']);
 const IMPORT_PATTERN = 'import\\s*\\{([^}]+)\\}\\s*from\\s*[\'"]([^\'"]+)[\'"]';
 const CALL_PATTERN = '\\b([A-Za-z_$][A-Za-z0-9_$]*)\\s*\\(\\s*([\'"`])([^\'"`]*)\\2';
-
 const toPosixPath = (value) => value.split(path.sep).join('/');
-
 const parseImportAliases = (rawImports, importName) => {
 	const aliases = [];
 	for (const segment of rawImports.split(',')) {
 		const item = segment.trim();
 		if (!item.length) continue;
-
 		const aliasMatch = item.match(/^([A-Za-z_$][A-Za-z0-9_$]*)\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*)$/);
 		if (aliasMatch?.[1] === importName && aliasMatch[2]) {
 			aliases.push(aliasMatch[2]);
 			continue;
 		}
-
 		if (item === importName) {
 			aliases.push(importName);
 		}
 	}
 	return aliases;
 };
-
 const listSourceFiles = 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)) {
@@ -49,17 +40,14 @@ const listSourceFiles = async (rootDir) => {
 				}
 				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 getLineByIndex = (content, index) => {
 	let line = 1;
 	for (let i = 0; i < index; i += 1) {
@@ -67,12 +55,10 @@ const getLineByIndex = (content, index) => {
 	}
 	return line;
 };
-
 const extractBoundaryFactoryAliases = (content) => {
 	const importRegex = new RegExp(IMPORT_PATTERN, 'g');
 	const aliases = new Set(['createBoundaryProvider']);
 	let match;
-
 	while ((match = importRegex.exec(content)) !== null) {
 		const rawImports = match[1];
 		if (!rawImports) continue;
@@ -80,25 +66,20 @@ const extractBoundaryFactoryAliases = (content) => {
 			aliases.add(alias);
 		}
 	}
-
 	return aliases;
 };
-
 const collectProviderOccurrences = (content, filepath) => {
 	const aliases = extractBoundaryFactoryAliases(content);
 	const callRegex = new RegExp(CALL_PATTERN, 'g');
 	const occurrences = [];
 	let match;
-
 	while ((match = callRegex.exec(content)) !== null) {
 		const callee = match[1];
 		const quote = match[2];
 		const providerId = match[3];
-
 		if (!callee || !providerId) continue;
 		if (!aliases.has(callee)) continue;
 		if (quote === '`' && providerId.includes('${')) continue;
-
 		occurrences.push({
 			id: providerId,
 			file: filepath,
@@ -106,10 +87,8 @@ const collectProviderOccurrences = (content, filepath) => {
 			callee
 		});
 	}
-
 	return occurrences;
 };
-
 export default async function checkProviderNames() {
 	const srcPath = path.join(process.cwd(), 'src');
 	try {
@@ -119,33 +98,27 @@ export default async function checkProviderNames() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const files = await listSourceFiles(srcPath);
 	const occurrences = [];
-
 	for (const filepath of files) {
 		const content = await fs.readFile(filepath, 'utf-8');
 		occurrences.push(...collectProviderOccurrences(content, filepath));
 	}
-
 	if (!occurrences.length) {
 		console.log('✅ No providers declarations found.');
 		return;
 	}
-
 	const grouped = new Map();
 	for (const occurrence of occurrences) {
 		const list = grouped.get(occurrence.id) ?? [];
 		list.push(occurrence);
 		grouped.set(occurrence.id, list);
 	}
-
 	const duplicated = Array.from(grouped.entries()).filter(([, list]) => list.length > 1);
 	if (!duplicated.length) {
 		console.log(`✅ Provider names are unique (${occurrences.length} found).`);
 		return;
 	}
-
 	console.error('❌ Duplicate provider names found:');
 	for (const [providerId, list] of duplicated) {
 		console.error(`\n- "${providerId}"`);
@@ -153,6 +126,5 @@ export default async function checkProviderNames() {
 			console.error(`  • ${toPosixPath(path.relative(process.cwd(), item.file))}:${item.line} (${item.callee})`);
 		}
 	}
-
 	process.exitCode = 1;
 }

package/src/checks/index.js

@@ -4,8 +4,8 @@ export { default as checkProviderGraph } from './checkProviderGraph.js';
 export { default as checkDomain } from './checkDomain.js';
 export { default as checkImports } from './checkImports.js';
 export { default as checkHooks } from './checkHooks.js';
+export { default as checkLayerImports } from './checkLayerImports.js';
 export { default as checkLayerBoundaries } from './checkLayerBoundaries.js';
 export { default as checkFoldersStructure } from './checkFoldersStructure.js';
 export { default as checkInternal } from './checkInternal.js';
 export { default as checkProject } from './checkProject.js';
-//# sourceMappingURL=index.js.map

package/src/checks/index.ts

@@ -4,6 +4,7 @@ export { default as checkProviderGraph } from './checkProviderGraph.js';
 export { default as checkDomain } from './checkDomain.js';
 export { default as checkImports } from './checkImports.js';
 export { default as checkHooks } from './checkHooks.js';
+export { default as checkLayerImports } from './checkLayerImports.js';
 export { default as checkLayerBoundaries } from './checkLayerBoundaries.js';
 export { default as checkFoldersStructure } from './checkFoldersStructure.js';
 export { default as checkInternal } from './checkInternal.js';