@treeviz/gedcom-parser 2.1.15 → 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.
- package/dist/classes/common.d.ts.map +1 -1
- package/dist/classes/date.d.ts +2 -0
- package/dist/classes/date.d.ts.map +1 -1
- package/dist/classes/index.js +41 -10
- package/dist/cli/index.js +41 -10
- package/dist/constants/index.js +1149 -1117
- package/dist/factories/index.js +1192 -1160
- package/dist/index.js +41 -10
- package/dist/kinship-translator/index.js +1192 -1160
- package/dist/structures/individual.d.ts +1 -0
- package/dist/structures/individual.d.ts.map +1 -1
- package/dist/types/types.d.ts +1 -0
- package/dist/types/types.d.ts.map +1 -1
- package/dist/utils/date-formatter.d.ts.map +1 -1
- package/dist/utils/gedcom7-schema.d.ts.map +1 -1
- package/dist/utils/index.js +41 -10
- package/package.json +1 -1
|
@@ -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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"}
|
package/dist/classes/date.d.ts
CHANGED
|
@@ -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;
|
|
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"}
|
package/dist/classes/index.js
CHANGED
|
@@ -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
|
|
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);
|
|
@@ -3859,19 +3863,41 @@ var ACCEPTED_DATE_FORMATS_REGEX = new RegExp(
|
|
|
3859
3863
|
).join("|")})`,
|
|
3860
3864
|
"gi"
|
|
3861
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
|
+
};
|
|
3862
3886
|
var commonDateFormatter = (date, format2 = "yyyy", prefix = "") => {
|
|
3863
|
-
const
|
|
3887
|
+
const used = firstDate(date);
|
|
3888
|
+
const formattedDate = used?.toValue(format2);
|
|
3864
3889
|
if (!formattedDate) {
|
|
3865
3890
|
return void 0;
|
|
3866
3891
|
}
|
|
3867
3892
|
return `${prefix}${formattedDate}`.trim();
|
|
3868
3893
|
};
|
|
3869
3894
|
var noteDateFormatter = (date, format2 = "yyyy", prefix = "", shortNote = true, showNote = true) => {
|
|
3870
|
-
const
|
|
3895
|
+
const used = firstDate(date);
|
|
3896
|
+
const rawDate = commonDateFormatter(used, format2, "");
|
|
3871
3897
|
if (!rawDate) {
|
|
3872
3898
|
return void 0;
|
|
3873
3899
|
}
|
|
3874
|
-
const note =
|
|
3900
|
+
const note = dateNote(used, shortNote);
|
|
3875
3901
|
return `${prefix}${note && showNote ? i18n.t(`${note} {{date}}`, { date: rawDate }) : rawDate}`;
|
|
3876
3902
|
};
|
|
3877
3903
|
var marriageDateFormatter = (fam, showDays = false, showPlaces = false, shortNote = true, showNote = true, showDisplayTextIfNoDate = true, showAllEvents = false, dateFormatPattern) => {
|
|
@@ -3976,11 +4002,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
|
|
|
3976
4002
|
const birthPlaces = [];
|
|
3977
4003
|
const eventsToProcess = showAllEvents ? birthEvents : birthEvents.slice(0, 1);
|
|
3978
4004
|
eventsToProcess.forEach((birthEvent) => {
|
|
4005
|
+
const birthDateNode = firstDate(birthEvent?.DATE);
|
|
3979
4006
|
const birthDate = commonDateFormatter(
|
|
3980
|
-
|
|
4007
|
+
birthDateNode,
|
|
3981
4008
|
showDays ? fullDateFormat : "yyyy"
|
|
3982
4009
|
);
|
|
3983
|
-
const birthEventNote =
|
|
4010
|
+
const birthEventNote = dateNote(birthDateNode, shortNote);
|
|
3984
4011
|
const birthEventPlace = showPlaces ? birthEvent?.PLAC?.value : void 0;
|
|
3985
4012
|
if (birthDate) {
|
|
3986
4013
|
birthStrings.push(
|
|
@@ -3995,11 +4022,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
|
|
|
3995
4022
|
const deathPlaces = [];
|
|
3996
4023
|
const deathEventsToProcess = showAllEvents ? deathEvents : deathEvents.slice(0, 1);
|
|
3997
4024
|
deathEventsToProcess.forEach((deathEvent) => {
|
|
4025
|
+
const deathDateNode = firstDate(deathEvent?.DATE);
|
|
3998
4026
|
const deathDate = commonDateFormatter(
|
|
3999
|
-
|
|
4027
|
+
deathDateNode,
|
|
4000
4028
|
showDays ? fullDateFormat : "yyyy"
|
|
4001
4029
|
);
|
|
4002
|
-
const deathEventNote =
|
|
4030
|
+
const deathEventNote = dateNote(deathDateNode, shortNote);
|
|
4003
4031
|
const deathEventPlace = showPlaces ? deathEvent?.PLAC?.value : void 0;
|
|
4004
4032
|
if (deathDate) {
|
|
4005
4033
|
deathStrings.push(
|
|
@@ -4131,6 +4159,8 @@ var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, base
|
|
|
4131
4159
|
var CommonDate = class extends Common {
|
|
4132
4160
|
constructor(gedcom, id, main, parent) {
|
|
4133
4161
|
super(gedcom, id, main, parent);
|
|
4162
|
+
/** One DATE per event — merge must not turn this into a List. */
|
|
4163
|
+
this.isListable = false;
|
|
4134
4164
|
delete this.id;
|
|
4135
4165
|
}
|
|
4136
4166
|
get calendar() {
|
|
@@ -8879,7 +8909,8 @@ var TREEVIZ_EXTENSION_URIS = {
|
|
|
8879
8909
|
_TREEVIZ_SETTINGS: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_SETTINGS`,
|
|
8880
8910
|
_TREEVIZ_VIEW: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_VIEW`,
|
|
8881
8911
|
_TREEVIZ_DETECTIVE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE`,
|
|
8882
|
-
_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`
|
|
8883
8914
|
};
|
|
8884
8915
|
var parseTagDefinition = (payload) => {
|
|
8885
8916
|
const trimmed = payload.trim();
|
|
@@ -8997,7 +9028,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
|
|
|
8997
9028
|
|
|
8998
9029
|
// package.json
|
|
8999
9030
|
var package_default = {
|
|
9000
|
-
version: "2.1.
|
|
9031
|
+
version: "2.1.16"};
|
|
9001
9032
|
|
|
9002
9033
|
// src/utils/get-product-details.ts
|
|
9003
9034
|
var getVersion = () => package_default.version;
|
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
|
|
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
|
|
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
|
|
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 =
|
|
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
|
-
|
|
2238
|
+
birthDateNode,
|
|
2212
2239
|
showDays ? fullDateFormat : "yyyy"
|
|
2213
2240
|
);
|
|
2214
|
-
const birthEventNote =
|
|
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
|
-
|
|
2258
|
+
deathDateNode,
|
|
2231
2259
|
showDays ? fullDateFormat : "yyyy"
|
|
2232
2260
|
);
|
|
2233
|
-
const deathEventNote =
|
|
2261
|
+
const deathEventNote = dateNote(deathDateNode, shortNote);
|
|
2234
2262
|
const deathEventPlace = showPlaces ? deathEvent?.PLAC?.value : void 0;
|
|
2235
2263
|
if (deathDate) {
|
|
2236
2264
|
deathStrings.push(
|
|
@@ -8049,6 +8077,8 @@ var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, base
|
|
|
8049
8077
|
var CommonDate = class extends Common {
|
|
8050
8078
|
constructor(gedcom, id, main, parent) {
|
|
8051
8079
|
super(gedcom, id, main, parent);
|
|
8080
|
+
/** One DATE per event — merge must not turn this into a List. */
|
|
8081
|
+
this.isListable = false;
|
|
8052
8082
|
delete this.id;
|
|
8053
8083
|
}
|
|
8054
8084
|
get calendar() {
|
|
@@ -8875,7 +8905,8 @@ var TREEVIZ_EXTENSION_URIS = {
|
|
|
8875
8905
|
_TREEVIZ_SETTINGS: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_SETTINGS`,
|
|
8876
8906
|
_TREEVIZ_VIEW: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_VIEW`,
|
|
8877
8907
|
_TREEVIZ_DETECTIVE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE`,
|
|
8878
|
-
_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`
|
|
8879
8910
|
};
|
|
8880
8911
|
var parseTagDefinition = (payload) => {
|
|
8881
8912
|
const trimmed = payload.trim();
|
|
@@ -8993,7 +9024,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
|
|
|
8993
9024
|
|
|
8994
9025
|
// package.json
|
|
8995
9026
|
var package_default = {
|
|
8996
|
-
version: "2.1.
|
|
9027
|
+
version: "2.1.16"};
|
|
8997
9028
|
|
|
8998
9029
|
// src/utils/get-product-details.ts
|
|
8999
9030
|
var isDevelopment = () => {
|