zero-swift 0.4.1 → 0.4.3

package/dist/bin.js

@@ -9,7 +9,7 @@ import { Cli, z } from "incur";
 // package.json
 var package_default = {
   name: "zero-swift",
-  version: "0.4.1",
+  version: "0.4.3",
   description: "Generates the Swift row types and schema of a Zero app for the Zero Swift client.",
   license: "Apache-2.0",
   repository: {
@@ -906,6 +906,8 @@ function writeOutput(fail, output, contents, check2, cwd) {
   }
   return { path, written: current !== contents };
 }
+var camelOption = /^--(schemaFile|schemaName|typePrefix)(=|$)/;
+var upperCase = /[A-Z]/g;
 function legacyArgv(argv) {
   if (argv[0] !== "codegen") return [...argv];
   const out = [];
@@ -917,6 +919,10 @@ function legacyArgv(argv) {
       i++;
     } else if (token.startsWith("--schema=")) {
       out.push("--schema-file", token.slice("--schema=".length));
+    } else if (camelOption.test(token)) {
+      const [name, ...value] = token.split("=");
+      const kebab = name.replace(upperCase, (c) => `-${c.toLowerCase()}`);
+      out.push([kebab, ...value].join("="));
     } else {
       out.push(token);
     }
@@ -930,25 +936,36 @@ var cli = Cli.create("zero-swift", {
 }).command("codegen", {
   description: "Generate the Swift row types, schema, and query builder from the app's TypeScript schema. Options override zero-swift.json, which is read when present. See swift/Sources/Zero/Zero.docc/GettingStarted.md in github.com/wevm/zero.",
   options: z.object({
-    config: z.string().optional().describe("Config file (default zero-swift.json, when present)"),
-    schemaFile: z.string().optional().describe("TS schema module (default schema.ts)"),
-    export: z.string().optional().describe("Export of the module that holds the schema (default schema)"),
-    out: z.string().optional().describe("Swift file to write (default Schema.swift)"),
-    schemaName: z.string().optional().describe("Name of the generated ZeroSchema static (default app)"),
-    zql: z.string().optional().describe("Name of the generated query builder global (default zql)"),
-    typePrefix: z.string().optional().describe("Prefix for every generated type name (default none)"),
-    access: z.enum(["public", "internal"]).optional().describe("Access level of the generated code (default public)"),
+    "config": z.string().optional().describe("Config file (default zero-swift.json, when present)"),
+    "schema-file": z.string().optional().describe("TS schema module (default schema.ts)"),
+    "export": z.string().optional().describe("Export of the module that holds the schema (default schema)"),
+    "out": z.string().optional().describe("Swift file to write (default Schema.swift)"),
+    "schema-name": z.string().optional().describe("Name of the generated ZeroSchema static (default app)"),
+    "zql": z.string().optional().describe("Name of the generated query builder global (default zql)"),
+    "type-prefix": z.string().optional().describe("Prefix for every generated type name (default none)"),
+    "access": z.enum(["public", "internal"]).optional().describe("Access level of the generated code (default public)"),
     check
   }),
-  // incur 0.7.1 prints example options as `--camelKey value`, so the hint
-  // shows `--schema-file` and a bare `--check` instead.
-  examples: [{ description: "Generate from zero-swift.json" }],
-  hint: "Without a config file: zero-swift codegen --schema-file shared/schema.ts --out Sources/App/Schema.swift. In CI, zero-swift codegen --check fails when the output is stale.",
+  // incur 0.7.1 prints a boolean example option as `--check true`, so the
+  // hint shows a bare `--check` instead.
+  examples: [
+    { description: "Generate from zero-swift.json" },
+    {
+      options: {
+        "schema-file": "shared/schema.ts",
+        "out": "Sources/App/Schema.swift"
+      },
+      description: "Generate without a config file"
+    }
+  ],
+  hint: "In CI, zero-swift codegen --check fails when the output is stale.",
   run: (c) => reporting(c.error, async () => {
     const cwd = process.cwd();
     const {
-      config: configOption,
-      schemaFile,
+      "config": configOption,
+      "schema-file": schemaFile,
+      "schema-name": schemaName,
+      "type-prefix": typePrefix,
       out,
       check: check2,
       ...overrides
@@ -965,7 +982,9 @@ var cli = Cli.create("zero-swift", {
     const config = {
       ...fileConfig,
       ...Object.fromEntries(
-        Object.entries(overrides).filter(([, v]) => v !== void 0)
+        Object.entries({ ...overrides, schemaName, typePrefix }).filter(
+          ([, v]) => v !== void 0
+        )
       ),
       ...schemaFile ? { schema: schemaFile } : {},
       ...out ? { output: out } : {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-swift",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Generates the Swift row types and schema of a Zero app for the Zero Swift client.",
   "license": "Apache-2.0",
   "repository": {
@@ -25,9 +25,9 @@
     "oxfmt": "^0.74.0",
     "vitest": "^5.0.0",
     "@rocicorp/zero": "1.12.0",
-    "zero-schema": "0.0.0",
+    "zql": "0.0.0",
     "zero-types": "0.0.0",
-    "zql": "0.0.0"
+    "zero-schema": "0.0.0"
   },
   "peerDependencies": {
     "@rocicorp/zero": ">=1.11.0"