Address comments from PR #39

Author: aomarks

src/outputters/runtime.ts

@@ -14,7 +14,7 @@ import {applyPatches, Patches} from '../patches';
 import {Locale} from '../locales';
 import {Config} from '../config';
 import {KnownError} from '../error';
-import {escapeStringLiteral} from '../typescript';
+import {escapeStringToEmbedInTemplateLiteral} from '../typescript';
 import * as fs from 'fs';
 import * as pathLib from 'path';
 
@@ -444,7 +444,7 @@ function makeMessageString(
   const fragments = [];
   for (const content of contents) {
     if (typeof content === 'string') {
-      fragments.push(escapeStringLiteral(content));
+      fragments.push(escapeStringToEmbedInTemplateLiteral(content));
     } else {
       fragments.push(content.untranslatable);
     }

src/outputters/transform.ts

@@ -13,9 +13,9 @@ import {Message} from '../messages';
 import {Locale} from '../locales';
 import {Config} from '../config';
 import * as ts from 'typescript';
-import {isLitExpression, isMsgCall, isStaticString} from '../program-analysis';
+import {isLitTemplate, isMsgCall, isStaticString} from '../program-analysis';
 import {KnownError} from '../error';
-import {escapeStringLiteral} from '../typescript';
+import {escapeStringToEmbedInTemplateLiteral} from '../typescript';
 import * as pathLib from 'path';
 
 /**
@@ -92,7 +92,7 @@ class Transformer {
     if (isMsgCall(node)) {
       return this.replaceMsgCall(node);
     }
-    if (isLitExpression(node)) {
+    if (isLitTemplate(node)) {
       // If an html-tagged template literal embeds a msg call, we want to
       // collapse the result of that msg call into the parent template.
       return tagLit(
@@ -128,7 +128,7 @@ class Transformer {
       !(
         ts.isStringLiteral(arg1) ||
         ts.isTemplateLiteral(arg1) ||
-        isLitExpression(arg1) ||
+        isLitTemplate(arg1) ||
         ts.isArrowFunction(arg1)
       )
     ) {
@@ -149,19 +149,19 @@ class Transformer {
       if (
         !ts.isStringLiteral(arg1.body) &&
         !ts.isTemplateLiteral(arg1.body) &&
-        !isLitExpression(arg1.body)
+        !isLitTemplate(arg1.body)
       ) {
         throw new KnownError(
           'Expected function body to be a template or string'
         );
       }
-      if (isLitExpression(arg1.body)) {
+      if (isLitTemplate(arg1.body)) {
         isLitTagged = true;
         template = arg1.body.template;
       } else {
         template = arg1.body;
       }
-    } else if (isLitExpression(arg1)) {
+    } else if (isLitTemplate(arg1)) {
       isLitTagged = true;
       template = arg1.template;
     } else {
@@ -176,7 +176,7 @@ class Transformer {
         const templateLiteralBody = translation.contents
           .map((content) =>
             typeof content === 'string'
-              ? escapeStringLiteral(content)
+              ? escapeStringToEmbedInTemplateLiteral(content)
               : content.untranslatable
           )
           .join('');
@@ -299,7 +299,7 @@ class Transformer {
         fragments.push(expression.text);
       } else if (ts.isTemplateLiteral(expression)) {
         fragments.push(...this.recursivelyFlattenTemplate(expression, false));
-      } else if (isLit && isLitExpression(expression)) {
+      } else if (isLit && isLitTemplate(expression)) {
         fragments.push(
           ...this.recursivelyFlattenTemplate(expression.template, true)
         );

src/program-analysis.ts

@@ -107,7 +107,7 @@ function extractMsg(
     };
   }
 
-  if (isLitExpression(contentsArg)) {
+  if (isLitTemplate(contentsArg)) {
     if (ts.isNoSubstitutionTemplateLiteral(contentsArg.template)) {
       // E.g. msg('foo', html`bar <b>baz</b>`)
       return {
@@ -186,7 +186,7 @@ function functionTemplate(
   if (
     !ts.isTemplateExpression(body) &&
     !ts.isNoSubstitutionTemplateLiteral(body) &&
-    !isLitExpression(body)
+    !isLitTemplate(body)
   ) {
     return createDiagnostic(
       file,
@@ -195,7 +195,7 @@ function functionTemplate(
         `or a lit-html template, without braces`
     );
   }
-  const template = isLitExpression(body) ? body.template : body;
+  const template = isLitTemplate(body) ? body.template : body;
   const parts: Array<string | {identifier: string}> = [];
   if (ts.isTemplateExpression(template)) {
     const spans = template.templateSpans;
@@ -220,8 +220,8 @@ function functionTemplate(
     // A NoSubstitutionTemplateLiteral. No spans.
     parts.push(template.text);
   }
-  const isLitTemplate = isLitExpression(body);
-  const contents = isLitTemplate
+  const isLit = isLitTemplate(body);
+  const contents = isLit
     ? replaceExpressionsAndHtmlWithPlaceholders(parts)
     : parts.map((part) =>
         typeof part === 'string'
@@ -235,7 +235,7 @@ function functionTemplate(
     file,
     descStack: descStack.map((desc) => desc.text),
     params,
-    isLitTemplate,
+    isLitTemplate: isLit,
   };
 }
 
@@ -480,7 +480,7 @@ export function isStaticString(
 /**
  * E.g. html`foo` or html`foo${bar}`
  */
-export function isLitExpression(
+export function isLitTemplate(
   node: ts.Node
 ): node is ts.TaggedTemplateExpression {
   return (

src/typescript.ts

@@ -81,7 +81,9 @@ export function printDiagnostics(diagnostics: ts.Diagnostic[]): void {
  * Escape a string such that it can be safely embedded in a JavaScript template
  * literal (backtick string).
  */
-export function escapeStringLiteral(unescaped: string): string {
+export function escapeStringToEmbedInTemplateLiteral(
+  unescaped: string
+): string {
   return unescaped
     .replace(/\\/g, `\\\\`)
     .replace(/`/g, '\\`')