Merge branch 'release/v1.0.14'

Author: holtwick

package.json

@@ -1,8 +1,8 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "1.0.13",
-  "packageManager": "pnpm@10.15.1",
+  "version": "1.0.14",
+  "packageManager": "pnpm@10.17.0",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",
@@ -79,17 +79,17 @@
   "devDependencies": {
     "@antfu/eslint-config": "^5.3.0",
     "@antfu/ni": "^25.0.0",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.5.2",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.4",
-    "esbuild": "^0.25.9",
+    "esbuild": "^0.25.10",
     "eslint": "^9.35.0",
     "playwright": "^1.55.0",
     "pnpm": "^10.12.1",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2",
-    "vite": "^7.1.5",
+    "vite": "^7.1.6",
     "vitest": "^3.2.4"
   }
 }

src/common/schema/export-json-schema.spec.ts

@@ -1,4 +1,3 @@
-import type { Infer } from './schema'
 import { schemaExportJsonSchema } from './export-json-schema'
 import { z } from './z'
 
@@ -11,17 +10,32 @@ describe('json-schema.spec', () => {
       aNumber: z.number().meta({
         desc: 'This is a number',
       }),
+      aRecord: z.record(z.number()),
+      moreRecords: z.record(z.object({ x: z.string() })).optional(),
+      anObject: z.object({
+        a: z.string(),
+        b: z.number(),
+      }),
       aString: z.string(),
     })
 
-    type t = Infer<typeof schema>
-    expectTypeOf<t>().toMatchObjectType<{
-      fixed: 'a' | 'b' | 'c'
-      anInt?: number | undefined
-      aBool: boolean
-      aNumber: number
-      aString: string
-    }>()
+    // type tInfer = Infer<typeof schema>
+
+    // expectTypeOf<tInfer>().toMatchObjectType<{
+    //   anInt?: number | undefined
+    //   moreRecords?: Record<string, {
+    //     x: string
+    //   }> | undefined
+    //   fixed: 'a' | 'b' | 'c'
+    //   aBool: boolean
+    //   aNumber: number
+    //   aRecord: Record<string, number>
+    //   anObject: {
+    //     a: string
+    //     b: number
+    //   }
+    //   aString: string
+    // }>()
 
     const r = schemaExportJsonSchema(schema)
 
@@ -38,13 +52,35 @@ describe('json-schema.spec', () => {
             "description": "This is a number",
             "type": "number",
           },
+          "aRecord": Object {
+            "additionalProperties": Object {
+              "type": "number",
+            },
+            "type": "object",
+          },
           "aString": Object {
             "type": "string",
           },
           "anInt": Object {
             "default": 0,
             "type": "integer",
           },
+          "anObject": Object {
+            "additionalProperties": false,
+            "properties": Object {
+              "a": Object {
+                "type": "string",
+              },
+              "b": Object {
+                "type": "number",
+              },
+            },
+            "required": Array [
+              "a",
+              "b",
+            ],
+            "type": "object",
+          },
           "fixed": Object {
             "description": "This is a fixed value",
             "enum": Array [
@@ -54,11 +90,28 @@ describe('json-schema.spec', () => {
             ],
             "type": "string",
           },
+          "moreRecords": Object {
+            "additionalProperties": Object {
+              "additionalProperties": false,
+              "properties": Object {
+                "x": Object {
+                  "type": "string",
+                },
+              },
+              "required": Array [
+                "x",
+              ],
+              "type": "object",
+            },
+            "type": "object",
+          },
         },
         "required": Array [
           "fixed",
           "aBool",
           "aNumber",
+          "aRecord",
+          "anObject",
           "aString",
         ],
         "type": "object",

src/common/schema/export-json-schema.ts

@@ -1,7 +1,6 @@
 import type { Type } from './schema'
-import { assert } from '../assert'
+import { isEmpty } from '../data'
 import { objectMap } from '../data/object'
-import { isSchemaObjectFlat } from './utils'
 
 const _mapJsonSchemaType: Record<string, string> = {
   string: 'string',
@@ -11,7 +10,7 @@ const _mapJsonSchemaType: Record<string, string> = {
 }
 
 export function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any> {
-  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')
+  // assert(isSchemaObjectFlat(schema), 'schema should be a flat object')
 
   function transformSchema(schema: Type<any>): any {
     const type = _mapJsonSchemaType[schema.type] ?? schema.type ?? 'object'
@@ -37,25 +36,37 @@ export function schemaExportJsonSchema<T>(schema: Type<T>): Record<string, any>
       if (schema.type === 'array' && schema._type) {
         properties[key].items = transformSchema(schema._type)
       }
-      if (schema.type === 'object' && schema._object) {
-        Object.assign(properties[key], transformSchema(schema._object))
+      else if (schema.type === 'object' && schema._object) {
+        Object.assign(properties[key], transformSchema(schema))
+        properties[key].additionalProperties = false
+      }
+      else if (schema.type === 'record' && schema._type) {
+        properties[key].type = 'object'
+        properties[key].additionalProperties = transformSchema(schema._type)
       }
       // Handle union types (e.g., z.union)
-      if (schema.type === 'union' && Array.isArray(schema._union)) {
+      else if (schema.type === 'union' && Array.isArray(schema._union)) {
         properties[key].type = schema._union.map((s: any) => _mapJsonSchemaType[s.type] ?? s.type) // todo complex types
       }
     })
 
+    if (!isEmpty(properties)) {
+      return {
+        type,
+        properties,
+        additionalProperties: false,
+        ...(required.length > 0 ? { required } : {}),
+      }
+    }
+
     return {
       type,
-      additionalProperties: false,
-      properties,
-      ...(required.length > 0 ? { required } : {}),
     }
   }
 
   return {
     $schema: 'http://json-schema.org/draft-07/schema#',
+    additionalProperties: false,
     ...transformSchema(schema),
   }
 }