@azure-net/cli 5.0.0-1 → 5.0.0

package/src/init/initStructure.js

@@ -2,10 +2,9 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { loadUserConfig } from '../utils/loadConfig.js';
 import initAliases, { normalizeContexts } from './initAliases.js';
-
+import { getSharedEssentialsPath } from '../utils/sharedFoundation.js';
 const ROOT = path.join(process.cwd(), 'src');
 const APP_ROOT = path.join(ROOT, 'app');
-
 const CONTEXT_DIRS = [
 	'ui',
 	'layers',
@@ -19,9 +18,22 @@ const CONTEXT_DIRS = [
 	'layers/infrastructure/http/repositories',
 	'layers/presentation'
 ];
-
-const SHARED_DIRS = ['core'];
-
+const SHARED_ESSENTIALS_DIRS = [
+	'',
+	'foundation',
+	'foundation/abstracts',
+	'foundation/constants',
+	'foundation/constructs',
+	'foundation/constructs/datasource',
+	'foundation/constructs/presenter',
+	'foundation/constructs/provider',
+	'foundation/constructs/response',
+	'foundation/constructs/schema',
+	'foundation/constructs/schema/custom-rules',
+	'foundation/helpers',
+	'localization',
+	'pipelines'
+];
 const ensureDir = async (dirPath) => {
 	try {
 		await fs.mkdir(dirPath, { recursive: true });
@@ -29,7 +41,6 @@ const ensureDir = async (dirPath) => {
 		console.warn(`⚠️ Failed to create directory: ${dirPath}`, error);
 	}
 };
-
 const ensureFile = async (filePath, content) => {
 	try {
 		await fs.access(filePath);
@@ -37,7 +48,6 @@ const ensureFile = async (filePath, content) => {
 	} catch {
 		// File is missing
 	}
-
 	try {
 		await fs.mkdir(path.dirname(filePath), { recursive: true });
 		await fs.writeFile(filePath, content, 'utf-8');
@@ -45,20 +55,17 @@ const ensureFile = async (filePath, content) => {
 		console.warn(`⚠️ Failed to create file: ${filePath}`, error);
 	}
 };
-
 const toPascalCase = (value) =>
 	value
 		.split(/[-_\s]+/)
 		.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
 		.join('');
-
 const createInfrastructureProvider = (contextName) => `import { createBoundaryProvider } from '@azure-net/kit';
 
 export const ${contextName}InfrastructureProvider = createBoundaryProvider('${contextName}InfrastructureProvider', {
 \tregister: () => ({})
 });
 `;
-
 const createApplicationProvider = (contextName) => `import { createBoundaryProvider } from '@azure-net/kit';
 import { ${contextName}InfrastructureProvider } from '../../infrastructure/providers';
 
@@ -67,7 +74,6 @@ export const ${contextName}ApplicationProvider = createBoundaryProvider('${conte
 \tregister: () => ({})
 });
 `;
-
 const printContextsError = () => {
 	console.error('❌ Cannot generate folders structure: `contexts` is missing or empty in azure-net.config.ts/js');
 	console.error('Add contexts first, for example:');
@@ -77,13 +83,32 @@ const printContextsError = () => {
 	console.error("\t// contexts: [{ name: 'web', alias: '$web' }, { name: 'admin', alias: '$admin' }]");
 	console.error('};');
 };
-
+const printSharedAliasError = () => {
+	console.error('❌ Cannot generate folders structure: `sharedAlias` is missing in azure-net.config.ts/js');
+	console.error('Add shared context and alias first, for example:');
+	console.error('export default {');
+	console.error("\tsharedAlias: '$shared-kernel',");
+	console.error("\tcontexts: [{ name: 'shared-kernel', alias: '$shared-kernel' }, 'public']");
+	console.error('};');
+};
+const ensureSharedEssentialsStructure = async (contexts, sharedAlias) => {
+	const normalizedSharedAlias = sharedAlias.startsWith('$') ? sharedAlias : `$${sharedAlias}`;
+	const sharedContext = contexts.find((context) => context.alias === normalizedSharedAlias);
+	if (!sharedContext) {
+		console.error(`❌ sharedAlias "${normalizedSharedAlias}" does not point to any configured context.`);
+		return false;
+	}
+	const essentialsRoot = getSharedEssentialsPath(sharedContext.name);
+	for (const dir of SHARED_ESSENTIALS_DIRS) {
+		await ensureDir(path.join(essentialsRoot, dir));
+	}
+	return true;
+};
 const ensureContextStructure = async (context) => {
 	const contextRoot = path.join(APP_ROOT, context.name);
 	for (const dir of CONTEXT_DIRS) {
 		await ensureDir(path.join(contextRoot, dir));
 	}
-
 	const contextName = toPascalCase(context.name);
 	const infraProviderPath = path.join(contextRoot, 'layers', 'infrastructure', 'providers', 'InfrastructureProvider.ts');
 	const infraProviderIndex = path.join(contextRoot, 'layers', 'infrastructure', 'providers', 'index.ts');
@@ -91,7 +116,6 @@ const ensureContextStructure = async (context) => {
 	const appProviderIndex = path.join(contextRoot, 'layers', 'application', 'providers', 'index.ts');
 	const repositoriesIndex = path.join(contextRoot, 'layers', 'infrastructure', 'http', 'repositories', 'index.ts');
 	const useCasesIndex = path.join(contextRoot, 'layers', 'application', 'use-cases', 'index.ts');
-
 	await ensureFile(infraProviderPath, createInfrastructureProvider(contextName));
 	await ensureFile(infraProviderIndex, `export * from './InfrastructureProvider';\n`);
 	await ensureFile(appProviderPath, createApplicationProvider(contextName));
@@ -99,24 +123,27 @@ const ensureContextStructure = async (context) => {
 	await ensureFile(repositoriesIndex, '');
 	await ensureFile(useCasesIndex, '');
 };
-
 export default async function initStructure() {
 	const config = await loadUserConfig();
 	const contexts = normalizeContexts(config.contexts);
-
 	if (!contexts.length) {
 		printContextsError();
 		return;
 	}
-
-	for (const sharedDir of SHARED_DIRS) {
-		await ensureDir(path.join(ROOT, sharedDir));
+	const sharedAlias = String(config.sharedAlias ?? '').trim();
+	if (!sharedAlias.length) {
+		printSharedAliasError();
+		process.exitCode = 1;
+		return;
 	}
-
 	for (const context of contexts) {
 		await ensureContextStructure(context);
 	}
-
+	const sharedCreated = await ensureSharedEssentialsStructure(contexts, sharedAlias);
+	if (!sharedCreated) {
+		process.exitCode = 1;
+		return;
+	}
 	await initAliases();
 	console.log('✅ Folders structure initialized');
 }

package/src/init/initStructure.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { loadUserConfig } from '../utils/loadConfig.js';
 import initAliases, { normalizeContexts } from './initAliases.js';
+import { getSharedEssentialsPath } from '../utils/sharedFoundation.js';
 
 type ContextConfig = { name: string; alias: string };
 
@@ -22,7 +23,19 @@ const CONTEXT_DIRS = [
 	'layers/presentation'
 ];
 
-const SHARED_DIRS = ['core'];
+const SHARED_ESSENTIALS_DIRS = [
+	'',
+	'foundation',
+	'foundation/constructs',
+	'foundation/constructs/datasource',
+	'foundation/constructs/presenter',
+	'foundation/constructs/provider',
+	'foundation/constructs/response',
+	'foundation/constructs/schema',
+	'foundation/constructs/schema/custom-rules',
+	'localization',
+	'pipelines'
+];
 
 const ensureDir = async (dirPath: string): Promise<void> => {
 	try {
@@ -80,6 +93,32 @@ const printContextsError = () => {
 	console.error('};');
 };
 
+const printSharedAliasError = () => {
+	console.error('❌ Cannot generate folders structure: `sharedAlias` is missing in azure-net.config.ts/js');
+	console.error('Add shared context and alias first, for example:');
+	console.error('export default {');
+	console.error("\tsharedAlias: '$shared-kernel',");
+	console.error("\tcontexts: [{ name: 'shared-kernel', alias: '$shared-kernel' }, 'public']");
+	console.error('};');
+};
+
+const ensureSharedEssentialsStructure = async (contexts: ContextConfig[], sharedAlias: string): Promise<boolean> => {
+	const normalizedSharedAlias = sharedAlias.startsWith('$') ? sharedAlias : `$${sharedAlias}`;
+	const sharedContext = contexts.find((context) => context.alias === normalizedSharedAlias);
+
+	if (!sharedContext) {
+		console.error(`❌ sharedAlias "${normalizedSharedAlias}" does not point to any configured context.`);
+		return false;
+	}
+
+	const essentialsRoot = getSharedEssentialsPath(sharedContext.name);
+	for (const dir of SHARED_ESSENTIALS_DIRS) {
+		await ensureDir(path.join(essentialsRoot, dir));
+	}
+
+	return true;
+};
+
 const ensureContextStructure = async (context: ContextConfig): Promise<void> => {
 	const contextRoot = path.join(APP_ROOT, context.name);
 	for (const dir of CONTEXT_DIRS) {
@@ -111,14 +150,23 @@ export default async function initStructure(): Promise<void> {
 		return;
 	}
 
-	for (const sharedDir of SHARED_DIRS) {
-		await ensureDir(path.join(ROOT, sharedDir));
+	const sharedAlias = String(config.sharedAlias ?? '').trim();
+	if (!sharedAlias.length) {
+		printSharedAliasError();
+		process.exitCode = 1;
+		return;
 	}
 
 	for (const context of contexts) {
 		await ensureContextStructure(context);
 	}
 
+	const sharedCreated = await ensureSharedEssentialsStructure(contexts, sharedAlias);
+	if (!sharedCreated) {
+		process.exitCode = 1;
+		return;
+	}
+
 	await initAliases();
 	console.log('✅ Folders structure initialized');
 }

package/src/install/installFresh.js

@@ -13,7 +13,6 @@ import {
 	createResponse,
 	createTranslationManager
 } from '../scaffolds/index.js';
-
 const printContextsError = () => {
 	console.error('❌ Cannot run "install fresh": `contexts` is missing or empty in azure-net.config.ts/js');
 	console.error('Add contexts first, for example:');
@@ -23,7 +22,6 @@ const printContextsError = () => {
 	console.error("\t// contexts: [{ name: 'web', alias: '$web' }, { name: 'admin', alias: '$admin' }]");
 	console.error('};');
 };
-
 const askConfirm = async (message) => {
 	const result = await prompts({
 		type: 'confirm',
@@ -31,14 +29,11 @@ const askConfirm = async (message) => {
 		message,
 		initial: true
 	});
-
 	return Boolean(result.confirmed);
 };
-
 const runOptionalStep = async (question, action) => {
 	const shouldRun = await askConfirm(question);
 	if (!shouldRun) return;
-
 	try {
 		await action();
 	} catch (error) {
@@ -46,48 +41,37 @@ const runOptionalStep = async (question, action) => {
 		console.warn(error);
 	}
 };
-
 export default async function installFresh() {
 	const config = await loadUserConfig();
 	const contexts = normalizeContexts(config.contexts);
-
 	if (!contexts.length) {
 		printContextsError();
 		process.exitCode = 1;
 		return;
 	}
-
 	await initStructure();
 	await initEdges();
 	await createProgram();
-
 	await runOptionalStep('Add commit tools (lint/commit conventions)?', async () => {
 		await addLint();
 	});
-
 	await runOptionalStep('Create schema factory?', async () => {
 		await createCoreSchema();
 	});
-
 	await runOptionalStep('Create presenter factory?', async () => {
 		await createPresenterFactory();
 	});
-
 	await runOptionalStep('Create API response?', async () => {
 		await createResponse();
 	});
-
 	await runOptionalStep('Create datasource?', async () => {
 		await createDatasource();
 	});
-
 	await runOptionalStep('Create datasource provider?', async () => {
 		await createDatasourceProvider();
 	});
-
 	await runOptionalStep('Create translation manager (i18n)?', async () => {
 		await createTranslationManager();
 	});
-
 	console.log('✅ install fresh completed');
 }

package/src/plugins/addLint.js

@@ -1,9 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { execSync } from 'node:child_process';
-
 const dependencies = ['@commitlint/cli', 'semantic-release', '@semantic-release/git', 'git-cz', 'husky', 'commitizen', 'env-cmd'];
-
 const commitlintConfig = `export default {
 	rules: {
 		'body-leading-blank': [2, 'always'],
@@ -17,7 +15,6 @@ const commitlintConfig = `export default {
 	}
 };
 `;
-
 const releaseConfig = `export default {
 	branches: ['main', 'dev'],
 	dryRun: false,
@@ -44,7 +41,6 @@ const releaseConfig = `export default {
 	]
 };
 `;
-
 const prettierConfig = `{
 	"useTabs": true,
 	"singleQuote": true,
@@ -63,7 +59,6 @@ const prettierConfig = `{
 	]
 }
 `;
-
 const resolveInstallCommand = (manager) => {
 	const deps = dependencies.join(' ');
 	switch (manager) {
@@ -75,11 +70,8 @@ const resolveInstallCommand = (manager) => {
 			return `yarn add -D ${deps}`;
 		case 'bun':
 			return `bun add -d ${deps}`;
-		default:
-			return `pnpm add -D ${deps}`;
 	}
 };
-
 const resolveRunScriptCommand = (manager, script) => {
 	switch (manager) {
 		case 'pnpm':
@@ -90,11 +82,8 @@ const resolveRunScriptCommand = (manager, script) => {
 			return `yarn ${script}`;
 		case 'bun':
 			return `bun run ${script}`;
-		default:
-			return `pnpm ${script}`;
 	}
 };
-
 const resolveHuskyCommand = (manager) => {
 	switch (manager) {
 		case 'pnpm':
@@ -105,11 +94,8 @@ const resolveHuskyCommand = (manager) => {
 			return 'yarn husky';
 		case 'bun':
 			return 'bunx husky';
-		default:
-			return 'pnpm exec husky';
 	}
 };
-
 const detectPackageManager = (cwd) => {
 	if (fs.existsSync(path.join(cwd, 'bun.lock')) || fs.existsSync(path.join(cwd, 'bun.lockb'))) return 'bun';
 	if (fs.existsSync(path.join(cwd, 'pnpm-lock.yaml'))) return 'pnpm';
@@ -117,12 +103,10 @@ const detectPackageManager = (cwd) => {
 	if (fs.existsSync(path.join(cwd, 'package-lock.json'))) return 'npm';
 	return undefined;
 };
-
 const parseConfigState = (cwd) => {
 	const tsPath = path.join(cwd, 'azure-net.config.ts');
 	const jsPath = path.join(cwd, 'azure-net.config.js');
 	const configPath = fs.existsSync(tsPath) ? tsPath : fs.existsSync(jsPath) ? jsPath : null;
-
 	if (!configPath) {
 		return {
 			configPath: null,
@@ -131,77 +115,66 @@ const parseConfigState = (cwd) => {
 			validPackageManager: null
 		};
 	}
-
 	const content = fs.readFileSync(configPath, 'utf-8');
 	const hasPackageManagerKey = /packageManager\s*:/.test(content);
 	const managerMatch = content.match(/packageManager\s*:\s*['"`](bun|pnpm|npm|yarn)['"`]/);
-	const validPackageManager = managerMatch?.[1] ?? null;
-
+	const validPackageManager = managerMatch?.[1];
 	return {
 		configPath,
 		content,
 		hasPackageManagerKey,
-		validPackageManager
+		validPackageManager: validPackageManager ?? null
 	};
 };
-
 const upsertPackageManagerInConfig = (content, manager) => {
 	const packageManagerEntry = `packageManager: '${manager}'`;
 	const hasExportDefaultObject = /export\s+default\s*\{[\s\S]*\}\s*;?/.test(content);
-
 	if (!hasExportDefaultObject) {
 		return `export default {\n\t${packageManagerEntry}\n};\n`;
 	}
-
 	if (/packageManager\s*:/.test(content)) {
 		return content.replace(/packageManager\s*:\s*['"`][^'"`]+['"`]/, packageManagerEntry);
 	}
-
 	return content.replace(/export\s+default\s*\{([\s\S]*?)\}\s*;?/, (_full, body) => {
 		const trimmedRight = body.replace(/\s*$/, '');
 		if (!trimmedRight.length) {
 			return `export default {\n\t${packageManagerEntry}\n};`;
 		}
-
 		const withComma = trimmedRight.endsWith(',') ? trimmedRight : `${trimmedRight},`;
 		return `export default {${withComma}\n\t${packageManagerEntry}\n};`;
 	});
 };
-
 const localOnlyPrepareScript = `node -e "const local = !process.env.CI && process.env.NODE_ENV !== 'production' && !process.env.DOCKER && !process.env.CONTAINER; process.exit(local ? 1 : 0)" || (husky && svelte-kit sync)`;
-
 const selectPackageManager = async (cwd, preset) => {
 	if (preset) return preset;
 	const { default: prompts } = await import('prompts');
-
-	const order = ['bun', 'pnpm', 'npm', 'yarn'];
 	const detected = detectPackageManager(cwd);
 	const response = await prompts({
 		type: 'select',
 		name: 'manager',
 		message: 'Choose your package manager:',
-		choices: order.map((item) => ({ title: item, value: item })),
-		initial: detected ? order.indexOf(detected) : 0
+		choices: [
+			{ title: 'bun', value: 'bun' },
+			{ title: 'pnpm', value: 'pnpm' },
+			{ title: 'npm', value: 'npm' },
+			{ title: 'yarn', value: 'yarn' }
+		],
+		initial: detected ? ['bun', 'pnpm', 'npm', 'yarn'].indexOf(detected) : 0
 	});
-
 	if (!response.manager) {
 		throw new Error('Package manager is required');
 	}
 	return response.manager;
 };
-
 export default async function addLint(options = {}) {
 	const cwd = process.cwd();
 	const pkgPath = path.join(cwd, 'package.json');
-
 	if (!fs.existsSync(pkgPath)) {
 		console.error('❌ package.json not found in this directory');
 		process.exit(1);
 	}
-
 	const configState = parseConfigState(cwd);
 	const manager = configState.validPackageManager ?? (await selectPackageManager(cwd, options.manager));
-
 	if (!configState.configPath) {
 		const newConfigPath = path.join(cwd, 'azure-net.config.ts');
 		fs.writeFileSync(newConfigPath, `export default {\n\tpackageManager: '${manager}'\n};\n`);
@@ -209,49 +182,41 @@ export default async function addLint(options = {}) {
 		const nextConfig = upsertPackageManagerInConfig(configState.content ?? '', manager);
 		fs.writeFileSync(configState.configPath, nextConfig);
 	}
-
 	const installCommand = resolveInstallCommand(manager);
 	const runFormatCommand = resolveRunScriptCommand(manager, 'format');
 	const preCommitScript = `${resolveRunScriptCommand(manager, 'lint')} && ${resolveRunScriptCommand(manager, 'check')}`;
 	const commitScript = `${resolveRunScriptCommand(manager, 'format')} && git add . && git-cz && git push`;
 	const releaseScript = `${resolveRunScriptCommand(manager, 'commit')} && ${resolveRunScriptCommand(manager, 'semantic-release')}`;
-
 	console.log(`📦 Installing packages with ${manager}...`);
 	execSync(installCommand, { stdio: 'inherit' });
-
 	console.log('📁 Updating package.json...');
 	const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 	pkg.scripts = {
-		...(pkg.scripts || {}),
+		...(pkg.scripts ?? {}),
 		precommit: preCommitScript,
 		prepare: localOnlyPrepareScript,
 		'semantic-release': 'env-cmd semantic-release',
 		commit: commitScript,
 		release: releaseScript
 	};
-
-	pkg.config = pkg.config || {};
+	pkg.config = pkg.config ?? {};
 	pkg.config.commitizen = {
 		path: 'git-cz'
 	};
-
 	fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 4));
 	fs.writeFileSync(path.join(cwd, 'commitlint.config.ts'), commitlintConfig);
 	fs.writeFileSync(path.join(cwd, 'release.config.ts'), releaseConfig);
 	fs.writeFileSync(path.join(cwd, '.prettierrc'), prettierConfig);
-
 	console.log('🔧 Initializing Husky...');
 	try {
 		execSync(resolveHuskyCommand(manager), { stdio: 'inherit' });
 	} catch {
 		console.warn('⚠️ Husky initialization skipped (command failed in current environment).');
 	}
-
 	try {
 		execSync(runFormatCommand, { stdio: 'inherit' });
 	} catch {
 		console.warn('⚠️ Format script execution skipped (script may be missing).');
 	}
-
 	console.log(`✅ Linting and release setup completed! Added prepare script: ${localOnlyPrepareScript}`);
 }

package/src/scaffolds/createCoreSchema.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import prompts from 'prompts';
 import { writeIfNotExists, updateIndexTs } from '../utils/fileUtils.js';
 import { toPascalCase } from '../utils/contextUtils.js';
-
+import { getFoundationConstructPath, getSharedState } from '../utils/sharedFoundation.js';
 const resolvePresetImportName = (preset) => {
 	switch (preset) {
 		case 'ru':
@@ -13,11 +13,8 @@ const resolvePresetImportName = (preset) => {
 			return 'validationMessagesEn';
 		case 'i18n':
 			return 'validationMessagesI18n';
-		default:
-			return 'validationMessagesI18n';
 	}
 };
-
 const createSchemaFactoryTemplate = (
 	factoryName,
 	messagesImportName
@@ -25,36 +22,27 @@ const createSchemaFactoryTemplate = (
 
 export const ${factoryName} = createSchemaFactory(createRules(${messagesImportName}));
 `;
-
 const resolveConfigFile = (cwd) => {
 	const tsPath = path.join(cwd, 'azure-net.config.ts');
 	const jsPath = path.join(cwd, 'azure-net.config.js');
-
 	if (fsSync.existsSync(tsPath)) {
 		return { filepath: tsPath, type: 'ts', exists: true, content: fsSync.readFileSync(tsPath, 'utf-8') };
 	}
 	if (fsSync.existsSync(jsPath)) {
 		return { filepath: jsPath, type: 'js', exists: true, content: fsSync.readFileSync(jsPath, 'utf-8') };
 	}
-
 	return { filepath: tsPath, type: 'ts', exists: false, content: '' };
 };
-
 const buildDefaultSchemaFactoryConfigEntry = (factoryName) => {
 	return `defaultSchemaFactory: '${factoryName}'`;
 };
-
 const upsertDefaultSchemaFactoryConfig = (content, factoryName) => {
 	const hasExportDefaultObject = /export\s+default\s*\{[\s\S]*\}\s*;?/.test(content);
 	const defaultFactoryEntry = buildDefaultSchemaFactoryConfigEntry(factoryName);
-	const coreAliasEntry = `coreAlias: '$core'`;
-
 	if (!hasExportDefaultObject) {
-		return `export default {\n\t${coreAliasEntry},\n\t${defaultFactoryEntry}\n};\n`;
+		return `export default {\n\t${defaultFactoryEntry}\n};\n`;
 	}
-
 	let nextContent = content;
-
 	if (/defaultSchemaFactory\s*:/.test(nextContent)) {
 		nextContent = nextContent.replace(/defaultSchemaFactory\s*:\s*(\{[\s\S]*?\n\s*\}|['"`][^'"`]+['"`])/m, defaultFactoryEntry);
 	} else if (/defaultSchema\s*:/.test(nextContent)) {
@@ -65,27 +53,12 @@ const upsertDefaultSchemaFactoryConfig = (content, factoryName) => {
 			if (!trimmedRight.length) {
 				return `export default {\n\t${defaultFactoryEntry}\n};`;
 			}
-
 			const withComma = trimmedRight.endsWith(',') ? trimmedRight : `${trimmedRight},`;
 			return `export default {${withComma}\n\t${defaultFactoryEntry}\n};`;
 		});
 	}
-
-	if (/coreAlias\s*:/.test(nextContent)) {
-		return nextContent.replace(/coreAlias\s*:\s*['"`][^'"`]+['"`]/, coreAliasEntry);
-	}
-
-	return nextContent.replace(/export\s+default\s*\{([\s\S]*)\}\s*;?/, (_full, body) => {
-		const trimmedRight = body.replace(/\s*$/, '');
-		if (!trimmedRight.length) {
-			return `export default {\n\t${coreAliasEntry}\n};`;
-		}
-
-		const withComma = trimmedRight.endsWith(',') ? trimmedRight : `${trimmedRight},`;
-		return `export default {${withComma}\n\t${coreAliasEntry}\n};`;
-	});
+	return nextContent;
 };
-
 export default async function createCoreSchema() {
 	const { schemaFactoryNameRaw } = await prompts({
 		type: 'text',
@@ -93,9 +66,7 @@ export default async function createCoreSchema() {
 		message: 'Schema factory name:',
 		initial: 'Schema'
 	});
-
 	const schemaFactoryName = toPascalCase(String(schemaFactoryNameRaw ?? 'Schema')) || 'Schema';
-
 	const { preset } = await prompts({
 		type: 'select',
 		name: 'preset',
@@ -107,33 +78,28 @@ export default async function createCoreSchema() {
 		],
 		initial: 2
 	});
-
 	const selectedPreset = preset ?? 'i18n';
 	const messagesImportName = resolvePresetImportName(selectedPreset);
-	const coreSchemaPath = path.join(process.cwd(), 'src', 'core', 'schema');
+	const { sharedContext } = await getSharedState();
+	const coreSchemaPath = getFoundationConstructPath(sharedContext.name, 'schema');
 	const customRulesPath = path.join(coreSchemaPath, 'custom-rules');
 	const filePath = path.join(coreSchemaPath, `${schemaFactoryName}.ts`);
-
 	await fs.mkdir(coreSchemaPath, { recursive: true });
 	await fs.mkdir(customRulesPath, { recursive: true });
-
 	const created = await writeIfNotExists(filePath, createSchemaFactoryTemplate(schemaFactoryName, messagesImportName));
 	if (!created) {
 		console.log(`⚠️ Schema factory "${schemaFactoryName}" already exists. File was not overwritten.`);
 	} else {
 		await updateIndexTs(coreSchemaPath);
-		console.log(`✅ Core schema factory created: ${filePath}`);
+		console.log(`✅ Shared schema factory created: ${filePath}`);
 	}
-
 	const { useAsDefault } = await prompts({
 		type: 'confirm',
 		name: 'useAsDefault',
 		message: 'Use this schema factory as default for the project?',
 		initial: true
 	});
-
 	if (!useAsDefault) return;
-
 	const config = resolveConfigFile(process.cwd());
 	const nextContent = upsertDefaultSchemaFactoryConfig(config.content, schemaFactoryName);
 	await fs.writeFile(config.filepath, nextContent, 'utf-8');