smartloc 2.0.7 → 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/collect.js +10 -4
- package/cli/collect.js.map +1 -1
- package/package.json +1 -1
package/cli/collect.js
CHANGED
|
@@ -182,10 +182,13 @@ function collectFromSource(content, ids, all, f, additionalSimpleTag) {
|
|
|
182
182
|
const id = (0, utils_1.autoGenerateId)([string]);
|
|
183
183
|
const exists = ids.get(id);
|
|
184
184
|
if (exists && exists.source !== string) {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
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;
|
|
189
192
|
}
|
|
190
193
|
const found = {
|
|
191
194
|
file: f,
|
|
@@ -211,6 +214,9 @@ function makeSimpleTagParser(syntax) {
|
|
|
211
214
|
let position = 0;
|
|
212
215
|
while (position < content.length) {
|
|
213
216
|
const idx = content.indexOf(prefix, position);
|
|
217
|
+
if (idx === -1) {
|
|
218
|
+
break;
|
|
219
|
+
}
|
|
214
220
|
const strChar = content[idx + prefix.length];
|
|
215
221
|
if (strChar !== '"' && strChar !== "'" && strChar !== '`') {
|
|
216
222
|
// not a match... restart
|
package/cli/collect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":";;;;;AAeA,0BA6HC;AAGD,
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../src/cli/collect.ts"],"names":[],"mappings":"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"}
|