@formatjs/ts-transformer 3.9.9 → 3.10.0

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/ts-transformer/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA"}

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./src/transform"), exports);
-(0, tslib_1.__exportStar)(require("./src/types"), exports);
-(0, tslib_1.__exportStar)(require("./src/interpolate-name"), exports);
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./src/transform"), exports);
+tslib_1.__exportStar(require("./src/types"), exports);
+tslib_1.__exportStar(require("./src/interpolate-name"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ts-transformer",
-  "version": "3.9.9",
+  "version": "3.10.0",
   "description": "TS Compiler transformer for formatjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,13 +17,13 @@
     "react-intl"
   ],
   "dependencies": {
-    "@formatjs/icu-messageformat-parser": "2.1.4",
+    "@formatjs/icu-messageformat-parser": "2.1.7",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/node": "14 || 16 || 17",
     "chalk": "^4.0.0",
     "json-stable-stringify": "^1.0.1",
     "tslib": "2.4.0",
-    "typescript": "^4.5"
+    "typescript": "^4.7"
   },
   "peerDependencies": {
     "ts-jest": "27 || 28"
@@ -39,4 +39,4 @@
     "url": "https://github.com/formatjs/formatjs/issues"
   },
   "homepage": "https://github.com/formatjs/formatjs#readme"
-}
+}

package/src/console_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console_utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/console_utils.ts"],"names":[],"mappings":"AAeA,wBAAsB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,iBAM1D;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAG1D;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAG3D"}
+{"version":3,"file":"console_utils.d.ts","sourceRoot":"","sources":["console_utils.ts"],"names":[],"mappings":"AAeA,wBAAsB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,iBAM1D;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAG1D;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAG3D"}

package/src/console_utils.js

@@ -1,49 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.error = exports.warn = exports.debug = void 0;
-var tslib_1 = require("tslib");
-var chalk_1 = require("chalk");
-var util_1 = require("util");
-var LEVEL_COLORS = {
+const chalk_1 = require("chalk");
+const util_1 = require("util");
+const LEVEL_COLORS = {
     debug: chalk_1.green,
     warn: chalk_1.yellow,
     error: chalk_1.red,
 };
 function label(level, message) {
-    return "[@formatjs/ts-transformer] [".concat(LEVEL_COLORS[level](level.toUpperCase()), "] ").concat(message);
+    return `[@formatjs/ts-transformer] [${LEVEL_COLORS[level](level.toUpperCase())}] ${message}`;
 }
-function debug(message) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
+async function debug(message, ...args) {
+    if (process.env.LOG_LEVEL !== 'debug') {
+        return;
     }
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-        return (0, tslib_1.__generator)(this, function (_a) {
-            if (process.env.LOG_LEVEL !== 'debug') {
-                return [2 /*return*/];
-            }
-            console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('debug', message)], args, false)));
-            console.error('\n');
-            return [2 /*return*/];
-        });
-    });
+    console.error((0, util_1.format)(label('debug', message), ...args));
+    console.error('\n');
 }
 exports.debug = debug;
-function warn(message) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('warn', message)], args, false)));
+function warn(message, ...args) {
+    console.error((0, util_1.format)(label('warn', message), ...args));
     console.error('\n');
 }
 exports.warn = warn;
-function error(message) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('error', message)], args, false)));
+function error(message, ...args) {
+    console.error((0, util_1.format)(label('error', message), ...args));
     console.error('\n');
 }
 exports.error = error;

package/src/interpolate-name.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interpolate-name.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/interpolate-name.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE;QACR,qBAAqB,CACnB,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,OAAO,EAAE,OAAO,GACf,MAAM,CAAA;KACV,CAAA;CACF;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,oBAAY,MAAM,GAAG,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;AAa9E,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,OAAO,EAAE,OAAO,UA6GjB"}
+{"version":3,"file":"interpolate-name.d.ts","sourceRoot":"","sources":["interpolate-name.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE;QACR,qBAAqB,CACnB,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,OAAO,EAAE,OAAO,GACf,MAAM,CAAA;KACV,CAAA;CACF;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,oBAAY,MAAM,GAAG,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;AAa9E,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,OAAO,EAAE,OAAO,UA6GjB"}

package/src/interpolate-name.js

@@ -1,37 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interpolateName = void 0;
-var tslib_1 = require("tslib");
-var path = (0, tslib_1.__importStar)(require("path"));
-var crypto_1 = require("crypto");
-function getHashDigest(content, hashType, digestType, length) {
-    if (hashType === void 0) { hashType = 'md5'; }
-    if (digestType === void 0) { digestType = 'hex'; }
-    if (length === void 0) { length = 9999; }
-    var hasher = (0, crypto_1.createHash)(hashType);
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const crypto_1 = require("crypto");
+function getHashDigest(content, hashType = 'md5', digestType = 'hex', length = 9999) {
+    const hasher = (0, crypto_1.createHash)(hashType);
     hasher.update(content);
     return hasher.digest(digestType).slice(0, length);
 }
 function interpolateName(loaderContext, name, options) {
-    var filename;
-    var hasQuery = loaderContext.resourceQuery && loaderContext.resourceQuery.length > 1;
+    let filename;
+    const hasQuery = loaderContext.resourceQuery && loaderContext.resourceQuery.length > 1;
     if (typeof name === 'function') {
         filename = name(loaderContext.resourcePath, hasQuery ? loaderContext.resourceQuery : undefined);
     }
     else {
         filename = name || '[hash].[ext]';
     }
-    var context = options.context;
-    var content = options.content;
-    var regExp = options.regExp;
-    var ext = 'bin';
-    var basename = 'file';
-    var directory = '';
-    var folder = '';
-    var query = '';
+    const context = options.context;
+    const content = options.content;
+    const regExp = options.regExp;
+    let ext = 'bin';
+    let basename = 'file';
+    let directory = '';
+    let folder = '';
+    let query = '';
     if (loaderContext.resourcePath) {
-        var parsed = path.parse(loaderContext.resourcePath);
-        var resourcePath = loaderContext.resourcePath;
+        const parsed = path.parse(loaderContext.resourcePath);
+        let resourcePath = loaderContext.resourcePath;
         if (parsed.ext) {
             ext = parsed.ext.slice(1);
         }
@@ -58,31 +55,29 @@ function interpolateName(loaderContext, name, options) {
     }
     if (loaderContext.resourceQuery && loaderContext.resourceQuery.length > 1) {
         query = loaderContext.resourceQuery;
-        var hashIdx = query.indexOf('#');
+        const hashIdx = query.indexOf('#');
         if (hashIdx >= 0) {
             query = query.slice(0, hashIdx);
         }
     }
-    var url = filename;
+    let url = filename;
     if (content) {
         // Match hash template
         url = url
             // `hash` and `contenthash` are same in `loader-utils` context
             // let's keep `hash` for backward compatibility
-            .replace(/\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi, function (_, hashType, digestType, maxLength) {
-            return getHashDigest(content, hashType, digestType, parseInt(maxLength, 10));
-        });
+            .replace(/\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi, (_, hashType, digestType, maxLength) => getHashDigest(content, hashType, digestType, parseInt(maxLength, 10)));
     }
     url = url
-        .replace(/\[ext\]/gi, function () { return ext; })
-        .replace(/\[name\]/gi, function () { return basename; })
-        .replace(/\[path\]/gi, function () { return directory; })
-        .replace(/\[folder\]/gi, function () { return folder; })
-        .replace(/\[query\]/gi, function () { return query; });
+        .replace(/\[ext\]/gi, () => ext)
+        .replace(/\[name\]/gi, () => basename)
+        .replace(/\[path\]/gi, () => directory)
+        .replace(/\[folder\]/gi, () => folder)
+        .replace(/\[query\]/gi, () => query);
     if (regExp && loaderContext.resourcePath) {
-        var match = loaderContext.resourcePath.match(new RegExp(regExp));
+        const match = loaderContext.resourcePath.match(new RegExp(regExp));
         match &&
-            match.forEach(function (matched, i) {
+            match.forEach((matched, i) => {
                 url = url.replace(new RegExp('\\[' + i + '\\]', 'ig'), matched);
             });
     }

package/src/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAA;AACxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAA;AAKzC,oBAAY,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAA;AAC7E,oBAAY,aAAa,GAAG,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACzB,IAAI,CAAA;AAET,oBAAY,iBAAiB,GAAG,CAC9B,EAAE,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAC5B,cAAc,CAAC,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,EACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,EAC9C,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAA;AAQX,aAAK,UAAU,GAAG,OAAO,UAAU,CAAA;AA2FnC,MAAM,WAAW,IAAI;IACnB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAA;IACnC;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAA;IAClC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B;;;OAGG;IACH,eAAe,CAAC,EAAE,aAAa,CAAA;IAC/B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAA;IACzC;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IACb;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAmiBD,wBAAgB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,wDA6BzD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,wDAEnC"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAA;AACxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAA;AAKzC,oBAAY,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAA;AAC7E,oBAAY,aAAa,GAAG,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACzB,IAAI,CAAA;AAET,oBAAY,iBAAiB,GAAG,CAC9B,EAAE,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAC5B,cAAc,CAAC,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,EACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,EAC9C,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAA;AAQX,aAAK,UAAU,GAAG,OAAO,UAAU,CAAA;AA2FnC,MAAM,WAAW,IAAI;IACnB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAA;IACnC;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAA;IAClC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B;;;OAGG;IACH,eAAe,CAAC,EAAE,aAAa,CAAA;IAC/B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAA;IACzC;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IACb;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAmiBD,wBAAgB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,wDA6BzD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,wDAEnC"}

package/src/transform.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform = exports.transformWithTs = void 0;
-var tslib_1 = require("tslib");
-var typescript = (0, tslib_1.__importStar)(require("typescript"));
-var interpolate_name_1 = require("./interpolate-name");
-var icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
-var console_utils_1 = require("./console_utils");
-var json_stable_stringify_1 = (0, tslib_1.__importDefault)(require("json-stable-stringify"));
-var MESSAGE_DESC_KEYS = [
+const tslib_1 = require("tslib");
+const typescript = tslib_1.__importStar(require("typescript"));
+const interpolate_name_1 = require("./interpolate-name");
+const icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
+const console_utils_1 = require("./console_utils");
+const json_stable_stringify_1 = tslib_1.__importDefault(require("json-stable-stringify"));
+const MESSAGE_DESC_KEYS = [
     'id',
     'defaultMessage',
     'description',
@@ -25,7 +25,7 @@ function primitiveToTSNode(factory, v) {
 }
 function isValidIdentifier(k) {
     try {
-        new Function("return {".concat(k, ":1}"));
+        new Function(`return {${k}:1}`);
         return true;
     }
     catch (e) {
@@ -36,24 +36,18 @@ function objToTSNode(factory, obj) {
     if (typeof obj === 'object' && !obj) {
         return factory.createNull();
     }
-    var props = Object.entries(obj)
-        .filter(function (_a) {
-        var _ = _a[0], v = _a[1];
-        return typeof v !== 'undefined';
-    })
-        .map(function (_a) {
-        var k = _a[0], v = _a[1];
-        return factory.createPropertyAssignment(isValidIdentifier(k) ? k : factory.createStringLiteral(k), primitiveToTSNode(factory, v) ||
-            (Array.isArray(v)
-                ? factory.createArrayLiteralExpression(v
-                    .filter(function (n) { return typeof n !== 'undefined'; })
-                    .map(function (n) { return objToTSNode(factory, n); }))
-                : objToTSNode(factory, v)));
-    });
+    const props = Object.entries(obj)
+        .filter(([_, v]) => typeof v !== 'undefined')
+        .map(([k, v]) => factory.createPropertyAssignment(isValidIdentifier(k) ? k : factory.createStringLiteral(k), primitiveToTSNode(factory, v) ||
+        (Array.isArray(v)
+            ? factory.createArrayLiteralExpression(v
+                .filter(n => typeof n !== 'undefined')
+                .map(n => objToTSNode(factory, n)))
+            : objToTSNode(factory, v))));
     return factory.createObjectLiteralExpression(props);
 }
 function messageASTToTSNode(factory, ast) {
-    return factory.createArrayLiteralExpression(ast.map(function (el) { return objToTSNode(factory, el); }));
+    return factory.createArrayLiteralExpression(ast.map(el => objToTSNode(factory, el)));
 }
 function literalToObj(ts, n) {
     if (ts.isNumericLiteral(n)) {
@@ -70,7 +64,7 @@ function literalToObj(ts, n) {
     }
 }
 function objectLiteralExpressionToObj(ts, obj) {
-    return obj.properties.reduce(function (all, prop) {
+    return obj.properties.reduce((all, prop) => {
         if (ts.isPropertyAssignment(prop) && prop.name) {
             if (ts.isIdentifier(prop.name)) {
                 all[prop.name.escapedText.toString()] = literalToObj(ts, prop.initializer);
@@ -82,22 +76,23 @@ function objectLiteralExpressionToObj(ts, obj) {
         return all;
     }, {});
 }
-var DEFAULT_OPTS = {
-    onMsgExtracted: function () { return undefined; },
-    onMetaExtracted: function () { return undefined; },
+const DEFAULT_OPTS = {
+    onMsgExtracted: () => undefined,
+    onMetaExtracted: () => undefined,
 };
 function isMultipleMessageDecl(ts, node) {
     return (ts.isIdentifier(node.expression) &&
         node.expression.text === 'defineMessages');
 }
 function isSingularMessageDecl(ts, node, additionalComponentNames) {
-    var compNames = new Set((0, tslib_1.__spreadArray)([
+    const compNames = new Set([
         'FormattedMessage',
         'defineMessage',
         'formatMessage',
-        '$formatMessage'
-    ], additionalComponentNames, true));
-    var fnName = '';
+        '$formatMessage',
+        ...additionalComponentNames,
+    ]);
+    let fnName = '';
     if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
         fnName = node.expression.text;
     }
@@ -111,7 +106,7 @@ function isSingularMessageDecl(ts, node, additionalComponentNames) {
     return compNames.has(fnName);
 }
 function evaluateStringConcat(ts, node) {
-    var right = node.right, left = node.left;
+    const { right, left } = node;
     if (!ts.isStringLiteral(right)) {
         return ['', false];
     }
@@ -119,27 +114,26 @@ function evaluateStringConcat(ts, node) {
         return [left.text + right.text, true];
     }
     if (ts.isBinaryExpression(left)) {
-        var _a = evaluateStringConcat(ts, left), result = _a[0], isStatic = _a[1];
+        const [result, isStatic] = evaluateStringConcat(ts, left);
         return [result + right.text, isStatic];
     }
     return ['', false];
 }
-function extractMessageDescriptor(ts, node, _a, sf) {
-    var overrideIdFn = _a.overrideIdFn, extractSourceLocation = _a.extractSourceLocation, preserveWhitespace = _a.preserveWhitespace;
-    var properties = undefined;
+function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocation, preserveWhitespace }, sf) {
+    let properties = undefined;
     if (ts.isObjectLiteralExpression(node)) {
         properties = node.properties;
     }
     else if (ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node)) {
         properties = node.attributes.properties;
     }
-    var msg = { id: '' };
+    const msg = { id: '' };
     if (!properties) {
         return;
     }
-    properties.forEach(function (prop) {
-        var name = prop.name;
-        var initializer = ts.isPropertyAssignment(prop) || ts.isJsxAttribute(prop)
+    properties.forEach(prop => {
+        const { name } = prop;
+        const initializer = ts.isPropertyAssignment(prop) || ts.isJsxAttribute(prop)
             ? prop.initializer
             : undefined;
         if (name && ts.isIdentifier(name) && initializer) {
@@ -193,7 +187,7 @@ function extractMessageDescriptor(ts, node, _a, sf) {
                 }
                 // <FormattedMessage foo={`bar`} />
                 else if (ts.isNoSubstitutionTemplateLiteral(initializer.expression)) {
-                    var expression = initializer.expression;
+                    const { expression } = initializer;
                     switch (name.text) {
                         case 'id':
                             msg.id = expression.text;
@@ -208,8 +202,8 @@ function extractMessageDescriptor(ts, node, _a, sf) {
                 }
                 // <FormattedMessage foo={'bar' + 'baz'} />
                 else if (ts.isBinaryExpression(initializer.expression)) {
-                    var expression = initializer.expression;
-                    var _a = evaluateStringConcat(ts, expression), result = _a[0], isStatic = _a[1];
+                    const { expression } = initializer;
+                    const [result, isStatic] = evaluateStringConcat(ts, expression);
                     if (isStatic) {
                         switch (name.text) {
                             case 'id':
@@ -227,7 +221,7 @@ function extractMessageDescriptor(ts, node, _a, sf) {
             }
             // {defaultMessage: 'asd' + bar'}
             else if (ts.isBinaryExpression(initializer)) {
-                var _b = evaluateStringConcat(ts, initializer), result = _b[0], isStatic = _b[1];
+                const [result, isStatic] = evaluateStringConcat(ts, initializer);
                 if (isStatic) {
                     switch (name.text) {
                         case 'id':
@@ -262,9 +256,9 @@ function extractMessageDescriptor(ts, node, _a, sf) {
                 if (!msg.id) {
                     msg.id = (0, interpolate_name_1.interpolateName)({ resourcePath: sf.fileName }, overrideIdFn, {
                         content: msg.description
-                            ? "".concat(msg.defaultMessage, "#").concat(typeof msg.description === 'string'
+                            ? `${msg.defaultMessage}#${typeof msg.description === 'string'
                                 ? msg.description
-                                : (0, json_stable_stringify_1.default)(msg.description))
+                                : (0, json_stable_stringify_1.default)(msg.description)}`
                             : msg.defaultMessage,
                     });
                 }
@@ -275,7 +269,12 @@ function extractMessageDescriptor(ts, node, _a, sf) {
         }
     }
     if (extractSourceLocation) {
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, msg), { file: sf.fileName, start: node.pos, end: node.end });
+        return {
+            ...msg,
+            file: sf.fileName,
+            start: node.pos,
+            end: node.end,
+        };
     }
     return msg;
 }
@@ -285,11 +284,12 @@ function extractMessageDescriptor(ts, node, _a, sf) {
  * @param sf
  */
 function isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames) {
-    var fnNames = new Set((0, tslib_1.__spreadArray)([
+    const fnNames = new Set([
         'formatMessage',
-        '$formatMessage'
-    ], additionalFunctionNames, true));
-    var method = node.expression;
+        '$formatMessage',
+        ...additionalFunctionNames,
+    ]);
+    const method = node.expression;
     // Handle foo.formatMessage()
     if (ts.isPropertyAccessExpression(method)) {
         return fnNames.has(method.name.text);
@@ -298,18 +298,18 @@ function isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames) {
     return ts.isIdentifier(method) && fnNames.has(method.text);
 }
 function extractMessageFromJsxComponent(ts, factory, node, opts, sf) {
-    var onMsgExtracted = opts.onMsgExtracted;
+    const { onMsgExtracted } = opts;
     if (!isSingularMessageDecl(ts, node, opts.additionalComponentNames || [])) {
         return node;
     }
-    var msg = extractMessageDescriptor(ts, node, opts, sf);
+    const msg = extractMessageDescriptor(ts, node, opts, sf);
     if (!msg) {
         return node;
     }
     if (typeof onMsgExtracted === 'function') {
         onMsgExtracted(sf.fileName, [msg]);
     }
-    var newProps = generateNewProperties(ts, factory, node.attributes, {
+    const newProps = generateNewProperties(ts, factory, node.attributes, {
         defaultMessage: opts.removeDefaultMessage
             ? undefined
             : msg.defaultMessage,
@@ -321,17 +321,17 @@ function extractMessageFromJsxComponent(ts, factory, node, opts, sf) {
     return factory.updateJsxSelfClosingElement(node, node.tagName, node.typeArguments, factory.createJsxAttributes(newProps));
 }
 function setAttributesInObject(ts, factory, node, msg, ast) {
-    var newProps = (0, tslib_1.__spreadArray)([
-        factory.createPropertyAssignment('id', factory.createStringLiteral(msg.id))
-    ], (msg.defaultMessage
-        ? [
-            factory.createPropertyAssignment('defaultMessage', ast
-                ? messageASTToTSNode(factory, (0, icu_messageformat_parser_1.parse)(msg.defaultMessage))
-                : factory.createStringLiteral(msg.defaultMessage)),
-        ]
-        : []), true);
-    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-        var prop = _a[_i];
+    const newProps = [
+        factory.createPropertyAssignment('id', factory.createStringLiteral(msg.id)),
+        ...(msg.defaultMessage
+            ? [
+                factory.createPropertyAssignment('defaultMessage', ast
+                    ? messageASTToTSNode(factory, (0, icu_messageformat_parser_1.parse)(msg.defaultMessage))
+                    : factory.createStringLiteral(msg.defaultMessage)),
+            ]
+            : []),
+    ];
+    for (const prop of node.properties) {
         if (ts.isPropertyAssignment(prop) &&
             ts.isIdentifier(prop.name) &&
             MESSAGE_DESC_KEYS.includes(prop.name.text)) {
@@ -344,17 +344,17 @@ function setAttributesInObject(ts, factory, node, msg, ast) {
     return factory.createObjectLiteralExpression(factory.createNodeArray(newProps));
 }
 function generateNewProperties(ts, factory, node, msg, ast) {
-    var newProps = (0, tslib_1.__spreadArray)([
-        factory.createJsxAttribute(factory.createIdentifier('id'), factory.createStringLiteral(msg.id))
-    ], (msg.defaultMessage
-        ? [
-            factory.createJsxAttribute(factory.createIdentifier('defaultMessage'), ast
-                ? factory.createJsxExpression(undefined, messageASTToTSNode(factory, (0, icu_messageformat_parser_1.parse)(msg.defaultMessage)))
-                : factory.createStringLiteral(msg.defaultMessage)),
-        ]
-        : []), true);
-    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-        var prop = _a[_i];
+    const newProps = [
+        factory.createJsxAttribute(factory.createIdentifier('id'), factory.createStringLiteral(msg.id)),
+        ...(msg.defaultMessage
+            ? [
+                factory.createJsxAttribute(factory.createIdentifier('defaultMessage'), ast
+                    ? factory.createJsxExpression(undefined, messageASTToTSNode(factory, (0, icu_messageformat_parser_1.parse)(msg.defaultMessage)))
+                    : factory.createStringLiteral(msg.defaultMessage)),
+            ]
+            : []),
+    ];
+    for (const prop of node.properties) {
         if (ts.isJsxAttribute(prop) &&
             ts.isIdentifier(prop.name) &&
             MESSAGE_DESC_KEYS.includes(prop.name.text)) {
@@ -367,10 +367,10 @@ function generateNewProperties(ts, factory, node, msg, ast) {
     return newProps;
 }
 function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
-    var onMsgExtracted = opts.onMsgExtracted, additionalFunctionNames = opts.additionalFunctionNames;
+    const { onMsgExtracted, additionalFunctionNames } = opts;
     if (isMultipleMessageDecl(ts, node)) {
-        var _a = node.arguments, arg = _a[0], restArgs = _a.slice(1);
-        var descriptorsObj = void 0;
+        const [arg, ...restArgs] = node.arguments;
+        let descriptorsObj;
         if (ts.isObjectLiteralExpression(arg)) {
             descriptorsObj = arg;
         }
@@ -379,24 +379,20 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
             descriptorsObj = arg.expression;
         }
         if (descriptorsObj) {
-            var properties = descriptorsObj.properties;
-            var msgs_1 = properties
-                .filter(function (prop) {
-                return ts.isPropertyAssignment(prop);
-            })
-                .map(function (prop) {
-                return ts.isObjectLiteralExpression(prop.initializer) &&
-                    extractMessageDescriptor(ts, prop.initializer, opts, sf);
-            })
-                .filter(function (msg) { return !!msg; });
-            if (!msgs_1.length) {
+            const properties = descriptorsObj.properties;
+            const msgs = properties
+                .filter((prop) => ts.isPropertyAssignment(prop))
+                .map(prop => ts.isObjectLiteralExpression(prop.initializer) &&
+                extractMessageDescriptor(ts, prop.initializer, opts, sf))
+                .filter((msg) => !!msg);
+            if (!msgs.length) {
                 return node;
             }
-            (0, console_utils_1.debug)('Multiple messages extracted from "%s": %s', sf.fileName, msgs_1);
+            (0, console_utils_1.debug)('Multiple messages extracted from "%s": %s', sf.fileName, msgs);
             if (typeof onMsgExtracted === 'function') {
-                onMsgExtracted(sf.fileName, msgs_1);
+                onMsgExtracted(sf.fileName, msgs);
             }
-            var clonedProperties = factory.createNodeArray(properties.map(function (prop, i) {
+            const clonedProperties = factory.createNodeArray(properties.map((prop, i) => {
                 if (!ts.isPropertyAssignment(prop) ||
                     !ts.isObjectLiteralExpression(prop.initializer)) {
                     return prop;
@@ -404,19 +400,19 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
                 return factory.createPropertyAssignment(prop.name, setAttributesInObject(ts, factory, prop.initializer, {
                     defaultMessage: opts.removeDefaultMessage
                         ? undefined
-                        : msgs_1[i].defaultMessage,
-                    id: msgs_1[i] ? msgs_1[i].id : '',
+                        : msgs[i].defaultMessage,
+                    id: msgs[i] ? msgs[i].id : '',
                 }, opts.ast));
             }));
-            var clonedDescriptorsObj = factory.createObjectLiteralExpression(clonedProperties);
-            return factory.updateCallExpression(node, node.expression, node.typeArguments, (0, tslib_1.__spreadArray)([clonedDescriptorsObj], restArgs, true));
+            const clonedDescriptorsObj = factory.createObjectLiteralExpression(clonedProperties);
+            return factory.updateCallExpression(node, node.expression, node.typeArguments, [clonedDescriptorsObj, ...restArgs]);
         }
     }
     else if (isSingularMessageDecl(ts, node, opts.additionalComponentNames || []) ||
         isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames || [])) {
-        var _b = node.arguments, descriptorsObj = _b[0], restArgs = _b.slice(1);
+        const [descriptorsObj, ...restArgs] = node.arguments;
         if (ts.isObjectLiteralExpression(descriptorsObj)) {
-            var msg = extractMessageDescriptor(ts, descriptorsObj, opts, sf);
+            const msg = extractMessageDescriptor(ts, descriptorsObj, opts, sf);
             if (!msg) {
                 return node;
             }
@@ -424,22 +420,23 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
             if (typeof onMsgExtracted === 'function') {
                 onMsgExtracted(sf.fileName, [msg]);
             }
-            return factory.updateCallExpression(node, node.expression, node.typeArguments, (0, tslib_1.__spreadArray)([
+            return factory.updateCallExpression(node, node.expression, node.typeArguments, [
                 setAttributesInObject(ts, factory, descriptorsObj, {
                     defaultMessage: opts.removeDefaultMessage
                         ? undefined
                         : msg.defaultMessage,
                     id: msg.id,
-                }, opts.ast)
-            ], restArgs, true));
+                }, opts.ast),
+                ...restArgs,
+            ]);
         }
     }
     return node;
 }
-var PRAGMA_REGEX = /^\/\/ @([^\s]*) (.*)$/m;
+const PRAGMA_REGEX = /^\/\/ @([^\s]*) (.*)$/m;
 function getVisitor(ts, ctx, sf, opts) {
-    var visitor = function (node) {
-        var newNode = ts.isCallExpression(node)
+    const visitor = (node) => {
+        const newNode = ts.isCallExpression(node)
             ? extractMessagesFromCallExpression(ts, ctx.factory, node, opts, sf)
             : ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node)
                 ? extractMessageFromJsxComponent(ts, ctx.factory, node, opts, sf)
@@ -449,20 +446,19 @@ function getVisitor(ts, ctx, sf, opts) {
     return visitor;
 }
 function transformWithTs(ts, opts) {
-    opts = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, DEFAULT_OPTS), opts);
+    opts = { ...DEFAULT_OPTS, ...opts };
     (0, console_utils_1.debug)('Transforming options', opts);
-    var transformFn = function (ctx) {
-        return function (sf) {
-            var pragmaResult = PRAGMA_REGEX.exec(sf.text);
+    const transformFn = ctx => {
+        return (sf) => {
+            const pragmaResult = PRAGMA_REGEX.exec(sf.text);
             if (pragmaResult) {
                 (0, console_utils_1.debug)('Pragma found', pragmaResult);
-                var pragma = pragmaResult[1], kvString = pragmaResult[2];
+                const [, pragma, kvString] = pragmaResult;
                 if (pragma === opts.pragma) {
-                    var kvs = kvString.split(' ');
-                    var result = {};
-                    for (var _i = 0, kvs_1 = kvs; _i < kvs_1.length; _i++) {
-                        var kv = kvs_1[_i];
-                        var _a = kv.split(':'), k = _a[0], v = _a[1];
+                    const kvs = kvString.split(' ');
+                    const result = {};
+                    for (const kv of kvs) {
+                        const [k, v] = kv.split(':');
                         result[k] = v;
                     }
                     (0, console_utils_1.debug)('Pragma extracted', result);

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CACjC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CACjC"}

package/ts-jest-integration.d.ts

@@ -1,5 +1,5 @@
 import { Opts } from '.';
-import type { TsCompilerInstance } from 'ts-jest/dist/types';
+import type { TsCompilerInstance } from 'ts-jest';
 export declare const name = "@formatjs/ts-transformer";
 export declare const version = "2.10.1";
 export declare function factory(compilerInstance: TsCompilerInstance, opts: Opts): import("typescript").TransformerFactory<import("typescript").SourceFile>;

package/ts-jest-integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-jest-integration.d.ts","sourceRoot":"","sources":["../../../../../packages/ts-transformer/ts-jest-integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,IAAI,EAAC,MAAM,GAAG,CAAA;AACvC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAA;AAE1D,eAAO,MAAM,IAAI,6BAA6B,CAAA;AAC9C,eAAO,MAAM,OAAO,WAAW,CAAA;AAE/B,wBAAgB,OAAO,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI,4EAEvE"}
+{"version":3,"file":"ts-jest-integration.d.ts","sourceRoot":"","sources":["ts-jest-integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,IAAI,EAAC,MAAM,GAAG,CAAA;AACvC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,SAAS,CAAA;AAE/C,eAAO,MAAM,IAAI,6BAA6B,CAAA;AAC9C,eAAO,MAAM,OAAO,WAAW,CAAA;AAE/B,wBAAgB,OAAO,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI,4EAEvE"}

package/ts-jest-integration.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.factory = exports.version = exports.name = void 0;
-var _1 = require(".");
+const _1 = require(".");
 exports.name = '@formatjs/ts-transformer';
 exports.version = '2.10.1';
 function factory(compilerInstance, opts) {