zeed 1.3.0 → 1.4.0

package/dist/common/schema/parse-env.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"parse-env.mjs","names":[],"sources":["../../../src/common/schema/parse-env.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { assert } from '../assert'\nimport { fromCamelCase } from '../data/camelcase'\nimport { valueToBoolean, valueToBooleanNotFalse, valueToInteger } from '../data/convert'\nimport { objectMap } from '../data/object'\nimport { schemaParseObject } from './parse-object'\nimport { isSchemaObjectFlat } from './utils'\n\ndeclare module './schema' {\n  interface TypeMeta {\n    envDesc?: string\n    envPrivate?: boolean // will not be documented\n    envSkip?: boolean // will not be included in env parsing\n  }\n}\n\nexport type SchemaEnvType = Record<string, any>\n\nexport interface SchemaEnvOptions<T> {\n  existing?: Partial<T> // if true, will only parse existing env variables\n  env?: SchemaEnvType\n  prefix?: string\n  prefixOptional?: boolean // if true, prefix is optional\n}\n\nexport function parseSchemaEnv<T>(schema: Type<T>, opt?: SchemaEnvOptions<T>): T {\n  assert(schema?._object, 'schema should be of type object')\n  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n\n  const {\n    // eslint-disable-next-line node/prefer-global/process\n    env = (process?.env ?? {}) as SchemaEnvType,\n    prefix = '',\n    prefixOptional = false,\n  } = opt ?? {}\n  const pl = prefix.length\n  const existing: any = opt?.existing ?? {}\n\n  return objectMap(schema._object, (key, schema) => {\n    const defaultValue = existing[key] ?? schema._default\n    if (schema._meta?.envSkip)\n      return defaultValue\n\n    const envKey = fromCamelCase(key, '_').toUpperCase()\n    const envKeyWithPrefix = prefix + fromCamelCase(key, '_').toUpperCase()\n\n    let value: any = env[envKey]\n\n    if (pl > 0) {\n      if (prefixOptional === true) {\n        value = env[envKeyWithPrefix] ?? value\n      }\n      else {\n        value = env[envKeyWithPrefix]\n      }\n    }\n\n    if (value === undefined) {\n      return defaultValue\n    }\n\n    if (schema.type === 'number') {\n      value = valueToInteger(value, schema._default)\n    }\n    else if (schema.type === 'boolean') {\n      if (schema._default === true)\n        value = valueToBooleanNotFalse(value)\n      else\n        value = valueToBoolean(value, false)\n    }\n    return schemaParseObject(schema, value)\n  }) as T\n}\n\nexport function stringFromSchemaEnv<T>(schema: Type<T>, prefix = '', commentOut = false, showPrivate = false): string {\n  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n  const lines: string[] = []\n  objectMap(schema._object!, (key, schema) => {\n    if ((schema._meta?.envPrivate || schema._meta?.envSkip) && !showPrivate)\n      return\n    const desc = schema._meta?.envDesc ?? schema._meta?.desc\n    if (desc) {\n      desc.trim().split('\\n').forEach((line: string) => {\n        lines.push(`# ${line.trim()}`)\n      })\n    }\n    lines.push(`${commentOut ? '# ' : ''}${prefix + fromCamelCase(key, '_').toUpperCase()}=${schema._default ?? ''}`)\n    lines.push('')\n  }) as T\n  return lines.join('\\n')\n}\n"],"mappings":"yVAyBA,SAAgB,EAAkB,EAAiB,EAA8B,CAC/E,EAAO,GAAQ,QAAS,kCAAkC,CAC1D,EAAO,EAAmB,EAAO,CAAE,iCAAiC,CAEpE,GAAM,CAEJ,MAAO,SAAS,KAAO,EAAE,CACzB,SAAS,GACT,iBAAiB,IACf,GAAO,EAAE,CACP,EAAK,EAAO,OACZ,EAAgB,GAAK,UAAY,EAAE,CAEzC,OAAO,EAAU,EAAO,SAAU,EAAK,IAAW,CAChD,IAAM,EAAe,EAAS,IAAQ,EAAO,SAC7C,GAAI,EAAO,OAAO,QAChB,OAAO,EAET,IAAM,EAAS,EAAc,EAAK,IAAI,CAAC,aAAa,CAC9C,EAAmB,EAAS,EAAc,EAAK,IAAI,CAAC,aAAa,CAEnE,EAAa,EAAI,GAwBrB,OAtBI,EAAK,IACP,AAIE,EAJE,IAAmB,GACb,EAAI,IAAqB,EAGzB,EAAI,IAIZ,IAAU,IAAA,GACL,GAGL,EAAO,OAAS,SAClB,EAAQ,EAAe,EAAO,EAAO,SAAS,CAEvC,EAAO,OAAS,YACvB,AAGE,EAHE,EAAO,WAAa,GACd,EAAuB,EAAM,CAE7B,EAAe,EAAO,GAAM,EAEjC,EAAkB,EAAQ,EAAM,GACvC,CAGJ,SAAgB,EAAuB,EAAiB,EAAS,GAAI,EAAa,GAAO,EAAc,GAAe,CACpH,EAAO,EAAmB,EAAO,CAAE,iCAAiC,CACpE,IAAM,EAAkB,EAAE,CAa1B,OAZA,EAAU,EAAO,SAAW,EAAK,IAAW,CAC1C,IAAK,EAAO,OAAO,YAAc,EAAO,OAAO,UAAY,CAAC,EAC1D,OACF,IAAM,EAAO,EAAO,OAAO,SAAW,EAAO,OAAO,KAChD,GACF,EAAK,MAAM,CAAC,MAAM;EAAK,CAAC,QAAS,GAAiB,CAChD,EAAM,KAAK,KAAK,EAAK,MAAM,GAAG,EAC9B,CAEJ,EAAM,KAAK,GAAG,EAAa,KAAO,KAAK,EAAS,EAAc,EAAK,IAAI,CAAC,aAAa,CAAC,GAAG,EAAO,UAAY,KAAK,CACjH,EAAM,KAAK,GAAG,EACd,CACK,EAAM,KAAK;EAAK"}
+{"version":3,"file":"parse-env.mjs","names":[],"sources":["../../../src/common/schema/parse-env.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { assert } from '../assert'\nimport { fromCamelCase } from '../data/camelcase'\nimport { valueToBoolean, valueToBooleanNotFalse, valueToInteger } from '../data/convert'\nimport { objectMap } from '../data/object'\nimport { schemaParseObject } from './parse-object'\nimport { isSchemaObjectFlat } from './utils'\n\ndeclare module './schema' {\n  interface TypeMeta {\n    envDesc?: string\n    envPrivate?: boolean // will not be documented\n    envSkip?: boolean // will not be included in env parsing\n  }\n}\n\nexport type SchemaEnvType = Record<string, any>\n\nexport interface SchemaEnvOptions<T> {\n  existing?: Partial<T> // if true, will only parse existing env variables\n  env?: SchemaEnvType\n  prefix?: string\n  prefixOptional?: boolean // if true, prefix is optional\n}\n\nexport function parseSchemaEnv<T>(schema: Type<T>, opt?: SchemaEnvOptions<T>): T {\n  assert(schema?._object, 'schema should be of type object')\n  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n\n  const {\n    // eslint-disable-next-line node/prefer-global/process\n    env = (process?.env ?? {}) as SchemaEnvType,\n    prefix = '',\n    prefixOptional = false,\n  } = opt ?? {}\n  const pl = prefix.length\n  const existing: any = opt?.existing ?? {}\n\n  return objectMap(schema._object, (key, schema) => {\n    const defaultValue = existing[key] ?? schema._default\n    if (schema._meta?.envSkip)\n      return defaultValue\n\n    const envKey = fromCamelCase(key, '_').toUpperCase()\n    const envKeyWithPrefix = prefix + fromCamelCase(key, '_').toUpperCase()\n\n    let value: any = env[envKey]\n\n    if (pl > 0) {\n      if (prefixOptional === true) {\n        value = env[envKeyWithPrefix] ?? value\n      }\n      else {\n        value = env[envKeyWithPrefix]\n      }\n    }\n\n    if (value === undefined) {\n      return defaultValue\n    }\n\n    if (schema.type === 'number') {\n      value = valueToInteger(value, schema._default)\n    }\n    else if (schema.type === 'boolean') {\n      if (schema._default === true)\n        value = valueToBooleanNotFalse(value)\n      else\n        value = valueToBoolean(value, false)\n    }\n    return schemaParseObject(schema, value)\n  }) as T\n}\n\nexport function stringFromSchemaEnv<T>(schema: Type<T>, prefix = '', commentOut = false, showPrivate = false): string {\n  assert(isSchemaObjectFlat(schema), 'schema should be a flat object')\n  const lines: string[] = []\n  objectMap(schema._object!, (key, schema) => {\n    if ((schema._meta?.envPrivate || schema._meta?.envSkip) && !showPrivate)\n      return\n    const desc = schema._meta?.envDesc ?? schema._meta?.desc\n    if (desc) {\n      desc.trim().split('\\n').forEach((line: string) => {\n        lines.push(`# ${line.trim()}`)\n      })\n    }\n    lines.push(`${commentOut ? '# ' : ''}${prefix + fromCamelCase(key, '_').toUpperCase()}=${schema._default ?? ''}`)\n    lines.push('')\n  }) as T\n  return lines.join('\\n')\n}\n"],"mappings":";;;;;;;;AAyBA,SAAgB,eAAkB,QAAiB,KAA8B;AAC/E,QAAO,QAAQ,SAAS,kCAAkC;AAC1D,QAAO,mBAAmB,OAAO,EAAE,iCAAiC;CAEpE,MAAM,EAEJ,MAAO,SAAS,OAAO,EAAE,EACzB,SAAS,IACT,iBAAiB,UACf,OAAO,EAAE;CACb,MAAM,KAAK,OAAO;CAClB,MAAM,WAAgB,KAAK,YAAY,EAAE;AAEzC,QAAO,UAAU,OAAO,UAAU,KAAK,WAAW;EAChD,MAAM,eAAe,SAAS,QAAQ,OAAO;AAC7C,MAAI,OAAO,OAAO,QAChB,QAAO;EAET,MAAM,SAAS,cAAc,KAAK,IAAI,CAAC,aAAa;EACpD,MAAM,mBAAmB,SAAS,cAAc,KAAK,IAAI,CAAC,aAAa;EAEvE,IAAI,QAAa,IAAI;AAErB,MAAI,KAAK,EACP,KAAI,mBAAmB,KACrB,SAAQ,IAAI,qBAAqB;MAGjC,SAAQ,IAAI;AAIhB,MAAI,UAAU,OACZ,QAAO;AAGT,MAAI,OAAO,SAAS,SAClB,SAAQ,eAAe,OAAO,OAAO,SAAS;WAEvC,OAAO,SAAS,UACvB,KAAI,OAAO,aAAa,KACtB,SAAQ,uBAAuB,MAAM;MAErC,SAAQ,eAAe,OAAO,MAAM;AAExC,SAAO,kBAAkB,QAAQ,MAAM;GACvC;;AAGJ,SAAgB,oBAAuB,QAAiB,SAAS,IAAI,aAAa,OAAO,cAAc,OAAe;AACpH,QAAO,mBAAmB,OAAO,EAAE,iCAAiC;CACpE,MAAM,QAAkB,EAAE;AAC1B,WAAU,OAAO,UAAW,KAAK,WAAW;AAC1C,OAAK,OAAO,OAAO,cAAc,OAAO,OAAO,YAAY,CAAC,YAC1D;EACF,MAAM,OAAO,OAAO,OAAO,WAAW,OAAO,OAAO;AACpD,MAAI,KACF,MAAK,MAAM,CAAC,MAAM,KAAK,CAAC,SAAS,SAAiB;AAChD,SAAM,KAAK,KAAK,KAAK,MAAM,GAAG;IAC9B;AAEJ,QAAM,KAAK,GAAG,aAAa,OAAO,KAAK,SAAS,cAAc,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,OAAO,YAAY,KAAK;AACjH,QAAM,KAAK,GAAG;GACd;AACF,QAAO,MAAM,KAAK,KAAK"}

package/dist/common/schema/parse-object.cjs

@@ -1,2 +1,123 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`../data/is.cjs`),t=require(`../data/array.cjs`),n=require(`../data/convert.cjs`);function r(t){if(t._default!==void 0)return e.isFunction(t._default)?t._default(t):t._default;if(!t._optional&&t._object){let e={};for(let n in t._object){let i=t._object[n],a=r(i);a!==void 0&&(e[n]=a)}return e}}function i(n,r,a){let o=a?.messages||[];function s(e,t=!1){return o.push({path:`.${a?.path??``}`,message:e,valid:t,type:n.type}),t}if(r==null&&n._optional)return s(`Optional`,!0);if(n._object){if(a?.allowExtra!==!0){let e=Object.keys(n._object),i=t.arrayMinus(Object.keys(r||{}),e);if(i.length>0)return s(`Extra properties: ${i.join(`, `)}`,!1)}for(let e in n._object){let t=n._object[e];if(!i(t,r[e],{...a,path:a?.path?`${a.path}.${e}`:e,messages:o}))return s(`Invalid property '${e}'`,!1)}return s(`Object valid`,!0)}return e.isFunction(n._check)?s(`Check`,n._check(r)):s(`Primitive valid`,!1)}function a(t,r,i){let o=i?.messages||[];function s(e,n=!1){return o.push({path:`.${i?.path??``}`,message:e,valid:n,type:t.type}),n}if(r==null){if(t._optional){s(`Optional`,!0);return}if(t._default!==void 0&&i?.skipDefault!==!0)return s(`Default`,!0),e.isFunction(t._default)?t._default(t):t._default;t._object&&(r={})}if(t._object){let n={},s=t._object;for(let t in s){let c=s[t],l=a(c,r[t],{...i,path:i?.path?`${i.path}.${t}`:t,messages:o});l===void 0?c._default!==void 0&&i?.skipDefault!==!0?n[t]=e.isFunction(c._default)?c._default(c):c._default:c._optional&&r&&typeof r==`object`&&t in r&&(n[t]=void 0):n[t]=l}if(i?.allowExtra&&r&&typeof r==`object`)for(let[e,t]of Object.entries(r))e in s||(n[e]=t);return n}if(r!=null){if(t.type===`string`)r=n.valueToString(r);else if(t.type===`boolean`)r=n.valueToBoolean(r);else if(t.type===`number`){if(r=n.valueToFloat(r),Number.isNaN(r)){s(`Invalid number: ${r}`,!1);return}}else if(t.type===`int`&&(r=n.valueToInteger(r),Number.isNaN(r))){s(`Invalid number: ${r}`,!1);return}}if(e.isFunction(t._check)){let e=t._check(r);return s(`Check`,e),e?r:void 0}return r}exports.schemaCreateObject=r,exports.schemaParseObject=a,exports.schemaValidateObject=i;
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_common_data_is = require('../data/is.cjs');
+const require_common_data_array = require('../data/array.cjs');
+const require_common_data_convert = require('../data/convert.cjs');
+
+//#region src/common/schema/parse-object.ts
+function schemaCreateObject(schema) {
+	if (schema._default !== void 0) return require_common_data_is.isFunction(schema._default) ? schema._default(schema) : schema._default;
+	if (schema._optional) return;
+	if (schema._object) {
+		const obj = {};
+		for (const key in schema._object) {
+			const propSchema = schema._object[key];
+			const value = schemaCreateObject(propSchema);
+			if (value !== void 0) obj[key] = value;
+		}
+		return obj;
+	}
+}
+function schemaValidateObject(schema, obj, opt) {
+	const messages = opt?.messages || [];
+	function addMessage(message, valid = false) {
+		messages.push({
+			path: `.${opt?.path ?? ""}`,
+			message,
+			valid,
+			type: schema.type
+		});
+		return valid;
+	}
+	if (obj == null && schema._optional) return addMessage("Optional", true);
+	if (schema._object) {
+		if (opt?.allowExtra !== true) {
+			const schemaKeys = Object.keys(schema._object);
+			const missingKeys = require_common_data_array.arrayMinus(Object.keys(obj || {}), schemaKeys);
+			if (missingKeys.length > 0) return addMessage(`Extra properties: ${missingKeys.join(", ")}`, false);
+		}
+		for (const key in schema._object) {
+			const propSchema = schema._object[key];
+			if (!schemaValidateObject(propSchema, obj[key], {
+				...opt,
+				path: opt?.path ? `${opt.path}.${key}` : key,
+				messages
+			})) return addMessage(`Invalid property '${key}'`, false);
+		}
+		return addMessage("Object valid", true);
+	}
+	if (require_common_data_is.isFunction(schema._check)) return addMessage("Check", schema._check(obj));
+	return addMessage("Primitive valid", false);
+}
+function schemaParseObject(schema, obj, opt) {
+	const messages = opt?.messages || [];
+	function addMessage(message, valid = false) {
+		messages.push({
+			path: `.${opt?.path ?? ""}`,
+			message,
+			valid,
+			type: schema.type
+		});
+		return valid;
+	}
+	if (obj == null) {
+		if (schema._optional) {
+			addMessage("Optional", true);
+			return;
+		}
+		if (schema._default !== void 0 && opt?.skipDefault !== true) {
+			addMessage("Default", true);
+			return require_common_data_is.isFunction(schema._default) ? schema._default(schema) : schema._default;
+		}
+		if (schema._object) obj = {};
+	}
+	if (schema._object) {
+		const newObj = {};
+		const shape = schema._object;
+		for (const key in shape) {
+			const propSchema = shape[key];
+			const result = schemaParseObject(propSchema, obj[key], {
+				...opt,
+				path: opt?.path ? `${opt.path}.${key}` : key,
+				messages
+			});
+			if (result !== void 0) newObj[key] = result;
+			else if (propSchema._default !== void 0 && opt?.skipDefault !== true) newObj[key] = require_common_data_is.isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default;
+			else if (propSchema._optional) {
+				if (obj && typeof obj === "object" && key in obj) newObj[key] = void 0;
+			}
+		}
+		if (opt?.allowExtra && obj && typeof obj === "object") {
+			for (const [key, value] of Object.entries(obj)) if (!(key in shape)) newObj[key] = value;
+		}
+		return newObj;
+	}
+	if (obj != null) {
+		if (schema.type === "string") obj = require_common_data_convert.valueToString(obj);
+		else if (schema.type === "boolean") obj = require_common_data_convert.valueToBoolean(obj);
+		else if (schema.type === "number") {
+			obj = require_common_data_convert.valueToFloat(obj);
+			if (Number.isNaN(obj)) {
+				addMessage(`Invalid number: ${obj}`, false);
+				return;
+			}
+		} else if (schema.type === "int") {
+			obj = require_common_data_convert.valueToInteger(obj);
+			if (Number.isNaN(obj)) {
+				addMessage(`Invalid number: ${obj}`, false);
+				return;
+			}
+		}
+	}
+	if (require_common_data_is.isFunction(schema._check)) {
+		const checkResult = schema._check(obj);
+		addMessage("Check", checkResult);
+		return checkResult ? obj : void 0;
+	}
+	return obj;
+}
+
+//#endregion
+exports.schemaCreateObject = schemaCreateObject;
+exports.schemaParseObject = schemaParseObject;
+exports.schemaValidateObject = schemaValidateObject;
 //# sourceMappingURL=parse-object.cjs.map

package/dist/common/schema/parse-object.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"parse-object.cjs","names":["isFunction","arrayMinus","valueToString","valueToBoolean","valueToFloat","valueToInteger"],"sources":["../../../src/common/schema/parse-object.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { arrayMinus, isFunction, valueToBoolean, valueToFloat, valueToInteger, valueToString } from '../data'\n\nexport function schemaCreateObject<T>(schema: Type<T>): Partial<T> | undefined {\n  if (schema._default !== undefined) {\n    return isFunction(schema._default) ? schema._default(schema) : schema._default\n  }\n\n  if (schema._optional) {\n    return undefined as any\n  }\n\n  if (schema._object) {\n    const obj: any = {}\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as Type<any>\n      const value = schemaCreateObject(propSchema)\n      if (value !== undefined) {\n        obj[key] = value\n      }\n    }\n    return obj\n  }\n\n  // For non-optional, non-object types without defaults, don't return anything\n  // This prevents setting undefined values in the parent object\n  return undefined\n}\n\n/**\n * Message for schema validation results.\n * @category Schema\n */\nexport interface SchemaValidateMessage {\n  path: string\n  message: string\n  type: string\n  valid: boolean\n}\n\nexport function schemaValidateObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n  allowExtra?: boolean\n}): boolean {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    return valid\n  }\n\n  if (obj == null && schema._optional) {\n    return addMessage('Optional', true)\n  }\n\n  if (schema._object) {\n    if (opt?.allowExtra !== true) {\n      const schemaKeys = Object.keys(schema._object)\n      const objKeys = Object.keys(obj || {})\n      const missingKeys = arrayMinus(objKeys, schemaKeys)\n      if (missingKeys.length > 0) {\n        return addMessage(`Extra properties: ${missingKeys.join(', ')}`, false)\n      }\n    }\n\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as any\n      if (!schemaValidateObject(\n        propSchema,\n        obj[key] as any,\n        {\n          ...opt,\n          path: opt?.path ? `${opt.path}.${key}` : key,\n          messages,\n        },\n      )) { return addMessage(`Invalid property '${key}'`, false) }\n    }\n    return addMessage('Object valid', true)\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    return addMessage('Check', checkResult)\n  }\n\n  return addMessage('Primitive valid', false)\n}\n\nexport function schemaParseObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n\n  /// Whether to allow extra properties not defined in the schema\n  allowExtra?: boolean\n  skipDefault?: boolean\n}): T | undefined {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    // console.debug({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type }, obj)\n    return valid\n  }\n\n  if (obj == null) {\n    if (schema._optional) {\n      addMessage('Optional', true)\n      return undefined\n    }\n    if (schema._default !== undefined && opt?.skipDefault !== true) {\n      addMessage('Default', true)\n      return isFunction(schema._default) ? schema._default(schema) : schema._default\n    }\n    // For non-optional objects without explicit defaults, use empty object\n    if (schema._object) {\n      obj = {}\n    }\n  }\n\n  if (schema._object) {\n    const newObj: any = {}\n    const shape = schema._object\n    for (const key in shape) {\n      const propSchema = shape[key] as any\n      const result = schemaParseObject(propSchema, obj[key] as any, {\n        ...opt,\n        path: opt?.path ? `${opt.path}.${key}` : key,\n        messages,\n      })\n      if (result !== undefined) {\n        newObj[key] = result\n      }\n      else if (propSchema._default !== undefined && opt?.skipDefault !== true) {\n        newObj[key] = isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default\n      }\n      else if (propSchema._optional) {\n        // Only set undefined for optional properties if they were explicitly provided as undefined\n        if (obj && typeof obj === 'object' && key in obj) {\n          newObj[key] = undefined\n        }\n        // Otherwise, don't set the property at all\n      }\n      // For required properties without defaults, don't set undefined - leave them missing\n    }\n\n    // Add extra properties if allowExtra is enabled\n    if (opt?.allowExtra && obj && typeof obj === 'object') {\n      for (const [key, value] of Object.entries(obj)) {\n        if (!(key in shape)) {\n          newObj[key] = value\n        }\n      }\n    }\n\n    return newObj\n  }\n\n  if (obj != null) {\n    if (schema.type === 'string') {\n      obj = valueToString(obj)\n    }\n    else if (schema.type === 'boolean') {\n      obj = valueToBoolean(obj)\n    }\n    else if (schema.type === 'number') {\n      obj = valueToFloat(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n    else if (schema.type === 'int') {\n      obj = valueToInteger(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    addMessage('Check', checkResult)\n    return checkResult ? obj : undefined\n  }\n\n  return obj\n}\n"],"mappings":"qKAGA,SAAgB,EAAsB,EAAyC,CAC7E,GAAI,EAAO,WAAa,IAAA,GACtB,OAAOA,EAAAA,WAAW,EAAO,SAAS,CAAG,EAAO,SAAS,EAAO,CAAG,EAAO,SAGpE,MAAO,WAIP,EAAO,QAAS,CAClB,IAAM,EAAW,EAAE,CACnB,IAAK,IAAM,KAAO,EAAO,QAAS,CAChC,IAAM,EAAa,EAAO,QAAQ,GAC5B,EAAQ,EAAmB,EAAW,CACxC,IAAU,IAAA,KACZ,EAAI,GAAO,GAGf,OAAO,GAmBX,SAAgB,EAAwB,EAAiB,EAAW,EAIxD,CACV,IAAM,EAAW,GAAK,UAAY,EAAE,CAEpC,SAAS,EAAW,EAAiB,EAAiB,GAAO,CAE3D,OADA,EAAS,KAAK,CAAE,KAAM,IAAI,GAAK,MAAQ,KAAM,UAAS,QAAO,KAAM,EAAO,KAAM,CAAC,CAC1E,EAGT,GAAI,GAAO,MAAQ,EAAO,UACxB,OAAO,EAAW,WAAY,GAAK,CAGrC,GAAI,EAAO,QAAS,CAClB,GAAI,GAAK,aAAe,GAAM,CAC5B,IAAM,EAAa,OAAO,KAAK,EAAO,QAAQ,CAExC,EAAcC,EAAAA,WADJ,OAAO,KAAK,GAAO,EAAE,CAAC,CACE,EAAW,CACnD,GAAI,EAAY,OAAS,EACvB,OAAO,EAAW,qBAAqB,EAAY,KAAK,KAAK,GAAI,GAAM,CAI3E,IAAK,IAAM,KAAO,EAAO,QAAS,CAChC,IAAM,EAAa,EAAO,QAAQ,GAClC,GAAI,CAAC,EACH,EACA,EAAI,GACJ,CACE,GAAG,EACH,KAAM,GAAK,KAAO,GAAG,EAAI,KAAK,GAAG,IAAQ,EACzC,WACD,CACF,CAAI,OAAO,EAAW,qBAAqB,EAAI,GAAI,GAAM,CAE5D,OAAO,EAAW,eAAgB,GAAK,CAQzC,OALID,EAAAA,WAAW,EAAO,OAAO,CAEpB,EAAW,QADE,EAAO,OAAO,EAAI,CACC,CAGlC,EAAW,kBAAmB,GAAM,CAG7C,SAAgB,EAAqB,EAAiB,EAAW,EAO/C,CAChB,IAAM,EAAW,GAAK,UAAY,EAAE,CAEpC,SAAS,EAAW,EAAiB,EAAiB,GAAO,CAG3D,OAFA,EAAS,KAAK,CAAE,KAAM,IAAI,GAAK,MAAQ,KAAM,UAAS,QAAO,KAAM,EAAO,KAAM,CAAC,CAE1E,EAGT,GAAI,GAAO,KAAM,CACf,GAAI,EAAO,UAAW,CACpB,EAAW,WAAY,GAAK,CAC5B,OAEF,GAAI,EAAO,WAAa,IAAA,IAAa,GAAK,cAAgB,GAExD,OADA,EAAW,UAAW,GAAK,CACpBA,EAAAA,WAAW,EAAO,SAAS,CAAG,EAAO,SAAS,EAAO,CAAG,EAAO,SAGpE,EAAO,UACT,EAAM,EAAE,EAIZ,GAAI,EAAO,QAAS,CAClB,IAAM,EAAc,EAAE,CAChB,EAAQ,EAAO,QACrB,IAAK,IAAM,KAAO,EAAO,CACvB,IAAM,EAAa,EAAM,GACnB,EAAS,EAAkB,EAAY,EAAI,GAAa,CAC5D,GAAG,EACH,KAAM,GAAK,KAAO,GAAG,EAAI,KAAK,GAAG,IAAQ,EACzC,WACD,CAAC,CACE,IAAW,IAAA,GAGN,EAAW,WAAa,IAAA,IAAa,GAAK,cAAgB,GACjE,EAAO,GAAOA,EAAAA,WAAW,EAAW,SAAS,CAAG,EAAW,SAAS,EAAW,CAAG,EAAW,SAEtF,EAAW,WAEd,GAAO,OAAO,GAAQ,UAAY,KAAO,IAC3C,EAAO,GAAO,IAAA,IARhB,EAAO,GAAO,EAgBlB,GAAI,GAAK,YAAc,GAAO,OAAO,GAAQ,aACtC,GAAM,CAAC,EAAK,KAAU,OAAO,QAAQ,EAAI,CACtC,KAAO,IACX,EAAO,GAAO,GAKpB,OAAO,EAGT,GAAI,GAAO,SACL,EAAO,OAAS,SAClB,EAAME,EAAAA,cAAc,EAAI,SAEjB,EAAO,OAAS,UACvB,EAAMC,EAAAA,eAAe,EAAI,SAElB,EAAO,OAAS,SAEvB,IADA,EAAMC,EAAAA,aAAa,EAAI,CACnB,OAAO,MAAM,EAAI,CAAE,CACrB,EAAW,mBAAmB,IAAO,GAAM,CAC3C,gBAGK,EAAO,OAAS,QACvB,EAAMC,EAAAA,eAAe,EAAI,CACrB,OAAO,MAAM,EAAI,EAAE,CACrB,EAAW,mBAAmB,IAAO,GAAM,CAC3C,QAKN,GAAIL,EAAAA,WAAW,EAAO,OAAO,CAAE,CAC7B,IAAM,EAAc,EAAO,OAAO,EAAI,CAEtC,OADA,EAAW,QAAS,EAAY,CACzB,EAAc,EAAM,IAAA,GAG7B,OAAO"}
+{"version":3,"file":"parse-object.cjs","names":["isFunction","arrayMinus","valueToString","valueToBoolean","valueToFloat","valueToInteger"],"sources":["../../../src/common/schema/parse-object.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { arrayMinus, isFunction, valueToBoolean, valueToFloat, valueToInteger, valueToString } from '../data'\n\nexport function schemaCreateObject<T>(schema: Type<T>): Partial<T> | undefined {\n  if (schema._default !== undefined) {\n    return isFunction(schema._default) ? schema._default(schema) : schema._default\n  }\n\n  if (schema._optional) {\n    return undefined as any\n  }\n\n  if (schema._object) {\n    const obj: any = {}\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as Type<any>\n      const value = schemaCreateObject(propSchema)\n      if (value !== undefined) {\n        obj[key] = value\n      }\n    }\n    return obj\n  }\n\n  // For non-optional, non-object types without defaults, don't return anything\n  // This prevents setting undefined values in the parent object\n  return undefined\n}\n\n/**\n * Message for schema validation results.\n * @category Schema\n */\nexport interface SchemaValidateMessage {\n  path: string\n  message: string\n  type: string\n  valid: boolean\n}\n\nexport function schemaValidateObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n  allowExtra?: boolean\n}): boolean {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    return valid\n  }\n\n  if (obj == null && schema._optional) {\n    return addMessage('Optional', true)\n  }\n\n  if (schema._object) {\n    if (opt?.allowExtra !== true) {\n      const schemaKeys = Object.keys(schema._object)\n      const objKeys = Object.keys(obj || {})\n      const missingKeys = arrayMinus(objKeys, schemaKeys)\n      if (missingKeys.length > 0) {\n        return addMessage(`Extra properties: ${missingKeys.join(', ')}`, false)\n      }\n    }\n\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as any\n      if (!schemaValidateObject(\n        propSchema,\n        obj[key] as any,\n        {\n          ...opt,\n          path: opt?.path ? `${opt.path}.${key}` : key,\n          messages,\n        },\n      )) { return addMessage(`Invalid property '${key}'`, false) }\n    }\n    return addMessage('Object valid', true)\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    return addMessage('Check', checkResult)\n  }\n\n  return addMessage('Primitive valid', false)\n}\n\nexport function schemaParseObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n\n  /// Whether to allow extra properties not defined in the schema\n  allowExtra?: boolean\n  skipDefault?: boolean\n}): T | undefined {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    // console.debug({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type }, obj)\n    return valid\n  }\n\n  if (obj == null) {\n    if (schema._optional) {\n      addMessage('Optional', true)\n      return undefined\n    }\n    if (schema._default !== undefined && opt?.skipDefault !== true) {\n      addMessage('Default', true)\n      return isFunction(schema._default) ? schema._default(schema) : schema._default\n    }\n    // For non-optional objects without explicit defaults, use empty object\n    if (schema._object) {\n      obj = {}\n    }\n  }\n\n  if (schema._object) {\n    const newObj: any = {}\n    const shape = schema._object\n    for (const key in shape) {\n      const propSchema = shape[key] as any\n      const result = schemaParseObject(propSchema, obj[key] as any, {\n        ...opt,\n        path: opt?.path ? `${opt.path}.${key}` : key,\n        messages,\n      })\n      if (result !== undefined) {\n        newObj[key] = result\n      }\n      else if (propSchema._default !== undefined && opt?.skipDefault !== true) {\n        newObj[key] = isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default\n      }\n      else if (propSchema._optional) {\n        // Only set undefined for optional properties if they were explicitly provided as undefined\n        if (obj && typeof obj === 'object' && key in obj) {\n          newObj[key] = undefined\n        }\n        // Otherwise, don't set the property at all\n      }\n      // For required properties without defaults, don't set undefined - leave them missing\n    }\n\n    // Add extra properties if allowExtra is enabled\n    if (opt?.allowExtra && obj && typeof obj === 'object') {\n      for (const [key, value] of Object.entries(obj)) {\n        if (!(key in shape)) {\n          newObj[key] = value\n        }\n      }\n    }\n\n    return newObj\n  }\n\n  if (obj != null) {\n    if (schema.type === 'string') {\n      obj = valueToString(obj)\n    }\n    else if (schema.type === 'boolean') {\n      obj = valueToBoolean(obj)\n    }\n    else if (schema.type === 'number') {\n      obj = valueToFloat(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n    else if (schema.type === 'int') {\n      obj = valueToInteger(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    addMessage('Check', checkResult)\n    return checkResult ? obj : undefined\n  }\n\n  return obj\n}\n"],"mappings":"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"}

package/dist/common/schema/parse-object.mjs

@@ -1,2 +1,120 @@
-import{isFunction as e}from"../data/is.mjs";import{arrayMinus as t}from"../data/array.mjs";import{valueToBoolean as n,valueToFloat as r,valueToInteger as i,valueToString as a}from"../data/convert.mjs";function o(t){if(t._default!==void 0)return e(t._default)?t._default(t):t._default;if(!t._optional&&t._object){let e={};for(let n in t._object){let r=t._object[n],i=o(r);i!==void 0&&(e[n]=i)}return e}}function s(n,r,i){let a=i?.messages||[];function o(e,t=!1){return a.push({path:`.${i?.path??``}`,message:e,valid:t,type:n.type}),t}if(r==null&&n._optional)return o(`Optional`,!0);if(n._object){if(i?.allowExtra!==!0){let e=Object.keys(n._object),i=t(Object.keys(r||{}),e);if(i.length>0)return o(`Extra properties: ${i.join(`, `)}`,!1)}for(let e in n._object){let t=n._object[e];if(!s(t,r[e],{...i,path:i?.path?`${i.path}.${e}`:e,messages:a}))return o(`Invalid property '${e}'`,!1)}return o(`Object valid`,!0)}return e(n._check)?o(`Check`,n._check(r)):o(`Primitive valid`,!1)}function c(t,o,s){let l=s?.messages||[];function u(e,n=!1){return l.push({path:`.${s?.path??``}`,message:e,valid:n,type:t.type}),n}if(o==null){if(t._optional){u(`Optional`,!0);return}if(t._default!==void 0&&s?.skipDefault!==!0)return u(`Default`,!0),e(t._default)?t._default(t):t._default;t._object&&(o={})}if(t._object){let n={},r=t._object;for(let t in r){let i=r[t],a=c(i,o[t],{...s,path:s?.path?`${s.path}.${t}`:t,messages:l});a===void 0?i._default!==void 0&&s?.skipDefault!==!0?n[t]=e(i._default)?i._default(i):i._default:i._optional&&o&&typeof o==`object`&&t in o&&(n[t]=void 0):n[t]=a}if(s?.allowExtra&&o&&typeof o==`object`)for(let[e,t]of Object.entries(o))e in r||(n[e]=t);return n}if(o!=null){if(t.type===`string`)o=a(o);else if(t.type===`boolean`)o=n(o);else if(t.type===`number`){if(o=r(o),Number.isNaN(o)){u(`Invalid number: ${o}`,!1);return}}else if(t.type===`int`&&(o=i(o),Number.isNaN(o))){u(`Invalid number: ${o}`,!1);return}}if(e(t._check)){let e=t._check(o);return u(`Check`,e),e?o:void 0}return o}export{o as schemaCreateObject,c as schemaParseObject,s as schemaValidateObject};
+import { isFunction } from "../data/is.mjs";
+import { arrayMinus } from "../data/array.mjs";
+import { valueToBoolean, valueToFloat, valueToInteger, valueToString } from "../data/convert.mjs";
+
+//#region src/common/schema/parse-object.ts
+function schemaCreateObject(schema) {
+	if (schema._default !== void 0) return isFunction(schema._default) ? schema._default(schema) : schema._default;
+	if (schema._optional) return;
+	if (schema._object) {
+		const obj = {};
+		for (const key in schema._object) {
+			const propSchema = schema._object[key];
+			const value = schemaCreateObject(propSchema);
+			if (value !== void 0) obj[key] = value;
+		}
+		return obj;
+	}
+}
+function schemaValidateObject(schema, obj, opt) {
+	const messages = opt?.messages || [];
+	function addMessage(message, valid = false) {
+		messages.push({
+			path: `.${opt?.path ?? ""}`,
+			message,
+			valid,
+			type: schema.type
+		});
+		return valid;
+	}
+	if (obj == null && schema._optional) return addMessage("Optional", true);
+	if (schema._object) {
+		if (opt?.allowExtra !== true) {
+			const schemaKeys = Object.keys(schema._object);
+			const missingKeys = arrayMinus(Object.keys(obj || {}), schemaKeys);
+			if (missingKeys.length > 0) return addMessage(`Extra properties: ${missingKeys.join(", ")}`, false);
+		}
+		for (const key in schema._object) {
+			const propSchema = schema._object[key];
+			if (!schemaValidateObject(propSchema, obj[key], {
+				...opt,
+				path: opt?.path ? `${opt.path}.${key}` : key,
+				messages
+			})) return addMessage(`Invalid property '${key}'`, false);
+		}
+		return addMessage("Object valid", true);
+	}
+	if (isFunction(schema._check)) return addMessage("Check", schema._check(obj));
+	return addMessage("Primitive valid", false);
+}
+function schemaParseObject(schema, obj, opt) {
+	const messages = opt?.messages || [];
+	function addMessage(message, valid = false) {
+		messages.push({
+			path: `.${opt?.path ?? ""}`,
+			message,
+			valid,
+			type: schema.type
+		});
+		return valid;
+	}
+	if (obj == null) {
+		if (schema._optional) {
+			addMessage("Optional", true);
+			return;
+		}
+		if (schema._default !== void 0 && opt?.skipDefault !== true) {
+			addMessage("Default", true);
+			return isFunction(schema._default) ? schema._default(schema) : schema._default;
+		}
+		if (schema._object) obj = {};
+	}
+	if (schema._object) {
+		const newObj = {};
+		const shape = schema._object;
+		for (const key in shape) {
+			const propSchema = shape[key];
+			const result = schemaParseObject(propSchema, obj[key], {
+				...opt,
+				path: opt?.path ? `${opt.path}.${key}` : key,
+				messages
+			});
+			if (result !== void 0) newObj[key] = result;
+			else if (propSchema._default !== void 0 && opt?.skipDefault !== true) newObj[key] = isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default;
+			else if (propSchema._optional) {
+				if (obj && typeof obj === "object" && key in obj) newObj[key] = void 0;
+			}
+		}
+		if (opt?.allowExtra && obj && typeof obj === "object") {
+			for (const [key, value] of Object.entries(obj)) if (!(key in shape)) newObj[key] = value;
+		}
+		return newObj;
+	}
+	if (obj != null) {
+		if (schema.type === "string") obj = valueToString(obj);
+		else if (schema.type === "boolean") obj = valueToBoolean(obj);
+		else if (schema.type === "number") {
+			obj = valueToFloat(obj);
+			if (Number.isNaN(obj)) {
+				addMessage(`Invalid number: ${obj}`, false);
+				return;
+			}
+		} else if (schema.type === "int") {
+			obj = valueToInteger(obj);
+			if (Number.isNaN(obj)) {
+				addMessage(`Invalid number: ${obj}`, false);
+				return;
+			}
+		}
+	}
+	if (isFunction(schema._check)) {
+		const checkResult = schema._check(obj);
+		addMessage("Check", checkResult);
+		return checkResult ? obj : void 0;
+	}
+	return obj;
+}
+
+//#endregion
+export { schemaCreateObject, schemaParseObject, schemaValidateObject };
 //# sourceMappingURL=parse-object.mjs.map

package/dist/common/schema/parse-object.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"parse-object.mjs","names":[],"sources":["../../../src/common/schema/parse-object.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { arrayMinus, isFunction, valueToBoolean, valueToFloat, valueToInteger, valueToString } from '../data'\n\nexport function schemaCreateObject<T>(schema: Type<T>): Partial<T> | undefined {\n  if (schema._default !== undefined) {\n    return isFunction(schema._default) ? schema._default(schema) : schema._default\n  }\n\n  if (schema._optional) {\n    return undefined as any\n  }\n\n  if (schema._object) {\n    const obj: any = {}\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as Type<any>\n      const value = schemaCreateObject(propSchema)\n      if (value !== undefined) {\n        obj[key] = value\n      }\n    }\n    return obj\n  }\n\n  // For non-optional, non-object types without defaults, don't return anything\n  // This prevents setting undefined values in the parent object\n  return undefined\n}\n\n/**\n * Message for schema validation results.\n * @category Schema\n */\nexport interface SchemaValidateMessage {\n  path: string\n  message: string\n  type: string\n  valid: boolean\n}\n\nexport function schemaValidateObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n  allowExtra?: boolean\n}): boolean {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    return valid\n  }\n\n  if (obj == null && schema._optional) {\n    return addMessage('Optional', true)\n  }\n\n  if (schema._object) {\n    if (opt?.allowExtra !== true) {\n      const schemaKeys = Object.keys(schema._object)\n      const objKeys = Object.keys(obj || {})\n      const missingKeys = arrayMinus(objKeys, schemaKeys)\n      if (missingKeys.length > 0) {\n        return addMessage(`Extra properties: ${missingKeys.join(', ')}`, false)\n      }\n    }\n\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as any\n      if (!schemaValidateObject(\n        propSchema,\n        obj[key] as any,\n        {\n          ...opt,\n          path: opt?.path ? `${opt.path}.${key}` : key,\n          messages,\n        },\n      )) { return addMessage(`Invalid property '${key}'`, false) }\n    }\n    return addMessage('Object valid', true)\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    return addMessage('Check', checkResult)\n  }\n\n  return addMessage('Primitive valid', false)\n}\n\nexport function schemaParseObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n\n  /// Whether to allow extra properties not defined in the schema\n  allowExtra?: boolean\n  skipDefault?: boolean\n}): T | undefined {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    // console.debug({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type }, obj)\n    return valid\n  }\n\n  if (obj == null) {\n    if (schema._optional) {\n      addMessage('Optional', true)\n      return undefined\n    }\n    if (schema._default !== undefined && opt?.skipDefault !== true) {\n      addMessage('Default', true)\n      return isFunction(schema._default) ? schema._default(schema) : schema._default\n    }\n    // For non-optional objects without explicit defaults, use empty object\n    if (schema._object) {\n      obj = {}\n    }\n  }\n\n  if (schema._object) {\n    const newObj: any = {}\n    const shape = schema._object\n    for (const key in shape) {\n      const propSchema = shape[key] as any\n      const result = schemaParseObject(propSchema, obj[key] as any, {\n        ...opt,\n        path: opt?.path ? `${opt.path}.${key}` : key,\n        messages,\n      })\n      if (result !== undefined) {\n        newObj[key] = result\n      }\n      else if (propSchema._default !== undefined && opt?.skipDefault !== true) {\n        newObj[key] = isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default\n      }\n      else if (propSchema._optional) {\n        // Only set undefined for optional properties if they were explicitly provided as undefined\n        if (obj && typeof obj === 'object' && key in obj) {\n          newObj[key] = undefined\n        }\n        // Otherwise, don't set the property at all\n      }\n      // For required properties without defaults, don't set undefined - leave them missing\n    }\n\n    // Add extra properties if allowExtra is enabled\n    if (opt?.allowExtra && obj && typeof obj === 'object') {\n      for (const [key, value] of Object.entries(obj)) {\n        if (!(key in shape)) {\n          newObj[key] = value\n        }\n      }\n    }\n\n    return newObj\n  }\n\n  if (obj != null) {\n    if (schema.type === 'string') {\n      obj = valueToString(obj)\n    }\n    else if (schema.type === 'boolean') {\n      obj = valueToBoolean(obj)\n    }\n    else if (schema.type === 'number') {\n      obj = valueToFloat(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n    else if (schema.type === 'int') {\n      obj = valueToInteger(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    addMessage('Check', checkResult)\n    return checkResult ? obj : undefined\n  }\n\n  return obj\n}\n"],"mappings":"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"}
+{"version":3,"file":"parse-object.mjs","names":[],"sources":["../../../src/common/schema/parse-object.ts"],"sourcesContent":["import type { Type } from './schema'\nimport { arrayMinus, isFunction, valueToBoolean, valueToFloat, valueToInteger, valueToString } from '../data'\n\nexport function schemaCreateObject<T>(schema: Type<T>): Partial<T> | undefined {\n  if (schema._default !== undefined) {\n    return isFunction(schema._default) ? schema._default(schema) : schema._default\n  }\n\n  if (schema._optional) {\n    return undefined as any\n  }\n\n  if (schema._object) {\n    const obj: any = {}\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as Type<any>\n      const value = schemaCreateObject(propSchema)\n      if (value !== undefined) {\n        obj[key] = value\n      }\n    }\n    return obj\n  }\n\n  // For non-optional, non-object types without defaults, don't return anything\n  // This prevents setting undefined values in the parent object\n  return undefined\n}\n\n/**\n * Message for schema validation results.\n * @category Schema\n */\nexport interface SchemaValidateMessage {\n  path: string\n  message: string\n  type: string\n  valid: boolean\n}\n\nexport function schemaValidateObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n  allowExtra?: boolean\n}): boolean {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    return valid\n  }\n\n  if (obj == null && schema._optional) {\n    return addMessage('Optional', true)\n  }\n\n  if (schema._object) {\n    if (opt?.allowExtra !== true) {\n      const schemaKeys = Object.keys(schema._object)\n      const objKeys = Object.keys(obj || {})\n      const missingKeys = arrayMinus(objKeys, schemaKeys)\n      if (missingKeys.length > 0) {\n        return addMessage(`Extra properties: ${missingKeys.join(', ')}`, false)\n      }\n    }\n\n    for (const key in schema._object) {\n      const propSchema = schema._object[key] as any\n      if (!schemaValidateObject(\n        propSchema,\n        obj[key] as any,\n        {\n          ...opt,\n          path: opt?.path ? `${opt.path}.${key}` : key,\n          messages,\n        },\n      )) { return addMessage(`Invalid property '${key}'`, false) }\n    }\n    return addMessage('Object valid', true)\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    return addMessage('Check', checkResult)\n  }\n\n  return addMessage('Primitive valid', false)\n}\n\nexport function schemaParseObject<T>(schema: Type<T>, obj?: any, opt?: {\n  path?: string\n  messages?: SchemaValidateMessage[]\n\n  /// Whether to allow extra properties not defined in the schema\n  allowExtra?: boolean\n  skipDefault?: boolean\n}): T | undefined {\n  const messages = opt?.messages || []\n\n  function addMessage(message: string, valid: boolean = false) {\n    messages.push({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type })\n    // console.debug({ path: `.${opt?.path ?? ''}`, message, valid, type: schema.type }, obj)\n    return valid\n  }\n\n  if (obj == null) {\n    if (schema._optional) {\n      addMessage('Optional', true)\n      return undefined\n    }\n    if (schema._default !== undefined && opt?.skipDefault !== true) {\n      addMessage('Default', true)\n      return isFunction(schema._default) ? schema._default(schema) : schema._default\n    }\n    // For non-optional objects without explicit defaults, use empty object\n    if (schema._object) {\n      obj = {}\n    }\n  }\n\n  if (schema._object) {\n    const newObj: any = {}\n    const shape = schema._object\n    for (const key in shape) {\n      const propSchema = shape[key] as any\n      const result = schemaParseObject(propSchema, obj[key] as any, {\n        ...opt,\n        path: opt?.path ? `${opt.path}.${key}` : key,\n        messages,\n      })\n      if (result !== undefined) {\n        newObj[key] = result\n      }\n      else if (propSchema._default !== undefined && opt?.skipDefault !== true) {\n        newObj[key] = isFunction(propSchema._default) ? propSchema._default(propSchema) : propSchema._default\n      }\n      else if (propSchema._optional) {\n        // Only set undefined for optional properties if they were explicitly provided as undefined\n        if (obj && typeof obj === 'object' && key in obj) {\n          newObj[key] = undefined\n        }\n        // Otherwise, don't set the property at all\n      }\n      // For required properties without defaults, don't set undefined - leave them missing\n    }\n\n    // Add extra properties if allowExtra is enabled\n    if (opt?.allowExtra && obj && typeof obj === 'object') {\n      for (const [key, value] of Object.entries(obj)) {\n        if (!(key in shape)) {\n          newObj[key] = value\n        }\n      }\n    }\n\n    return newObj\n  }\n\n  if (obj != null) {\n    if (schema.type === 'string') {\n      obj = valueToString(obj)\n    }\n    else if (schema.type === 'boolean') {\n      obj = valueToBoolean(obj)\n    }\n    else if (schema.type === 'number') {\n      obj = valueToFloat(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n    else if (schema.type === 'int') {\n      obj = valueToInteger(obj)\n      if (Number.isNaN(obj)) {\n        addMessage(`Invalid number: ${obj}`, false)\n        return undefined\n      }\n    }\n  }\n\n  if (isFunction(schema._check)) {\n    const checkResult = schema._check(obj)\n    addMessage('Check', checkResult)\n    return checkResult ? obj : undefined\n  }\n\n  return obj\n}\n"],"mappings":"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"}

package/dist/common/schema/schema-standard.mjs

@@ -1 +1 @@
-export{};
+export {  };