@esgettext/tools 1.3.4 → 1.3.6

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.
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  Object.defineProperty(exports, "__esModule", { value: true });
26
36
  exports.AddLanguage = void 0;
27
37
  const path = __importStar(require("path"));
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  Object.defineProperty(exports, "__esModule", { value: true });
26
36
  exports.Convert = void 0;
27
37
  const fs = __importStar(require("fs"));
@@ -116,16 +126,17 @@ class Convert {
116
126
  console.error(gtx._x('Detected output format {outputFormat}.', { outputFormat }));
117
127
  }
118
128
  try {
119
- const inBuffer = this.readInput(input);
129
+ const buffer = this.readInput(input);
130
+ const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
120
131
  let catalog;
121
132
  switch (options.inputFormat) {
122
133
  case 'mo.json':
123
- catalog = (0, runtime_1.parseMoJsonCatalog)(inBuffer);
134
+ catalog = (0, runtime_1.parseMoJsonCatalog)(arrayBuffer);
124
135
  break;
125
136
  case 'mo':
126
137
  case 'gmo':
127
138
  default:
128
- catalog = (0, runtime_1.parseMoCatalog)(inBuffer);
139
+ catalog = (0, runtime_1.parseMoCatalog)(arrayBuffer);
129
140
  break;
130
141
  }
131
142
  const converted = this.convert(catalog, input, outputFormat);
@@ -135,7 +146,10 @@ class Convert {
135
146
  this.output(output, converted);
136
147
  }
137
148
  catch (e) {
138
- console.error(gtx._x('{programName}: Error: {e}'));
149
+ console.error(gtx._x('{programName}: Error: {e}', {
150
+ programName: package_1.Package.getName(),
151
+ e,
152
+ }));
139
153
  return resolve(1);
140
154
  }
141
155
  return resolve(0);
@@ -194,8 +208,7 @@ class Convert {
194
208
  filename = undefined;
195
209
  }
196
210
  if (typeof filename !== 'undefined') {
197
- const b = fs.readFileSync(filename);
198
- return b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength);
211
+ return fs.readFileSync(filename);
199
212
  }
200
213
  // Must read from standard input.
201
214
  const stdinFd = 0;
@@ -205,8 +218,7 @@ class Convert {
205
218
  while ((bytesRead = fs.readSync(stdinFd, buffer, 0, buffer.length, null)) > 0) {
206
219
  chunks.push(Buffer.from(buffer.subarray(0, bytesRead)));
207
220
  }
208
- const b = Buffer.concat(chunks);
209
- return b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength);
221
+ return Buffer.concat(chunks);
210
222
  }
211
223
  catch (error) {
212
224
  if (typeof filename === 'undefined') {
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -50,7 +60,6 @@ const package_1 = require("../package");
50
60
  const optspec_1 = require("../optspec");
51
61
  const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
52
62
  class Init {
53
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
54
63
  constructor(configuration) {
55
64
  this.options = undefined;
56
65
  this.packageJson = undefined;
@@ -336,7 +345,7 @@ class Init {
336
345
  })
337
346
  .split(/[\r\n]+/);
338
347
  }
339
- catch (_) {
348
+ catch (_a) {
340
349
  return null;
341
350
  }
342
351
  }
@@ -669,7 +678,7 @@ class Init {
669
678
  message: gtx._x("(Boolean) options to invoke '{tool}' with", {
670
679
  tool: 'msgmerge',
671
680
  }),
672
- default: '--update --previous',
681
+ default: '--previous',
673
682
  }),
674
683
  msgfmt: yield (0, prompts_1.input)({
675
684
  message: gtx._x("The '{tool}' program to use:", { tool: 'msgfmt' }),
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  Object.defineProperty(exports, "__esModule", { value: true });
26
36
  exports.Install = void 0;
27
37
  const fs_1 = require("fs");
@@ -182,9 +192,9 @@ class Install {
182
192
  outFile,
183
193
  }));
184
194
  }
185
- const input = (0, fs_1.readFileSync)(inFile);
186
- const b = input.buffer.slice(input.byteOffset, input.byteOffset + input.byteLength);
187
- const catalog = (0, runtime_1.parseMoCatalog)(b);
195
+ const buffer = (0, fs_1.readFileSync)(inFile);
196
+ const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
197
+ const catalog = (0, runtime_1.parseMoCatalog)(arrayBuffer);
188
198
  const json = JSON.stringify(catalog);
189
199
  (0, fs_1.writeFile)(outFile, json, err => {
190
200
  if (err) {
@@ -208,9 +218,9 @@ class Install {
208
218
  outFile,
209
219
  }));
210
220
  }
211
- const input = (0, fs_1.readFileSync)(inFile);
212
- const b = input.buffer.slice(input.byteOffset, input.byteOffset + input.byteLength);
213
- const catalog = (0, runtime_1.parseMoCatalog)(b);
221
+ const buffer = (0, fs_1.readFileSync)(inFile);
222
+ const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
223
+ const catalog = (0, runtime_1.parseMoCatalog)(arrayBuffer);
214
224
  const msgs = {};
215
225
  for (const msgid in catalog.entries) {
216
226
  const msgstr = catalog.entries[msgid];
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,7 +10,6 @@ const package_1 = require("../package");
10
10
  const optspec_1 = require("../optspec");
11
11
  const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
12
12
  class Potfiles {
13
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
14
13
  constructor(configuration) {
15
14
  this.GIT_DIRECTORY_NAME = '.git';
16
15
  this.options = undefined;
@@ -51,7 +50,6 @@ class Potfiles {
51
50
  },
52
51
  };
53
52
  }
54
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
55
53
  additional(argv) {
56
54
  argv.positional(gtx._('PATTERN'), {
57
55
  type: 'string',
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  Object.defineProperty(exports, "__esModule", { value: true });
26
36
  exports.XGettext = void 0;
27
37
  const fs_1 = require("fs");
@@ -238,7 +248,6 @@ class XGettext {
238
248
  },
239
249
  };
240
250
  }
241
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
242
251
  additional(argv) {
243
252
  argv.positional(gtx._('INPUTFILE'), {
244
253
  type: 'string',
@@ -404,6 +413,7 @@ class XGettext {
404
413
  try {
405
414
  const fullName = resolve(directories[i], filename);
406
415
  return (0, fs_1.readFileSync)(fullName);
416
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
407
417
  }
408
418
  catch (e) {
409
419
  /* ignore */
@@ -539,6 +549,9 @@ class XGettext {
539
549
  });
540
550
  parserOptions.keyword = cookedKeywords;
541
551
  }
552
+ if (this.options.instance) {
553
+ parserOptions.instance = this.options.instance;
554
+ }
542
555
  return parserOptions;
543
556
  }
544
557
  }
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -289,7 +299,7 @@ class ConfigurationFactory {
289
299
  (0, normalize_package_data_1.default)(data.content);
290
300
  return data.content;
291
301
  }
292
- catch (error) {
302
+ catch (_a) {
293
303
  return {};
294
304
  }
295
305
  });
@@ -312,7 +322,8 @@ class ConfigurationFactory {
312
322
  try {
313
323
  return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
314
324
  }
315
- catch (_a) {
325
+ catch (e) {
326
+ console.error(`error reading configuration from '${filePath}': ${e}!`);
316
327
  return null;
317
328
  }
318
329
  }
package/dist/index.js CHANGED
@@ -16,13 +16,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
16
16
  }) : function(o, v) {
17
17
  o["default"] = v;
18
18
  });
19
- var __importStar = (this && this.__importStar) || function (mod) {
20
- if (mod && mod.__esModule) return mod;
21
- var result = {};
22
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23
- __setModuleDefault(result, mod);
24
- return result;
25
- };
19
+ var __importStar = (this && this.__importStar) || (function () {
20
+ var ownKeys = function(o) {
21
+ ownKeys = Object.getOwnPropertyNames || function (o) {
22
+ var ar = [];
23
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
24
+ return ar;
25
+ };
26
+ return ownKeys(o);
27
+ };
28
+ return function (mod) {
29
+ if (mod && mod.__esModule) return mod;
30
+ var result = {};
31
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
32
+ __setModuleDefault(result, mod);
33
+ return result;
34
+ };
35
+ })();
26
36
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
27
37
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
28
38
  return new (P || (P = Promise))(function (resolve, reject) {
package/dist/optspec.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.coerceOptions = void 0;
3
+ exports.coerceOptions = coerceOptions;
4
4
  const runtime_1 = require("@esgettext/runtime");
5
5
  const package_1 = require("./package");
6
6
  const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
@@ -25,4 +25,3 @@ function coerceOptions(args, optspecs) {
25
25
  }
26
26
  return true;
27
27
  }
28
- exports.coerceOptions = coerceOptions;
package/dist/package.js CHANGED
@@ -9,7 +9,7 @@ class Package {
9
9
  return 'https://github.com/gflohr/esgettext/issues';
10
10
  }
11
11
  static getVersion() {
12
- return '1.3.4';
12
+ return '1.3.6';
13
13
  }
14
14
  static getNpmRunAllVersion() {
15
15
  return '^4.1.5';
@@ -11,9 +11,9 @@ class JavaScriptParser extends parser_2.Parser {
11
11
  allowReturnOutsideFunction: true,
12
12
  allowSuperOutsideMethod: true,
13
13
  allowUndeclaredExports: true,
14
- // Documented but not supported. FIXME! Maybe only missing in types.
15
- // errorRecovery: true,
14
+ errorRecovery: true,
16
15
  sourceFilename: filename,
16
+ sourceType: this.getSourceType(filename),
17
17
  plugins: [
18
18
  'flow',
19
19
  'jsx',
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
37
  };
@@ -30,6 +40,8 @@ exports.Parser = void 0;
30
40
  const iconv_lite_1 = require("iconv-lite");
31
41
  const traverse_1 = __importDefault(require("@babel/traverse"));
32
42
  const t = __importStar(require("@babel/types"));
43
+ const fs = __importStar(require("fs"));
44
+ const path = __importStar(require("path"));
33
45
  const runtime_1 = require("@esgettext/runtime");
34
46
  const entry_1 = require("../pot/entry");
35
47
  const keyword_1 = require("../pot/keyword");
@@ -361,6 +373,12 @@ class Parser {
361
373
  instance.push(me.property.name);
362
374
  return this.methodFromMemberExpression(me.object, instance);
363
375
  }
376
+ else if (t.isThisExpression(me.object) &&
377
+ t.isIdentifier(me.property) &&
378
+ !me.computed) {
379
+ instance.push(me.property.name);
380
+ return instance[0];
381
+ }
364
382
  else if (t.isMemberExpression(me.object) &&
365
383
  t.isLiteral(me.property) &&
366
384
  me.computed) {
@@ -368,6 +386,12 @@ class Parser {
368
386
  instance.push(this.literalValue(me.property));
369
387
  return this.methodFromMemberExpression(me.object, instance);
370
388
  }
389
+ else if (t.isThisExpression(me.object) &&
390
+ t.isLiteral(me.property) &&
391
+ me.computed) {
392
+ instance.push(this.literalValue(me.property));
393
+ return instance[0];
394
+ }
371
395
  else {
372
396
  return null;
373
397
  }
@@ -547,10 +571,6 @@ class Parser {
547
571
  ++i;
548
572
  continue;
549
573
  }
550
- if (buf[i] === 0xd) {
551
- ++i;
552
- continue;
553
- }
554
574
  if (0xc2 <= buf[i] &&
555
575
  buf[i] <= 0xdf &&
556
576
  0x80 <= buf[i + 1] &&
@@ -610,5 +630,43 @@ class Parser {
610
630
  }
611
631
  return null;
612
632
  }
633
+ getSourceTypeFromPackageJson(filename) {
634
+ const packageJsonPath = this.findPackageJson(filename);
635
+ if (packageJsonPath === null)
636
+ return 'script';
637
+ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
638
+ if (packageJson.type === 'module') {
639
+ return 'module';
640
+ }
641
+ return 'script';
642
+ }
643
+ getSourceType(filename) {
644
+ const extname = path.extname(filename).toLowerCase();
645
+ switch (extname) {
646
+ case '.js':
647
+ case '.ts':
648
+ case '.jsx':
649
+ case '.tsx':
650
+ return this.getSourceTypeFromPackageJson(filename);
651
+ case '.mjs':
652
+ return 'module';
653
+ case '.cjs':
654
+ return 'script';
655
+ default:
656
+ return 'script';
657
+ }
658
+ }
659
+ findPackageJson(filePath) {
660
+ const absolutePath = path.resolve(filePath);
661
+ let currentDir = absolutePath;
662
+ while (currentDir !== path.parse(currentDir).root) {
663
+ const packageJsonPath = path.join(currentDir, 'package.json');
664
+ if (fs.existsSync(packageJsonPath)) {
665
+ return packageJsonPath;
666
+ }
667
+ currentDir = path.dirname(currentDir);
668
+ }
669
+ return null;
670
+ }
613
671
  }
614
672
  exports.Parser = Parser;
@@ -11,9 +11,9 @@ class TypeScriptParser extends parser_2.Parser {
11
11
  allowReturnOutsideFunction: true,
12
12
  allowSuperOutsideMethod: true,
13
13
  allowUndeclaredExports: true,
14
- // Documented but not supported. FIXME! Maybe only missing in types.
15
- // errorRecovery: true,
14
+ errorRecovery: true,
16
15
  sourceFilename: filename,
16
+ sourceType: this.getSourceType(filename),
17
17
  plugins: [
18
18
  'typescript',
19
19
  'jsx',
package/dist/pot/entry.js CHANGED
@@ -317,7 +317,7 @@ class POTEntry {
317
317
  '"': '\\"',
318
318
  '\\': '\\\\',
319
319
  };
320
- return input.replace(/([\u0007-\u000d"\\])/gs, m => {
320
+ return input.replace(/([\u0007-\u000d"\\])/g, m => {
321
321
  return escapes[m[0]];
322
322
  });
323
323
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@esgettext/tools",
3
- "version": "1.3.4",
3
+ "version": "1.3.6",
4
4
  "description": "Gettext-like po creation and manipulation",
5
5
  "keywords": [
6
6
  "gettext",
@@ -81,38 +81,38 @@
81
81
  ]
82
82
  },
83
83
  "devDependencies": {
84
- "@babel/types": "^7.24.7",
85
- "@esgettext/tools": "^1.3.1",
86
- "@eslint/config-array": "^0.16.0",
87
- "@humanwhocodes/retry": "^0.3.0",
88
- "@tsconfig/recommended": "^1.0.6",
84
+ "@babel/types": "^7.26.3",
85
+ "@esgettext/tools": "^1.3.4",
86
+ "@eslint/config-array": "^0.19.0",
87
+ "@humanwhocodes/retry": "^0.4.1",
88
+ "@tsconfig/recommended": "^1.0.8",
89
89
  "@types/glob": "^8.1.0",
90
- "@types/jest": "^29.5.12",
90
+ "@types/jest": "^29.5.14",
91
91
  "@types/jsonfile": "^6.1.4",
92
- "@types/node": "^20.14.2",
92
+ "@types/node": "^22.10.1",
93
93
  "@types/npmcli__package-json": "^4.0.4",
94
- "@types/yargs": "^17.0.32",
95
- "eslint": "^8.56.0",
94
+ "@types/yargs": "^17.0.33",
95
+ "eslint": "^9.16.0",
96
96
  "jest": "^29.7.0",
97
97
  "npm-run-all": "^4.1.5",
98
- "prettier": "^3.3.2",
99
- "rimraf": "^5.0.7",
100
- "tsx": "^4.15.4",
101
- "typescript": "^5.4.5",
102
- "typescript-eslint": "^7.13.0"
98
+ "prettier": "^3.4.2",
99
+ "rimraf": "^6.0.1",
100
+ "tsx": "^4.19.2",
101
+ "typescript": "^5.7.2",
102
+ "typescript-eslint": "^8.17.0"
103
103
  },
104
104
  "dependencies": {
105
- "@babel/parser": "^7.24.7",
106
- "@babel/traverse": "^7.24.7",
105
+ "@babel/parser": "^7.26.3",
106
+ "@babel/traverse": "^7.26.3",
107
107
  "@esgettext/runtime": "^1.3.4",
108
- "@inquirer/prompts": "^5.0.6",
109
- "@npmcli/package-json": "^5.2.0",
110
- "@valibot/i18n": "^0.15.0",
108
+ "@inquirer/prompts": "^7.1.0",
109
+ "@npmcli/package-json": "^6.1.0",
110
+ "@valibot/i18n": "^0.17.0",
111
111
  "iconv-lite": "^0.6.3",
112
112
  "jsonfile": "^6.1.0",
113
113
  "mkdirp": "^3.0.1",
114
- "valibot": "^0.31.1",
114
+ "valibot": "^0.42.1",
115
115
  "yargs": "^17.7.2"
116
116
  },
117
- "gitHead": "b874712f63ffbc0dfeebd5d23a2fdeafd232857b"
117
+ "gitHead": "5eab231f046e32d4a6484aa396520feeadb2cdd5"
118
118
  }