smartloc 2.0.6 → 2.0.8
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/cli.js +9 -1
- package/cli/cli.js.map +1 -1
- package/cli/collect.d.ts +8 -2
- package/cli/collect.js +80 -5
- package/cli/collect.js.map +1 -1
- package/package.json +1 -1
package/cli/cli.js
CHANGED
|
@@ -65,6 +65,10 @@ yargs_1.default
|
|
|
65
65
|
}
|
|
66
66
|
return x;
|
|
67
67
|
},
|
|
68
|
+
})
|
|
69
|
+
.positional('additionalSimpleTag', {
|
|
70
|
+
description: `Additional simple tag to use for translations (ex: Named<*> will catch any Named<'some string'> etc as transltatables)`,
|
|
71
|
+
type: 'string',
|
|
68
72
|
}), async (args) => {
|
|
69
73
|
try {
|
|
70
74
|
const locales = args.locales?.split(',')
|
|
@@ -81,9 +85,13 @@ yargs_1.default
|
|
|
81
85
|
// create adapter
|
|
82
86
|
const outdir = path_1.default.join(process.cwd(), args.outDir);
|
|
83
87
|
const adapter = (0, adapters_1.getAdapter)(args.format, outdir);
|
|
88
|
+
const additionalSimpleTag = args.additionalSimpleTag ? (0, collect_1.makeSimpleTagParser)(args.additionalSimpleTag) : undefined;
|
|
84
89
|
// collect from sources
|
|
85
90
|
console.log('Collecting from sources...');
|
|
86
|
-
const { collected, files } = await (0, collect_1.collect)(args.source || '.', adapter,
|
|
91
|
+
const { collected, files } = await (0, collect_1.collect)(args.source || '.', adapter, {
|
|
92
|
+
forceLocale: args.defaultLocale,
|
|
93
|
+
additionalSimpleTag,
|
|
94
|
+
});
|
|
87
95
|
console.log(`...found ${Object.keys(collected.resources).length} translatable items over ${files} files with default language ${collected.targetLanguage}`);
|
|
88
96
|
// load other locales
|
|
89
97
|
const others = (await adapter.loadLocales(locales))
|
package/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";;;;;;AAEA,kDAAoC;AACpC,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"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"}
|
package/cli/collect.d.ts
CHANGED
|
@@ -7,8 +7,14 @@ export interface Loc {
|
|
|
7
7
|
source: string;
|
|
8
8
|
plural?: boolean;
|
|
9
9
|
}
|
|
10
|
-
export declare function collect(source: string, adapter: IFormatAdapter,
|
|
10
|
+
export declare function collect(source: string, adapter: IFormatAdapter, opts?: {
|
|
11
|
+
additionalSimpleTag?: SimpleTagParser;
|
|
12
|
+
forceLocale?: string;
|
|
13
|
+
}): Promise<{
|
|
11
14
|
collected: Translation;
|
|
12
15
|
files: number;
|
|
13
16
|
}>;
|
|
14
|
-
export declare function collectFromSource(content: string, ids: Map<string, Loc>, all: Loc[], f?: string): void;
|
|
17
|
+
export declare function collectFromSource(content: string, ids: Map<string, Loc>, all: Loc[], f?: string, additionalSimpleTag?: SimpleTagParser): void;
|
|
18
|
+
type SimpleTagParser = (content: string) => IterableIterator<string>;
|
|
19
|
+
export declare function makeSimpleTagParser(syntax: string): SimpleTagParser;
|
|
20
|
+
export {};
|
package/cli/collect.js
CHANGED
|
@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.collect = collect;
|
|
7
7
|
exports.collectFromSource = collectFromSource;
|
|
8
|
+
exports.makeSimpleTagParser = makeSimpleTagParser;
|
|
8
9
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const gitignore_parser_1 = __importDefault(require("gitignore-parser"));
|
|
11
12
|
const utils_1 = require("../core/utils");
|
|
12
13
|
const util_1 = __importDefault(require("util"));
|
|
13
|
-
async function collect(source, adapter,
|
|
14
|
+
async function collect(source, adapter, opts) {
|
|
14
15
|
source = source
|
|
15
16
|
? path_1.default.join(process.cwd(), source)
|
|
16
17
|
: process.cwd();
|
|
@@ -62,7 +63,7 @@ async function collect(source, adapter, forceLocale) {
|
|
|
62
63
|
try {
|
|
63
64
|
const content = await fs_extra_1.default.readFile(path_1.default.join(source, f), 'utf8');
|
|
64
65
|
// === try to find setDefaultLocale()
|
|
65
|
-
if (!forceLocale) {
|
|
66
|
+
if (!opts?.forceLocale) {
|
|
66
67
|
const defLoc = /\bsetDefaultLocale\s*\(\s*('|")([a-zA-Z\-]+)('|")\s*\)/.exec(content);
|
|
67
68
|
const newDefLoc = defLoc?.[2];
|
|
68
69
|
if (newDefLoc) {
|
|
@@ -75,14 +76,14 @@ async function collect(source, adapter, forceLocale) {
|
|
|
75
76
|
};
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
|
-
collectFromSource(content, ids, all, f);
|
|
79
|
+
collectFromSource(content, ids, all, f, opts?.additionalSimpleTag);
|
|
79
80
|
}
|
|
80
81
|
catch (e) {
|
|
81
82
|
console.error('Failed to read file ' + f + ': ' + util_1.default.inspect(e));
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
85
|
// === load default locale ===
|
|
85
|
-
const targetLanguage = defaultLocale?.val || forceLocale;
|
|
86
|
+
const targetLanguage = defaultLocale?.val || opts?.forceLocale;
|
|
86
87
|
const origFile = targetLanguage ? await adapter.loadLocale(targetLanguage) : null;
|
|
87
88
|
// === WRITE RESULT ===
|
|
88
89
|
const result = {};
|
|
@@ -127,7 +128,7 @@ async function collect(source, adapter, forceLocale) {
|
|
|
127
128
|
};
|
|
128
129
|
return { collected, files: fcount };
|
|
129
130
|
}
|
|
130
|
-
function collectFromSource(content, ids, all, f) {
|
|
131
|
+
function collectFromSource(content, ids, all, f, additionalSimpleTag) {
|
|
131
132
|
// === parse loc() calls
|
|
132
133
|
const re = /\bloc(\.plural\([^\)]+\))?\s*(\(\s*('|")([^'"\n]+)('|")\s*(?:,\s*)?\))?\s*`([^`]*)`/g;
|
|
133
134
|
let m;
|
|
@@ -176,5 +177,79 @@ function collectFromSource(content, ids, all, f) {
|
|
|
176
177
|
all.push(found);
|
|
177
178
|
ids.set(id, found);
|
|
178
179
|
}
|
|
180
|
+
if (additionalSimpleTag) {
|
|
181
|
+
for (const string of additionalSimpleTag(content)) {
|
|
182
|
+
const id = (0, utils_1.autoGenerateId)([string]);
|
|
183
|
+
const exists = ids.get(id);
|
|
184
|
+
if (exists && exists.source !== string) {
|
|
185
|
+
if (f === exists.file) {
|
|
186
|
+
console.error(`Duplicate translation id '${id}' (${string}) found in ${f} but was already defined in ${exists.file}`);
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
console.error(`Duplicate translation id '${id}' (${string}) found in ${f}`);
|
|
190
|
+
}
|
|
191
|
+
continue;
|
|
192
|
+
}
|
|
193
|
+
const found = {
|
|
194
|
+
file: f,
|
|
195
|
+
id,
|
|
196
|
+
line: 0, // todo
|
|
197
|
+
source: string,
|
|
198
|
+
plural: undefined,
|
|
199
|
+
};
|
|
200
|
+
all.push(found);
|
|
201
|
+
ids.set(id, found);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
function makeSimpleTagParser(syntax) {
|
|
206
|
+
// detect string placeholder
|
|
207
|
+
const i = syntax.indexOf('*');
|
|
208
|
+
if (i === -1) {
|
|
209
|
+
throw new Error('Invalid syntax for simple tag: ' + syntax);
|
|
210
|
+
}
|
|
211
|
+
const prefix = syntax.substring(0, i);
|
|
212
|
+
const suffix = syntax.substring(i + 1);
|
|
213
|
+
return function* parse(content) {
|
|
214
|
+
let position = 0;
|
|
215
|
+
while (position < content.length) {
|
|
216
|
+
const idx = content.indexOf(prefix, position);
|
|
217
|
+
if (idx === -1) {
|
|
218
|
+
break;
|
|
219
|
+
}
|
|
220
|
+
const strChar = content[idx + prefix.length];
|
|
221
|
+
if (strChar !== '"' && strChar !== "'" && strChar !== '`') {
|
|
222
|
+
// not a match... restart
|
|
223
|
+
position = idx + prefix.length;
|
|
224
|
+
continue;
|
|
225
|
+
}
|
|
226
|
+
const stringStart = idx + prefix.length + 1;
|
|
227
|
+
let stringEnd = stringStart;
|
|
228
|
+
let string = undefined;
|
|
229
|
+
while (stringEnd < content.length) {
|
|
230
|
+
if (content[stringEnd] === strChar) {
|
|
231
|
+
// yep, that's a string
|
|
232
|
+
string = content.substring(stringStart, stringEnd);
|
|
233
|
+
break;
|
|
234
|
+
}
|
|
235
|
+
stringEnd++;
|
|
236
|
+
}
|
|
237
|
+
// skip string closing quote
|
|
238
|
+
stringEnd++;
|
|
239
|
+
if (!string) {
|
|
240
|
+
// not a match... restart
|
|
241
|
+
position = idx + prefix.length;
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
// check suffix
|
|
245
|
+
if (content.substring(stringEnd, stringEnd + suffix.length) !== suffix) {
|
|
246
|
+
// not a match... restart
|
|
247
|
+
position = idx + prefix.length;
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
yield string;
|
|
251
|
+
position = stringEnd + suffix.length;
|
|
252
|
+
}
|
|
253
|
+
};
|
|
179
254
|
}
|
|
180
255
|
//# sourceMappingURL=collect.js.map
|
package/cli/collect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":";;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":"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"}
|