swallowkit 1.0.0-beta.8 → 1.0.0

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

@@ -0,0 +1,142 @@
+import * as fs from "fs";
+import * as path from "path";
+import { parseModelFile } from "../core/scaffold/model-parser";
+
+describe("parseModelFile", () => {
+  afterEach(() => { jest.restoreAllMocks(); });
+
+  it.each(["zod", "zod/v4"])("executes TypeScript modules and nested imports with %s without fallback", async (zodImport) => {
+    const tempDir = fs.mkdtempSync(path.join(process.cwd(), ".tmp-model-parser-"));
+    const warning = jest.spyOn(console, "warn").mockImplementation(() => {});
+    try {
+      fs.writeFileSync(path.join(tempDir, "leaf.ts"), `
+import { z } from '${zodImport}';
+export const displayName = 'Leaf';
+export const leafSchema = z.object({ name: z.string() });
+`);
+      fs.writeFileSync(path.join(tempDir, "nested.ts"), `
+import { z } from '${zodImport}';
+import { leafSchema } from './leaf';
+export const displayName = 'Nested';
+export const nestedSchema = z.object({ leaf: leafSchema });
+`);
+      const modelPath = path.join(tempDir, "record.ts");
+      fs.writeFileSync(modelPath, `
+import { z } from '${zodImport}';
+import { nestedSchema } from './nested';
+import { leafSchema as otherSchema } from './leaf';
+interface Settings { inner: { count: number }; }
+type Label = string;
+const label: Label = 'https://example.com';
+const statuses = ['draft', 'active'] as const;
+export const recordSchema = z.object({
+  id: z.string(), title: z.string().default(label), count: z.number(), enabled: z.boolean(),
+  optional: z.string().optional(), nullable: z.number().nullable(), status: z.enum(statuses),
+  numbers: z.array(z.number()), nested: nestedSchema, others: z.array(otherSchema),
+  inline: z.object({ name: z.string() }), tenantId: z.string(),
+});
+export type Record = z.infer<typeof recordSchema>;
+export const displayName = 'Record';
+export const partitionKey = '/tenantId';
+export const connectorConfig = { connector: 'catalog', table: 'records', operations: ['read'] } as const;
+export const authPolicy = { read: ['reader'], write: ['editor'] } as const;
+`);
+      const model = await parseModelFile(modelPath);
+      expect(warning).not.toHaveBeenCalled();
+      expect(model.fields).toHaveLength(12);
+      expect(model.fields).toEqual(expect.arrayContaining([
+        expect.objectContaining({ name: "count", type: "number" }),
+        expect.objectContaining({ name: "enabled", type: "boolean" }),
+        expect.objectContaining({ name: "title", isOptional: true }),
+        expect.objectContaining({ name: "optional", isOptional: true }),
+        expect.objectContaining({ name: "nullable", isNullable: true }),
+        expect.objectContaining({ name: "status", enumValues: ["draft", "active"] }),
+        expect.objectContaining({ name: "numbers", type: "number", isArray: true }),
+        expect.objectContaining({ name: "nested", type: "object" }),
+        expect.objectContaining({ name: "others", type: "object", isArray: true }),
+      ]));
+      expect(model.connectorConfig).toEqual(expect.objectContaining({ connector: "catalog", table: "records", operations: ["read"] }));
+      expect(model.partitionKey).toBe("/tenantId");
+      expect(model.authPolicy).toEqual({ read: ["reader"], write: ["editor"] });
+      expect(fs.readdirSync(tempDir).some(name => name.startsWith(".swallowkit-parser-"))).toBe(false);
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  it("preserves array and enum metadata for schemas with defaults", async () => {
+    const tempDir = fs.mkdtempSync(path.join(process.cwd(), ".tmp-model-parser-"));
+    const modelPath = path.join(tempDir, "product.ts");
+
+    try {
+      fs.writeFileSync(
+        modelPath,
+        `import { z } from 'zod/v4';
+
+export const Product = z.object({
+  id: z.string(),
+  name: z.string().min(1),
+  price: z.number().min(0),
+  tags: z.array(z.string()).default([]),
+  status: z.enum(['draft', 'active', 'archived']).default('draft'),
+  createdAt: z.string().optional(),
+  updatedAt: z.string().optional(),
+});
+
+export type Product = z.infer<typeof Product>;
+`,
+        "utf-8"
+      );
+
+      const model = await parseModelFile(modelPath);
+      expect(model.fields).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: "tags",
+            type: "string",
+            isArray: true,
+            isOptional: true,
+          }),
+          expect.objectContaining({
+            name: "status",
+            type: "string",
+            isArray: false,
+            isOptional: true,
+            enumValues: ["draft", "active", "archived"],
+          }),
+        ])
+      );
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  it("distinguishes optional and nullable fields", async () => {
+    const tempDir = fs.mkdtempSync(path.join(process.cwd(), ".tmp-model-parser-"));
+    const modelPath = path.join(tempDir, "coupon.ts");
+
+    try {
+      fs.writeFileSync(
+        modelPath,
+        `import { z } from 'zod/v4';
+
+export const couponSchema = z.object({
+  requiredUserId: z.string(),
+  optionalUserId: z.string().optional(),
+  nullableUserId: z.string().nullable(),
+});
+`,
+        "utf-8"
+      );
+
+      const model = await parseModelFile(modelPath);
+      expect(model.fields).toEqual(expect.arrayContaining([
+        expect.objectContaining({ name: "requiredUserId", isOptional: false, isNullable: false }),
+        expect.objectContaining({ name: "optionalUserId", isOptional: true, isNullable: false }),
+        expect.objectContaining({ name: "nullableUserId", isOptional: false, isNullable: true }),
+      ]));
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+});

package/src/__tests__/multi-auth.test.ts

@@ -0,0 +1,160 @@
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { addAuthCommand } from "../cli/commands/add-auth";
+import { createUIAuthOptions } from "../cli/commands/scaffold";
+import {
+  generateBFFCallFunctionWithMultipleAuth,
+  generateNamedAuthRouterCSharp,
+  generateNamedAuthRouterPython,
+  generateNamedAuthRouterTS,
+} from "../core/scaffold/auth-generator";
+import { normalizeAuthConfig } from "../core/config";
+import { parseAuthPolicy } from "../core/scaffold/model-parser";
+import { createBasicModelInfo } from "./fixtures";
+import { generateCSharpAzureFunctionsCRUD, generateCompactAzureFunctionsCRUD, generatePythonAzureFunctionsCRUD } from "../core/scaffold/functions-generator";
+import { generateAuthLayout, generateNewPage } from "../core/scaffold/ui-generator";
+import { AuthConfig } from "../types";
+
+const namedAuthConfig: AuthConfig = {
+  schemes: {
+    admin: { provider: "swa" },
+    lineUser: { provider: "external-token" },
+  },
+  authorization: {
+    defaultPolicy: "anonymous",
+    policies: {
+      adminOnly: { schemes: ["admin"], roles: ["authenticated"] },
+      lineUserOnly: { schemes: ["lineUser"], roles: ["authenticated"] },
+    },
+  },
+};
+const auth = normalizeAuthConfig(namedAuthConfig)!;
+
+describe("named authentication routers", () => {
+  it("generates deterministic TypeScript policy routing and normalized principals", () => {
+    const code = generateNamedAuthRouterTS(auth);
+    expect(code).toContain("policy.schemes.filter");
+    expect(code).toContain("candidates.length !== 1");
+    expect(code).toContain("subject: value.userId");
+    expect(code).toContain("scheme + ':' + principal.subject");
+    expect(code).toContain("new AuthError(403");
+    expect(code).toContain("new AuthError(503");
+    expect(code).not.toContain("JWT_SECRET");
+  });
+
+  it("generates equivalent C# and Python named guards", () => {
+    const csharp = generateNamedAuthRouterCSharp(auth);
+    const python = generateNamedAuthRouterPython(auth);
+    expect(csharp).toContain("record AuthPrincipal(string Subject, string Scheme, string Issuer");
+    expect(csharp).toContain("candidates.Length != 1");
+    expect(csharp).toContain("HttpStatusCode.Forbidden");
+    expect(python).toContain('principal["scheme"] + ":" + principal["subject"]');
+    expect(python).toContain("len(candidates) != 1");
+    expect(python).toContain("AuthError(503");
+  });
+
+  it("generates valid branch structure for an SWA-only Python router", () => {
+    const swaOnly = normalizeAuthConfig({ schemes: { admin: { provider: "swa", swa: { allowedProviders: ["github"] } } }, authorization: { defaultPolicy: "anonymous", policies: { adminOnly: { schemes: ["admin"] } } } })!;
+    const python = generateNamedAuthRouterPython(swaOnly);
+    expect(python).toContain('        if PROVIDERS[scheme] == "swa":');
+    expect(python).not.toContain('        elif PROVIDERS[scheme] == "swa":');
+    expect(python).toContain("ALLOWED_PROVIDERS");
+    expect(generateNamedAuthRouterCSharp(swaOnly)).toContain("AllowedProviders[scheme]");
+  });
+
+  it("emits Array.Empty<string>() instead of untyped new[] { } for empty C# arrays (CS0826)", () => {
+    const emptyLists = normalizeAuthConfig({
+      schemes: { api: { provider: "external-token" } },
+      authorization: { defaultPolicy: "anonymous", policies: { apiOnly: { schemes: ["api"] } } },
+    })!;
+    const csharp = generateNamedAuthRouterCSharp(emptyLists);
+    expect(csharp).not.toMatch(/new\[\]\s*\{\s*\}/);
+    expect(csharp).toContain("Array.Empty<string>()");
+    // 非空のリストは従来通り new[] リテラル
+    expect(csharp).toContain('new[] { "api" }');
+  });
+
+  it("scaffolds named read/write guards for all Functions languages", () => {
+    const policy = { read: "adminOnly", write: "lineUserOnly" };
+    const model = createBasicModelInfo();
+    const ts = generateCompactAzureFunctionsCRUD(model, "@fixture/shared", policy);
+    const cs = generateCSharpAzureFunctionsCRUD(model, policy);
+    const py = generatePythonAzureFunctionsCRUD(model, policy).blueprint;
+    expect(ts).toContain("./auth/auth-router");
+    expect(ts).toContain('requireAuth(request, "adminOnly")');
+    expect(ts).toContain('requireAuth(request, "lineUserOnly")');
+    expect(cs).toContain('AuthRouter.Authorize(request, "adminOnly")');
+    expect(cs).toContain('AuthRouter.Authorize(request, "lineUserOnly")');
+    expect(py).toContain("from auth.auth_router import");
+    expect(py).toContain('require_auth(req, "adminOnly")');
+    expect(py).toContain('require_auth(req, "lineUserOnly")');
+  });
+
+  it("forwards both credential sources and the Functions host key", () => {
+    const code = generateBFFCallFunctionWithMultipleAuth();
+    expect(code).toContain("fetchHeaders.Authorization");
+    expect(code).toContain("fetchHeaders['x-ms-client-principal']");
+    expect(code).toContain("'x-functions-key'");
+    expect(code).not.toMatch(/console\.log\([^\n]*(authorization|principal|cookie)/i);
+  });
+
+  it("parses model-wide and operation-specific named policies", () => {
+    expect(parseAuthPolicy("export const authPolicy = { policy: 'adminOnly' };"))
+      .toEqual({ policy: "adminOnly" });
+    expect(parseAuthPolicy("export const authPolicy = { read: 'adminOnly', write: 'lineUserOnly' };"))
+      .toEqual({ read: "adminOnly", write: "lineUserOnly" });
+  });
+
+  it("resolves the same named auth context for the model layout and CRUD pages", () => {
+    const model = createBasicModelInfo({ name: "Product", authPolicy: { policy: "adminOnly" } });
+    const options = createUIAuthOptions(model.authPolicy!, namedAuthConfig);
+    const layout = generateAuthLayout(model, options);
+    const page = generateNewPage(model, options);
+
+    expect(options.authContextImport).toBe("@/lib/auth/schemes/admin/auth-context");
+    expect(layout).toContain("AuthProvider } from '@/lib/auth/schemes/admin/auth-context'");
+    expect(page).toContain("useAuth } from '@/lib/auth/schemes/admin/auth-context'");
+  });
+});
+
+describe("add-auth named scheme CLI", () => {
+  const originalCwd = process.cwd();
+  let root: string;
+
+  beforeEach(() => {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), "swallowkit-multi-auth-"));
+    fs.writeFileSync(path.join(root, "package.json"), JSON.stringify({ name: "fixture" }));
+    fs.writeFileSync(path.join(root, "swallowkit.config.json"), JSON.stringify({ backend: { language: "typescript" }, auth: { schemes: {}, authorization: { defaultPolicy: "anonymous", policies: {} } } }, null, 2));
+    process.chdir(root);
+  });
+
+  afterEach(() => {
+    process.chdir(originalCwd);
+    fs.rmSync(root, { recursive: true, force: true });
+  });
+
+  it("adds two schemes without overwriting the first verifier", async () => {
+    await addAuthCommand({ scheme: "admin", provider: "swa" });
+    await addAuthCommand({ scheme: "lineUser", provider: "external-token" });
+    const verifier = path.join(root, "functions", "src", "auth", "schemes", "line-user", "verifier.ts");
+    fs.writeFileSync(verifier, "// user verifier\n", "utf-8");
+    const config = JSON.parse(fs.readFileSync(path.join(root, "swallowkit.config.json"), "utf-8"));
+    expect(config.auth.schemes.admin.provider).toBe("swa");
+    expect(config.auth.schemes.lineUser.provider).toBe("external-token");
+    await expect(addAuthCommand({ scheme: "lineUser", provider: "external-token" })).rejects.toThrow("already exists");
+    expect(fs.readFileSync(verifier, "utf-8")).toBe("// user verifier\n");
+    expect(fs.readFileSync(path.join(root, "lib", "api", "call-function.ts"), "utf-8")).toContain("x-functions-key");
+  });
+
+  it("updates a JavaScript config that already has a trailing comma", async () => {
+    fs.rmSync(path.join(root, "swallowkit.config.json"));
+    fs.writeFileSync(path.join(root, "swallowkit.config.js"), "module.exports = {\n  backend: { language: 'typescript' },\n  api: { endpoint: '/api/test' },\n};\n");
+    await addAuthCommand({ scheme: "admin", provider: "swa" });
+    const content = fs.readFileSync(path.join(root, "swallowkit.config.js"), "utf-8");
+    expect(content).not.toContain(",,");
+    const configModule = { exports: {} as Record<string, unknown> };
+    new Function("module", content)(configModule);
+    expect((configModule.exports as { auth: { schemes: { admin: { provider: string } } } }).auth.schemes.admin.provider).toBe("swa");
+  });
+});

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

@@ -21,6 +21,14 @@ describe("generateBFFCallFunction", () => {
     expect(code).toContain("export async function callFunction");
   });
 
+  it("uses a server-side Functions key and fails closed outside localhost", () => {
+    const code = generateBFFCallFunction();
+    expect(code).toContain("BACKEND_FUNCTIONS_KEY");
+    expect(code).toContain("'x-functions-key'");
+    expect(code).toContain("required for non-local Functions calls");
+    expect(code).not.toContain("?code=");
+  });
+
   it("includes z.ZodSchema typings", () => {
     const code = generateBFFCallFunction();
     expect(code).toContain("z.ZodSchema");

package/src/__tests__/package-manager.test.ts

@@ -1,14 +1,41 @@
 import {
+  detectFromUserAgent,
   getCommands,
   getWorkspaceConfig,
   getCiSetupStep,
+  getCiInstallCommand,
   getAzurePipelinesSetup,
   getBuildScript,
+  getSwaAppBuildCommand,
   getFunctionsPrestart,
   getFunctionsStartScript,
   spawnArgs,
 } from "../utils/package-manager";
 
+describe("detectFromUserAgent", () => {
+  const originalAgent = process.env.npm_config_user_agent;
+  beforeEach(() => { delete process.env.npm_config_user_agent; });
+  afterEach(() => {
+    if (originalAgent === undefined) delete process.env.npm_config_user_agent;
+    else process.env.npm_config_user_agent = originalAgent;
+  });
+  it("honors npm invocation even with pnpm installed", () => {
+    process.env.npm_config_user_agent = "npm/11.0.0 node/v22.14.0";
+    expect(detectFromUserAgent(() => true)).toBe("npm");
+  });
+  it("honors pnpm invocation", () => {
+    process.env.npm_config_user_agent = "pnpm/11.26.0 npm/? node/v22.14.0";
+    expect(detectFromUserAgent(() => false)).toBe("pnpm");
+  });
+  it("falls back to npm when pnpm is not installed", () => {
+    expect(detectFromUserAgent(() => false)).toBe("npm");
+  });
+
+  it("prefers pnpm when it is installed", () => {
+    expect(detectFromUserAgent(() => true)).toBe("pnpm");
+  });
+});
+
 describe("getCommands", () => {
   describe("pnpm", () => {
     const cmds = getCommands("pnpm");
@@ -42,7 +69,7 @@ describe("getCommands", () => {
     });
 
     it("returns correct runFilter for workspace", () => {
-      expect(cmds.runFilter("shared")).toBe("pnpm run --filter shared");
+      expect(cmds.runFilter("shared")).toBe("pnpm --filter shared run");
     });
 
     it("returns --use-pnpm flag for create-next-app", () => {
@@ -85,8 +112,8 @@ describe("getCommands", () => {
       expect(cmds.runFilter("shared")).toBe("npm run --workspace=shared");
     });
 
-    it("returns null for create-next-app flag", () => {
-      expect(cmds.createNextAppFlag).toBeNull();
+    it("explicitly selects npm for create-next-app", () => {
+      expect(cmds.createNextAppFlag).toBe("--use-npm");
     });
   });
 });
@@ -100,6 +127,9 @@ describe("getWorkspaceConfig", () => {
       expect(config.content).toContain("packages:");
       expect(config.content).toContain("  - packages/*");
       expect(config.content).toContain("  - apps/*");
+      expect(config.content).toContain("protobufjs: false");
+      expect(config.content).toContain("unrs-resolver: false");
+      expect(config.content).not.toContain(": true");
     }
   });
 
@@ -117,6 +147,7 @@ describe("getCiSetupStep", () => {
   it("returns pnpm setup step for pnpm", () => {
     const step = getCiSetupStep("pnpm");
     expect(step).toContain("pnpm/action-setup");
+    expect(step).toContain("version: 11");
   });
 
   it("returns empty string for npm", () => {
@@ -124,6 +155,30 @@ describe("getCiSetupStep", () => {
   });
 });
 
+describe("getSwaAppBuildCommand", () => {
+  it("returns a pnpm build command for pnpm projects", () => {
+    expect(getSwaAppBuildCommand("pnpm")).toBe("pnpm install --frozen-lockfile && pnpm run build");
+  });
+
+  it("returns an npm build command for npm projects", () => {
+    expect(getSwaAppBuildCommand("npm")).toBe("npm ci && npm run build");
+  });
+
+  it("uses npm ci for pnpm-initialized projects once an npm lockfile is generated", () => {
+    expect(getSwaAppBuildCommand("npm", "pnpm")).toBe("npm ci && npm run build");
+  });
+});
+
+describe("getCiInstallCommand", () => {
+  it("returns npm ci for npm projects", () => {
+    expect(getCiInstallCommand("npm", "npm")).toBe("npm ci");
+  });
+
+  it("returns npm ci for pnpm projects once an npm lockfile is generated", () => {
+    expect(getCiInstallCommand("npm", "pnpm")).toBe("npm ci");
+  });
+});
+
 describe("getAzurePipelinesSetup", () => {
   it("returns corepack step for pnpm", () => {
     const step = getAzurePipelinesSetup("pnpm");
@@ -138,7 +193,7 @@ describe("getAzurePipelinesSetup", () => {
 
 describe("getBuildScript", () => {
   it("uses pnpm run --filter for pnpm", () => {
-    expect(getBuildScript("pnpm")).toContain("pnpm run --filter shared build");
+    expect(getBuildScript("pnpm")).toContain("pnpm --filter shared run build");
     expect(getBuildScript("pnpm")).toContain("fs.cpSync");
   });