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

package/src/checks/checkProviderGraph.js

@@ -1,184 +1,200 @@
 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 IGNORED_DIRS = new Set(['.backup', '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) {
-		if (content[i] === '\n') line += 1;
-	}
-	return line;
+    let line = 1;
+    for (let i = 0; i < index; i += 1) {
+        if (content[i] === '\n')
+            line += 1;
+    }
+    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 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) {
-		const ch = content[i];
-		if (ch === openChar) depth += 1;
-		if (ch === closeChar) {
-			depth -= 1;
-			if (depth === 0) return i;
-		}
-	}
-	return -1;
+    let depth = 0;
+    for (let i = startIndex; i < content.length; i += 1) {
+        const ch = content[i];
+        if (ch === openChar)
+            depth += 1;
+        if (ch === closeChar) {
+            depth -= 1;
+            if (depth === 0)
+                return i;
+        }
+    }
+    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;
-	let match;
-	while ((match = keyRegex.exec(block)) !== null) {
-		const key = match[1];
-		if (key) deps.add(key);
-	}
-	return [...deps];
+    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;
+    let match;
+    while ((match = keyRegex.exec(block)) !== null) {
+        const key = match[1];
+        if (key)
+            deps.add(key);
+    }
+    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];
-		if (providerName) {
-			const objectStartInCall = fullCall.indexOf('{');
-			if (objectStartInCall !== -1) {
-				const absoluteObjectStart = openParenIndex + 1 + objectStartInCall;
-				const absoluteObjectEnd = findMatchingBracket(content, absoluteObjectStart, '{', '}');
-				const configBlock =
-					absoluteObjectEnd !== -1 ? content.slice(absoluteObjectStart, absoluteObjectEnd + 1) : fullCall.slice(objectStartInCall);
-				nodes.push({
-					name: providerName,
-					file: filePath,
-					line: getLineByIndex(content, start),
-					dependsOn: extractDependsOn(configBlock)
-				});
-			} else {
-				nodes.push({
-					name: providerName,
-					file: filePath,
-					line: getLineByIndex(content, start),
-					dependsOn: []
-				});
-			}
-		}
-		fromIndex = closeParenIndex + 1;
-	}
-	return nodes;
+    const nodes = [];
+    const token = 'CreateDiContainer(';
+    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];
+        if (providerName) {
+            const objectStartInCall = fullCall.indexOf('{');
+            if (objectStartInCall !== -1) {
+                const absoluteObjectStart = openParenIndex + 1 + objectStartInCall;
+                const absoluteObjectEnd = findMatchingBracket(content, absoluteObjectStart, '{', '}');
+                const configBlock = absoluteObjectEnd !== -1 ? content.slice(absoluteObjectStart, absoluteObjectEnd + 1) : fullCall.slice(objectStartInCall);
+                nodes.push({
+                    name: providerName,
+                    file: filePath,
+                    line: getLineByIndex(content, start),
+                    dependsOn: extractDependsOn(configBlock)
+                });
+            }
+            else {
+                nodes.push({
+                    name: providerName,
+                    file: filePath,
+                    line: getLineByIndex(content, start),
+                    dependsOn: []
+                });
+            }
+        }
+        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;
-			if (!visited.has(next)) {
-				dfs(next);
-				continue;
-			}
-			if (inStack.has(next)) {
-				const idx = stack.indexOf(next);
-				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;
+    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;
+            if (!visited.has(next)) {
+                dfs(next);
+                continue;
+            }
+            if (inStack.has(next)) {
+                const idx = stack.indexOf(next);
+                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 {
-		await fs.access(srcPath);
-	} catch {
-		console.error('❌ src folder not found in current workspace.');
-		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})`
-			});
-			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] ?? '');
-		issues.push({
-			file: firstNode?.file ?? srcPath,
-			line: firstNode?.line ?? 1,
-			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;
+    const srcPath = path.join(process.cwd(), 'src');
+    try {
+        await fs.access(srcPath);
+    }
+    catch {
+        console.error('❌ src folder not found in current workspace.');
+        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 CreateDiContainer 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})`
+            });
+            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] ?? '');
+        issues.push({
+            file: firstNode?.file ?? srcPath,
+            line: firstNode?.line ?? 1,
+            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,130 +1,141 @@
 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 IGNORED_DIRS = new Set(['.backup', '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 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)) {
-					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 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 getLineByIndex = (content, index) => {
-	let line = 1;
-	for (let i = 0; i < index; i += 1) {
-		if (content[i] === '\n') line += 1;
-	}
-	return line;
+    let line = 1;
+    for (let i = 0; i < index; i += 1) {
+        if (content[i] === '\n')
+            line += 1;
+    }
+    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;
-		for (const alias of parseImportAliases(rawImports, 'createBoundaryProvider')) {
-			aliases.add(alias);
-		}
-	}
-	return aliases;
+    const importRegex = new RegExp(IMPORT_PATTERN, 'g');
+    const aliases = new Set(['CreateDiContainer']);
+    let match;
+    while ((match = importRegex.exec(content)) !== null) {
+        const rawImports = match[1];
+        if (!rawImports)
+            continue;
+        for (const alias of parseImportAliases(rawImports, 'CreateDiContainer')) {
+            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,
-			line: getLineByIndex(content, match.index),
-			callee
-		});
-	}
-	return occurrences;
+    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,
+            line: getLineByIndex(content, match.index),
+            callee
+        });
+    }
+    return occurrences;
 };
 export default async function checkProviderNames() {
-	const srcPath = path.join(process.cwd(), 'src');
-	try {
-		await fs.access(srcPath);
-	} catch {
-		console.error('❌ src folder not found in current workspace.');
-		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}"`);
-		for (const item of list) {
-			console.error(`  • ${toPosixPath(path.relative(process.cwd(), item.file))}:${item.line} (${item.callee})`);
-		}
-	}
-	process.exitCode = 1;
+    const srcPath = path.join(process.cwd(), 'src');
+    try {
+        await fs.access(srcPath);
+    }
+    catch {
+        console.error('❌ src folder not found in current workspace.');
+        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}"`);
+        for (const item of list) {
+            console.error(`  • ${toPosixPath(path.relative(process.cwd(), item.file))}:${item.line} (${item.callee})`);
+        }
+    }
+    process.exitCode = 1;
 }