map input source map

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 9.5.0
+* [Feature: map the input source map in case ts-loader is used in a loader pipeline](https://github.com/TypeStrong/ts-loader/pull/1626) - thanks @Ka0o0 and @bojanv55
+
 ## 9.4.4
 * [Bug fix: let users override skipLibCheck](https://github.com/TypeStrong/ts-loader/pull/1617) - thanks @haakonflatval-cognite
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "9.4.4",
+  "version": "9.5.0",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "types": "dist",
@@ -57,7 +57,8 @@
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.0.0",
     "micromatch": "^4.0.0",
-    "semver": "^7.3.4"
+    "semver": "^7.3.4",
+    "source-map": "^0.7.4"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.0",

src/index.ts

@@ -25,13 +25,19 @@ import {
   formatErrors,
   isReferencedFile,
 } from './utils';
+import type { RawSourceMap } from 'source-map';
+import { SourceMapConsumer, SourceMapGenerator } from 'source-map';
 
 const loaderOptionsCache: LoaderOptionsCache = {};
 
 /**
  * The entry point for ts-loader
  */
-function loader(this: webpack.LoaderContext<LoaderOptions>, contents: string) {
+function loader(
+  this: webpack.LoaderContext<LoaderOptions>,
+  contents: string,
+  inputSourceMap?: Record<string, any>
+) {
   this.cacheable && this.cacheable();
   const callback = this.async();
   const options = getLoaderOptions(this);
@@ -43,14 +49,15 @@ function loader(this: webpack.LoaderContext<LoaderOptions>, contents: string) {
   }
   const instance = instanceOrError.instance!;
   buildSolutionReferences(instance, this);
-  successLoader(this, contents, callback, instance);
+  successLoader(this, contents, callback, instance, inputSourceMap);
 }
 
 function successLoader(
   loaderContext: webpack.LoaderContext<LoaderOptions>,
   contents: string,
   callback: ReturnType<webpack.LoaderContext<LoaderOptions>['async']>,
-  instance: TSInstance
+  instance: TSInstance,
+  inputSourceMap?: Record<string, any>
 ) {
   initializeInstance(loaderContext, instance);
   reportTranspileErrors(instance, loaderContext);
@@ -78,6 +85,8 @@ function successLoader(
     ? getTranspilationEmit(filePath, contents, instance, loaderContext)
     : getEmit(rawFilePath, filePath, instance, loaderContext);
 
+  // the following function is async, which means it will immediately return and run in the "background"
+  // Webpack will be notified when it's finished when the function calls the `callback` method
   makeSourceMapAndFinish(
     sourceMapText,
     outputText,
@@ -86,7 +95,8 @@ function successLoader(
     loaderContext,
     fileVersion,
     callback,
-    instance
+    instance,
+    inputSourceMap
   );
 }
 
@@ -98,7 +108,8 @@ function makeSourceMapAndFinish(
   loaderContext: webpack.LoaderContext<LoaderOptions>,
   fileVersion: number,
   callback: ReturnType<webpack.LoaderContext<LoaderOptions>['async']>,
-  instance: TSInstance
+  instance: TSInstance,
+  inputSourceMap?: Record<string, any>
 ) {
   if (outputText === null || outputText === undefined) {
     setModuleMeta(loaderContext, instance, fileVersion);
@@ -130,7 +141,27 @@ function makeSourceMapAndFinish(
   );
 
   setModuleMeta(loaderContext, instance, fileVersion);
-  callback(null, output, sourceMap);
+
+  // there are two cases where we don't need to perform input source map mapping:
+  //   - either the ts-compiler did not generate a source map (tsconfig had `sourceMap` set to false)
+  //   - or we did not get an input source map
+  //
+  // in the first case, we simply return undefined.
+  // in the second case we only need to return the newly generated source map
+  // this avoids that we have to make a possibly expensive call to the source-map lib
+  if (sourceMap === undefined || inputSourceMap === undefined) {
+    callback(null, output, sourceMap);
+    return;
+  }
+
+  // otherwise we have to make a mapping to the input source map which is asynchronous
+  mapToInputSourceMap(sourceMap, loaderContext, inputSourceMap as RawSourceMap)
+    .then(mappedSourceMap => {
+      callback(null, output, mappedSourceMap);
+    })
+    .catch((e: Error) => {
+      callback(e);
+    });
 }
 
 function setModuleMeta(
@@ -661,6 +692,54 @@ function makeSourceMap(
   };
 }
 
+/**
+ * This method maps the newly generated @param{sourceMap} to the input source map.
+ * This is required when ts-loader is not the first loader in the Webpack loader chain.
+ */
+function mapToInputSourceMap(
+  sourceMap: RawSourceMap,
+  loaderContext: webpack.LoaderContext<LoaderOptions>,
+  inputSourceMap: RawSourceMap
+): Promise<RawSourceMap> {
+  return new Promise<RawSourceMap>((resolve, reject) => {
+    const inMap: RawSourceMap = {
+      file: loaderContext.remainingRequest,
+      mappings: inputSourceMap.mappings,
+      names: inputSourceMap.names,
+      sources: inputSourceMap.sources,
+      sourceRoot: inputSourceMap.sourceRoot,
+      sourcesContent: inputSourceMap.sourcesContent,
+      version: inputSourceMap.version,
+    };
+    Promise.all([
+      new SourceMapConsumer(inMap),
+      new SourceMapConsumer(sourceMap),
+    ])
+      .then(sourceMapConsumers => {
+        try {
+          const generator = SourceMapGenerator.fromSourceMap(
+            sourceMapConsumers[1]
+          );
+          generator.applySourceMap(sourceMapConsumers[0]);
+          const mappedSourceMap = generator.toJSON();
+
+          // before resolving, we free memory by calling destroy on the source map consumers
+          sourceMapConsumers.forEach(sourceMapConsumer =>
+            sourceMapConsumer.destroy()
+          );
+          resolve(mappedSourceMap);
+        } catch (e) {
+          //before rejecting, we free memory by calling destroy on the source map consumers
+          sourceMapConsumers.forEach(sourceMapConsumer =>
+            sourceMapConsumer.destroy()
+          );
+          reject(e);
+        }
+      })
+      .catch(reject);
+  });
+}
+
 export = loader;
 
 /**

test/comparison-tests/create-and-execute-test.js

@@ -1,6 +1,7 @@
 const assert = require("assert");
 const os = require('os');
 const fs = require('fs-extra');
+const execSync = require('child_process').execSync;
 const path = require('path');
 const mkdirp = require('mkdirp');
 const rimraf = require('rimraf');
@@ -110,6 +111,9 @@ function createTest(test, testPath, options) {
             const program = getProgram(path.resolve(paths.testStagingPath, "lib/tsconfig.json"), { newLine: typescript.NewLineKind.LineFeed });
             program.emit();
         }
+        if(test === "sourceMapsShouldConsiderInputSourceMap") {
+            execSync("npm ci", { cwd: paths.testStagingPath, stdio: 'inherit' });
+        }
 
         // ensure output directories
         mkdirp.sync(paths.actualOutput);

test/comparison-tests/sourceMapsShouldConsiderInputSourceMap/App.vue

@@ -0,0 +1,16 @@
+<template>
+  <h1>Hello World!</h1>
+</template>
+
+<script lang="ts">
+/* eslint-disable import/no-extraneous-dependencies */
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  components: {
+  },
+  async created() {
+    console.log("Hello World!");
+  },
+});
+</script>

test/comparison-tests/sourceMapsShouldConsiderInputSourceMap/README.md

@@ -0,0 +1,11 @@
+# sourceMapsShouldConsiderInputSourceMap
+
+This test represents a typical Vue project which is configured to compile using the [vue-loader](https://github.com/vuejs/vue-loader) webpack loader.
+In this test we expect that `ts-loader` is considering the input source map which is generated by the `vue-loader`.
+
+## Background Information
+
+A Vue single file component (SFC) contains different parts of the component: the HTML template, the component's script (can be TypeScript) and sometimes CSS.
+The `vue-loader` is extracting the different parts of those SFCs and "sends" the different parts back to webpack together with a appropriate source map.
+Webpack then forwards those parts to the each different loaders that are next in the loader chain, which in the case for the script part is the `ts-loader`.
+`ts-loader` receives the isolated TypeScript code together with a source map and then further compiles the TypeScript code with the `tsc` and maps the newly generated source map to the input source map from `vue-loader`.

test/comparison-tests/sourceMapsShouldConsiderInputSourceMap/bootloader.ts

@@ -0,0 +1,6 @@
+import { createApp } from "vue";
+import App from "./App.vue";
+
+const app = createApp(App);
+
+app.mount("#app");