Merge branch 'release/v0.26.2'

Author: holtwick

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",
@@ -69,19 +69,19 @@
     "watch": "nr build -- --watch src"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.8",
-    "@antfu/ni": "^0.23.0",
-    "@types/node": "^22.9.0",
-    "@vitejs/plugin-vue": "^5.1.4",
-    "@vitest/browser": "^2.1.4",
-    "@vitest/coverage-v8": "^2.1.4",
+    "@antfu/eslint-config": "^3.11",
+    "@antfu/ni": "^0.23.1",
+    "@types/node": "^22.10.1",
+    "@vitejs/plugin-vue": "^5.2.1",
+    "@vitest/browser": "^2.1.8",
+    "@vitest/coverage-v8": "^2.1.8",
     "esbuild": "^0.24.0",
-    "eslint": "^9",
-    "playwright": "^1.48.2",
+    "eslint": "^9.16.0",
+    "playwright": "^1.49.0",
     "tsup": "^8.3.5",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10",
-    "vitest": "^2.1.4"
+    "typescript": "^5.7.2",
+    "vite": "^6.0.2",
+    "vitest": "^2.1.8"
   },
   "pnpm": {
     "overrides": {

src/browser/log/log-colors.ts

@@ -33,23 +33,23 @@ export function browserSupportsColors(): boolean {
     // @ts-expect-error xxx
       && document.documentElement.style.WebkitAppearance)
     // Is firebug? http://stackoverflow.com/a/398120/376773
-      || (typeof window !== 'undefined'
-        && window.console
+    || (typeof window !== 'undefined'
+      && window.console
+      // @ts-expect-error xxx
+      && (window.console.firebug
       // @ts-expect-error xxx
-        && (window.console.firebug
-        // @ts-expect-error xxx
 
-          || (window.console.exception && window.console.table)))
+        || (window.console.exception && window.console.table)))
     // Is firefox >= v31?
     // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-          || (typeof navigator !== 'undefined'
-            && navigator.userAgent
-            && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)
-          // eslint-disable-next-line regexp/no-legacy-features
-            && Number.parseInt(RegExp.$1, 10) >= 31)
+      || (typeof navigator !== 'undefined'
+        && navigator.userAgent
+        && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)
+      // eslint-disable-next-line regexp/no-legacy-features
+        && Number.parseInt(RegExp.$1, 10) >= 31)
     // Double check webkit in userAgent just in case we are in a worker
-            || (typeof navigator !== 'undefined'
-              && navigator.userAgent
-              && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/))
+      || (typeof navigator !== 'undefined'
+        && navigator.userAgent
+        && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/))
   )
 }

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

@@ -0,0 +1,28 @@
+import type { Infer } from './schema'
+import { schemaExportSwiftStruct } from './export-swift'
+import { boolean, int, number, object, string } from './schema'
+
+describe('swift.spec', () => {
+  it('parse args', async () => {
+    const schema = object({
+      anInt: int().optional().default(0),
+      aBool: boolean(),
+      aNumber: number(),
+      aString: string(),
+    })
+
+    type t = Infer<typeof schema>
+    expectTypeOf<t>().toMatchTypeOf<any>()
+
+    const r = schemaExportSwiftStruct(schema, 'Test')
+
+    expect(r).toMatchInlineSnapshot(`
+      "struct Test {
+        var anInt: Int? = 0
+        var aBool: Bool
+        var aNumber: Double
+        var aString: String
+      }"
+    `)
+  })
+})

src/common/schema/export-swift.ts

@@ -0,0 +1,39 @@
+import type { Type } from './schema'
+import { assert } from '../assert'
+import { objectMap } from '../data/object'
+import { isSchemaObjectFlat } from './utils'
+
+// declare module './schema' {
+//   interface TypeProps {
+//     argShort?: string
+//     argDesc?: string
+//   }
+// }
+
+const mapSwiftType = {
+  string: 'String',
+  number: 'Double',
+  int: 'Int',
+  boolean: 'Bool',
+} as any
+
+export function schemaExportSwiftStruct<T>(schema: Type<T>, name: string = 'Example'): string {
+  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')
+
+  const lines: string[] = [
+    `struct ${name} {`,
+  ]
+
+  objectMap(schema._object!, (key, schema: Type<any>) => {
+    let s = `  var ${key}: ${mapSwiftType[schema.type] ?? schema.type}`
+    if (schema._optional === true)
+      s += '?'
+    if (schema._default != null)
+      s += ` = ${schema._default}`
+    lines.push(s)
+  })
+
+  lines.push('}')
+
+  return lines.join('\n')
+}

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

@@ -0,0 +1,28 @@
+import type { Infer } from './schema'
+import { schemaExportTypescriptInterface } from './export-typescript'
+import { boolean, int, number, object, string } from './schema'
+
+describe('typescript.spec', () => {
+  it('parse args', async () => {
+    const schema = object({
+      anInt: int().optional().default(0),
+      aBool: boolean(),
+      aNumber: number(),
+      aString: string(),
+    })
+
+    type t = Infer<typeof schema>
+    expectTypeOf<t>().toMatchTypeOf<any>()
+
+    const r = schemaExportTypescriptInterface(schema, 'Test')
+
+    expect(r).toMatchInlineSnapshot(`
+      "interface Test {
+        anInt?: number
+        aBool: boolean
+        aNumber: number
+        aString: string
+      }"
+    `)
+  })
+})

src/common/schema/export-typescript.ts

@@ -0,0 +1,34 @@
+import type { Type } from './schema'
+import { assert } from '../assert'
+import { objectMap } from '../data/object'
+import { isSchemaObjectFlat } from './utils'
+
+// declare module './schema' {
+//   interface TypeProps {
+//     argShort?: string
+//     argDesc?: string
+//   }
+// }
+
+const mapTypescriptType = {
+  int: 'number',
+} as any
+
+export function schemaExportTypescriptInterface<T>(schema: Type<T>, name: string = 'Example'): string {
+  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')
+
+  const lines: string[] = [
+    `interface ${name} {`,
+  ]
+
+  objectMap(schema._object!, (key, schema: Type<any>) => {
+    const s = `  ${key}${schema._optional === true ? '?' : ''}: ${mapTypescriptType[schema.type] ?? schema.type}`
+    // if (schema._default != null)
+    //   s += ` = ${schema._default}`
+    lines.push(s)
+  })
+
+  lines.push('}')
+
+  return lines.join('\n')
+}

src/common/schema/index.ts

@@ -1,4 +1,6 @@
 export * from './args'
 export * from './env'
+export * from './export-swift'
+export * from './export-typescript'
 export * from './schema'
 export * from './utils'