Merge branch 'release/v0.24.6'

holtwick · Aug 26, 2024 · c6f2715 · c6f2715
2 parents ca3333f + 558279d
commit c6f2715
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.24.5",
+  "version": "0.24.6",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",

diff --git a/src/common/schema/schema.spec.ts b/src/common/schema/schema.spec.ts
@@ -1,5 +1,5 @@
 import { cloneJsonObject } from '../data'
-import { boolean, int, literal, number, object, string, stringLiterals, union } from './schema'
+import { boolean, float, int, literal, object, string, union } from './schema'
 import type { Infer } from './types'
 
 describe('schema', () => {
@@ -14,7 +14,7 @@ describe('schema', () => {
       // status: stringLiterals(['active', 'trialing', 'past_due', 'paused', 'deleted']),
       status: string<Status>(),
       obj: object({
-        test: number(),
+        test: float(),
       }).optional(),
     })
 
@@ -36,9 +36,8 @@ describe('schema', () => {
             "type": "boolean",
           },
           "age": Object {
-            "_integer": true,
             "_optional": true,
-            "type": "number",
+            "type": "int",
           },
           "id": Object {
             "type": "string",

diff --git a/src/common/schema/schema.ts b/src/common/schema/schema.ts
@@ -64,9 +64,10 @@ export function number<T = number>() {
   })
 }
 
+export const float = number
+
 export function int<T = number>() {
-  return generic<T>('number', {
-    _integer: true,
+  return generic<T>('int', {
     _check: isInteger,
   })
 }

diff --git a/src/common/schema/types.ts b/src/common/schema/types.ts
@@ -3,7 +3,7 @@
 export interface TypeProps {
 }
 
-export type TypeNames = 'string' | 'number' | 'boolean' | 'object' | 'any' | string // | 'null' | 'undefined' | 'symbol' | 'bigint'
+export type TypeNames = 'string' | 'number' | 'boolean' | 'int' | 'object' | 'any' | string // | 'null' | 'undefined' | 'symbol' | 'bigint'
 
 export interface Type<T = unknown> {
   type: TypeNames
@@ -12,7 +12,6 @@ export interface Type<T = unknown> {
   _default?: T | (() => T)
   _object?: SchemaDefinitionObject<Type<T>>
   _union?: Type[]
-  _integer?: boolean
 
   _check: (obj: any) => boolean