Merge pull request #223 from PepsRyuu/LoadHookSourceMap

Load Hook return AST

Author: PepsRyuu

docs/sdk.md

@@ -43,7 +43,7 @@ container.hooks.buildStart(options);
 container.hooks.resolveDynamicImport(id, parentId);
 container.hooks.resolveId(id, parentId, options);
 container.hooks.load(filepath, parentFilepath);
-container.hooks.transform(code, id);
+container.hooks.transform(code, id, map);
 container.hooks.watchChange(id);
 container.hooks.buildEnd(error);
 container.hooks.renderStart(outputOptions, inputOptions);

lib/impl/NollupCodeGenerator.js

@@ -363,7 +363,7 @@ class NollupCodeGenerator {
         if (map) {
             map.sourceRoot = 'nollup:///';
             map.sources[map.sources.length - 1] = sourcePath;
-            code += `${ConvertSourceMap.fromObject(map).toComment()}\\n`;
+            code += `\\n${ConvertSourceMap.fromObject(map).toComment()}\\n`;
         } 
 
         code += `\\n//# sourceURL=nollup-int:///${sourcePath}`;

lib/impl/NollupCompiler.js

@@ -147,7 +147,7 @@ async function compileModule (context, filePath, parentFilePath, depth, emitted,
         context.currentModuleEmittedChunksCache = emittedChunksCache;
 
         let loaded = await context.plugins.hooks.load(filePath, parentFilePath);
-        let transformed = await context.plugins.hooks.transform( loaded.code, filePath);
+        let transformed = await context.plugins.hooks.transform( loaded.code, filePath, loaded.map);
         let resolved = await ImportExportResolver(context.plugins, transformed.code, filePath, generator, context.liveBindings);
 
         file.transformed = resolved.code;

lib/impl/PluginLifecycle.js

@@ -316,8 +316,16 @@ const PluginLifecycle = {
                 }
             },
 
-            async transform (code, id) {
-                let map, originalCode = code, mapChain = [];
+            async transform (code, id, map) {
+                let originalCode = code, mapChain = [];
+
+                if (map) {
+                    // The load step can contain a map, as well as transform code from original code.
+                    // TypeScript plugin uses the load step to transform from TS to ES.
+                    map = typeof map === 'string'? JSON.parse(map) : map;
+                    originalCode = map.sourcesContent? map.sourcesContent[0] : code;
+                    mapChain.push({ code: originalCode, map });
+                }
 
                 container.__currentMapChain = mapChain;
                 container.__currentOriginalCode = originalCode;
@@ -355,15 +363,13 @@ const PluginLifecycle = {
 
                 }, { code, id, map: null, syntheticNamedExports: false });
 
-                map = await combineSourceMapChainFast(mapChain, originalCode, id);
-
                 container.__currentMapChain = null;
                 container.__currentOriginalCode = null;
                 container.__currentModuleId = null;
 
                 return { 
                     code: hr.code,
-                    map: map,
+                    map: await combineSourceMapChainFast(mapChain, originalCode, id),
                     syntheticNamedExports
                 };
             },

lib/impl/types.js

@@ -167,7 +167,7 @@
  * @property {(id: string, parentFilePath: string) => Promise<RollupResolveIdResult>} resolveDynamicImport
  * @property {(id: string, parentFilePath: string, options: object) => Promise<RollupResolveIdResult>} resolveId
  * @property {(filePath: string, parentFilePath: string) => Promise<RollupSourceDescription>} load
- * @property {(code: string, id: string) => Promise<RollupSourceDescription>} transform
+ * @property {(code: string, id: string, map: object) => Promise<RollupSourceDescription>} transform
  * @property {(filePath: string) => void} watchChange
  * @property {(error: Error) => Promise<void>} buildEnd
  * @property {(outputOptions: RollupOutputOptions, inputOptions: RollupConfigContainer)} renderStart

test/cases/api/hooks.js

@@ -617,6 +617,7 @@ describe ('API: Plugin Hooks', () => {
         });
 
         it ('should be allowed to return an AST');
+        it ('should be allowed to return an AST as a string');
 
         it ('should allow meta option to be returned', async () => {
             fs.stub('./src/main.js', () => `