Fix browser FileMaker scaffold and fmdapi e2e tests

Author: eluce2

env.d.ts

@@ -32,12 +32,12 @@ export type CoercedEnvSchema = {
   FM_SERVER: string;
 
   /**
-   * **g**  
+   * **FM_DATABASE**  
    * Canonical FileMaker database name used across fmdapi, fmodata, typegen,  
    * CLI templates, and integration tests. Usually ends in `.fmp12`.  
    * ![icon](data:image/svg+xml;utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2220%22%20height%3D%2220%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cpath%20fill%3D%22%23808080%22%20d%3D%22M29%2022h-5a2.003%202.003%200%200%201-2-2v-6a2%202%200%200%201%202-2h5v2h-5v6h5ZM18%2012h-4V8h-2v14h6a2.003%202.003%200%200%200%202-2v-6a2%202%200%200%200-2-2m-4%208v-6h4v6Zm-6-8H3v2h5v2H4a2%202%200%200%200-2%202v2a2%202%200%200%200%202%202h6v-8a2%202%200%200%200-2-2m0%208H4v-2h4Z%22%2F%3E%3C%2Fsvg%3E)   
    */
-  g: string;
+  FM_DATABASE: string;
 
   /**
    * **FM_USERNAME**  
@@ -199,7 +199,7 @@ export type CoercedEnvSchema = {
 
 declare module 'varlock/env' {
   export interface TypedEnvSchema extends Readonly<CoercedEnvSchema> {}
-  export interface PublicTypedEnvSchema extends Readonly<Pick<CoercedEnvSchema, 'APP_ENV' | 'FM_SERVER' | 'g' | 'FM_USERNAME' | 'FMODATA_SERVER_URL' | 'FMODATA_USERNAME' | 'FMODATA_DATABASE' | 'OTTO_SERVER_URL' | 'FM_FILE_NAME' | 'FM_LAYOUT_NAME' | 'DIFFERENT_FM_SERVER' | 'DIFFERENT_FM_DATABASE' | 'DIFFERENT_FM_USERNAME' | 'FM_MCP_BASE_URL' | 'PROOFKIT_ALLOW_INSECURE_TLS'>> {}
+  export interface PublicTypedEnvSchema extends Readonly<Pick<CoercedEnvSchema, 'APP_ENV' | 'FM_SERVER' | 'FM_DATABASE' | 'FM_USERNAME' | 'FMODATA_SERVER_URL' | 'FMODATA_USERNAME' | 'FMODATA_DATABASE' | 'OTTO_SERVER_URL' | 'FM_FILE_NAME' | 'FM_LAYOUT_NAME' | 'DIFFERENT_FM_SERVER' | 'DIFFERENT_FM_DATABASE' | 'DIFFERENT_FM_USERNAME' | 'FM_MCP_BASE_URL' | 'PROOFKIT_ALLOW_INSECURE_TLS'>> {}
 }
 
 

packages/cli/src/core/planInit.ts

@@ -59,6 +59,10 @@ export function planInit(
     Object.assign(packageJson.dependencies, sharedUiDependencies);
     packageJson.dependencies["@tailwindcss/postcss"] = "^4.1.10";
     packageJson.dependencies["next-themes"] = "^0.4.6";
+    if (request.dataSource === "filemaker") {
+      packageJson.dependencies["@proofkit/fmdapi"] = releaseTag;
+      packageJson.dependencies.zod = "^4";
+    }
   }
 
   if (request.appType === "webviewer") {

packages/cli/tests/browser-apps.smoke.test.ts

@@ -54,14 +54,15 @@ describeWhenSmokeEnvPresent("External integration smoke tests (non-interactive C
       `node "${cliPath}" init`,
       projectName,
       "--non-interactive",
-      "--appType browser",
-      "--dataSource filemaker",
+      "--app-type browser",
+      "--data-source filemaker",
       `--server "${testEnv.OTTO_SERVER_URL}"`,
-      `--adminApiKey "${testEnv.OTTO_ADMIN_API_KEY}"`,
-      `--dataApiKey "${testEnv.FM_DATA_API_KEY}"`,
-      `--fileName "${testEnv.FM_FILE_NAME}"`,
-      `--layoutName "${testEnv.FM_LAYOUT_NAME}"`,
-      "--noGit", // Skip git initialization for testing
+      `--admin-api-key "${testEnv.OTTO_ADMIN_API_KEY}"`,
+      `--data-api-key "${testEnv.FM_DATA_API_KEY}"`,
+      `--file-name "${testEnv.FM_FILE_NAME}"`,
+      `--layout-name "${testEnv.FM_LAYOUT_NAME}"`,
+      "--schema-name Contacts",
+      "--no-git", // Skip git initialization for testing
     ].join(" ");
 
     // Execute the command

packages/cli/tests/planner.test.ts

@@ -41,6 +41,21 @@ describe("planInit", () => {
     expect(plan.tasks.checkWebViewerAddon).toBe(true);
   });
 
+  it("adds fmdapi for browser filemaker scaffolds", () => {
+    const plan = planInit(
+      makeInitRequest({
+        appType: "browser",
+        dataSource: "filemaker",
+      }),
+      {
+        templateDir: "/templates/browser",
+      },
+    );
+
+    expect(plan.packageJson.dependencies["@proofkit/fmdapi"]).toBe("beta");
+    expect(plan.packageJson.dependencies.zod).toBe("^4");
+  });
+
   it("plans filemaker bootstrap and initial codegen when inputs are explicit", () => {
     const plan = planInit(
       makeInitRequest({

packages/fmdapi/package.json

@@ -48,7 +48,7 @@
     "dev": "tsc --watch",
     "ci": "pnpm build && pnpm check-format && pnpm publint --strict && pnpm test",
     "test": "vitest run",
-    "test:e2e": "varlock run -- vitest run tests/e2e",
+    "test:e2e": "varlock run -- vitest run --config vitest.e2e.config.ts",
     "capture": "varlock run -- npx tsx scripts/capture-responses.ts",
     "typecheck": "tsc --noEmit",
     "changeset": "changeset",

packages/fmdapi/tests/e2e/client-methods.test.ts

@@ -1,7 +1,12 @@
 import { describe, expect, it, test } from "vitest";
-import { DataApi, OttoAdapter } from "../src";
-import type { AllLayoutsMetadataResponse, Layout, ScriptOrFolder, ScriptsMetadataResponse } from "../src/client-types";
-import { config, containerClient, layoutClient, weirdPortalClient } from "./setup";
+import { DataApi, OttoAdapter } from "../../src";
+import type {
+  AllLayoutsMetadataResponse,
+  Layout,
+  ScriptOrFolder,
+  ScriptsMetadataResponse,
+} from "../../src/client-types";
+import { config, containerClient, layoutClient, weirdPortalClient } from "../setup";
 
 describe("sort methods", () => {
   test("should sort descending", async () => {

packages/fmdapi/tests/e2e/zod.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { z } from "zod/v4";
-import { DataApi, OttoAdapter } from "../src";
-import { config } from "./setup";
+import { DataApi, OttoAdapter } from "../../src";
+import { config } from "../setup";
 
 const ZCustomer = z.object({ name: z.string(), phone: z.string() });
 const ZPortalTable = z.object({

packages/fmdapi/vitest.e2e.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    testTimeout: 15_000,
+    include: ["tests/e2e/**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+    exclude: ["**/node_modules/**", "**/dist/**"],
+  },
+});