node-opcua-data-model 2.184.0 → 2.185.0
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/localized_text.d.ts
CHANGED
|
@@ -11,6 +11,25 @@ import { BaseUAObject, type DecodeDebugOptions, type IStructuredTypeSchema } fro
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function coerceLocalizedText(value?: null | string | LocalizedTextOptions): LocalizedText | null;
|
|
13
13
|
export declare function coerceLocalizedTextStrict(value?: null | string | LocalizedTextOptions): LocalizedText;
|
|
14
|
+
/**
|
|
15
|
+
* Picks the entry of `texts` that best matches `preferredLocales`.
|
|
16
|
+
*
|
|
17
|
+
* OPC 10000-4 v1.05.07 §5.7.3 ActivateSession: "When a Server returns a string to the
|
|
18
|
+
* Client, it first determines if there are available translations for it. If there are,
|
|
19
|
+
* then the Server returns the string whose locale id exactly matches the locale id with
|
|
20
|
+
* the highest priority in the Client-supplied list. If there are no exact matches, then
|
|
21
|
+
* the Server ignores the <country/region> component of the locale id, and returns the
|
|
22
|
+
* string whose <language> component matches the <language> component of the locale id
|
|
23
|
+
* with the highest priority in the Client supplied list. If there still are no matches,
|
|
24
|
+
* then the Server returns the string that it has along with the locale id." See also
|
|
25
|
+
* §5.4 Locale Negotiation.
|
|
26
|
+
*
|
|
27
|
+
* Matching is case-insensitive. `preferredLocales` in priority order (most preferred
|
|
28
|
+
* first); a `null`/empty entry is skipped. Returns the first element of `texts` when
|
|
29
|
+
* nothing matches or `preferredLocales` is null/empty, and `undefined` when `texts`
|
|
30
|
+
* itself is null/empty.
|
|
31
|
+
*/
|
|
32
|
+
export declare function selectLocalizedText(texts: readonly LocalizedText[] | null | undefined, preferredLocales: readonly (string | null | undefined)[] | null | undefined): LocalizedText | undefined;
|
|
14
33
|
export interface LocalizedTextOptions {
|
|
15
34
|
locale?: LocaleId;
|
|
16
35
|
text?: UAString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localized_text.d.ts","sourceRoot":"","sources":["../source/localized_text.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAsD,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC1H,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EACH,YAAY,EAGZ,KAAK,kBAAkB,EAEvB,KAAK,qBAAqB,EAG7B,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,GAAG,IAAI,CAQtG;AACD,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,CAMrG;AA0BD,MAAM,WAAW,oBAAoB;IACjC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;CACnB;AAED,qBAAa,aAAc,SAAQ,YAAY;IAC3C,MAAM,KAAK,MAAM,IAAI,qBAAqB,CAEzC;IAED,IAAW,MAAM,IAAI,qBAAqB,CAEzC;IAED,OAAc,cAAc,EAAE,MAAM,EAAE,CAAsB;IAE5D,OAAc,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,GAAG,IAAI,CAEvF;IAEM,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IAEtB,YAAY,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,GAAG,IAAI,EAmBzD;IAEM,QAAQ,IAAI,MAAM,CAExB;IAGM,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAW9C;IAEM,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAyB1E;IAEM,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAYxC;CACJ;AAKD,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAiB9D,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAMjG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,aAAa,GAAG,aAAa,CAI9F"}
|
|
1
|
+
{"version":3,"file":"localized_text.d.ts","sourceRoot":"","sources":["../source/localized_text.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAsD,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC1H,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EACH,YAAY,EAGZ,KAAK,kBAAkB,EAEvB,KAAK,qBAAqB,EAG7B,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,GAAG,IAAI,CAQtG;AACD,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,CAMrG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,GAAG,SAAS,EAClD,gBAAgB,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GAC5E,aAAa,GAAG,SAAS,CAoB3B;AA0BD,MAAM,WAAW,oBAAoB;IACjC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;CACnB;AAED,qBAAa,aAAc,SAAQ,YAAY;IAC3C,MAAM,KAAK,MAAM,IAAI,qBAAqB,CAEzC;IAED,IAAW,MAAM,IAAI,qBAAqB,CAEzC;IAED,OAAc,cAAc,EAAE,MAAM,EAAE,CAAsB;IAE5D,OAAc,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,oBAAoB,GAAG,aAAa,GAAG,IAAI,CAEvF;IAEM,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IAEtB,YAAY,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,GAAG,IAAI,EAmBzD;IAEM,QAAQ,IAAI,MAAM,CAExB;IAGM,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAW9C;IAEM,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAyB1E;IAEM,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAYxC;CACJ;AAKD,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAiB9D,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAMjG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,aAAa,GAAG,aAAa,CAI9F"}
|
package/dist/localized_text.js
CHANGED
|
@@ -24,6 +24,45 @@ export function coerceLocalizedTextStrict(value) {
|
|
|
24
24
|
}
|
|
25
25
|
return result;
|
|
26
26
|
}
|
|
27
|
+
/**
|
|
28
|
+
* Picks the entry of `texts` that best matches `preferredLocales`.
|
|
29
|
+
*
|
|
30
|
+
* OPC 10000-4 v1.05.07 §5.7.3 ActivateSession: "When a Server returns a string to the
|
|
31
|
+
* Client, it first determines if there are available translations for it. If there are,
|
|
32
|
+
* then the Server returns the string whose locale id exactly matches the locale id with
|
|
33
|
+
* the highest priority in the Client-supplied list. If there are no exact matches, then
|
|
34
|
+
* the Server ignores the <country/region> component of the locale id, and returns the
|
|
35
|
+
* string whose <language> component matches the <language> component of the locale id
|
|
36
|
+
* with the highest priority in the Client supplied list. If there still are no matches,
|
|
37
|
+
* then the Server returns the string that it has along with the locale id." See also
|
|
38
|
+
* §5.4 Locale Negotiation.
|
|
39
|
+
*
|
|
40
|
+
* Matching is case-insensitive. `preferredLocales` in priority order (most preferred
|
|
41
|
+
* first); a `null`/empty entry is skipped. Returns the first element of `texts` when
|
|
42
|
+
* nothing matches or `preferredLocales` is null/empty, and `undefined` when `texts`
|
|
43
|
+
* itself is null/empty.
|
|
44
|
+
*/
|
|
45
|
+
export function selectLocalizedText(texts, preferredLocales) {
|
|
46
|
+
if (!texts || texts.length === 0) {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
const language = (locale) => locale.split("-")[0];
|
|
50
|
+
for (const wanted of preferredLocales ?? []) {
|
|
51
|
+
if (!wanted) {
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
const w = wanted.toLowerCase();
|
|
55
|
+
const exact = texts.find((t) => (t.locale ?? "").toLowerCase() === w);
|
|
56
|
+
if (exact) {
|
|
57
|
+
return exact;
|
|
58
|
+
}
|
|
59
|
+
const sameLanguage = texts.find((t) => t.locale && language(t.locale.toLowerCase()) === language(w));
|
|
60
|
+
if (sameLanguage) {
|
|
61
|
+
return sameLanguage;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return texts[0];
|
|
65
|
+
}
|
|
27
66
|
// --------------------------------------------------------------------------------------------
|
|
28
67
|
// see Part 3 - $8.5 page 63
|
|
29
68
|
const schemaLocalizedText = buildStructuredType({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localized_text.js","sourceRoot":"","sources":["../source/localized_text.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"localized_text.js","sourceRoot":"","sources":["../source/localized_text.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-data-model",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.185.0",
|
|
5
5
|
"description": "pure nodejs OPCUA SDK - module data-model",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "tsc -b",
|
|
@@ -19,15 +19,15 @@
|
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"node-opcua-assert": "2.184.0",
|
|
22
|
-
"node-opcua-basic-types": "2.
|
|
23
|
-
"node-opcua-binary-stream": "2.184.
|
|
24
|
-
"node-opcua-enum": "2.184.
|
|
25
|
-
"node-opcua-factory": "2.
|
|
26
|
-
"node-opcua-nodeid": "2.
|
|
27
|
-
"node-opcua-status-code": "2.184.
|
|
22
|
+
"node-opcua-basic-types": "2.185.0",
|
|
23
|
+
"node-opcua-binary-stream": "2.184.1",
|
|
24
|
+
"node-opcua-enum": "2.184.1",
|
|
25
|
+
"node-opcua-factory": "2.185.0",
|
|
26
|
+
"node-opcua-nodeid": "2.185.0",
|
|
27
|
+
"node-opcua-status-code": "2.184.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"node-opcua-packet-analyzer": "2.
|
|
30
|
+
"node-opcua-packet-analyzer": "2.185.0"
|
|
31
31
|
},
|
|
32
32
|
"author": "Etienne Rossignon",
|
|
33
33
|
"license": "MIT",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"internet of things"
|
|
45
45
|
],
|
|
46
46
|
"homepage": "http://node-opcua.github.io/",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "7869fea1a598282415d32535dc5d5da1347f0ba7",
|
|
48
48
|
"files": [
|
|
49
49
|
"dist",
|
|
50
50
|
"source"
|
package/source/localized_text.ts
CHANGED
|
@@ -36,6 +36,49 @@ export function coerceLocalizedTextStrict(value?: null | string | LocalizedTextO
|
|
|
36
36
|
return result;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
/**
|
|
40
|
+
* Picks the entry of `texts` that best matches `preferredLocales`.
|
|
41
|
+
*
|
|
42
|
+
* OPC 10000-4 v1.05.07 §5.7.3 ActivateSession: "When a Server returns a string to the
|
|
43
|
+
* Client, it first determines if there are available translations for it. If there are,
|
|
44
|
+
* then the Server returns the string whose locale id exactly matches the locale id with
|
|
45
|
+
* the highest priority in the Client-supplied list. If there are no exact matches, then
|
|
46
|
+
* the Server ignores the <country/region> component of the locale id, and returns the
|
|
47
|
+
* string whose <language> component matches the <language> component of the locale id
|
|
48
|
+
* with the highest priority in the Client supplied list. If there still are no matches,
|
|
49
|
+
* then the Server returns the string that it has along with the locale id." See also
|
|
50
|
+
* §5.4 Locale Negotiation.
|
|
51
|
+
*
|
|
52
|
+
* Matching is case-insensitive. `preferredLocales` in priority order (most preferred
|
|
53
|
+
* first); a `null`/empty entry is skipped. Returns the first element of `texts` when
|
|
54
|
+
* nothing matches or `preferredLocales` is null/empty, and `undefined` when `texts`
|
|
55
|
+
* itself is null/empty.
|
|
56
|
+
*/
|
|
57
|
+
export function selectLocalizedText(
|
|
58
|
+
texts: readonly LocalizedText[] | null | undefined,
|
|
59
|
+
preferredLocales: readonly (string | null | undefined)[] | null | undefined
|
|
60
|
+
): LocalizedText | undefined {
|
|
61
|
+
if (!texts || texts.length === 0) {
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
const language = (locale: string) => locale.split("-")[0];
|
|
65
|
+
for (const wanted of preferredLocales ?? []) {
|
|
66
|
+
if (!wanted) {
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
const w = wanted.toLowerCase();
|
|
70
|
+
const exact = texts.find((t) => (t.locale ?? "").toLowerCase() === w);
|
|
71
|
+
if (exact) {
|
|
72
|
+
return exact;
|
|
73
|
+
}
|
|
74
|
+
const sameLanguage = texts.find((t) => t.locale && language(t.locale.toLowerCase()) === language(w));
|
|
75
|
+
if (sameLanguage) {
|
|
76
|
+
return sameLanguage;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return texts[0];
|
|
80
|
+
}
|
|
81
|
+
|
|
39
82
|
// --------------------------------------------------------------------------------------------
|
|
40
83
|
// see Part 3 - $8.5 page 63
|
|
41
84
|
const schemaLocalizedText = buildStructuredType({
|