json schema fix

.changeset/config.json

@@ -7,5 +7,5 @@
   "linked": [],
   "access": "public",
   "updateInternalDependencies": "patch",
-  "ignore": ["@proofkit/docs", "demo"]
+  "ignore": ["@proofkit/docs", "demo", "@proofkit/typegen-web"]
 }

.changeset/olive-coins-trade.md

@@ -0,0 +1,5 @@
+---
+"@proofkit/fmodata": minor
+---
+
+Beta release

.changeset/pre.json

@@ -12,11 +12,15 @@
     "@proofkit/registry": "1.0.0",
     "tmp": "0.0.0",
     "@proofkit/typegen": "1.0.10",
-    "@proofkit/webviewer": "3.0.6"
+    "@proofkit/webviewer": "3.0.6",
+    "@proofkit/fmodata": "0.1.0-alpha.20",
+    "@proofkit/typegen-web": "0.0.0"
   },
   "changesets": [
     "brown-keys-float",
+    "olive-coins-trade",
     "quick-ends-drop",
+    "real-ideas-sort",
     "swift-swans-rush",
     "tough-forks-start",
     "ui-default-shadcn"

apps/docs/src/app/typegen-config-schema.json/route.ts

@@ -1,6 +1,11 @@
-import { typegenConfig } from "@proofkit/typegen/config";
+import { typegenConfigForValidation } from "@proofkit/typegen/src/types.ts";
 import { z } from "zod/v4";
 
 export const GET = async () => {
-  return Response.json(z.toJSONSchema(typegenConfig, { reused: "ref" }));
+  return Response.json(
+    z.toJSONSchema(typegenConfigForValidation, {
+      reused: "ref",
+      target: "draft-7",
+    }),
+  );
 };

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/cli",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Create web application with the ProofKit stack",
   "license": "MIT",
   "repository": {
@@ -59,7 +59,6 @@
     "@better-fetch/fetch": "1.1.17",
     "@clack/core": "^0.3.4",
     "@clack/prompts": "^0.11.0",
-    "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
     "@proofkit/fmdapi": "workspace:*",
     "@proofkit/typegen": "workspace:*",
     "@types/glob": "^8.1.0",

packages/cli/prettier.config.mjs

@@ -1,14 +1,12 @@
 // import baseConfig from "../";
 
 /**
- * @type {import('prettier').Config & import('prettier-plugin-tailwindcss').PluginOptions &
- *       import("@ianvs/prettier-plugin-sort-imports").PluginConfig}
+ * @type {import('prettier').Config & import('prettier-plugin-tailwindcss').PluginOptions}
  */
 const config = {
   // ...baseConfig,
   arrowParens: "always",
   plugins: [
-    "@ianvs/prettier-plugin-sort-imports",
     "prettier-plugin-tailwindcss",
   ],
   tailwindConfig: "./template/extras/config/tailwind.config.ts",

packages/fmodata/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @proofkit/fmodata
 
+## 0.1.0-beta.21
+
+### Minor Changes
+
+- Beta release
+
 ## 0.0.0
 
 Initial setup of the package.

packages/fmodata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.20",
+  "version": "0.1.0-beta.21",
   "description": "FileMaker OData API client",
   "repository": "git@github.com:proofgeist/proofkit.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",

packages/typegen/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @proofkit/typegen
 
+## 1.1.0-beta.2
+
+### Minor Changes
+
+- 7672233: New command: `npx @proofkit/typegen@latest ui` will launch a web UI for configuring and running your typegen config.
+  (beta) support for @proofkit/fmodata typegen config.
+
+### Patch Changes
+
+- Updated dependencies
+  - @proofkit/fmodata@0.1.0-beta.21
+
 ## 1.0.11-beta.1
 
 ### Patch Changes

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/typegen",
-  "version": "1.0.11-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "",
   "type": "module",
   "main": "dist/esm/index.js",

packages/typegen/src/server/api.ts

@@ -115,7 +115,14 @@ async function handlePostConfig(
 
     // Write to disk as pretty JSON (replacing JSONC)
     const fullPath = path.resolve(context.cwd, context.configPath);
-    const jsonContent = JSON.stringify(validation.data, null, 2) + "\n";
+    // Add $schema at the top of the config
+    const configData = validation.data as Record<string, unknown>;
+    const { $schema: _, ...rest } = configData;
+    const configWithSchema = {
+      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      ...rest,
+    };
+    const jsonContent = JSON.stringify(configWithSchema, null, 2) + "\n";
 
     await fs.ensureDir(path.dirname(fullPath));
     await fs.writeFile(fullPath, jsonContent, "utf8");

packages/typegen/src/server/app.ts

@@ -3,7 +3,11 @@ import { zValidator } from "@hono/zod-validator";
 import fs from "fs-extra";
 import path from "path";
 import { parse } from "jsonc-parser";
-import { typegenConfig, typegenConfigSingle } from "../types";
+import {
+  typegenConfig,
+  typegenConfigSingle,
+  typegenConfigSingleForValidation,
+} from "../types";
 import z from "zod/v4";
 import { type clientTypes, FileMakerError } from "@proofkit/fmdapi";
 import {
@@ -52,6 +56,16 @@ function flattenLayouts(
 }
 
 export function createApiApp(context: ApiContext) {
+  // Request-validation schema: add default `type` for backwards compatibility.
+  // Important: we keep `typegenConfigSingleForValidation` as a pure discriminated union
+  // so JSON Schema generation (apps/docs) remains unchanged.
+  const typegenConfigSingleRequestForValidation = z.preprocess((data) => {
+    if (data && typeof data === "object" && !("type" in data)) {
+      return { ...(data as Record<string, unknown>), type: "fmdapi" };
+    }
+    return data;
+  }, typegenConfigSingleForValidation);
+
   // Define all routes with proper chaining for type inference
   const app = new Hono()
     .basePath("/api")
@@ -99,15 +113,30 @@ export function createApiApp(context: ApiContext) {
       zValidator(
         "json",
         z.object({
-          config: z.array(typegenConfigSingle),
+          config: z.array(typegenConfigSingleRequestForValidation),
         }),
       ),
       async (c) => {
         try {
           const data = c.req.valid("json");
 
+          // Transform validated data using runtime schema (applies transforms)
+          const transformedData = {
+            config: data.config.map((config) => {
+              // Add default type if missing (backwards compatibility)
+              const configWithType =
+                "type" in config && config.type
+                  ? config
+                  : Object.assign({}, config as Record<string, unknown>, {
+                      type: "fmdapi" as const,
+                    });
+              // Parse with runtime schema to apply transforms
+              return typegenConfigSingle.parse(configWithType);
+            }),
+          };
+
           // Validate with Zod (data is already { config: [...] })
-          const validation = typegenConfig.safeParse(data);
+          const validation = typegenConfig.safeParse(transformedData);
 
           if (!validation.success) {
             const issues = validation.error.issues.map((err) => ({
@@ -138,7 +167,14 @@ export function createApiApp(context: ApiContext) {
 
           // Write to disk as pretty JSON (replacing JSONC)
           const fullPath = path.resolve(context.cwd, context.configPath);
-          const jsonContent = JSON.stringify(validation.data, null, 2) + "\n";
+          // Add $schema at the top of the config
+          const configData = validation.data as Record<string, unknown>;
+          const { $schema: _, ...rest } = configData;
+          const configWithSchema = {
+            $schema: "https://proofkit.dev/typegen-config-schema.json",
+            ...rest,
+          };
+          const jsonContent = JSON.stringify(configWithSchema, null, 2) + "\n";
 
           await fs.ensureDir(path.dirname(fullPath));
           await fs.writeFile(fullPath, jsonContent, "utf8");
@@ -186,12 +222,33 @@ export function createApiApp(context: ApiContext) {
       zValidator(
         "json",
         z.object({
-          config: z.union([z.array(typegenConfigSingle), typegenConfigSingle]),
+          config: z.union([
+            z.array(typegenConfigSingleRequestForValidation),
+            typegenConfigSingleRequestForValidation,
+          ]),
         }),
       ),
       async (c, next) => {
-        const data = c.req.valid("json");
-        const config = data.config;
+        const rawData = c.req.valid("json");
+        // Transform validated data using runtime schema (applies transforms)
+        const configArray = Array.isArray(rawData.config)
+          ? rawData.config
+          : [rawData.config];
+        const transformedConfig = configArray.map((config) => {
+          // Add default type if missing (backwards compatibility)
+          const configWithType =
+            "type" in config && config.type
+              ? config
+              : Object.assign({}, config as Record<string, unknown>, {
+                  type: "fmdapi" as const,
+                });
+          // Parse with runtime schema to apply transforms
+          return typegenConfigSingle.parse(configWithType);
+        });
+        const config: z.infer<typeof typegenConfig>["config"] =
+          transformedConfig.length === 1
+            ? transformedConfig[0]!
+            : transformedConfig;
 
         await generateTypedClients(config);
         await next();
@@ -319,14 +376,21 @@ export function createApiApp(context: ApiContext) {
       zValidator(
         "json",
         z.object({
-          config: typegenConfigSingle,
+          config: typegenConfigSingleRequestForValidation,
           tableName: z.string(),
         }),
       ),
       async (c) => {
-        const input = c.req.valid("json");
-        const config = input.config;
-        const { tableName } = input;
+        const rawInput = c.req.valid("json");
+        // Transform validated data using runtime schema (applies transforms)
+        const configWithType =
+          "type" in rawInput.config && rawInput.config.type
+            ? rawInput.config
+            : Object.assign({}, rawInput.config as Record<string, unknown>, {
+                type: "fmdapi" as const,
+              });
+        const config = typegenConfigSingle.parse(configWithType);
+        const tableName = rawInput.tableName;
         if (config.type !== "fmodata") {
           return c.json({ error: "Invalid config type" }, 400);
         }
@@ -415,11 +479,21 @@ export function createApiApp(context: ApiContext) {
     // POST /api/test-connection
     .post(
       "/test-connection",
-      zValidator("json", z.object({ config: typegenConfigSingle })),
+      zValidator(
+        "json",
+        z.object({ config: typegenConfigSingleRequestForValidation }),
+      ),
       async (c) => {
         try {
-          const data = c.req.valid("json");
-          const config = data.config;
+          const rawData = c.req.valid("json");
+          // Transform validated data using runtime schema (applies transforms)
+          const configWithType =
+            "type" in rawData.config && rawData.config.type
+              ? rawData.config
+              : Object.assign({}, rawData.config as Record<string, unknown>, {
+                  type: "fmdapi" as const,
+                });
+          const config = typegenConfigSingle.parse(configWithType);
 
           // Validate config type
           if (config.type === "fmdapi") {