Merge branch 'release/v0.24.5'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",

src/common/schema/schema.spec.ts

@@ -1,5 +1,5 @@
 import { cloneJsonObject } from '../data'
-import { boolean, literal, number, object, string, stringLiterals, union } from './schema'
+import { boolean, int, literal, number, object, string, stringLiterals, union } from './schema'
 import type { Infer } from './types'
 
 describe('schema', () => {
@@ -9,7 +9,7 @@ describe('schema', () => {
     const schema = object({
       id: string().default(() => '123'),
       name: string(),
-      age: number().optional(),
+      age: int().optional(),
       active: boolean(),
       // status: stringLiterals(['active', 'trialing', 'past_due', 'paused', 'deleted']),
       status: string<Status>(),
@@ -36,6 +36,7 @@ describe('schema', () => {
             "type": "boolean",
           },
           "age": Object {
+            "_integer": true,
             "_optional": true,
             "type": "number",
           },

src/common/schema/schema.ts

@@ -1,4 +1,4 @@
-import { first, isBoolean, isFunction, isNumber, isObject, isString } from '../data'
+import { first, isBoolean, isFunction, isInteger, isNumber, isObject, isString } from '../data'
 import type { SchemaDefinitionObject, Type, TypeNames, TypeObject } from './types'
 
 // Helper
@@ -64,6 +64,13 @@ export function number<T = number>() {
   })
 }
 
+export function int<T = number>() {
+  return generic<T>('number', {
+    _integer: true,
+    _check: isInteger,
+  })
+}
+
 export function boolean<T = boolean>() {
   return generic<T>('boolean', {
     _check: isBoolean,
@@ -94,12 +101,6 @@ export function object<T extends SchemaDefinitionObject>(tobj: T): TypeObject<T>
       const result = fn.call(this as any, obj, this as any)
       if (result !== undefined)
         return result
-
-      // if (!isObject(obj))
-      //   return new Error('expected object input')
-      // if (!isObject(this._object))
-      //   return new Error('expected object definition')
-
       const newObj: any = {}
       if (obj) {
         for (const [key, info] of Object.entries(this._object ?? {})) {

src/common/schema/types.ts

@@ -12,6 +12,7 @@ export interface Type<T = unknown> {
   _default?: T | (() => T)
   _object?: SchemaDefinitionObject<Type<T>>
   _union?: Type[]
+  _integer?: boolean
 
   _check: (obj: any) => boolean