smartloc 1.1.2 → 1.1.3
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/package.json +3 -3
package/cli/collect.js
CHANGED
|
@@ -100,7 +100,7 @@ function collect(source, forceLocale) {
|
|
|
100
100
|
exports.collect = collect;
|
|
101
101
|
function collectFromSource(content, ids, all, f) {
|
|
102
102
|
// === parse loc() calls
|
|
103
|
-
const re = /\bloc\s*(\(\s*('|")([a-zA-Z0-9\-_\s\.]+)('|")\s
|
|
103
|
+
const re = /\bloc\s*(\(\s*('|")([a-zA-Z0-9\-_\s\.]+)('|")\s*(:?,\s*)?\))?\s*`([^`]+)`/g;
|
|
104
104
|
let m;
|
|
105
105
|
while (m = re.exec(content)) {
|
|
106
106
|
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":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,wEAAwC;AAExC,yCAA+C;AAS/C,SAAgB,OAAO,CAAC,MAAc,EAAE,WAAoB;IACxD,MAAM,GAAG,MAAM;QACX,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC;QAClC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IACpB,kBAAkB;IAClB,sDAAsD;IACtD,IAAI,MAA0E,CAAC;IAC/E,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtD,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAC9B,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,0BAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACtC;SAAM;QACH,MAAM,GAAG,0BAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACjC;IAGD,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAmB;QAC9B,IAAI;YACA,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACtB,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;gBACtD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAClD,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;oBAC7B,SAAS;iBACZ;gBACD,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACpC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;oBACrB,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBAC7B;qBAAM;oBACH,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;wBAC9B,MAAM,YAAY,CAAC;qBACtB;iBACJ;aACJ;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,WAAW,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,EAAe,CAAC;IACnC,MAAM,GAAG,GAAU,EAAE,CAAC;IACtB,IAAI,aAA6C,CAAC;IAClD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE;QACtB,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAChG,SAAS;SACZ;QACD,MAAM,EAAE,CAAC;QACT,IAAI;YACA,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;YAE9D,qCAAqC;YACrC,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,MAAM,GAAG,wDAAwD,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtF,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAC,CAAC;gBAC9B,IAAI,SAAS,EAAE;oBACX,IAAI,aAAa,IAAI,aAAa,CAAC,GAAG,KAAK,SAAS,EAAE;wBAClD,OAAO,CAAC,KAAK,CAAC,oCAAoC,SAAS,QAAQ,CAAC,yCAAyC,aAAa,CAAC,GAAG,QAAQ,aAAa,CAAC,IAAI,yBAAyB,aAAa,CAAC,GAAG,EAAE,CAAC,CAAA;qBACxM;oBACD,aAAa,GAAG;wBACZ,IAAI,EAAE,CAAC;wBACP,GAAG,EAAE,SAAS;qBACjB,CAAC;iBACL;aACJ;YAED,iBAAiB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;SAE3C;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC;SAC7C;KACJ;IAED,uBAAuB;IACvB,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;QACjB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG;YACX,MAAM,EAAE,CAAC,CAAC,MAAM;SACnB,CAAC;KACL;IAED,MAAM,cAAc,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG,KAAI,WAAW,CAAC;IACzD,IAAI,CAAC,cAAc,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,0HAA0H,CAAC,CAAC;QAC1I,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;IACD,MAAM,SAAS,GAAG;QACd,SAAS,EAAE,MAAM;QACjB,cAAc;KACjB,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACxC,CAAC;AA5FD,0BA4FC;AAGD,SAAgB,iBAAiB,CAAC,OAAe,EAAE,GAAqB,EAAE,GAAU,EAAE,CAAU;IAG5F,wBAAwB;IACxB,MAAM,EAAE,GAAG,4EAA4E,CAAC;IACxF,IAAI,CAAkB,CAAC;IACvB,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACzB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjB,eAAe;QACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC;QACnC,IAAI,EAAmB,CAAC;QACxB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC5B,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;YACpD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,OAAO,EAAE;YACvB,KAAK,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;YACrC,GAAG,EAAE,CAAC;SACT;QACD,eAAe;QACf,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACjC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAG9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3B,EAAE,GAAG,EAAE,IAAI,sBAAc,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,sBAAsB;QACtB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE;YACjC,IAAI,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,cAAc,CAAC,+BAA+B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;aAC7G;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;aACnE;YACD,SAAS;SACZ;QAGD,MAAM,KAAK,GAAQ;YACf,IAAI,EAAE,CAAC;YACP,EAAE;YACF,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,GAAG;SACd,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;KACtB;AACL,CAAC;AArDD,8CAqDC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "smartloc",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.3",
|
|
4
4
|
"description": "A i18n toolset for nodejs apis leveraging tagged strings",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
|
-
"build": "tsc && cp package.json bin/package.json",
|
|
7
|
+
"build": "tsc && cp package.json bin/package.json && cp README.md build",
|
|
8
8
|
"release": "npm run build && cd bin && npm publish && cd .."
|
|
9
9
|
},
|
|
10
10
|
"bin": {
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"js-levenshtein": "^1.1.6",
|
|
34
34
|
"js-sha1": "^0.6.0",
|
|
35
35
|
"json-stable-stringify": "~1.0.1",
|
|
36
|
-
"moment": "~2.
|
|
36
|
+
"moment": "~2.29.2",
|
|
37
37
|
"xliff": "~4.4.0",
|
|
38
38
|
"yargs": "~15.1.0"
|
|
39
39
|
},
|