ochre-sdk 1.3.4 → 1.3.5
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.
|
@@ -40,13 +40,11 @@ export declare function resolveContentLanguages(node: unknown, requestedLanguage
|
|
|
40
40
|
* Read the languages a dataset declares in its metadata
|
|
41
41
|
* @param rawOchre - The raw OCHRE payload root
|
|
42
42
|
* @param rawOchre.metadata - The payload metadata declaring the languages
|
|
43
|
-
* @param rawOchre.languages - The semicolon-separated fallback language list
|
|
44
43
|
* @returns The declared languages, falling back to {@link DEFAULT_LANGUAGES}
|
|
45
44
|
* @internal
|
|
46
45
|
*/
|
|
47
46
|
export declare function parseMetadataLanguages(rawOchre: {
|
|
48
47
|
metadata: XMLMetadata;
|
|
49
|
-
languages?: string;
|
|
50
48
|
}): Array<string>;
|
|
51
49
|
/**
|
|
52
50
|
* Reconcile requested languages against the ones a dataset declares
|
|
@@ -76,7 +76,6 @@ function resolveContentLanguages(node, requestedLanguages) {
|
|
|
76
76
|
* Read the languages a dataset declares in its metadata
|
|
77
77
|
* @param rawOchre - The raw OCHRE payload root
|
|
78
78
|
* @param rawOchre.metadata - The payload metadata declaring the languages
|
|
79
|
-
* @param rawOchre.languages - The semicolon-separated fallback language list
|
|
80
79
|
* @returns The declared languages, falling back to {@link DEFAULT_LANGUAGES}
|
|
81
80
|
* @internal
|
|
82
81
|
*/
|
|
@@ -87,10 +86,6 @@ function parseMetadataLanguages(rawOchre) {
|
|
|
87
86
|
const parsedLanguage = parseStringLike(language);
|
|
88
87
|
if (parsedLanguage != null) languages.push(parsedLanguage);
|
|
89
88
|
}
|
|
90
|
-
if (languages.length > 0) return languages;
|
|
91
|
-
if (rawOchre.languages != null) {
|
|
92
|
-
for (const language of rawOchre.languages.split(";")) if (language !== "") languages.push(language);
|
|
93
|
-
}
|
|
94
89
|
return languages.length > 0 ? languages : [...DEFAULT_LANGUAGES];
|
|
95
90
|
}
|
|
96
91
|
/**
|
package/dist/xml/schemas.d.mts
CHANGED
|
@@ -5193,7 +5193,6 @@ export declare const XMLWebsiteData: v.ObjectSchema<{
|
|
|
5193
5193
|
}, "XMLMetadata: item is object with identification, category, type, and maxLength">, undefined>;
|
|
5194
5194
|
}, undefined>;
|
|
5195
5195
|
readonly persistentUrl: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<"XMLWebsiteData: persistentUrl is string and optional">, v.UrlAction<string, "XMLWebsiteData: persistentUrl is not a valid URL">]>, undefined>;
|
|
5196
|
-
readonly languages: v.OptionalSchema<v.StringSchema<"XMLWebsiteData: languages is string and optional">, undefined>;
|
|
5197
5196
|
readonly tree: v.ArraySchema<v.LazySchema<v.ObjectSchema<{
|
|
5198
5197
|
readonly type: v.OptionalSchema<v.StringSchema<"XMLWebsiteTree: type is string and optional">, undefined>;
|
|
5199
5198
|
readonly date: v.OptionalSchema<v.UnionSchema<[v.GenericSchema<unknown, Date>, v.ObjectSchema<{
|
package/dist/xml/schemas.mjs
CHANGED
|
@@ -949,9 +949,8 @@ const XMLData = v.object({ result: v.object({ ochre: v.intersect([v.object({
|
|
|
949
949
|
uuidBelongsTo: v.pipe(v.string("XMLData: uuidBelongsTo is string and required"), v.check(isPseudoUuid, "XMLData: uuidBelongsTo is not a valid pseudo-UUID")),
|
|
950
950
|
publicationDateTime: customDateTime("XMLData: publicationDateTime is not a valid datetime"),
|
|
951
951
|
metadata: XMLMetadata,
|
|
952
|
-
persistentUrl: v.optional(v.pipe(v.string("XMLData: persistentUrl is string and optional"), v.url("XMLData: persistentUrl is not a valid URL")))
|
|
953
|
-
|
|
954
|
-
}, "XMLData: ochre is object with uuid, belongsTo, uuidBelongsTo, publicationDateTime, metadata, and languages"), XMLTopLevelDataItem]) }) }, "XMLData: Shape error");
|
|
952
|
+
persistentUrl: v.optional(v.pipe(v.string("XMLData: persistentUrl is string and optional"), v.url("XMLData: persistentUrl is not a valid URL")))
|
|
953
|
+
}, "XMLData: ochre is object with uuid, belongsTo, uuidBelongsTo, publicationDateTime, and metadata"), XMLTopLevelDataItem]) }) }, "XMLData: Shape error");
|
|
955
954
|
const XMLWebsiteData = v.object({ result: v.object({ ochre: v.object({
|
|
956
955
|
uuid: v.pipe(v.string("XMLWebsiteData: uuid is string and required"), v.check(isPseudoUuid, "XMLWebsiteData: uuid is not a valid pseudo-UUID")),
|
|
957
956
|
belongsTo: v.string("XMLWebsiteData: belongsTo is string and required"),
|
|
@@ -959,7 +958,6 @@ const XMLWebsiteData = v.object({ result: v.object({ ochre: v.object({
|
|
|
959
958
|
publicationDateTime: customDateTime("XMLWebsiteData: publicationDateTime is not a valid datetime"),
|
|
960
959
|
metadata: XMLMetadata,
|
|
961
960
|
persistentUrl: v.optional(v.pipe(v.string("XMLWebsiteData: persistentUrl is string and optional"), v.url("XMLWebsiteData: persistentUrl is not a valid URL"))),
|
|
962
|
-
languages: v.optional(v.string("XMLWebsiteData: languages is string and optional")),
|
|
963
961
|
tree: v.array(XMLWebsiteTree)
|
|
964
962
|
}, "XMLWebsiteData: ochre is object with website tree") }, "XMLWebsiteData: result is object with ochre") }, "XMLWebsiteData: Shape error");
|
|
965
963
|
//#endregion
|
package/dist/xml/types.d.mts
CHANGED
|
@@ -919,7 +919,6 @@ export type XMLData = {
|
|
|
919
919
|
publicationDateTime: Date;
|
|
920
920
|
metadata: XMLMetadata;
|
|
921
921
|
persistentUrl?: string;
|
|
922
|
-
languages?: string;
|
|
923
922
|
} & XMLDataItem;
|
|
924
923
|
};
|
|
925
924
|
};
|
|
@@ -932,7 +931,6 @@ export type XMLWebsiteData = {
|
|
|
932
931
|
publicationDateTime: Date;
|
|
933
932
|
metadata: XMLMetadata;
|
|
934
933
|
persistentUrl?: string;
|
|
935
|
-
languages?: string;
|
|
936
934
|
tree: Array<XMLWebsiteTree>;
|
|
937
935
|
};
|
|
938
936
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ochre-sdk",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"eslint-plugin-erasable-syntax-only": "^0.7.2",
|
|
58
58
|
"eslint-plugin-slop": "^0.1.3",
|
|
59
59
|
"eslint-plugin-sonarjs": "^4.2.2",
|
|
60
|
-
"knip": "^6.
|
|
60
|
+
"knip": "^6.40.0",
|
|
61
61
|
"oxfmt": "^0.72.0",
|
|
62
62
|
"tsdown": "^0.23.0",
|
|
63
63
|
"typescript": "^6.0.3",
|