@formatjs/ts-transformer 3.5.0 → 3.8.0

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var 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);
+(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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ts-transformer",
-  "version": "3.5.0",
+  "version": "3.8.0",
   "description": "TS Compiler transformer for formatjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,11 @@
     "react-intl"
   ],
   "dependencies": {
-    "@formatjs/icu-messageformat-parser": "2.0.12",
+    "@formatjs/icu-messageformat-parser": "2.0.16",
     "@types/node": "14 || 16",
     "chalk": "^4.0.0",
     "tslib": "^2.1.0",
-    "typescript": "^4.3"
+    "typescript": "^4.5"
   },
   "peerDependencies": {
     "ts-jest": "27"

package/src/console_utils.js

@@ -10,19 +10,19 @@ var LEVEL_COLORS = {
     error: chalk_1.red,
 };
 function label(level, message) {
-    return "[@formatjs/ts-transformer] [" + LEVEL_COLORS[level](level.toUpperCase()) + "] " + message;
+    return "[@formatjs/ts-transformer] [".concat(LEVEL_COLORS[level](level.toUpperCase()), "] ").concat(message);
 }
 function debug(message) {
     var args = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         args[_i - 1] = arguments[_i];
     }
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        return tslib_1.__generator(this, function (_a) {
+    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, tslib_1.__spreadArray([label('debug', message)], args)));
+            console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('debug', message)], args, false)));
             console.error('\n');
             return [2 /*return*/];
         });
@@ -34,7 +34,7 @@ function warn(message) {
     for (var _i = 1; _i < arguments.length; _i++) {
         args[_i - 1] = arguments[_i];
     }
-    console.error(util_1.format.apply(void 0, tslib_1.__spreadArray([label('warn', message)], args)));
+    console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('warn', message)], args, false)));
     console.error('\n');
 }
 exports.warn = warn;
@@ -43,7 +43,7 @@ function error(message) {
     for (var _i = 1; _i < arguments.length; _i++) {
         args[_i - 1] = arguments[_i];
     }
-    console.error(util_1.format.apply(void 0, tslib_1.__spreadArray([label('error', message)], args)));
+    console.error(util_1.format.apply(void 0, (0, tslib_1.__spreadArray)([label('error', message)], args, false)));
     console.error('\n');
 }
 exports.error = error;

package/src/interpolate-name.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interpolateName = void 0;
 var tslib_1 = require("tslib");
-var path = tslib_1.__importStar(require("path"));
+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 = crypto_1.createHash(hashType);
+    var hasher = (0, crypto_1.createHash)(hashType);
     hasher.update(content);
     return hasher.digest(digestType).slice(0, length);
 }

package/src/transform.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform = exports.transformWithTs = void 0;
 var tslib_1 = require("tslib");
-var typescript = tslib_1.__importStar(require("typescript"));
+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");
@@ -24,7 +24,7 @@ function primitiveToTSNode(factory, v) {
 }
 function isValidIdentifier(k) {
     try {
-        new Function("return {" + k + ":1}");
+        new Function("return {".concat(k, ":1}"));
         return true;
     }
     catch (e) {
@@ -63,12 +63,12 @@ function isMultipleMessageDecl(ts, node) {
         node.expression.text === 'defineMessages');
 }
 function isSingularMessageDecl(ts, node, additionalComponentNames) {
-    var compNames = new Set(tslib_1.__spreadArray([
+    var compNames = new Set((0, tslib_1.__spreadArray)([
         'FormattedMessage',
         'defineMessage',
         'formatMessage',
         '$formatMessage'
-    ], additionalComponentNames));
+    ], additionalComponentNames, true));
     var fnName = '';
     if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
         fnName = node.expression.text;
@@ -224,9 +224,9 @@ function extractMessageDescriptor(ts, node, _a, sf) {
         switch (typeof overrideIdFn) {
             case 'string':
                 if (!msg.id) {
-                    msg.id = interpolate_name_1.interpolateName({ resourcePath: sf.fileName }, overrideIdFn, {
+                    msg.id = (0, interpolate_name_1.interpolateName)({ resourcePath: sf.fileName }, overrideIdFn, {
                         content: msg.description
-                            ? msg.defaultMessage + "#" + msg.description
+                            ? "".concat(msg.defaultMessage, "#").concat(msg.description)
                             : msg.defaultMessage,
                     });
                 }
@@ -237,7 +237,7 @@ function extractMessageDescriptor(ts, node, _a, sf) {
         }
     }
     if (extractSourceLocation) {
-        return tslib_1.__assign(tslib_1.__assign({}, msg), { file: sf.fileName, start: node.pos, end: node.end });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, msg), { file: sf.fileName, start: node.pos, end: node.end });
     }
     return msg;
 }
@@ -247,10 +247,10 @@ function extractMessageDescriptor(ts, node, _a, sf) {
  * @param sf
  */
 function isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames) {
-    var fnNames = new Set(tslib_1.__spreadArray([
+    var fnNames = new Set((0, tslib_1.__spreadArray)([
         'formatMessage',
         '$formatMessage'
-    ], additionalFunctionNames));
+    ], additionalFunctionNames, true));
     var method = node.expression;
     // Handle foo.formatMessage()
     if (ts.isPropertyAccessExpression(method)) {
@@ -283,15 +283,15 @@ 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 = tslib_1.__spreadArray([
+    var newProps = (0, tslib_1.__spreadArray)([
         factory.createPropertyAssignment('id', factory.createStringLiteral(msg.id))
     ], (msg.defaultMessage
         ? [
             factory.createPropertyAssignment('defaultMessage', ast
-                ? messageASTToTSNode(factory, icu_messageformat_parser_1.parse(msg.defaultMessage))
+                ? 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];
         if (ts.isPropertyAssignment(prop) &&
@@ -306,15 +306,15 @@ function setAttributesInObject(ts, factory, node, msg, ast) {
     return factory.createObjectLiteralExpression(factory.createNodeArray(newProps));
 }
 function generateNewProperties(ts, factory, node, msg, ast) {
-    var newProps = tslib_1.__spreadArray([
+    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, icu_messageformat_parser_1.parse(msg.defaultMessage)))
+                ? 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];
         if (ts.isJsxAttribute(prop) &&
@@ -354,7 +354,7 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
             if (!msgs_1.length) {
                 return node;
             }
-            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_1);
             if (typeof onMsgExtracted === 'function') {
                 onMsgExtracted(sf.fileName, msgs_1);
             }
@@ -371,7 +371,7 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
                 }, opts.ast));
             }));
             var clonedDescriptorsObj = factory.createObjectLiteralExpression(clonedProperties);
-            return factory.updateCallExpression(node, node.expression, node.typeArguments, tslib_1.__spreadArray([clonedDescriptorsObj], restArgs));
+            return factory.updateCallExpression(node, node.expression, node.typeArguments, (0, tslib_1.__spreadArray)([clonedDescriptorsObj], restArgs, true));
         }
     }
     else if (isSingularMessageDecl(ts, node, opts.additionalComponentNames || []) ||
@@ -382,18 +382,18 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
             if (!msg) {
                 return node;
             }
-            console_utils_1.debug('Message extracted from "%s": %s', sf.fileName, msg);
+            (0, console_utils_1.debug)('Message extracted from "%s": %s', sf.fileName, msg);
             if (typeof onMsgExtracted === 'function') {
                 onMsgExtracted(sf.fileName, [msg]);
             }
-            return factory.updateCallExpression(node, node.expression, node.typeArguments, tslib_1.__spreadArray([
+            return factory.updateCallExpression(node, node.expression, node.typeArguments, (0, tslib_1.__spreadArray)([
                 setAttributesInObject(ts, factory, descriptorsObj, {
                     defaultMessage: opts.removeDefaultMessage
                         ? undefined
                         : msg.defaultMessage,
                     id: msg.id,
                 }, opts.ast)
-            ], restArgs));
+            ], restArgs, true));
         }
     }
     return node;
@@ -411,13 +411,13 @@ function getVisitor(ts, ctx, sf, opts) {
     return visitor;
 }
 function transformWithTs(ts, opts) {
-    opts = tslib_1.__assign(tslib_1.__assign({}, DEFAULT_OPTS), opts);
-    console_utils_1.debug('Transforming options', opts);
+    opts = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, 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);
             if (pragmaResult) {
-                console_utils_1.debug('Pragma found', pragmaResult);
+                (0, console_utils_1.debug)('Pragma found', pragmaResult);
                 var pragma = pragmaResult[1], kvString = pragmaResult[2];
                 if (pragma === opts.pragma) {
                     var kvs = kvString.split(' ');
@@ -427,7 +427,7 @@ function transformWithTs(ts, opts) {
                         var _a = kv.split(':'), k = _a[0], v = _a[1];
                         result[k] = v;
                     }
-                    console_utils_1.debug('Pragma extracted', result);
+                    (0, console_utils_1.debug)('Pragma extracted', result);
                     if (typeof opts.onMetaExtracted === 'function') {
                         opts.onMetaExtracted(sf.fileName, result);
                     }

package/ts-jest-integration.js

@@ -5,6 +5,6 @@ var _1 = require(".");
 exports.name = '@formatjs/ts-transformer';
 exports.version = '2.10.1';
 function factory(compilerInstance, opts) {
-    return _1.transformWithTs(compilerInstance.configSet.compilerModule, opts);
+    return (0, _1.transformWithTs)(compilerInstance.configSet.compilerModule, opts);
 }
 exports.factory = factory;