@formatjs/ts-transformer - npm Package Compare versions

Comparing version 1.0.10 to 1.0.11

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+## [1.0.11](https://github.com/formatjs/formatjs/compare/@formatjs/ts-transformer@1.0.10...@formatjs/ts-transformer@1.0.11) (2019-11-26)
+
+
+### Bug Fixes
+
+* **@formatjs/ts-transformer:** use .text instead of .getText ([961a680](https://github.com/formatjs/formatjs/commit/961a680e687506db1fb81b682ef773fd6c538258))
+
+
+
+
+
 ## [1.0.10](https://github.com/formatjs/formatjs/compare/@formatjs/ts-transformer@1.0.9...@formatjs/ts-transformer@1.0.10) (2019-11-26)
@@ -8,0 +19,0 @@

dist/transform.js

@@ -8,11 +8,2 @@ "use strict";
 };
-/**
- * Trim the trailing & beginning ': 'asd' -> asd
- *
- * @param {string} txt text
- * @returns trimmed string
- */
-function trimSingleQuote(txt) {
-    return txt.replace(/^['"](.*?)["']$/g, '$1');
-}
 function getImportSpecifier(program, node) {
@@ -29,3 +20,3 @@ const symbol = program.getTypeChecker().getSymbolAtLocation(node);
 }
-function referenceImport(sf, moduleSourceName, importSpecifier) {
+function referenceImport(moduleSourceName, importSpecifier) {
     return (!!importSpecifier &&
@@ -35,5 +26,6 @@ ts.isNamedImports(importSpecifier.parent) &&
         ts.isImportDeclaration(importSpecifier.parent.parent.parent) &&
-        trimSingleQuote(importSpecifier.parent.parent.parent.moduleSpecifier.getText(sf)) === moduleSourceName);
+        importSpecifier.parent.parent.parent.moduleSpecifier
+            .text === moduleSourceName);
 }
-function isMultipleMessageDecl(node, program, sf, moduleSourceName) {
+function isMultipleMessageDecl(node, program, moduleSourceName) {
     const importSpecifier = getImportSpecifier(program, node.expression);
@@ -43,6 +35,6 @@ if (!importSpecifier) {
     }
-    return (referenceImport(sf, moduleSourceName, importSpecifier) &&
-        importSpecifier.name.getText(sf) === 'defineMessages');
+    return (referenceImport(moduleSourceName, importSpecifier) &&
+        importSpecifier.name.text === 'defineMessages');
 }
-function isSingularMessageDecl(node, program, sf, moduleSourceName, additionalComponentNames) {
+function isSingularMessageDecl(node, program, moduleSourceName, additionalComponentNames) {
     const importSpecifier = getImportSpecifier(program, ts.isCallExpression(node) ? node.expression : node.tagName);
@@ -58,4 +50,4 @@ if (!importSpecifier) {
     ]);
-    return (referenceImport(sf, moduleSourceName, importSpecifier) &&
-        compNames.has(importSpecifier.name.getText(sf)));
+    return (referenceImport(moduleSourceName, importSpecifier) &&
+        compNames.has(importSpecifier.name.text));
 }
@@ -84,9 +76,9 @@ function extractMessageDescriptor(node, sf, { overrideIdFn, extractSourceLocation }) {
             case 'id':
-                msg.id = trimSingleQuote(initializer.getText(sf));
+                msg.id = initializer.text;
                 break;
             case 'defaultMessage':
-                msg.defaultMessage = trimSingleQuote(initializer.getText(sf));
+                msg.defaultMessage = initializer.text;
                 break;
             case 'description':
-                msg.description = trimSingleQuote(initializer.getText(sf));
+                msg.description = initializer.text;
                 break;
@@ -127,3 +119,3 @@ }
     const { moduleSourceName = 'react-intl', onMsgExtracted } = opts;
-    if (!isSingularMessageDecl(node, program, sf, moduleSourceName, opts.additionalComponentNames || [])) {
+    if (!isSingularMessageDecl(node, program, moduleSourceName, opts.additionalComponentNames || [])) {
         return;
@@ -162,3 +154,3 @@ }
     const { moduleSourceName = 'react-intl', onMsgExtracted } = opts;
-    if (isMultipleMessageDecl(node, program, sf, moduleSourceName)) {
+    if (isMultipleMessageDecl(node, program, moduleSourceName)) {
         const [descriptorsObj, ...restArgs] = node.arguments;
@@ -199,3 +191,3 @@ if (ts.isObjectLiteralExpression(descriptorsObj)) {
     }
-    else if (isSingularMessageDecl(node, program, sf, moduleSourceName, opts.additionalComponentNames || []) ||
+    else if (isSingularMessageDecl(node, program, moduleSourceName, opts.additionalComponentNames || []) ||
         (opts.extractFromFormatMessageCall && isIntlFormatMessageCall(node, sf))) {
@@ -202,0 +194,0 @@ const [descriptorsObj, ...restArgs] = node.arguments;

package.json

 {
   "name": "@formatjs/ts-transformer",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "TS Compiler transformer for formatjs",
@@ -33,3 +33,3 @@ "main": "dist/index.js",
   "homepage": "https://github.com/formatjs/formatjs#readme",
-  "gitHead": "6d6aa5ccec18f2f04be72a6e510193c0a1210725"
+  "gitHead": "1d25bb5035be83f1b92d98013f0bd1542448eb16"
 }

src/transform.ts

@@ -72,12 +72,2 @@ import * as ts from 'typescript';
 
-/**
- * Trim the trailing & beginning ': 'asd' -> asd
- *
- * @param {string} txt text
- * @returns trimmed string
- */
-function trimSingleQuote(txt: string): string {
-  return txt.replace(/^['"](.*?)["']$/g, '$1');
-}
-
 function getImportSpecifier(program: ts.Program, node: ts.Node) {
@@ -96,3 +86,2 @@ const symbol = program.getTypeChecker().getSymbolAtLocation(node);
 function referenceImport(
-  sf: ts.SourceFile,
   moduleSourceName: string,
@@ -106,5 +95,4 @@ importSpecifier?: ts.ImportSpecifier
     ts.isImportDeclaration(importSpecifier.parent.parent.parent) &&
-    trimSingleQuote(
-      importSpecifier.parent.parent.parent.moduleSpecifier.getText(sf)
-    ) === moduleSourceName
+    (importSpecifier.parent.parent.parent.moduleSpecifier as ts.StringLiteral)
+      .text === moduleSourceName
   );
@@ -116,3 +104,2 @@ }
   program: ts.Program,
-  sf: ts.SourceFile,
   moduleSourceName: string
@@ -125,4 +112,4 @@ ) {
   return (
-    referenceImport(sf, moduleSourceName, importSpecifier) &&
-    importSpecifier.name.getText(sf) === 'defineMessages'
+    referenceImport(moduleSourceName, importSpecifier) &&
+    importSpecifier.name.text === 'defineMessages'
   );
@@ -134,3 +121,2 @@ }
   program: ts.Program,
-  sf: ts.SourceFile,
   moduleSourceName: string,
@@ -153,4 +139,4 @@ additionalComponentNames: string[]
   return (
-    referenceImport(sf, moduleSourceName, importSpecifier) &&
-    compNames.has(importSpecifier.name.getText(sf))
+    referenceImport(moduleSourceName, importSpecifier) &&
+    compNames.has(importSpecifier.name.text)
   );
@@ -188,9 +174,9 @@ }
       case 'id':
-        msg.id = trimSingleQuote(initializer.getText(sf));
+        msg.id = initializer.text;
         break;
       case 'defaultMessage':
-        msg.defaultMessage = trimSingleQuote(initializer.getText(sf));
+        msg.defaultMessage = initializer.text;
         break;
       case 'description':
-        msg.description = trimSingleQuote(initializer.getText(sf));
+        msg.description = initializer.text;
         break;
@@ -254,3 +240,2 @@ }
       program,
-      sf,
       moduleSourceName,
@@ -306,3 +291,3 @@ opts.additionalComponentNames || []
   const {moduleSourceName = 'react-intl', onMsgExtracted} = opts;
-  if (isMultipleMessageDecl(node, program, sf, moduleSourceName)) {
+  if (isMultipleMessageDecl(node, program, moduleSourceName)) {
     const [descriptorsObj, ...restArgs] = node.arguments;
@@ -357,3 +342,2 @@ if (ts.isObjectLiteralExpression(descriptorsObj)) {
       program,
-      sf,
       moduleSourceName,
@@ -360,0 +344,0 @@ opts.additionalComponentNames || []

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

67272

decreased by-0.55%

Lines of code

1231

decreased by-1.2%

No dependency changes