From 9bf026f0c34b53e55793b98bdf32bed3bc790a53 Mon Sep 17 00:00:00 2001
From: Miel Truyen <miel.truyen@gmail.com>
Date: Sat, 20 May 2023 23:14:59 +0200
Subject: [PATCH] 0.0.3: fix entryNames of sources files included by html in a
 subdir (they didnt keep their relative address...)

---
 src/index.ts                               |  18 +++++++++-
 test/multi-entry/fixtures/admin/batman.js  |   2 ++
 test/multi-entry/fixtures/admin/index.html |   1 +
 test/multi-entry/snapshots/test.js.md      |  37 +++++++++++++++++++--
 test/multi-entry/snapshots/test.js.snap    | Bin 1427 -> 1713 bytes
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 test/multi-entry/fixtures/admin/batman.js

diff --git a/src/index.ts b/src/index.ts
index 8885d0e..d79d421 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -61,8 +61,11 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
   if(publicPath){ throw new Error("TODO, do something with the public path or throw it out of the options. this is just to stop typescript complaining")}
 
   let filter = createFilter(include, exclude, {});
+
+  // TODO, we need to clear all these properly at sme point to avoid odd bugs in watch mode
   let htmlModules = new Map<string, HtmlModule>();// todo clean this per new build?
   let virtualSources = new Map<string, string>();
+  let addedEntries = new Map<string, string>();
 
   const pluginName = 'html2';
   return {
@@ -143,6 +146,11 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
                   if(source){
                     virtualSources.set(sourceId, source);
                   }
+                  let entryName: string|undefined = undefined;
+                  if(type==='entryChunk'){
+                    entryName= posix.join(posix.dirname(htmlModule.name),sourceId);
+                    entryName = entryName.slice(0,-(posix.extname(entryName).length)); // Cut off the extension (TODO, is this wise?)
+                  }
 
                   const resolved = await this.resolve(sourceId, id, {
                     isEntry: type==='entryChunk',
@@ -152,7 +160,9 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
                   }
 
                   const selfInfo = this.getModuleInfo(id);
-                  const importName = (source && selfInfo?.meta[pluginName].name) ? makeInlineId(selfInfo?.meta[pluginName].name, node, extname(sourceId)) : undefined;
+                  const importName = (source && selfInfo?.meta[pluginName].name)
+                      ? makeInlineId(selfInfo?.meta[pluginName].name, node, extname(sourceId))
+                      : entryName;
 
                   const htmlImport: HtmlImport = {
                     id: <string>sourceId,
@@ -171,6 +181,9 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
                     placeholder: `html-import-${crypto.randomBytes(32).toString('base64')}`,
                     index: htmlImports.length,
                   }
+                  // if(entryName){
+                  //   addedEntries.set(resolved.id, entryName);// (we could do this using meta?)
+                  // }
                   htmlImports.push(htmlImport);
                   return htmlImport.placeholder;
                 }
@@ -224,12 +237,15 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
         ...options,
         entryFileNames: (chunkInfo)=>{
           const htmlModule = chunkInfo.facadeModuleId ? htmlModules.get(chunkInfo.facadeModuleId!) : null;
+          const addedEntry = chunkInfo.facadeModuleId ? addedEntries.get(chunkInfo.facadeModuleId!) : null;
           const defaultOption = options.entryFileNames ?? "[name]-[hash].js";// This default is copied from the docs. TODO: don't like overwrite it this way, can we remove the need for this or fetch the true default?
           if(htmlModule){
             let fileName = typeof (htmlFileNames) === 'string' ? htmlFileNames : (<(chunkInfo:PreRenderedChunk)=>string>htmlFileNames)(chunkInfo);
             if(fileName) {
               return fileName;
             }
+          }else if(addedEntry){
+            return addedEntry;
           }
           return typeof (defaultOption) === 'string' ? defaultOption : (<(chunkInfo:PreRenderedChunk)=>string>defaultOption)(chunkInfo);
         },
diff --git a/test/multi-entry/fixtures/admin/batman.js b/test/multi-entry/fixtures/admin/batman.js
new file mode 100644
index 0000000..413d5d3
--- /dev/null
+++ b/test/multi-entry/fixtures/admin/batman.js
@@ -0,0 +1,2 @@
+export const b = ()=>'batman';
+console.log(b());
diff --git a/test/multi-entry/fixtures/admin/index.html b/test/multi-entry/fixtures/admin/index.html
index 79d7fea..098235e 100644
--- a/test/multi-entry/fixtures/admin/index.html
+++ b/test/multi-entry/fixtures/admin/index.html
@@ -8,5 +8,6 @@
             import {adminDeps} from "../app/admin-deps.js";
             bootstrap(document.getElementById('root'), adminDeps());
         </script>
+        <script src="./batman.js" type="module"></script>
     </body>
 </html>
diff --git a/test/multi-entry/snapshots/test.js.md b/test/multi-entry/snapshots/test.js.md
index e2a246c..d84adc4 100644
--- a/test/multi-entry/snapshots/test.js.md
+++ b/test/multi-entry/snapshots/test.js.md
@@ -9,6 +9,36 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     [
+      {
+        code: `const b = ()=>'batman';␊
+        console.log(b());␊
+        ␊
+        export { b };␊
+        //# sourceMappingURL=batman-c7fa228c.js.map␊
+        `,
+        fileName: 'admin/batman-c7fa228c.js',
+        map: SourceMap {
+          file: 'batman-c7fa228c.js',
+          mappings: 'AAAY,MAAC,CAAC,GAAG,IAAI,SAAS;AAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;;;;',
+          names: [],
+          sources: [
+            '../../admin/batman.js',
+          ],
+          sourcesContent: [
+            `export const b = ()=>'batman';␊
+            console.log(b());␊
+            `,
+          ],
+          version: 3,
+        },
+        source: undefined,
+      },
+      {
+        code: undefined,
+        fileName: 'admin/batman-c7fa228c.js.map',
+        map: undefined,
+        source: '{"version":3,"file":"batman-c7fa228c.js","sources":["../../admin/batman.js"],"sourcesContent":["export const b = ()=>\'batman\';\\nconsole.log(b());\\n"],"names":[],"mappings":"AAAY,MAAC,CAAC,GAAG,IAAI,SAAS;AAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;;;;"}',
+      },
       {
         code: undefined,
         fileName: 'admin/index.html',
@@ -24,17 +54,18 @@ Generated by [AVA](https://avajs.dev).
         }␊
         ␊
         bootstrap(document.getElementById('root'), adminDeps());␊
-        //# sourceMappingURL=index.html.body.script.js-15dfaff3.js.map␊
+        //# sourceMappingURL=index.html.body.script0.js-15dfaff3.js.map␊
         </script>␊
+                <script src="batman-c7fa228c.js" type="module"></script>␊
             ␊
         ␊
         </body></html>`,
       },
       {
         code: undefined,
-        fileName: 'admin/index.html.body.script.js-15dfaff3.js.map',
+        fileName: 'admin/index.html.body.script0.js-15dfaff3.js.map',
         map: undefined,
-        source: '{"version":3,"file":"index.html.body.script.js-15dfaff3.js","sources":["../../app/admin-deps.js","../../admin/index.html.body.script.js"],"sourcesContent":["export function adminDeps(){\\n    return \\"robin!\\";\\n}\\n","\\n            import {bootstrap} from \\"../app/app.js\\"\\n            import {adminDeps} from \\"../app/admin-deps.js\\";\\n            bootstrap(document.getElementById(\'root\'), adminDeps());\\n        "],"names":[],"mappings":";;AAAO,SAAS,SAAS,EAAE;AAC3B,IAAI,OAAO,QAAQ,CAAC;AACpB;;ACCY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC"}',
+        source: '{"version":3,"file":"index.html.body.script0.js-15dfaff3.js","sources":["../../app/admin-deps.js","../../admin/index.html.body.script0.js"],"sourcesContent":["export function adminDeps(){\\n    return \\"robin!\\";\\n}\\n","\\n            import {bootstrap} from \\"../app/app.js\\"\\n            import {adminDeps} from \\"../app/admin-deps.js\\";\\n            bootstrap(document.getElementById(\'root\'), adminDeps());\\n        "],"names":[],"mappings":";;AAAO,SAAS,SAAS,EAAE;AAC3B,IAAI,OAAO,QAAQ,CAAC;AACpB;;ACCY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC"}',
       },
       {
         code: `const bootstrap = (el,deps = [])=>{␊
diff --git a/test/multi-entry/snapshots/test.js.snap b/test/multi-entry/snapshots/test.js.snap
index 010356908959422d65322175356b8ae3e55ee338..d43ca7961b06c5cb775af484acf960b0856d3f35 100644
GIT binary patch
literal 1713
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
HpBDfCdEGnx

literal 1427
zcmV;E1#J33RzV<BZeeh9Xm4~Nb~6eC0EcRC$VMal^z)g<!O^GioTE_K3%TdQx*hVm
za8VngP9KX100000000BsSj}%6MHHX49oya1wWA`$0ij_4IYEw{kd#*O2ds^0Bawy@
zArZ2byxtu*+j@7+?z*W-eJBU`2RI_3A|W9mA;AqU&=VK_0wj)b0saC6;?1l-)@vuR
z6A1(>J@1=&AM@tTZ{CdeVWZx()H}|DPpGTAO?t;@H(h<1ny%f^9aCvJ`<ClGc&KTL
ztL!fP5k@h@9w9EoUWWIpK(7Ps0X2Z$0lE)#QHU-GbCPW<9YN@G$z&1<A`+rVm=}Z(
zJV(HN!`=dCe`jonvseH&%-J2rMmYOEW9QiTb6*4dEzplZ^C5(u3-!j0Zr5*9)fGYm
zHkC?olaIp)eG2p)P%47Z^O1l_c+BK}6ruNkeu9Z7;s}v=z$7we@)D?2foeb>0(}uQ
zIX7nVr-)E^9-*gzHi6XnfQdL}^7(m$z6AOK=<x(XD~W)~{HRHSr!WaRp~qNW=N5#B
zYH5@=Vu^q#-q4%$x?<3NM@rEQ-OTBxM(<_!U85N=2pdXkva6_LwQaTUDD<{aVCJR5
zK2@}mh~X*Ze0<%~Iv&fLntm7ST9Me6<&sh%2W_9!QEk2DVz<+xMPgW5yGcn&H(HkM
z;zL}=ii7K5=(x7h!d=|3Ed!^s*__g9Ew8MuuCLZ#yqvx5r1PTKXq&35TPEfceTBB1
z#ic_&l1<&VZDI(auA5Jjyx0}Rf!9UNQriY>nCva;R-2Tu<<6$Im}U{Dmok2TOL;Mu
zdj@+6*@7T+^VXYhyjC1$HOr=-^`-@ZEw5hE8cL(F27DGWEEaN}%*%lYZJsa4Aj|2Q
zS2-74<rCsLEeKu+9g@4$b|BwmV=Y5i9Atw`H7>~z&zVCu_6RJdx1L_;%NiuwQ|d{M
zpAfk@@K&)*7Z#5>rS~|3CPG3seVCAYppZ#kHoLM3!+P@m)5qcfFFg>-q#t#w1!2fX
zm<<LVGxJZDkM1`=Ejou@SYAv32Fo$9hKE&Xk$hf~r0vX(B<*-VRY|HsUuCVF*_5Qs
z%r+C>kfa-#3iL8bs|-e!%C4u+dWZ6iDoLuxZAsFW$1#^f=e&<}PXITdswk+I>A1cv
zU&M>FnPF)HcJJm=vE*%O+RW;vN$qQZ2$0l9>P=}gZD699rqzKt6a4HU028Z<L-7H{
zCZ!s7E$mVlNv^>-pd{BYbyS7rC`-Coe2tna#qPfDU<Pe0r$LQ6a++D{rrK<46f4ap
zBkKShHZ0q4u+_k6-AxCp9BZ*9+JI2lT)IAm8k8fbUOmJf`sU7RAMPGeaRLR9*Orrt
zLo#55gbRZ3*#(6B+y9t-&x*ns>(j*vai6vZ<tEplzzAd2X1HmOtsPS!(c5i7C=U1F
z0E_Yfj50%`d^8*fc=Q8Oo`}dkBxk~8Ah-#j^fYR{a(HAFff};QHhjg~=2s=@s&DIa
zju#Uy;C+l^#pK<dWT-gm!7DhK^|B<bmp!d3(0`>ekY28443HW<DfiZwt(J%FLFe^6
zJSP^QlhG@l{r0r@@86y#U7lt*a7e+lOj;td--XsMt*xvzRvQ1%U1(|QNKU($ZwWKr
zf_&qS)ukD)I8$F!j=81Gu<CMe*<~{QEu%W)g<+t=wkrHV{RNJu-+-P-!W$@@Lg-1L
zLaO&q>D*2qe0*_6|13p=&|#}{^iep9rT$F%EBzJv?-e|Lyzixk$NL;#D&BqI>yGun
z#RVVv1Q$k87syephkV|Su%GzIXM^a-XM?y9dIYY&PmO+Chy|5?28CY(O7Y+a2muM_
hStx@@6C>yPM4ixIX!?`=e|X0f{|4Z^*%&Jl007Mrx<3E_