@azure-net/cli 2.0.6 → 2.0.8

package/bin/azure-net.js

@@ -73,10 +73,10 @@ program
     .action(async () => {
         await initStructure();
         await initAliases();
-        await initEdges();
-        await initMiddleware();
-        await initTranslations();
-        await initSchema();
+        // await initEdges();
+        // await initMiddleware();
+        // await initTranslations();
+        // await initSchema();
     });
 
 // Generate commands

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/cli",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "type": "module",
   "bin": {
     "azure-net": "bin/azure-net.js"

package/src/commands/generate/generateCrudPresenter.js

@@ -2,7 +2,7 @@ import prompts from 'prompts';
 import path from 'path';
 import fs from 'fs/promises';
 import { selectContext, getContextPath, toPascalCase, getAvailableFiles, getApplicationProviderServices } from '../../utils/contextUtils.js';
-import { writeIfNotExists } from '../../utils/fileUtils.js';
+import {updateIndexTs, writeIfNotExists} from '../../utils/fileUtils.js';
 
 const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
 import type { I{{name}}CreateRequest } from '\${{context}}/Domain/Ports/{{entity}}';

package/src/commands/generate/generateDatasource.js

@@ -5,7 +5,6 @@ import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
 const datasourceWithResponseTemplate = `import { BaseHttpDatasource, type CreateRequestCallbackType } from '@azure-net/kit/infra';
 import { {{responseClass}}, type {{responseInterface}} } from '{{responseImport}}';
-import { HttpService } from '@azure-net/kit/infra';
 
 export class {{name}}Datasource extends BaseHttpDatasource {
 \tasync createRequest<T>(callback: CreateRequestCallbackType<{{responseInterface}}<T>>) {

package/src/commands/generate/generateResponse.js

@@ -5,16 +5,7 @@ import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
 const responseTemplate = `import { ResponseBuilder } from '@azure-net/kit/infra';
 
-export interface I{{name}}Response<T = unknown> {
-\tdata: T;
-\tsuccess: boolean;
-\tmessage: string;
-}
-
 export class {{name}}Response<TData = unknown, TMeta = unknown> extends ResponseBuilder<TData, TMeta, I{{name}}Response<TData>> {
-\toverride unwrapData(data: I{{name}}Response<TData>): TData {
-\t\treturn data.data;
-\t}
 }`;
 
 export default async function generateResponse() {

package/src/commands/init/initMiddleware.js

@@ -2,8 +2,6 @@ import { writeIfNotExists, injectIntoFile } from '../../utils/fileUtils.js';
 import path from 'path';
 
 const middlewarePath = path.join(process.cwd(), 'src/app/shared/Middleware/MiddlewareManager.ts');
-const hooksServerPath = path.join(process.cwd(), 'src/hooks.server.ts');
-const layoutPath = path.join(process.cwd(), 'src/routes/+layout.svelte');
 
 const middlewareTemplate = `import { createMiddlewareManager } from '@azure-net/kit';
 
@@ -16,28 +14,5 @@ export default async function initMiddleware() {
         `export * from './MiddlewareManager';`
     );
 
-    // Add to hooks.server.ts
-    await injectIntoFile(
-        hooksServerPath,
-        'import',
-        `import { serverMiddleware } from '$shared';`,
-        'before'
-    );
-
-    await injectIntoFile(
-        hooksServerPath,
-        'async ({ edgesEvent, serialize }) => {',
-        '\t\t\tawait serverMiddleware();',
-        'after'
-    );
-
-    // Add to +layout.svelte
-    await injectIntoFile(
-        layoutPath,
-        '<script',
-        `\timport { clientMiddleware } from '$shared';\n\tclientMiddleware();`,
-        'after'
-    );
-
     console.log('✅ Middleware initialized');
 }

package/src/commands/init/initStructure.js

@@ -23,7 +23,7 @@ async function createIndexFile(dirPath, exportPatterns = []) {
     }
 }
 
-async function createBaseStructure(root, contextName) {
+async function createBaseStructure(root, contextName, contextAlias) {
     // Domain
     const domainPath = path.join(root, 'Domain');
     await createDirIfNotExists(path.join(domainPath, 'Entities'));
@@ -69,9 +69,9 @@ export const InfrastructureProvider = createBoundaryProvider(
     await createDirIfNotExists(path.join(appPath, 'Services'));
     await createDirIfNotExists(path.join(appPath, 'Providers'));
 
-    // Create empty ApplicationProvider
+    // Create empty ApplicationProvider with correct import
     const appProviderContent = `import { createBoundaryProvider } from '@azure-net/kit';
-import { InfrastructureProvider } from '../Infrastructure';
+import { InfrastructureProvider } from '\$${contextAlias}/Infrastructure';
 
 export const ApplicationProvider = createBoundaryProvider(
 \t'${contextName}ApplicationProvider',
@@ -115,7 +115,7 @@ export default async function initStructure() {
     for (const context of contexts) {
         const contextPath = path.join(CONTEXTS_PATH, context);
         const contextName = context.charAt(0).toUpperCase() + context.slice(1);
-        await createBaseStructure(contextPath, contextName);
+        await createBaseStructure(contextPath, contextName, context);
     }
 
     // Create shared structure (former core)

package/src/commands/init/initTranslations.js

@@ -1,9 +1,7 @@
-import { writeIfNotExists, injectIntoFile } from '../../utils/fileUtils.js';
+import { writeIfNotExists } from '../../utils/fileUtils.js';
 import path from 'path';
 
 const translationsPath = path.join(process.cwd(), 'src/app/shared/Translation');
-const layoutServerPath = path.join(process.cwd(), 'src/routes/+layout.server.ts');
-const layoutTsPath = path.join(process.cwd(), 'src/routes/+layout.ts');
 
 const translationProviderTemplate = `import { messages } from './Locales';
 import { createTranslations } from '@azure-net/kit/i18n';
@@ -54,49 +52,5 @@ export default async function initTranslations() {
         localesIndexTemplate
     );
 
-    // Add to hooks.server.ts
-    await injectIntoFile(
-        path.join(process.cwd(), 'src/hooks.server.ts'),
-        'import',
-        `import { Translation } from '$shared';`,
-        'before'
-    );
-
-    await injectIntoFile(
-        path.join(process.cwd(), 'src/hooks.server.ts'),
-        'await serverMiddleware();',
-        `\t\t\tconst { preloadTranslation, applyHtmlLocaleAttr } = Translation();\n\t\t\tawait preloadTranslation(edgesEvent);`,
-        'after'
-    );
-
-    await injectIntoFile(
-        path.join(process.cwd(), 'src/hooks.server.ts'),
-        'transformPageChunk: ({ html })',
-        ' => {\n\t\t\t\tconst serialized = serialize(html);\n\t\t\t\treturn applyHtmlLocaleAttr(serialized);\n\t\t\t}',
-        'after'
-    );
-
-    // Add to layout files
-    await injectIntoFile(
-        layoutServerPath,
-        'export const load',
-        `\treturn { lang: locals.lang };`,
-        'after'
-    );
-
-    await injectIntoFile(
-        layoutTsPath,
-        'import',
-        `import { Translation } from '$shared';\nimport { browser } from '$app/environment';`,
-        'before'
-    );
-
-    await injectIntoFile(
-        layoutTsPath,
-        'export const load',
-        `\tconst { syncTranslation } = Translation();\n\tif (browser) {\n\t\tawait syncTranslation({ lang: data.lang }, false);\n\t}`,
-        'after'
-    );
-
     console.log('✅ Translations initialized');
 }