@youtyan/code-viewer 0.6.4 → 0.6.6

package/dist/code-viewer.js

@@ -1053,10 +1053,14 @@ function normalizeBlameRef(ref, base) {
   return { base, ref: rawRef };
 }
 function run(args, cwd) {
-  return runSync(resolveGitArgs(args), cwd);
+  return runSync(resolveGitArgs(args), cwd, {
+    timeout: GIT_COMMAND_TIMEOUT_MS
+  });
 }
 function runBytes(args, cwd) {
-  return runBytesSync(resolveGitArgs(args), cwd);
+  return runBytesSync(resolveGitArgs(args), cwd, {
+    timeout: GIT_COMMAND_TIMEOUT_MS
+  });
 }
 function resolveGitArgs(args) {
   if (args[0] !== "git")
@@ -1077,10 +1081,13 @@ function gitFailureResult(res, fallback) {
     status: 503
   };
 }
-function repoRoot(cwd) {
-  const res = run(["git", "rev-parse", "--show-toplevel"], cwd);
+function runGitRefLookup(args, cwd) {
+  const res = run(args, cwd);
   return res.code === 0 ? res.stdout.trimEnd() : null;
 }
+function repoRoot(cwd) {
+  return runGitRefLookup(["git", "rev-parse", "--show-toplevel"], cwd);
+}
 function repoRootResult(cwd) {
   const res = run(["git", "rev-parse", "--show-toplevel"], cwd);
   if (res.code === 0)
@@ -1094,8 +1101,7 @@ function repoRootResult(cwd) {
   return { kind: "error", error: stderr || "git rev-parse failed" };
 }
 function currentBranch(cwd) {
-  const res = run(["git", "rev-parse", "--abbrev-ref", "HEAD"], cwd);
-  return res.code === 0 ? res.stdout.trimEnd() : null;
+  return runGitRefLookup(["git", "rev-parse", "--abbrev-ref", "HEAD"], cwd);
 }
 function verifyCommit(ref, cwd) {
   const res = run(["git", "rev-parse", "--verify", `${ref}^{commit}`], cwd);
@@ -2112,7 +2118,7 @@ function truncateToNHunks(diffText, n, maxLines = Number.POSITIVE_INFINITY) {
     lineTruncated
   };
 }
-var BLAME_ZERO_SHA = "0000000000000000000000000000000000000000", WORKTREE_RECURSIVE_DEPTH_LIMIT = 32, WORKTREE_RECURSIVE_ENTRY_LIMIT = 50000, DEFAULT_REF_COMMIT_LIMIT = 100, MAX_REF_COMMIT_LIMIT = 500, COMMIT_FORMAT = "%H%x00%s%x00%an%x00%aI", DEFAULT_WORKTREE_OMIT_DIR_NAMES, HISTORY_FORMAT = "%H%x00%s%x00%an%x00%aI%x00%P%x00%b", MAX_HISTORY_LIMIT = 200;
+var BLAME_ZERO_SHA = "0000000000000000000000000000000000000000", WORKTREE_RECURSIVE_DEPTH_LIMIT = 32, WORKTREE_RECURSIVE_ENTRY_LIMIT = 50000, DEFAULT_REF_COMMIT_LIMIT = 100, MAX_REF_COMMIT_LIMIT = 500, COMMIT_FORMAT = "%H%x00%s%x00%an%x00%aI", DEFAULT_WORKTREE_OMIT_DIR_NAMES, GIT_COMMAND_TIMEOUT_MS = 20000, HISTORY_FORMAT = "%H%x00%s%x00%an%x00%aI%x00%P%x00%b", MAX_HISTORY_LIMIT = 200;
 var init_git = __esm(() => {
   init_command_resolver();
   init_runtime();
@@ -11789,9 +11795,22 @@ var init_source_meta = __esm(() => {
     hcl: "terraform",
     xml: "xml",
     html: "xml",
-    vue: "xml",
+    vue: "vue",
+    svelte: "svelte",
+    astro: "astro",
+    erb: "erb",
+    rhtml: "erb",
+    ejs: "html",
+    hbs: "handlebars",
+    mustache: "handlebars",
+    liquid: "liquid",
+    pug: "pug",
+    twig: "twig",
+    haml: "haml",
     css: "css",
     scss: "scss",
+    sass: "sass",
+    less: "less",
     md: "markdown",
     dockerfile: "dockerfile",
     proto: "protobuf",
@@ -11834,7 +11853,26 @@ var init_source_meta = __esm(() => {
     mm: "objective-cpp",
     tex: "tex",
     bib: "bibtex",
-    rst: "rst"
+    rst: "rst",
+    graphql: "graphql",
+    graphqls: "graphql",
+    gql: "graphql",
+    ps1: "powershell",
+    psm1: "powershell",
+    psd1: "powershell",
+    ini: "ini",
+    conf: "ini",
+    env: "dotenv",
+    prisma: "prisma",
+    pas: "pascal",
+    adoc: "asciidoc",
+    asciidoc: "asciidoc",
+    jsonc: "jsonc",
+    mts: "typescript",
+    cts: "typescript",
+    kts: "kotlin",
+    cxx: "cpp",
+    hxx: "cpp"
   };
   TEXT_SOURCE_EXTENSIONS = new Set([
     ...Object.keys(EXT_TO_LANG),
@@ -11986,6 +12024,12 @@ var init_source_meta = __esm(() => {
     "rakefile",
     "procfile",
     "brewfile",
+    "guardfile",
+    "capfile",
+    "vagrantfile",
+    "podfile",
+    "fastfile",
+    "berksfile",
     "gnumakefile",
     "bsdmakefile",
     ".gitattributes",
@@ -12741,6 +12785,11 @@ function safePrepare(db, sql) {
   }
   return stmt;
 }
+function applyBusyTimeout(db) {
+  try {
+    db.prepare(`PRAGMA busy_timeout = ${SQLITE_BUSY_TIMEOUT_MS}`).get();
+  } catch {}
+}
 function queryRowsToResult(rows, columns) {
   const columnNames = rows.length > 0 ? Object.keys(rows[0]) : columns.map((c) => c.name);
   const typeMap = new Map(columns.map((c) => [c.name, c.type]));
@@ -13047,7 +13096,7 @@ function createSqliteAdapter(rawDb, openRawWriteDb) {
   };
   return adapter;
 }
-var sqliteAdapterFactory;
+var SQLITE_BUSY_TIMEOUT_MS = 2000, sqliteAdapterFactory;
 var init_sqlite = __esm(() => {
   init_mutate();
   init_sql_snapshot();
@@ -13058,7 +13107,12 @@ var init_sqlite = __esm(() => {
     async open(path) {
       const DbClass = await loadSqliteClass();
       const db = new DbClass(path, { readonly: true, create: false });
-      const openWriteDb = () => new DbClass(path);
+      applyBusyTimeout(db);
+      const openWriteDb = () => {
+        const wdb = new DbClass(path);
+        applyBusyTimeout(wdb);
+        return wdb;
+      };
       return createSqliteAdapter(db, openWriteDb);
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youtyan/code-viewer",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Local browser-based code and git diff viewer",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
   ],
   "scripts": {
     "build": "bun run build:web && bun run build:server",
-    "build:web": "bun build --target=browser --format=iife --outfile=web/app.js web-src/app.ts && bun build --target=browser --format=esm --outfile=web/mermaid.js web-src/mermaid-entry.ts && bun build --target=browser --format=esm --outfile=web/shiki.js web-src/shiki-entry.ts && node scripts/generate-third-party-notices.mjs",
+    "build:web": "bun build --target=browser --format=iife --outfile=web/app.js web-src/app.ts && bun build --target=browser --format=esm --outfile=web/mermaid.js web-src/mermaid-entry.ts && bun build --target=browser --format=esm --outfile=web/shiki.js web-src/shiki-entry.ts && bun build --target=browser --format=iife --outfile=web/vendor/highlight.js/highlight.min.js web-src/highlight-entry.ts && node scripts/generate-third-party-notices.mjs",
     "build:server": "bun build --target=node --format=esm --outfile=dist/code-viewer.js web-src/server/cli.ts",
     "check": "bun run typecheck",
     "typecheck": "tsc --noEmit",
@@ -49,7 +49,7 @@
     "test:postgres:down": "docker compose -f data/test/postgresql/docker-compose.yml down -v",
     "test": "bun test",
     "lint": "biome lint web-src package.json biome.jsonc",
-    "verify": "bun run check && bun run lint && bun run check:format && bun run build && bun run check:bundle && bun run test && node --check web/app.js && node --check web/mermaid.js && node --check web/shiki.js && node --check dist/code-viewer.js && node dist/code-viewer.js --help && node scripts/node-smoke.mjs",
+    "verify": "bun run check && bun run lint && bun run check:format && bun run build && bun run check:bundle && bun run test && node --check web/app.js && node --check web/mermaid.js && node --check web/shiki.js && node --check web/vendor/highlight.js/highlight.min.js && node --check dist/code-viewer.js && node dist/code-viewer.js --help && node scripts/node-smoke.mjs",
     "pack:dry": "npm pack --dry-run",
     "prepack": "bun run build",
     "prepublishOnly": "bun run verify"
@@ -68,6 +68,7 @@
     "@happy-dom/global-registrator": "^20.10.6",
     "@types/bun": "1.3.13",
     "@types/markdown-it": "14.1.2",
+    "highlight.js": "11.9.0",
     "markdown-it": "14.1.1",
     "markdown-it-anchor": "9.2.0",
     "markdown-it-footnote": "4.0.0",

package/web/app.js

@@ -1186,9 +1186,22 @@ ${lines.join(`
     hcl: "terraform",
     xml: "xml",
     html: "xml",
-    vue: "xml",
+    vue: "vue",
+    svelte: "svelte",
+    astro: "astro",
+    erb: "erb",
+    rhtml: "erb",
+    ejs: "html",
+    hbs: "handlebars",
+    mustache: "handlebars",
+    liquid: "liquid",
+    pug: "pug",
+    twig: "twig",
+    haml: "haml",
     css: "css",
     scss: "scss",
+    sass: "sass",
+    less: "less",
     md: "markdown",
     dockerfile: "dockerfile",
     proto: "protobuf",
@@ -1231,7 +1244,26 @@ ${lines.join(`
     mm: "objective-cpp",
     tex: "tex",
     bib: "bibtex",
-    rst: "rst"
+    rst: "rst",
+    graphql: "graphql",
+    graphqls: "graphql",
+    gql: "graphql",
+    ps1: "powershell",
+    psm1: "powershell",
+    psd1: "powershell",
+    ini: "ini",
+    conf: "ini",
+    env: "dotenv",
+    prisma: "prisma",
+    pas: "pascal",
+    adoc: "asciidoc",
+    asciidoc: "asciidoc",
+    jsonc: "jsonc",
+    mts: "typescript",
+    cts: "typescript",
+    kts: "kotlin",
+    cxx: "cpp",
+    hxx: "cpp"
   };
   var TEXT_SOURCE_EXTENSIONS = new Set([
     ...Object.keys(EXT_TO_LANG),
@@ -1383,6 +1415,12 @@ ${lines.join(`
     "rakefile",
     "procfile",
     "brewfile",
+    "guardfile",
+    "capfile",
+    "vagrantfile",
+    "podfile",
+    "fastfile",
+    "berksfile",
     "gnumakefile",
     "bsdmakefile",
     ".gitattributes",
@@ -1403,7 +1441,16 @@ ${lines.join(`
     "go.mod": "go",
     "build.bazel": "starlark",
     "workspace.bazel": "starlark",
-    "module.bazel": "starlark"
+    "module.bazel": "starlark",
+    gemfile: "ruby",
+    rakefile: "ruby",
+    brewfile: "ruby",
+    guardfile: "ruby",
+    capfile: "ruby",
+    vagrantfile: "ruby",
+    podfile: "ruby",
+    fastfile: "ruby",
+    berksfile: "ruby"
   };
   function sourceFileName(path) {
     return (path.split("/").pop() || path).toLowerCase();
@@ -32092,6 +32139,8 @@ code-viewer query agent-help`
       return true;
     }
     const SOURCE_SHIKI_LANGS = Array.from(new Set([
+      "asciidoc",
+      "astro",
       "bash",
       "bibtex",
       "c",
@@ -32103,33 +32152,46 @@ code-viewer query agent-help`
       "dart",
       "diff",
       "dockerfile",
+      "dotenv",
       "elixir",
+      "erb",
       "erlang",
       "fortran",
       "go",
       "gradle",
       "graphql",
+      "haml",
+      "handlebars",
       "haskell",
       "html",
+      "ini",
       "java",
       "javascript",
       "json",
+      "jsonc",
       "julia",
       "kotlin",
+      "less",
+      "liquid",
       "lua",
       "make",
       "markdown",
       "nix",
       "ocaml",
+      "pascal",
       "perl",
       "php",
+      "powershell",
+      "prisma",
       "properties",
       "protobuf",
+      "pug",
       "python",
       "r",
       "rst",
       "ruby",
       "rust",
+      "sass",
       "scala",
       "scss",
       "sql",
@@ -32137,6 +32199,7 @@ code-viewer query agent-help`
       "terraform",
       "tex",
       "toml",
+      "twig",
       "typescript",
       "vim",
       "vue",

package/web/vendor/README.md

@@ -7,13 +7,17 @@ the generated bundles next to this directory are produced at build / pack time.
 | Package | Version | Files | License |
 | --- | --- | --- | --- |
 | diff2html | 3.4.56 | `diff2html/diff2html.min.css`, `diff2html/diff2html-ui.min.js` | MIT, https://github.com/rtfpessoa/diff2html |
-| highlight.js | 11.9.0 | `highlight.js/highlight.min.js`, `highlight.js/styles/github*.min.css` | BSD-3-Clause, https://github.com/highlightjs/highlight.js |
-| Browser bundle dependencies | fixed by `bun.lock` | generated `../app.js`, `../mermaid.js`, `../shiki.js` | see `THIRD_PARTY_NOTICES.txt` |
+| highlight.js styles | 11.9.0 | `highlight.js/LICENSE`, `highlight.js/styles/github*.min.css` | BSD-3-Clause, https://github.com/highlightjs/highlight.js |
+| Browser bundle dependencies | fixed by `bun.lock` | generated `../app.js`, `../mermaid.js`, `../shiki.js`, `highlight.js/highlight.min.js` | see `THIRD_PARTY_NOTICES.txt` |
 
-`diff2html-ui.min.js` is the UI bundle from the npm package. `highlight.min.js`
-is the standard browser build for highlight.js 11.9.0.
+`diff2html-ui.min.js` is the UI bundle from the npm package. The
+`highlight.js/styles/*.min.css` theme files and `highlight.js/LICENSE` are
+committed manually; they only need to be refreshed when upgrading the
+`highlight.js` version pinned in `package.json`.
 
-`../app.js`, `../mermaid.js`, and `../shiki.js` are generated by
-`bun run build:web` and are included in npm tarballs, but are not tracked in git.
+`../app.js`, `../mermaid.js`, `../shiki.js`, and `highlight.js/highlight.min.js`
+are generated by `bun run build:web` (the last one registers every language
+bundled with `highlight.js`, not just its CDN "common" subset) and are
+included in npm tarballs, but are not tracked in git.
 `THIRD_PARTY_NOTICES.txt` is generated from the installed npm packages during
 the same build.

package/web/vendor/THIRD_PARTY_NOTICES.txt

@@ -2,7 +2,7 @@ Third Party Notices
 ===================
 
 This file is generated by scripts/generate-third-party-notices.mjs.
-It covers npm packages pulled into the browser bundles generated as web/app.js, web/mermaid.js, and web/shiki.js.
+It covers npm packages pulled into the browser bundles generated as web/app.js, web/mermaid.js, web/shiki.js, and web/vendor/highlight.js/highlight.min.js.
 
 Package Summary
 ---------------
@@ -126,6 +126,7 @@ Package Summary
 | hachure-fill | 0.5.2 | MIT | https://github.com/pshihn/hachure-fill#readme |
 | hast-util-to-html | 9.0.5 | MIT | syntax-tree/hast-util-to-html |
 | hast-util-whitespace | 3.0.0 | MIT | syntax-tree/hast-util-whitespace |
+| highlight.js | 11.9.0 | BSD-3-Clause | https://highlightjs.org/ |
 | html-void-elements | 3.0.0 | MIT | wooorm/html-void-elements |
 | iconv-lite | 0.6.3 | MIT | https://github.com/ashtuchkin/iconv-lite |
 | internmap | 1.0.1 | ISC | https://github.com/mbostock/internmap/ |
@@ -5635,6 +5636,45 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+highlight.js@11.9.0
+-------------------
+
+License metadata: BSD-3-Clause
+Source: https://highlightjs.org/
+Package metadata: node_modules/highlight.js/package.json
+
+File: node_modules/highlight.js/LICENSE
+
+BSD 3-Clause License
+
+Copyright (c) 2006, Ivan Sagalaev.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 html-void-elements@3.0.0
 ------------------------