@treeviz/gedcom-parser 2.1.12 → 2.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/classes/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/classes/common.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,8 @@ import type { List } from "./list";
9
9
  export declare class CommonDate extends Common<string> {
10
10
  private _date?;
11
11
  private _calendar?;
12
+ /** One DATE per event — merge must not turn this into a List. */
13
+ isListable: boolean;
12
14
  DAY?: Common;
13
15
  MONTH?: Common;
14
16
  YEAR?: Common;
@@ -1 +1 @@
1
- {"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/classes/date.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAA6B,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAsFnC,qBAAa,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAO;IACrB,OAAO,CAAC,SAAS,CAAC,CAAS;IAE3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;gBAGb,MAAM,CAAC,EAAE,UAAU,EACnB,EAAE,CAAC,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM;IAOhB,IAAI,QAAQ,uBAEX;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EA2GlC;IAED,IAAI,KAAK,IA7GQ,MAAM,GAAG,SAAS,CAgIlC;IAED,IAAI,QAAQ,qBAEX;IAED,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,EAC7C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAC,EACR,MAAM,UAAQ;IAUf,OAAO,CAAC,iBAAiB;IAgBzB,MAAM,CAAC,KAAK,UAAO,GAAG,MAAM,GAAG,SAAS;IAUxC,OAAO,CACN,UAAU,SAAgB,EAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,GAAG,SAAS;IAuBrB,WAAW;IAuCX,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,SAAI,EAAE,OAAO,CAAC,EAAE,cAAc;IAajE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,UAAQ;CAG1C;AAED,eAAO,MAAM,gBAAgB,GAC5B,SAAS,UAAU,EACnB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACb,aAAa,CAAC,UAAU,CAI1B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,KAAG,KAAK,IAAI,UAOvD,CAAC"}
1
+ {"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/classes/date.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAA6B,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAsFnC,qBAAa,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAO;IACrB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,iEAAiE;IACjE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;gBAGb,MAAM,CAAC,EAAE,UAAU,EACnB,EAAE,CAAC,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM;IAOhB,IAAI,QAAQ,uBAEX;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EA2GlC;IAED,IAAI,KAAK,IA7GQ,MAAM,GAAG,SAAS,CAgIlC;IAED,IAAI,QAAQ,qBAEX;IAED,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,EAC7C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAC,EACR,MAAM,UAAQ;IAUf,OAAO,CAAC,iBAAiB;IAgBzB,MAAM,CAAC,KAAK,UAAO,GAAG,MAAM,GAAG,SAAS;IAUxC,OAAO,CACN,UAAU,SAAgB,EAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,GAAG,SAAS;IAuBrB,WAAW;IAuCX,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,SAAI,EAAE,OAAO,CAAC,EAAE,cAAc;IAajE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,UAAQ;CAG1C;AAED,eAAO,MAAM,gBAAgB,GAC5B,SAAS,UAAU,EACnB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACb,aAAa,CAAC,UAAU,CAI1B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,KAAG,KAAK,IAAI,UAOvD,CAAC"}
@@ -886,7 +886,11 @@ var Common = class _Common {
886
886
  const current = this.get(validKey);
887
887
  const mergeValue = other.get(validKey);
888
888
  if (mergeValue) {
889
- if (current instanceof _Common || current instanceof List) {
889
+ if (current instanceof _Common && !current.isListable) {
890
+ if (override) {
891
+ this.set(validKey, mergeValue);
892
+ }
893
+ } else if (current instanceof _Common || current instanceof List) {
890
894
  this.assign(validKey, mergeValue, true);
891
895
  } else if (!current || override && validKey !== "id" && validKey !== "_id") {
892
896
  this.set(validKey, mergeValue);
@@ -1445,11 +1449,12 @@ var hungarianOrdinalize = (n) => {
1445
1449
 
1446
1450
  // src/kinship-translator/kinship-translator.basic.ts
1447
1451
  var KinshipTranslatorBasic = class {
1448
- constructor(path, displayName = "givenname") {
1452
+ constructor(path, displayName = "givenname", nameOrder = "first-last") {
1449
1453
  this.isOfSpouse = false;
1450
1454
  this.isSpouseOf = false;
1451
1455
  this._path = path;
1452
1456
  this.displayName = displayName;
1457
+ this.nameOrder = nameOrder;
1453
1458
  }
1454
1459
  get path() {
1455
1460
  return this._path;
@@ -1872,7 +1877,7 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
1872
1877
  }
1873
1878
  of(relation) {
1874
1879
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
1875
- nameOrder: "last-first"
1880
+ nameOrder: this.nameOrder
1876
1881
  });
1877
1882
  let name = formattedName.inOrder.filter(Boolean).join(" ");
1878
1883
  if (this.displayName === "none") {
@@ -2086,7 +2091,7 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
2086
2091
  }
2087
2092
  of(relation) {
2088
2093
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
2089
- nameOrder: "first-last"
2094
+ nameOrder: this.nameOrder
2090
2095
  });
2091
2096
  let name = formattedName.inOrder.filter(Boolean).join(" ");
2092
2097
  if (this.displayName === "none") {
@@ -2302,7 +2307,7 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
2302
2307
  }
2303
2308
  of(relation) {
2304
2309
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
2305
- nameOrder: "first-last"
2310
+ nameOrder: this.nameOrder
2306
2311
  });
2307
2312
  let name = formattedName.inOrder.filter(Boolean).join(" ");
2308
2313
  if (this.displayName === "none") {
@@ -2519,7 +2524,7 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
2519
2524
  }
2520
2525
  of(relation) {
2521
2526
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
2522
- nameOrder: "first-last"
2527
+ nameOrder: this.nameOrder
2523
2528
  });
2524
2529
  let name = formattedName.inOrder.filter(Boolean).join(" ");
2525
2530
  if (this.displayName === "none") {
@@ -2857,7 +2862,7 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
2857
2862
  }
2858
2863
  of(relation) {
2859
2864
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
2860
- nameOrder: "first-last"
2865
+ nameOrder: this.nameOrder
2861
2866
  });
2862
2867
  let name = formattedName.inOrder.filter(Boolean).join(" ");
2863
2868
  if (this.displayName === "none") {
@@ -3164,7 +3169,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
3164
3169
  }
3165
3170
  of(relation) {
3166
3171
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
3167
- nameOrder: "first-last"
3172
+ nameOrder: this.nameOrder
3168
3173
  });
3169
3174
  let name = formattedName.inOrder.filter(Boolean).join(" ");
3170
3175
  if (this.displayName === "none") {
@@ -3400,7 +3405,7 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
3400
3405
  }
3401
3406
  of(relation) {
3402
3407
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
3403
- nameOrder: "last-first"
3408
+ nameOrder: this.nameOrder
3404
3409
  });
3405
3410
  let name = formattedName.inOrder.filter(Boolean).join(" ");
3406
3411
  if (this.displayName === "none") {
@@ -3649,7 +3654,7 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
3649
3654
  }
3650
3655
  of(relation) {
3651
3656
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
3652
- nameOrder: "last-first"
3657
+ nameOrder: this.nameOrder
3653
3658
  });
3654
3659
  let name = formattedName.inOrder.filter(Boolean).join(" ");
3655
3660
  if (this.displayName === "none") {
@@ -3718,22 +3723,30 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
3718
3723
  };
3719
3724
 
3720
3725
  // src/kinship-translator/kinship-translator.ts
3726
+ var nameOrderForLang = (lang) => lang === "hu" || lang === "ja" || lang === "zh" ? "last-first" : "first-last";
3721
3727
  var KinshipTranslator = class {
3722
- constructor(person1, person2, lang = "en", entirePath, displayName = "givenname") {
3728
+ constructor(person1, person2, lang = "en", entirePath, displayName = "givenname", nameOrder) {
3723
3729
  this.displayName = displayName;
3724
3730
  this.lang = lang;
3725
3731
  this.entirePath = entirePath;
3726
3732
  this.person1 = person1;
3727
3733
  this.person2 = typeof person2 === "string" ? this.person1.getGedcom()?.indi(person2) : person2;
3728
3734
  this.path = this.person1.path(this.person2);
3735
+ const order = nameOrder ?? nameOrderForLang(lang);
3736
+ this.nameOrder = order;
3729
3737
  if (translators_exports[lang]) {
3730
3738
  this.translator = new translators_exports[lang](
3731
3739
  this.path ?? [],
3732
- displayName
3740
+ displayName,
3741
+ order
3733
3742
  );
3734
3743
  }
3735
3744
  if (!this.translator) {
3736
- this.translator = new KinshipTranslatorEn(this.path ?? [], displayName);
3745
+ this.translator = new KinshipTranslatorEn(
3746
+ this.path ?? [],
3747
+ displayName,
3748
+ order
3749
+ );
3737
3750
  }
3738
3751
  }
3739
3752
  get path0() {
@@ -3778,14 +3791,16 @@ var KinshipTranslator = class {
3778
3791
  showMainPerson,
3779
3792
  this.lang,
3780
3793
  false,
3781
- this.displayName
3794
+ this.displayName,
3795
+ this.nameOrder
3782
3796
  ),
3783
3797
  relative: this.path?.[index - 1]?.indi.kinship(
3784
3798
  path2.indi.id,
3785
3799
  showMainPerson,
3786
3800
  this.lang,
3787
3801
  false,
3788
- this.displayName
3802
+ this.displayName,
3803
+ this.nameOrder
3789
3804
  )
3790
3805
  }));
3791
3806
  return path;
@@ -3848,19 +3863,41 @@ var ACCEPTED_DATE_FORMATS_REGEX = new RegExp(
3848
3863
  ).join("|")})`,
3849
3864
  "gi"
3850
3865
  );
3866
+ var firstDate = (date) => {
3867
+ if (!date) return void 0;
3868
+ if (isCommonDate(date)) return date;
3869
+ if (date instanceof List) {
3870
+ return firstDate(
3871
+ date.index(0)
3872
+ );
3873
+ }
3874
+ const node = date;
3875
+ if (typeof node.toValue === "function") {
3876
+ return node;
3877
+ }
3878
+ return void 0;
3879
+ };
3880
+ var dateNote = (date, shortNote = true) => {
3881
+ if (date && typeof date.toNote === "function") {
3882
+ return date.toNote(shortNote) ?? "";
3883
+ }
3884
+ return "";
3885
+ };
3851
3886
  var commonDateFormatter = (date, format2 = "yyyy", prefix = "") => {
3852
- const formattedDate = date?.toValue(format2);
3887
+ const used = firstDate(date);
3888
+ const formattedDate = used?.toValue(format2);
3853
3889
  if (!formattedDate) {
3854
3890
  return void 0;
3855
3891
  }
3856
3892
  return `${prefix}${formattedDate}`.trim();
3857
3893
  };
3858
3894
  var noteDateFormatter = (date, format2 = "yyyy", prefix = "", shortNote = true, showNote = true) => {
3859
- const rawDate = commonDateFormatter(date, format2, "");
3895
+ const used = firstDate(date);
3896
+ const rawDate = commonDateFormatter(used, format2, "");
3860
3897
  if (!rawDate) {
3861
3898
  return void 0;
3862
3899
  }
3863
- const note = date?.toNote(shortNote) ?? "";
3900
+ const note = dateNote(used, shortNote);
3864
3901
  return `${prefix}${note && showNote ? i18n.t(`${note} {{date}}`, { date: rawDate }) : rawDate}`;
3865
3902
  };
3866
3903
  var marriageDateFormatter = (fam, showDays = false, showPlaces = false, shortNote = true, showNote = true, showDisplayTextIfNoDate = true, showAllEvents = false, dateFormatPattern) => {
@@ -3965,11 +4002,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
3965
4002
  const birthPlaces = [];
3966
4003
  const eventsToProcess = showAllEvents ? birthEvents : birthEvents.slice(0, 1);
3967
4004
  eventsToProcess.forEach((birthEvent) => {
4005
+ const birthDateNode = firstDate(birthEvent?.DATE);
3968
4006
  const birthDate = commonDateFormatter(
3969
- birthEvent?.DATE,
4007
+ birthDateNode,
3970
4008
  showDays ? fullDateFormat : "yyyy"
3971
4009
  );
3972
- const birthEventNote = birthEvent?.DATE?.toNote(shortNote) ?? "";
4010
+ const birthEventNote = dateNote(birthDateNode, shortNote);
3973
4011
  const birthEventPlace = showPlaces ? birthEvent?.PLAC?.value : void 0;
3974
4012
  if (birthDate) {
3975
4013
  birthStrings.push(
@@ -3984,11 +4022,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
3984
4022
  const deathPlaces = [];
3985
4023
  const deathEventsToProcess = showAllEvents ? deathEvents : deathEvents.slice(0, 1);
3986
4024
  deathEventsToProcess.forEach((deathEvent) => {
4025
+ const deathDateNode = firstDate(deathEvent?.DATE);
3987
4026
  const deathDate = commonDateFormatter(
3988
- deathEvent?.DATE,
4027
+ deathDateNode,
3989
4028
  showDays ? fullDateFormat : "yyyy"
3990
4029
  );
3991
- const deathEventNote = deathEvent?.DATE?.toNote(shortNote) ?? "";
4030
+ const deathEventNote = dateNote(deathDateNode, shortNote);
3992
4031
  const deathEventPlace = showPlaces ? deathEvent?.PLAC?.value : void 0;
3993
4032
  if (deathDate) {
3994
4033
  deathStrings.push(
@@ -4120,6 +4159,8 @@ var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, base
4120
4159
  var CommonDate = class extends Common {
4121
4160
  constructor(gedcom, id, main, parent) {
4122
4161
  super(gedcom, id, main, parent);
4162
+ /** One DATE per event — merge must not turn this into a List. */
4163
+ this.isListable = false;
4123
4164
  delete this.id;
4124
4165
  }
4125
4166
  get calendar() {
@@ -7623,14 +7664,15 @@ var Indi = class extends Common {
7623
7664
  }
7624
7665
  return foundPath;
7625
7666
  }
7626
- kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname") {
7667
+ kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname", nameOrder) {
7627
7668
  const KinshipTranslatorClass2 = getKinshipTranslatorClass();
7628
7669
  const translator = new KinshipTranslatorClass2(
7629
7670
  this,
7630
7671
  other,
7631
7672
  lang,
7632
7673
  entirePath,
7633
- showMainPerson ? displayName : void 0
7674
+ showMainPerson ? displayName : void 0,
7675
+ nameOrder
7634
7676
  );
7635
7677
  return translator.translate(!!showMainPerson);
7636
7678
  }
@@ -8867,7 +8909,8 @@ var TREEVIZ_EXTENSION_URIS = {
8867
8909
  _TREEVIZ_SETTINGS: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_SETTINGS`,
8868
8910
  _TREEVIZ_VIEW: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_VIEW`,
8869
8911
  _TREEVIZ_DETECTIVE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE`,
8870
- _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`
8912
+ _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`,
8913
+ _TREEVIZ_FS_IGNORE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_FS_IGNORE`
8871
8914
  };
8872
8915
  var parseTagDefinition = (payload) => {
8873
8916
  const trimmed = payload.trim();
@@ -8985,7 +9028,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
8985
9028
 
8986
9029
  // package.json
8987
9030
  var package_default = {
8988
- version: "2.1.12"};
9031
+ version: "2.1.16"};
8989
9032
 
8990
9033
  // src/utils/get-product-details.ts
8991
9034
  var getVersion = () => package_default.version;
@@ -4,7 +4,7 @@ import type { Kinship } from "../kinship-translator/kinship-translator.interface
4
4
  import type { Language } from "../kinship-translator/types";
5
5
  import type IIndividualStructure from "../structures/individual";
6
6
  import { RelationType } from "../types/types";
7
- import type { IndiKey, FamKey, Filter, ObjeKey, MultiTag, IdType, SnoteKey } from "../types/types";
7
+ import type { IndiKey, FamKey, Filter, ObjeKey, MultiTag, IdType, SnoteKey, NameOrder } from "../types/types";
8
8
  import type { AddFactInput, AddNonEventInput } from "../utils/fact-edit";
9
9
  import { PlaceType } from "../utils/get-places";
10
10
  import type { Place } from "../utils/get-places";
@@ -149,7 +149,7 @@ export declare class Indi extends Common<string, IndiKey> implements IIndi {
149
149
  breakAfterSpouse?: boolean;
150
150
  breakAfterNonBiological?: boolean;
151
151
  }): ReducedPath | undefined;
152
- kinship<T extends boolean | undefined>(other?: IndiKey | IndiType, showMainPerson?: boolean, lang?: Language, entirePath?: T, displayName?: "none" | "givenname" | "surname" | "all"): (T extends false | undefined ? string : Array<{
152
+ kinship<T extends boolean | undefined>(other?: IndiKey | IndiType, showMainPerson?: boolean, lang?: Language, entirePath?: T, displayName?: "none" | "givenname" | "surname" | "all", nameOrder?: NameOrder): (T extends false | undefined ? string : Array<{
153
153
  id?: IndiKey;
154
154
  gen: number;
155
155
  relative?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"indi.d.ts","sourceRoot":"","sources":["../../src/classes/indi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"indi.d.ts","sourceRoot":"","sources":["../../src/classes/indi.ts"],"names":[],"mappings":"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"}
package/dist/cli/index.js CHANGED
@@ -820,7 +820,11 @@ var Common = class _Common {
820
820
  const current = this.get(validKey);
821
821
  const mergeValue = other.get(validKey);
822
822
  if (mergeValue) {
823
- if (current instanceof _Common || current instanceof List) {
823
+ if (current instanceof _Common && !current.isListable) {
824
+ if (override) {
825
+ this.set(validKey, mergeValue);
826
+ }
827
+ } else if (current instanceof _Common || current instanceof List) {
824
828
  this.assign(validKey, mergeValue, true);
825
829
  } else if (!current || override && validKey !== "id" && validKey !== "_id") {
826
830
  this.set(validKey, mergeValue);
@@ -2090,19 +2094,41 @@ var ACCEPTED_DATE_FORMATS_REGEX = new RegExp(
2090
2094
  ).join("|")})`,
2091
2095
  "gi"
2092
2096
  );
2097
+ var firstDate = (date) => {
2098
+ if (!date) return void 0;
2099
+ if (isCommonDate(date)) return date;
2100
+ if (date instanceof List) {
2101
+ return firstDate(
2102
+ date.index(0)
2103
+ );
2104
+ }
2105
+ const node = date;
2106
+ if (typeof node.toValue === "function") {
2107
+ return node;
2108
+ }
2109
+ return void 0;
2110
+ };
2111
+ var dateNote = (date, shortNote = true) => {
2112
+ if (date && typeof date.toNote === "function") {
2113
+ return date.toNote(shortNote) ?? "";
2114
+ }
2115
+ return "";
2116
+ };
2093
2117
  var commonDateFormatter = (date, format2 = "yyyy", prefix = "") => {
2094
- const formattedDate = date?.toValue(format2);
2118
+ const used = firstDate(date);
2119
+ const formattedDate = used?.toValue(format2);
2095
2120
  if (!formattedDate) {
2096
2121
  return void 0;
2097
2122
  }
2098
2123
  return `${prefix}${formattedDate}`.trim();
2099
2124
  };
2100
2125
  var noteDateFormatter = (date, format2 = "yyyy", prefix = "", shortNote = true, showNote = true) => {
2101
- const rawDate = commonDateFormatter(date, format2, "");
2126
+ const used = firstDate(date);
2127
+ const rawDate = commonDateFormatter(used, format2, "");
2102
2128
  if (!rawDate) {
2103
2129
  return void 0;
2104
2130
  }
2105
- const note = date?.toNote(shortNote) ?? "";
2131
+ const note = dateNote(used, shortNote);
2106
2132
  return `${prefix}${note && showNote ? i18n.t(`${note} {{date}}`, { date: rawDate }) : rawDate}`;
2107
2133
  };
2108
2134
  var marriageDateFormatter = (fam, showDays = false, showPlaces = false, shortNote = true, showNote = true, showDisplayTextIfNoDate = true, showAllEvents = false, dateFormatPattern) => {
@@ -2207,11 +2233,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
2207
2233
  const birthPlaces = [];
2208
2234
  const eventsToProcess = showAllEvents ? birthEvents : birthEvents.slice(0, 1);
2209
2235
  eventsToProcess.forEach((birthEvent) => {
2236
+ const birthDateNode = firstDate(birthEvent?.DATE);
2210
2237
  const birthDate = commonDateFormatter(
2211
- birthEvent?.DATE,
2238
+ birthDateNode,
2212
2239
  showDays ? fullDateFormat : "yyyy"
2213
2240
  );
2214
- const birthEventNote = birthEvent?.DATE?.toNote(shortNote) ?? "";
2241
+ const birthEventNote = dateNote(birthDateNode, shortNote);
2215
2242
  const birthEventPlace = showPlaces ? birthEvent?.PLAC?.value : void 0;
2216
2243
  if (birthDate) {
2217
2244
  birthStrings.push(
@@ -2226,11 +2253,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
2226
2253
  const deathPlaces = [];
2227
2254
  const deathEventsToProcess = showAllEvents ? deathEvents : deathEvents.slice(0, 1);
2228
2255
  deathEventsToProcess.forEach((deathEvent) => {
2256
+ const deathDateNode = firstDate(deathEvent?.DATE);
2229
2257
  const deathDate = commonDateFormatter(
2230
- deathEvent?.DATE,
2258
+ deathDateNode,
2231
2259
  showDays ? fullDateFormat : "yyyy"
2232
2260
  );
2233
- const deathEventNote = deathEvent?.DATE?.toNote(shortNote) ?? "";
2261
+ const deathEventNote = dateNote(deathDateNode, shortNote);
2234
2262
  const deathEventPlace = showPlaces ? deathEvent?.PLAC?.value : void 0;
2235
2263
  if (deathDate) {
2236
2264
  deathStrings.push(
@@ -4627,14 +4655,15 @@ var Indi = class extends Common {
4627
4655
  }
4628
4656
  return foundPath;
4629
4657
  }
4630
- kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname") {
4658
+ kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname", nameOrder) {
4631
4659
  const KinshipTranslatorClass2 = getKinshipTranslatorClass();
4632
4660
  const translator = new KinshipTranslatorClass2(
4633
4661
  this,
4634
4662
  other,
4635
4663
  lang,
4636
4664
  entirePath,
4637
- showMainPerson ? displayName : void 0
4665
+ showMainPerson ? displayName : void 0,
4666
+ nameOrder
4638
4667
  );
4639
4668
  return translator.translate(!!showMainPerson);
4640
4669
  }
@@ -5558,11 +5587,12 @@ var hungarianOrdinalize = (n) => {
5558
5587
 
5559
5588
  // src/kinship-translator/kinship-translator.basic.ts
5560
5589
  var KinshipTranslatorBasic = class {
5561
- constructor(path, displayName = "givenname") {
5590
+ constructor(path, displayName = "givenname", nameOrder = "first-last") {
5562
5591
  this.isOfSpouse = false;
5563
5592
  this.isSpouseOf = false;
5564
5593
  this._path = path;
5565
5594
  this.displayName = displayName;
5595
+ this.nameOrder = nameOrder;
5566
5596
  }
5567
5597
  get path() {
5568
5598
  return this._path;
@@ -5985,7 +6015,7 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
5985
6015
  }
5986
6016
  of(relation) {
5987
6017
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
5988
- nameOrder: "last-first"
6018
+ nameOrder: this.nameOrder
5989
6019
  });
5990
6020
  let name = formattedName.inOrder.filter(Boolean).join(" ");
5991
6021
  if (this.displayName === "none") {
@@ -6199,7 +6229,7 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
6199
6229
  }
6200
6230
  of(relation) {
6201
6231
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
6202
- nameOrder: "first-last"
6232
+ nameOrder: this.nameOrder
6203
6233
  });
6204
6234
  let name = formattedName.inOrder.filter(Boolean).join(" ");
6205
6235
  if (this.displayName === "none") {
@@ -6415,7 +6445,7 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
6415
6445
  }
6416
6446
  of(relation) {
6417
6447
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
6418
- nameOrder: "first-last"
6448
+ nameOrder: this.nameOrder
6419
6449
  });
6420
6450
  let name = formattedName.inOrder.filter(Boolean).join(" ");
6421
6451
  if (this.displayName === "none") {
@@ -6632,7 +6662,7 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
6632
6662
  }
6633
6663
  of(relation) {
6634
6664
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
6635
- nameOrder: "first-last"
6665
+ nameOrder: this.nameOrder
6636
6666
  });
6637
6667
  let name = formattedName.inOrder.filter(Boolean).join(" ");
6638
6668
  if (this.displayName === "none") {
@@ -6970,7 +7000,7 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
6970
7000
  }
6971
7001
  of(relation) {
6972
7002
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
6973
- nameOrder: "first-last"
7003
+ nameOrder: this.nameOrder
6974
7004
  });
6975
7005
  let name = formattedName.inOrder.filter(Boolean).join(" ");
6976
7006
  if (this.displayName === "none") {
@@ -7277,7 +7307,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
7277
7307
  }
7278
7308
  of(relation) {
7279
7309
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
7280
- nameOrder: "first-last"
7310
+ nameOrder: this.nameOrder
7281
7311
  });
7282
7312
  let name = formattedName.inOrder.filter(Boolean).join(" ");
7283
7313
  if (this.displayName === "none") {
@@ -7513,7 +7543,7 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
7513
7543
  }
7514
7544
  of(relation) {
7515
7545
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
7516
- nameOrder: "last-first"
7546
+ nameOrder: this.nameOrder
7517
7547
  });
7518
7548
  let name = formattedName.inOrder.filter(Boolean).join(" ");
7519
7549
  if (this.displayName === "none") {
@@ -7762,7 +7792,7 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
7762
7792
  }
7763
7793
  of(relation) {
7764
7794
  const formattedName = nameFormatter(this.path?.[0]?.indi, {
7765
- nameOrder: "last-first"
7795
+ nameOrder: this.nameOrder
7766
7796
  });
7767
7797
  let name = formattedName.inOrder.filter(Boolean).join(" ");
7768
7798
  if (this.displayName === "none") {
@@ -7831,22 +7861,30 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
7831
7861
  };
7832
7862
 
7833
7863
  // src/kinship-translator/kinship-translator.ts
7864
+ var nameOrderForLang = (lang) => lang === "hu" || lang === "ja" || lang === "zh" ? "last-first" : "first-last";
7834
7865
  var KinshipTranslator = class {
7835
- constructor(person1, person2, lang = "en", entirePath, displayName = "givenname") {
7866
+ constructor(person1, person2, lang = "en", entirePath, displayName = "givenname", nameOrder) {
7836
7867
  this.displayName = displayName;
7837
7868
  this.lang = lang;
7838
7869
  this.entirePath = entirePath;
7839
7870
  this.person1 = person1;
7840
7871
  this.person2 = typeof person2 === "string" ? this.person1.getGedcom()?.indi(person2) : person2;
7841
7872
  this.path = this.person1.path(this.person2);
7873
+ const order = nameOrder ?? nameOrderForLang(lang);
7874
+ this.nameOrder = order;
7842
7875
  if (translators_exports[lang]) {
7843
7876
  this.translator = new translators_exports[lang](
7844
7877
  this.path ?? [],
7845
- displayName
7878
+ displayName,
7879
+ order
7846
7880
  );
7847
7881
  }
7848
7882
  if (!this.translator) {
7849
- this.translator = new KinshipTranslatorEn(this.path ?? [], displayName);
7883
+ this.translator = new KinshipTranslatorEn(
7884
+ this.path ?? [],
7885
+ displayName,
7886
+ order
7887
+ );
7850
7888
  }
7851
7889
  }
7852
7890
  get path0() {
@@ -7891,14 +7929,16 @@ var KinshipTranslator = class {
7891
7929
  showMainPerson,
7892
7930
  this.lang,
7893
7931
  false,
7894
- this.displayName
7932
+ this.displayName,
7933
+ this.nameOrder
7895
7934
  ),
7896
7935
  relative: this.path?.[index - 1]?.indi.kinship(
7897
7936
  path2.indi.id,
7898
7937
  showMainPerson,
7899
7938
  this.lang,
7900
7939
  false,
7901
- this.displayName
7940
+ this.displayName,
7941
+ this.nameOrder
7902
7942
  )
7903
7943
  }));
7904
7944
  return path;
@@ -8037,6 +8077,8 @@ var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, base
8037
8077
  var CommonDate = class extends Common {
8038
8078
  constructor(gedcom, id, main, parent) {
8039
8079
  super(gedcom, id, main, parent);
8080
+ /** One DATE per event — merge must not turn this into a List. */
8081
+ this.isListable = false;
8040
8082
  delete this.id;
8041
8083
  }
8042
8084
  get calendar() {
@@ -8863,7 +8905,8 @@ var TREEVIZ_EXTENSION_URIS = {
8863
8905
  _TREEVIZ_SETTINGS: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_SETTINGS`,
8864
8906
  _TREEVIZ_VIEW: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_VIEW`,
8865
8907
  _TREEVIZ_DETECTIVE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE`,
8866
- _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`
8908
+ _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`,
8909
+ _TREEVIZ_FS_IGNORE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_FS_IGNORE`
8867
8910
  };
8868
8911
  var parseTagDefinition = (payload) => {
8869
8912
  const trimmed = payload.trim();
@@ -8981,7 +9024,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
8981
9024
 
8982
9025
  // package.json
8983
9026
  var package_default = {
8984
- version: "2.1.12"};
9027
+ version: "2.1.16"};
8985
9028
 
8986
9029
  // src/utils/get-product-details.ts
8987
9030
  var isDevelopment = () => {
@@ -10348,7 +10391,7 @@ var create = (gedcom, type, id, nodes) => {
10348
10391
  prevNode = createObje(gedcom, void 0, mainNode, curNode);
10349
10392
  } else if (type === "DATE") {
10350
10393
  prevNode = createCommonDate(gedcom, void 0, mainNode, curNode);
10351
- } else if (type === "NOTE" || type === "SNOTE") {
10394
+ } else if (type === "NOTE" || type === "SNOTE" || type === "_TREEVIZ_LIFE_STORY" || type === "_TREEVIZ_FAMILY_STORY") {
10352
10395
  prevNode = createCommonNote(gedcom, void 0, mainNode, curNode);
10353
10396
  } else if (type === "NAME" && mainNode instanceof Indi) {
10354
10397
  prevNode = createCommonName(gedcom, void 0, mainNode, curNode);