@azure-net/cli 2.3.62 → 4.0.0-0

package/src/utils/fileUtils.js

@@ -2,106 +2,94 @@ import fs from 'fs/promises';
 import path from 'path';
 
 export async function writeIfNotExists(filepath, content) {
-    try {
-        await fs.access(filepath);
-        console.log(`⚠️  Skip existing: ${filepath}`);
-        return false;
-    } catch {
-        await fs.mkdir(path.dirname(filepath), { recursive: true });
-        await fs.writeFile(filepath, content, 'utf-8');
-        console.log(`✅ Created: ${filepath}`);
-        return true;
-    }
+	try {
+		await fs.access(filepath);
+		console.log(`⚠️  Skip existing: ${filepath}`);
+		return false;
+	} catch {
+		await fs.mkdir(path.dirname(filepath), { recursive: true });
+		await fs.writeFile(filepath, content, 'utf-8');
+		console.log(`✅ Created: ${filepath}`);
+		return true;
+	}
 }
 
 export async function updateIndexTs(dir, filePattern = '.ts', ignore = ['index.ts']) {
-    try {
-        const files = (await fs.readdir(dir)).filter(f =>
-            f.endsWith(filePattern) && !ignore.includes(f)
-        );
-        const content = files
-            .map(f => `export * from './${f.replace('.ts', '')}';`)
-            .join('\n') + '\n';
-        await fs.writeFile(path.join(dir, 'index.ts'), content, 'utf-8');
-    } catch (error) {
-        // Directory doesn't exist yet
-    }
+	try {
+		const files = (await fs.readdir(dir)).filter((f) => f.endsWith(filePattern) && !ignore.includes(f));
+		const content = files.map((f) => `export * from './${f.replace('.ts', '')}';`).join('\n') + '\n';
+		await fs.writeFile(path.join(dir, 'index.ts'), content, 'utf-8');
+	} catch (error) {
+		// Directory doesn't exist yet
+	}
 }
 
 export async function updateCoreIndex() {
-    const corePath = path.join(process.cwd(), 'src/core');
-    try {
-        const dirs = await fs.readdir(corePath, { withFileTypes: true });
-        const validDirs = [];
+	const corePath = path.join(process.cwd(), 'src/core');
+	try {
+		const dirs = await fs.readdir(corePath, { withFileTypes: true });
+		const validDirs = [];
 
-        for (const dir of dirs) {
-            if (dir.isDirectory()) {
-                // Check if directory has any files
-                const dirPath = path.join(corePath, dir.name);
-                const files = await fs.readdir(dirPath);
-                if (files.length > 0) {
-                    validDirs.push(dir.name);
-                }
-            }
-        }
+		for (const dir of dirs) {
+			if (dir.isDirectory()) {
+				// Check if directory has any files
+				const dirPath = path.join(corePath, dir.name);
+				const files = await fs.readdir(dirPath);
+				if (files.length > 0) {
+					validDirs.push(dir.name);
+				}
+			}
+		}
 
-        if (validDirs.length > 0) {
-            const content = validDirs
-                .map(d => `export * from './${d}';`)
-                .join('\n') + '\n';
-            await fs.writeFile(path.join(corePath, 'index.ts'), content, 'utf-8');
-        }
-    } catch (error) {
-        // Core directory doesn't exist
-    }
+		if (validDirs.length > 0) {
+			const content = validDirs.map((d) => `export * from './${d}';`).join('\n') + '\n';
+			await fs.writeFile(path.join(corePath, 'index.ts'), content, 'utf-8');
+		}
+	} catch (error) {
+		// Core directory doesn't exist
+	}
 }
 
 export async function ensureIndexExports(layerPath) {
-    try {
-        const subdirs = await fs.readdir(layerPath, { withFileTypes: true });
-        const exportLines = subdirs
-            .filter(d => d.isDirectory())
-            .map(d => `export * from './${d.name}';`);
+	try {
+		const subdirs = await fs.readdir(layerPath, { withFileTypes: true });
+		const exportLines = subdirs.filter((d) => d.isDirectory()).map((d) => `export * from './${d.name}';`);
 
-        if (exportLines.length > 0) {
-            await fs.writeFile(
-                path.join(layerPath, 'index.ts'),
-                exportLines.join('\n') + '\n',
-                'utf-8'
-            );
-        }
-    } catch (error) {
-        // Directory doesn't exist
-    }
+		if (exportLines.length > 0) {
+			await fs.writeFile(path.join(layerPath, 'index.ts'), exportLines.join('\n') + '\n', 'utf-8');
+		}
+	} catch (error) {
+		// Directory doesn't exist
+	}
 }
 
 export async function injectIntoFile(filepath, searchPattern, newContent, position = 'after') {
-    try {
-        let content = await fs.readFile(filepath, 'utf-8');
-        const index = content.indexOf(searchPattern);
+	try {
+		let content = await fs.readFile(filepath, 'utf-8');
+		const index = content.indexOf(searchPattern);
 
-        if (index === -1) {
-            console.warn(`Pattern not found in ${filepath}`);
-            return false;
-        }
+		if (index === -1) {
+			console.warn(`Pattern not found in ${filepath}`);
+			return false;
+		}
 
-        if (content.includes(newContent.trim())) {
-            console.log(`Content already exists in ${filepath}`);
-            return false;
-        }
+		if (content.includes(newContent.trim())) {
+			console.log(`Content already exists in ${filepath}`);
+			return false;
+		}
 
-        if (position === 'after') {
-            const insertIndex = index + searchPattern.length;
-            content = content.slice(0, insertIndex) + '\n' + newContent + content.slice(insertIndex);
-        } else {
-            content = content.slice(0, index) + newContent + '\n' + content.slice(index);
-        }
+		if (position === 'after') {
+			const insertIndex = index + searchPattern.length;
+			content = content.slice(0, insertIndex) + '\n' + newContent + content.slice(insertIndex);
+		} else {
+			content = content.slice(0, index) + newContent + '\n' + content.slice(index);
+		}
 
-        await fs.writeFile(filepath, content, 'utf-8');
-        console.log(`✅ Updated: ${filepath}`);
-        return true;
-    } catch (error) {
-        console.error(`Failed to update ${filepath}:`, error.message);
-        return false;
-    }
-}
+		await fs.writeFile(filepath, content, 'utf-8');
+		console.log(`✅ Updated: ${filepath}`);
+		return true;
+	} catch (error) {
+		console.error(`Failed to update ${filepath}:`, error.message);
+		return false;
+	}
+}

package/src/utils/loadConfig.js

@@ -1,15 +1,59 @@
-import path from 'path';
-import { pathToFileURL } from 'url';
+import fs from 'node:fs/promises';
+import fsSync from 'node:fs';
+import path from 'node:path';
+
+const DEFAULT_CONFIG = {
+	contexts: [],
+	defaultContext: 'web',
+	coreAlias: '$core'
+};
+
+function toObjectFromDefaultExport(content) {
+	const source = String(content ?? '').trim();
+	if (!source.length) return {};
+
+	const replacedExport = source.replace(/^\s*export\s+default\s+/m, 'return ');
+	if (replacedExport === source) return {};
+
+	const withSemicolon = /;\s*$/.test(replacedExport) ? replacedExport : `${replacedExport};`;
+
+	try {
+		// eslint-disable-next-line no-new-func
+		return new Function(withSemicolon)() ?? {};
+	} catch {
+		return {};
+	}
+}
+
+export function resolveConfigFile(cwd = process.cwd()) {
+	const tsPath = path.join(cwd, 'azure-net.config.ts');
+	const jsPath = path.join(cwd, 'azure-net.config.js');
+
+	if (fsSync.existsSync(tsPath)) {
+		return { exists: true, filepath: tsPath, type: 'ts' };
+	}
+	if (fsSync.existsSync(jsPath)) {
+		return { exists: true, filepath: jsPath, type: 'js' };
+	}
+
+	return { exists: false, filepath: tsPath, type: 'ts' };
+}
 
 export async function loadUserConfig() {
-    try {
-        const configPath = path.resolve(process.cwd(), 'azure-net.config.js');
-        const userConfig = await import(pathToFileURL(configPath));
-        return userConfig.default || {};
-    } catch {
-        return {
-            contexts: ['web'],
-            defaultContext: 'web'
-        };
-    }
-}
+	const { exists, filepath } = resolveConfigFile();
+	if (!exists) {
+		return { ...DEFAULT_CONFIG };
+	}
+
+	try {
+		const content = await fs.readFile(filepath, 'utf-8');
+		const parsed = toObjectFromDefaultExport(content);
+		if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+			return { ...DEFAULT_CONFIG };
+		}
+
+		return { ...DEFAULT_CONFIG, ...parsed };
+	} catch {
+		return { ...DEFAULT_CONFIG };
+	}
+}

package/tsconfig.json

@@ -0,0 +1,19 @@
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"rootDir": ".",
+		"outDir": "dist",
+		"allowJs": true,
+		"checkJs": false,
+		"declaration": true,
+		"sourceMap": true,
+		"strict": true,
+		"noUncheckedIndexedAccess": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true
+	},
+	"include": ["bin/**/*.ts", "src/**/*"],
+	"exclude": ["dist", "node_modules"]
+}

package/src/commands/generate/generateComponent.js

@@ -1,53 +0,0 @@
-import prompts from 'prompts';
-import path from 'path';
-import { selectContext } from '../../utils/contextUtils.js';
-import { writeIfNotExists } from '../../utils/fileUtils.js';
-
-const componentTemplate = `<script lang="ts">
-\timport './style.scss';
-</script>
-
-{{componentName}}
-`;
-
-const styleTemplate = `// Add your styles here
-`;
-
-export default async function generateComponent() {
-    const context = await selectContext('Select context for component:');
-
-    const { componentPath } = await prompts({
-        type: 'text',
-        name: 'componentPath',
-        message: 'Component path (e.g. reviews/modals/ReviewModal):',
-        validate: value => value.length > 0 ? true : 'Path cannot be empty'
-    });
-
-    // Parse the path
-    const normalizedPath = componentPath.replace(/\\/g, '/');
-    const pathParts = normalizedPath.split('/');
-    const componentName = pathParts[pathParts.length - 1];
-
-    // Build the full path: src/app/{context}/ui/components/{path}
-    const contextUiPath = path.join(process.cwd(), 'src/app', context, 'ui/components');
-    const fullComponentPath = path.join(contextUiPath, normalizedPath);
-
-    console.log(`\n🚀 Generating component: ${componentName}...\n`);
-
-    // Create Component.svelte
-    await writeIfNotExists(
-        path.join(fullComponentPath, 'Component.svelte'),
-        componentTemplate.replace(/{{componentName}}/g, componentName)
-    );
-
-    // Create style.scss
-    await writeIfNotExists(
-        path.join(fullComponentPath, 'style.scss'),
-        styleTemplate
-    );
-
-    console.log(`✅ Component created at: ${fullComponentPath}`);
-    console.log(`\n💡 Files created:`);
-    console.log(`   - Component.svelte`);
-    console.log(`   - style.scss`);
-}

package/src/commands/generate/generateDatasource.js

@@ -1,84 +0,0 @@
-import prompts from 'prompts';
-import path from 'path';
-import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '../../utils/contextUtils.js';
-import { writeIfNotExists, updateIndexTs, updateCoreIndex } from '../../utils/fileUtils.js';
-
-const datasourceWithResponseTemplate = `import { BaseHttpDatasource, type CreateRequestCallbackType } from '@azure-net/kit/infra';
-import { {{responseClass}} } from '{{responseImport}}';
-
-export class {{name}}Datasource extends BaseHttpDatasource {
-\tasync createRequest<T>(callback: CreateRequestCallbackType<T>) {
-\t\treturn new {{responseClass}}<T>(await this.createRawRequest<T>(callback));
-\t}
-}`;
-
-export default async function generateDatasource() {
-    const context = await selectContext('Select context for datasource (or core):');
-
-    const { name } = await prompts({
-        type: 'text',
-        name: 'name',
-        message: 'Datasource name (without "Datasource" suffix):'
-    });
-
-    const pascalName = toPascalCase(name);
-    const contextPath = context === 'core'
-        ? path.join(process.cwd(), 'src/core')
-        : getContextPath(context);
-
-    // Get available responses
-    const coreResponses = await getAvailableFiles(
-        path.join(process.cwd(), 'src/core/responses')
-    );
-
-    const contextResponses = context !== 'core'
-        ? await getAvailableFiles(path.join(contextPath, 'infrastructure/responses'))
-        : [];
-
-    const allResponses = [
-        ...coreResponses.map(r => ({
-            title: `${r} (core)`,
-            value: { name: r, from: 'core' }
-        })),
-        ...contextResponses.map(r => ({
-            title: `${r} (${context})`,
-            value: { name: r, from: context }
-        }))
-    ];
-
-    if (allResponses.length === 0) {
-        console.error('❌ No responses available. Create a response first with make:response');
-        return;
-    }
-
-    const { response } = await prompts({
-        type: 'select',
-        name: 'response',
-        message: 'Select response for datasource:',
-        choices: allResponses
-    });
-
-    const datasourcePath = context === 'core'
-        ? path.join(contextPath, 'datasources')
-        : path.join(contextPath, 'infrastructure/http/datasources');
-
-    const responseImport = response.from === 'core'
-        ? context === 'core' ? '../responses' : '$core/responses'
-        : `\$${context}/infrastructure/responses`;
-
-    const content = datasourceWithResponseTemplate
-        .replace(/{{name}}/g, pascalName)
-        .replace(/{{responseClass}}/g, response.name)
-        .replace(/{{responseImport}}/g, responseImport);
-
-    const filePath = path.join(datasourcePath, `${pascalName}Datasource.ts`);
-    await writeIfNotExists(filePath, content);
-    await updateIndexTs(datasourcePath);
-
-    // Update core index if needed
-    if (context === 'core') {
-        await updateCoreIndex();
-    }
-
-    console.log(`✅ Datasource created at ${filePath}`);
-}

package/src/commands/generate/generateDesignComponent.js

@@ -1,53 +0,0 @@
-import prompts from 'prompts';
-import path from 'path';
-import { selectContext } from '../../utils/contextUtils.js';
-import { writeIfNotExists } from '../../utils/fileUtils.js';
-
-const designComponentTemplate = `<script lang="ts">
-\timport './style.scss';
-</script>
-
-{{componentName}}
-`;
-
-const styleTemplate = `// Add your styles here
-`;
-
-export default async function generateDesignComponent() {
-    const context = await selectContext('Select context for design component:');
-
-    const { componentPath } = await prompts({
-        type: 'text',
-        name: 'componentPath',
-        message: 'Design component path (e.g. Button/Themes/PrimaryButton):',
-        validate: value => value.length > 0 ? true : 'Path cannot be empty'
-    });
-
-    // Parse the path
-    const normalizedPath = componentPath.replace(/\\/g, '/');
-    const pathParts = normalizedPath.split('/');
-    const componentName = pathParts[pathParts.length - 1];
-
-    // Build the full path: src/app/{context}/ui/design/{path}
-    const contextUiPath = path.join(process.cwd(), 'src/app', context, 'ui/design');
-    const fullComponentPath = path.join(contextUiPath, normalizedPath);
-
-    console.log(`\n🚀 Generating design component: ${componentName}...\n`);
-
-    // Create Component.svelte
-    await writeIfNotExists(
-        path.join(fullComponentPath, 'Component.svelte'),
-        designComponentTemplate.replace(/{{componentName}}/g, componentName)
-    );
-
-    // Create style.scss
-    await writeIfNotExists(
-        path.join(fullComponentPath, 'style.scss'),
-        styleTemplate
-    );
-
-    console.log(`✅ Design component created at: ${fullComponentPath}`);
-    console.log(`\n💡 Files created:`);
-    console.log(`   - Component.svelte`);
-    console.log(`   - style.scss`);
-}

package/src/commands/generate/generateResponse.js

@@ -1,41 +0,0 @@
-import prompts from 'prompts';
-import path from 'path';
-import { selectContext, getContextPath, toPascalCase } from '../../utils/contextUtils.js';
-import { writeIfNotExists, updateIndexTs, updateCoreIndex } from '../../utils/fileUtils.js';
-
-const responseTemplate = `import { ResponseBuilder } from '@azure-net/kit/infra';
-
-export class {{name}}Response<TData = unknown, TMeta = unknown> extends ResponseBuilder<TData, TMeta, TData> {
-}`;
-
-export default async function generateResponse() {
-    const context = await selectContext('Select context for response (or core):');
-
-    const { name } = await prompts({
-        type: 'text',
-        name: 'name',
-        message: 'Response name (without "Response" suffix):'
-    });
-
-    const pascalName = toPascalCase(name);
-    const contextPath = context === 'core'
-        ? path.join(process.cwd(), 'src/core')
-        : getContextPath(context);
-
-    const responsePath = context === 'core'
-        ? path.join(contextPath, 'responses')
-        : path.join(contextPath, 'infrastructure/responses');
-
-    const content = responseTemplate.replace(/{{name}}/g, pascalName);
-    const filePath = path.join(responsePath, `${pascalName}Response.ts`);
-
-    await writeIfNotExists(filePath, content);
-    await updateIndexTs(responsePath);
-
-    // Update core index if needed
-    if (context === 'core') {
-        await updateCoreIndex();
-    }
-
-    console.log(`✅ Response created at ${filePath}`);
-}

package/src/commands/generate/generateWidget.js

@@ -1,53 +0,0 @@
-import prompts from 'prompts';
-import path from 'path';
-import { selectContext } from '../../utils/contextUtils.js';
-import { writeIfNotExists } from '../../utils/fileUtils.js';
-
-const widgetTemplate = `<script lang="ts">
-\timport './style.scss';
-</script>
-
-{{widgetName}}
-`;
-
-const styleTemplate = `// Add your styles here
-`;
-
-export default async function generateWidget() {
-    const context = await selectContext('Select context for widget:');
-
-    const { widgetPath } = await prompts({
-        type: 'text',
-        name: 'widgetPath',
-        message: 'Widget path (e.g. modals/ConfirmModal):',
-        validate: value => value.length > 0 ? true : 'Path cannot be empty'
-    });
-
-    // Parse the path
-    const normalizedPath = widgetPath.replace(/\\/g, '/');
-    const pathParts = normalizedPath.split('/');
-    const widgetName = pathParts[pathParts.length - 1];
-
-    // Build the full path: src/app/{context}/ui/widgets/{path}
-    const contextUiPath = path.join(process.cwd(), 'src/app', context, 'ui/widgets');
-    const fullWidgetPath = path.join(contextUiPath, normalizedPath);
-
-    console.log(`\n🚀 Generating widget: ${widgetName}...\n`);
-
-    // Create Component.svelte
-    await writeIfNotExists(
-        path.join(fullWidgetPath, 'Component.svelte'),
-        widgetTemplate.replace(/{{widgetName}}/g, widgetName)
-    );
-
-    // Create style.scss
-    await writeIfNotExists(
-        path.join(fullWidgetPath, 'style.scss'),
-        styleTemplate
-    );
-
-    console.log(`✅ Widget created at: ${fullWidgetPath}`);
-    console.log(`\n💡 Files created:`);
-    console.log(`   - Component.svelte`);
-    console.log(`   - style.scss`);
-}

package/src/commands/init/index.js

@@ -1,9 +0,0 @@
-export { default as initStructure } from './initStructure.js';
-export { default as initAliases } from './initAliases.js';
-export { default as initMiddleware } from './initMiddleware.js';
-export { default as initEdges } from './initEdges.js';
-export { default as initTranslations } from './initTranslations.js';
-export { default as initSchema } from './initSchema.js';
-export { default as initLint } from './initLint.js';
-export { default as initPresenter } from './initPresenter.js';
-export { default as migrateStructure } from './migrateStructure.js';

package/src/commands/init/initAliases.js

@@ -1,52 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { loadUserConfig } from '../../utils/loadConfig.js';
-import { execSync } from 'child_process';
-
-const svelteConfigPath = path.resolve('svelte.config.js');
-
-function generateAliases(config) {
-    const contexts = config.contexts || ['app'];
-
-    return Object.fromEntries([
-        ...contexts.flatMap(c => [
-            [`$${c}`, `./src/app/${c}/layers`],
-            [`$${c}/ui`, `./src/app/${c}/ui`]
-        ]),
-        ['$core', './src/core']
-    ]);
-}
-
-function serializeObjectLiteral(obj) {
-    return Object.entries(obj)
-        .map(([key, value]) => `\t\t\t'${key}': '${value}'`)
-        .join(',\n');
-}
-
-export default async function initAliases() {
-    const config = await loadUserConfig();
-    const newAliases = generateAliases(config);
-
-    let content = await fs.readFile(svelteConfigPath, 'utf-8');
-
-    const aliasRegex = /alias:\s*{([\s\S]*?)}/m;
-    const aliasMatch = content.match(aliasRegex);
-
-    const newAliasBlock = `alias: {\n${serializeObjectLiteral(newAliases)}\n\t\t}`;
-
-    if (aliasMatch) {
-        content = content.replace(aliasRegex, newAliasBlock);
-    } else {
-        const kitRegex = /kit:\s*{/;
-        content = content.replace(kitRegex, `kit: {\n\t\t${newAliasBlock},`);
-    }
-
-    await fs.writeFile(svelteConfigPath, content, 'utf-8');
-    console.log('✅ Aliases updated in svelte.config.js');
-
-    try {
-        execSync('npm run format', { stdio: 'inherit' });
-    } catch {
-        console.warn('⚠️ Failed to run format');
-    }
-}

package/src/commands/init/initEdges.js

@@ -1,42 +0,0 @@
-import { injectIntoFile, writeIfNotExists } from '../../utils/fileUtils.js';
-import path from 'path';
-
-const hooksServerPath = path.join(process.cwd(), 'src/hooks.server.ts');
-
-const hooksTemplate = `import { dev } from '$app/environment';
-import { edgesHandle } from '@azure-net/kit/edges/server';
-import { type Handle } from '@sveltejs/kit';
-
-export const handle: Handle = async ({ event, resolve }) => {
-\treturn edgesHandle(
-\t\tevent,
-\t\tasync ({ edgesEvent, serialize }) => {
-\t\t\treturn resolve(edgesEvent, {
-\t\t\t\ttransformPageChunk: ({ html }) => serialize(html)
-\t\t\t});
-\t\t},
-\t\tdev
-\t);
-};`;
-
-export default async function initEdges() {
-    const created = await writeIfNotExists(hooksServerPath, hooksTemplate);
-
-    if (!created) {
-        const importStatement = `import { edgesHandle } from '@azure-net/kit/edges/server';`;
-        await injectIntoFile(hooksServerPath, 'import {', importStatement, 'before');
-
-        const handleCode = `\treturn edgesHandle(
-\t\tevent,
-\t\tasync ({ edgesEvent, serialize }) => {`;
-
-        await injectIntoFile(
-            hooksServerPath,
-            'export const handle: Handle = async ({ event, resolve }) => {',
-            handleCode,
-            'after'
-        );
-    }
-
-    console.log('✅ Edges-svelte initialized');
-}