@azure-net/cli 5.0.0-3 → 5.0.1

package/src/generate/ui/generateDesignComponent.js

@@ -5,7 +5,6 @@ import { toPascalCase } from '../../utils/contextUtils.js';
 import { normalizeContexts } from '../../init/initAliases.js';
 import { loadUserConfig } from '../../utils/loadConfig.js';
 import { writeIfNotExists } from '../../utils/fileUtils.js';
-
 const createComponentContent = (propsName) => `<script lang="ts">
 import type { ${propsName} } from './types';
 const {}: ${propsName} = $props();
@@ -15,22 +14,17 @@ const {}: ${propsName} = $props();
 \t@use './style';
 </style>
 `;
-
 const createTypesContent = (propsName) => `export interface ${propsName} {}
 `;
-
 const createIndexContent = (name) => `export { default as ${name} } from './Component.svelte';
 `;
-
 const printContextsError = () => {
 	console.error('❌ Cannot generate UI artifact: `contexts` is missing or empty in azure-net.config.ts/js');
 };
-
 const selectContext = async () => {
 	const config = await loadUserConfig();
 	const contexts = normalizeContexts(config.contexts);
 	if (!contexts.length) return null;
-
 	const { context } = await prompts({
 		type: 'select',
 		name: 'context',
@@ -38,10 +32,8 @@ const selectContext = async () => {
 		choices: contexts.map((item) => ({ title: item.name, value: item.name })),
 		initial: 0
 	});
-
 	return context ? String(context) : null;
 };
-
 export default async function generateDesignComponent() {
 	const context = await selectContext();
 	if (!context) {
@@ -49,23 +41,19 @@ export default async function generateDesignComponent() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { rawName } = await prompts({
 		type: 'text',
 		name: 'rawName',
 		message: 'Design component name:',
 		validate: (value) => (String(value).trim().length > 0 ? true : 'Name is required')
 	});
-
 	const name = toPascalCase(String(rawName ?? 'DesignComponent')) || 'DesignComponent';
 	const propsName = `IDesignComponent${name}Props`;
 	const targetDir = path.join(process.cwd(), 'src', 'app', context, 'ui', 'design', name);
-
 	await fs.mkdir(targetDir, { recursive: true });
 	await writeIfNotExists(path.join(targetDir, 'Component.svelte'), createComponentContent(propsName));
 	await writeIfNotExists(path.join(targetDir, 'style.scss'), '');
 	await writeIfNotExists(path.join(targetDir, 'types.ts'), createTypesContent(propsName));
 	await writeIfNotExists(path.join(targetDir, 'index.ts'), createIndexContent(name));
-
 	console.log(`✅ Design component generated: ${targetDir}`);
 }

package/src/generate/ui/generateWidget.js

@@ -5,7 +5,6 @@ import { toPascalCase } from '../../utils/contextUtils.js';
 import { normalizeContexts } from '../../init/initAliases.js';
 import { loadUserConfig } from '../../utils/loadConfig.js';
 import { writeIfNotExists } from '../../utils/fileUtils.js';
-
 const createComponentContent = (propsName) => `<script lang="ts">
 import type { ${propsName} } from './types';
 const {}: ${propsName} = $props();
@@ -15,22 +14,17 @@ const {}: ${propsName} = $props();
 \t@use './style';
 </style>
 `;
-
 const createTypesContent = (propsName) => `export interface ${propsName} {}
 `;
-
 const createIndexContent = (name) => `export { default as ${name} } from './Component.svelte';
 `;
-
 const printContextsError = () => {
 	console.error('❌ Cannot generate UI artifact: `contexts` is missing or empty in azure-net.config.ts/js');
 };
-
 const selectContext = async () => {
 	const config = await loadUserConfig();
 	const contexts = normalizeContexts(config.contexts);
 	if (!contexts.length) return null;
-
 	const { context } = await prompts({
 		type: 'select',
 		name: 'context',
@@ -38,10 +32,8 @@ const selectContext = async () => {
 		choices: contexts.map((item) => ({ title: item.name, value: item.name })),
 		initial: 0
 	});
-
 	return context ? String(context) : null;
 };
-
 export default async function generateWidget() {
 	const context = await selectContext();
 	if (!context) {
@@ -49,23 +41,19 @@ export default async function generateWidget() {
 		process.exitCode = 1;
 		return;
 	}
-
 	const { rawName } = await prompts({
 		type: 'text',
 		name: 'rawName',
 		message: 'Widget name:',
 		validate: (value) => (String(value).trim().length > 0 ? true : 'Name is required')
 	});
-
 	const name = toPascalCase(String(rawName ?? 'Widget')) || 'Widget';
 	const propsName = `IWidget${name}Props`;
 	const targetDir = path.join(process.cwd(), 'src', 'app', context, 'ui', 'widgets', name);
-
 	await fs.mkdir(targetDir, { recursive: true });
 	await writeIfNotExists(path.join(targetDir, 'Component.svelte'), createComponentContent(propsName));
 	await writeIfNotExists(path.join(targetDir, 'style.scss'), '');
 	await writeIfNotExists(path.join(targetDir, 'types.ts'), createTypesContent(propsName));
 	await writeIfNotExists(path.join(targetDir, 'index.ts'), createIndexContent(name));
-
 	console.log(`✅ Widget generated: ${targetDir}`);
 }

package/src/init/initAliases.js

@@ -1,18 +1,14 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { loadUserConfig, resolveConfigFile } from '../utils/loadConfig.js';
-
+import { loadUserConfig } from '../utils/loadConfig.js';
 const svelteConfigPath = path.resolve('svelte.config.js');
-
 function normalizeAliasValue(value, fallbackName) {
 	const raw = String(value ?? '').trim();
 	if (!raw.length) return `$${fallbackName}`;
 	return raw.startsWith('$') ? raw : `$${raw}`;
 }
-
 export function normalizeContexts(rawContexts) {
 	if (!Array.isArray(rawContexts)) return [];
-
 	return rawContexts
 		.map((item) => {
 			if (typeof item === 'string') {
@@ -20,81 +16,90 @@ export function normalizeContexts(rawContexts) {
 				if (!name.length) return null;
 				return { name, alias: `$${name}` };
 			}
-
 			if (!item || typeof item !== 'object') return null;
-
 			const name = String(item.name ?? '').trim();
 			if (!name.length) return null;
-
 			return {
 				name,
 				alias: normalizeAliasValue(item.alias, name)
 			};
 		})
-		.filter(Boolean);
+		.filter((item) => item !== null);
 }
-
 export function generateAliases(config) {
-	const coreAlias = normalizeAliasValue(config.coreAlias, 'core');
 	const contexts = normalizeContexts(config.contexts);
-
 	const entries = [];
 	for (const context of contexts) {
 		entries.push([context.alias, `./src/app/${context.name}`]);
 	}
-
-	entries.push([coreAlias, './src/core']);
-
 	return {
-		coreAlias,
 		contexts,
 		aliases: Object.fromEntries(entries)
 	};
 }
-
 function parseAliasEntries(aliasBody) {
 	const entryRegex = /(['"`])([^'"`]+)\1\s*:\s*(['"`])([^'"`]+)\3\s*,?/g;
 	const ordered = [];
 	const map = new Map();
 	let match;
-
 	while ((match = entryRegex.exec(aliasBody)) !== null) {
 		const key = match[2];
 		const value = match[4];
+		if (!key || !value) continue;
 		if (!map.has(key)) {
 			ordered.push(key);
 		}
 		map.set(key, value);
 	}
-
 	return { ordered, map };
 }
-
 function buildAliasEntriesString(orderedKeys, map, baseIndent) {
 	if (!orderedKeys.length) return '';
-
-	return orderedKeys.map((key) => `${baseIndent}'${key}': '${map.get(key)}'`).join(',\n');
+	return orderedKeys.map((key) => `${baseIndent}'${key}': '${map.get(key) ?? ''}'`).join(',\n');
 }
-
+function removeAliasEntry(content, alias) {
+	const escapedAlias = alias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+	const aliasRegex = new RegExp(`\\n?\\s*['"\`]${escapedAlias}['"\`]\\s*:\\s*['"\`][^'"\`]+['"\`]\\s*,?`, 'g');
+	return content.replace(aliasRegex, '');
+}
+const removeCoreAliasFromAzureNetConfig = async () => {
+	const tsPath = path.resolve('azure-net.config.ts');
+	const jsPath = path.resolve('azure-net.config.js');
+	let filepath = null;
+	try {
+		await fs.access(tsPath);
+		filepath = tsPath;
+	} catch {
+		try {
+			await fs.access(jsPath);
+			filepath = jsPath;
+		} catch {
+			return;
+		}
+	}
+	const content = await fs.readFile(filepath, 'utf-8');
+	if (!/coreAlias\s*:/.test(content)) return;
+	const nextContent = content.replace(/\n?\s*coreAlias\s*:\s*['"`][^'"`]+['"`]\s*,?/m, '').replace(/,\s*\n\s*\}/m, '\n}');
+	await fs.writeFile(filepath, nextContent, 'utf-8');
+};
 export function mergeAliasesInSvelteConfig(content, aliases) {
 	const aliasRegex = /alias\s*:\s*\{([\s\S]*?)\}/m;
 	const aliasMatch = content.match(aliasRegex);
-
 	if (aliasMatch) {
 		const aliasBody = aliasMatch[1] ?? '';
 		const { ordered, map } = parseAliasEntries(aliasBody);
+		map.delete('$core');
 		for (const [key, value] of Object.entries(aliases)) {
 			if (!map.has(key)) ordered.push(key);
 			map.set(key, value);
 		}
-
+		const nextOrdered = ordered.filter((key) => key !== '$core');
 		const baseIndentMatch = aliasBody.match(/\n(\s*)['"`]/);
 		const baseIndent = baseIndentMatch?.[1] ?? '\t\t\t';
-		const merged = buildAliasEntriesString(ordered, map, baseIndent);
+		const merged = buildAliasEntriesString(nextOrdered, map, baseIndent);
 		const nextAliasBlock = `alias: {\n${merged}\n\t\t}`;
 		return content.replace(aliasRegex, nextAliasBlock);
 	}
-
 	const kitRegex = /kit\s*:\s*\{/m;
 	if (kitRegex.test(content)) {
 		const aliasLines = Object.entries(aliases)
@@ -103,48 +108,22 @@ export function mergeAliasesInSvelteConfig(content, aliases) {
 		const aliasBlock = `alias: {\n${aliasLines}\n\t\t},`;
 		return content.replace(kitRegex, `kit: {\n\t\t${aliasBlock}`);
 	}
-
 	return `${content}\n\n// azure-net aliases\nconst alias = {\n${Object.entries(aliases)
 		.map(([key, value]) => `\t'${key}': '${value}'`)
 		.join(',\n')}\n};\n`;
 }
-
-function upsertCoreAlias(content, coreAlias) {
-	const exportDefaultRegex = /export\s+default\s*\{([\s\S]*)\}\s*;?/m;
-	if (!exportDefaultRegex.test(content)) {
-		return `export default {\n\tcoreAlias: '${coreAlias}'\n};\n`;
-	}
-
-	if (/coreAlias\s*:/.test(content)) {
-		return content.replace(/coreAlias\s*:\s*['"`][^'"`]+['"`]/, `coreAlias: '${coreAlias}'`);
-	}
-
-	return content.replace(exportDefaultRegex, (_full, body) => {
-		const trimmed = body.replace(/\s*$/, '');
-		if (!trimmed.length) {
-			return `export default {\n\tcoreAlias: '${coreAlias}'\n};`;
-		}
-
-		const withComma = trimmed.endsWith(',') ? trimmed : `${trimmed},`;
-		return `export default {${withComma}\n\tcoreAlias: '${coreAlias}'\n};`;
-	});
-}
-
-export async function ensureCoreAliasInConfig(coreAlias) {
-	const { exists, filepath } = resolveConfigFile();
-	const aliasToSave = normalizeAliasValue(coreAlias, 'core');
-	const currentContent = exists ? await fs.readFile(filepath, 'utf-8') : '';
-	const nextContent = upsertCoreAlias(currentContent, aliasToSave);
-	await fs.writeFile(filepath, nextContent, 'utf-8');
-	return aliasToSave;
-}
-
 export default async function initAliases() {
 	const config = await loadUserConfig();
+	const sharedAlias = String(config.sharedAlias ?? '').trim();
+	if (!sharedAlias.length) {
+		console.error('❌ Cannot update aliases: `sharedAlias` is missing in azure-net.config.ts/js.');
+		console.error("Add it first, for example: sharedAlias: '$shared-kernel'");
+		process.exitCode = 1;
+		return;
+	}
 	const generated = generateAliases(config);
-	const actualCoreAlias = await ensureCoreAliasInConfig(generated.coreAlias);
-	const aliases = { ...generated.aliases, [actualCoreAlias]: './src/core' };
-
+	const aliases = generated.aliases;
+	await removeCoreAliasFromAzureNetConfig();
 	let content;
 	try {
 		content = await fs.readFile(svelteConfigPath, 'utf-8');
@@ -152,8 +131,7 @@ export default async function initAliases() {
 		console.warn('⚠️ svelte.config.js not found, aliases were not updated');
 		return;
 	}
-
-	const nextContent = mergeAliasesInSvelteConfig(content, aliases);
+	const nextContent = removeAliasEntry(mergeAliasesInSvelteConfig(content, aliases), '$core');
 	await fs.writeFile(svelteConfigPath, nextContent, 'utf-8');
 	console.log('✅ Aliases updated in svelte.config.js');
 }

package/src/init/initAliases.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { loadUserConfig, resolveConfigFile } from '../utils/loadConfig.js';
+import { loadUserConfig } from '../utils/loadConfig.js';
 
 const svelteConfigPath = path.resolve('svelte.config.js');
 
@@ -37,12 +37,10 @@ export function normalizeContexts(rawContexts: unknown): ContextConfig[] {
 		.filter((item): item is ContextConfig => item !== null);
 }
 
-export function generateAliases(config: { coreAlias?: string; contexts?: unknown }): {
-	coreAlias: string;
+export function generateAliases(config: { contexts?: unknown }): {
 	contexts: ContextConfig[];
 	aliases: Record<string, string>;
 } {
-	const coreAlias = normalizeAliasValue(config.coreAlias, 'core');
 	const contexts = normalizeContexts(config.contexts);
 
 	const entries: Array<[string, string]> = [];
@@ -50,10 +48,7 @@ export function generateAliases(config: { coreAlias?: string; contexts?: unknown
 		entries.push([context.alias, `./src/app/${context.name}`]);
 	}
 
-	entries.push([coreAlias, './src/core']);
-
 	return {
-		coreAlias,
 		contexts,
 		aliases: Object.fromEntries(entries)
 	};
@@ -84,6 +79,36 @@ function buildAliasEntriesString(orderedKeys: string[], map: Map<string, string>
 	return orderedKeys.map((key) => `${baseIndent}'${key}': '${map.get(key) ?? ''}'`).join(',\n');
 }
 
+function removeAliasEntry(content: string, alias: string): string {
+	const escapedAlias = alias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+	const aliasRegex = new RegExp(`\\n?\\s*['"\`]${escapedAlias}['"\`]\\s*:\\s*['"\`][^'"\`]+['"\`]\\s*,?`, 'g');
+	return content.replace(aliasRegex, '');
+}
+
+const removeCoreAliasFromAzureNetConfig = async (): Promise<void> => {
+	const tsPath = path.resolve('azure-net.config.ts');
+	const jsPath = path.resolve('azure-net.config.js');
+	let filepath: string | null = null;
+
+	try {
+		await fs.access(tsPath);
+		filepath = tsPath;
+	} catch {
+		try {
+			await fs.access(jsPath);
+			filepath = jsPath;
+		} catch {
+			return;
+		}
+	}
+
+	const content = await fs.readFile(filepath, 'utf-8');
+	if (!/coreAlias\s*:/.test(content)) return;
+
+	const nextContent = content.replace(/\n?\s*coreAlias\s*:\s*['"`][^'"`]+['"`]\s*,?/m, '').replace(/,\s*\n\s*\}/m, '\n}');
+	await fs.writeFile(filepath, nextContent, 'utf-8');
+};
+
 export function mergeAliasesInSvelteConfig(content: string, aliases: Record<string, string>): string {
 	const aliasRegex = /alias\s*:\s*\{([\s\S]*?)\}/m;
 	const aliasMatch = content.match(aliasRegex);
@@ -91,14 +116,16 @@ export function mergeAliasesInSvelteConfig(content: string, aliases: Record<stri
 	if (aliasMatch) {
 		const aliasBody = aliasMatch[1] ?? '';
 		const { ordered, map } = parseAliasEntries(aliasBody);
+		map.delete('$core');
 		for (const [key, value] of Object.entries(aliases)) {
 			if (!map.has(key)) ordered.push(key);
 			map.set(key, value);
 		}
+		const nextOrdered = ordered.filter((key) => key !== '$core');
 
 		const baseIndentMatch = aliasBody.match(/\n(\s*)['"`]/);
 		const baseIndent = baseIndentMatch?.[1] ?? '\t\t\t';
-		const merged = buildAliasEntriesString(ordered, map, baseIndent);
+		const merged = buildAliasEntriesString(nextOrdered, map, baseIndent);
 		const nextAliasBlock = `alias: {\n${merged}\n\t\t}`;
 		return content.replace(aliasRegex, nextAliasBlock);
 	}
@@ -117,41 +144,19 @@ export function mergeAliasesInSvelteConfig(content: string, aliases: Record<stri
 		.join(',\n')}\n};\n`;
 }
 
-function upsertCoreAlias(content: string, coreAlias: string): string {
-	const exportDefaultRegex = /export\s+default\s*\{([\s\S]*)\}\s*;?/m;
-	if (!exportDefaultRegex.test(content)) {
-		return `export default {\n\tcoreAlias: '${coreAlias}'\n};\n`;
-	}
-
-	if (/coreAlias\s*:/.test(content)) {
-		return content.replace(/coreAlias\s*:\s*['"`][^'"`]+['"`]/, `coreAlias: '${coreAlias}'`);
-	}
-
-	return content.replace(exportDefaultRegex, (_full, body: string) => {
-		const trimmed = body.replace(/\s*$/, '');
-		if (!trimmed.length) {
-			return `export default {\n\tcoreAlias: '${coreAlias}'\n};`;
-		}
-
-		const withComma = trimmed.endsWith(',') ? trimmed : `${trimmed},`;
-		return `export default {${withComma}\n\tcoreAlias: '${coreAlias}'\n};`;
-	});
-}
-
-export async function ensureCoreAliasInConfig(coreAlias: string): Promise<string> {
-	const { exists, filepath } = resolveConfigFile();
-	const aliasToSave = normalizeAliasValue(coreAlias, 'core');
-	const currentContent = exists ? await fs.readFile(filepath, 'utf-8') : '';
-	const nextContent = upsertCoreAlias(currentContent, aliasToSave);
-	await fs.writeFile(filepath, nextContent, 'utf-8');
-	return aliasToSave;
-}
-
 export default async function initAliases(): Promise<void> {
 	const config = await loadUserConfig();
-	const generated = generateAliases(config as { coreAlias?: string; contexts?: unknown });
-	const actualCoreAlias = await ensureCoreAliasInConfig(generated.coreAlias);
-	const aliases = { ...generated.aliases, [actualCoreAlias]: './src/core' };
+	const sharedAlias = String(config.sharedAlias ?? '').trim();
+	if (!sharedAlias.length) {
+		console.error('❌ Cannot update aliases: `sharedAlias` is missing in azure-net.config.ts/js.');
+		console.error("Add it first, for example: sharedAlias: '$shared-kernel'");
+		process.exitCode = 1;
+		return;
+	}
+
+	const generated = generateAliases(config as { contexts?: unknown });
+	const aliases = generated.aliases;
+	await removeCoreAliasFromAzureNetConfig();
 
 	let content: string;
 	try {
@@ -161,7 +166,7 @@ export default async function initAliases(): Promise<void> {
 		return;
 	}
 
-	const nextContent = mergeAliasesInSvelteConfig(content, aliases);
+	const nextContent = removeAliasEntry(mergeAliasesInSvelteConfig(content, aliases), '$core');
 	await fs.writeFile(svelteConfigPath, nextContent, 'utf-8');
 	console.log('✅ Aliases updated in svelte.config.js');
 }

package/src/init/initEdges.js

@@ -1,45 +1,34 @@
 import fs from 'node:fs/promises';
 import fsSync from 'node:fs';
 import path from 'node:path';
-
 const EDGES_IMPORT = `import { edgesPlugin } from '@azure-net/kit/edges/plugin';`;
-
 function resolveViteConfigPath() {
 	const cwd = process.cwd();
 	const candidates = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs', 'vite.config.cjs'].map((filename) => path.join(cwd, filename));
-
 	for (const filepath of candidates) {
 		if (fsSync.existsSync(filepath)) {
 			return filepath;
 		}
 	}
-
 	return null;
 }
-
 function injectEdgesImport(content) {
 	if (content.includes(EDGES_IMPORT)) return content;
-
 	const svelteImportRegex = /import\s+\{\s*sveltekit\s*\}\s+from\s+['"]@sveltejs\/kit\/vite['"]\s*;?/m;
 	if (svelteImportRegex.test(content)) {
 		return content.replace(svelteImportRegex, (line) => `${line}\n${EDGES_IMPORT}`);
 	}
-
 	return `${EDGES_IMPORT}\n${content}`;
 }
-
 function injectEdgesPlugin(content) {
 	if (/edgesPlugin\s*\(\s*\)/.test(content)) return content;
-
 	const pluginsRegex = /plugins\s*:\s*\[([\s\S]*?)\]/m;
 	const pluginsMatch = content.match(pluginsRegex);
 	if (!pluginsMatch) {
 		throw new Error('plugins array was not found in vite.config');
 	}
-
 	const pluginsBody = pluginsMatch[1] ?? '';
 	let nextPluginsBody = pluginsBody;
-
 	if (/sveltekit\s*\(\s*\)/.test(pluginsBody)) {
 		nextPluginsBody = pluginsBody.replace(/sveltekit\s*\(\s*\)\s*,?/, (matched) => {
 			const hasComma = matched.trim().endsWith(',');
@@ -54,21 +43,17 @@ function injectEdgesPlugin(content) {
 			nextPluginsBody = `${withComma} edgesPlugin()`;
 		}
 	}
-
 	return content.replace(pluginsRegex, `plugins: [${nextPluginsBody}]`);
 }
-
 export default async function initEdges() {
 	const viteConfigPath = resolveViteConfigPath();
 	if (!viteConfigPath) {
 		console.error('❌ vite.config.(ts|js|mjs|cjs) was not found');
 		return;
 	}
-
 	let content = await fs.readFile(viteConfigPath, 'utf-8');
 	content = injectEdgesImport(content);
 	content = injectEdgesPlugin(content);
 	await fs.writeFile(viteConfigPath, content, 'utf-8');
-
 	console.log(`✅ Edges plugin initialized in ${path.basename(viteConfigPath)}`);
 }