xml-model 2.0.0-beta.5 → 2.0.0-beta.6

package/dist/index.js

@@ -1,7 +1,7 @@
 import { DATA, isModel, model } from "./model.js";
 import XML, { ZXMLCommentNode, ZXMLElementNode, ZXMLNode, ZXMLRoot, ZXMLTextNode } from "./xml/xml-js.js";
 import { xml } from "./xml/schema-meta.js";
-import { normalizeCodecOptions, registerDefault } from "./xml/codec.js";
+import { XMLCodecError, normalizeCodecOptions, registerDefault } from "./xml/codec.js";
 import { XMLBase, XMLBaseWithSource, xmlModel } from "./xml/model.js";
 import "./xml/index.js";
-export { DATA, XML, XMLBase, XMLBaseWithSource, ZXMLCommentNode, ZXMLElementNode, ZXMLNode, ZXMLRoot, ZXMLTextNode, isModel, model, normalizeCodecOptions, registerDefault, xml, xmlModel };
+export { DATA, XML, XMLBase, XMLBaseWithSource, XMLCodecError, ZXMLCommentNode, ZXMLElementNode, ZXMLNode, ZXMLRoot, ZXMLTextNode, isModel, model, normalizeCodecOptions, registerDefault, xml, xmlModel };

package/dist/xml/codec.d.ts

@@ -1,5 +1,10 @@
 import { z } from 'zod';
 import { XMLElement } from './xml-js';
+export declare class XMLCodecError extends Error {
+    readonly path: readonly (string | number)[];
+    readonly rawMessage: string;
+    constructor(rawMessage: string, path?: readonly (string | number)[], options?: ErrorOptions);
+}
 export declare function assertSingleElement(xml: XMLElement[]): asserts xml is [XMLElement];
 export declare function assertSingleRoot(xml: XMLElement[]): asserts xml is [XMLElement & {
     elements: XMLElement[];

package/dist/xml/codec.js

@@ -4,6 +4,21 @@ import { getUserOptions, prop } from "./schema-meta.js";
 import { kebabCase } from "../util/kebab-case.js";
 import { z } from "zod";
 //#region src/xml/codec.ts
+var XMLCodecError = class extends Error {
+	path;
+	rawMessage;
+	constructor(rawMessage, path = [], options) {
+		super(path.length ? `[${path.join(".")}] ${rawMessage}` : rawMessage, options);
+		this.name = "XMLCodecError";
+		this.path = path;
+		this.rawMessage = rawMessage;
+	}
+};
+function rethrow(e, segment) {
+	const cause = e instanceof XMLCodecError ? e.cause : e;
+	const path = e instanceof XMLCodecError ? [segment, ...e.path] : [segment];
+	throw new XMLCodecError(e instanceof XMLCodecError ? e.rawMessage : e instanceof Error ? e.message : String(e), path, { cause });
+}
 function assertSingleElement(xml) {
 	if (xml.length !== 1) throw new Error(`Expected single XML element, got ${xml.length}`);
 }
@@ -206,7 +221,10 @@ registerDefault((schema) => {
 				});
 			},
 			encode(ctx) {
-				const data = outSchema.encode(ctx.data);
+				const data = schema.def.reverseTransform ? schema.def.reverseTransform(ctx.data, {
+					value: ctx.data,
+					issues: []
+				}) : outSchema.encode(ctx.data);
 				const innerOpts = ctx.options.tagname !== inputCodecOptions.tagname ? {
 					...inputCodecOptions,
 					tagname: ctx.options.tagname
@@ -311,12 +329,16 @@ registerDefault((schema) => {
 							propCtx.xml = matches[0];
 						}
 					}
-					o.decodeAsProperty({
-						options: ctx.options,
-						xml: ctx.xml,
-						property: propCtx,
-						result
-					});
+					try {
+						o.decodeAsProperty({
+							options: ctx.options,
+							xml: ctx.xml,
+							property: propCtx,
+							result
+						});
+					} catch (e) {
+						rethrow(e, prop);
+					}
 				}
 				return result;
 			},
@@ -332,20 +354,24 @@ registerDefault((schema) => {
 				for (const item of sequence) if (typeof item === "string") {
 					const o = options[item];
 					if (!o) throw new Error(`Failed to resolve property options for sequence item ${item}`);
-					o.encodeAsProperty({
-						options: ctx.options,
-						data,
-						property: {
-							name: item,
-							options: o,
-							tagname: o.propertyTagname({
+					try {
+						o.encodeAsProperty({
+							options: ctx.options,
+							data,
+							property: {
 								name: item,
-								options: o
-							}),
-							value: data[item]
-						},
-						result
-					});
+								options: o,
+								tagname: o.propertyTagname({
+									name: item,
+									options: o
+								}),
+								value: data[item]
+							},
+							result
+						});
+					} catch (e) {
+						rethrow(e, item);
+					}
 				} else result.elements.push(item);
 				return result;
 			}
@@ -353,6 +379,6 @@ registerDefault((schema) => {
 	}
 });
 //#endregion
-export { XML_STATE_KEY, decode, encode, normalizeCodecOptions, registerDefault, xmlStateSchema };
+export { XMLCodecError, XML_STATE_KEY, decode, encode, normalizeCodecOptions, registerDefault, xmlStateSchema };
 
 //# sourceMappingURL=codec.js.map

package/dist/xml/examples.d.ts

@@ -1,4 +1,17 @@
 import { z } from 'zod';
+declare const Event_base: import('./model').XmlModelConstructor<z.ZodObject<{
+    title: z.ZodString;
+    publishedAt: z.ZodCodec<z.ZodString, z.ZodDate>;
+}, z.core.$strip>, {
+    title: string;
+    publishedAt?: Date;
+}>;
+/**
+ * An event with a typed `Date` field stored as an ISO 8601 string in XML.
+ * Demonstrates using `z.codec` to transform a raw XML string into a native JS type.
+ */
+export declare class Event extends Event_base {
+}
 declare const Engine_base: import('./model').XmlModelConstructor<z.ZodObject<{
     type: z.ZodString;
     horsepower: z.ZodNumber;

package/dist/xml/index.d.ts

@@ -1,6 +1,6 @@
 export * from './xml-js';
 export { xml } from './schema-meta';
 export type { UserCodecOptions, XMLState } from './codec';
-export { registerDefault, normalizeCodecOptions } from './codec';
+export { registerDefault, normalizeCodecOptions, XMLCodecError } from './codec';
 export { xmlModel, XMLBase, XMLBaseWithSource, type XmlModelConstructor } from './model';
 //# sourceMappingURL=index.d.ts.map

package/dist/xml/model.js

@@ -30,12 +30,7 @@ function xmlModel(schema, options) {
 		static fromXML(input) {
 			if (typeof input === "string") input = XML.parse(input);
 			if (XML.isRoot(input)) input = XML.elementFromRoot(input);
-			const schema = this.dataSchema;
-			const inputData = decode(this.dataSchema, input);
-			const xmlState = inputData[XML_STATE_KEY];
-			const parsed = schema.parse(inputData);
-			parsed[XML_STATE_KEY] = xmlState;
-			return this.fromData(parsed);
+			return this.fromData(decode(this.dataSchema, input));
 		}
 		static toXML(instance) {
 			const data = this.toData(instance);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-model",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "description": "allows transparent XML <-> Object conversion in typescript",
   "license": "MIT",
   "author": "MathisTLD",
@@ -53,4 +53,4 @@
     "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
   },
   "packageManager": "npm@11.12.0"
-}
+}