texlite 0.9.2 → 0.9.4

package/dist/server/projectOutline.js

@@ -1,45 +1,55 @@
 import fs from "node:fs";
-import path from "node:path";
-import { listProjectFilesAsync, resolveSourcePath, safeRelativePath } from "./files.js";
-const levels = { part: 0, chapter: 0, section: 1, subsection: 2, subsubsection: 3, paragraph: 4 };
-const commandPattern = /\\(part|chapter|section|subsection|subsubsection|paragraph)\*?(?:\s*\[[^\]]*\])?\s*\{|\\(?:input|include|subfile)\s*\{/g;
+import { maskLatexComments } from "../shared/latexLiterals.js";
+import { findLatexSourceIncludes } from "../shared/latexDependencies.js";
+import { forEachLatexCommand, readLatexMandatoryArguments } from "../shared/latexScanner.js";
+import { resolveLatexInclude, toLatexIncludeDirective } from "./latexDocumentGraph.js";
+import { listProjectFiles, listProjectFilesAsync, resolveSourcePath, safeRelativePath } from "./files.js";
+const levels = new Map([
+    ["part", 0],
+    ["chapter", 0],
+    ["section", 1],
+    ["subsection", 2],
+    ["subsubsection", 3],
+    ["paragraph", 4]
+]);
 export function buildProjectOutline(config, projectId, mainFileInput) {
     const mainFile = safeRelativePath(mainFileInput);
+    return buildProjectOutlineFromFiles(config, projectId, mainFile, sourceFilePaths(listProjectFiles(config, projectId)));
+}
+function buildProjectOutlineFromFiles(config, projectId, mainFile, availableFiles) {
     const result = [];
     const visited = new Set();
-    const visit = (filePath) => {
+    const visit = (filePath, importBase) => {
         if (visited.has(filePath) || visited.size >= 200)
             return;
         visited.add(filePath);
         const absolute = resolveSourcePath(config, projectId, filePath);
         if (!fs.existsSync(absolute) || !fs.statSync(absolute).isFile() || fs.statSync(absolute).size > 3 * 1024 * 1024)
             return;
-        const content = stripCommentsPreserveLines(fs.readFileSync(absolute, "utf8"));
-        const lineStarts = sourceLineStarts(content);
-        commandPattern.lastIndex = 0;
-        for (const command of content.matchAll(commandPattern)) {
-            const start = (command.index ?? 0) + command[0].length;
-            const argument = balancedArgument(content, start);
-            if (!argument)
-                continue;
-            if (command[1]) {
-                result.push({ path: filePath, line: lineAtOffset(lineStarts, command.index ?? 0), level: levels[command[1]], title: cleanTitle(argument.value) });
+        const content = fs.readFileSync(absolute, "utf8");
+        for (const event of scanOutlineSource(content)) {
+            if (event.type === "heading") {
+                result.push({ path: filePath, line: event.line, level: event.level, title: event.title });
                 continue;
             }
-            const included = resolveIncludedFile(config, projectId, filePath, argument.value);
+            const included = resolveLatexInclude(event.directive, importBase, availableFiles);
             if (included)
-                visit(included);
+                visit(included.path, included.importBase);
         }
     };
-    visit(mainFile);
+    visit(mainFile, "");
     return result;
 }
 /** Async outline builder used by the HTTP path so large projects do not block the event loop. */
 export async function buildProjectOutlineAsync(config, projectId, mainFileInput) {
     const mainFile = safeRelativePath(mainFileInput);
+    const availableFiles = sourceFilePaths(await listProjectFilesAsync(config, projectId));
+    return buildProjectOutlineAsyncFromFiles(config, projectId, mainFile, availableFiles);
+}
+async function buildProjectOutlineAsyncFromFiles(config, projectId, mainFile, availableFiles) {
     const result = [];
     const visited = new Set();
-    const visit = async (filePath) => {
+    const visit = async (filePath, importBase) => {
         if (visited.has(filePath) || visited.size >= 200)
             return;
         visited.add(filePath);
@@ -54,28 +64,22 @@ export async function buildProjectOutlineAsync(config, projectId, mainFileInput)
             return;
         let content;
         try {
-            content = stripCommentsPreserveLines(await fs.promises.readFile(resolveSourcePath(config, projectId, filePath), "utf8"));
+            content = await fs.promises.readFile(resolveSourcePath(config, projectId, filePath), "utf8");
         }
         catch {
             return;
         }
-        const lineStarts = sourceLineStarts(content);
-        const pattern = new RegExp(commandPattern.source, commandPattern.flags);
-        for (const command of content.matchAll(pattern)) {
-            const start = (command.index ?? 0) + command[0].length;
-            const argument = balancedArgument(content, start);
-            if (!argument)
-                continue;
-            if (command[1]) {
-                result.push({ path: filePath, line: lineAtOffset(lineStarts, command.index ?? 0), level: levels[command[1]], title: cleanTitle(argument.value) });
+        for (const event of scanOutlineSource(content)) {
+            if (event.type === "heading") {
+                result.push({ path: filePath, line: event.line, level: event.level, title: event.title });
                 continue;
             }
-            const included = await resolveIncludedFileAsync(config, projectId, filePath, argument.value);
+            const included = resolveLatexInclude(event.directive, importBase, availableFiles);
             if (included)
-                await visit(included);
+                await visit(included.path, included.importBase);
         }
     };
-    await visit(mainFile);
+    await visit(mainFile, "");
     return result;
 }
 /**
@@ -119,7 +123,7 @@ export class ProjectOutlineService {
             cached.touched = Date.now();
             return cached.outline;
         }
-        const outline = await buildProjectOutlineAsync(this.config, projectId, mainFile);
+        const outline = await buildProjectOutlineAsyncFromFiles(this.config, projectId, mainFile, sourceFilePaths(entries));
         this.cache.set(key, { signature, outline, touched: Date.now() });
         if (this.cache.size > 64) {
             const oldest = [...this.cache.entries()].sort((left, right) => left[1].touched - right[1].touched)[0];
@@ -129,65 +133,51 @@ export class ProjectOutlineService {
         return outline;
     }
 }
-function resolveIncludedFile(config, projectId, currentFile, value) {
-    const raw = value.trim();
-    if (!raw || /[\\#]/.test(raw))
-        return null;
-    const withExtension = path.posix.extname(raw) ? raw : `${raw}.tex`;
-    const candidates = [withExtension, path.posix.join(path.posix.dirname(currentFile), withExtension)];
-    for (const candidate of [...new Set(candidates)]) {
-        try {
-            const safe = safeRelativePath(candidate);
-            if (fs.existsSync(resolveSourcePath(config, projectId, safe)))
-                return safe;
-        }
-        catch { /* Ignore includes outside the project. */ }
-    }
-    return null;
+function sourceFilePaths(entries) {
+    return new Set(entries.filter((entry) => entry.type === "file").map((entry) => entry.path));
 }
-async function resolveIncludedFileAsync(config, projectId, currentFile, value) {
-    const raw = value.trim();
-    if (!raw || /[\\#]/.test(raw))
-        return null;
-    const withExtension = path.posix.extname(raw) ? raw : `${raw}.tex`;
-    const candidates = [withExtension, path.posix.join(path.posix.dirname(currentFile), withExtension)];
-    for (const candidate of [...new Set(candidates)]) {
-        try {
-            const safe = safeRelativePath(candidate);
-            const stat = await fs.promises.stat(resolveSourcePath(config, projectId, safe));
-            if (stat.isFile())
-                return safe;
-        }
-        catch { /* Ignore includes outside the project. */ }
-    }
-    return null;
-}
-function balancedArgument(source, start) {
-    let depth = 1;
-    for (let index = start; index < source.length; index += 1) {
-        if (source[index] === "{" && !escapedAt(source, index))
-            depth += 1;
-        if (source[index] === "}" && !escapedAt(source, index))
-            depth -= 1;
-        if (depth === 0)
-            return { value: source.slice(start, index), end: index };
+/**
+ * Read one source file into ordered outline events. The shared scanner keeps
+ * offsets from the original source while skipping comments and literal TeX
+ * forms, so the synchronous and asynchronous builders cannot drift in their
+ * interpretation of headings and arguments.
+ */
+function scanOutlineSource(source) {
+    const lineStarts = sourceLineStarts(source);
+    const events = [];
+    forEachLatexCommand(source, (command) => {
+        const level = levels.get(command.name);
+        if (level === undefined)
+            return;
+        const argument = readLatexMandatoryArguments(source, command.to, 1)[0];
+        if (!argument)
+            return;
+        const value = source.slice(argument.contentFrom, argument.contentTo);
+        events.push({
+            type: "heading",
+            from: command.from,
+            line: lineAtOffset(lineStarts, command.from),
+            level,
+            title: cleanTitle(maskLatexComments(value))
+        });
+    });
+    for (const reference of findLatexSourceIncludes(source)) {
+        const directive = toLatexIncludeDirective(reference);
+        if (!isStaticOutlineInclude(directive))
+            continue;
+        events.push({
+            type: "include",
+            from: reference.from,
+            directive
+        });
     }
-    return null;
-}
-function stripCommentsPreserveLines(source) {
-    return source.split(/(?<=\n)/).map((line) => {
-        for (let index = 0; index < line.length; index += 1) {
-            if (line[index] === "%" && !escapedAt(line, index))
-                return `${line.slice(0, index)}${line.endsWith("\n") ? "\n" : ""}`;
-        }
-        return line;
-    }).join("");
-}
-function escapedAt(source, index) {
-    let slashes = 0;
-    for (let cursor = index - 1; cursor >= 0 && source[cursor] === "\\"; cursor -= 1)
-        slashes += 1;
-    return slashes % 2 === 1;
+    return events.sort((left, right) => {
+        if (left.from !== right.from)
+            return left.from - right.from;
+        if (left.type === right.type)
+            return 0;
+        return left.type === "heading" ? -1 : 1;
+    });
 }
 function sourceLineStarts(source) {
     const starts = [0];
@@ -209,5 +199,27 @@ function lineAtOffset(starts, offset) {
     return Math.max(1, low);
 }
 function cleanTitle(value) {
-    return value.replace(/\\(?:texorpdfstring|MakeUppercase)\s*\{([^{}]*)\}(?:\{[^{}]*\})?/g, "$1").replace(/\\[a-zA-Z@]+\*?/g, "").replace(/[{}]/g, "").trim() || value.trim();
+    const cleaned = value
+        .replace(/\\(?:texorpdfstring|MakeUppercase)\s*\{([^{}]*)\}(?:\{[^{}]*\})?/g, "$1")
+        .replace(/\\[a-zA-Z@]+\*?/g, "")
+        .replace(/[{}]/g, "");
+    return compactOutlineWhitespace(cleaned) || compactOutlineWhitespace(value);
+}
+/**
+ * `maskLatexComments` intentionally keeps source offsets intact, so a long
+ * comment becomes a long run of spaces. Outline titles are display-only: keep
+ * their original line breaks but collapse that offset-preserving padding.
+ */
+function compactOutlineWhitespace(value) {
+    return value.replace(/[^\S\r\n]{2,}/g, " ").trim();
+}
+/**
+ * TeX paths containing a command or parameter marker need macro expansion.
+ * Do not guess their target while building an outline. The generic document
+ * graph deliberately supports backslash-separated paths for other consumers,
+ * while the legacy outline already skipped these dynamic forms.
+ */
+function isStaticOutlineInclude(directive) {
+    return !/[\\#]/.test(directive.path)
+        && (directive.directory === undefined || !/[\\#]/.test(directive.directory));
 }

package/dist/server/projectReferences.js

@@ -95,7 +95,7 @@ function citationLookupOrder(sourceDirectives, documentSources, bibPaths, source
         if (!directives)
             continue;
         for (const bibliography of directives.bibliographies) {
-            const resolved = resolveProjectReferencePath(bibliography, sourcePath, ".bib", bibPathSet, true);
+            const resolved = resolveProjectReferencePath(bibliography, sourcePath, ".bib", bibPathSet, "project-root-then-source-file");
             if (resolved)
                 declaredBibliographies.push(resolved);
         }

package/dist/server/routes/comments.js

@@ -6,7 +6,7 @@ import { resolveSourcePath, safeRelativePath } from "../files.js";
 import { apiError, httpError } from "../http.js";
 import { accessibleProject } from "../projects.js";
 import { commentMentionForUser, createCommentMentions, listCommentMentions, markAllCommentMentionsRead, markCommentMentionRead, markCommentMentionsResolved, mentionableUsersForProject } from "../commentMentions.js";
-import { commentsForFile, now, repliesForComment, text } from "./projectShared.js";
+import { commentsForFile, commentsForProject, now, repliesForComment, text } from "./projectShared.js";
 /** Register source-anchored comments and reply routes. */
 export function registerCommentRoutes(app, context) {
     const { config, db, collaboration, projectMutations } = context;
@@ -75,12 +75,18 @@ export function registerCommentRoutes(app, context) {
         if (!user)
             return;
         const { id } = request.params;
-        const { path: filePath } = request.query;
+        const { path: filePath, scope } = request.query;
         if (!accessibleProject(db, id, user))
             return apiError(reply, 404, "PROJECT_NOT_FOUND");
-        const relative = safeRelativePath(filePath ?? "");
+        if (scope !== undefined && scope !== "project")
+            return apiError(reply, 400, "REQUEST_INVALID");
+        if (scope === "project" && filePath !== undefined)
+            return apiError(reply, 400, "REQUEST_INVALID");
+        const load = scope === "project"
+            ? () => commentsForProject(db, config, id)
+            : () => commentsForFile(db, config, id, safeRelativePath(filePath ?? ""));
         return {
-            comments: await projectMutations.runConsistentRead(id, () => commentsForFile(db, config, id, relative), {
+            comments: await projectMutations.runConsistentRead(id, load, {
                 preflight: () => {
                     if (!accessibleProject(db, id, user))
                         throw httpError(404, "PROJECT_NOT_FOUND");

package/dist/server/routes/projectFiles.js

@@ -263,7 +263,12 @@ export function registerProjectFileRoutes(app, context) {
                 throw httpError(409, "PATH_EXISTS", { path: destination });
             }
         };
-        return await projectMutations.runExclusive(id, "move project path", () => {
+        // Moving/renaming is collaboration-aware: movePath() remaps the live Yjs
+        // texts and publishes a files event.  It therefore needs the ordinary
+        // durable write lock, not maintenance mode.  Maintenance resets the Yjs
+        // epoch and makes every connected browser reload after an otherwise safe
+        // drag-and-drop move.
+        return await projectMutations.runWrite(id, () => {
             fs.renameSync(sourceAbsolute, destinationAbsolute);
             let hasCommentUpdates = false;
             db.exec("BEGIN IMMEDIATE");

package/dist/server/routes/projectShared.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import { reanchorFileComments, offsetToLine } from "../anchors.js";
-import { maxCollaborativeFileBytes } from "../collaboration.js";
+import { isCollaborativeTextFile, maxCollaborativeFileBytes } from "../collaboration.js";
 import { listProjectFiles, resolveSourcePath } from "../files.js";
 import { httpError, ValidationError } from "../http.js";
 import { accessibleProject, canEdit } from "../projects.js";
@@ -154,8 +154,7 @@ export function requireActualProjectOwner(db, projectId, user) {
     return project;
 }
 export function projectTextSnapshot(config, projectId) {
-    const versionedText = (filePath) => /(?:\.tex|\.bib|\.sty|\.cls|\.txt|\.md|latexmkrc)$/i.test(filePath);
-    return new Map(listProjectFiles(config, projectId).filter((entry) => entry.type === "file" && versionedText(entry.path)).map((entry) => {
+    return new Map(listProjectFiles(config, projectId).filter((entry) => entry.type === "file" && isCollaborativeTextFile(entry.path)).map((entry) => {
         const absolute = resolveSourcePath(config, projectId, entry.path);
         return [entry.path, fs.statSync(absolute).size <= maxCollaborativeFileBytes(config) ? fs.readFileSync(absolute, "utf8") : ""];
     }));
@@ -189,21 +188,34 @@ export function repliesForComment(db, commentId) {
         editedAt: reply.edited_at
     }));
 }
-export function commentsForFile(db, config, projectId, filePath) {
-    const absolute = resolveSourcePath(config, projectId, filePath);
-    const source = fs.existsSync(absolute) ? fs.readFileSync(absolute, "utf8") : "";
+function commentsForScope(db, config, projectId, filePath) {
+    const hasFileScope = typeof filePath === "string";
+    const fileClause = hasFileScope ? " AND c.file_path = ?" : "";
+    // File-scoped reads retain chronological order for backwards compatibility.
+    // A project review is grouped by file and source position so next/previous
+    // follows the manuscript rather than arbitrary database insertion order.
+    const commentOrder = hasFileScope
+        ? "c.created_at"
+        : "c.file_path COLLATE NOCASE, c.start_line, c.created_at";
     const rows = db.prepare(`SELECT c.*, u.username AS author_username, u.display_name AS author_display_name FROM comments c
-    LEFT JOIN users u ON u.id = c.author_id WHERE c.project_id = ? AND c.file_path = ? ORDER BY c.created_at`)
-        .all(projectId, filePath);
+    LEFT JOIN users u ON u.id = c.author_id WHERE c.project_id = ?${fileClause} ORDER BY ${commentOrder}`)
+        .all(projectId, ...(hasFileScope ? [filePath] : []));
     if (!rows.length)
         return [];
+    const sourceByPath = new Map();
+    for (const row of rows) {
+        if (sourceByPath.has(row.file_path))
+            continue;
+        const absolute = resolveSourcePath(config, projectId, row.file_path);
+        sourceByPath.set(row.file_path, fs.existsSync(absolute) ? fs.readFileSync(absolute, "utf8") : "");
+    }
     const replies = db.prepare(`SELECT reply.*, user.username AS author_username, user.display_name AS author_display_name
     FROM comment_replies reply
     JOIN comments c ON c.id = reply.comment_id
     LEFT JOIN users user ON user.id = reply.author_id
-    WHERE c.project_id = ? AND c.file_path = ?
+    WHERE c.project_id = ?${fileClause}
     ORDER BY reply.created_at`)
-        .all(projectId, filePath);
+        .all(projectId, ...(hasFileScope ? [filePath] : []));
     const replyMap = new Map();
     for (const reply of replies) {
         const list = replyMap.get(reply.comment_id) ?? [];
@@ -221,14 +233,15 @@ export function commentsForFile(db, config, projectId, filePath) {
     }
     return rows.map((comment) => ({
         id: comment.id,
+        filePath: comment.file_path,
         authorId: comment.author_id,
         authorUsername: comment.author_username,
         authorDisplayName: comment.author_display_name,
         selectedText: comment.selected_text,
         startOffset: comment.start_offset,
         endOffset: comment.end_offset,
-        startLine: offsetToLine(source, comment.start_offset),
-        endLine: offsetToLine(source, comment.end_offset),
+        startLine: offsetToLine(sourceByPath.get(comment.file_path) ?? "", comment.start_offset),
+        endLine: offsetToLine(sourceByPath.get(comment.file_path) ?? "", comment.end_offset),
         content: comment.content,
         resolved: Boolean(comment.resolved),
         orphaned: Boolean(comment.orphaned),
@@ -238,3 +251,11 @@ export function commentsForFile(db, config, projectId, filePath) {
         replies: replyMap.get(comment.id) ?? []
     }));
 }
+/** Comments anchored in one source file, used for editor decorations. */
+export function commentsForFile(db, config, projectId, filePath) {
+    return commentsForScope(db, config, projectId, filePath);
+}
+/** All project comments, grouped in manuscript order for the review drawer. */
+export function commentsForProject(db, config, projectId) {
+    return commentsForScope(db, config, projectId);
+}

package/dist/shared/collaborationProtocol.js

@@ -0,0 +1,31 @@
+/**
+ * Wire-level constants and payload shapes shared by the browser and server.
+ *
+ * These values are part of the persisted collaboration contract. Do not
+ * renumber a message or change a payload shape in place: make an intentional
+ * protocol-version migration instead.
+ */
+export const CollaborationMessageType = {
+    Sync: 0,
+    Awareness: 1,
+    QueryAwareness: 3,
+    Flush: 4,
+    Protocol: 5,
+    Maintenance: 6,
+    Permission: 7,
+    // A small, non-Yjs handshake message for ephemeral compile metadata.
+    // Source text still uses the normal Yjs sync protocol.
+    CompileStates: 8,
+    // Ephemeral per-file formatter leases, intentionally outside Yjs state.
+    FormatLease: 9
+};
+/** Increment only for an incompatible collaboration wire change. */
+export const COLLABORATION_PROTOCOL_VERSION = 3;
+const compileStatuses = ["queued", "running", "succeeded", "failed", "cleaned"];
+const cleanModes = ["cache", "artifacts"];
+export function isCollaborationCompileStatus(value) {
+    return typeof value === "string" && compileStatuses.includes(value);
+}
+export function isCollaborationCleanMode(value) {
+    return typeof value === "string" && cleanModes.includes(value);
+}

package/dist/shared/latexDependencies.js

@@ -1,23 +1,76 @@
 /** Lightweight extraction of source and bibliography dependencies from TeX. */
-import { forEachLatexCommand, readLatexMandatoryArguments } from "./latexScanner.js";
+import { forEachLatexCommand, isLatexCommentStart, readLatexMandatoryArguments, skipLatexComment, skipLatexTrivia } from "./latexScanner.js";
 function pathRanges(source, argument, splitOnComma) {
     const paths = [];
     let segmentStart = argument.contentFrom;
-    for (let index = argument.contentFrom; index <= argument.contentTo; index += 1) {
-        if (index !== argument.contentTo && (!splitOnComma || source[index] !== ","))
+    let index = argument.contentFrom;
+    while (index <= argument.contentTo) {
+        if (index < argument.contentTo && isLatexCommentStart(source, index)) {
+            index = skipLatexComment(source, index);
+            if (source[index] === "\n")
+                index += 1;
             continue;
-        let from = segmentStart;
-        let to = index;
-        while (from < to && /\s/.test(source[from]))
-            from += 1;
-        while (to > from && /\s/.test(source[to - 1]))
-            to -= 1;
-        if (to > from)
-            paths.push({ path: source.slice(from, to), command: "", from, to });
+        }
+        if (index !== argument.contentTo && (!splitOnComma || source[index] !== ",")) {
+            index += 1;
+            continue;
+        }
+        const reference = pathReferenceFromRange(source, segmentStart, index);
+        if (reference)
+            paths.push(reference);
         segmentStart = index + 1;
+        index += 1;
     }
     return paths;
 }
+/**
+ * Turn a raw argument segment into a project path while preserving the source
+ * range that produced it. Comments disappear in TeX before filename handling,
+ * so a comment between path fragments must not become part of the path.
+ */
+function pathReferenceFromRange(source, start, end) {
+    const characters = [];
+    let index = start;
+    while (index < end) {
+        if (isLatexCommentStart(source, index)) {
+            index = skipLatexComment(source, index);
+            if (source[index] === "\n")
+                index += 1;
+            continue;
+        }
+        characters.push({ character: source[index], index });
+        index += 1;
+    }
+    let first = 0;
+    let last = characters.length;
+    while (first < last && /\s/.test(characters[first].character))
+        first += 1;
+    while (last > first && /\s/.test(characters[last - 1].character))
+        last -= 1;
+    if (first === last)
+        return null;
+    return {
+        path: characters.slice(first, last).map((entry) => entry.character).join(""),
+        command: "",
+        from: characters[first].index,
+        to: characters[last - 1].index + 1
+    };
+}
+/** Read TeX's common `\\input filename` form without guessing macro expansion. */
+function readUnbracedInputPath(source, start) {
+    const from = skipLatexTrivia(source, start);
+    if (from >= source.length || /[\\{}\[\]#~]/.test(source[from]))
+        return null;
+    let to = from;
+    while (to < source.length && !/\s/.test(source[to]) && !isLatexCommentStart(source, to)) {
+        if (/[\\{}\[\]#~]/.test(source[to]))
+            break;
+        to += 1;
+    }
+    if (to === from)
+        return null;
+    return { path: source.slice(from, to), command: "", from, to };
+}
 /**
  * Find source files pulled into a LaTeX document. Paths intentionally remain
  * raw: project-level code is responsible for resolving them safely.
@@ -28,27 +81,34 @@ export function findLatexSourceIncludes(source) {
         const name = command.name.toLowerCase();
         if (name === "input" || name === "include" || name === "subfile") {
             const argument = readLatexMandatoryArguments(source, command.to, 1)[0];
-            if (!argument)
-                return;
-            for (const include of pathRanges(source, argument, false))
-                includes.push({ ...include, command: command.name });
+            if (argument) {
+                for (const include of pathRanges(source, argument, false))
+                    includes.push({ ...include, command: command.name });
+            }
+            else if (name === "input") {
+                const include = readUnbracedInputPath(source, command.to);
+                if (include)
+                    includes.push({ ...include, command: command.name });
+            }
             return;
         }
-        if (name !== "import" && name !== "subimport" && name !== "includefrom" && name !== "inputfrom")
+        if (name !== "import" && name !== "subimport" && name !== "includefrom" && name !== "inputfrom"
+            && name !== "subinputfrom" && name !== "subincludefrom")
             return;
         const argumentsFound = readLatexMandatoryArguments(source, command.to, 2);
         if (argumentsFound.length !== 2)
             return;
-        const directory = source.slice(argumentsFound[0].contentFrom, argumentsFound[0].contentTo).trim();
-        const file = source.slice(argumentsFound[1].contentFrom, argumentsFound[1].contentTo).trim();
-        if (!directory || !file)
+        const directory = pathRanges(source, argumentsFound[0], false)[0]?.path ?? "";
+        const file = pathRanges(source, argumentsFound[1], false)[0];
+        if (!file)
             return;
-        const separator = directory.endsWith("/") ? "" : "/";
+        const separator = directory && !directory.endsWith("/") ? "/" : "";
         includes.push({
-            path: directory + separator + file,
+            path: directory + separator + file.path,
             command: command.name,
-            from: argumentsFound[1].contentFrom,
-            to: argumentsFound[1].contentTo
+            from: file.from,
+            to: file.to,
+            directory
         });
     });
     return includes;

package/dist/shared/writingChecks.js

@@ -1,4 +1,4 @@
-/** Bibliographies are structured reference data, not prose. */
+/** Bibliographies and BibTeX style programs are structured data/code, not prose. */
 export function supportsWritingChecks(path) {
-    return !/\.bib$/i.test(path.trim());
+    return !/\.(?:bib|bst)$/i.test(path.trim());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "texlite",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "A lightweight local-first collaborative LaTeX workspace",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -41,8 +41,9 @@
   },
   "type": "module",
   "scripts": {
-    "dev": "npm run generate:lucide-icons && tsx watch src/server/index.ts",
-    "dev:web": "npm run generate:bibtex-parser && vite",
+    "dev": "npm run generate:lucide-icons && node scripts/run-dev.mjs server",
+    "dev:init": "node scripts/run-dev.mjs init",
+    "dev:web": "npm run generate:bibtex-parser && node scripts/run-dev.mjs web",
     "build": "npm run build:web && npm run build:server",
     "build:web": "npm run generate:bibtex-parser && vite build",
     "build:server": "tsc -p tsconfig.server.json && npm run generate:lucide-icons",

package/dist/client/assets/AdminUsers-Buf5ZclR.js

@@ -1 +0,0 @@
-import{u as Y,r as n,j as e}from"./react-BVUjbTTn.js";import{c as h,M as D,d as _,C as ee,g as u,h as m}from"./index-DIM_KiG2.js";import{U as se,T as R,X as O}from"./x-CSzFikn2.js";import{U as $}from"./user-plus-gQ6q5Nom.js";import{S as ae}from"./Dashboard-DLk2j3oq.js";import{K as B}from"./key-round-BjL9H8-H.js";import"./hard-drive-B-NSDVVA.js";import"./sigma-DOcJr7VG.js";import"./tags-BedQ75lh.js";import"./chevron-left-l1oupvGO.js";const re=h("Dices",[["rect",{width:"12",height:"12",x:"2",y:"10",rx:"2",ry:"2",key:"6agr2n"}],["path",{d:"m17.92 14 3.5-3.5a2.24 2.24 0 0 0 0-3l-5-4.92a2.24 2.24 0 0 0-3 0L10 6",key:"1o487t"}],["path",{d:"M6 18h.01",key:"uhywen"}],["path",{d:"M10 14h.01",key:"ssrbsk"}],["path",{d:"M15 6h.01",key:"cblpky"}],["path",{d:"M18 9h.01",key:"2061c0"}]]);const ne=h("FolderCheck",[["path",{d:"M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z",key:"1kt360"}],["path",{d:"m9 13 2 2 4-4",key:"6343dt"}]]);const te=h("FolderX",[["path",{d:"M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z",key:"1kt360"}],["path",{d:"m9.5 10.5 5 5",key:"ra9qjz"}],["path",{d:"m14.5 10.5-5 5",key:"l2rkpq"}]]);const ie=h("ShieldOff",[["path",{d:"m2 2 20 20",key:"1ooewy"}],["path",{d:"M5 5a1 1 0 0 0-1 1v7c0 5 3.5 7.5 7.67 8.94a1 1 0 0 0 .67.01c2.35-.82 4.48-1.97 5.9-3.71",key:"1jlk70"}],["path",{d:"M9.309 3.652A12.252 12.252 0 0 0 11.24 2.28a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1v7a9.784 9.784 0 0 1-.08 1.264",key:"18rp1v"}]]);const oe=h("UserCheck",[["path",{d:"M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2",key:"1yyitq"}],["circle",{cx:"9",cy:"7",r:"4",key:"nufk8"}],["polyline",{points:"16 11 18 13 22 9",key:"1pwet4"}]]);const le=h("UserX",[["path",{d:"M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2",key:"1yyitq"}],["circle",{cx:"9",cy:"7",r:"4",key:"nufk8"}],["line",{x1:"17",x2:"22",y1:"8",y2:"13",key:"3nzzx3"}],["line",{x1:"22",x2:"17",y1:"8",y2:"13",key:"1swrse"}]]);function de(p=10){const t="ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789!@#$%",a=crypto.getRandomValues(new Uint8Array(p));return Array.from(a,S=>t[S%t.length]).join("")}function Ce({currentUser:p,minPasswordLength:t}){const{t:a}=Y(),[S,J]=n.useState([]),[E,d]=n.useState(""),[V,C]=n.useState(!1),[r,o]=n.useState({username:"",displayName:"",password:"",role:"user",canCreateProjects:!1}),[k,g]=n.useState(null),[j,P]=n.useState(""),[x,w]=n.useState(null),[z,N]=n.useState(!1),[i,F]=n.useState(!1),[U,y]=n.useState(""),[l,f]=n.useState(null),[A,H]=n.useState(!1),[X,c]=n.useState(""),b=()=>u("/api/admin/users").then(({users:s})=>J(s)).catch(s=>d(m(s)));n.useEffect(()=>{b()},[]);const q=async()=>{if(r.password.length<t)return d(a("auth.passwordMinimum",{count:t}));try{await u("/api/admin/users",{method:"POST",body:JSON.stringify({username:r.username,displayName:r.displayName||r.username,password:r.password,role:r.role,canCreateProjects:r.canCreateProjects})}),C(!1),o({username:"",displayName:"",password:"",role:"user",canCreateProjects:!1}),await b()}catch(s){d(m(s))}},M=async(s,v)=>{try{await u(`/api/admin/users/${s.id}`,{method:"PATCH",body:JSON.stringify(v)}),await b()}catch(T){d(m(T))}},K=async s=>{if(!s.disabled){f({target:s,setting:"disable"}),c("");return}await M(s,{disabled:!1})},Z=async s=>{if(s.role==="admin"){f({target:s,setting:"demote"}),c("");return}await M(s,{role:"admin"})},G=async s=>{if(s.canCreateProjects){f({target:s,setting:"denyProjectCreation"}),c("");return}await M(s,{canCreateProjects:!0})},I=async()=>{if(!l)return;const{target:s,setting:v}=l,T=v==="disable"?{disabled:!0}:v==="demote"?{role:"user"}:{canCreateProjects:!1};H(!0),c("");try{await u(`/api/admin/users/${s.id}`,{method:"PATCH",body:JSON.stringify(T)}),await b(),f(null)}catch(W){c(m(W))}finally{H(!1)}},L=async()=>{if(!(!k||!j)){if(j.length<t)return d(a("auth.passwordMinimum",{count:t}));try{await u(`/api/admin/users/${k.id}`,{method:"PATCH",body:JSON.stringify({password:j})}),g(null),P("")}catch(s){d(m(s))}}},Q=async()=>{if(!(!x||i)){F(!0),y("");try{await u(`/api/admin/users/${x.id}`,{method:"DELETE",body:JSON.stringify({deleteProjects:z})}),w(null),N(!1),await b()}catch(s){y(m(s))}finally{F(!1)}}};return e.jsxs("main",{className:"dashboard",children:[e.jsxs("div",{className:"section-title",children:[e.jsxs("div",{children:[e.jsxs("h1",{children:[e.jsx(se,{"aria-hidden":!0,size:25}),a("users.manage")]}),e.jsx("p",{className:"muted",children:a("users.onlyAdmin")})]}),e.jsxs("button",{className:"primary icon-button",onClick:()=>C(!0),children:[e.jsx($,{"aria-hidden":!0,size:15}),a("users.add")]})]}),E&&e.jsx("p",{className:"error",children:E}),e.jsx("div",{className:"table-card",children:e.jsxs("table",{children:[e.jsx("thead",{children:e.jsxs("tr",{children:[e.jsx("th",{children:a("common.user")}),e.jsx("th",{children:a("users.role")}),e.jsx("th",{children:a("users.createProjects")}),e.jsx("th",{children:a("users.ownedProjects")}),e.jsx("th",{children:a("users.status")}),e.jsx("th",{children:a("users.actions")})]})}),e.jsx("tbody",{children:S.map(s=>e.jsxs("tr",{children:[e.jsxs("td",{children:[e.jsx("strong",{children:s.displayName}),e.jsxs("small",{children:["@",s.username]})]}),e.jsx("td",{children:s.role==="admin"?a("common.admin"):a("common.user")}),e.jsx("td",{children:s.canCreateProjects?a("users.allow"):a("users.deny")}),e.jsx("td",{children:s.ownedProjects}),e.jsx("td",{children:s.disabled?a("common.disabled"):a("common.normal")}),e.jsxs("td",{children:[e.jsxs("button",{className:"icon-button",disabled:s.id===p.id,onClick:()=>K(s),children:[s.disabled?e.jsx(oe,{"aria-hidden":!0,size:13}):e.jsx(le,{"aria-hidden":!0,size:13}),s.disabled?a("users.enable"):a("users.disable")]}),e.jsxs("button",{className:"icon-button",disabled:s.id===p.id,onClick:()=>Z(s),children:[s.role==="admin"?e.jsx(ie,{"aria-hidden":!0,size:13}):e.jsx(ae,{"aria-hidden":!0,size:13}),s.role==="admin"?a("users.demote"):a("users.promote")]}),e.jsxs("button",{className:"icon-button",disabled:s.role==="admin",onClick:()=>G(s),children:[s.canCreateProjects?e.jsx(te,{"aria-hidden":!0,size:13}):e.jsx(ne,{"aria-hidden":!0,size:13}),s.canCreateProjects?a("users.denyCreate"):a("users.allowCreate")]}),e.jsxs("button",{className:"icon-button",onClick:()=>{g(s),P("")},children:[e.jsx(B,{"aria-hidden":!0,size:13}),a("users.resetPassword")]}),e.jsxs("button",{className:"icon-button danger-text",disabled:s.id===p.id,onClick:()=>{w(s),N(!1),y("")},children:[e.jsx(R,{"aria-hidden":!0,size:13}),a("common.delete")]})]})]},s.id))})]})}),e.jsx(D,{open:V,title:a("users.add"),description:a("users.addDescription"),onOpenChange:C,footer:e.jsxs(e.Fragment,{children:[e.jsxs("button",{className:"icon-button",onClick:()=>C(!1),children:[e.jsx(O,{"aria-hidden":!0,size:14}),a("common.cancel")]}),e.jsxs("button",{className:"primary icon-button",disabled:r.password.length<t,onClick:()=>{q()},children:[e.jsx($,{"aria-hidden":!0,size:14}),a("users.createUser")]})]}),children:e.jsxs("div",{className:"form-stack",children:[e.jsxs("label",{className:"form-field",children:[a("auth.username"),e.jsx("input",{value:r.username,onChange:s=>o({...r,username:s.target.value})})]}),e.jsxs("label",{className:"form-field",children:[a("users.displayName"),e.jsx("input",{value:r.displayName,onChange:s=>o({...r,displayName:s.target.value})})]}),e.jsxs("label",{className:"form-field",children:[a("users.initialPassword"),e.jsxs("span",{className:"password-generator",children:[e.jsx("input",{minLength:t,autoComplete:"new-password",value:r.password,onChange:s=>o({...r,password:s.target.value})}),e.jsxs("button",{type:"button",title:a("users.generatePassword"),onClick:()=>o({...r,password:de()}),children:[e.jsx(re,{size:15}),a("users.randomPassword")]})]}),e.jsx("small",{className:"field-hint",children:a("auth.passwordMinimum",{count:t})})]}),e.jsxs("label",{className:"form-field",children:[a("users.role"),e.jsxs("select",{value:r.role,onChange:s=>o({...r,role:s.target.value}),children:[e.jsx("option",{value:"user",children:a("common.user")}),e.jsx("option",{value:"admin",children:a("common.admin")})]})]}),e.jsxs("label",{className:"checkbox-field",children:[e.jsx("input",{type:"checkbox",checked:r.canCreateProjects||r.role==="admin",disabled:r.role==="admin",onChange:s=>o({...r,canCreateProjects:s.target.checked})})," ",a("users.allowCreate")]})]})}),e.jsx(D,{open:!!k,title:a("users.resetPassword"),description:a("users.resetDescription",{username:k?.username??""}),onOpenChange:s=>{s||g(null)},footer:e.jsxs(e.Fragment,{children:[e.jsxs("button",{className:"icon-button",onClick:()=>g(null),children:[e.jsx(O,{"aria-hidden":!0,size:14}),a("common.cancel")]}),e.jsxs("button",{className:"primary icon-button",disabled:j.length<t,onClick:()=>{L()},children:[e.jsx(B,{"aria-hidden":!0,size:14}),a("users.reset")]})]}),children:e.jsxs("label",{className:"form-field",children:[a("auth.newPassword"),e.jsx("input",{autoFocus:!0,type:"password",minLength:t,autoComplete:"new-password",value:j,onChange:s=>P(s.target.value)}),e.jsx("small",{className:"field-hint",children:a("auth.passwordMinimum",{count:t})})]})}),e.jsx(D,{open:!!x,title:a("users.deleteTitle"),description:a("users.deleteDescription",{username:x?.username??""}),onOpenChange:s=>{!s&&!i&&(w(null),y(""))},footer:e.jsxs(e.Fragment,{children:[e.jsxs("button",{className:"icon-button",disabled:i,onClick:()=>{w(null),y("")},children:[e.jsx(O,{"aria-hidden":!0,size:14}),a("common.cancel")]}),e.jsxs("button",{className:"danger icon-button",disabled:i,"aria-busy":i,onClick:()=>{Q()},children:[i?e.jsx(_,{className:"spin","aria-hidden":!0,size:14}):e.jsx(R,{"aria-hidden":!0,size:14}),a(i?"common.loading":"users.deleteTitle")]})]}),children:e.jsxs(e.Fragment,{children:[U&&e.jsx("p",{className:"error dialog-error",children:U}),e.jsxs("fieldset",{className:"choice-group",disabled:i,children:[e.jsx("legend",{children:a("users.ownedChoice",{count:x?.ownedProjects??0})}),e.jsxs("label",{children:[e.jsx("input",{type:"radio",checked:!z,onChange:()=>N(!1)})," ",a("users.transferProjects")]}),e.jsxs("label",{children:[e.jsx("input",{type:"radio",checked:z,onChange:()=>N(!0)})," ",a("users.deleteProjects")]})]})]})}),e.jsx(ee,{open:!!l,title:a(`userConfirmations.${l?.setting??"disable"}Title`),description:a(`userConfirmations.${l?.setting??"disable"}Description`,{username:l?.target.username??""}),confirmLabel:a(`userConfirmations.${l?.setting??"disable"}Confirm`),danger:!0,busy:A,error:X,onCancel:()=>{A||(f(null),c(""))},onConfirm:()=>{I()}})]})}export{Ce as AdminUsers};