swallowkit 1.0.0-beta.16 → 1.0.0-beta.18

package/src/__tests__/fixtures.ts

@@ -21,6 +21,7 @@ export function createBasicModelInfo(overrides?: Partial<ModelInfo>): ModelInfo
     hasCreatedAt: true,
     hasUpdatedAt: true,
     nestedSchemaRefs: [],
+    partitionKey: '/id',
     ...overrides,
   };
 }

package/src/__tests__/functions-generator.test.ts

@@ -98,4 +98,140 @@ describe("generateCompactAzureFunctionsCRUD", () => {
     expect(generated.blueprint).toContain("container.replace_item");
     expect(generated.blueprint).toContain("container.delete_item");
   });
+
+  // --- Custom Partition Key Tests ---
+
+  describe("custom partition key (TS)", () => {
+    it("uses input binding when partitionKey is /id (default)", () => {
+      const model = createBasicModelInfo({ partitionKey: "/id" });
+      const code = generateCompactAzureFunctionsCRUD(model, "@myapp/shared");
+      expect(code).toContain("partitionKey: '{id}'");
+      expect(code).toContain("container.item(id, id).delete()");
+    });
+
+    it("uses SDK direct call when partitionKey is not /id", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const code = generateCompactAzureFunctionsCRUD(model, "@myapp/shared");
+
+      // Should NOT have input binding with partitionKey
+      expect(code).not.toContain("partitionKey: '{id}'");
+      // getById should use SDK query
+      expect(code).toContain("custom partition key");
+      expect(code).toContain("SELECT * FROM c WHERE c.id = @id");
+      // delete should read doc first to get PK value
+      expect(code).toContain("resources[0].tenantId");
+      expect(code).toContain("container.item(id, pkValue).delete()");
+    });
+
+    it("generates snapshot for custom partition key TS", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const code = generateCompactAzureFunctionsCRUD(model, "@myapp/shared");
+      expect(code).toMatchSnapshot();
+    });
+  });
+
+  describe("custom partition key (C#)", () => {
+    it("uses ReadItemStreamAsync when partitionKey is /id", () => {
+      const model = createBasicModelInfo({ partitionKey: "/id" });
+      const code = generateCSharpAzureFunctionsCRUD(model);
+      expect(code).toContain("ReadItemStreamAsync(id, new PartitionKey(id))");
+      expect(code).toContain("DeleteItemAsync<JsonObject>(id, new PartitionKey(id))");
+    });
+
+    it("uses query when partitionKey is not /id", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const code = generateCSharpAzureFunctionsCRUD(model);
+      // ReadCosmosItemAsync should use query instead of point read
+      expect(code).toContain("GetItemQueryStreamIterator(query)");
+      expect(code).not.toContain("ReadItemStreamAsync(id, new PartitionKey(id))");
+      // Delete should read doc first for PK value
+      expect(code).toContain('existing["tenantId"]');
+    });
+
+    it("generates snapshot for custom partition key C#", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const code = generateCSharpAzureFunctionsCRUD(model);
+      expect(code).toMatchSnapshot();
+    });
+  });
+
+  describe("custom partition key (Python)", () => {
+    it("uses read_item with partition_key=item_id when partitionKey is /id", () => {
+      const model = createBasicModelInfo({ partitionKey: "/id" });
+      const generated = generatePythonAzureFunctionsCRUD(model);
+      expect(generated.blueprint).toContain("partition_key=item_id");
+    });
+
+    it("uses cross-partition query when partitionKey is not /id", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const generated = generatePythonAzureFunctionsCRUD(model);
+      // Should not use direct read_item with partition_key=item_id
+      expect(generated.blueprint).not.toContain("partition_key=item_id");
+      // Should use cross-partition query
+      expect(generated.blueprint).toContain("enable_cross_partition_query=True");
+      expect(generated.blueprint).toContain('SELECT * FROM c WHERE c.id = @id');
+      // Delete should get PK value from document
+      expect(generated.blueprint).toContain('.get("tenantId")');
+    });
+
+    it("generates snapshot for custom partition key Python", () => {
+      const model = createBasicModelInfo({
+        partitionKey: "/tenantId",
+        fields: [
+          { name: "id", type: "string", isOptional: false, isArray: false },
+          { name: "tenantId", type: "string", isOptional: false, isArray: false },
+          { name: "title", type: "string", isOptional: false, isArray: false },
+          { name: "createdAt", type: "string", isOptional: false, isArray: false },
+          { name: "updatedAt", type: "string", isOptional: false, isArray: false },
+        ],
+      });
+      const generated = generatePythonAzureFunctionsCRUD(model);
+      expect(generated.blueprint).toMatchSnapshot();
+    });
+  });
 });

package/src/__tests__/model-parser.test.ts

@@ -0,0 +1,72 @@
+import { parsePartitionKey } from "../core/scaffold/model-parser";
+
+describe("parsePartitionKey", () => {
+  it("returns default '/id' when no partitionKey export exists", () => {
+    const content = `
+import { z } from 'zod/v4';
+
+export const Todo = z.object({
+  id: z.string(),
+  title: z.string(),
+});
+export type Todo = z.infer<typeof Todo>;
+`;
+    expect(parsePartitionKey(content)).toBe("/id");
+  });
+
+  it("extracts explicit partitionKey with single quotes", () => {
+    const content = `
+import { z } from 'zod/v4';
+
+export const Order = z.object({
+  id: z.string(),
+  tenantId: z.string(),
+  items: z.array(z.string()),
+});
+export type Order = z.infer<typeof Order>;
+export const partitionKey = '/tenantId';
+`;
+    expect(parsePartitionKey(content)).toBe("/tenantId");
+  });
+
+  it("extracts explicit partitionKey with double quotes", () => {
+    const content = `
+export const User = z.object({ id: z.string(), email: z.string() });
+export const partitionKey = "/email";
+`;
+    expect(parsePartitionKey(content)).toBe("/email");
+  });
+
+  it("extracts /id as explicit partitionKey", () => {
+    const content = `
+export const Todo = z.object({ id: z.string() });
+export const partitionKey = '/id';
+`;
+    expect(parsePartitionKey(content)).toBe("/id");
+  });
+
+  it("handles nested/hierarchical partition key paths", () => {
+    const content = `
+export const partitionKey = '/address/city';
+`;
+    expect(parsePartitionKey(content)).toBe("/address/city");
+  });
+
+  it("ignores commented-out partitionKey", () => {
+    const content = `
+// export const partitionKey = '/tenantId';
+export const Todo = z.object({ id: z.string() });
+`;
+    // The regex matches inside comments too — this is acceptable since
+    // the pattern follows the same approach as parseConnectorConfig/parseAuthPolicy
+    // In practice, commented-out exports are rare in model files
+    expect(parsePartitionKey(content)).toBe("/tenantId");
+  });
+
+  it("handles extra spaces around equals sign", () => {
+    const content = `
+export const partitionKey   =   '/customerId';
+`;
+    expect(parsePartitionKey(content)).toBe("/customerId");
+  });
+});

package/src/cli/commands/dev-seeds.ts

@@ -135,7 +135,7 @@ export async function applyDevSeedEnvironment({
   console.log(`🧪 Applying Cosmos DB seed data for environment "${environment}"...`);
 
   for (const seedFile of seedFiles) {
-    await recreateContainer(database, seedFile.containerName);
+    await recreateContainer(database, seedFile.containerName, seedFile.model.partitionKey);
     const container = database.container(seedFile.containerName);
 
     for (const document of seedFile.documents) {
@@ -326,7 +326,7 @@ function validateSeedDocuments(documents: SeedDocument[], filePath: string): voi
   });
 }
 
-async function recreateContainer(database: Database, containerName: string): Promise<void> {
+async function recreateContainer(database: Database, containerName: string, partitionKeyPath: string = '/id'): Promise<void> {
   try {
     await database.container(containerName).delete();
   } catch (error: any) {
@@ -339,7 +339,7 @@ async function recreateContainer(database: Database, containerName: string): Pro
     await database.containers.createIfNotExists({
       id: containerName,
       partitionKey: {
-        paths: ["/id"],
+        paths: [partitionKeyPath],
         kind: PartitionKeyKind.Hash,
         version: 2,
       },
@@ -351,7 +351,7 @@ async function recreateContainer(database: Database, containerName: string): Pro
     await database.containers.createIfNotExists({
       id: containerName,
       partitionKey: {
-        paths: ["/id"],
+        paths: [partitionKeyPath],
       },
     });
   }

package/src/cli/commands/dev.ts

@@ -395,11 +395,11 @@ async function initializeCosmosDB(databaseName: string): Promise<CosmosInitializ
       let containerCreated = false;
       
       try {
-        console.log(`🔧 Creating container "${containerName}" with partition key /id...`);
+        console.log(`🔧 Creating container "${containerName}" with partition key ${model.partitionKey}...`);
         const containerResponse = await database.containers.createIfNotExists({
           id: containerName,
           partitionKey: {
-            paths: ['/id'],
+            paths: [model.partitionKey],
             kind: PartitionKeyKind.Hash,
             version: 2
           }
@@ -418,7 +418,7 @@ async function initializeCosmosDB(databaseName: string): Promise<CosmosInitializ
           const containerResponse = await database.containers.createIfNotExists({
             id: containerName,
             partitionKey: {
-              paths: ['/id']
+              paths: [model.partitionKey]
             }
           });
           console.log(`✅ Container "${containerName}" ready (status: ${containerResponse.statusCode})`);
@@ -652,6 +652,18 @@ async function startDevEnvironment(options: DevOptions) {
         }
       }
 
+      // Build TypeScript functions after shared package (functions import from shared)
+      if (backendLanguage === 'typescript') {
+        const functionsPkgPath = path.join(functionsDir, 'package.json');
+        if (fs.existsSync(functionsPkgPath)) {
+          const functionsPkg = JSON.parse(fs.readFileSync(functionsPkgPath, 'utf-8'));
+          if (functionsPkg.scripts?.build) {
+            console.log('📦 Building TypeScript Azure Functions...');
+            await runCommand(pm, ['run', 'build'], functionsDir, `${pm} run build`);
+          }
+        }
+      }
+
       // Azure Functions を起動
       const funcProcess = spawn('func', buildFunctionsStartArgs(functionsPort), {
         cwd: functionsDir,

package/src/cli/commands/init.ts

@@ -1781,7 +1781,7 @@ app.http('{model}-get-all', {
 | UI page directory | \`app/{kebab-case}/\` | \`app/todo/page.tsx\` |
 | React component | PascalCase | \`TodoForm.tsx\` |
 | Cosmos DB container | PascalCase + 's' | \`Todos\` |
-| Cosmos DB partition key | \`/id\` | Always \`/id\` |
+| Cosmos DB partition key | \`/id\` (default) | Custom: \`export const partitionKey = '/field'\` |
 | Bicep container file | \`infra/containers/{kebab-case}-container.bicep\` | \`infra/containers/todo-container.bicep\` |
 
 ## Adding New Models (SwallowKit CLI Skills)
@@ -1842,7 +1842,7 @@ Deploys Bicep infrastructure: Static Web Apps, Functions, Cosmos DB, Storage, Ma
 - **Do not** manually duplicate model definitions across layers. Use the shared package.
 - **Do not** manually create CRUD boilerplate. Use \`swallowkit scaffold\`.
 - **Do not** hardcode Cosmos DB connection strings. Use Managed Identity (\`CosmosDBConnection__accountEndpoint\`) in production and emulator settings locally.
-- **Do not** change the partition key strategy. All containers use \`/id\` as the partition key.
+- By default, all containers use \`/id\` as the partition key. To use a custom partition key, add \`export const partitionKey = '/yourField'\` to the model file. The scaffold command will apply it across all layers.
 
 ## Technology Stack
 
@@ -1920,7 +1920,7 @@ Frontend (Next.js App Router) → BFF (Next.js API Routes) → Backend (Azure Fu
 
 - Schema/type: PascalCase, same name for both (\`export const Todo = z.object({...}); export type Todo = z.infer<typeof Todo>;\`)
 - Files: kebab-case (\`shared/models/todo.ts\`, backend handlers under \`functions/\`)
-- Cosmos DB containers: PascalCase + 's' (\`Todos\`), partition key always \`/id\`
+- Cosmos DB containers: PascalCase + 's' (\`Todos\`), partition key default \`/id\` (customizable via \`export const partitionKey\`)
 
 ## Managed Fields
 
@@ -2017,7 +2017,7 @@ Files in \`functions/\` contain all business logic and data access for this appl
 - For TypeScript backends, use Cosmos DB **input/output bindings** (\`extraInputs\`/\`extraOutputs\`) for reads and writes.
 - For C#/Python backends, consume the generated OpenAPI-derived assets in \`functions/generated/\`.
 - Auto-generate \`id\` (UUID), \`createdAt\`, and \`updatedAt\` on the backend. Never trust client-sent values.
-- Container names are PascalCase + 's' (e.g., \`Todos\`). Partition key is always \`/id\`.
+- Container names are PascalCase + 's' (e.g., \`Todos\`). Partition key defaults to \`/id\` but can be customized per model.
 
 ## Handler Pattern
 

package/src/cli/commands/scaffold.ts

@@ -947,7 +947,7 @@ param databaseName string
 param containerName string = '${modelPascal}s'
 
 @description('Partition key path')
-param partitionKeyPath string = '/id'
+param partitionKeyPath string = '${modelInfo.partitionKey}'
 
 @description('Throughput (RU/s) - only used for Free Tier')
 param throughput int = 400