smartloc 2.0.9 → 2.0.10
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/README.md +25 -0
- package/core/json-utils.js +16 -4
- package/core/json-utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -215,6 +215,31 @@ const obj = loadFromDb();
|
|
|
215
215
|
const serializable = toLocalizable(obj);
|
|
216
216
|
```
|
|
217
217
|
|
|
218
|
+
### Recursive object conversion
|
|
219
|
+
|
|
220
|
+
`toJsonStorable(value)` recursively converts messages in objects and arrays to
|
|
221
|
+
untranslated storage values. Serialize that result with `JSON.stringify` when
|
|
222
|
+
storage requires JSON text. `toLocalizable` accepts the already parsed value:
|
|
223
|
+
|
|
224
|
+
```typescript
|
|
225
|
+
import { loc, toJsonStorable, toLocalizable } from 'smartloc';
|
|
226
|
+
|
|
227
|
+
const value = { labels: ['Custom text', loc('save')`Save`, ''] };
|
|
228
|
+
const stored = JSON.stringify(toJsonStorable(value));
|
|
229
|
+
const restored = toLocalizable(JSON.parse(stored));
|
|
230
|
+
```
|
|
231
|
+
|
|
232
|
+
Plain strings remain strings. Version 2.0.10 also preserves plural counts and
|
|
233
|
+
recursively converts messages used as interpolation values, in both directions.
|
|
234
|
+
Stored ID references require loaded catalogs, including the default-language
|
|
235
|
+
catalog; source templates are not included. These changes keep the existing
|
|
236
|
+
stored representation.
|
|
237
|
+
|
|
238
|
+
`toJsonStorable` leaves ordinary `Date` values intact until JSON serialization.
|
|
239
|
+
JSON turns them into ISO strings; `toLocalizable` does not infer dates from those
|
|
240
|
+
strings, including inside message interpolations. React elements and
|
|
241
|
+
joined/transformed messages are not supported storage values.
|
|
242
|
+
|
|
218
243
|
## Cloning
|
|
219
244
|
Beware, if you deep-clone an object containing smartloc string instances, you must:
|
|
220
245
|
- Clone the object prototype
|
package/core/json-utils.js
CHANGED
|
@@ -41,7 +41,7 @@ function _toLocalizable(value, depth) {
|
|
|
41
41
|
}
|
|
42
42
|
return value;
|
|
43
43
|
}
|
|
44
|
-
if (typeof value !== 'object' || value instanceof Date) {
|
|
44
|
+
if (typeof value !== 'object' || value instanceof Date || (0, literal_1.isLocStr)(value)) {
|
|
45
45
|
return value;
|
|
46
46
|
}
|
|
47
47
|
// === handle arrays
|
|
@@ -62,11 +62,19 @@ function _toLocalizable(value, depth) {
|
|
|
62
62
|
return value;
|
|
63
63
|
}
|
|
64
64
|
// === handle smartloc with args
|
|
65
|
-
|
|
65
|
+
// The native encoder includes count (possibly undefined before stringify).
|
|
66
|
+
// A counted message can have no interpolation data; JSON then keeps null.
|
|
67
|
+
if (typeof value.i18n === 'string'
|
|
68
|
+
&& (value.data instanceof Array || value.data === null)
|
|
69
|
+
&& keys.includes('data')
|
|
70
|
+
&& (keys.length === 2 || (keys.length === 3 && keys.includes('count')))
|
|
71
|
+
&& (value.count === undefined || typeof value.count === 'number')) {
|
|
66
72
|
return (0, smartloc_1.smartLoc)({
|
|
67
73
|
id: value.i18n,
|
|
68
74
|
literals: null,
|
|
69
|
-
|
|
75
|
+
// These descriptors can themselves contain messages. Restore them
|
|
76
|
+
// before rendering so their IDs are not interpolated as literal text.
|
|
77
|
+
placeholders: _toLocalizable(value.data, depth - 1),
|
|
70
78
|
count: value.count
|
|
71
79
|
});
|
|
72
80
|
}
|
|
@@ -136,7 +144,11 @@ function _toJsonStorable(v, depth) {
|
|
|
136
144
|
return ret || v;
|
|
137
145
|
}
|
|
138
146
|
if ((0, literal_1.isLocStr)(v)) {
|
|
139
|
-
|
|
147
|
+
const stored = v.toJSON();
|
|
148
|
+
// toJSON returns the interpolation values as-is. Convert those while
|
|
149
|
+
// the serialization scope is still active; later JSON.stringify must
|
|
150
|
+
// not translate a remaining nested LocStr into a fixed-language string.
|
|
151
|
+
return stored === v ? v : _toJsonStorable(stored, depth - 1);
|
|
140
152
|
}
|
|
141
153
|
const obj = {};
|
|
142
154
|
let diff = false;
|
package/core/json-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-utils.js","sourceRoot":"","sources":["../../src/core/json-utils.ts"],"names":[],"mappings":";;AAOA,gDAGC;AAKD,sCAEC;
|
|
1
|
+
{"version":3,"file":"json-utils.js","sourceRoot":"","sources":["../../src/core/json-utils.ts"],"names":[],"mappings":"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"}
|