@azure-net/cli 5.0.0-3 → 5.0.1

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

@@ -9,4 +9,3 @@ 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/generate/layers/generateRepository.js

@@ -16,7 +16,6 @@ import {
 	promptMethodDefinition
 } from './repositoryShared.js';
 import { updateIndexTs, writeIfNotExists } from '../../utils/fileUtils.js';
-
 export default async function generateRepository() {
 	const { rawName } = await prompts({
 		type: 'text',
@@ -24,7 +23,6 @@ export default async function generateRepository() {
 		message: 'Repository name:',
 		validate: (value) => (String(value ?? '').trim().length > 0 ? true : 'Repository name is required')
 	});
-
 	const className = ensureRepositoryName(rawName);
 	const meta = getRepositoryMeta(className);
 	const contextName = await selectContext('Select context for repository:');
@@ -32,13 +30,11 @@ export default async function generateRepository() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const datasource = await selectDatasource(contextName);
 	if (!datasource) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { methodsCountRaw } = await prompts({
 		type: 'number',
 		name: 'methodsCountRaw',
@@ -46,30 +42,25 @@ export default async function generateRepository() {
 		initial: 1,
 		min: 0
 	});
-
 	const methodsCount = Number(methodsCountRaw ?? 0);
 	if (!Number.isFinite(methodsCount) || methodsCount < 0) {
 		console.error('❌ Invalid methods count.');
 		process.exitCode = 1;
 		return;
 	}
-
 	const methods = [];
 	for (let index = 0; index < methodsCount; index += 1) {
 		console.log(`\n🧩 Method ${index + 1} of ${methodsCount}`);
-		// eslint-disable-next-line no-await-in-loop
 		const method = await promptMethodDefinition();
 		methods.push(method);
 	}
-
 	const { contexts } = await getConfigState();
 	const contextAlias = resolveContextAlias(contexts, contextName);
 	const repositoriesPath = resolveRepositoriesPath(contextName);
 	await fs.mkdir(repositoriesPath, { recursive: true });
 	const repositoryPath = path.join(repositoriesPath, `${meta.className}.ts`);
-
 	for (const method of methods) {
-		// eslint-disable-next-line no-await-in-loop
+		if (!method) continue;
 		const ensuredResponseType = await ensureDomainType({
 			contextName,
 			domainName: meta.domainName,
@@ -78,9 +69,7 @@ export default async function generateRepository() {
 		});
 		method.responseType = ensuredResponseType.interfaceName;
 		method.responseLayer = ensuredResponseType.layer;
-
 		if (method.requestType) {
-			// eslint-disable-next-line no-await-in-loop
 			const ensuredRequestType = await ensureDomainType({
 				contextName,
 				domainName: meta.domainName,
@@ -91,16 +80,15 @@ export default async function generateRepository() {
 			method.requestLayer = ensuredRequestType.layer;
 		}
 	}
-
-	await ensureRepositoryInterfaceFile({ contextName, meta, methods });
+	const filteredMethods = methods.filter(Boolean);
+	await ensureRepositoryInterfaceFile({ contextName, meta, methods: filteredMethods });
 	const repositoryContent = buildRepositoryContent({
 		meta,
 		contextAlias,
 		datasourceImportPath: datasource.importPath,
 		datasourceName: datasource.name,
-		methods
+		methods: filteredMethods
 	});
-
 	const created = await writeIfNotExists(repositoryPath, repositoryContent);
 	await updateIndexTs(repositoriesPath);
 	if (!created) {
@@ -108,17 +96,14 @@ export default async function generateRepository() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { shouldCreateUseCases } = await prompts({
 		type: 'confirm',
 		name: 'shouldCreateUseCases',
 		message: 'Create UseCases for this repository?',
 		initial: true
 	});
-
 	if (shouldCreateUseCases) {
 		await ensureUseCasesFile({ contextName, contextAlias, meta });
 	}
-
 	console.log(`✅ Repository generated: ${repositoryPath}`);
 }

package/src/generate/layers/generateRepositoryMethod.js

@@ -14,14 +14,12 @@ import {
 	selectContext,
 	promptMethodDefinition
 } from './repositoryShared.js';
-
 export default async function generateRepositoryMethod() {
 	const contextName = await selectContext('Select context for repository method:');
 	if (!contextName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const repositoriesPath = resolveRepositoriesPath(contextName);
 	const repositories = await getAvailableTsNames(repositoriesPath);
 	if (!repositories.length) {
@@ -29,7 +27,6 @@ export default async function generateRepositoryMethod() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { repositoryName } = await prompts({
 		type: 'select',
 		name: 'repositoryName',
@@ -37,16 +34,13 @@ export default async function generateRepositoryMethod() {
 		choices: repositories.map((name) => ({ title: name, value: name })),
 		initial: 0
 	});
-
 	if (!repositoryName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const meta = getRepositoryMeta(String(repositoryName));
 	const repositoryPath = path.join(repositoriesPath, `${meta.className}.ts`);
 	const method = await promptMethodDefinition();
-
 	const ensuredResponseType = await ensureDomainType({
 		contextName,
 		domainName: meta.domainName,
@@ -55,7 +49,6 @@ export default async function generateRepositoryMethod() {
 	});
 	method.responseType = ensuredResponseType.interfaceName;
 	method.responseLayer = ensuredResponseType.layer;
-
 	if (method.requestType) {
 		const ensuredRequestType = await ensureDomainType({
 			contextName,
@@ -66,7 +59,6 @@ export default async function generateRepositoryMethod() {
 		method.requestType = ensuredRequestType.interfaceName;
 		method.requestLayer = ensuredRequestType.layer;
 	}
-
 	let repositoryContent = '';
 	try {
 		repositoryContent = await fs.readFile(repositoryPath, 'utf-8');
@@ -75,14 +67,12 @@ export default async function generateRepositoryMethod() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const existingMethods = parseRepositoryMethods(repositoryContent);
 	if (existingMethods.some((item) => item.name === method.name)) {
 		console.warn(`⚠️ Method "${method.name}" already exists in ${meta.className}.`);
 		process.exitCode = 1;
 		return;
 	}
-
 	const { contexts } = await getConfigState();
 	const contextAlias = resolveContextAlias(contexts, contextName);
 	await appendRepositoryMethod({
@@ -91,12 +81,10 @@ export default async function generateRepositoryMethod() {
 		contextAlias,
 		domainName: meta.domainName
 	});
-
 	await ensureRepositoryInterfaceFile({
 		contextName,
 		meta,
 		methods: [...existingMethods, method]
 	});
-
 	console.log(`✅ Method "${method.name}" added to ${meta.className}`);
 }

package/src/generate/layers/generateUseCases.js

@@ -8,14 +8,12 @@ import {
 	resolveRepositoriesPath,
 	selectContext
 } from './repositoryShared.js';
-
 export default async function generateUseCases() {
 	const contextName = await selectContext('Select context for UseCases:');
 	if (!contextName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const repositoriesPath = resolveRepositoriesPath(contextName);
 	const repositories = await getAvailableTsNames(repositoriesPath);
 	if (!repositories.length) {
@@ -23,7 +21,6 @@ export default async function generateUseCases() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { repositoryName } = await prompts({
 		type: 'select',
 		name: 'repositoryName',
@@ -31,12 +28,10 @@ export default async function generateUseCases() {
 		choices: repositories.map((name) => ({ title: name, value: name })),
 		initial: 0
 	});
-
 	if (!repositoryName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { contexts } = await getConfigState();
 	const contextAlias = resolveContextAlias(contexts, contextName);
 	const meta = getRepositoryMeta(String(repositoryName));
@@ -45,6 +40,5 @@ export default async function generateUseCases() {
 		process.exitCode = 1;
 		return;
 	}
-
 	console.log(`✅ UseCases generated: ${meta.useCasesClassName}`);
 }