Merge branch 'release/v0.28.14'

Author: holtwick

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.28.13",
+  "version": "0.28.14",
   "packageManager": "pnpm@10.11.0",
   "description": "🌱 Simple foundation library",
   "author": {

src/common/schema/parse-env.ts

@@ -1,9 +1,8 @@
 import type { Type } from './schema'
-import { A } from 'vitest/dist/chunks/environment.d.Dmw5ulng.js'
 import { assert } from '../assert'
-import { fromCamelCase, toCamelCase } from '../data/camelcase'
+import { fromCamelCase } from '../data/camelcase'
 import { valueToBoolean, valueToBooleanNotFalse, valueToInteger } from '../data/convert'
-import { objectFilter, objectMap } from '../data/object'
+import { objectMap } from '../data/object'
 import { isSchemaObjectFlat } from './utils'
 
 declare module './schema' {
@@ -13,10 +12,10 @@ declare module './schema' {
   }
 }
 
-type EnvType = Record<string, any>
+export type SchemaEnvType = Record<string, any>
 
-interface SchemaEnvOptions {
-  env?: EnvType
+export interface SchemaEnvOptions {
+  env?: SchemaEnvType
   prefix?: string
   prefixOptional?: boolean // if true, prefix is optional
 }
@@ -25,9 +24,9 @@ export function parseSchemaEnv<T>(schema: Type<T>, opt?: SchemaEnvOptions): T {
   assert(schema?._object, 'schema should be of type object')
   assert(isSchemaObjectFlat(schema), 'schema should be a flat object')
 
-  let {
+  const {
     // eslint-disable-next-line node/prefer-global/process
-    env = (process?.env ?? {}) as EnvType,
+    env = (process?.env ?? {}) as SchemaEnvType,
     prefix = '',
     prefixOptional = false,
   } = opt ?? {}
@@ -59,34 +58,6 @@ export function parseSchemaEnv<T>(schema: Type<T>, opt?: SchemaEnvOptions): T {
     }
     return schema.parse(value)
   }) as T
-
-  if (pl > 0)
-    env = objectFilter(env, key => key.startsWith(prefix))
-  env = objectMap(env, (key, value) => {
-    if (pl > 0)
-      key = key.substring(pl)
-    return [toCamelCase(key), value]
-  })
-  const result = objectMap(schema._object!, (key, schema) => {
-    let value = env[toCamelCase(key)]
-    if (schema.type === 'number') {
-      value = valueToInteger(value, schema._default)
-    }
-    else if (schema.type === 'boolean') {
-      if (schema._default === true)
-        value = valueToBooleanNotFalse(value)
-      else
-        value = valueToBoolean(value, false)
-    }
-    return schema.parse(value)
-  }) as T
-
-  if (prefixOptional !== true || pl <= 0) {
-    return result
-  }
-
-  const resultWithoutPrefix = parseSchemaEnv(schema, { ...opt, prefix: '', prefixOptional: false })
-  return { ...resultWithoutPrefix, ...result }
 }
 
 export function stringFromSchemaEnv<T>(schema: Type<T>, prefix = '', commentOut = false, showPrivate = false): string {