swallowkit 1.0.0-beta.15 → 1.0.0-beta.17

package/dist/core/scaffold/functions-generator.js

@@ -19,6 +19,9 @@ function generateCompactAzureFunctionsCRUD(model, sharedPackageName, authPolicy)
     const modelCamel = (0, model_parser_1.toCamelCase)(modelName);
     const modelKebab = (0, model_parser_1.toKebabCase)(modelName);
     const schemaName = model.schemaName;
+    const partitionKeyPath = model.partitionKey; // e.g. "/tenantId"
+    const partitionKeyField = partitionKeyPath.slice(1); // e.g. "tenantId"
+    const isIdPartition = partitionKeyField === 'id';
     const hasAuth = !!authPolicy;
     const authImport = hasAuth ? `\n${(0, auth_generator_1.generateAuthImportTS)()}\n` : '';
     const readGuard = hasAuth ? `\n${(0, auth_generator_1.generateAuthGuardTS)(authPolicy, 'read')}\n` : '';
@@ -27,12 +30,36 @@ function generateCompactAzureFunctionsCRUD(model, sharedPackageName, authPolicy)
         ? `      const authErr = handleAuthError(error);
       if (authErr) return authErr;\n`
         : '';
+    // SDK クライアント初期化ヘルパー（PK≠/id の場合、および delete で使用）
+    const sdkClientInit = `const { CosmosClient } = await import('@azure/cosmos');
+      const endpoint = process.env.CosmosDBConnection__accountEndpoint;
+      let client: InstanceType<typeof CosmosClient>;
+      if (endpoint) {
+        const { DefaultAzureCredential } = await import('@azure/identity');
+        client = new CosmosClient({ endpoint, aadCredentials: new DefaultAzureCredential() });
+      } else {
+        client = new CosmosClient(process.env.CosmosDBConnection!);
+      }
+      const database = client.database(process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase');
+      const container = database.container(containerName);`;
+    // getById ハンドラー: PK=/id の場合は input binding、それ以外は SDK
+    const getByIdHandler = isIdPartition
+        ? generateGetByIdWithBinding(modelCamel, schemaName, readGuard, authCatchBlock)
+        : generateGetByIdWithSdk(modelCamel, schemaName, readGuard, authCatchBlock, sdkClientInit);
+    // update ハンドラー: PK=/id の場合は input binding、それ以外は SDK
+    const updateHandler = isIdPartition
+        ? generateUpdateWithBinding(modelCamel, schemaName, writeGuard, authCatchBlock)
+        : generateUpdateWithSdk(modelCamel, schemaName, partitionKeyField, writeGuard, authCatchBlock, sdkClientInit);
+    // delete ハンドラー: 常に SDK（既存パターン）、PK に応じて分岐
+    const deleteHandler = isIdPartition
+        ? generateDeleteIdPartition(modelCamel, writeGuard, authCatchBlock, sdkClientInit)
+        : generateDeleteCustomPartition(modelCamel, partitionKeyField, writeGuard, authCatchBlock, sdkClientInit);
     return `import { app, HttpRequest, HttpResponseInit, InvocationContext } from '@azure/functions';
 import { z } from 'zod/v4';
 import crypto from 'crypto';
 import { ${schemaName} } from '${sharedPackageName}';${authImport}
 
-const containerName = '${modelName}s';
+const containerName = '${modelName.endsWith('s') ? modelName : modelName + 's'}';
 
 // GET /api/${modelCamel} - 全件取得
 app.http('${modelCamel}-get-all', {
@@ -68,38 +95,7 @@ ${authCatchBlock}      context.error(\`Error fetching from \${containerName}:\`,
   },
 });
 
-// GET /api/${modelCamel}/{id} - ID指定取得
-app.http('${modelCamel}-get-by-id', {
-  methods: ['GET'],
-  route: '${modelCamel}/{id}',
-  authLevel: 'anonymous',
-  extraInputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosInput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-      id: '{id}',
-      partitionKey: '{id}',
-    },
-  ],
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {${readGuard}
-      const document = context.extraInputs.get('cosmosInput');
-
-      if (!document) {
-        return { status: 404, jsonBody: { error: 'Item not found' } };
-      }
-
-      const validated = ${schemaName}.parse(document);
-      return { status: 200, jsonBody: validated };
-    } catch (error) {
-${authCatchBlock}      context.error(\`Error fetching item from \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to fetch item' } };
-    }
-  },
-});
+${getByIdHandler}
 
 // POST /api/${modelCamel} - 新規作成
 app.http('${modelCamel}-create', {
@@ -145,7 +141,82 @@ ${authCatchBlock}      context.error(\`Error creating item in \${containerName}:
   },
 });
 
-// PUT /api/${modelCamel}/{id} - 更新
+${updateHandler}
+
+${deleteHandler}
+`;
+}
+// --- TS getById ハンドラー生成ヘルパー ---
+function generateGetByIdWithBinding(modelCamel, schemaName, readGuard, authCatchBlock) {
+    return `// GET /api/${modelCamel}/{id} - ID指定取得
+app.http('${modelCamel}-get-by-id', {
+  methods: ['GET'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  extraInputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosInput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+      id: '{id}',
+      partitionKey: '{id}',
+    },
+  ],
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {${readGuard}
+      const document = context.extraInputs.get('cosmosInput');
+
+      if (!document) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const validated = ${schemaName}.parse(document);
+      return { status: 200, jsonBody: validated };
+    } catch (error) {
+${authCatchBlock}      context.error(\`Error fetching item from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to fetch item' } };
+    }
+  },
+});`;
+}
+function generateGetByIdWithSdk(modelCamel, schemaName, readGuard, authCatchBlock, sdkClientInit) {
+    return `// GET /api/${modelCamel}/{id} - ID指定取得 (custom partition key)
+app.http('${modelCamel}-get-by-id', {
+  methods: ['GET'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {${readGuard}
+      const id = request.params.id;
+      if (!id) {
+        return { status: 400, jsonBody: { error: 'ID is required' } };
+      }
+
+      ${sdkClientInit}
+
+      const { resources } = await container.items.query({
+        query: 'SELECT * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: id }],
+      }).fetchAll();
+
+      if (!resources || resources.length === 0) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const validated = ${schemaName}.parse(resources[0]);
+      return { status: 200, jsonBody: validated };
+    } catch (error) {
+${authCatchBlock}      context.error(\`Error fetching item from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to fetch item' } };
+    }
+  },
+});`;
+}
+// --- TS update ハンドラー生成ヘルパー ---
+function generateUpdateWithBinding(modelCamel, schemaName, writeGuard, authCatchBlock) {
+    return `// PUT /api/${modelCamel}/{id} - 更新
 app.http('${modelCamel}-update', {
   methods: ['PUT'],
   route: '${modelCamel}/{id}',
@@ -206,9 +277,63 @@ ${authCatchBlock}      context.error(\`Error updating item in \${containerName}:
       return { status: 500, jsonBody: { error: 'Failed to update item' } };
     }
   },
-});
+});`;
+}
+function generateUpdateWithSdk(modelCamel, schemaName, partitionKeyField, writeGuard, authCatchBlock, sdkClientInit) {
+    return `// PUT /api/${modelCamel}/{id} - 更新 (custom partition key)
+app.http('${modelCamel}-update', {
+  methods: ['PUT'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {${writeGuard}
+      const id = request.params.id;
+      if (!id) {
+        return { status: 400, jsonBody: { error: 'ID is required' } };
+      }
+
+      ${sdkClientInit}
+
+      const { resources } = await container.items.query({
+        query: 'SELECT * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: id }],
+      }).fetchAll();
+
+      if (!resources || resources.length === 0) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const existingDocument = resources[0];
+      const body = await request.json() as any;
+      const { createdAt, updatedAt, ...userData } = body;
+
+      const dataWithManagedFields = {
+        ...userData,
+        id,
+        createdAt: existingDocument.createdAt,
+        updatedAt: new Date().toISOString(),
+      };
+
+      const result = ${schemaName}.safeParse(dataWithManagedFields);
+
+      if (!result.success) {
+        context.error('Validation failed:', result.error.issues);
+        return { status: 400, jsonBody: { error: 'Validation failed', details: result.error.issues } };
+      }
 
-// DELETE /api/${modelCamel}/{id} - 削除
+      const pkValue = result.data.${partitionKeyField};
+      await container.items.upsert(result.data);
+      return { status: 200, jsonBody: result.data };
+    } catch (error) {
+${authCatchBlock}      context.error(\`Error updating item in \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to update item' } };
+    }
+  },
+});`;
+}
+// --- TS delete ハンドラー生成ヘルパー ---
+function generateDeleteIdPartition(modelCamel, writeGuard, authCatchBlock, sdkClientInit) {
+    return `// DELETE /api/${modelCamel}/{id} - 削除
 app.http('${modelCamel}-delete', {
   methods: ['DELETE'],
   route: '${modelCamel}/{id}',
@@ -220,17 +345,7 @@ app.http('${modelCamel}-delete', {
         return { status: 400, jsonBody: { error: 'ID is required' } };
       }
 
-      const { CosmosClient } = await import('@azure/cosmos');
-      const endpoint = process.env.CosmosDBConnection__accountEndpoint;
-      let client: InstanceType<typeof CosmosClient>;
-      if (endpoint) {
-        const { DefaultAzureCredential } = await import('@azure/identity');
-        client = new CosmosClient({ endpoint, aadCredentials: new DefaultAzureCredential() });
-      } else {
-        client = new CosmosClient(process.env.CosmosDBConnection!);
-      }
-      const database = client.database(process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase');
-      const container = database.container(containerName);
+      ${sdkClientInit}
 
       await container.item(id, id).delete();
       context.log(\`Deleted item \${id} from \${containerName}\`);
@@ -244,14 +359,119 @@ ${authCatchBlock}      context.error(\`Error deleting item from \${containerName
       return { status: 500, jsonBody: { error: 'Failed to delete item' } };
     }
   },
-});
-`;
+});`;
+}
+function generateDeleteCustomPartition(modelCamel, partitionKeyField, writeGuard, authCatchBlock, sdkClientInit) {
+    return `// DELETE /api/${modelCamel}/{id} - 削除 (custom partition key)
+app.http('${modelCamel}-delete', {
+  methods: ['DELETE'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {${writeGuard}
+      const id = request.params.id;
+      if (!id) {
+        return { status: 400, jsonBody: { error: 'ID is required' } };
+      }
+
+      ${sdkClientInit}
+
+      // パーティションキー値を取得するためにドキュメントを読み取り
+      const { resources } = await container.items.query({
+        query: 'SELECT * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: id }],
+      }).fetchAll();
+
+      if (!resources || resources.length === 0) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const pkValue = resources[0].${partitionKeyField};
+      await container.item(id, pkValue).delete();
+      context.log(\`Deleted item \${id} from \${containerName}\`);
+
+      return { status: 204 };
+    } catch (error: any) {
+      if (error.code === 404) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+${authCatchBlock}      context.error(\`Error deleting item from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to delete item' } };
+    }
+  },
+});`;
 }
-function generateCSharpAzureFunctionsCRUD(model) {
+function generateCSharpAzureFunctionsCRUD(model, authPolicy) {
     const modelName = model.name;
     const modelCamel = (0, model_parser_1.toCamelCase)(modelName);
     const className = `${modelName}Functions`;
-    const containerName = `${modelName}s`;
+    const containerName = modelName.endsWith('s') ? modelName : `${modelName}s`;
+    const partitionKeyPath = model.partitionKey;
+    const partitionKeyField = partitionKeyPath.slice(1);
+    const isIdPartition = partitionKeyField === 'id';
+    const hasAuth = !!authPolicy;
+    const authUsing = hasAuth ? 'using Functions.Auth;\n' : '';
+    const readGuard = hasAuth ? `\n${(0, auth_generator_1.generateAuthGuardCSharp)(authPolicy, 'read')}\n` : '';
+    const writeGuard = hasAuth ? `\n${(0, auth_generator_1.generateAuthGuardCSharp)(authPolicy, 'write')}\n` : '';
+    // PK値の取得ロジック（create 用）
+    const createPkExpr = isIdPartition
+        ? 'id'
+        : `payload["${partitionKeyField}"]?.GetValue<string>() ?? throw new InvalidOperationException("Partition key field '${partitionKeyField}' is required.")`;
+    // ReadCosmosItemAsync: PK=/id の場合は直接読み取り、それ以外はクエリ
+    const readItemMethod = isIdPartition
+        ? `    private static async Task<JsonObject> ReadCosmosItemAsync(Container container, string id)
+    {
+        var response = await container.ReadItemStreamAsync(id, new PartitionKey(id));
+        if (response.StatusCode == HttpStatusCode.NotFound)
+        {
+            throw new CosmosException("Item not found", HttpStatusCode.NotFound, 0, response.Headers.ActivityId, response.Headers.RequestCharge);
+        }
+
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new InvalidOperationException($"Cosmos read failed with status {(int)response.StatusCode}.");
+        }
+
+        using var document = await JsonDocument.ParseAsync(response.Content);
+        return JsonNode.Parse(document.RootElement.GetRawText())?.AsObject()
+            ?? throw new JsonException("Cosmos item payload must be a JSON object.");
+    }`
+        : `    private static async Task<JsonObject> ReadCosmosItemAsync(Container container, string id)
+    {
+        var query = new QueryDefinition("SELECT * FROM c WHERE c.id = @id")
+            .WithParameter("@id", id);
+        using var iterator = container.GetItemQueryStreamIterator(query);
+
+        while (iterator.HasMoreResults)
+        {
+            var page = await iterator.ReadNextAsync();
+            if (!page.IsSuccessStatusCode)
+            {
+                throw new InvalidOperationException($"Cosmos query failed with status {(int)page.StatusCode}.");
+            }
+
+            using var document = await JsonDocument.ParseAsync(page.Content);
+            if (document.RootElement.TryGetProperty("Documents", out var documents))
+            {
+                foreach (var item in documents.EnumerateArray())
+                {
+                    return JsonNode.Parse(item.GetRawText())?.AsObject()
+                        ?? throw new JsonException("Cosmos item payload must be a JSON object.");
+                }
+            }
+        }
+
+        throw new CosmosException("Item not found", HttpStatusCode.NotFound, 0, "", 0);
+    }`;
+    // Replace / Delete の PK 解決ロジック
+    const replacePkExpr = isIdPartition
+        ? 'new PartitionKey(id)'
+        : `new PartitionKey(payload["${partitionKeyField}"]?.GetValue<string>())`;
+    const deleteLogic = isIdPartition
+        ? `            await container.DeleteItemAsync<JsonObject>(id, new PartitionKey(id));`
+        : `            var existing = await ReadCosmosItemAsync(container, id);
+            var pkValue = existing["${partitionKeyField}"]?.GetValue<string>();
+            await container.DeleteItemAsync<JsonObject>(id, new PartitionKey(pkValue));`;
     return `using System.Net;
 using System.Text;
 using System.Text.Json;
@@ -261,7 +481,7 @@ using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
-
+${authUsing}
 namespace SwallowKit.Functions;
 
 public sealed class ${className}
@@ -344,23 +564,7 @@ public sealed class ${className}
     private static Stream CreateJsonStream(JsonObject payload) =>
         new MemoryStream(Encoding.UTF8.GetBytes(payload.ToJsonString()));
 
-    private static async Task<JsonObject> ReadCosmosItemAsync(Container container, string id)
-    {
-        var response = await container.ReadItemStreamAsync(id, new PartitionKey(id));
-        if (response.StatusCode == HttpStatusCode.NotFound)
-        {
-            throw new CosmosException("Item not found", HttpStatusCode.NotFound, 0, response.Headers.ActivityId, response.Headers.RequestCharge);
-        }
-
-        if (!response.IsSuccessStatusCode)
-        {
-            throw new InvalidOperationException($"Cosmos read failed with status {(int)response.StatusCode}.");
-        }
-
-        using var document = await JsonDocument.ParseAsync(response.Content);
-        return JsonNode.Parse(document.RootElement.GetRawText())?.AsObject()
-            ?? throw new JsonException("Cosmos item payload must be a JSON object.");
-    }
+${readItemMethod}
 
     private static async Task<HttpResponseData> WriteJsonAsync(HttpRequestData request, HttpStatusCode status, object payload)
     {
@@ -374,7 +578,7 @@ public sealed class ${className}
         [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "${modelCamel}")] HttpRequestData request)
     {
         try
-        {
+        {${readGuard}
             using var client = CreateCosmosClient();
             var container = GetContainer(client);
             using var iterator = container.GetItemQueryStreamIterator("SELECT * FROM c");
@@ -416,7 +620,7 @@ public sealed class ${className}
         string id)
     {
         try
-        {
+        {${readGuard}
             using var client = CreateCosmosClient();
             var container = GetContainer(client);
             var item = await ReadCosmosItemAsync(container, id);
@@ -438,7 +642,7 @@ public sealed class ${className}
         [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "${modelCamel}")] HttpRequestData request)
     {
         try
-        {
+        {${writeGuard}
             var body = await ReadRequestBodyAsync(request);
             var now = DateTimeOffset.UtcNow.ToString("O");
             var id = body["id"]?.GetValue<string>() ?? Guid.NewGuid().ToString();
@@ -447,7 +651,8 @@ public sealed class ${className}
             using var client = CreateCosmosClient();
             var container = GetContainer(client);
             using var stream = CreateJsonStream(payload);
-            var response = await container.CreateItemStreamAsync(stream, new PartitionKey(id));
+            var pkValue = ${createPkExpr};
+            var response = await container.CreateItemStreamAsync(stream, new PartitionKey(pkValue));
             if (!response.IsSuccessStatusCode)
             {
                 throw new InvalidOperationException($"Cosmos create failed with status {(int)response.StatusCode}.");
@@ -473,7 +678,7 @@ public sealed class ${className}
         string id)
     {
         try
-        {
+        {${writeGuard}
             using var client = CreateCosmosClient();
             var container = GetContainer(client);
 
@@ -492,7 +697,7 @@ public sealed class ${className}
             var payload = BuildManagedDocument(body, id, createdAt, DateTimeOffset.UtcNow.ToString("O"));
 
             using var stream = CreateJsonStream(payload);
-            var response = await container.ReplaceItemStreamAsync(stream, id, new PartitionKey(id));
+            var response = await container.ReplaceItemStreamAsync(stream, id, ${replacePkExpr});
             if (!response.IsSuccessStatusCode)
             {
                 throw new InvalidOperationException($"Cosmos replace failed with status {(int)response.StatusCode}.");
@@ -518,10 +723,10 @@ public sealed class ${className}
         string id)
     {
         try
-        {
+        {${writeGuard}
             using var client = CreateCosmosClient();
             var container = GetContainer(client);
-            await container.DeleteItemAsync<JsonObject>(id, new PartitionKey(id));
+${deleteLogic}
 
             return request.CreateResponse(HttpStatusCode.NoContent);
         }
@@ -538,11 +743,88 @@ public sealed class ${className}
 }
 `;
 }
-function generatePythonAzureFunctionsCRUD(model) {
+function generatePythonAzureFunctionsCRUD(model, authPolicy) {
     const modelName = model.name;
     const modelCamel = (0, model_parser_1.toCamelCase)(modelName);
     const modelSnake = (0, model_parser_1.toKebabCase)(modelName).replace(/-/g, "_");
-    const containerName = `${modelName}s`;
+    const containerName = modelName.endsWith('s') ? modelName : `${modelName}s`;
+    const partitionKeyPath = model.partitionKey;
+    const partitionKeyField = partitionKeyPath.slice(1);
+    const isIdPartition = partitionKeyField === 'id';
+    const hasAuth = !!authPolicy;
+    const authImport = hasAuth ? '\nfrom auth.jwt_helper import require_auth, require_roles, handle_auth_error\n' : '';
+    // generateAuthGuardPython outputs at 4-space indent; inside try: we need 8-space
+    const readGuardRaw = hasAuth ? (0, auth_generator_1.generateAuthGuardPython)(authPolicy, 'read') : '';
+    const writeGuardRaw = hasAuth ? (0, auth_generator_1.generateAuthGuardPython)(authPolicy, 'write') : '';
+    const readGuard = hasAuth ? '\n' + readGuardRaw.split('\n').map(l => '    ' + l).join('\n') : '';
+    const writeGuard = hasAuth ? '\n' + writeGuardRaw.split('\n').map(l => '    ' + l).join('\n') : '';
+    const authCatch = hasAuth ? `\n        auth_err = handle_auth_error(exc)\n        if auth_err:\n            return auth_err` : '';
+    // getById / update の読み取りロジック
+    const getByIdRead = isIdPartition
+        ? `container.read_item(item=item_id, partition_key=item_id)`
+        : `list(container.query_items(
+            query="SELECT * FROM c WHERE c.id = @id",
+            parameters=[{"name": "@id", "value": item_id}],
+            enable_cross_partition_query=True,
+        ))`;
+    const getByIdBody = isIdPartition
+        ? `        container = _get_container()
+        item = container.read_item(item=item_id, partition_key=item_id)
+        return _json_response(item, 200)`
+        : `        container = _get_container()
+        items = list(container.query_items(
+            query="SELECT * FROM c WHERE c.id = @id",
+            parameters=[{"name": "@id", "value": item_id}],
+            enable_cross_partition_query=True,
+        ))
+        if not items:
+            return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
+        return _json_response(items[0], 200)`;
+    const updateBody = isIdPartition
+        ? `        container = _get_container()
+        existing = container.read_item(item=item_id, partition_key=item_id)
+        body = req.get_json()
+        payload = _build_managed_document(
+            body,
+            item_id,
+            existing.get("createdAt") or datetime.now(timezone.utc).isoformat(),
+            datetime.now(timezone.utc).isoformat(),
+        )
+        container.replace_item(item=item_id, body=payload)
+        return _json_response(payload, 200)`
+        : `        container = _get_container()
+        items = list(container.query_items(
+            query="SELECT * FROM c WHERE c.id = @id",
+            parameters=[{"name": "@id", "value": item_id}],
+            enable_cross_partition_query=True,
+        ))
+        if not items:
+            return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
+        existing = items[0]
+        body = req.get_json()
+        payload = _build_managed_document(
+            body,
+            item_id,
+            existing.get("createdAt") or datetime.now(timezone.utc).isoformat(),
+            datetime.now(timezone.utc).isoformat(),
+        )
+        container.replace_item(item=existing, body=payload)
+        return _json_response(payload, 200)`;
+    const deleteBody = isIdPartition
+        ? `        container = _get_container()
+        container.delete_item(item=item_id, partition_key=item_id)
+        return func.HttpResponse(status_code=204)`
+        : `        container = _get_container()
+        items = list(container.query_items(
+            query="SELECT * FROM c WHERE c.id = @id",
+            parameters=[{"name": "@id", "value": item_id}],
+            enable_cross_partition_query=True,
+        ))
+        if not items:
+            return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
+        pk_value = items[0].get("${partitionKeyField}")
+        container.delete_item(item=item_id, partition_key=pk_value)
+        return func.HttpResponse(status_code=204)`;
     return {
         registration: `from blueprints.${modelSnake} import bp as ${modelSnake}_bp\napp.register_blueprint(${modelSnake}_bp)`,
         blueprint: `import json
@@ -554,7 +836,7 @@ import os
 import azure.functions as func
 from azure.cosmos import CosmosClient, exceptions
 from azure.identity import DefaultAzureCredential
-
+${authImport}
 bp = func.Blueprint()
 CONTAINER_NAME = "${containerName}"
 DATABASE_NAME = os.environ.get("COSMOS_DB_DATABASE_NAME", "AppDatabase")
@@ -596,7 +878,7 @@ def _build_managed_document(source: dict[str, Any], item_id: str, created_at: st
 
 @bp.route(route="${modelCamel}", methods=["GET"])
 def ${modelSnake}_get_all(req: func.HttpRequest) -> func.HttpResponse:
-    try:
+    try:${readGuard}
         container = _get_container()
         items = list(
             container.query_items(
@@ -605,26 +887,24 @@ def ${modelSnake}_get_all(req: func.HttpRequest) -> func.HttpResponse:
             )
         )
         return _json_response(items, 200)
-    except Exception as exc:
+    except Exception as exc:${authCatch}
         return _json_response({"error": "Failed to fetch items", "details": str(exc)}, 500)
 
 
 @bp.route(route="${modelCamel}/{id}", methods=["GET"])
 def ${modelSnake}_get_by_id(req: func.HttpRequest) -> func.HttpResponse:
     item_id = req.route_params.get("id")
-    try:
-        container = _get_container()
-        item = container.read_item(item=item_id, partition_key=item_id)
-        return _json_response(item, 200)
+    try:${readGuard}
+${getByIdBody}
     except exceptions.CosmosResourceNotFoundError:
         return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
-    except Exception as exc:
+    except Exception as exc:${authCatch}
         return _json_response({"error": "Failed to fetch item", "id": item_id, "details": str(exc)}, 500)
 
 
 @bp.route(route="${modelCamel}", methods=["POST"])
 def ${modelSnake}_create(req: func.HttpRequest) -> func.HttpResponse:
-    try:
+    try:${writeGuard}
         body = req.get_json()
         now = datetime.now(timezone.utc).isoformat()
         item_id = body.get("id") or str(uuid4())
@@ -635,43 +915,31 @@ def ${modelSnake}_create(req: func.HttpRequest) -> func.HttpResponse:
         return _json_response(payload, 201)
     except ValueError:
         return _json_response({"error": "Request body must be a JSON object."}, 400)
-    except Exception as exc:
+    except Exception as exc:${authCatch}
         return _json_response({"error": "Failed to create item", "details": str(exc)}, 500)
 
 
 @bp.route(route="${modelCamel}/{id}", methods=["PUT"])
 def ${modelSnake}_update(req: func.HttpRequest) -> func.HttpResponse:
     item_id = req.route_params.get("id")
-    try:
-        container = _get_container()
-        existing = container.read_item(item=item_id, partition_key=item_id)
-        body = req.get_json()
-        payload = _build_managed_document(
-            body,
-            item_id,
-            existing.get("createdAt") or datetime.now(timezone.utc).isoformat(),
-            datetime.now(timezone.utc).isoformat(),
-        )
-        container.replace_item(item=item_id, body=payload)
-        return _json_response(payload, 200)
+    try:${writeGuard}
+${updateBody}
     except exceptions.CosmosResourceNotFoundError:
         return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
     except ValueError:
         return _json_response({"error": "Request body must be a JSON object.", "id": item_id}, 400)
-    except Exception as exc:
+    except Exception as exc:${authCatch}
         return _json_response({"error": "Failed to update item", "id": item_id, "details": str(exc)}, 500)
 
 
 @bp.route(route="${modelCamel}/{id}", methods=["DELETE"])
 def ${modelSnake}_delete(req: func.HttpRequest) -> func.HttpResponse:
     item_id = req.route_params.get("id")
-    try:
-        container = _get_container()
-        container.delete_item(item=item_id, partition_key=item_id)
-        return func.HttpResponse(status_code=204)
+    try:${writeGuard}
+${deleteBody}
     except exceptions.CosmosResourceNotFoundError:
         return _json_response({"error": "${modelName} not found", "id": item_id}, 404)
-    except Exception as exc:
+    except Exception as exc:${authCatch}
         return _json_response({"error": "Failed to delete item", "id": item_id, "details": str(exc)}, 500)
 `,
     };