@azure-net/cli 5.0.0-3 → 5.0.1

package/src/generate/module/generateTypesJson.js

@@ -2,34 +2,26 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import prompts from 'prompts';
 import { selectContext } from './repositoryModuleShared.js';
-
 const isValidIdentifier = (value) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value);
-
 const toPropertyName = (key) => (isValidIdentifier(key) ? key : `'${String(key).replace(/'/g, "\\'")}'`);
-
 const getIndent = (level) => '\t'.repeat(level);
-
 const normalizeObjectInput = (rawValue) => {
 	let input = String(rawValue ?? '').trim();
 	if (input.endsWith(';')) {
 		input = input.slice(0, -1).trim();
 	}
-
 	const openCurly = (input.match(/\{/g) ?? []).length;
 	const closeCurly = (input.match(/\}/g) ?? []).length;
 	if (openCurly > closeCurly) {
 		input += '}'.repeat(openCurly - closeCurly);
 	}
-
 	return input;
 };
-
 const parseObjectInput = (rawValue) => {
 	const input = normalizeObjectInput(rawValue);
 	if (!input.length) {
 		throw new Error('Input is empty');
 	}
-
 	try {
 		const parsed = JSON.parse(input);
 		if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
@@ -39,63 +31,49 @@ const parseObjectInput = (rawValue) => {
 	} catch {
 		// fallback to JS object literal
 	}
-
-	// eslint-disable-next-line no-new-func
 	const parsed = new Function(`"use strict"; return (${input});`)();
 	if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
 		throw new Error('Input root must be an object');
 	}
 	return parsed;
 };
-
 const stringifyType = (value, level = 1) => {
 	if (value === null) return 'null';
-
 	const valueType = typeof value;
 	if (valueType === 'string') return 'string';
 	if (valueType === 'number') return Number.isFinite(value) ? 'number' : 'unknown';
 	if (valueType === 'boolean') return 'boolean';
 	if (valueType === 'bigint') return 'bigint';
 	if (valueType === 'undefined') return 'undefined';
-
 	if (Array.isArray(value)) {
 		if (!value.length) return 'unknown[]';
-
 		const itemTypes = Array.from(new Set(value.map((item) => stringifyType(item, level + 1))));
 		if (itemTypes.length === 1) {
-			const single = itemTypes[0];
+			const single = itemTypes[0] ?? 'unknown';
 			if (single.includes('\n')) return `Array<${single}>`;
 			return `${single}[]`;
 		}
-
 		const union = itemTypes.join(' | ');
 		if (union.includes('\n')) return `Array<${union}>`;
 		return `(${union})[]`;
 	}
-
 	if (valueType === 'object') {
 		const entries = Object.entries(value);
 		if (!entries.length) return 'Record<string, unknown>';
-
 		const lines = entries.map(([entryKey, entryValue]) => {
 			const propertyType = stringifyType(entryValue, level + 1);
 			return `${getIndent(level + 1)}${toPropertyName(entryKey)}: ${propertyType};`;
 		});
-
 		return `{\n${lines.join('\n')}\n${getIndent(level)}}`;
 	}
-
 	return 'unknown';
 };
-
 const findInterfaceDeclaration = (content) => {
 	const declarationMatch = content.match(/export\s+interface\s+([A-Za-z0-9_]+)\s*\{/);
 	if (!declarationMatch || declarationMatch.index === undefined) return null;
-
-	const name = declarationMatch[1];
+	const name = declarationMatch[1] ?? 'Interface';
 	const openBraceIndex = content.indexOf('{', declarationMatch.index);
 	if (openBraceIndex === -1) return null;
-
 	let depth = 0;
 	let closeBraceIndex = -1;
 	for (let index = openBraceIndex; index < content.length; index += 1) {
@@ -109,9 +87,7 @@ const findInterfaceDeclaration = (content) => {
 			}
 		}
 	}
-
 	if (closeBraceIndex === -1) return null;
-
 	const body = content.slice(openBraceIndex + 1, closeBraceIndex);
 	return {
 		name,
@@ -120,17 +96,16 @@ const findInterfaceDeclaration = (content) => {
 		body
 	};
 };
-
 const extractExistingRootKeys = (body) => {
 	const keys = new Set();
 	const keyRegex = /^\s*([A-Za-z_$][A-Za-z0-9_$]*)\??\s*:/gm;
 	let match;
 	while ((match = keyRegex.exec(body)) !== null) {
-		keys.add(match[1]);
+		const key = match[1];
+		if (key) keys.add(key);
 	}
 	return keys;
 };
-
 const listDomains = async (contextName) => {
 	const domainRoot = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'domain');
 	try {
@@ -140,7 +115,6 @@ const listDomains = async (contextName) => {
 		return [];
 	}
 };
-
 const listModelFiles = async (contextName, domainName) => {
 	const modelRoot = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'domain', domainName, 'model');
 	try {
@@ -155,21 +129,18 @@ const listModelFiles = async (contextName, domainName) => {
 		return [];
 	}
 };
-
 export default async function generateTypesJson() {
 	const contextName = await selectContext('Select context for model update:');
 	if (!contextName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const domains = await listDomains(contextName);
 	if (!domains.length) {
 		console.error(`❌ No domains found in context "${contextName}".`);
 		process.exitCode = 1;
 		return;
 	}
-
 	const { domainName } = await prompts({
 		type: 'select',
 		name: 'domainName',
@@ -177,19 +148,16 @@ export default async function generateTypesJson() {
 		choices: domains.map((item) => ({ title: item, value: item })),
 		initial: 0
 	});
-
 	if (!domainName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const models = await listModelFiles(contextName, String(domainName));
 	if (!models.length) {
 		console.error(`❌ No model files found in domain "${domainName}".`);
 		process.exitCode = 1;
 		return;
 	}
-
 	const { modelPath } = await prompts({
 		type: 'select',
 		name: 'modelPath',
@@ -197,12 +165,10 @@ export default async function generateTypesJson() {
 		choices: models.map((item) => ({ title: item.name, value: item.path })),
 		initial: 0
 	});
-
 	if (!modelPath) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { rawJson } = await prompts({
 		type: 'text',
 		name: 'rawJson',
@@ -216,12 +182,10 @@ export default async function generateTypesJson() {
 			}
 		}
 	});
-
 	if (!rawJson) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const parsedJson = parseObjectInput(rawJson);
 	const content = await fs.readFile(String(modelPath), 'utf-8');
 	const interfaceDeclaration = findInterfaceDeclaration(content);
@@ -230,23 +194,18 @@ export default async function generateTypesJson() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const existingKeys = extractExistingRootKeys(interfaceDeclaration.body);
 	const generatedLines = Object.entries(parsedJson)
 		.filter(([key]) => !existingKeys.has(key))
 		.map(([key, value]) => `${getIndent(1)}${toPropertyName(key)}: ${stringifyType(value, 1)};`);
-
 	if (!generatedLines.length) {
 		console.log('ℹ️ No new keys to add. Model already contains all JSON keys.');
 		return;
 	}
-
 	const trimmedBody = interfaceDeclaration.body.trimEnd();
 	const bodyPrefix = trimmedBody.length ? `${trimmedBody}\n` : '';
 	const newBody = `${bodyPrefix}${generatedLines.join('\n')}\n`;
-
 	const updatedContent = `${content.slice(0, interfaceDeclaration.openBraceIndex + 1)}${newBody}${content.slice(interfaceDeclaration.closeBraceIndex)}`;
 	await fs.writeFile(String(modelPath), updatedContent, 'utf-8');
-
 	console.log(`✅ Model updated: ${modelPath}`);
 }

package/src/generate/module/generateUseCases.js

@@ -8,14 +8,12 @@ import {
 	resolveRepositoriesPath,
 	selectContext
 } from './repositoryModuleShared.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((item) => ({ title: item, value: item })),
 		initial: 0
 	});
-
 	if (!repositoryName) {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { contexts } = await getConfigState();
 	const contextAlias = resolveContextAlias(contexts, contextName);
 	const domainName = await resolveDomainForRepository({
@@ -44,24 +39,20 @@ export default async function generateUseCases() {
 		contextAlias,
 		repositoryName: String(repositoryName)
 	});
-
 	if (!domainName) {
 		console.error('❌ Unable to resolve domain from repository imports.');
 		process.exitCode = 1;
 		return;
 	}
-
 	const created = await createUseCasesForRepository({
 		contextName,
 		contextAlias,
 		domainName,
 		repositoryName: String(repositoryName)
 	});
-
 	if (!created) {
 		process.exitCode = 1;
 		return;
 	}
-
 	console.log(`✅ UseCases generated for ${repositoryName}`);
 }