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

package/src/generate/module/generatePresenter.js

@@ -1,402 +1,474 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import prompts from 'prompts';
-import { toKebabCase, toPascalCase } from '../../utils/contextUtils.js';
+import ts from 'typescript';
+import { selectWorkspace, selectScope } from '../../utils/architecture.js';
+import { toPascalCase } from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 import { getConfigState, resolveContextAlias, selectContext } from './repositoryModuleShared.js';
 import { loadUserConfig } from '../../utils/loadConfig.js';
 import { getFoundationConstructImportPath, getFoundationConstructPath, getSharedState } from '../../utils/sharedFoundation.js';
-const PRIMITIVE_TYPES = new Set(['string', 'number', 'boolean', 'unknown', 'void', 'null', 'undefined', 'bigint', 'symbol', 'never']);
-const parseProviderInfo = (content) => {
-	const providerNameMatch = content.match(/export\s+const\s+(\w+)\s*=\s*createBoundaryProvider/);
-	const providerName = providerNameMatch?.[1] ?? 'ApplicationProvider';
-	const registerMatch = content.match(/register\s*:\s*\([^)]*\)\s*=>\s*\(\{([\s\S]*?)\}\)/m);
-	const registerBody = registerMatch?.[1] ?? '';
-	const keys = [];
-	const keyRegex = /([A-Za-z_]\w*)\s*:/g;
-	let keyMatch;
-	while ((keyMatch = keyRegex.exec(registerBody)) !== null) {
-		const key = keyMatch[1];
-		if (key) keys.push(key);
-	}
-	return { providerName, registeredKeys: keys };
+export const parseProviderInfo = (content) => {
+    const source = ts.createSourceFile('ApplicationProvider.ts', content, ts.ScriptTarget.Latest, true);
+    const services = new Map();
+    const aliases = new Map();
+    for (const statement of source.statements) {
+        if (ts.isImportDeclaration(statement) &&
+            statement.importClause?.namedBindings &&
+            ts.isNamedImports(statement.importClause.namedBindings)) {
+            for (const specifier of statement.importClause.namedBindings.elements)
+                aliases.set(specifier.name.text, specifier.propertyName?.text ?? specifier.name.text);
+        }
+    }
+    const unwrap = (expression) => ts.isParenthesizedExpression(expression) ? unwrap(expression.expression) : expression;
+    const returnValues = (fn) => {
+        if (!ts.isBlock(fn.body))
+            return [unwrap(fn.body)];
+        const values = [];
+        const visit = (node) => {
+            if (ts.isReturnStatement(node) && node.expression)
+                values.push(unwrap(node.expression));
+            else if (!ts.isFunctionLike(node))
+                ts.forEachChild(node, visit);
+        };
+        ts.forEachChild(fn.body, visit);
+        return values;
+    };
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) && node.name.getText(source).replace(/['"]/g, '') === 'register') {
+            const register = unwrap(node.initializer);
+            if (ts.isArrowFunction(register) || ts.isFunctionExpression(register)) {
+                for (const value of returnValues(register)) {
+                    if (!ts.isObjectLiteralExpression(value))
+                        continue;
+                    for (const property of value.properties) {
+                        if (!ts.isPropertyAssignment(property))
+                            continue;
+                        const factory = unwrap(property.initializer);
+                        if (!ts.isArrowFunction(factory) && !ts.isFunctionExpression(factory))
+                            continue;
+                        for (const instance of returnValues(factory)) {
+                            if (ts.isNewExpression(instance) && ts.isIdentifier(instance.expression)) {
+                                services.set(property.name.getText(source).replace(/['"]/g, ''), aliases.get(instance.expression.text) ?? instance.expression.text);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return { providerName: 'ApplicationProvider', services };
 };
-const parseUseCasesInfo = (content) => {
-	const interfaceImport = content.match(/import\s+type\s+\{\s*(\w+)\s*\}\s+from\s+['"]([^'"]+)['"]/);
-	const repositoryInterfaceName = interfaceImport?.[1] ?? null;
-	const domainImportPath = interfaceImport?.[2] ?? null;
-	const domainNameMatch = domainImportPath?.match(/\/layers\/domain\/([^'"]+)$/);
-	const domainName = domainNameMatch?.[1] ?? null;
-	const methods = [];
-	const declareRegex = /declare\s+(\w+)\s*:\s*\w+\['\w+'\];/g;
-	let declareMatch;
-	while ((declareMatch = declareRegex.exec(content)) !== null) {
-		const methodName = declareMatch[1];
-		if (methodName) methods.push(methodName);
-	}
-	return { repositoryInterfaceName, domainName, methods };
+export const parseUseCasesInfo = (content) => {
+    const source = ts.createSourceFile('UseCases.ts', content, ts.ScriptTarget.Latest, true);
+    const imported = new Map();
+    for (const statement of source.statements) {
+        if (!ts.isImportDeclaration(statement) ||
+            !ts.isStringLiteral(statement.moduleSpecifier) ||
+            !statement.moduleSpecifier.text.includes('/Domain'))
+            continue;
+        const bindings = statement.importClause?.namedBindings;
+        if (bindings && ts.isNamedImports(bindings))
+            for (const item of bindings.elements)
+                imported.set(item.name.text, item.propertyName?.text ?? item.name.text);
+    }
+    const methods = [];
+    let repositoryInterfaceName = null;
+    for (const statement of source.statements)
+        if (ts.isClassDeclaration(statement)) {
+            for (const member of statement.members) {
+                if (!ts.isPropertyDeclaration(member) || !member.type || !ts.isIndexedAccessTypeNode(member.type))
+                    continue;
+                const owner = member.type.objectType.getText(source);
+                if (!imported.has(owner))
+                    continue;
+                repositoryInterfaceName = imported.get(owner);
+                methods.push(member.name.getText(source));
+            }
+            if (!repositoryInterfaceName)
+                for (const member of statement.members)
+                    if (ts.isConstructorDeclaration(member)) {
+                        for (const parameter of member.parameters) {
+                            const owner = parameter.type?.getText(source);
+                            if (owner && imported.has(owner))
+                                repositoryInterfaceName = imported.get(owner);
+                        }
+                    }
+        }
+    return { repositoryInterfaceName, domainName: repositoryInterfaceName ? 'Domain' : null, methods };
 };
-const parseRepositoryInterfaceMethods = (content) => {
-	const methods = [];
-	const regex = /(\w+)\(([^)]*)\)\s*:\s*Promise<([^>]+)>;/g;
-	let match;
-	while ((match = regex.exec(content)) !== null) {
-		const methodName = match[1];
-		const paramsChunk = match[2];
-		const responseTypeChunk = match[3];
-		if (!methodName || paramsChunk === undefined || !responseTypeChunk) continue;
-		const paramsRaw = paramsChunk.trim();
-		const params = paramsRaw
-			? paramsRaw.split(',').map((part) => {
-					const [name, ...typeParts] = part.trim().split(':');
-					return { name: String(name ?? '').trim(), type: typeParts.join(':').trim() };
-				})
-			: [];
-		methods.push({
-			name: methodName,
-			params,
-			responseType: responseTypeChunk.trim()
-		});
-	}
-	return methods;
+export const parseRepositoryInterfaceMethods = (content, interfaceName) => {
+    const source = ts.createSourceFile('Repository.ts', content, ts.ScriptTarget.Latest, true);
+    const methods = [];
+    for (const statement of source.statements) {
+        if (!ts.isInterfaceDeclaration(statement) || (interfaceName && statement.name.text !== interfaceName))
+            continue;
+        for (const member of statement.members) {
+            if (!ts.isMethodSignature(member) || !member.type)
+                continue;
+            const result = ts.isTypeReferenceNode(member.type) && member.type.typeName.getText(source) === 'Promise'
+                ? member.type.typeArguments?.[0]
+                : member.type;
+            methods.push({
+                name: member.name.getText(source),
+                params: member.parameters.map((parameter) => ({
+                    name: parameter.name.getText(source) + (parameter.questionToken ? '?' : ''),
+                    type: parameter.type?.getText(source) ?? 'unknown'
+                })),
+                responseType: result?.getText(source) ?? 'unknown'
+            });
+        }
+    }
+    return methods;
 };
 const findRepositoryByInterface = async (contextName, repositoryInterfaceName) => {
-	const repositoriesPath = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'infrastructure', 'http', 'repositories');
-	try {
-		const files = await fs.readdir(repositoriesPath);
-		for (const fileName of files) {
-			if (!fileName.endsWith('.ts') || fileName === 'index.ts') continue;
-			const absolute = path.join(repositoriesPath, fileName);
-			const content = await fs.readFile(absolute, 'utf-8');
-			if (content.includes(`implements ${repositoryInterfaceName}`)) {
-				return { filePath: absolute, content };
-			}
-		}
-		return null;
-	} catch {
-		return null;
-	}
+    const repositoriesPath = path.join(process.cwd(), 'src', 'app', 'Contexts', contextName, 'Infrastructure', 'Repositories');
+    try {
+        const files = await fs.readdir(repositoriesPath);
+        for (const fileName of files) {
+            if (!fileName.endsWith('.ts') || fileName === 'index.ts')
+                continue;
+            const absolute = path.join(repositoriesPath, fileName);
+            const content = await fs.readFile(absolute, 'utf-8');
+            if (content.includes(`implements ${repositoryInterfaceName}`)) {
+                return { filePath: absolute, content };
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
 };
-const parseRepositoryHttpMethods = (content) => {
-	const methods = new Map();
-	const regex = /public\s+async\s+(\w+)\([^)]*\)\s*\{([\s\S]*?)\n\t\}/g;
-	let match;
-	while ((match = regex.exec(content)) !== null) {
-		const methodName = match[1];
-		if (!methodName) continue;
-		const body = match[2] ?? '';
-		const httpMatch = body.match(/http\.(get|post|put|delete|head|options|patch)\(/);
-		if (httpMatch?.[1]) methods.set(methodName, httpMatch[1]);
-	}
-	return methods;
-};
-const getSharedPresenterFactories = async () => {
-	const { sharedContext } = await getSharedState();
-	const presenterPath = getFoundationConstructPath(sharedContext.name, 'presenter');
-	try {
-		const files = await fs.readdir(presenterPath);
-		return files.filter((item) => item.endsWith('.ts') && item !== 'index.ts').map((item) => item.replace(/\.ts$/, ''));
-	} catch {
-		return [];
-	}
+export const parseRepositoryHttpMethods = (content) => {
+    const source = ts.createSourceFile('Repository.ts', content, ts.ScriptTarget.Latest, true);
+    const methods = new Map();
+    for (const statement of source.statements)
+        if (ts.isClassDeclaration(statement)) {
+            for (const member of statement.members)
+                if (ts.isMethodDeclaration(member) && member.body) {
+                    const visit = (node) => {
+                        if (ts.isCallExpression(node) &&
+                            ts.isPropertyAccessExpression(node.expression) &&
+                            node.expression.expression.getText(source) === 'http' &&
+                            /^(get|post|put|delete|head|options|patch)$/.test(node.expression.name.text)) {
+                            methods.set(member.name.getText(source), node.expression.name.text);
+                        }
+                        ts.forEachChild(node, visit);
+                    };
+                    visit(member.body);
+                }
+        }
+    return methods;
 };
 const getSharedSchemaFactories = async () => {
-	const { sharedContext } = await getSharedState();
-	const schemaPath = getFoundationConstructPath(sharedContext.name, 'schema');
-	try {
-		const files = await fs.readdir(schemaPath);
-		return files.filter((item) => item.endsWith('.ts') && item !== 'index.ts').map((item) => item.replace(/\.ts$/, ''));
-	} catch {
-		return [];
-	}
+    const { sharedContext } = await getSharedState();
+    const schemaPath = getFoundationConstructPath(sharedContext.name, 'schema');
+    try {
+        const files = await fs.readdir(schemaPath);
+        return files.filter((item) => item.endsWith('.ts') && item !== 'index.ts').map((item) => item.replace(/\.ts$/, ''));
+    }
+    catch {
+        return [];
+    }
 };
 const normalizePresenterName = (rawName, fallbackUseCasesName) => {
-	const fallback = fallbackUseCasesName.replace(/UseCases$/, '') || 'Module';
-	const source = String(rawName ?? '').trim() || fallback;
-	const normalized = toPascalCase(source);
-	return normalized.endsWith('Presenter') ? normalized : `${normalized}Presenter`;
+    const fallback = fallbackUseCasesName.replace(/UseCases$/, '') || 'Module';
+    const source = String(rawName ?? '').trim() || fallback;
+    const normalized = toPascalCase(source);
+    return normalized.endsWith('Presenter') ? normalized : `${normalized}Presenter`;
+};
+export const normalizeTypeImports = (types) => {
+    const names = new Set();
+    const source = ts.createSourceFile('Types.ts', types.map((type, index) => 'type T' + index + ' = ' + type + ';').join('\n'), ts.ScriptTarget.Latest, true);
+    const visit = (node) => {
+        // Domain declarations use I/T prefixes. Built-in generics and primitive keywords need no import.
+        if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && /^[IT][A-Z]/.test(node.typeName.text))
+            names.add(node.typeName.text);
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return [...names];
 };
-const isPrimitive = (typeName) => PRIMITIVE_TYPES.has(String(typeName ?? '').trim());
-const normalizeTypeImports = (types) => Array.from(new Set(types.filter((typeName) => !isPrimitive(typeName))));
-const isPathParamName = (name) => name === 'pathParam' || name === 'path';
+const isPathParamName = (name) => name.replace(/\?$/, '') === 'pathParam' || name.replace(/\?$/, '') === 'path';
 const toTypeFileName = (typeName) => String(typeName ?? '').replace(/^I/, '') || 'Type';
 const buildMethodInvocation = (method, useCasesName, schemaByMethod) => {
-	const paramsSignature = method.params.map((item) => `${item.name}: ${item.type}`).join(', ');
-	const argNames = method.params.map((item) => item.name);
-	const requestParam = method.params.find((item) => !isPathParamName(item.name));
-	const schemaInfo = schemaByMethod.get(method.name) ?? null;
-	const args = argNames.map((argName) => {
-		if (schemaInfo && requestParam && argName === requestParam.name) {
-			return `${schemaInfo.constName}.from(${argName}).json()`;
-		}
-		return argName;
-	});
-	const httpMethod = method.httpMethod;
-	if (httpMethod === 'get' || httpMethod === 'head' || httpMethod === 'options') {
-		return `\tconst ${method.name} = (${paramsSignature}) => createAsyncResource(() => ${useCasesName}.${method.name}(${args.join(', ')}));`;
-	}
-	const responseType = method.responseType;
-	const requestType = requestParam?.type ?? null;
-	let generic = `<${responseType}`;
-	if (requestType) generic += `, ${requestType}`;
-	generic += '>';
-	return `\tconst ${method.name} = async (${paramsSignature}) =>\n\t\tawait createAsyncAction${generic}(() => ${useCasesName}.${method.name}(${args.join(', ')}));`;
+    const paramsSignature = method.params.map((item) => `${item.name}: ${item.type}`).join(', ');
+    const argNames = method.params.map((item) => item.name.replace(/\?$/, ''));
+    const requestParam = method.params.find((item) => !isPathParamName(item.name));
+    const schemaInfo = schemaByMethod.get(method.name) ?? null;
+    const args = argNames.map((argName) => {
+        if (schemaInfo && requestParam && argName === requestParam.name.replace(/\?$/, '')) {
+            return `${schemaInfo.constName}.from(${argName}).toJson()`;
+        }
+        return argName;
+    });
+    const httpMethod = method.httpMethod;
+    if (httpMethod === 'get' || httpMethod === 'head' || httpMethod === 'options') {
+        return `\t${method.name} = (${paramsSignature}) => createAsyncResource(() => ${useCasesName}.${method.name}(${args.join(', ')}));`;
+    }
+    const responseType = method.responseType;
+    const requestType = requestParam?.type ?? null;
+    let generic = `<${responseType}`;
+    if (requestType)
+        generic += `, ${requestType}`;
+    generic += '>';
+    return `\t${method.name} = (${paramsSignature}) => createAsyncAction${generic}(() => ${useCasesName}.${method.name}(${args.join(', ')}));`;
 };
-const getApplicationProviderFile = async (contextName) => {
-	const providersPath = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'application', 'providers');
-	const targetPath = path.join(providersPath, 'ApplicationProvider.ts');
-	try {
-		await fs.access(targetPath);
-		return targetPath;
-	} catch {
-		const files = await fs.readdir(providersPath);
-		const candidate = files.find((item) => item.endsWith('.ts') && item !== 'index.ts');
-		return candidate ? path.join(providersPath, candidate) : null;
-	}
+const getApplicationProviderFile = async () => {
+    const targetPath = path.join(process.cwd(), 'src/app/Platform/Foundation/DI/ApplicationProvider.ts');
+    try {
+        await fs.access(targetPath);
+        return targetPath;
+    }
+    catch {
+        return null;
+    }
 };
-const resolveDomainInterfaceFile = async ({ contextName, domainName, interfaceName }) => {
-	const portsPath = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'domain', domainName, 'ports');
-	const preferredPath = path.join(portsPath, `${toTypeFileName(interfaceName)}.ts`);
-	const legacyPath = path.join(portsPath, `${interfaceName}.ts`);
-	for (const candidate of [preferredPath, legacyPath]) {
-		try {
-			await fs.access(candidate);
-			return candidate;
-		} catch {
-			// Try the next candidate.
-		}
-	}
-	try {
-		const files = await fs.readdir(portsPath);
-		for (const fileName of files) {
-			if (!fileName.endsWith('.ts') || fileName === 'index.ts') continue;
-			const candidate = path.join(portsPath, fileName);
-			const content = await fs.readFile(candidate, 'utf-8');
-			const escapedName = interfaceName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-			if (new RegExp(`export\\s+interface\\s+${escapedName}\\b`).test(content)) {
-				return candidate;
-			}
-		}
-	} catch {
-		return null;
-	}
-	return null;
+const resolveDomainInterfaceFile = async ({ contextName, interfaceName }) => {
+    const portsPath = path.join(process.cwd(), 'src', 'app', 'Contexts', contextName, 'Domain', 'Ports');
+    const preferredPath = path.join(portsPath, `${toTypeFileName(interfaceName)}.ts`);
+    const legacyPath = path.join(portsPath, `${interfaceName}.ts`);
+    for (const candidate of [preferredPath, legacyPath]) {
+        try {
+            await fs.access(candidate);
+            return candidate;
+        }
+        catch {
+            // Try the next candidate.
+        }
+    }
+    try {
+        const files = await fs.readdir(portsPath);
+        for (const fileName of files) {
+            if (!fileName.endsWith('.ts') || fileName === 'index.ts')
+                continue;
+            const candidate = path.join(portsPath, fileName);
+            const content = await fs.readFile(candidate, 'utf-8');
+            const escapedName = interfaceName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            if (new RegExp(`export\\s+interface\\s+${escapedName}\\b`).test(content)) {
+                return candidate;
+            }
+        }
+    }
+    catch {
+        return null;
+    }
+    return null;
 };
 export default async function generatePresenter(options = {}) {
-	let contextName = options.contextName ? String(options.contextName) : null;
-	if (!contextName) {
-		contextName = await selectContext('Select context for presenter:');
-	}
-	if (!contextName) {
-		process.exitCode = 1;
-		return;
-	}
-	const appProviderFile = await getApplicationProviderFile(contextName);
-	if (!appProviderFile) {
-		console.error('❌ ApplicationProvider file was not found.');
-		process.exitCode = 1;
-		return;
-	}
-	const appProviderContent = await fs.readFile(appProviderFile, 'utf-8');
-	const providerInfo = parseProviderInfo(appProviderContent);
-	const useCasesPath = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'application', 'use-cases');
-	let useCasesFiles = [];
-	try {
-		useCasesFiles = (await fs.readdir(useCasesPath))
-			.filter((item) => item.endsWith('.ts') && item !== 'index.ts')
-			.map((item) => item.replace(/\.ts$/, ''));
-	} catch {
-		// ignore
-	}
-	const registeredUseCases = useCasesFiles.filter((item) => providerInfo.registeredKeys.includes(item));
-	if (!registeredUseCases.length) {
-		console.error('❌ No registered UseCases were found in ApplicationProvider register().');
-		process.exitCode = 1;
-		return;
-	}
-	let useCasesName = options.useCasesName ? String(options.useCasesName) : '';
-	if (!useCasesName) {
-		const { selectedUseCases } = await prompts({
-			type: 'select',
-			name: 'selectedUseCases',
-			message: 'Select UseCases:',
-			choices: registeredUseCases.map((item) => ({ title: item, value: item })),
-			initial: 0
-		});
-		useCasesName = String(selectedUseCases ?? '');
-	}
-	if (!registeredUseCases.includes(useCasesName)) {
-		console.error(`❌ UseCases "${useCasesName}" is not registered in ApplicationProvider.`);
-		process.exitCode = 1;
-		return;
-	}
-	const useCasesFile = path.join(useCasesPath, `${useCasesName}.ts`);
-	const useCasesContent = await fs.readFile(useCasesFile, 'utf-8');
-	const useCasesInfo = parseUseCasesInfo(useCasesContent);
-	if (!useCasesInfo.repositoryInterfaceName || !useCasesInfo.domainName) {
-		console.error('❌ Unable to parse repository interface import from UseCases.');
-		process.exitCode = 1;
-		return;
-	}
-	const repositoryInfo = await findRepositoryByInterface(contextName, useCasesInfo.repositoryInterfaceName);
-	if (!repositoryInfo) {
-		console.error(`❌ Repository implementing ${useCasesInfo.repositoryInterfaceName} was not found.`);
-		process.exitCode = 1;
-		return;
-	}
-	const repositoryHttpMethods = parseRepositoryHttpMethods(repositoryInfo.content);
-	const domainPortsInterfacePath = await resolveDomainInterfaceFile({
-		contextName,
-		domainName: useCasesInfo.domainName,
-		interfaceName: useCasesInfo.repositoryInterfaceName
-	});
-	if (!domainPortsInterfacePath) {
-		console.error(
-			`❌ Repository interface "${useCasesInfo.repositoryInterfaceName}" was not found in ${path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'domain', useCasesInfo.domainName, 'ports')}`
-		);
-		process.exitCode = 1;
-		return;
-	}
-	const repositoryInterfaceContent = await fs.readFile(domainPortsInterfacePath, 'utf-8');
-	const repositoryMethods = parseRepositoryInterfaceMethods(repositoryInterfaceContent).filter((method) =>
-		useCasesInfo.methods.includes(method.name)
-	);
-	const { presenterNameRaw } = await prompts({
-		type: 'text',
-		name: 'presenterNameRaw',
-		message: 'Presenter name (optional):'
-	});
-	const presenterName = normalizePresenterName(presenterNameRaw, useCasesName);
-	const presenterFolder = toKebabCase(presenterName.replace(/Presenter$/, ''));
-	const presentationPath = path.join(process.cwd(), 'src', 'app', contextName, 'layers', 'presentation', presenterFolder);
-	await fs.mkdir(presentationPath, { recursive: true });
-	const { contexts, sharedAlias } = await getConfigState();
-	const contextAlias = resolveContextAlias(contexts, contextName);
-	const presenterImportPath = getFoundationConstructImportPath(sharedAlias, 'presenter');
-	const schemaFactoryImportPath = getFoundationConstructImportPath(sharedAlias, 'schema');
-	let presenterFactory = String((await loadUserConfig()).defaultPresenterFactory ?? '').trim();
-	let useNativePresenter = false;
-	if (!presenterFactory) {
-		const availableFactories = await getSharedPresenterFactories();
-		const { selectedFactory } = await prompts({
-			type: 'select',
-			name: 'selectedFactory',
-			message: 'Select presenter factory:',
-			choices: [
-				...availableFactories.map((item) => ({ title: item, value: item })),
-				{ title: 'Native createPresenter', value: '__native__' }
-			],
-			initial: 0
-		});
-		if (selectedFactory === '__native__') {
-			useNativePresenter = true;
-			presenterFactory = 'createPresenter';
-		} else {
-			presenterFactory = String(selectedFactory ?? '');
-		}
-	}
-	if (!presenterFactory) {
-		useNativePresenter = true;
-		presenterFactory = 'createPresenter';
-	}
-	const mutationMethods = repositoryMethods.filter((method) => {
-		const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
-		return httpMethod !== 'get' && httpMethod !== 'head' && httpMethod !== 'options';
-	});
-	let schemaFactory = String((await loadUserConfig()).defaultSchemaFactory ?? '').trim();
-	let schemaFactoryResolved = false;
-	const schemaByMethod = new Map();
-	const schemaImports = [];
-	let schemaIndexNeeded = false;
-	if (mutationMethods.length) {
-		for (const method of mutationMethods) {
-			const requestParam = method.params.find((item) => !isPathParamName(item.name));
-			if (!requestParam) continue;
-			const { shouldCreateSchema } = await prompts({
-				type: 'confirm',
-				name: 'shouldCreateSchema',
-				message: `Create schema for "${method.name}"?`,
-				initial: false
-			});
-			if (!shouldCreateSchema) continue;
-			if (!schemaFactoryResolved) {
-				if (!schemaFactory) {
-					const availableSchemas = await getSharedSchemaFactories();
-					if (!availableSchemas.length) {
-						console.error('❌ No schema factories found in shared foundation constructs/schema.');
-						process.exitCode = 1;
-						return;
-					}
-					const { selectedSchemaFactory } = await prompts({
-						type: 'select',
-						name: 'selectedSchemaFactory',
-						message: 'Select schema factory:',
-						choices: availableSchemas.map((item) => ({ title: item, value: item })),
-						initial: 0
-					});
-					schemaFactory = String(selectedSchemaFactory ?? '');
-				}
-				schemaFactoryResolved = true;
-			}
-			const schemaConstName = `${toPascalCase(method.name)}${presenterName}Schema`;
-			const schemaFileName = `${schemaConstName}.ts`;
-			const schemaPath = path.join(presentationPath, 'schema');
-			await fs.mkdir(schemaPath, { recursive: true });
-			schemaIndexNeeded = true;
-			const schemaContent = `import { ${schemaFactory} } from '${schemaFactoryImportPath}';
-import type { ${requestParam.type} } from '${contextAlias}/layers/domain/${useCasesInfo.domainName}';
+    let contextName = options.contextName ? String(options.contextName) : null;
+    if (!contextName) {
+        contextName = await selectContext('Select context for presenter:');
+    }
+    if (!contextName) {
+        process.exitCode = 1;
+        return;
+    }
+    const appProviderFile = await getApplicationProviderFile();
+    if (!appProviderFile) {
+        console.error('❌ ApplicationProvider file was not found.');
+        process.exitCode = 1;
+        return;
+    }
+    const appProviderContent = await fs.readFile(appProviderFile, 'utf-8');
+    const providerInfo = parseProviderInfo(appProviderContent);
+    const useCasesPath = path.join(process.cwd(), 'src', 'app', 'Contexts', contextName, 'Application', 'UseCases');
+    let useCasesFiles = [];
+    try {
+        useCasesFiles = (await fs.readdir(useCasesPath))
+            .filter((item) => item.endsWith('.ts') && item !== 'index.ts')
+            .map((item) => item.replace(/\.ts$/, ''));
+    }
+    catch {
+        // ignore
+    }
+    const registeredUseCases = useCasesFiles.filter((item) => [...providerInfo.services.values()].includes(item));
+    if (!registeredUseCases.length) {
+        console.error('❌ No registered UseCases were found in ApplicationProvider register().');
+        process.exitCode = 1;
+        return;
+    }
+    let useCasesName = options.useCasesName ? String(options.useCasesName) : '';
+    if (!useCasesName) {
+        const { selectedUseCases } = await prompts({
+            type: 'select',
+            name: 'selectedUseCases',
+            message: 'Select UseCases:',
+            choices: registeredUseCases.map((item) => ({ title: item, value: item })),
+            initial: 0
+        });
+        useCasesName = String(selectedUseCases ?? '');
+    }
+    if (!registeredUseCases.includes(useCasesName)) {
+        console.error(`❌ UseCases "${useCasesName}" is not registered in ApplicationProvider.`);
+        process.exitCode = 1;
+        return;
+    }
+    const serviceKeys = [...providerInfo.services.entries()].filter(([, className]) => className === useCasesName).map(([key]) => key);
+    let serviceName = serviceKeys[0];
+    if (serviceKeys.length > 1) {
+        const answer = await prompts({
+            type: 'select',
+            name: 'service',
+            message: 'Select registered service:',
+            choices: serviceKeys.map((key) => ({ title: key, value: key }))
+        });
+        if (!answer.service)
+            return;
+        serviceName = String(answer.service);
+    }
+    const useCasesFile = path.join(useCasesPath, `${useCasesName}.ts`);
+    const useCasesContent = await fs.readFile(useCasesFile, 'utf-8');
+    const useCasesInfo = parseUseCasesInfo(useCasesContent);
+    if (!useCasesInfo.repositoryInterfaceName || !useCasesInfo.domainName) {
+        console.error('❌ Unable to parse repository interface import from UseCases.');
+        process.exitCode = 1;
+        return;
+    }
+    const repositoryInfo = await findRepositoryByInterface(contextName, useCasesInfo.repositoryInterfaceName);
+    if (!repositoryInfo) {
+        console.error(`❌ Repository implementing ${useCasesInfo.repositoryInterfaceName} was not found.`);
+        process.exitCode = 1;
+        return;
+    }
+    const repositoryHttpMethods = parseRepositoryHttpMethods(repositoryInfo.content);
+    const domainPortsInterfacePath = await resolveDomainInterfaceFile({
+        contextName,
+        domainName: useCasesInfo.domainName,
+        interfaceName: useCasesInfo.repositoryInterfaceName
+    });
+    if (!domainPortsInterfacePath) {
+        console.error(`❌ Repository interface "${useCasesInfo.repositoryInterfaceName}" was not found in ${path.join(process.cwd(), 'src', 'app', 'Contexts', contextName, 'Domain', 'Ports')}`);
+        process.exitCode = 1;
+        return;
+    }
+    const repositoryInterfaceContent = await fs.readFile(domainPortsInterfacePath, 'utf-8');
+    const repositoryMethods = parseRepositoryInterfaceMethods(repositoryInterfaceContent, useCasesInfo.repositoryInterfaceName).filter((method) => useCasesInfo.methods.includes(method.name));
+    const { presenterNameRaw } = await prompts({
+        type: 'text',
+        name: 'presenterNameRaw',
+        message: 'Presenter name (optional):'
+    });
+    const presenterName = normalizePresenterName(presenterNameRaw, useCasesName);
+    const workspace = await selectWorkspace();
+    if (!workspace)
+        return;
+    const scope = await selectScope(workspace);
+    if (!scope)
+        return;
+    const presentationPath = path.join(workspace.path, 'Scopes', scope);
+    try {
+        await fs.access(path.join(presentationPath, `${presenterName}.ts`));
+        console.log('Presenter already exists; not overwritten.');
+        return;
+    }
+    catch {
+        /* new file */
+    }
+    await fs.mkdir(presentationPath, { recursive: true });
+    const { contexts, sharedAlias } = await getConfigState();
+    const contextAlias = resolveContextAlias(contexts, contextName);
+    const schemaFactoryImportPath = getFoundationConstructImportPath(sharedAlias, 'schema');
+    const mutationMethods = repositoryMethods.filter((method) => {
+        const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
+        return httpMethod !== 'get' && httpMethod !== 'head' && httpMethod !== 'options';
+    });
+    let schemaFactory = String((await loadUserConfig()).defaultSchemaFactory ?? '').trim();
+    let schemaFactoryResolved = false;
+    const schemaByMethod = new Map();
+    const schemaImports = [];
+    let schemaIndexNeeded = false;
+    if (mutationMethods.length) {
+        for (const method of mutationMethods) {
+            const requestParam = method.params.find((item) => !isPathParamName(item.name));
+            if (!requestParam)
+                continue;
+            const { shouldCreateSchema } = await prompts({
+                type: 'confirm',
+                name: 'shouldCreateSchema',
+                message: `Create schema for "${method.name}"?`,
+                initial: false
+            });
+            if (!shouldCreateSchema)
+                continue;
+            if (!schemaFactoryResolved) {
+                if (!schemaFactory) {
+                    const availableSchemas = await getSharedSchemaFactories();
+                    if (!availableSchemas.length) {
+                        console.error('❌ No schema factories found in Platform/Foundation/Schema.');
+                        process.exitCode = 1;
+                        return;
+                    }
+                    const { selectedSchemaFactory } = await prompts({
+                        type: 'select',
+                        name: 'selectedSchemaFactory',
+                        message: 'Select schema factory:',
+                        choices: availableSchemas.map((item) => ({ title: item, value: item })),
+                        initial: 0
+                    });
+                    schemaFactory = String(selectedSchemaFactory ?? '');
+                }
+                schemaFactoryResolved = true;
+            }
+            const schemaConstName = `${toPascalCase(method.name)}${presenterName}Schema`;
+            const schemaFileName = `${schemaConstName}.ts`;
+            const schemaPath = path.join(presentationPath, 'Schema');
+            await fs.mkdir(schemaPath, { recursive: true });
+            schemaIndexNeeded = true;
+            const schemaContent = `import { ${schemaFactory} } from '${schemaFactoryImportPath}';
+${normalizeTypeImports([requestParam.type]).length ? `import type { ${normalizeTypeImports([requestParam.type]).join(', ')} } from '${contextAlias}/Domain';` : ''}
 
 export const ${schemaConstName} = ${schemaFactory}<${requestParam.type}>()
 \t.rules((rules) => ({}))
 \t.create();
 `;
-			await writeIfNotExists(path.join(schemaPath, schemaFileName), schemaContent);
-			schemaByMethod.set(method.name, { constName: schemaConstName });
-			schemaImports.push(schemaConstName);
-		}
-	}
-	if (schemaIndexNeeded) {
-		await updateIndexTs(path.join(presentationPath, 'schema'));
-	}
-	const hasGetLike = repositoryMethods.some((method) => {
-		const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
-		return httpMethod === 'get' || httpMethod === 'head' || httpMethod === 'options';
-	});
-	const hasMutation = repositoryMethods.some((method) => {
-		const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
-		return httpMethod !== 'get' && httpMethod !== 'head' && httpMethod !== 'options';
-	});
-	const helperParams = [hasGetLike ? 'createAsyncResource' : null, hasMutation ? 'createAsyncAction' : null].filter(Boolean).join(', ');
-	const typeImports = normalizeTypeImports(
-		repositoryMethods.flatMap((method) => [method.responseType, ...method.params.map((item) => item.type)])
-	);
-	const methodsCode = repositoryMethods
-		.map((method) => {
-			const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
-			return buildMethodInvocation({ ...method, httpMethod }, useCasesName, schemaByMethod);
-		})
-		.join('\n\n');
-	const factoryImport = useNativePresenter
-		? `import { createPresenter } from '@azure-net/kit/delivery';`
-		: `import { ${presenterFactory} } from '${presenterImportPath}';`;
-	const schemaImportLine = schemaImports.length ? `import { ${Array.from(new Set(schemaImports)).join(', ')} } from './schema';` : '';
-	const typeImportLine = typeImports.length
-		? `import type { ${typeImports.join(', ')} } from '${contextAlias}/layers/domain/${useCasesInfo.domainName}';`
-		: '';
-	const presenterId = `${toPascalCase(contextName)}${presenterName}`;
-	const presenterContent = `${factoryImport}
-import { ${providerInfo.providerName} } from '${contextAlias}/layers/application/providers';
-${typeImportLine}
+            await writeIfNotExists(path.join(schemaPath, schemaFileName), schemaContent);
+            schemaByMethod.set(method.name, { constName: schemaConstName });
+            schemaImports.push(schemaConstName);
+        }
+    }
+    if (schemaIndexNeeded) {
+        await updateIndexTs(path.join(presentationPath, 'Schema'));
+    }
+    const hasGetLike = repositoryMethods.some((method) => {
+        const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
+        return httpMethod === 'get' || httpMethod === 'head' || httpMethod === 'options';
+    });
+    const hasMutation = repositoryMethods.some((method) => {
+        const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
+        return httpMethod !== 'get' && httpMethod !== 'head' && httpMethod !== 'options';
+    });
+    const helperParams = [hasGetLike ? 'createAsyncResource' : null, hasMutation ? 'createAsyncAction' : null].filter(Boolean).join(', ');
+    const typeImports = normalizeTypeImports(repositoryMethods.flatMap((method) => [method.responseType, ...method.params.map((item) => item.type)]));
+    const methodsCode = repositoryMethods
+        .map((method) => {
+        const httpMethod = repositoryHttpMethods.get(method.name) ?? 'get';
+        return buildMethodInvocation({ ...method, httpMethod }, 'this.useCases', schemaByMethod);
+    })
+        .join('\n\n');
+    const schemaImportLine = schemaImports.length ? `import { ${Array.from(new Set(schemaImports)).join(', ')} } from './Schema';` : '';
+    const typeImportLine = typeImports.length ? `import type { ${typeImports.join(', ')} } from '${contextAlias}/Domain';` : '';
+    const presenterContent = `import { RegisterProvider${helperParams ? ', ' + helperParams : ''} } from '@azure-net/kit/delivery';
+import { ApplicationProvider } from '#platform/Foundation/DI';
 ${schemaImportLine}
+import type { ${useCasesName} } from '${contextAlias}/Application/UseCases/${useCasesName}';
+${typeImportLine}
+
+export class ${presenterName} {
+\tconstructor(private readonly useCases: ${useCasesName}) {}
 
-export const ${presenterName} = ${presenterFactory}('${presenterId}', ({ ${helperParams} }) => {
-\tconst { ${useCasesName} } = ${providerInfo.providerName}();
+${methodsCode}
+}
 
-${methodsCode ? `${methodsCode}\n` : ''}
-\treturn { ${repositoryMethods.map((method) => method.name).join(', ')} };
-});
+export const use${presenterName} = RegisterProvider(() => {
+\tconst { ${serviceName} } = ApplicationProvider();
+\treturn new ${presenterName}(${serviceName});
+}, 'scoped');
 `;
-	await writeIfNotExists(path.join(presentationPath, `${presenterName}.ts`), presenterContent);
-	await fs.writeFile(path.join(presentationPath, 'index.ts'), `export * from './${presenterName}';\n`, 'utf-8');
-	console.log(`✅ Presenter generated: ${path.join(presentationPath, `${presenterName}.ts`)}`);
+    await writeIfNotExists(path.join(presentationPath, `${presenterName}.ts`), presenterContent);
+    await updateIndexTs(presentationPath);
+    console.log(`✅ Presenter generated: ${path.join(presentationPath, `${presenterName}.ts`)}`);
 }