@ng-linguo/extract 0.9.3 → 0.9.5
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/package.json +1 -1
- package/src/lib/scan.js +12 -7
- package/src/lib/scan.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-linguo/extract",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.5",
|
|
4
4
|
"description": "The ng-linguo extraction CLI — scans Angular source for translatable messages, manages gettext .po catalogs, and compiles them to runtime JSON. Pure Node, zero Angular deps.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "jmwierzbicki",
|
package/src/lib/scan.js
CHANGED
|
@@ -4,17 +4,19 @@ exports.extractMessages = extractMessages;
|
|
|
4
4
|
const normalize_1 = require("./normalize");
|
|
5
5
|
// The `t` pipe: `'Play' | t` with an optional options object (`| t: { ... }`).
|
|
6
6
|
// Group 2 is the key; group 3 is the options object (one level of nesting), from
|
|
7
|
-
// which the context is read.
|
|
8
|
-
|
|
7
|
+
// which the context is read. The key body uses `[\s\S]` rather than `.` so a
|
|
8
|
+
// string literal that a formatter wrapped across several lines is still captured
|
|
9
|
+
// whole — normalizeMessage collapses the embedded newlines, matching the runtime.
|
|
10
|
+
const PIPE_PATTERN = /(['"])((?:\\.|(?!\1)[\s\S])*?)\1\s*\|\s*t\b(?:\s*:\s*(\{(?:[^{}]|\{[^{}]*\})*\}))?/g;
|
|
9
11
|
// `mark('...')` — the extraction marker for messages defined outside a template
|
|
10
12
|
// (e.g. a component field). Not preceded by `.` so `foo.mark(...)` is ignored.
|
|
11
13
|
// Group 2 is the key; group 3 is the optional options object (`mark('…', { … })`,
|
|
12
14
|
// one level of nesting), from which the context is read.
|
|
13
|
-
const MARK_PATTERN = /(?<!\.)\bmark\s*\(\s*(['"])((?:\\.|(?!\1)
|
|
15
|
+
const MARK_PATTERN = /(?<!\.)\bmark\s*\(\s*(['"])((?:\\.|(?!\1)[\s\S])*?)\1(?:\s*,\s*(\{(?:[^{}]|\{[^{}]*\})*\}))?/g;
|
|
14
16
|
// The `t('...', { ... })` helper call (from `injectTranslate()`). The lookbehind
|
|
15
17
|
// keeps it from matching `obj.t(`, `$t(`, or the tail of an identifier. Group 2
|
|
16
18
|
// is the key; group 3 is the options object, from which the context is read.
|
|
17
|
-
const T_CALL_PATTERN = /(?<![\w.$])t\s*\(\s*(['"])((?:\\.|(?!\1)
|
|
19
|
+
const T_CALL_PATTERN = /(?<![\w.$])t\s*\(\s*(['"])((?:\\.|(?!\1)[\s\S])*?)\1(?:\s*,\s*(\{(?:[^{}]|\{[^{}]*\})*\}))?/g;
|
|
18
20
|
// An element carrying the `[t]` directive via a static `t="message"` attribute.
|
|
19
21
|
// `(?<![\w-])t\s*=` matches a standalone `t=` attribute (not `alt`, `data-t`,
|
|
20
22
|
// `tParams`, `tContext`, `tFor`, nor bound `[t]="…"`). Group 2 is the message.
|
|
@@ -22,7 +24,7 @@ const DIRECTIVE_TAG_PATTERN = /<[a-zA-Z][\w-]*\b[^>]*?(?<![\w-])t\s*=\s*"(?:\\.|
|
|
|
22
24
|
const DIRECTIVE_MESSAGE_PATTERN = /(?<![\w-])t\s*=\s*"((?:\\.|[^"])*)"/;
|
|
23
25
|
const DIRECTIVE_CONTEXT_PATTERN = /(?<![\w-])tContext\s*=\s*"((?:\\.|[^"])*)"/;
|
|
24
26
|
// Reads `context: '…'` out of a pipe options object.
|
|
25
|
-
const CONTEXT_IN_OPTIONS = /\bcontext\s*:\s*(['"])((?:\\.|(?!\1)
|
|
27
|
+
const CONTEXT_IN_OPTIONS = /\bcontext\s*:\s*(['"])((?:\\.|(?!\1)[\s\S])*?)\1/;
|
|
26
28
|
// Joins context and key for the dedup map (gettext EOT glue).
|
|
27
29
|
const GLUE = String.fromCharCode(4);
|
|
28
30
|
// Source-comment directives that exclude regions from extraction — for
|
|
@@ -128,7 +130,10 @@ function extractMessages(files) {
|
|
|
128
130
|
found.push({
|
|
129
131
|
index,
|
|
130
132
|
keyId: (0, normalize_1.normalizeMessage)(unescapeJs(key)),
|
|
131
|
-
|
|
133
|
+
// Collapse the context like the key: Angular collapses interpolation
|
|
134
|
+
// whitespace at runtime, so a multi-line context arrives single-spaced
|
|
135
|
+
// there — the catalog key must match (CLAUDE.md §5.2).
|
|
136
|
+
context: contextMatch ? (0, normalize_1.normalizeMessage)(unescapeJs(contextMatch[2] ?? '')) : '',
|
|
132
137
|
});
|
|
133
138
|
};
|
|
134
139
|
PIPE_PATTERN.lastIndex = 0;
|
|
@@ -158,7 +163,7 @@ function extractMessages(files) {
|
|
|
158
163
|
found.push({
|
|
159
164
|
index: tagMatch.index,
|
|
160
165
|
keyId: (0, normalize_1.normalizeMessage)(messageMatch[1] ?? ''),
|
|
161
|
-
context: contextMatch ? (contextMatch[1]
|
|
166
|
+
context: contextMatch ? (0, normalize_1.normalizeMessage)(contextMatch[1] ?? '') : '',
|
|
162
167
|
});
|
|
163
168
|
}
|
|
164
169
|
// Interleave pipe and directive matches by source position so discovery
|
package/src/lib/scan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../../packages/extract/src/lib/scan.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../../packages/extract/src/lib/scan.ts"],"names":[],"mappings":"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"}
|