Differentiate between dependency types

Some dependencies also inject supporting HTML tags and can carry attributes and other metadata. Simple dependencies are just files that are copied.

fix

Author: dragonstyle

src/command/render/pandoc-dependencies-html.ts

@@ -217,6 +217,8 @@ function processHtmlDependencies(
 
     const copyFile = (
       file: DependencyFile,
+      attribs?: Record<string, string>,
+      afterBody?: boolean,
       inject?: (
         href: string,
         attribs?: Record<string, string>,
@@ -230,7 +232,7 @@ function processHtmlDependencies(
       );
       if (inject) {
         const href = join(directoryInfo.relative, file.name);
-        inject(href, file.attribs, file.afterBody);
+        inject(href, attribs, afterBody);
       }
     };
 
@@ -239,6 +241,8 @@ function processHtmlDependencies(
       dependency.scripts.forEach((script) =>
         copyFile(
           script,
+          script.attribs,
+          script.afterBody,
           injector.injectScript,
         )
       );
@@ -249,6 +253,8 @@ function processHtmlDependencies(
       dependency.stylesheets.forEach((stylesheet) => {
         copyFile(
           stylesheet,
+          stylesheet.attribs,
+          stylesheet.afterBody,
           injector.injectStyle,
         );
       });

src/config/types.ts

@@ -204,15 +204,18 @@ export interface FormatDependency {
   external?: boolean;
   meta?: Record<string, string>;
   links?: { rel: string; href: string; type?: string }[];
-  scripts?: DependencyFile[];
-  stylesheets?: DependencyFile[];
+  scripts?: DependencyHtmlFile[];
+  stylesheets?: DependencyHtmlFile[];
   head?: string;
   resources?: DependencyFile[];
 }
 
 export interface DependencyFile {
   name: string;
   path: string;
+}
+
+export interface DependencyHtmlFile extends DependencyFile {
   attribs?: Record<string, string>;
   afterBody?: boolean;
 }

src/format/html/format-html.ts

@@ -31,6 +31,7 @@ import {
 
 import {
   DependencyFile,
+  DependencyHtmlFile,
   Format,
   FormatDependency,
   FormatExtras,
@@ -187,8 +188,8 @@ export async function htmlFormatExtras(
   }
 
   // lists of scripts and ejs data for the orchestration script
-  const scripts: DependencyFile[] = [];
-  const stylesheets: DependencyFile[] = [];
+  const scripts: DependencyHtmlFile[] = [];
+  const stylesheets: DependencyHtmlFile[] = [];
   const sassBundles: SassBundle[] = [];
   const dependencies: FormatDependency[] = [];