apply AppMonet#5

Author: codedhead

src/fix-output.ts

@@ -1,25 +1,27 @@
 /**
  * Fix some common issues with the tsickle output
- * @param code {string} the transformed typescript code
+ * @param {string} code the transformed typescript code
  * @return {string} transformed code
  */
 export const fixCode = (code: string): string => {
   return code
-    .replace(/^\s*var\s*tsickle.+=.*goog\.requireType.*$/g, "")
+    .replace(
+      /(?:const|var)\s*.*tsickle_.*\s*=\s*goog\.requireType.*/g,
+      ""
+    )
     .replace(
       /(?:const|var)\s*.*tsickle_forward_declare_.*\s*=\s*goog\.forwardDeclare.*/g,
       ""
     )
-    .replace(/!\.(\w)/gm, "!$1")
-    .replace(/goog\.require.*/gm, "")
-    .replace(/tsickle_forward_declare_\d\./gm, "")
-    .replace(/var\s* tsickle_.+=\s+/g, "");
+    .replace(/goog\.require.*/g, "")
+    .replace(/tsickle_forward_declare_\d\./g, "")
+    .replace(/\/\/# sourceMappingURL=.*\.js\.map/g, "");
 };
 
 /**
  * Fix some issues with the tsickle extern file definition specific
  * to typescript-in-webpack
- * @param extern {string} the extern definition file content
+ * @param {string} extern the extern definition file content
  * @return {string} transformed code
  */
 export const fixExtern = (extern: string | null): string => {

src/index.ts

@@ -6,8 +6,8 @@ import ts from "typescript";
 import { EOL } from "os";
 import webpack from "webpack";
 import { fixCode, fixExtern } from "./fix-output";
-import { jsToTS, tsToJS } from "./path-utils";
 import { JSONSchema7 } from "json-schema";
+import { RawSourceMap } from "source-map";
 
 const LOADER_NAME = "tsickle-loader";
 const DEFAULT_EXTERN_DIR = "dist/externs";
@@ -64,7 +64,7 @@ const setup = (loaderCTX: LoaderCTX): RealOptions => {
   const compilerConfig = ts.parseJsonConfigFileContent(
     compilerConfigFile.config,
     ts.sys,
-    ".",
+    path.dirname(tsconfig || ''),
     {},
     tsconfig
   );
@@ -142,38 +142,49 @@ const tsickleLoader = function (
     rootDirsRelative: (f: string) => f,
   };
 
-  const jsFiles = new Map<string, string>();
+  let transpiledSources: string[] = [];
+  let transpiledSourceMaps: string[] = [];
 
-  const output = tsickle.emitWithTsickle(
+  const output = tsickle.emit(
     program,
     tsickleHost,
-    compilerHost,
-    options,
-    undefined,
-    (path: string, contents: string) => jsFiles.set(path, contents)
+    (jsFileName: string, contents: string, _writeByteOrderMark: boolean, _onError, tsSourceFiles) => {
+      for (const source of tsSourceFiles ?? []) {
+        if (source.fileName === sourceFileName) {
+          if (jsFileName.endsWith('.map')) {
+            transpiledSourceMaps.push(contents);
+          } else {
+            transpiledSources.push(contents);
+          }
+        }
+      }
+    },
+    program.getSourceFile(sourceFileName)
   );
 
-  const sourceFileAsJs = tsToJS(sourceFileName);
-  for (const [path, source] of jsFiles) {
-    if (sourceFileAsJs.indexOf(path) === -1) {
-      continue;
-    }
-
-    const tsPathName = jsToTS(path);
-    const extern = output.externs[tsPathName];
-    if (extern != null) {
-      // console.info(`appending extern for ${path} to (${externFile}) ::\n${extern}\n`);
-      fs.appendFileSync(externFile, fixExtern(extern));
-    }
+  if (transpiledSources.length !== 1) {
+    this.emitError(
+      Error(`missing compiled result for source file: ${sourceFileName}`)
+    );
+    return;
+  }
+  if (this.sourceMap && transpiledSourceMaps.length !== 1) {
+    this.emitError(
+      Error(`tsconfig must specify sourceMap: "true" when sourcemaps are enabled!`)
+    );
+    return;
+  }
 
-    const fixed = fixCode(source);
-    // console.info("FIXED CODE:: \n", fixed);
-    return fixed;
+  const extern = output.externs[sourceFileName];
+  if (extern != null) {
+    fs.appendFileSync(externFile, fixExtern(extern));
   }
 
-  this.emitError(
-    Error(`missing compiled result for source file: ${sourceFileName}`)
-  );
+  let sourceMap: RawSourceMap | undefined = undefined;
+  if (this.sourceMap) {
+    sourceMap = JSON.parse(transpiledSourceMaps[0]);
+  }
+  this.callback(null, fixCode(transpiledSources[0]), sourceMap);
 };
 
 export default tsickleLoader;

src/path-utils.ts

@@ -1,11 +1,10 @@
 {
-  "include": [
-    "./examples/**/*.ts"
-  ],
+  "include": ["./examples/**/*.ts"],
   "compilerOptions": {
     "module": "es2015",
     "moduleResolution": "node",
     "target": "es5",
-    "rootDir": "."
+    "rootDir": ".",
+    "sourceMap": true
   }
-}
+}