@domorium/validator 2.2.0 → 2.2.1

package/dist/index.esm.js

@@ -893,10 +893,10 @@ function T() {
 		requireDeclaration: !1
 	};
 }
-function ce(e, t) {
+function E(e, t) {
 	return e.aliases.get(y(t)) ?? y(t);
 }
-function le(e, t) {
+function ce(e, t) {
 	return {
 		code: m.UndocumentedTag,
 		message: `Extension tag ${e} is not declared in HEAD.SCHMA`,
@@ -904,19 +904,19 @@ function le(e, t) {
 		level: "warning"
 	};
 }
-var ue = /^(_[A-Z0-9_]+)\s+([A-Za-z][A-Za-z0-9+.-]*:\S*)$/;
-function E(e) {
-	let t = e.trim().match(ue);
+var le = /^(_[A-Z0-9_]+)\s+([A-Za-z][A-Za-z0-9+.-]*:\S*)$/;
+function D(e) {
+	let t = e.trim().match(le);
 	return t ? {
 		tag: y(t[1]),
 		uri: t[2]
 	} : null;
 }
-function de(e, t, n) {
+function ue(e, t, n) {
 	let r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Set(), o = [], s = e.find((e) => e.tokens.TAG?.value === "HEAD")?.children.find((e) => e.tokens.TAG?.value === "SCHMA");
 	for (let e of s?.children ?? []) {
 		if (e.tokens.TAG?.value !== "TAG") continue;
-		let t = E(v(e));
+		let t = D(v(e));
 		if (!t) continue;
 		let s = `${t.tag} ${t.uri}`;
 		if (a.has(s)) {
@@ -944,37 +944,37 @@ function de(e, t, n) {
 }
 //#endregion
 //#region src/validator/calendars.ts
-var D = "@#D([A-Z][A-Z ]*)@", fe = RegExp(`^${D}\\s*`, "u"), pe = RegExp(`^${D}$`, "u"), me = RegExp(`${D}|\\S+`, "gu"), O = y("GREGORIAN"), he = {
+var O = "@#D([A-Z][A-Z ]*)@", de = RegExp(`^${O}\\s*`, "u"), fe = RegExp(`^${O}$`, "u"), pe = RegExp(`${O}|\\S+`, "gu"), k = y("GREGORIAN"), me = {
 	months: null,
 	epochs: null
-}, ge = /* @__PURE__ */ new WeakMap();
-function k(e, t) {
-	let n = ge.get(e);
-	n || (n = /* @__PURE__ */ new Map(), ge.set(e, n));
+}, he = /* @__PURE__ */ new WeakMap();
+function A(e, t) {
+	let n = he.get(e);
+	n || (n = /* @__PURE__ */ new Map(), he.set(e, n));
 	let r = n.get(t);
 	if (r) return r;
 	let i = e.calendar[t];
-	if (!i) return he;
+	if (!i) return me;
 	let a = {
 		months: new Set(Object.keys(i.months)),
 		epochs: new Set(i.epochs)
 	};
 	return n.set(t, a), a;
 }
-function A(e, t) {
+function j(e, t) {
 	return e === null ? w(t) : e.has(t) || w(t);
 }
-function _e(e) {
+function ge(e) {
 	return `@#D${e}@`;
 }
-function ve(e, t) {
-	let n = pe.exec(t)?.[1];
+function _e(e, t) {
+	let n = fe.exec(t)?.[1];
 	if (n !== void 0) return y(n);
 	let r = y(t);
 	return e.calendar[r] ? r : null;
 }
-function j(e) {
-	let t = fe.exec(e);
+function ve(e) {
+	let t = de.exec(e);
 	return t ? {
 		calendar: y(t[1]),
 		rest: e.slice(t[0].length)
@@ -984,7 +984,7 @@ function j(e) {
 	};
 }
 function M(e) {
-	return e.match(me) ?? [];
+	return e.match(pe) ?? [];
 }
 //#endregion
 //#region src/validator/epoch.ts
@@ -1007,7 +1007,7 @@ var P = {
 	OCT: 31,
 	NOV: 30,
 	DEC: 31
-}, xe = /* @__PURE__ */ new Set([O, "JULIAN"]), Se = /^\d+$/u, Ce = /* @__PURE__ */ new Set([
+}, xe = /* @__PURE__ */ new Set([k, "JULIAN"]), Se = /^\d+$/u, Ce = /* @__PURE__ */ new Set([
 	"ABT",
 	"AFT",
 	"AND",
@@ -1029,29 +1029,29 @@ function Te(e, t, n) {
 function Ee(e) {
 	return e.replace(/\([^()]*\)/gu, " ");
 }
-function De(e, t) {
-	let n = M(Ee(t)), r = [], i = O;
-	for (let t = 0; t < n.length; t += 1) {
-		let a = n[t];
-		if (Ce.has(a)) {
-			i = O;
+function De(e, t, n = T()) {
+	let r = M(Ee(t)).map((e) => E(n, e)), i = [], a = k;
+	for (let t = 0; t < r.length; t += 1) {
+		let n = r[t];
+		if (Ce.has(n)) {
+			a = k;
 			continue;
 		}
-		let o = ve(e, a);
+		let o = _e(e, n);
 		if (o !== null) {
-			i = o;
+			a = o;
 			continue;
 		}
-		let s = n[t + 1];
-		if (!xe.has(i) || !Se.test(a) || s === void 0 || P[s] === void 0) continue;
-		let c = Te(s, Se.test(n[t + 2] ?? "") && !be(n[t + 3]) ? Number(n[t + 2]) : null, i), l = Number(a);
-		c !== null && (l < 1 || l > c) && r.push({
+		let s = r[t + 1];
+		if (!xe.has(a) || !Se.test(n) || s === void 0 || P[s] === void 0) continue;
+		let c = Te(s, Se.test(r[t + 2] ?? "") && !be(r[t + 3]) ? Number(r[t + 2]) : null, a), l = Number(n);
+		c !== null && (l < 1 || l > c) && i.push({
 			day: l,
 			month: s,
 			length: c
 		}), t += 1;
 	}
-	return r;
+	return i;
 }
 function Oe(e) {
 	return e.filter(({ calendar: e, year: t, epoch: n }) => t === 0 && xe.has(e) && (n === void 0 || n === "BCE")).map(({ year: e, calendar: t }) => ({
@@ -1069,13 +1069,13 @@ var F = /^\d+$/, ke = [
 function L(e, t, n, r) {
 	let i = t, a = e[i];
 	if (a === void 0) return I;
-	let o = O;
+	let o = k;
 	(n.calendar[y(a)] || w(a)) && (o = y(a), i += 1);
-	let { months: s, epochs: c } = k(n, o), l = {
+	let { months: s, epochs: c } = A(n, o), l = {
 		calendar: o,
 		year: 0
 	};
-	return F.test(e[i] ?? "") && e[i + 1] !== void 0 && A(s, e[i + 1]) && F.test(e[i + 2] ?? "") ? (l.day = Number(e[i]), l.month = e[i + 1], i += 2) : e[i] !== void 0 && A(s, e[i]) && F.test(e[i + 1] ?? "") && (l.month = e[i], i += 1), F.test(e[i] ?? "") ? (l.year = Number(e[i]), i += 1, e[i] !== void 0 && A(c, e[i]) && (l.epoch = e[i], i += 1), r.push(l), i) : I;
+	return F.test(e[i] ?? "") && e[i + 1] !== void 0 && j(s, e[i + 1]) && F.test(e[i + 2] ?? "") ? (l.day = Number(e[i]), l.month = e[i + 1], i += 2) : e[i] !== void 0 && j(s, e[i]) && F.test(e[i + 1] ?? "") && (l.month = e[i], i += 1), F.test(e[i] ?? "") ? (l.year = Number(e[i]), i += 1, e[i] !== void 0 && j(c, e[i]) && (l.epoch = e[i], i += 1), r.push(l), i) : I;
 }
 function R(e, t, n, r) {
 	if (e[t] === "TO") return L(e, t + 1, n, r);
@@ -1096,7 +1096,7 @@ function Ae(e) {
 	return e.trim().split(/\s+/);
 }
 function B(e, t) {
-	return Ae(e).map((e) => ce(t, e));
+	return Ae(e).map((e) => E(t, e));
 }
 function V(e, t, n, r) {
 	let i = B(e, n);
@@ -1132,8 +1132,8 @@ function Ne(e, t, n = T()) {
 function Pe(e, t, n = T()) {
 	let r = B(e, n);
 	if (r.length !== 3) return !1;
-	let { months: i } = k(t, O);
-	return F.test(r[0]) && A(i, r[1]) && F.test(r[2]);
+	let { months: i } = A(t, k);
+	return F.test(r[0]) && j(i, r[1]) && F.test(r[2]);
 }
 //#endregion
 //#region src/validator/date-551.ts
@@ -1154,11 +1154,11 @@ function W(e, t) {
 	return n.set(t, a), a;
 }
 function Le(e, t) {
-	let { calendar: n, rest: r } = j(t), i = W(e, n ?? O);
+	let { calendar: n, rest: r } = ve(t), i = W(e, n ?? k);
 	return i === null ? r.length > 0 : i.dated.test(r);
 }
 function Re(e, t) {
-	let { calendar: n, rest: r } = j(t), i = n ?? O, a = W(e, i)?.dated.exec(r)?.groups;
+	let { calendar: n, rest: r } = ve(t), i = n ?? k, a = W(e, i)?.dated.exec(r)?.groups;
 	if (!a) return null;
 	let { day: o, month: s, year: c, dual: l, epoch: u } = a, d = {
 		calendar: i.replace(" ", "_"),
@@ -1218,7 +1218,7 @@ function Xe(e, t) {
 	return Je(e, qe(t));
 }
 function Ze(e, t) {
-	let n = W(e, O);
+	let n = W(e, k);
 	return n === null ? t.length > 0 : n.exact.test(t);
 }
 function G(e, t) {
@@ -1259,8 +1259,8 @@ function q(e, t, n = m.IncorrectValue) {
 		level: "error"
 	};
 }
-function it(e, t, n, r) {
-	return [...De(e, n).map(({ day: e, month: n, length: r }) => q(t, `names ${e} ${n}, and ${n} has ${r} days`, m.ImpossibleDay)), ...Oe(r?.dates ?? []).map(({ year: e, calendar: n }) => q(t, `names year ${e}, and ${n} has no year ${e}`, m.ImpossibleYear))];
+function it(e, t, n, r, i) {
+	return [...De(e, r, t.requireDeclaration ? t : T()).map(({ day: e, month: t, length: r }) => q(n, `names ${e} ${t}, and ${t} has ${r} days`, m.ImpossibleDay)), ...Oe(i?.dates ?? []).map(({ year: e, calendar: t }) => q(n, `names year ${e}, and ${t} has no year ${e}`, m.ImpossibleYear))];
 }
 var at = "(?:[01]?\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?", ot = RegExp(`^${at}$`), st = RegExp(`^${at}Z?$`), ct = "(?:CHILD|INFANT|STILLBORN|\\d+y(?:\\s\\d+m)?(?:\\s\\d+w)?(?:\\s\\d+d)?|\\d+m(?:\\s\\d+w)?(?:\\s\\d+d)?|\\d+w(?:\\s\\d+d)?|\\d+d)", lt = RegExp(`^(?:[<>]\\s)?${ct}$`), ut = RegExp(`^(?:[<>]\\s*)?${ct}$`, "i"), dt = /^[^/]*(?:\/[^/]*\/[^/]*)?$/, ft = /^[A-Za-z0-9][A-Za-z0-9!#$&^_.+-]*\/[A-Za-z0-9][A-Za-z0-9!#$&^_.+-]*(;\s*[\w-]+=[^;]+)*$/, pt = /^\d+$/, mt = /^[NS]\d+(\.\d+)?$/, ht = /^[EW]\d+(\.\d+)?$/, gt = /* @__PURE__ */ RegExp("^(?:(?:en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE|art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)|(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}|[A-Za-z]{4}|[A-Za-z]{5,8})(?:-[A-Za-z]{4})?(?:-(?:[A-Za-z]{2}|[0-9]{3}))?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[0-9A-WY-Za-wy-z](?:-[A-Za-z0-9]{2,8})+)*(?:-x(?:-[A-Za-z0-9]{1,8})+)?)|(?:x(?:-[A-Za-z0-9]{1,8})+))$", "i"), _t = {
 	"Y|<NULL>": "boolean",
@@ -1336,7 +1336,7 @@ var at = "(?:[01]?\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?", ot = RegExp(`
 		message: "should be a valid RFC 5646 language tag (e.g. \"en\", \"en-US\")"
 	},
 	"tag-def": {
-		test: (e) => !!E(e),
+		test: (e) => !!D(e),
 		message: "should be an extension tag and its URI (e.g. \"_SKYPEID http://xmlns.com/foaf/0.1/skypeID\")"
 	},
 	nonNegativeInteger: {
@@ -1396,7 +1396,7 @@ function bt(e, t) {
 	let r = /* @__PURE__ */ new Map();
 	for (let n of e.values()) for (let e of n) {
 		let n = e.tokens.TAG?.value, i = e.tokens.POINTER?.value;
-		if (n && i) for (let e of /* @__PURE__ */ new Set([n, ce(t, n)])) {
+		if (n && i) for (let e of /* @__PURE__ */ new Set([n, E(t, n)])) {
 			let t = r.get(e);
 			t || (t = /* @__PURE__ */ new Set(), r.set(e, t)), t.add(i);
 		}
@@ -1429,7 +1429,7 @@ var J = class {
 	}
 	validateEnumeration(e, t, n) {
 		let r = n.tokens.VALUE?.range || n.range, i = this.getAvailableValues(t), a = [], o = new Set(e.filter((e) => w(e) && this.extensions.requireDeclaration && !this.extensions.tags.has(y(e))));
-		for (let e of o) a.push(le(y(e), r));
+		for (let e of o) a.push(ce(y(e), r));
 		let s = this.scheme.payload[t]?.set, c = s !== void 0 && et.has(s), l = c ? i?.map((e) => e.toLowerCase()) : i;
 		return e.some((e) => !w(e) && !l?.includes(c ? e.toLowerCase() : e)) && a.push(q(n, `should be in set [${rt(i)}]`, m.ShouldBeSetValue)), a;
 	}
@@ -1471,7 +1471,7 @@ var J = class {
 		let r = n || this.getNodeType(t), i = this.getFieldType(r), a = v(t).trim(), o = t.tokens.TAG;
 		if (!a && this.mayOmitPayload(r) || i.type === null) return;
 		let s = vt[i.type];
-		if (s) !a || !s.test(a, this.scheme, this.extensions) ? e.push(q(t, s.message)) : s.read && e.push(...it(this.scheme, t, a, s.read(a, this.scheme, this.extensions)));
+		if (s) !a || !s.test(a, this.scheme, this.extensions) ? e.push(q(t, s.message)) : s.read && e.push(...it(this.scheme, this.extensions, t, a, s.read(a, this.scheme, this.extensions)));
 		else switch (i.type) {
 			case "boolean":
 				a && a !== "Y" ? e.push(q(t, "should be Y or null")) : !a && t.children.length === 0 && e.push({
@@ -1586,7 +1586,7 @@ var Et = class {
 			if (t === y("CONT") || t === y("CONC")) continue;
 			let i = n.tokens.TAG;
 			if (w(t)) {
-				this.extensions.requireDeclaration && !this.extensions.tags.has(t) && e.push(le(t, i?.range || n.range));
+				this.extensions.requireDeclaration && !this.extensions.tags.has(t) && e.push(ce(t, i?.range || n.range));
 				let a = wt(this.extensions, t, r);
 				a && (c.collect(e, n, a), this.collect(e, n.children, a, r, n));
 				continue;
@@ -1742,7 +1742,7 @@ function Ft(e) {
 	return /\s$/u.test(e) ? t : t.slice(0, -1);
 }
 function It(e, t) {
-	let n = 0, r = O, i = t[0] === void 0 ? null : ve(e, t[0]);
+	let n = 0, r = k, i = t[0] === void 0 ? null : _e(e, t[0]);
 	i !== null && (r = i, n = 1);
 	let a = t.slice(n);
 	if (a.length === 0) return {
@@ -1752,7 +1752,7 @@ function It(e, t) {
 		keywords: [],
 		complete: !1
 	};
-	let { epochs: o } = k(e, r);
+	let { epochs: o } = A(e, r);
 	if (a.some((e) => o?.has(e))) return {
 		...Z,
 		complete: !0
@@ -1780,12 +1780,12 @@ function Lt(e, t, n) {
 	let r = Ft(t);
 	if (n === "exact") return r.length === 1 ? {
 		...Z,
-		months: O
+		months: k
 	} : Z;
 	let i = n === "period" ? Nt : Mt;
 	if (r.length === 0) return {
 		calendars: !0,
-		months: O,
+		months: k,
 		epochs: null,
 		keywords: i
 	};
@@ -1896,7 +1896,7 @@ var qt = {
 	}
 };
 function Jt(e, { grammar: t, escaped: n }, r) {
-	let i = Lt(e.scheme, r, t), a = (t) => t === null ? void 0 : e.scheme.calendar[y(t)], o = Object.keys(e.scheme.calendar).map((e) => n ? _e(e) : e);
+	let i = Lt(e.scheme, r, t), a = (t) => t === null ? void 0 : e.scheme.calendar[y(t)], o = Object.keys(e.scheme.calendar).map((e) => n ? ge(e) : e);
 	return [
 		...i.calendars ? o : [],
 		...Object.keys(a(i.months)?.months ?? {}),
@@ -1939,8 +1939,8 @@ function Zt(e) {
 	return e.startsWith("@") ? "An xref holds letters, digits and underscore between two @ marks, so this line cannot be read" : `This line cannot be read from ${JSON.stringify(e)} onward`;
 }
 var Qt = /* @__PURE__ */ new Set([m.UnresolvedXref, m.UndocumentedTag]);
-function $(e, t, n) {
-	return n && De(e, t).length === 0 && Oe(n.dates).length === 0 ? n : null;
+function $(e, t, n, r = T()) {
+	return n && De(e, t, r).length === 0 && Oe(n.dates).length === 0 ? n : null;
 }
 var $t = class {
 	nodes = [];
@@ -2023,7 +2023,7 @@ var $t = class {
 	}
 	applyScheme(e, t, n) {
 		this.scheme = t.scheme, this.validatedAs = t.dialect, this.requiresSchmaDeclaration = t.requiresSchmaDeclaration;
-		let { context: r, errors: i } = de(e, this.requiresSchmaDeclaration, this.scheme);
+		let { context: r, errors: i } = ue(e, this.requiresSchmaDeclaration, this.scheme);
 		this.extensions = r;
 		for (let e of i) this.errors.push(e);
 		new Et(this.pointers, r, n.fragment ?? !1).collect(this.errors, this.nodes, b(""), this.scheme), n.fragment && (this.errors = this.errors.filter((e) => !Qt.has(e.code)));
@@ -2082,7 +2082,7 @@ var $t = class {
 	}
 	readDate(e) {
 		let t = e.trim();
-		if (this.scheme && this.validatedAs) return $(this.scheme, t, this.validatedAs === "7.0" ? H(t, this.scheme, this.extensions) : G(this.scheme, t));
+		if (this.scheme && this.validatedAs) return $(this.scheme, t, this.validatedAs === "7.0" ? H(t, this.scheme, this.extensions) : G(this.scheme, t), this.extensions.requireDeclaration ? this.extensions : T());
 		let n = X("5.5.1").scheme, r = X("7.0").scheme;
 		return $(n, t, G(n, t)) ?? $(r, t, H(t, r));
 	}

package/dist/validator/calendarDays.d.ts

@@ -13,6 +13,7 @@
  */
 import { GedcomScheme } from "../schemes/schema-types";
 import type { GedcomDate } from "../types/date";
+import { ExtensionContext } from "./extensions";
 export declare const LENGTHS: Record<string, number>;
 export interface ImpossibleYear {
     year: number;
@@ -26,7 +27,7 @@ export interface ImpossibleDay {
 }
 export declare function isLeapYear(year: number, calendar: string): boolean;
 export declare function daysInMonth(month: string, year: number | null, calendar: string): number | null;
-export declare function impossibleDays(scheme: GedcomScheme, value: string): ImpossibleDay[];
+export declare function impossibleDays(scheme: GedcomScheme, value: string, extensions?: ExtensionContext): ImpossibleDay[];
 /**
  * Judged on what a grammar read rather than on tokens: only the grammar knows
  * that `0BC` is a year and an epoch, or that `_CAL 0` is not Gregorian.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domorium/validator",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "GEDCOM 5.5.1 and 7.0 parser and validator",
   "keywords": [
     "gedcom",