swallowkit 1.0.0-beta.4 → 1.0.0-beta.40

package/dist/cli/commands/scaffold.js

@@ -38,13 +38,35 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scaffoldCommand = scaffoldCommand;
+exports.generateCosmosContainer = generateCosmosContainer;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const config_1 = require("../../core/config");
 const model_parser_1 = require("../../core/scaffold/model-parser");
 const functions_generator_1 = require("../../core/scaffold/functions-generator");
+const connector_functions_generator_1 = require("../../core/scaffold/connector-functions-generator");
 const nextjs_generator_1 = require("../../core/scaffold/nextjs-generator");
 const ui_generator_1 = require("../../core/scaffold/ui-generator");
-const config_1 = require("../../core/config");
+const native_schema_generator_1 = require("../../core/scaffold/native-schema-generator");
+const package_manager_1 = require("../../utils/package-manager");
+const manifest_1 = require("../../core/project/manifest");
+function getMachineAwareStdio() {
+    return process.env.SWALLOWKIT_MACHINE_OUTPUT === "1" ? "pipe" : "inherit";
+}
+function runSpawnSyncCommand(command, args, cwd) {
+    const result = (0, child_process_1.spawnSync)(command, args, {
+        cwd,
+        stdio: getMachineAwareStdio(),
+        shell: true,
+    });
+    if (typeof result.status === "number" && result.status !== 0) {
+        throw new Error(`${command} ${args.join(" ")} exited with code ${result.status}`);
+    }
+    if (result.error) {
+        throw result.error;
+    }
+}
 async function scaffoldCommand(options) {
     // SwallowKit プロジェクトディレクトリかどうかを検証
     (0, config_1.ensureSwallowKitProject)("scaffold");
@@ -57,6 +79,14 @@ async function scaffoldCommand(options) {
         console.log("🔍 Parsing model file...");
         const modelInfo = await (0, model_parser_1.parseModelFile)(modelPath);
         console.log(`✅ Model parsed: ${modelInfo.name} (${modelInfo.schemaName})`);
+        const backendLanguage = (0, config_1.getBackendLanguage)();
+        console.log(`🧠 Backend language: ${backendLanguage}`);
+        // コネクタモデルかどうかを判定
+        const isConnectorModel = !!modelInfo.connectorConfig;
+        if (isConnectorModel) {
+            console.log(`🔌 Connector model detected: ${modelInfo.connectorConfig.connector}`);
+            console.log(`   Operations: ${modelInfo.connectorConfig.operations.join(", ")}`);
+        }
         // ネストスキーマ参照があれば表示
         if (modelInfo.nestedSchemaRefs.length > 0) {
             console.log(`🔗 Nested schema references detected:`);
@@ -73,36 +103,91 @@ async function scaffoldCommand(options) {
         // 4. Read shared package name
         const functionsDir = options.functionsDir || "functions";
         const sharedPackageName = readSharedPackageName();
+        const relatedModels = backendLanguage === "typescript"
+            ? [modelInfo]
+            : await collectModelGraph(modelPath);
+        if (options.apiOnly) {
+            console.log("ℹ️  --api-only skips UI generation only; Functions, BFF routes, OpenAPI, and native schema assets are still updated.");
+        }
         // 5. Generate BFF callFunction helper
         await generateCallFunctionHelper();
         // 6. Generate Azure Functions code
-        await generateFunctionsCode(modelInfo, functionsDir, sharedPackageName);
+        if (isConnectorModel) {
+            await generateConnectorFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage);
+            // 6b. Install connector driver dependencies
+            await installConnectorDriverDependencies(modelInfo, functionsDir, backendLanguage);
+        }
+        else {
+            await generateFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage);
+            if (backendLanguage !== "typescript") {
+                await (0, native_schema_generator_1.generateLanguageSchemaArtifacts)(relatedModels, modelInfo, functionsDir, backendLanguage);
+            }
+        }
         // 7. Generate Next.js BFF API Routes
         const apiDir = options.apiDir || "app/api";
-        await generateBFFRoutes(modelInfo, apiDir, sharedPackageName);
-        // 8. Generate Cosmos DB container Bicep file
-        await generateCosmosContainer(modelInfo);
+        if (isConnectorModel) {
+            await generateConnectorBFFRoutesFiles(modelInfo, apiDir, sharedPackageName);
+        }
+        else {
+            await generateBFFRoutes(modelInfo, apiDir, sharedPackageName);
+        }
+        // 8. Generate Cosmos DB container Bicep file (skip for connector models)
+        if (!isConnectorModel) {
+            await generateCosmosContainer(modelInfo);
+        }
         // 9. Generate UI components (unless --api-only)
         if (!options.apiOnly) {
-            await generateUIComponents(modelInfo, sharedPackageName);
+            const uiAuthConfig = (0, config_1.getAuthConfig)();
+            const uiAuthPolicy = resolveAuthPolicy(modelInfo, uiAuthConfig);
+            const uiAuthOptions = uiAuthPolicy && uiAuthConfig && uiAuthConfig.provider !== 'none'
+                ? { authPolicy: uiAuthPolicy }
+                : undefined;
+            await generateUIComponents(modelInfo, sharedPackageName, uiAuthOptions);
             await updateNavigationMenu(modelInfo);
         }
+        await (0, manifest_1.syncProjectManifest)();
         console.log("\n✅ Scaffold completed successfully!");
         console.log("\n📝 Next steps:");
-        console.log(`  1. Review generated files in ${functionsDir}/src/ and ${apiDir}/`);
+        console.log(`  1. Review generated files in ${describeFunctionsOutputPath(functionsDir, backendLanguage)} and ${apiDir}/`);
         if (!options.apiOnly) {
             console.log(`  2. Check the generated UI pages in app/${(0, model_parser_1.toKebabCase)(modelInfo.name)}/`);
             console.log("  3. Navigate to the model from the homepage menu");
         }
-        console.log(`  ${options.apiOnly ? '2' : '4'}. Ensure FUNCTIONS_BASE_URL is set in your .env.local file`);
-        console.log(`  ${options.apiOnly ? '3' : '5'}. Configure CosmosDBConnection in functions/local.settings.json`);
-        console.log(`  ${options.apiOnly ? '4' : '6'}. Run 'npx swallowkit dev' to test the generated code`);
+        if (backendLanguage !== "typescript") {
+            console.log(`  ${options.apiOnly ? "2" : "4"}. Review generated OpenAPI export and native schema assets in ${functionsDir}/openapi/ and ${functionsDir}/generated/`);
+        }
+        console.log(`  ${options.apiOnly ? (backendLanguage === "typescript" ? "2" : "3") : (backendLanguage === "typescript" ? "4" : "5")}. Ensure BACKEND_FUNCTIONS_BASE_URL is set in your .env.local file`);
+        console.log(`  ${options.apiOnly ? (backendLanguage === "typescript" ? "3" : "4") : (backendLanguage === "typescript" ? "5" : "6")}. Configure CosmosDBConnection in functions/local.settings.json`);
+        console.log(`  ${options.apiOnly ? (backendLanguage === "typescript" ? "4" : "5") : (backendLanguage === "typescript" ? "6" : "7")}. Run '${(0, package_manager_1.getCommands)((0, package_manager_1.detectFromProject)()).dlx} swallowkit dev' to test the generated code`);
     }
     catch (error) {
         console.error("\n❌ Scaffold failed:", error.message);
         process.exit(1);
     }
 }
+/**
+ * モデルの authPolicy と auth config から実効的な認可ポリシーを解決
+ * - モデルに authPolicy があればそれを使用
+ * - なければ auth.authorization.defaultPolicy に従う
+ * - auth 設定がなければ undefined（ガードなし）
+ */
+function resolveAuthPolicy(modelInfo, authConfig) {
+    // モデルに明示的な authPolicy がある場合はそれを使用
+    if (modelInfo.authPolicy) {
+        return modelInfo.authPolicy;
+    }
+    // auth 設定がない場合はガードなし
+    if (!authConfig || authConfig.provider === 'none') {
+        return undefined;
+    }
+    // defaultPolicy が 'authenticated' なら認証のみ（ロール指定なし）のポリシーを返す
+    const defaultPolicy = authConfig.authorization?.defaultPolicy ?? 'authenticated';
+    if (defaultPolicy === 'authenticated') {
+        return {}; // 空のポリシー = 認証のみ、ロール制限なし
+    }
+    // defaultPolicy が 'anonymous' なら認証不要
+    return undefined;
+}
 /**
  * モデルファイルのパスを解決
  */
@@ -152,7 +237,7 @@ function readSharedPackageName() {
     if (!fs.existsSync(sharedPkgPath)) {
         throw new Error("shared/package.json not found.\n" +
             "The shared package is required for model imports.\n" +
-            'Run "npx swallowkit init" to set up your project.');
+            `Run "${(0, package_manager_1.getCommands)((0, package_manager_1.detectFromProject)()).dlx} swallowkit init" to set up your project.`);
     }
     const pkg = JSON.parse(fs.readFileSync(sharedPkgPath, "utf-8"));
     return pkg.name;
@@ -168,34 +253,272 @@ async function generateCallFunctionHelper() {
     if (!fs.existsSync(helperDir)) {
         fs.mkdirSync(helperDir, { recursive: true });
     }
-    const helperCode = (0, nextjs_generator_1.generateBFFCallFunction)();
+    // auth 設定がある場合は Authorization ヘッダー転送版を生成
+    const authConfig = (0, config_1.getAuthConfig)();
+    const hasAuth = authConfig && authConfig.provider !== 'none';
+    let helperCode;
+    if (hasAuth) {
+        const { generateBFFCallFunctionWithAuth } = await Promise.resolve().then(() => __importStar(require("../../core/scaffold/auth-generator")));
+        helperCode = generateBFFCallFunctionWithAuth();
+    }
+    else {
+        helperCode = (0, nextjs_generator_1.generateBFFCallFunction)();
+    }
     fs.writeFileSync(helperPath, helperCode, "utf-8");
     console.log(`✅ Created: ${helperPath}`);
 }
 /**
  * Generate Azure Functions CRUD code
  */
-async function generateFunctionsCode(modelInfo, functionsDir, sharedPackageName) {
+async function generateFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage) {
     console.log("\n🔨 Generating Azure Functions CRUD code...");
+    // Resolve auth policy: model-level authPolicy or global defaultPolicy
+    const authConfig = (0, config_1.getAuthConfig)();
+    const authPolicy = resolveAuthPolicy(modelInfo, authConfig);
+    if (authPolicy) {
+        console.log(`🔐 Auth policy detected: ${JSON.stringify(authPolicy)}`);
+    }
     const modelKebab = (0, model_parser_1.toKebabCase)(modelInfo.name);
-    const functionFilePath = path.join(process.cwd(), functionsDir, "src", `${modelKebab}.ts`);
-    // ディレクトリを作成
-    const functionDir = path.dirname(functionFilePath);
-    if (!fs.existsSync(functionDir)) {
-        fs.mkdirSync(functionDir, { recursive: true });
+    if (backendLanguage === "typescript") {
+        const functionFilePath = path.join(process.cwd(), functionsDir, "src", `${modelKebab}.ts`);
+        const functionDir = path.dirname(functionFilePath);
+        if (!fs.existsSync(functionDir)) {
+            fs.mkdirSync(functionDir, { recursive: true });
+        }
+        const code = (0, functions_generator_1.generateCompactAzureFunctionsCRUD)(modelInfo, sharedPackageName, authPolicy);
+        fs.writeFileSync(functionFilePath, code, "utf-8");
+        console.log(`✅ Created: ${functionFilePath}`);
+        return;
     }
-    // コードを生成
-    const code = (0, functions_generator_1.generateCompactAzureFunctionsCRUD)(modelInfo, sharedPackageName);
-    // ファイルに書き込み
-    fs.writeFileSync(functionFilePath, code, "utf-8");
-    console.log(`✅ Created: ${functionFilePath}`);
+    if (backendLanguage === "csharp") {
+        const crudDir = path.join(process.cwd(), functionsDir, "Crud");
+        const functionFilePath = path.join(crudDir, `${modelInfo.name}CrudFunctions.cs`);
+        fs.mkdirSync(crudDir, { recursive: true });
+        // Remove init-generated template (singular) to avoid route conflicts
+        const templatePath = path.join(crudDir, `${modelInfo.name}Function.cs`);
+        if (fs.existsSync(templatePath)) {
+            fs.unlinkSync(templatePath);
+            console.log(`🗑️  Removed template: ${templatePath}`);
+        }
+        fs.writeFileSync(functionFilePath, (0, functions_generator_1.generateCSharpAzureFunctionsCRUD)(modelInfo, authPolicy), "utf-8");
+        console.log(`✅ Created: ${functionFilePath}`);
+        return;
+    }
+    const blueprintsDir = path.join(process.cwd(), functionsDir, "blueprints");
+    const blueprintPath = path.join(blueprintsDir, `${modelKebab.replace(/-/g, "_")}.py`);
+    fs.mkdirSync(blueprintsDir, { recursive: true });
+    const { blueprint, registration } = (0, functions_generator_1.generatePythonAzureFunctionsCRUD)(modelInfo, authPolicy);
+    fs.writeFileSync(blueprintPath, blueprint, "utf-8");
+    updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), registration);
+    console.log(`✅ Created: ${blueprintPath}`);
+}
+/**
+ * コネクタモデル用 Azure Functions コード生成
+ */
+async function generateConnectorFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage) {
+    console.log("\n🔌 Generating Connector Azure Functions code...");
+    const connectorConfig = modelInfo.connectorConfig;
+    const connectorDef = (0, config_1.getConnectorDefinition)(connectorConfig.connector);
+    if (!connectorDef) {
+        throw new Error(`Connector '${connectorConfig.connector}' not found in swallowkit.config.js.\n` +
+            `  Please add it to the 'connectors' section of your configuration.`);
+    }
+    // Resolve auth policy (same logic as Cosmos model scaffolding)
+    const authConfig = (0, config_1.getAuthConfig)();
+    const authPolicy = resolveAuthPolicy(modelInfo, authConfig);
+    if (authPolicy) {
+        console.log(`🔐 Auth policy detected: ${JSON.stringify(authPolicy)}`);
+    }
+    const modelKebab = (0, model_parser_1.toKebabCase)(modelInfo.name);
+    if (backendLanguage === "typescript") {
+        const functionFilePath = path.join(process.cwd(), functionsDir, "src", `${modelKebab}.ts`);
+        fs.mkdirSync(path.dirname(functionFilePath), { recursive: true });
+        let code;
+        if (connectorDef.type === "rdb") {
+            code = (0, connector_functions_generator_1.generateRdbConnectorFunctionTS)(modelInfo, sharedPackageName, connectorDef, connectorConfig, authPolicy);
+        }
+        else {
+            code = (0, connector_functions_generator_1.generateApiConnectorFunctionTS)(modelInfo, sharedPackageName, connectorDef, connectorConfig, authPolicy);
+        }
+        fs.writeFileSync(functionFilePath, code, "utf-8");
+        console.log(`✅ Created: ${functionFilePath}`);
+        return;
+    }
+    if (backendLanguage === "csharp") {
+        const functionFilePath = path.join(process.cwd(), functionsDir, "Connectors", `${modelInfo.name}ConnectorFunctions.cs`);
+        fs.mkdirSync(path.dirname(functionFilePath), { recursive: true });
+        let code;
+        if (connectorDef.type === "rdb") {
+            code = (0, connector_functions_generator_1.generateRdbConnectorFunctionCSharp)(modelInfo, connectorDef, connectorConfig);
+        }
+        else {
+            code = (0, connector_functions_generator_1.generateApiConnectorFunctionCSharp)(modelInfo, connectorDef, connectorConfig);
+        }
+        fs.writeFileSync(functionFilePath, code, "utf-8");
+        console.log(`✅ Created: ${functionFilePath}`);
+        return;
+    }
+    // Python
+    const blueprintsDir = path.join(process.cwd(), functionsDir, "blueprints");
+    const blueprintPath = path.join(blueprintsDir, `${modelKebab.replace(/-/g, "_")}.py`);
+    fs.mkdirSync(blueprintsDir, { recursive: true });
+    let result;
+    if (connectorDef.type === "rdb") {
+        result = (0, connector_functions_generator_1.generateRdbConnectorFunctionPython)(modelInfo, connectorDef, connectorConfig);
+    }
+    else {
+        result = (0, connector_functions_generator_1.generateApiConnectorFunctionPython)(modelInfo, connectorDef, connectorConfig);
+    }
+    fs.writeFileSync(blueprintPath, result.blueprint, "utf-8");
+    updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), result.registration);
+    console.log(`✅ Created: ${blueprintPath}`);
+}
+/**
+ * コネクタモデルの scaffold 後に、生成コードが必要とする RDB/API ドライバを
+ * functions ディレクトリにインストールする。
+ */
+async function installConnectorDriverDependencies(modelInfo, functionsDir, backendLanguage) {
+    const connectorConfig = modelInfo.connectorConfig;
+    const connectorDef = (0, config_1.getConnectorDefinition)(connectorConfig.connector);
+    if (!connectorDef || connectorDef.type !== "rdb")
+        return;
+    const rdbDef = connectorDef;
+    const functionsPath = path.join(process.cwd(), functionsDir);
+    if (backendLanguage === "typescript") {
+        const driverMap = {
+            mysql: { deps: ["mysql2"], devDeps: [] },
+            postgres: { deps: ["pg"], devDeps: ["@types/pg"] },
+            sqlserver: { deps: ["mssql"], devDeps: [] },
+        };
+        const entry = driverMap[rdbDef.provider];
+        if (!entry)
+            return;
+        // package.json を読んで、既にインストール済みならスキップ
+        const pkgJsonPath = path.join(functionsPath, "package.json");
+        if (fs.existsSync(pkgJsonPath)) {
+            const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+            const allDeps = { ...pkg.dependencies, ...pkg.devDependencies };
+            const missingDeps = entry.deps.filter(d => !allDeps[d]);
+            const missingDevDeps = entry.devDeps.filter(d => !allDeps[d]);
+            if (missingDeps.length === 0 && missingDevDeps.length === 0)
+                return;
+        }
+        console.log(`\n📦 Installing ${rdbDef.provider} driver dependencies...`);
+        const pm = (0, package_manager_1.detectFromProject)(functionsPath);
+        const cmds = (0, package_manager_1.getCommands)(pm);
+        if (entry.deps.length > 0) {
+            runSpawnSyncCommand(cmds.name, [pm === "pnpm" ? "add" : "install", ...entry.deps], functionsPath);
+        }
+        if (entry.devDeps.length > 0) {
+            runSpawnSyncCommand(cmds.name, [pm === "pnpm" ? "add" : "install", "-D", ...entry.devDeps], functionsPath);
+        }
+        console.log(`✅ ${rdbDef.provider} driver installed`);
+        return;
+    }
+    if (backendLanguage === "csharp") {
+        const nugetMap = {
+            mysql: "MySqlConnector",
+            postgres: "Npgsql",
+            sqlserver: "Microsoft.Data.SqlClient",
+        };
+        const pkg = nugetMap[rdbDef.provider];
+        if (!pkg)
+            return;
+        console.log(`\n📦 Installing ${rdbDef.provider} NuGet package...`);
+        runSpawnSyncCommand("dotnet", ["add", path.join(functionsPath, "functions.csproj"), "package", pkg], functionsPath);
+        console.log(`✅ ${pkg} installed`);
+        return;
+    }
+    // Python — requirements.txt に追記
+    const pipMap = {
+        mysql: "mysql-connector-python",
+        postgres: "psycopg2-binary",
+        sqlserver: "pymssql",
+    };
+    const pipPkg = pipMap[rdbDef.provider];
+    if (!pipPkg)
+        return;
+    const reqPath = path.join(functionsPath, "requirements.txt");
+    if (fs.existsSync(reqPath)) {
+        const existing = fs.readFileSync(reqPath, "utf-8");
+        if (!existing.includes(pipPkg)) {
+            console.log(`\n📦 Adding ${pipPkg} to requirements.txt...`);
+            fs.appendFileSync(reqPath, `\n${pipPkg}\n`);
+            console.log(`✅ ${pipPkg} added`);
+        }
+    }
+}
+/**
+ * コネクタモデル用 BFF ルート生成（操作制限に対応）
+ */
+async function generateConnectorBFFRoutesFiles(modelInfo, apiDir, sharedPackageName) {
+    console.log("\n🔌 Generating Connector BFF API routes...");
+    const modelCamel = (0, model_parser_1.toCamelCase)(modelInfo.name);
+    const operations = modelInfo.connectorConfig.operations;
+    const listRoutePath = path.join(process.cwd(), apiDir, modelCamel, "route.ts");
+    const detailRoutePath = path.join(process.cwd(), apiDir, modelCamel, "[id]", "route.ts");
+    fs.mkdirSync(path.dirname(listRoutePath), { recursive: true });
+    fs.mkdirSync(path.dirname(detailRoutePath), { recursive: true });
+    const routes = (0, nextjs_generator_1.generateConnectorBFFRoutes)(modelInfo, sharedPackageName, operations);
+    fs.writeFileSync(listRoutePath, routes.listRoute, "utf-8");
+    fs.writeFileSync(detailRoutePath, routes.detailRoute, "utf-8");
+    console.log(`✅ Created: ${listRoutePath}`);
+    console.log(`✅ Created: ${detailRoutePath}`);
+}
+async function collectModelGraph(modelPath, seen = new Map()) {
+    const resolvedPath = path.resolve(modelPath);
+    if (seen.has(resolvedPath)) {
+        return Array.from(seen.values());
+    }
+    const modelInfo = await (0, model_parser_1.parseModelFile)(resolvedPath);
+    seen.set(resolvedPath, modelInfo);
+    for (const ref of modelInfo.nestedSchemaRefs) {
+        const nestedPath = resolveNestedModelPath(resolvedPath, ref.importPath);
+        await collectModelGraph(nestedPath, seen);
+    }
+    return Array.from(seen.values());
+}
+function resolveNestedModelPath(modelPath, importPath) {
+    let resolvedPath = path.resolve(path.dirname(modelPath), importPath);
+    if (!resolvedPath.endsWith(".ts")) {
+        resolvedPath += ".ts";
+    }
+    return resolvedPath;
+}
+function describeFunctionsOutputPath(functionsDir, backendLanguage) {
+    if (backendLanguage === "typescript") {
+        return `${functionsDir}/src/`;
+    }
+    if (backendLanguage === "csharp") {
+        return `${functionsDir}/Crud/`;
+    }
+    return `${functionsDir}/blueprints/`;
+}
+function updatePythonFunctionRegistrations(functionAppPath, registration) {
+    if (!fs.existsSync(functionAppPath)) {
+        throw new Error(`Python Functions entrypoint not found: ${functionAppPath}`);
+    }
+    const content = fs.readFileSync(functionAppPath, "utf-8");
+    // Check if import line already exists (handles init-generated layout)
+    const importLine = registration.split("\n").find((l) => l.startsWith("from ") || l.startsWith("import "));
+    if (importLine && content.includes(importLine)) {
+        return;
+    }
+    if (content.includes(registration)) {
+        return;
+    }
+    const marker = "# SwallowKit scaffold registrations";
+    if (!content.includes(marker)) {
+        throw new Error(`Could not find scaffold registration marker in ${functionAppPath}`);
+    }
+    const updated = content.replace(marker, `${registration}\n${marker}`);
+    fs.writeFileSync(functionAppPath, updated, "utf-8");
 }
 /**
  * Next.js BFF API Routes を生成
  */
 async function generateBFFRoutes(modelInfo, apiDir, sharedPackageName) {
     console.log("\n🔨 Generating Next.js BFF API routes...");
-    const modelKebab = (0, model_parser_1.toKebabCase)(modelInfo.name);
     const modelCamel = modelInfo.name.charAt(0).toLowerCase() + modelInfo.name.slice(1);
     // List route: app/api/[model]/route.ts
     const listRoutePath = path.join(process.cwd(), apiDir, modelCamel, "route.ts");
@@ -240,70 +563,61 @@ async function generateCosmosContainer(modelInfo) {
     // Generate container Bicep file
     const containerFileName = `${modelKebab}-container.bicep`;
     const containerFilePath = path.join(containersDir, containerFileName);
-    const bicepContent = `@description('Cosmos DB account name')
-param cosmosAccountName string
-
-@description('Database name')
-param databaseName string
-
-@description('Container name')
-param containerName string = '${modelPascal}s'
-
-@description('Partition key path')
-param partitionKeyPath string = '/id'
-
-@description('Throughput (RU/s) - only used for Free Tier')
-param throughput int = 400
-
-@description('Cosmos DB mode: freetier or serverless')
-param cosmosDbMode string
-
-// Reference existing Cosmos DB account
-resource cosmosAccount 'Microsoft.DocumentDB/databaseAccounts@2023-11-15' existing = {
-  name: cosmosAccountName
-}
-
-// Reference existing database
-resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-11-15' existing = {
-  parent: cosmosAccount
-  name: databaseName
-}
-
-// Container for ${modelPascal}
-resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-11-15' = {
-  parent: database
-  name: containerName
-  properties: {
-    resource: {
-      id: containerName
-      partitionKey: {
-        paths: [
-          partitionKeyPath
-        ]
-        kind: 'Hash'
-      }
-      indexingPolicy: {
-        automatic: true
-        indexingMode: 'consistent'
-        includedPaths: [
-          {
-            path: '/*'
-          }
-        ]
-        excludedPaths: [
-          {
-            path: '/_etag/?'
-          }
-        ]
-      }
-    }
-    options: cosmosDbMode == 'freetier' ? {
-      throughput: throughput
-    } : {}
-  }
-}
-
-output containerName string = container.name
+    const bicepContent = `@description('Cosmos DB account name')
+param cosmosAccountName string
+
+@description('Database name')
+param databaseName string
+
+@description('Container name')
+param containerName string = '${modelPascal}s'
+
+@description('Partition key path')
+param partitionKeyPath string = '${modelInfo.partitionKey}'
+
+// Reference existing Cosmos DB account
+resource cosmosAccount 'Microsoft.DocumentDB/databaseAccounts@2023-11-15' existing = {
+  name: cosmosAccountName
+}
+
+// Reference existing database
+resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-11-15' existing = {
+  parent: cosmosAccount
+  name: databaseName
+}
+
+// Container for ${modelPascal}
+resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-11-15' = {
+  parent: database
+  name: containerName
+  properties: {
+    resource: {
+      id: containerName
+      partitionKey: {
+        paths: [
+          partitionKeyPath
+        ]
+        kind: 'Hash'
+      }
+      indexingPolicy: {
+        automatic: true
+        indexingMode: 'consistent'
+        includedPaths: [
+          {
+            path: '/*'
+          }
+        ]
+        excludedPaths: [
+          {
+            path: '/_etag/?'
+          }
+        ]
+      }
+    }
+  }
+}
+
+output containerName string = container.name
 `;
     // Write Bicep file (overwrite if exists)
     fs.writeFileSync(containerFilePath, bicepContent, "utf-8");
@@ -323,7 +637,7 @@ async function updateMainBicepWithContainer(modelKebab, modelPascal) {
     }
     let mainBicepContent = fs.readFileSync(mainBicepPath, "utf-8");
     // Check if container module already exists
-    const containerModuleName = `${modelKebab.replace(/-/g, '')}Container`;
+    const containerModuleName = `${modelPascal.charAt(0).toLowerCase()}${modelPascal.slice(1)}Container`;
     if (mainBicepContent.includes(`module ${containerModuleName}`)) {
         console.log(`ℹ️  Container module '${containerModuleName}' already exists in main.bicep`);
         return;
@@ -334,37 +648,32 @@ async function updateMainBicepWithContainer(modelKebab, modelPascal) {
     const cosmosModuleMatch = mainBicepContent.match(cosmosModulePattern);
     if (!cosmosModuleMatch) {
         console.log("⚠️  Could not find Cosmos DB Serverless module in main.bicep. Please manually add the container module:");
-        console.log(`\nmodule ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
-  name: '${modelKebab}-container'
-  params: {
-    cosmosAccountName: cosmosDbMode == 'freetier' ? cosmosDbFreeTier.outputs.accountName : cosmosDbServerless.outputs.accountName
-    databaseName: databaseName
-    cosmosDbMode: cosmosDbMode
-  }
-  dependsOn: [
-    cosmosDbFreeTier
-    cosmosDbServerless
-  ]
+        console.log(`\nmodule ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
+  name: '${modelKebab}-container'
+  params: {
+    cosmosAccountName: cosmosDbMode == 'freetier' ? cosmosDbFreeTier.outputs.accountName : cosmosDbServerless.outputs.accountName
+    databaseName: databaseName
+    cosmosDbMode: cosmosDbMode
+  }
+  dependsOn: [
+    cosmosDbFreeTier
+    cosmosDbServerless
+  ]
 }\n`);
         return;
     }
     // Find the end of the cosmosDbServerless module
     const insertPosition = cosmosModuleMatch.index + cosmosModuleMatch[0].length;
     // Create the container module declaration
-    const containerModule = `
-
-// ${modelPascal} Container
-module ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
-  name: '${modelKebab}-container'
-  params: {
-    cosmosAccountName: cosmosDbMode == 'freetier' ? cosmosDbFreeTier.outputs.accountName : cosmosDbServerless.outputs.accountName
-    databaseName: '$` + `{projectName}Database'
-    cosmosDbMode: cosmosDbMode
-  }
-  dependsOn: [
-    cosmosDbFreeTier
-    cosmosDbServerless
-  ]
+    const containerModule = `
+
+// ${modelPascal} Container
+module ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
+  name: '${modelKebab}-container'
+  params: {
+    cosmosAccountName: cosmosDbMode == 'freetier' ? cosmosDbFreeTier.outputs.accountName : cosmosDbServerless.outputs.accountName
+    databaseName: '\${projectName}Database'
+  }
 }`;
     // Insert the module
     mainBicepContent =
@@ -377,7 +686,7 @@ module ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
 /**
  * Generate UI components (list, detail, form, create, edit pages)
  */
-async function generateUIComponents(modelInfo, sharedPackageName) {
+async function generateUIComponents(modelInfo, sharedPackageName, authOptions) {
     console.log("\n🎨 Generating UI components...");
     const modelKebab = (0, model_parser_1.toKebabCase)(modelInfo.name);
     const modelName = modelInfo.name;
@@ -395,11 +704,11 @@ async function generateUIComponents(modelInfo, sharedPackageName) {
         }
     });
     // Generate and write files
-    const listPage = (0, ui_generator_1.generateListPage)(modelInfo, sharedPackageName);
-    const detailPage = (0, ui_generator_1.generateDetailPage)(modelInfo, sharedPackageName);
+    const listPage = (0, ui_generator_1.generateListPage)(modelInfo, sharedPackageName, authOptions);
+    const detailPage = (0, ui_generator_1.generateDetailPage)(modelInfo, sharedPackageName, authOptions);
     const formComponent = (0, ui_generator_1.generateFormComponent)(modelInfo, sharedPackageName);
-    const newPage = (0, ui_generator_1.generateNewPage)(modelInfo);
-    const editPage = (0, ui_generator_1.generateEditPage)(modelInfo, sharedPackageName);
+    const newPage = (0, ui_generator_1.generateNewPage)(modelInfo, authOptions);
+    const editPage = (0, ui_generator_1.generateEditPage)(modelInfo, sharedPackageName, authOptions);
     fs.writeFileSync(path.join(modelDir, "page.tsx"), listPage, "utf-8");
     fs.writeFileSync(path.join(idDir, "page.tsx"), detailPage, "utf-8");
     fs.writeFileSync(path.join(componentsDir, `${modelName}Form.tsx`), formComponent, "utf-8");
@@ -454,17 +763,17 @@ async function updateNavigationMenu(modelInfo) {
         label: modelInfo.displayName
     });
     // Generate new scaffold-config.ts content
-    const newConfigContent = `export interface ScaffoldModel {
-  name: string;
-  path: string;
-  label: string;
-}
-
-export const scaffoldConfig = {
-  models: [
-${models.map(m => `    { name: '${m.name}', path: '${m.path}', label: '${m.label}' },`).join('\n')}
-  ] as ScaffoldModel[]
-};
+    const newConfigContent = `export interface ScaffoldModel {
+  name: string;
+  path: string;
+  label: string;
+}
+
+export const scaffoldConfig = {
+  models: [
+${models.map(m => `    { name: '${m.name}', path: '${m.path}', label: '${m.label}' },`).join('\n')}
+  ] as ScaffoldModel[]
+};
 `;
     fs.writeFileSync(configPath, newConfigContent, "utf-8");
     console.log(`✅ Added ${modelInfo.name} to navigation menu`);