@treeviz/gedcom-parser 2.0.12 → 2.1.1

package/dist/constants/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,YAAY,kDAAkD,CAAC;AAE5E;;;GAGG;AAEH,eAAO,MAAM,YAAY,QACqE,CAAC;AAC/F,eAAO,MAAM,QAAQ,QACsF,CAAC;AAC5G,eAAO,MAAM,MAAM,QAAqB,CAAC;AACzC,eAAO,MAAM,aAAa,QAAiC,CAAC;AAC5D,eAAO,MAAM,YAAY,QAAsB,CAAC;AAEhD,8EAA8E;AAC9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,qBAAqB,QAAmB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,YAAY,kDAAkD,CAAC;AAE5E;;;GAGG;AAEH,eAAO,MAAM,YAAY,QAC2E,CAAC;AACrG,eAAO,MAAM,QAAQ,QACiG,CAAC;AACvH,eAAO,MAAM,MAAM,QAAqB,CAAC;AACzC,eAAO,MAAM,aAAa,QAAiC,CAAC;AAC5D,eAAO,MAAM,YAAY,QAAsB,CAAC;AAEhD,8EAA8E;AAC9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,qBAAqB,QAAmB,CAAC"}

package/dist/constants/index.js

@@ -9,8 +9,8 @@ var __export = (target, all) => {
 
 // src/constants/constants.ts
 var APP_BRANDING = "TreeViz - The Family Tree Visualiser & Editor";
-var REF_LINE_REG = /^0 (?:(@[_a-zA-Z0-9]*@) )?(?<type>_[_A-Z][_a-zA-Z]{2,}|_?[A-Z][a-zA-Z]{2,}) ?(?<value>.*)/gm;
-var LINE_REG = /(?<indent>^[0-9]) (?:(@[_a-zA-Z0-9]*@) )?(?<type>_[_A-Z][_a-zA-Z]{2,}|_?[A-Z][a-zA-Z]{2,}) ?(?<value>.*)/;
+var REF_LINE_REG = /^0 (?:(@[_a-zA-Z0-9]*@) )?(?<type>_[_A-Z][_a-zA-Z0-9]{2,}|_?[A-Z][A-Za-z0-9]{2,}) ?(?<value>.*)/gm;
+var LINE_REG = /(?<indent>^[0-9]{1,2}) (?:(@[_a-zA-Z0-9]*@) )?(?<type>_[_A-Z][_a-zA-Z0-9]{2,}|_?[A-Z][A-Za-z0-9]{2,}) ?(?<value>.*)/;
 var ID_REG = /^@[_a-zA-Z0-9]+@/;
 var ID_GETTER_REG = /^(?<at>@)?(?<letter>[A-Z])?/i;
 var ID_SPLIT_REG = /^@[_a-zA-Z0-9]+@:/;
@@ -924,11 +924,17 @@ var List = class _List {
     const gedcom = [];
     this.entries().forEach(([_, item]) => {
       const validTag = getValidTag(tag);
-      const validKey = item.id;
-      const validValue = validKey ? validTag : item.exportValue();
-      gedcom.push(
-        `${level} ${validKey || validTag}${validValue ? ` ${validValue}` : ""}`
-      );
+      const xref = item.id;
+      const payload = item.exportValue?.();
+      if (xref) {
+        gedcom.push(
+          `${level} ${xref} ${validTag}${payload ? ` ${payload}` : ""}`
+        );
+      } else {
+        gedcom.push(
+          `${level} ${validTag}${payload ? ` ${payload}` : ""}`
+        );
+      }
       gedcom.push(
         ...item.toGedcomLines(
           validTag,
@@ -1186,12 +1192,14 @@ var Common = class _Common {
     );
   }
   standardizeObject(tag, options) {
-    if (tag === "OBJE" && !options?.original && options?.obje?.standardize && options?.obje?.namespace && "standardizeMedia" in this) {
+    if (tag === "OBJE" && options?.obje?.standardize && "standardizeMedia" in this) {
       const standardize = this.standardizeMedia;
       return standardize.call(
         this,
         options.obje.namespace,
-        options.obje.override
+        options.obje.override,
+        void 0,
+        options.gedcomVersion
       );
     }
   }
@@ -1218,7 +1226,7 @@ var Common = class _Common {
         if (typeof prop?.toObject === "function") {
           if (prop instanceof _Common) {
             json[validKey] = prop.toObject(validKey, options);
-          } else {
+          } else if (prop instanceof List) {
             json = {
               ...json,
               ...prop.toObject(validKey, options)
@@ -1276,8 +1284,12 @@ var Common = class _Common {
     this.standardizeObject(tag, options);
     const validKeys = getValidKeys(this);
     const gedcom = [];
+    const isGedcom7Export = options?.gedcomVersion === "7.0";
     validKeys.forEach((key) => {
       const validKey = key;
+      if (isGedcom7Export && validKey === "CONC") {
+        return;
+      }
       const prop = this.get(validKey);
       if (typeof prop?.toGedcomLines === "function") {
         if (prop instanceof _Common) {
@@ -1288,7 +1300,7 @@ var Common = class _Common {
           gedcom.push(
             ...prop.toGedcomLines(validKey, level + 1, options)
           );
-        } else {
+        } else if (prop instanceof List) {
           gedcom.push(
             ...prop.toGedcomLines(validKey, level, options)
           );
@@ -1688,6 +1700,24 @@ var addFamilyFact = (fam, input) => {
   fillFact(gedcom, fam, event, input);
   return event;
 };
+var addNonEvent = (owner, input) => {
+  const gedcom = owner.getGedcom();
+  const eventType = input.event?.trim().toUpperCase();
+  if (!gedcom || !eventType) {
+    return void 0;
+  }
+  const no = createCommon(gedcom, void 0, owner);
+  no.type = "NO";
+  no.value = eventType;
+  if (input.date?.trim()) {
+    setDateOn(gedcom, owner, no, input.date);
+  }
+  if (input.note?.trim()) {
+    no.set("NOTE", input.note.trim());
+  }
+  owner.assign("NO", no);
+  return no;
+};
 
 // src/utils/family-edit.ts
 var PEDIGREE_VALUES = [
@@ -1922,16 +1952,58 @@ var getPlaces = (common, type = ["ALL" /* All */], maxLevel = 1, level = 0, main
   });
   return places;
 };
+
+// src/utils/local-media.ts
+var localMediaResolver;
+var isRemoteOrEmbeddedMediaUrl = (path) => {
+  if (!path) {
+    return false;
+  }
+  return path.startsWith("data:") || path.startsWith("blob:") || /^https?:\/\//i.test(path);
+};
+var resolveLocalMediaUrl = async (path) => {
+  if (!path) {
+    return void 0;
+  }
+  if (isRemoteOrEmbeddedMediaUrl(path)) {
+    return path;
+  }
+  const resolved = await localMediaResolver?.(path);
+  return resolved;
+};
 var implemented = (type, ...args) => {
 };
 
 // src/utils/media-utils.ts
 var getFileExtension = (filename) => {
-  const match = filename.match(/\.([^.]+)$/);
-  return match ? match[1] : "";
+  if (!filename) {
+    return "";
+  }
+  if (filename.startsWith("data:")) {
+    const mime = filename.slice(5).split(";")[0] || "";
+    const subtype = (mime.split("/")[1] || "").toLowerCase();
+    if (subtype === "jpeg") {
+      return "jpg";
+    }
+    return subtype.split("+")[0] || "";
+  }
+  const withoutQuery = filename.split(/[?#]/)[0] || filename;
+  const match = withoutQuery.match(/\.([^.]+)$/);
+  return match ? match[1].toLowerCase() : "";
 };
 var isImageFormat = (format2) => {
-  if (!format2) return false;
+  if (!format2) {
+    return false;
+  }
+  let normalized = format2.toLowerCase().trim();
+  if (normalized.startsWith("data:")) {
+    normalized = getFileExtension(normalized);
+  } else if (normalized.includes("/")) {
+    normalized = normalized.split("/")[1]?.split("+")[0] || "";
+    if (normalized === "jpeg") {
+      normalized = "jpg";
+    }
+  }
   const imageFormats = [
     "jpg",
     "jpeg",
@@ -1943,7 +2015,11 @@ var isImageFormat = (format2) => {
     "tiff",
     "tif"
   ];
-  return imageFormats.includes(format2.toLowerCase());
+  return imageFormats.includes(normalized);
+};
+var resolveObjeForm = (obje) => {
+  const value = obje?.get?.("FILE.FORM")?.toValue?.() ?? obje?.get?.("FORM")?.toValue?.();
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
 };
 var uniqueItemsCache = /* @__PURE__ */ new WeakMap();
 var setNestedGroup = (obj, key, value, uniqueCounting = true) => {
@@ -2513,6 +2589,9 @@ var Fam = class extends Common {
   addFact(input) {
     return addFamilyFact(this, input);
   }
+  addNonEvent(input) {
+    return addNonEvent(this, input);
+  }
   toList() {
     return new Families().concat(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -3231,10 +3310,14 @@ var Indi = class extends Common {
           const clone = obje?.get("_CLON._OID")?.toValue();
           const mser = obje?.get("_MSER._LKID")?.toValue();
           let url = obje?.get("FILE")?.toValue();
-          const title = obje?.get("TITL")?.toValue() ?? "";
-          const type = obje?.get("FORM")?.toValue() ?? "raw";
-          const imgId = clone || mser;
-          if (!www || !tree || !this.id) {
+          const title = obje?.get("FILE.TITL")?.toValue() ?? obje?.get("TITL")?.toValue() ?? "";
+          const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
+          let imgId = clone || mser;
+          const hasEmbeddedOrLocalFile = !!url && (url.startsWith("data:") || url.startsWith("blob:") || !/^https?:\/\//i.test(url));
+          if (!hasEmbeddedOrLocalFile && (!www || !tree || !this.id)) {
+            return;
+          }
+          if (!this.id) {
             return;
           }
           if (!namespace && !url) {
@@ -3252,13 +3335,16 @@ var Indi = class extends Common {
             }
             url = url || `https://${www}/mediaui-viewer/tree/${tree}/media/${media}`;
           }
+          if (!imgId && hasEmbeddedOrLocalFile && url) {
+            imgId = typeof media === "string" && media || `local-${String(key).replace(/[@]/g, "")}-${getFileExtension(url) || "bin"}`;
+          }
           if (url && imgId) {
-            const id = `${tree}-${this.id}-${imgId}`;
+            const id = `${tree || "gedzip"}-${this.id}-${imgId}`;
             list[id] = {
               key,
               isPrimary,
               id,
-              tree,
+              tree: tree || "gedzip",
               imgId,
               person: this.id,
               title,
@@ -3304,9 +3390,11 @@ var Indi = class extends Common {
       obje.standardizeMedia();
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
-      const title = obje?.get("NOTE")?.toValue() ?? "";
-      const type = obje?.get("FORM")?.toValue() ?? "raw";
-      const imgId = obje?.get("_PHOTO_RIN")?.toValue();
+      const title = obje?.get("FILE.NOTE")?.toValue() ?? obje?.get("NOTE")?.toValue() ?? "";
+      const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
+      const photoRin = obje?.get("_PHOTO_RIN")?.toValue();
+      const hasEmbeddedOrLocalFile = !!url && (url.startsWith("data:") || url.startsWith("blob:") || !/^https?:\/\//i.test(url));
+      const imgId = photoRin || (hasEmbeddedOrLocalFile && url ? `local-${String(key).replace(/[@]/g, "")}-${getFileExtension(url) || "bin"}` : void 0);
       if (url && imgId) {
         const id = `${tree}-${this.id}-${imgId}`;
         list[id] = {
@@ -3429,10 +3517,10 @@ var Indi = class extends Common {
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
       const title = obje?.get("TITL")?.toValue() ?? "";
-      const type = obje?.get("FORM")?.toValue() ?? "raw";
+      const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
       if (url) {
         const urlMatch = url.match(/\/([^/]+)\?hash=/);
-        const imgId = urlMatch?.[1] || `img-${index}-${Date.now().toString(36)}`;
+        const imgId = urlMatch?.[1] || (url.startsWith("data:") ? `data-${index}-${getFileExtension(url) || "bin"}` : `img-${index}-${Date.now().toString(36)}`);
         const id = `geni-${geniId}-${imgId}`;
         list[id] = {
           isPrimary,
@@ -3469,10 +3557,10 @@ var Indi = class extends Common {
       obje.standardizeMedia();
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
-      const title = obje?.get("TITL")?.toValue() ?? "";
-      const type = obje?.get("FORM")?.toValue() ?? "raw";
+      const title = obje?.get("FILE.TITL")?.toValue() ?? obje?.get("TITL")?.toValue() ?? "";
+      const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
       if (url) {
-        const imgId = `media-${index}-${url.split("/").pop()?.split("?")[0]?.substring(0, 20) || Date.now().toString(36)}`;
+        const imgId = `media-${index}-${url.startsWith("data:") ? getFileExtension(url) || "bin" : url.split("/").pop()?.split("?")[0]?.substring(0, 20) || Date.now().toString(36)}`;
         const id = `${treeId}-${this.id}-${imgId}`;
         list[id] = {
           isPrimary,
@@ -3512,7 +3600,20 @@ var Indi = class extends Common {
       cacheKey
     );
     if (cached !== void 0) {
-      return cached;
+      if (cached?.file && !isRemoteOrEmbeddedMediaUrl(cached.file)) {
+        const resolvedCached = await resolveLocalMediaUrl(cached.file);
+        if (resolvedCached && isRemoteOrEmbeddedMediaUrl(resolvedCached)) {
+          const refreshed = { ...cached, file: resolvedCached };
+          profilePictureCache(
+            this._gedcom,
+            cacheKey,
+            refreshed
+          );
+          return refreshed;
+        }
+      } else {
+        return cached;
+      }
     }
     const mediaList = await this.multimedia(namespace);
     if (!mediaList) {
@@ -3524,39 +3625,40 @@ var Indi = class extends Common {
       return void 0;
     }
     const mediaArray = Object.values(mediaList);
-    const primaryMedia = mediaArray.find(
-      (media) => media.isPrimary && isImageFormat(media.contentType || getFileExtension(media.url))
-    );
-    if (primaryMedia) {
-      const result = {
-        file: primaryMedia.url,
-        form: primaryMedia.contentType,
-        title: primaryMedia.title,
-        isPrimary: true
+    const toDisplayableProfile = async (media, isPrimary) => {
+      const resolvedFile = await resolveLocalMediaUrl(media.url);
+      if (!resolvedFile || !isRemoteOrEmbeddedMediaUrl(resolvedFile)) {
+        return void 0;
+      }
+      return {
+        file: resolvedFile,
+        form: media.contentType,
+        title: media.title,
+        isPrimary
       };
-      profilePictureCache(this._gedcom, cacheKey, result);
-      return result;
-    }
-    if (onlyPrimary) {
-      profilePictureCache(
-        this._gedcom,
-        cacheKey,
-        void 0
-      );
-      return void 0;
-    }
-    const secondaryMedia = mediaArray.find(
-      (media) => isImageFormat(media.contentType || getFileExtension(media.url))
+    };
+    const candidates = mediaArray.filter(
+      (media) => isImageFormat(
+        media.contentType || media.url || getFileExtension(media.url)
+      )
     );
-    if (secondaryMedia) {
-      const result = {
-        file: secondaryMedia.url,
-        form: secondaryMedia.contentType,
-        title: secondaryMedia.title,
-        isPrimary: false
-      };
-      profilePictureCache(this._gedcom, cacheKey, result);
-      return result;
+    const ordered = [
+      ...candidates.filter((media) => media.isPrimary),
+      ...candidates.filter((media) => !media.isPrimary)
+    ];
+    for (const media of ordered) {
+      if (onlyPrimary && !media.isPrimary) {
+        break;
+      }
+      const result = await toDisplayableProfile(media, !!media.isPrimary);
+      if (result) {
+        profilePictureCache(
+          this._gedcom,
+          cacheKey,
+          result
+        );
+        return result;
+      }
     }
     profilePictureCache(
       this._gedcom,
@@ -3842,9 +3944,108 @@ var Indi = class extends Common {
   addParent(parent, pedigree) {
     return parent.addChild(this, pedigree);
   }
+  /**
+   * Link an existing top-level OBJE record to this individual (`1 OBJE @On@`).
+   */
+  attachMultimedia(objeOrKey, options) {
+    if (!this._gedcom || !this.id) {
+      return void 0;
+    }
+    const obje = typeof objeOrKey === "string" ? this._gedcom.obje(objeOrKey) : objeOrKey;
+    if (!obje?.id) {
+      return void 0;
+    }
+    const already = this.get("OBJE")?.toList()?.values()?.some((item) => item?.toValue?.() === obje.id);
+    if (!already) {
+      const pointer = makePointer(
+        this._gedcom,
+        this,
+        obje.id,
+        "OBJE"
+      );
+      this.assign("OBJE", pointer);
+    }
+    if (options?.primary) {
+      this.get("OBJE")?.toList()?.forEach((item) => {
+        const target = item?.refType === "OBJE" ? this._gedcom?.obje(
+          String(item.toValue())
+        ) : item;
+        if (!target) {
+          return;
+        }
+        if (target.id === obje.id) {
+          target.set("_PRIM", "Y");
+        } else if (target.get("_PRIM")?.toValue() === "Y") {
+          target.set("_PRIM", "N");
+        }
+      });
+      obje.set("_PRIM", "Y");
+    }
+    return obje;
+  }
+  detachMultimedia(objeKey) {
+    const list = this.get("OBJE")?.toList();
+    if (!list) {
+      return;
+    }
+    const toRemove = list.values().filter(
+      (item) => item?.toValue?.() === objeKey || item?.id === objeKey
+    );
+    toRemove.forEach((item) => {
+      if (item) {
+        list.delete(item);
+      }
+    });
+    if (list.length === 0) {
+      this.remove("OBJE");
+    }
+  }
+  /**
+   * Create a multimedia record and attach it to this person.
+   */
+  attachMediaFromUrl(url, options) {
+    if (!this._gedcom || !url) {
+      return void 0;
+    }
+    const obje = this._gedcom.createMultimediaRecord({
+      file: url,
+      form: options?.form,
+      title: options?.title,
+      mediType: options?.mediType,
+      primary: options?.primary,
+      gedcomVersion: options?.gedcomVersion
+    });
+    return this.attachMultimedia(obje, { primary: options?.primary });
+  }
+  /**
+   * Link a shared SNOTE record via `1 NOTE @Nn@` (GEDCOM 7).
+   */
+  attachSharedNote(noteOrKey) {
+    if (!this._gedcom || !this.id) {
+      return void 0;
+    }
+    const note = typeof noteOrKey === "string" ? this._gedcom.snote(noteOrKey) : noteOrKey;
+    if (!note?.id) {
+      return void 0;
+    }
+    const already = this.get("NOTE")?.toList()?.values()?.some((item) => item?.toValue?.() === note.id);
+    if (!already) {
+      const pointer = makePointer(
+        this._gedcom,
+        this,
+        note.id,
+        "SNOTE"
+      );
+      this.assign("NOTE", pointer);
+    }
+    return note;
+  }
   addFact(input) {
     return addIndividualFact(this, input);
   }
+  addNonEvent(input) {
+    return addNonEvent(this, input);
+  }
   getParentType(id) {
     let indi;
     if (typeof id === "string" || typeof id === "number") {
@@ -3885,7 +4086,7 @@ var Indi = class extends Common {
       if (!famChild) {
         const childIndi = this._gedcom?.indi(child.id);
         const childState = childIndi?.get("FAMC")?.toList()?.filter((item) => item.value === family.id).index(0);
-        childType = childState?.get("PEDI")?.toValue() || "biological" /* BIOLOGICAL */;
+        childType = (childState?.get("PEDI") ?? childState?.get("PEDT"))?.toValue() || "biological" /* BIOLOGICAL */;
       } else {
         childType = famChild.get(usedRel)?.toValue() || "biological" /* BIOLOGICAL */;
       }
@@ -4446,7 +4647,7 @@ var Indi = class extends Common {
             return;
           }
           const childState = child?.get("FAMC")?.toList()?.filter((item) => item.value === family.id).index(0);
-          const childType = childState?.get("PEDI")?.toValue() || "biological" /* BIOLOGICAL */;
+          const childType = (childState?.get("PEDI") ?? childState?.get("PEDT"))?.toValue() || "biological" /* BIOLOGICAL */;
           if (childType?.toLowerCase() === filter.PEDI.toLowerCase()) {
             children.append(child);
           }
@@ -4554,7 +4755,7 @@ var Indi = class extends Common {
       const child = this.id && family.CHIL?.toValueList()?.item(this.id);
       if (!child) {
         const childState = this?.get("FAMC")?.toList()?.filter((item) => item.value === family.id).index(0);
-        const parentType = childState?.get("PEDI")?.toValue() || "biological" /* BIOLOGICAL */;
+        const parentType = (childState?.get("PEDI") ?? childState?.get("PEDT"))?.toValue() || "biological" /* BIOLOGICAL */;
         if (parentType?.toLowerCase() === filter.PEDI.toLowerCase()) {
           parents.merge(family.getParents());
         }
@@ -6753,7 +6954,11 @@ var STANDARD_QUALIFIERS = {
   BEF: "Bef.",
   BEFORE: "Bef.",
   AFT: "Aft.",
-  AFTER: "Aft."
+  AFTER: "Aft.",
+  CAL: "Abt.",
+  // calculated ≈ about for display
+  EST: "Abt."
+  // estimated ≈ about for display
 };
 var EXPORT_QUALIFIERS = {
   "Abt.": "ABT",
@@ -6761,6 +6966,11 @@ var EXPORT_QUALIFIERS = {
   "Aft.": "AFT"
 };
 var GEDCOM_MONTHS = /\b(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\b/g;
+var CALENDAR_PREFIX = /^(?<calendar>GREGORIAN|JULIAN|FRENCH_R|HEBREW)\b\s+/i;
+var isGedcomDateValueForm = (value) => (
+  // Require space/end after the token so display forms like "Abt." are not opaque.
+  /^(FROM|TO|BET|AFT|BEF|ABT|CAL|EST|INT)(\s|$)/i.test(value) || /\bAND\b/i.test(value)
+);
 var NOTE_MARKER = "####";
 var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, baseFormat = "dd MMM yyyy", locale) => {
   const hasNote = baseFormat.includes("NOTE");
@@ -6785,29 +6995,45 @@ var CommonDate = class extends Common {
     super(gedcom, id, main, parent);
     delete this.id;
   }
+  get calendar() {
+    return this._calendar;
+  }
   set value(value) {
     if (value) {
-      const noteRegExp = /^(?<note>[a-zA-Z]+\.)/;
-      const noteMatch = value.match(noteRegExp)?.groups;
       let validValue = value;
+      const calendarMatch = validValue.match(CALENDAR_PREFIX);
+      if (calendarMatch?.groups?.calendar) {
+        this._calendar = calendarMatch.groups.calendar.toUpperCase();
+        validValue = validValue.slice(calendarMatch[0].length);
+      } else {
+        this._calendar = void 0;
+      }
+      const noteRegExp = /^(?<note>[a-zA-Z]+\.)/;
+      const noteMatch = validValue.match(noteRegExp)?.groups;
       if (noteMatch?.note) {
         this.NOTE = this.NOTE || createCommon(this._gedcom, void 0, this.main);
         this.NOTE.value = noteMatch?.note;
-        validValue = value.replace(noteRegExp, "");
+        validValue = validValue.replace(noteRegExp, "");
       } else {
-        const qualifierMatch = value.match(
-          /^(?<qualifier>ABT|ABOUT|BEF|BEFORE|AFT|AFTER)\b\s*/i
+        const qualifierMatch = validValue.match(
+          /^(?<qualifier>ABT|ABOUT|BEF|BEFORE|AFT|AFTER|CAL|EST)\b\s*/i
         );
         const qualifier = qualifierMatch?.groups?.qualifier?.toUpperCase();
         const note = qualifier ? STANDARD_QUALIFIERS[qualifier] : void 0;
         if (note) {
           this.NOTE = this.NOTE || createCommon(this._gedcom, void 0, this.main);
           this.NOTE.value = note;
-          validValue = value.slice(qualifierMatch[0].length);
+          validValue = validValue.slice(qualifierMatch[0].length);
         }
       }
       const acceptedDate = this.isValidDateFormat(validValue);
-      if (acceptedDate) {
+      if (isGedcomDateValueForm(validValue.trim())) {
+        delete this.DAY;
+        delete this.MONTH;
+        delete this.YEAR;
+        this._date = void 0;
+        this._value = value;
+      } else if (acceptedDate) {
         this.DAY = this.DAY || createCommon(this._gedcom, void 0, this.main);
         this.DAY.value = format(acceptedDate, "dd");
         this.MONTH = this.MONTH || createCommon(this._gedcom, void 0, this.main);
@@ -6910,6 +7136,15 @@ var CommonDate = class extends Common {
     );
   }
   exportValue() {
+    if (typeof this._value === "string") {
+      const withoutCalendar = this._value.replace(CALENDAR_PREFIX, "");
+      if (isGedcomDateValueForm(withoutCalendar.trim())) {
+        return this._value.replace(
+          /^((?:GREGORIAN|JULIAN|FRENCH_R|HEBREW)\s+)?(FROM|TO|BET|AFT|BEF|ABT|CAL|EST|INT)\b/i,
+          (_m, cal, q) => `${cal || ""}${q.toUpperCase()}`
+        );
+      }
+    }
     const formatted = this.toValue("NOTE dd MMM yyyy", null);
     if (!formatted) {
       return formatted;
@@ -6917,10 +7152,14 @@ var CommonDate = class extends Common {
     const note = this.NOTE?.value?.trim();
     const qualifier = note ? EXPORT_QUALIFIERS[note] : void 0;
     const standardized = qualifier ? formatted.replace(note, qualifier) : formatted;
-    return standardized.replace(
+    const withMonths = standardized.replace(
       GEDCOM_MONTHS,
       (month) => month.toUpperCase()
     );
+    if (this._calendar && this._calendar !== "GREGORIAN") {
+      return `${this._calendar} ${withMonths}`;
+    }
+    return withMonths;
   }
   toGedcomLines(tag, level = 0, options) {
     const internal = new RegExp(