@optique/zod 0.10.7 → 1.0.0-dev.1109

package/README.md

@@ -1,9 +1,6 @@
 @optique/zod
 ============
 
-> [!WARNING]
-> The API is stabilizing, but may change before the 1.0 release.
-
 Zod value parsers for Optique. This package provides seamless integration
 between [Zod] schemas and *@optique/core*, enabling powerful validation and
 type-safe parsing of command-line arguments.
@@ -33,13 +30,16 @@ address.
 
 ~~~~ typescript
 import { run } from "@optique/run";
-import { option } from "@optique/core/parser";
+import { object } from "@optique/core/constructs";
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
-const cli = run({
-  email: option("--email", zod(z.string().email())),
-});
+const cli = run(
+  object({
+    email: option("--email", zod(z.string().email())),
+  }),
+);
 
 console.log(`Welcome, ${cli.email}!`);
 ~~~~
@@ -61,6 +61,7 @@ Common use cases
 ### Email validation
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
@@ -70,6 +71,7 @@ const email = option("--email", zod(z.string().email()));
 ### URL validation
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
@@ -83,6 +85,7 @@ const url = option("--url", zod(z.string().url()));
 > always strings.
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
@@ -94,6 +97,7 @@ const port = option("-p", "--port",
 ### Enum choices
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
@@ -105,6 +109,7 @@ const logLevel = option("--log-level",
 ### Date transformations
 
 ~~~~ typescript
+import { argument } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { z } from "zod";
 
@@ -120,6 +125,7 @@ Custom error messages
 You can customize error messages using the `errors` option:
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
 import { zod } from "@optique/zod";
 import { message } from "@optique/core/message";
 import { z } from "zod";
@@ -143,11 +149,15 @@ CLI arguments are always strings. If you want to parse numbers, booleans,
 or other types, you must use `z.coerce`:
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
+import { zod } from "@optique/zod";
+import { z } from "zod";
+
 // ✅ Correct
 const port = option("-p", zod(z.coerce.number()));
 
 // ❌ Won't work (CLI arguments are always strings)
-const port = option("-p", zod(z.number()));
+// const port = option("-p", zod(z.number()));
 ~~~~
 
 ### Async refinements are not supported
@@ -156,6 +166,10 @@ Optique's `ValueParser.parse()` is synchronous, so async Zod features like
 async refinements cannot be supported:
 
 ~~~~ typescript
+import { option } from "@optique/core/primitives";
+import { zod } from "@optique/zod";
+import { z } from "zod";
+
 // ❌ Not supported
 const email = option("--email",
   zod(z.string().refine(async (val) => await checkDB(val)))

package/dist/index.cjs

@@ -78,8 +78,16 @@ function inferMetavar(schema) {
 	if (typeName === "ZodDate" || typeName === "date") return "DATE";
 	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return "CHOICE";
 	if (typeName === "ZodUnion" || typeName === "union" || typeName === "ZodLiteral" || typeName === "literal") return "VALUE";
-	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") return inferMetavar(def.innerType);
-	if (typeName === "ZodDefault" || typeName === "default") return inferMetavar(def.innerType);
+	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferMetavar(innerType);
+		return "VALUE";
+	}
+	if (typeName === "ZodDefault" || typeName === "default") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferMetavar(innerType);
+		return "VALUE";
+	}
 	return "VALUE";
 }
 /**

package/dist/index.js

@@ -55,8 +55,16 @@ function inferMetavar(schema) {
 	if (typeName === "ZodDate" || typeName === "date") return "DATE";
 	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return "CHOICE";
 	if (typeName === "ZodUnion" || typeName === "union" || typeName === "ZodLiteral" || typeName === "literal") return "VALUE";
-	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") return inferMetavar(def.innerType);
-	if (typeName === "ZodDefault" || typeName === "default") return inferMetavar(def.innerType);
+	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferMetavar(innerType);
+		return "VALUE";
+	}
+	if (typeName === "ZodDefault" || typeName === "default") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferMetavar(innerType);
+		return "VALUE";
+	}
 	return "VALUE";
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/zod",
-  "version": "0.10.7",
+  "version": "1.0.0-dev.1109+fa132665",
   "description": "Zod value parsers for Optique",
   "keywords": [
     "CLI",
@@ -57,7 +57,7 @@
     "zod": "^3.25.0 || ^4.0.0"
   },
   "dependencies": {
-    "@optique/core": "0.10.7"
+    "@optique/core": "1.0.0-dev.1109+fa132665"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",