Implement manuscript texbundle using before file moved

Author: dragonstyle

src/project/types/manuscript/manuscript-meca.ts

@@ -15,7 +15,6 @@ import { kProjectType, ProjectContext } from "../../types.ts";
 import { ProjectOutputFile } from "../types.ts";
 
 import {
-  basename,
   dirname,
   globToRegExp,
   isAbsolute,
@@ -30,6 +29,7 @@ import {
   kEnvironmentFiles,
   kMecaBundle,
   ManuscriptConfig,
+  ManuscriptOutputBundle,
   ResolvedManuscriptConfig,
 } from "./manuscript-types.ts";
 import { Format } from "../../../config/types.ts";
@@ -49,7 +49,6 @@ import {
 const kArticleMetadata = "article-metadata";
 const kArticleSupportingFile = "article-supporting-file";
 const kArticleSource = "article-source";
-const kArticleSourceDirectory = "article-source-directory";
 const kArticleSourceEnvironment = "article-source-environment";
 const kManuscript = "manuscript";
 const kManuscriptSupportingFile = "manuscript-supporting-file";
@@ -97,7 +96,7 @@ export const createMecaBundle = async (
   outputDir: string,
   outputFiles: ProjectOutputFile[],
   manuscriptConfig: ResolvedManuscriptConfig,
-  otherOutputBundle?: { manuscript: string; supporting: string[] },
+  otherOutputBundle?: ManuscriptOutputBundle,
 ) => {
   const workingDir = globalTempContext().createDir();
 

src/project/types/manuscript/manuscript-types.ts

@@ -4,7 +4,7 @@
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
 
-import { kCodeLinks, kOtherLinks } from "../../../config/constants.ts";
+import { kCodeLinks } from "../../../config/constants.ts";
 import { NotebookPreviewDescriptor, OtherLink } from "../../../config/types.ts";
 
 export const kManuscriptType = "manuscript";
@@ -28,3 +28,8 @@ export interface ResolvedManuscriptConfig extends ManuscriptConfig {
   mecaFile: string;
   [kEnvironmentFiles]?: string[];
 }
+
+export interface ManuscriptOutputBundle {
+  manuscript: string;
+  supporting: string[];
+}

src/project/types/manuscript/manuscript.ts

@@ -71,6 +71,7 @@ import {
   kManuscriptType,
   kManuscriptUrl,
   ManuscriptConfig,
+  ManuscriptOutputBundle,
   ResolvedManuscriptConfig,
 } from "./manuscript-types.ts";
 import {
@@ -121,6 +122,7 @@ import { safeExistsSync } from "../../../core/path.ts";
 
 const kMecaIcon = "archive";
 const kOutputDir = "_manuscript";
+const kTexOutputBundle = "tex-bundle";
 
 // Manscript projects are a multi file project that is composed into:
 // - a root article file
@@ -621,19 +623,29 @@ export const manuscriptProjectType: ProjectType = {
       return undefined;
     }
   },
-  postRender: async (
+  beforeMoveOutput: async (
     context: ProjectContext,
-    _incremental: boolean,
-    outputFiles: ProjectOutputFile[],
+    renderedFiles: RenderResultFile[],
   ) => {
     let outBundle;
-    for (const outputFile of outputFiles) {
-      const format = outputFile.format;
+    for (const renderedFile of renderedFiles) {
+      const format = renderedFile.format;
       if (isLatexOutput(format.pandoc) && format.render[kKeepTex]) {
-        outBundle = createTexOutputBundle(outputFile, context);
+        outBundle = createTexOutputBundle(renderedFile, context);
       }
     }
-
+    if (outBundle) {
+      return {
+        [kTexOutputBundle]: outBundle,
+      };
+    }
+  },
+  postRender: async (
+    context: ProjectContext,
+    _incremental: boolean,
+    outputFiles: ProjectOutputFile[],
+    moveOutputResult?: Record<string, unknown>,
+  ) => {
     const manuscriptConfig = context.config
       ?.[kManuscriptType] as ResolvedManuscriptConfig;
     if (
@@ -642,6 +654,12 @@ export const manuscriptProjectType: ProjectType = {
         manuscriptConfig,
       ) && outputFiles.length > 0
     ) {
+      let outBundle: ManuscriptOutputBundle | undefined;
+      if (moveOutputResult) {
+        outBundle =
+          moveOutputResult[kTexOutputBundle] as ManuscriptOutputBundle;
+      }
+
       const language = outputFiles[0].format.language;
 
       logProgress(`Creating ${language[kManuscriptMecaBundle]}`);
@@ -819,9 +837,9 @@ const resolveCodeLinks = (
 
 const kTexOutDir = "_tex";
 const createTexOutputBundle = (
-  outputFile: ProjectOutputFile,
+  outputFile: RenderResultFile,
   context: ProjectContext,
-) => {
+): ManuscriptOutputBundle | undefined => {
   const format = outputFile.format;
   const outDir = projectOutputDir(context);
 
@@ -831,7 +849,7 @@ const createTexOutputBundle = (
 
   if (format.pandoc["output-file"]) {
     // Compute the tex file path
-    const baseDir = dirname(outputFile.input);
+    const baseDir = join(context.dir, dirname(outputFile.input));
     const texInputFile = join(baseDir, format.pandoc["output-file"]);
     const texInputDir = dirname(texInputFile);
 
@@ -865,8 +883,8 @@ const createTexOutputBundle = (
     }
 
     // move the supporting files and resources
-    if (outputFile.resources) {
-      const uniqResources = ld.uniq(outputFile.resources);
+    if (outputFile.resourceFiles) {
+      const uniqResources = ld.uniq(outputFile.resourceFiles);
       for (const file of uniqResources) {
         const outPath = join(texDirAbs, relative(context.dir, file));
         ensureDirSync(dirname(outPath));