ipx 4.0.0-alpha.2 → 4.0.0-beta.1

package/dist/_chunks/libs/h3.mjs

@@ -6,20 +6,26 @@ const n = (() => {
 function r(e) {
 	return decodeURI(e.includes(`%25`) ? e.replace(/%25/g, `%2525`) : e);
 }
-const i = `h3.internal.event.`, a = Symbol.for(`${i}res`), o = Symbol.for(`${i}res.headers`), s = Symbol.for(`${i}res.err.headers`);
-var c = class {
+const i = `h3.internal.event.`, a = Symbol.for(`${i}res`), o = Symbol.for(`${i}res.headers`), s = Symbol.for(`${i}res.err.headers`), c = Symbol.for(`${i}malformed`);
+var l = class {
 	app;
 	req;
 	url;
 	context;
 	static __is_event__ = !0;
 	constructor(e, i, a) {
-		this.context = i || e.context || new n(), this.req = e, this.app = a;
+		this.context = e.context = i || e.context || new n(), this.req = e, this.app = a;
 		let o = e._url, s = o && o instanceof URL ? o : new t(e.url);
-		s.pathname.includes(`%`) && (s.pathname = r(s.pathname)), this.url = s;
+		if (s.pathname.includes(`%`)) try {
+			let e = r(s.pathname);
+			e !== s.pathname && (s = new t(`${s.protocol}//${s.host}${e}${s.search}`));
+		} catch {
+			this[c] = !0;
+		}
+		this.url = s;
 	}
 	get res() {
-		return this[a] ||= new l();
+		return this[a] ||= new u();
 	}
 	get runtime() {
 		return this.req.runtime;
@@ -45,7 +51,7 @@ var c = class {
 	get method() {
 		return this.req.method;
 	}
-}, l = class {
+}, u = class {
 	status;
 	statusText;
 	get headers() {
@@ -55,14 +61,14 @@ var c = class {
 		return this[s] ||= new Headers();
 	}
 };
-const u = /[^\u0009\u0020-\u007E]/g;
-function d(e = ``) {
-	return e.replace(u, ``);
+const d = /[^\u0009\u0020-\u007E]/g;
+function f(e = ``) {
+	return e.replace(d, ``);
 }
-function f(e, t = 200) {
-	return !e || (typeof e == `string` && (e = +e), e < 100 || e > 599) ? t : e;
+function p(e, t = 200) {
+	return !e || (typeof e == `string` && (e = +e), !Number.isInteger(e) || e < 100 || e > 599) ? t : e;
 }
-var p = class e extends Error {
+var m = class e extends Error {
 	get name() {
 		return `HTTPError`;
 	}
@@ -86,7 +92,7 @@ var p = class e extends Error {
 	constructor(e, t) {
 		let n, r;
 		typeof e == `string` ? (n = e, r = t) : r = e;
-		let i = f(r?.status || r?.statusCode || r?.cause?.status || r?.cause?.statusCode, 500), a = d(r?.statusText || r?.statusMessage || r?.cause?.statusText || r?.cause?.statusMessage), o = n || r?.message || r?.cause?.message || r?.statusText || r?.statusMessage || [
+		let i = p(r?.status || r?.statusCode || r?.cause?.status || r?.cause?.statusCode, 500), a = f(r?.statusText || r?.statusMessage || r?.cause?.statusText || r?.cause?.statusMessage), o = n || r?.message || r?.cause?.message || r?.statusText || r?.statusMessage || [
 			`HTTPError`,
 			i,
 			a
@@ -113,7 +119,7 @@ var p = class e extends Error {
 		};
 	}
 };
-function m(e, t) {
+function h(e, t) {
 	if (e == null) return !0;
 	if (t !== `object`) return t === `boolean` || t === `number` || t === `string`;
 	if (typeof e.toJSON == `function` || Array.isArray(e)) return !0;
@@ -122,15 +128,31 @@ function m(e, t) {
 	let r = Object.getPrototypeOf(e);
 	return r === Object.prototype || r === null;
 }
-const h = Symbol.for(`h3.notFound`), g = Symbol.for(`h3.handled`);
-function _(e, t, n = {}) {
-	if (typeof e?.then == `function`) return e.then((e) => _(e, t, n), (e) => _(typeof e == `number` ? new p({ status: e }) : e, t, n));
-	let r = y(e, t, n);
-	if (typeof r?.then == `function`) return _(r, t, n);
+const g = Symbol.for(`h3.internal.event.dispose`), _ = Symbol.for(`h3.notFound`), v = Symbol.for(`h3.handled`);
+function y(e, t, n = {}) {
+	if (typeof e?.then == `function`) return e.then((e) => y(e, t, n), (e) => y(b(e), t, n));
+	let r;
+	try {
+		r = S(e, t, n);
+	} catch (e) {
+		return y(b(e), t, n);
+	}
+	if (typeof r?.then == `function`) return y(r, t, n);
 	let { onResponse: i } = n;
-	return i ? Promise.resolve(i(r, t)).then(() => r) : r;
+	return i ? Promise.resolve().then(() => i(r, t)).catch((e) => {
+		n.silent || console.error(e);
+	}).then(() => t[g]?.observe(r, e) ?? r) : t[g]?.observe(r, e) ?? r;
+}
+function b(e) {
+	if (e === _ || e === v || e instanceof Error) return e;
+	if (typeof e == `number`) return new m({ status: e });
+	let t = new m({
+		status: 500,
+		unhandled: !0
+	});
+	return t.cause = e, t;
 }
-var v = class {
+var x = class {
 	#headers;
 	#init;
 	body;
@@ -138,75 +160,82 @@ var v = class {
 		this.body = e, this.#init = t;
 	}
 	get status() {
-		return this.#init?.status || 200;
+		return this.#init?.status;
 	}
 	get statusText() {
-		return this.#init?.statusText || `OK`;
+		return this.#init?.statusText;
 	}
 	get headers() {
 		return this.#headers ||= new Headers(this.#init?.headers);
 	}
 };
-function y(t, n, r, i) {
-	if (t === g) return new e(null);
-	if (t === h && (t = new p({
+function S(t, n, r, i) {
+	if (t === v) return new e(null);
+	if (t === _ && (t = new m({
 		status: 404,
 		message: `Cannot find any route matching [${n.req.method}] ${n.url}`
 	})), t && t instanceof Error) {
-		let e = p.isError(t), o = e ? t : new p(t);
+		let e = m.isError(t), o = e ? t : new m(t);
 		e || (o.unhandled = !0, t?.stack && (o.stack = t.stack)), o.unhandled && !r.silent && console.error(o);
 		let { onError: c } = r, l = n[a]?.[s];
-		return c && !i ? Promise.resolve(c(o, n)).catch((e) => e).then((e) => y(e ?? t, n, r, !0)) : D(o, r.debug, l);
+		return c && !i ? Promise.resolve().then(() => c(o, n)).catch((e) => e).then((e) => S(e ?? t, n, r, !0)) : A(o, r.debug, l);
 	}
 	let c = n[a], l = c?.[o];
 	if (n[a] = void 0, !(t instanceof Response)) {
-		let i = T(t, n, r), a = i.status || c?.status;
-		return new e(E(n.req.method, a) ? null : i.body, {
+		let i = O(t, n, r), a = i.status || c?.status;
+		return new e(k(n.req.method, a) ? null : i.body, {
 			status: a,
 			statusText: i.statusText || c?.statusText,
-			headers: i.headers && l ? b(i.headers, l) : i.headers || l
+			headers: i.headers && l ? C(i.headers, l) : i.headers || l
 		});
 	}
-	if (!l || i || !t.ok) return t;
-	try {
-		return b(t.headers, l, t.headers), t;
+	if (t.status >= 400 && (l = c?.[s]), l && !i) try {
+		C(t.headers, l, t.headers);
 	} catch {
-		return new e(E(n.req.method, t.status) ? null : t.body, {
+		return new e(k(n.req.method, t.status) ? null : t.body, {
 			status: t.status,
 			statusText: t.statusText,
-			headers: b(t.headers, l)
+			headers: C(t.headers, l)
 		});
 	}
+	return n.req.method === `HEAD` && t.body !== null ? new e(null, {
+		status: t.status,
+		statusText: t.statusText,
+		headers: t.headers
+	}) : t;
 }
-function b(e, t, n = new Headers(e)) {
+function C(e, t, n = new Headers(e)) {
 	for (let [e, r] of t) e === `set-cookie` ? n.append(e, r) : n.set(e, r);
 	return n;
 }
-const x = (e) => (...t) => {
+const w = (e) => (...t) => {
 	throw Error(`Headers are frozen (${e} ${t.join(`, `)})`);
 };
-var S = class extends Headers {
-	set = x(`set`);
-	append = x(`append`);
-	delete = x(`delete`);
+var T = class extends Headers {
+	set = w(`set`);
+	append = w(`append`);
+	delete = w(`delete`);
 };
-const C = new S({ "content-length": `0` }), w = new S({ "content-type": `application/json;charset=UTF-8` });
-function T(e, t, n) {
+const E = new T({ "content-length": `0` }), D = new T({ "content-type": `application/json;charset=UTF-8` });
+function O(e, t, n) {
 	if (e == null) return {
 		body: ``,
-		headers: C
+		headers: E
 	};
 	let r = typeof e;
 	if (r === `string`) return { body: e };
-	if (e instanceof Uint8Array) return t.res.headers.set(`content-length`, e.byteLength.toString()), { body: e };
-	if (e instanceof v || e?.constructor?.name === `HTTPResponse`) return e;
-	if (m(e, r)) return {
+	if (e instanceof Uint8Array) return {
+		body: e,
+		headers: new Headers({ "content-length": e.byteLength.toString() })
+	};
+	if (e instanceof x || e?.constructor?.name === `HTTPResponse`) return e;
+	if (h(e, r)) return {
 		body: JSON.stringify(e, void 0, n.debug ? 2 : void 0),
-		headers: w
+		headers: D
 	};
 	if (r === `bigint`) return {
 		body: e.toString(),
-		headers: w
+		headers: D
 	};
 	if (e instanceof Blob) {
 		let t = new Headers({
@@ -220,12 +249,12 @@ function T(e, t, n) {
 	}
 	return r === `symbol` ? { body: e.toString() } : r === `function` ? { body: `${e.name}()` } : { body: e };
 }
-function E(e, t) {
+function k(e, t) {
 	return e === `HEAD` || t === 100 || t === 101 || t === 102 || t === 204 || t === 205 || t === 304;
 }
-function D(t, n, r) {
-	let i = t.headers ? b(w, t.headers) : new Headers(w);
-	return r && (i = b(i, r)), new e(JSON.stringify({
+function A(t, n, r) {
+	let i = t.headers ? C(D, t.headers) : new Headers(D);
+	return r && (i = C(i, r)), new e(JSON.stringify({
 		...t.toJSON(),
 		stack: n && t.stack ? t.stack.split(`
 `).map((e) => e.trim()) : void 0
@@ -235,33 +264,46 @@ function D(t, n, r) {
 		headers: i
 	});
 }
-function O(e, t, n, r = 0) {
-	if (r === t.length) return n(e);
-	let i = t[r], a, o, s = () => a ? o : (a = !0, o = O(e, t, n, r + 1), o), c = i(e, s);
-	return k(c) ? s() : typeof c?.then == `function` ? c.then((e) => k(e) ? s() : e) : c;
+function j(e) {
+	let t = (e, t) => t(e);
+	for (let n = e.length - 1; n >= 0; n--) {
+		let r = e[n], i = t;
+		t = (e, t) => N(r, e, t, i);
+	}
+	return t;
 }
-function k(e) {
-	return e === void 0 || e === h;
+function M(e, t) {
+	let n = j(e);
+	return function(e) {
+		return n(e, t);
+	};
 }
-function A(e) {
-	if (typeof e == `function`) return j(e);
+function N(e, t, n, r) {
+	let i, a, o = () => i ? a : (i = !0, a = r(t, n), a), s = e(t, o);
+	return P(s) ? o() : typeof s?.then == `function` ? s.then((e) => P(e) ? o() : e) : s;
+}
+function P(e) {
+	return e === void 0 || e === _;
+}
+function F(e) {
+	if (typeof e == `function`) return I(e);
 	let t = e.handler || (e.fetch ? function(t) {
 		return e.fetch(t.req);
-	} : M);
-	return Object.assign(j(e.middleware?.length ? function(n) {
-		return O(n, e.middleware, t);
-	} : t), e);
+	} : L);
+	return Object.assign(I(e.middleware?.length ? M(e.middleware, t) : t), e);
 }
-function j(e) {
+function I(e) {
 	return `fetch` in e ? e : Object.assign(e, { fetch: (t) => {
 		typeof t == `string` && (t = new URL(t, `http://_`)), t instanceof URL && (t = new Request(t));
-		let n = new c(t);
+		let n = new l(t);
 		try {
-			return Promise.resolve(_(e(n), n));
+			return Promise.resolve(y(e(n), n));
 		} catch (e) {
-			return Promise.resolve(_(e, n));
+			return Promise.resolve(y(b(e), n));
 		}
 	} });
 }
-const M = () => h, N = A;
-export { p as HTTPError, N as defineEventHandler };
+const L = () => _;
+String.raw`(?:^|/)(?:\.|%(?:25)*2e){1,2}(?:/|$)`, String.raw`%(?:25)*(?:2f|5c)`;
+const R = F;
+export { m as HTTPError, R as defineEventHandler };

package/dist/_chunks/libs/image-meta.d.mts

@@ -5,8 +5,4 @@ type e = {
   orientation?: number;
   type?: string;
 };
-/**
- * @param {Uint8Array|string} input - Uint8Array or relative/absolute path of the image file
- * @param {Function=} [callback] - optional function for async detection
- */
 export type { e as ImageMeta };

package/dist/_chunks/libs/image-meta.mjs

@@ -9,8 +9,8 @@ const e = new TextDecoder(), t = (t, n = 0, r = t.length) => e.decode(t.slice(n,
 };
 function d(e, t, n, r) {
 	n ||= 0;
-	let i = r ? `BE` : `LE`;
-	return u[`readUInt` + t + i](e, n);
+	let i = r ? `BE` : `LE`, a = `readUInt` + t + i;
+	return u[a](e, n);
 }
 const ee = {
 	validate: (e) => t(e, 0, 2) === `BM`,
@@ -203,8 +203,8 @@ const ne = {
 	validate(e) {
 		let t = n(e, 4, 8), r = c(e, 0);
 		if (t !== w.jp__ || r < 1) return !1;
-		let i = r + 4, a = c(e, r);
-		return n(e.slice(i, i + a), 0, 4) === w.ftyp;
+		let i = r + 4, a = c(e, r), o = e.slice(i, i + a);
+		return n(o, 0, 4) === w.ftyp;
 	},
 	calculate(e) {
 		let r = c(e, 0), a = i(e, r + 2), o = r + 4 + a;
@@ -328,8 +328,8 @@ const M = {
 }, R = {
 	validate: (e) => t(e, 0, 2) in I,
 	calculate(e) {
-		let n = I[t(e, 0, 2)], r = t(e, 3).split(/[\n\r]+/);
-		return (L[n] || L.default)(r);
+		let n = t(e, 0, 2), r = I[n], i = t(e, 3).split(/[\n\r]+/);
+		return (L[r] || L.default)(i);
 	}
 }, z = {
 	validate: (e) => t(e, 0, 4) === `8BPS`,

package/dist/_chunks/libs/sax.mjs

@@ -80,7 +80,7 @@ var n = e(((e) => {
 			end: function() {
 				L(this);
 			},
-			write: q,
+			write: J,
 			resume: function() {
 				return this.error = null, this;
 			},
@@ -163,7 +163,7 @@ var n = e(((e) => {
 				t.splice(0, 0, e), n.emit.apply(n, t);
 			}), s.prototype.on.call(n, e, t);
 		};
-		var f = `[CDATA[`, p = `DOCTYPE`, m = `http://www.w3.org/XML/1998/namespace`, h = `http://www.w3.org/2000/xmlns/`, g = {
+		var f = /^\[CDATA\[$/i, p = /^DOCTYPE$/i, m = `http://www.w3.org/XML/1998/namespace`, h = `http://www.w3.org/2000/xmlns/`, g = {
 			xml: m,
 			xmlns: h
 		}, _ = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, v = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/, y = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, b = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/;
@@ -221,13 +221,13 @@ var n = e(((e) => {
 			CLOSE_TAG_SAW_WHITE: E++,
 			SCRIPT: E++,
 			SCRIPT_ENDING: E++
-		}, e.XML_ENTITIES = {
+		}, e.XML_ENTITIES = Object.assign(Object.create(null), {
 			amp: `&`,
 			gt: `>`,
 			lt: `<`,
 			quot: `"`,
 			apos: `'`
-		}, e.ENTITIES = {
+		}), e.ENTITIES = Object.assign(Object.create(null), {
 			amp: `&`,
 			gt: `>`,
 			lt: `<`,
@@ -481,7 +481,7 @@ var n = e(((e) => {
 			clubs: 9827,
 			hearts: 9829,
 			diams: 9830
-		}, Object.keys(e.ENTITIES).forEach(function(t) {
+		}), Object.keys(e.ENTITIES).forEach(function(t) {
 			var n = e.ENTITIES[t], r = typeof n == `number` ? String.fromCharCode(n) : n;
 			e.ENTITIES[t] = r;
 		}), e.STATE) e.STATE[e.STATE[D]] = D;
@@ -588,7 +588,7 @@ Actual: ` + e.attribValue);
 				}
 				e.attribList.length = 0;
 			}
-			e.tag.isSelfClosing = !!t, e.sawRoot = !0, e.tags.push(e.tag), N(e, `onopentag`, e.tag), t || (!e.noscript && e.tagName.toLowerCase() === `script` ? e.state = E.SCRIPT : e.state = E.TEXT, e.tag = null, e.tagName = ``), e.attribName = e.attribValue = ``, e.attribList.length = 0;
+			e.tag.isSelfClosing = !!t, e.sawRoot = !0, e.tags.push(e.tag), N(e, `onopentag`, e.tag), t || (e.state = !e.noscript && e.tagName.toLowerCase() === `script` ? E.SCRIPT : E.TEXT, e.tag = null, e.tagName = ``), e.attribName = e.attribValue = ``, e.attribList.length = 0;
 		}
 		function U(e) {
 			if (!e.tagName) {
@@ -628,33 +628,36 @@ Actual: ` + e.attribValue);
 		}
 		function W(e) {
 			var t = e.entity, n = t.toLowerCase(), r, i = ``;
-			return e.ENTITIES[t] ? e.ENTITIES[t] : e.ENTITIES[n] ? e.ENTITIES[n] : (t = n, t.charAt(0) === `#` && (t.charAt(1) === `x` ? (t = t.slice(2), r = parseInt(t, 16), i = r.toString(16)) : (t = t.slice(1), r = parseInt(t, 10), i = r.toString(10))), t = t.replace(/^0+/, ``), isNaN(r) || i.toLowerCase() !== t || r < 0 || r > 1114111 ? (R(e, `Invalid character entity`), `&` + e.entity + `;`) : String.fromCodePoint(r));
+			return e.ENTITIES[t] ? e.ENTITIES[t] : e.ENTITIES[n] ? e.ENTITIES[n] : (t = n, t.charAt(0) === `#` && (t.charAt(1) === `x` ? (t = t.slice(2), r = parseInt(t, 16), i = r.toString(16)) : (t = t.slice(1), r = parseInt(t, 10), i = r.toString(10))), t = t.replace(/^0+/, ``), isNaN(r) || i.toLowerCase() !== t || r < 0 || r > 1114111 || !G(r) ? (R(e, `Invalid character entity`), `&` + e.entity + `;`) : String.fromCodePoint(r));
 		}
-		function G(e, t) {
-			t === `<` ? (e.state = E.OPEN_WAKA, e.startTagPosition = e.position) : x(t) || (R(e, `Non-whitespace before first tag.`), e.textNode = t, e.state = E.TEXT);
+		function G(e) {
+			return e === 9 || e === 10 || e === 13 || e >= 32 && e <= 55295 || e >= 57344 && e <= 65533 || e >= 65536 && e <= 1114111;
 		}
 		function K(e, t) {
+			t === `<` ? (e.state = E.OPEN_WAKA, e.startTagPosition = e.position) : x(t) || (R(e, `Non-whitespace before first tag.`), e.textNode = t, e.state = E.TEXT);
+		}
+		function q(e, t) {
 			var n = ``;
 			return t < e.length && (n = e.charAt(t)), n;
 		}
-		function q(t) {
+		function J(t) {
 			var n = this;
 			if (this.error) throw this.error;
 			if (n.closed) return I(n, `Cannot write after close. Assign an onready handler.`);
 			if (t === null) return L(n);
 			typeof t == `object` && (t = t.toString());
-			for (var r = 0, a = ``; a = K(t, r++), n.c = a, a;) switch (n.trackPosition && (n.position++, a === `
+			for (var r = 0, a = ``; a = q(t, r++), n.c = a, a;) switch (n.trackPosition && (n.position++, a === `
 ` ? (n.line++, n.column = 0) : n.column++), n.state) {
 				case E.BEGIN:
 					if (n.state = E.BEGIN_WHITESPACE, a === ``) continue;
-					G(n, a);
+					K(n, a);
 					continue;
 				case E.BEGIN_WHITESPACE:
-					G(n, a);
+					K(n, a);
 					continue;
 				case E.TEXT:
 					if (n.sawRoot && !n.closedRoot) {
-						for (var o = r - 1; a && a !== `<` && a !== `&`;) a = K(t, r++), a && n.trackPosition && (n.position++, a === `
+						for (var o = r - 1; a && a !== `<` && a !== `&`;) a = q(t, r++), a && n.trackPosition && (n.position++, a === `
 ` ? (n.line++, n.column = 0) : n.column++);
 						n.textNode += t.substring(o, r - 1);
 					}
@@ -684,7 +687,7 @@ Actual: ` + e.attribValue);
 						n.state = E.COMMENT, n.comment = ``, n.sgmlDecl = ``;
 						continue;
 					}
-					n.doctype && n.doctype !== !0 && n.sgmlDecl ? (n.state = E.DOCTYPE_DTD, n.doctype += `<!` + n.sgmlDecl + a, n.sgmlDecl = ``) : (n.sgmlDecl + a).toUpperCase() === f ? (N(n, `onopencdata`), n.state = E.CDATA, n.sgmlDecl = ``, n.cdata = ``) : (n.sgmlDecl + a).toUpperCase() === p ? (n.state = E.DOCTYPE, (n.doctype || n.sawRoot) && R(n, `Inappropriately located doctype declaration`), n.doctype = ``, n.sgmlDecl = ``) : a === `>` ? (N(n, `onsgmldeclaration`, n.sgmlDecl), n.sgmlDecl = ``, n.state = E.TEXT) : (S(a) && (n.state = E.SGML_DECL_QUOTED), n.sgmlDecl += a);
+					n.doctype && n.doctype !== !0 && n.sgmlDecl ? (n.state = E.DOCTYPE_DTD, n.doctype += `<!` + n.sgmlDecl + a, n.sgmlDecl = ``) : f.test(n.sgmlDecl + a) ? (N(n, `onopencdata`), n.state = E.CDATA, n.sgmlDecl = ``, n.cdata = ``) : p.test(n.sgmlDecl + a) ? (n.state = E.DOCTYPE, (n.doctype || n.sawRoot) && R(n, `Inappropriately located doctype declaration`), n.doctype = ``, n.sgmlDecl = ``) : a === `>` ? (N(n, `onsgmldeclaration`, n.sgmlDecl), n.sgmlDecl = ``, n.state = E.TEXT) : (S(a) && (n.state = E.SGML_DECL_QUOTED), n.sgmlDecl += a);
 					continue;
 				case E.SGML_DECL_QUOTED:
 					a === n.q && (n.state = E.SGML_DECL, n.q = ``), n.sgmlDecl += a;
@@ -708,10 +711,10 @@ Actual: ` + e.attribValue);
 					a === `-` ? (n.state = E.COMMENT_ENDED, n.comment = F(n.opt, n.comment), n.comment && N(n, `oncomment`, n.comment), n.comment = ``) : (n.comment += `-` + a, n.state = E.COMMENT);
 					continue;
 				case E.COMMENT_ENDED:
-					a === `>` ? n.doctype && n.doctype !== !0 ? n.state = E.DOCTYPE_DTD : n.state = E.TEXT : (R(n, `Malformed comment`), n.comment += `--` + a, n.state = E.COMMENT);
+					a === `>` ? n.state = n.doctype && n.doctype !== !0 ? E.DOCTYPE_DTD : E.TEXT : (R(n, `Malformed comment`), n.comment += `--` + a, n.state = E.COMMENT);
 					continue;
 				case E.CDATA:
-					for (var o = r - 1; a && a !== `]`;) a = K(t, r++), a && n.trackPosition && (n.position++, a === `
+					for (var o = r - 1; a && a !== `]`;) a = q(t, r++), a && n.trackPosition && (n.position++, a === `
 ` ? (n.line++, n.column = 0) : n.column++);
 					n.cdata += t.substring(o, r - 1), a === `]` && (n.state = E.CDATA_ENDING);
 					continue;
@@ -801,9 +804,7 @@ Actual: ` + e.attribValue);
 						case E.ATTRIB_VALUE_ENTITY_Q:
 							c = E.ATTRIB_VALUE_QUOTED, l = `attribValue`;
 							break;
-						case E.ATTRIB_VALUE_ENTITY_U:
-							c = E.ATTRIB_VALUE_UNQUOTED, l = `attribValue`;
-							break;
+						case E.ATTRIB_VALUE_ENTITY_U: c = E.ATTRIB_VALUE_UNQUOTED, l = `attribValue`;
 					}
 					if (a === `;`) {
 						var u = W(n);