Parse tool args for outdir and auxdir

Author: James-Yu

package.json

@@ -1061,7 +1061,7 @@
           "scope": "resource",
           "type": "string",
           "default": "%DIR%",
-          "markdownDescription": "The directory where the extension tries to find project files (e.g., PDF and SyncTeX files) are located. Both relative and absolute paths are supported. Relative path start from the root file location, so beware if it is located in sub-directory. The path must not contain a trailing slash. The LaTeX toolchain should output files to this path. For a list of supported placeholders, please visit https://github.com/James-Yu/LaTeX-Workshop/wiki/Compile#placeholders."
+          "markdownDescription": "The directory where the extension tries to find project files (e.g., PDF and SyncTeX files) are located. Both relative and absolute paths are supported. Relative path start from the root file location, so beware if it is located in sub-directory. The path must not contain a trailing slash. The LaTeX toolchain should output files to this path. For a list of supported placeholders, please visit https://github.com/James-Yu/LaTeX-Workshop/wiki/Compile#placeholders. Note that if this config is set to %DIR% (default value) or %DIR_W32%, the extension will try to parse the last LaTeX tools used and look for `-out-directory=` and `-outdir=`, and automatically determine the output directory. This means that you can safely ignore this config if you use `latexmk` and do not manually `mv` the output files in your recipe."
         },
         "latex-workshop.latex.jobname": {
           "scope": "resource",

src/compile/build.ts

@@ -156,6 +156,7 @@ async function buildLoop() {
         if (step === undefined) {
             break
         }
+        lw.compile.lastSteps.push(step)
         const env = spawnProcess(step)
         const success = await monitorProcess(step, env)
         skipped = skipped && !(step.isExternal || !step.isSkipped)

src/compile/index.ts

@@ -1,11 +1,13 @@
 import type { ChildProcessWithoutNullStreams } from 'child_process'
+import type { Step } from '../types'
 import { build, autoBuild } from './build'
 import { terminate } from './terminate'
 
 export const compile = {
     build,
     autoBuild,
     terminate,
+    lastSteps: [] as Step[],
     lastBuildTime: 0,
     compiledPDFPath: '',
     compiledPDFWriting: 0,

src/compile/recipe.ts

@@ -330,18 +330,20 @@ function populateTools(rootFile: string, buildTools: Tool[]): Tool[] {
             }
         }
         tool.args = tool.args?.map(replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath))
+        tool.outdir = tool.args?.filter(arg => arg.startsWith('-out-directory') || arg.startsWith('-outdir'))[0]?.replace(/^-out-directory=|^-outdir=/, '')
+        tool.auxdir = tool.args?.filter(arg => arg.startsWith('-aux-directory') || arg.startsWith('-auxdir'))[0]?.replace(/^-aux-directory=|^-auxdir=/, '')
         const env = tool.env ?? {}
         Object.entries(env).forEach(([key, value]) => {
             env[key] = value && replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(value)
         })
         if (configuration.get('latex.option.maxPrintLine.enabled')) {
             tool.args = tool.args ?? []
             const isLuaLatex = tool.args.includes('-lualatex') ||
-                                tool.args.includes('-pdflua') ||
-                                tool.args.includes('-pdflualatex') ||
-                                tool.args.includes('--lualatex') ||
-                                tool.args.includes('--pdflua') ||
-                                tool.args.includes('--pdflualatex')
+                               tool.args.includes('-pdflua') ||
+                               tool.args.includes('-pdflualatex') ||
+                               tool.args.includes('--lualatex') ||
+                               tool.args.includes('--pdflua') ||
+                               tool.args.includes('--pdflualatex')
             if (isMikTeX() && ((tool.command === 'latexmk' && !isLuaLatex) || tool.command === 'pdflatex')) {
                 tool.args.unshift('--max-print-line=' + lw.constant.MAX_PRINT_LINE)
             }

src/core/file.ts

@@ -140,6 +140,9 @@ function getOutDir(texPath?: string): string {
     const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(texPath))
     const outDir = configuration.get('latex.outDir') as string
     const out = utils.replaceArgumentPlaceholders(texPath, file.tmpDirPath)(outDir)
+    if (outDir === '%DIR%' || outDir === '%DIR_W32%') {
+        return lw.compile.lastSteps.filter(step => step.outdir).slice(-1)[0]?.outdir ?? path.normalize(out).split(path.sep).join('/')
+    }
     return path.normalize(out).split(path.sep).join('/')
 }
 
@@ -198,8 +201,12 @@ function getPdfPath(texPath: string): string {
 function getFlsPath(texPath: string): string | undefined {
     const rootDir = path.dirname(texPath)
     const outDir = getOutDir(texPath)
-    const baseName = path.parse(getJobname(texPath)).name
-    const flsFile = path.resolve(rootDir, path.join(outDir, baseName + '.fls'))
+    const fileName = path.parse(getJobname(texPath)).name + '.fls'
+    let flsFile = path.resolve(rootDir, path.join(outDir, fileName))
+    if (fs.existsSync(flsFile)) {
+        return flsFile
+    }
+    flsFile = path.resolve(rootDir, lw.compile.lastSteps.filter(step => step.auxdir).slice(-1)[0]?.auxdir ?? '', fileName)
     return fs.existsSync(flsFile) ? flsFile : undefined
 }
 

src/types.ts

@@ -64,7 +64,9 @@ export type Tool = {
     name: string,
     command: string,
     args?: string[],
-    env?: ProcessEnv
+    env?: ProcessEnv,
+    outdir?: string,
+    auxdir?: string
 }
 
 export type Recipe = {