@rollup-extras/plugin-script-loader 0.1.0 → 0.1.1

package/index.js

@@ -1,6 +1,7 @@
 import { readFile } from 'node:fs/promises';
-import { basename } from 'node:path';
+import { basename, dirname, join, relative, resolve } from 'node:path';
 
+import remapping from '@ampproject/remapping';
 import MagicString, { Bundle } from 'magic-string';
 
 import { LogLevel } from '@niceties/logger';
@@ -61,7 +62,7 @@ export default function (options = {}) {
         const externalMatch = code.match(/\/\/[#@]\s*sourceMappingURL=(.+?)\s*$/);
         if (externalMatch && !externalMatch[1].startsWith('data:')) {
             try {
-                const mapPath = `${filePath}.map`;
+                const mapPath = join(dirname(filePath), externalMatch[1]);
                 const mapContent = await readFile(mapPath, 'utf8');
                 return JSON.parse(mapContent);
             } catch {
@@ -187,6 +188,8 @@ export default function (options = {}) {
                 })
                 .map(([, entry]) => entry);
 
+            const outputDir = _outputOptions.dir ?? (_outputOptions.file ? dirname(_outputOptions.file) : process.cwd());
+
             const magicBundle = new Bundle({ separator: '\n' });
 
             for (const entry of sortedEntries) {
@@ -205,7 +208,7 @@ export default function (options = {}) {
             let generatedMap;
 
             if (sourcemap) {
-                generatedMap =  (
+                const magicMap =  (
                     magicBundle.generateMap({
                         file: name,
                         source: name,
@@ -213,6 +216,26 @@ export default function (options = {}) {
                         hires: true,
                     })
                 );
+
+                const originalMaps = new Map(sortedEntries.filter(e => e.originalMap).map(e => [e.filePath, e.originalMap]));
+
+                if (originalMaps.size > 0) {
+
+                    const returned = new Set();
+                    generatedMap =  (
+                        remapping(magicMap, file => {
+                            if (returned.has(file)) return null;
+                            const orig = originalMaps.get(file);
+                            if (orig) {
+                                returned.add(file);
+                                return orig;
+                            }
+                            return null;
+                        })
+                    );
+                } else {
+                    generatedMap = magicMap;
+                }
             }
 
             if (minify) {
@@ -227,29 +250,58 @@ export default function (options = {}) {
                 }
             }
 
-            const assetRefId = this.emitFile({
-                type: 'asset',
-                [exactFileName ? 'fileName' : 'name']: name,
-                source: concatenatedCode,
-            });
+            if (exactFileName) {
+
+                if (sourcemap && generatedMap) {
+                    const assetDir = resolve(outputDir, dirname(name));
+                    generatedMap.sources = generatedMap.sources.map(( s) => relative(assetDir, s));
+
+                    const mapFileName = `${name}.map`;
+                    generatedMap.file = basename(name);
+                    concatenatedCode += `\n//# sourceMappingURL=${basename(mapFileName)}`;
+
+                    this.emitFile({
+                        type: 'asset',
+                        fileName: name,
+                        source: concatenatedCode,
+                    });
+
+                    this.emitFile({
+                        type: 'asset',
+                        fileName: mapFileName,
+                        source: JSON.stringify(generatedMap),
+                    });
+                } else {
+                    this.emitFile({
+                        type: 'asset',
+                        fileName: name,
+                        source: concatenatedCode,
+                    });
+                }
+            } else {
 
-            const finalFileName = this.getFileName(assetRefId);
+                const assetRefId = this.emitFile({
+                    type: 'asset',
+                    name,
+                    source: concatenatedCode,
+                });
 
-            if (sourcemap && generatedMap) {
+                const finalFileName = this.getFileName(assetRefId);
 
-                const mapFileName = `${finalFileName}.map`;
+                if (sourcemap && generatedMap) {
+                    const assetDir = resolve(outputDir, dirname(finalFileName));
+                    generatedMap.sources = generatedMap.sources.map(( s) => relative(assetDir, s));
 
-                generatedMap.file = basename(finalFileName);
+                    const mapFileName = `${finalFileName}.map`;
+                    generatedMap.file = basename(finalFileName);
 
-                this.emitFile({
-                    type: 'asset',
-                    fileName: mapFileName,
-                    source: JSON.stringify(generatedMap),
-                });
+                    this.emitFile({
+                        type: 'asset',
+                        fileName: mapFileName,
+                        source: JSON.stringify(generatedMap),
+                    });
 
-                const bundleEntry = bundle[finalFileName];
-                if (bundleEntry && bundleEntry.type === 'asset' && typeof bundleEntry.source === 'string') {
-                    bundleEntry.source += `\n//# sourceMappingURL=${basename(mapFileName)}`;
+                     (bundle[finalFileName]).source += `\n//# sourceMappingURL=${basename(mapFileName)}`;
                 }
             }
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "name": "@rollup-extras/plugin-script-loader",
   "author": "Konstantin Shutkin",
@@ -34,6 +34,7 @@
     "concatenation"
   ],
   "dependencies": {
+    "@ampproject/remapping": "^2.3.0",
     "@niceties/logger": "^2.1.0",
     "magic-string": "^0.30.21",
     "@rollup-extras/utils": "^2.0.0"