smartloc 1.2.0 → 1.2.2
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/cli/collect.js +1 -1
- package/cli/collect.js.map +1 -1
- package/core/locstr-array.js +1 -3
- package/core/locstr-array.js.map +1 -1
- package/core/smartloc.d.ts +4 -5
- package/core/smartloc.js +4 -9
- package/core/smartloc.js.map +1 -1
- package/package.json +2 -3
package/cli/collect.js
CHANGED
|
@@ -101,7 +101,7 @@ function collect(source, forceLocale) {
|
|
|
101
101
|
exports.collect = collect;
|
|
102
102
|
function collectFromSource(content, ids, all, f) {
|
|
103
103
|
// === parse loc() calls
|
|
104
|
-
const re = /\bloc\s*(\(\s*('|")([
|
|
104
|
+
const re = /\bloc\s*(\(\s*('|")([^'"\n]+)('|")\s*(?:,\s*)?\))?\s*`([^`]*)`/g;
|
|
105
105
|
let m;
|
|
106
106
|
while (m = re.exec(content)) {
|
|
107
107
|
let id = m[3];
|
package/cli/collect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":"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"}
|
package/core/locstr-array.js
CHANGED
|
@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LocStringArray = void 0;
|
|
4
4
|
const smartloc_1 = require("./smartloc");
|
|
5
5
|
const literal_1 = require("./literal");
|
|
6
|
-
|
|
7
|
-
class JoinedString extends base_loc_1.BaseLoc {
|
|
6
|
+
class JoinedString {
|
|
8
7
|
constructor(strs, join) {
|
|
9
|
-
super();
|
|
10
8
|
this.strs = strs;
|
|
11
9
|
this.join = join;
|
|
12
10
|
literal_1.setIsLoc(this);
|
package/core/locstr-array.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locstr-array.js","sourceRoot":"","sources":["../../src/core/locstr-array.ts"],"names":[],"mappings":";;;AACA,yCAA4C;AAC5C,uCAAqC;
|
|
1
|
+
{"version":3,"file":"locstr-array.js","sourceRoot":"","sources":["../../src/core/locstr-array.ts"],"names":[],"mappings":";;;AACA,yCAA4C;AAC5C,uCAAqC;AAErC,MAAM,YAAY;IAKd,YAAoB,IAAyB,EAAU,IAAY;QAA/C,SAAI,GAAJ,IAAI,CAAqB;QAAU,SAAI,GAAJ,IAAI,CAAQ;QAC/D,kBAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAND,IAAI,EAAE;QACF,OAAO,SAAS,CAAC;IACrB,CAAC;IAMD,QAAQ,CAAC,MAA4B;QACjC,OAAO,IAAI,CAAC,IAAI;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,SAAS,CAAC,WAAkC;QACxC,OAAO,IAAI,yBAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CACJ;AAGD,MAAa,cAAc;IACvB,YAAoB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAC7C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,GAAG,CAAC,EAAwC;QAExC,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,KAAc,EAAE,GAAY;QAC9B,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,IAAY;QACb,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO;QACH,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACJ;AAxBD,wCAwBC"}
|
package/core/smartloc.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ILocaleDef, LocLiteral, LocStr } from './interfaces';
|
|
2
|
-
import { BaseLoc } from './base-loc';
|
|
3
2
|
export interface SerializationContextOptions {
|
|
4
3
|
/** HOw non self-descriptive (MultiLoc, SingleLoc, ...) will be transformed. Defaults to 'id'.
|
|
5
4
|
*
|
|
@@ -20,7 +19,7 @@ export declare function withLocales<T = void>(acceptLanguages: string[], action:
|
|
|
20
19
|
* will be serialized into a form that is parsable via jsonParseLocalized()
|
|
21
20
|
*/
|
|
22
21
|
export declare function withSerializationContext<T = void>(action: () => T, options?: SerializationContextOptions): T;
|
|
23
|
-
export declare class TransformedLoc
|
|
22
|
+
export declare class TransformedLoc implements LocStr {
|
|
24
23
|
private parent;
|
|
25
24
|
private transformer;
|
|
26
25
|
get id(): string;
|
|
@@ -32,7 +31,7 @@ export declare class TransformedLoc extends BaseLoc implements LocStr {
|
|
|
32
31
|
/**
|
|
33
32
|
* A localizable string instance
|
|
34
33
|
*/
|
|
35
|
-
export declare class SmartLoc
|
|
34
|
+
export declare class SmartLoc implements LocStr {
|
|
36
35
|
id: string;
|
|
37
36
|
private literals;
|
|
38
37
|
private placeholders;
|
|
@@ -42,7 +41,7 @@ export declare class SmartLoc extends BaseLoc implements LocStr {
|
|
|
42
41
|
transform(transformer: (x: string) => string): LocStr;
|
|
43
42
|
}
|
|
44
43
|
/** A loc string that has only one translation for all locales */
|
|
45
|
-
export declare class SingleLoc
|
|
44
|
+
export declare class SingleLoc implements LocStr {
|
|
46
45
|
text: string;
|
|
47
46
|
readonly id: string;
|
|
48
47
|
constructor(text: string);
|
|
@@ -51,7 +50,7 @@ export declare class SingleLoc extends BaseLoc implements LocStr {
|
|
|
51
50
|
transform(transformer: (x: string) => string): LocStr;
|
|
52
51
|
}
|
|
53
52
|
/** A given set of translations */
|
|
54
|
-
export declare class MultiLoc
|
|
53
|
+
export declare class MultiLoc implements LocStr {
|
|
55
54
|
translations: {
|
|
56
55
|
[locale: string]: string;
|
|
57
56
|
};
|
package/core/smartloc.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.MultiLoc = exports.SingleLoc = exports.SmartLoc = exports.TransformedLoc
|
|
|
4
4
|
const locale_list_1 = require("./locale-list");
|
|
5
5
|
const literal_1 = require("./literal");
|
|
6
6
|
const utils_1 = require("../cli/utils");
|
|
7
|
-
const base_loc_1 = require("./base-loc");
|
|
8
7
|
let langCtx = null;
|
|
9
8
|
let serialContext;
|
|
10
9
|
/**
|
|
@@ -45,9 +44,8 @@ function withSerializationContext(action, options) {
|
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
exports.withSerializationContext = withSerializationContext;
|
|
48
|
-
class TransformedLoc
|
|
47
|
+
class TransformedLoc {
|
|
49
48
|
constructor(parent, transformer) {
|
|
50
|
-
super();
|
|
51
49
|
this.parent = parent;
|
|
52
50
|
this.transformer = transformer;
|
|
53
51
|
if (typeof transformer !== 'function') {
|
|
@@ -76,9 +74,8 @@ exports.TransformedLoc = TransformedLoc;
|
|
|
76
74
|
/**
|
|
77
75
|
* A localizable string instance
|
|
78
76
|
*/
|
|
79
|
-
class SmartLoc
|
|
77
|
+
class SmartLoc {
|
|
80
78
|
constructor(id, literals, placeholders) {
|
|
81
|
-
super();
|
|
82
79
|
this.id = id;
|
|
83
80
|
this.literals = literals;
|
|
84
81
|
this.placeholders = placeholders;
|
|
@@ -140,9 +137,8 @@ class SmartLoc extends base_loc_1.BaseLoc {
|
|
|
140
137
|
}
|
|
141
138
|
exports.SmartLoc = SmartLoc;
|
|
142
139
|
/** A loc string that has only one translation for all locales */
|
|
143
|
-
class SingleLoc
|
|
140
|
+
class SingleLoc {
|
|
144
141
|
constructor(text) {
|
|
145
|
-
super();
|
|
146
142
|
this.text = text;
|
|
147
143
|
this.id = undefined;
|
|
148
144
|
literal_1.setIsLoc(this);
|
|
@@ -162,9 +158,8 @@ class SingleLoc extends base_loc_1.BaseLoc {
|
|
|
162
158
|
}
|
|
163
159
|
exports.SingleLoc = SingleLoc;
|
|
164
160
|
/** A given set of translations */
|
|
165
|
-
class MultiLoc
|
|
161
|
+
class MultiLoc {
|
|
166
162
|
constructor(translations) {
|
|
167
|
-
super();
|
|
168
163
|
this.translations = translations;
|
|
169
164
|
this.id = undefined;
|
|
170
165
|
literal_1.setIsLoc(this);
|
package/core/smartloc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smartloc.js","sourceRoot":"","sources":["../../src/core/smartloc.ts"],"names":[],"mappings":";;;AAAA,+CAAyE;AAEzE,uCAAqC;AACrC,wCAA6C;
|
|
1
|
+
{"version":3,"file":"smartloc.js","sourceRoot":"","sources":["../../src/core/smartloc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "smartloc",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.2",
|
|
4
4
|
"description": "A i18n toolset for nodejs apis leveraging tagged strings",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -40,8 +40,7 @@
|
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
42
|
"express": "~4.17.1",
|
|
43
|
-
"graphql": "^0.13.2"
|
|
44
|
-
"react": "^16.0.0"
|
|
43
|
+
"graphql": "^0.13.2"
|
|
45
44
|
},
|
|
46
45
|
"devDependencies": {
|
|
47
46
|
"@types/accept-language-parser": "^1.5.1",
|