@aiquants/markdown 1.11.0 → 1.14.0

package/dist/index.server.js

@@ -1,115 +1,116 @@
-import A from "node:fs/promises";
-import * as v from "node:path";
+import I from "node:fs/promises";
+import * as S from "node:path";
 import h from "node:path";
-import { visit as D } from "unist-util-visit";
-import { L as S } from "./simple-logger-DIfMY3fH.js";
-import * as _ from "cheerio";
-import C from "url-join";
-import { spawn as E } from "node:child_process";
-import { existsSync as P, unlinkSync as U, accessSync as N, constants as I, chmodSync as B } from "node:fs";
-import * as J from "node:net";
-import { fileURLToPath as j } from "node:url";
-import { createClient as L } from "@connectrpc/connect";
-import { createConnectTransport as $ } from "@connectrpc/connect-node";
-import { Message as x, proto3 as m, MethodKind as q } from "@bufbuild/protobuf";
-const z = /<!--\s+@import\s+"(.+?)"\s+-->/;
-function me(t) {
+import { visit as x } from "unist-util-visit";
+import { L as P } from "./simple-logger-DIfMY3fH.js";
+import * as J from "cheerio";
+import U from "url-join";
+import { spawn as C } from "node:child_process";
+import { existsSync as R, unlinkSync as L } from "node:fs";
+import { createRequire as j } from "node:module";
+import * as F from "node:net";
+import { fileURLToPath as q } from "node:url";
+import { createClient as W } from "@connectrpc/connect";
+import { createConnectTransport as K } from "@connectrpc/connect-node";
+import { Message as _, proto3 as l, MethodKind as z } from "@bufbuild/protobuf";
+const G = /<!--\s+@import\s+"(.+?)"\s+-->/;
+function pe(r) {
   return async (e) => {
-    const { markdownFilePath: r } = t, i = h.dirname(r), o = [];
-    if (D(e, "html", (a, n, s) => {
+    const { markdownFilePath: t } = r, m = h.dirname(t), o = [];
+    if (x(e, "html", (a, n, s) => {
       if (!s || typeof n != "number")
         return;
-      const c = a.value.match(z);
-      if (!c)
+      const i = a.value.match(G);
+      if (!i)
         return;
-      const f = c[1], l = h.resolve(i, f);
-      Array.isArray(s.children) && o.push({ parent: s, index: n, absolutePath: l });
+      const d = i[1], c = h.resolve(m, d);
+      Array.isArray(s.children) && o.push({ parent: s, index: n, absolutePath: c });
     }), o.length === 0)
       return;
-    const d = await Promise.all(
+    const f = await Promise.all(
       o.map(async ({ absolutePath: a }) => {
         try {
-          const n = await A.readFile(a, "utf-8");
+          const n = await I.readFile(a, "utf-8");
           return this.parse(n);
         } catch (n) {
-          return n && n.code === "ENOENT" ? S.warn(`[remark-import-directive] Import file not found: ${a}`) : S.error(`[remark-import-directive] Error processing import: ${a}`, n), null;
+          return n && n.code === "ENOENT" ? P.warn(`[remark-import-directive] Import file not found: ${a}`) : P.error(`[remark-import-directive] Error processing import: ${a}`, n), null;
         }
       })
     );
     for (let a = o.length - 1; a >= 0; a--) {
-      const { parent: n, index: s } = o[a], c = d[a];
-      c?.children && Array.isArray(c.children) && n.children.splice(s, 1, ...c.children);
+      const { parent: n, index: s } = o[a], i = f[a];
+      i?.children && Array.isArray(i.children) && n.children.splice(s, 1, ...i.children);
     }
   };
 }
-const K = /^[a-z][a-z0-9+.-]*:/, M = async (t, e, r, i, o = !1) => {
-  if (!t)
+const Z = /^[a-z][a-z0-9+.-]*:/, M = async (r, e, t, m, o = !1) => {
+  if (!r)
     return "";
-  if (K.test(t)) {
-    const f = t.substring(0, t.indexOf(":")).toLowerCase();
-    if (["http", "https", "mailto", "tel", "file"].includes(f))
-      return t;
+  if (Z.test(r)) {
+    const d = r.substring(0, r.indexOf(":")).toLowerCase();
+    if (["http", "https", "mailto", "tel", "file"].includes(d))
+      return r;
   }
-  if (t.startsWith("#") || t.startsWith("/"))
-    return t;
-  const d = decodeURIComponent(t), a = h.dirname(r), n = h.normalize(h.join(a, d)), s = h.resolve(i, n);
-  if (!s.startsWith(i) || n.startsWith(".."))
-    return S.error(`Security Alert: Attempt to access file outside project root: ${s}`), "";
+  if (r.startsWith("#") || r.startsWith("/"))
+    return r;
+  const f = decodeURIComponent(r), a = h.dirname(t), n = h.normalize(h.join(a, f)), s = h.resolve(m, n);
+  if (!s.startsWith(m) || n.startsWith(".."))
+    return P.error(`Security Alert: Attempt to access file outside project root: ${s}`), "";
   if (o)
     try {
-      await A.access(s);
+      await I.access(s);
     } catch {
-      return S.warn(`File not found: ${s}`), "";
+      return P.warn(`File not found: ${s}`), "";
     }
-  const c = n.replace(/\\/g, "/");
-  return e ? C("/assets/", c) : `?filePath=${encodeURIComponent(c)}`;
+  const i = n.replace(/\\/g, "/");
+  return e ? U("/assets/", i) : `?filePath=${encodeURIComponent(i)}`;
 };
-function ue(t) {
+function he(r) {
   return async (e) => {
-    if (!(t?.markdownFilePath && t?.workspaceRoot)) {
-      S.warn("remark-resolve-uri-async: markdownFilePath and workspaceRoot are required. Skipping URI resolution.");
+    if (!(r?.markdownFilePath && r?.workspaceRoot)) {
+      P.warn("remark-resolve-uri-async: markdownFilePath and workspaceRoot are required. Skipping URI resolution.");
       return;
     }
-    const r = [], i = [];
-    D(e, ["image", "link", "html"], (a) => {
+    const t = [], m = [];
+    x(e, ["image", "link", "html"], (a) => {
       if (a.type === "html")
-        i.push(a);
+        m.push(a);
       else {
         const n = a;
-        n.url && r.push({ node: n, isImage: n.type === "image" });
+        n.url && t.push({ node: n, isImage: n.type === "image" });
       }
     });
-    const o = r.map(async ({ node: a, isImage: n }) => {
-      const s = await M(a.url, n, t.markdownFilePath, t.workspaceRoot, t.validateExistence);
+    const o = t.map(async ({ node: a, isImage: n }) => {
+      const s = await M(a.url, n, r.markdownFilePath, r.workspaceRoot, r.validateExistence);
       a.url = s;
-    }), d = i.map(async (a) => {
-      const n = _.load(a.value, null, !1);
+    }), f = m.map(async (a) => {
+      const n = J.load(a.value, null, !1);
       let s = !1;
-      const c = n("img").toArray();
-      for (const l of c) {
-        const u = n(l).attr("src");
+      const i = n("img").toArray();
+      for (const c of i) {
+        const u = n(c).attr("src");
         if (u) {
-          const p = await M(u, !0, t.markdownFilePath, t.workspaceRoot, t.validateExistence);
-          p !== u && (n(l).attr("src", p), s = !0);
+          const p = await M(u, !0, r.markdownFilePath, r.workspaceRoot, r.validateExistence);
+          p !== u && (n(c).attr("src", p), s = !0);
         }
       }
-      const f = n("a").toArray();
-      for (const l of f) {
-        const u = n(l).attr("href");
+      const d = n("a").toArray();
+      for (const c of d) {
+        const u = n(c).attr("href");
         if (u) {
-          const p = await M(u, !1, t.markdownFilePath, t.workspaceRoot, t.validateExistence);
-          p !== u && (n(l).attr("href", p), s = !0);
+          const p = await M(u, !1, r.markdownFilePath, r.workspaceRoot, r.validateExistence);
+          p !== u && (n(c).attr("href", p), s = !0);
         }
       }
       if (s) {
-        const l = n.html();
-        l && (a.value = l);
+        const c = n.html();
+        c && (a.value = c);
       }
     });
-    await Promise.all([...o, ...d]);
+    await Promise.all([...o, ...f]);
   };
 }
-class w extends x {
+class w extends _ {
   /**
    * @generated from field: string markdown_text = 1;
    */
@@ -151,11 +152,11 @@ class w extends x {
    */
   enableZennDirectives;
   constructor(e) {
-    super(), m.util.initPartial(e, this);
+    super(), l.util.initPartial(e, this);
   }
-  static runtime = m;
+  static runtime = l;
   static typeName = "markdown.v1.ConvertRequest";
-  static fields = m.util.newFieldList(() => [
+  static fields = l.util.newFieldList(() => [
     {
       no: 1,
       name: "markdown_text",
@@ -191,20 +192,20 @@ class w extends x {
     { no: 9, name: "enable_embeds", kind: "scalar", T: 8, opt: !0 },
     { no: 10, name: "enable_zenn_directives", kind: "scalar", T: 8, opt: !0 }
   ]);
-  static fromBinary(e, r) {
-    return new w().fromBinary(e, r);
+  static fromBinary(e, t) {
+    return new w().fromBinary(e, t);
   }
-  static fromJson(e, r) {
-    return new w().fromJson(e, r);
+  static fromJson(e, t) {
+    return new w().fromJson(e, t);
   }
-  static fromJsonString(e, r) {
-    return new w().fromJsonString(e, r);
+  static fromJsonString(e, t) {
+    return new w().fromJsonString(e, t);
   }
-  static equals(e, r) {
-    return m.util.equals(w, e, r);
+  static equals(e, t) {
+    return l.util.equals(w, e, t);
   }
 }
-class k extends x {
+class k extends _ {
   /**
    * @generated from field: string html_content = 1;
    */
@@ -214,11 +215,11 @@ class k extends x {
    */
   headings = [];
   constructor(e) {
-    super(), m.util.initPartial(e, this);
+    super(), l.util.initPartial(e, this);
   }
-  static runtime = m;
+  static runtime = l;
   static typeName = "markdown.v1.ConvertResponse";
-  static fields = m.util.newFieldList(() => [
+  static fields = l.util.newFieldList(() => [
     {
       no: 1,
       name: "html_content",
@@ -228,20 +229,20 @@ class k extends x {
     },
     { no: 2, name: "headings", kind: "message", T: y, repeated: !0 }
   ]);
-  static fromBinary(e, r) {
-    return new k().fromBinary(e, r);
+  static fromBinary(e, t) {
+    return new k().fromBinary(e, t);
   }
-  static fromJson(e, r) {
-    return new k().fromJson(e, r);
+  static fromJson(e, t) {
+    return new k().fromJson(e, t);
   }
-  static fromJsonString(e, r) {
-    return new k().fromJsonString(e, r);
+  static fromJsonString(e, t) {
+    return new k().fromJsonString(e, t);
   }
-  static equals(e, r) {
-    return m.util.equals(k, e, r);
+  static equals(e, t) {
+    return l.util.equals(k, e, t);
   }
 }
-class y extends x {
+class y extends _ {
   /**
    * @generated from field: string text = 1;
    */
@@ -255,11 +256,11 @@ class y extends x {
    */
   id = "";
   constructor(e) {
-    super(), m.util.initPartial(e, this);
+    super(), l.util.initPartial(e, this);
   }
-  static runtime = m;
+  static runtime = l;
   static typeName = "markdown.v1.Heading";
-  static fields = m.util.newFieldList(() => [
+  static fields = l.util.newFieldList(() => [
     {
       no: 1,
       name: "text",
@@ -282,20 +283,20 @@ class y extends x {
       /* ScalarType.STRING */
     }
   ]);
-  static fromBinary(e, r) {
-    return new y().fromBinary(e, r);
+  static fromBinary(e, t) {
+    return new y().fromBinary(e, t);
   }
-  static fromJson(e, r) {
-    return new y().fromJson(e, r);
+  static fromJson(e, t) {
+    return new y().fromJson(e, t);
   }
-  static fromJsonString(e, r) {
-    return new y().fromJsonString(e, r);
+  static fromJsonString(e, t) {
+    return new y().fromJsonString(e, t);
   }
-  static equals(e, r) {
-    return m.util.equals(y, e, r);
+  static equals(e, t) {
+    return l.util.equals(y, e, t);
   }
 }
-const W = {
+const H = {
   typeName: "markdown.v1.MarkdownService",
   methods: {
     /**
@@ -305,117 +306,125 @@ const W = {
       name: "Convert",
       I: w,
       O: k,
-      kind: q.Unary
+      kind: z.Unary
     }
   }
-}, T = process.env.MARKDOWN_SOCKET_PATH || "/tmp/markdown.sock", G = $({
+}, b = process.env.MARKDOWN_SOCKET_PATH || "/tmp/markdown.sock", V = K({
   baseUrl: "http://localhost",
   httpVersion: "2",
   nodeOptions: {
-    createConnection: () => J.connect(T)
+    createConnection: () => F.connect(b)
   }
-}), Z = L(W, G), H = (t) => {
+}), X = W(H, V), E = () => {
   try {
-    N(t, I.X_OK);
+    return S.dirname(q(import.meta.url));
   } catch {
-    try {
-      B(t, 493);
-    } catch (e) {
-      console.warn("Failed to set executable permission on markdown-api binary:", e);
-    }
+    return __dirname;
   }
-}, X = () => {
+}, B = () => `@aiquants/markdown-${process.platform}-${process.arch}`, N = () => process.platform === "win32" ? "bin/markdown-api.exe" : "bin/markdown-api", Y = () => {
+  const r = process.env.MARKDOWN_API_BINARY;
+  if (r && R(r))
+    return r;
   try {
-    const t = j(import.meta.url);
-    return v.dirname(t);
+    const t = j(S.join(E(), "index.js")).resolve(`${B()}/${N()}`);
+    if (R(t))
+      return t;
   } catch {
-    return __dirname;
   }
-}, V = () => {
-  const t = X(), e = v.join(t, "markdown-api");
-  if (P(e)) return e;
-  const r = v.join(t, "..", "dist", "markdown-api");
-  if (P(r)) return r;
-  const i = v.join(t, "..", "..", "go", "markdown-api", "markdown-api");
-  if (P(i)) return i;
-}, R = () => new Promise((t) => {
-  const e = J.connect(T);
+  const e = S.join(E(), "..", "..", "go", "markdown-api", "dist", S.basename(N()));
+  return R(e) ? e : void 0;
+}, Q = () => [
+  `markdown-api binary not found for ${process.platform}-${process.arch}.`,
+  `Expected the optional dependency ${B()} to be installed.`,
+  "If your platform is unsupported, build the service yourself",
+  "(https://github.com/fehde-k/aiquants/tree/main/packages/go/markdown-api)",
+  "and point MARKDOWN_API_BINARY at it."
+].join(" "), D = () => new Promise((r) => {
+  const e = F.connect(b);
   e.on("connect", () => {
-    e.destroy(), t(!0);
-  }), e.on("error", () => t(!1));
-}), Q = async (t) => {
+    e.destroy(), r(!0);
+  }), e.on("error", () => r(!1));
+}), $ = async (r) => {
   const e = Date.now();
-  for (; Date.now() - e < t; ) {
-    if (await R()) return !0;
-    await new Promise((r) => setTimeout(r, 100));
+  for (; Date.now() - e < r; ) {
+    if (await D()) return !0;
+    await new Promise((t) => setTimeout(t, 100));
   }
   return !1;
 };
-let b = null, g = null;
-const Y = async () => {
-  if (await R()) return !0;
-  if (g) return g;
-  g = (async () => {
-    const e = V();
+let T = null, v = null;
+const O = 2e3, ee = () => {
+  const r = Number(process.env.MARKDOWN_API_STARTUP_TIMEOUT_MS);
+  return Number.isFinite(r) && r > 0 ? r : 1e4;
+};
+let A = null;
+const te = async () => {
+  if (await D()) return !0;
+  if (v) return v;
+  v = (async () => {
+    const e = Y();
     if (!e)
-      return console.warn("markdown-api binary not found. Cannot auto-start markdown server."), !1;
-    H(e);
+      return await $(O) ? !0 : (A = Q(), !1);
+    A = null;
     try {
-      P(T) && U(T);
+      R(b) && L(b);
     } catch {
     }
     try {
-      b = E(e, [], { stdio: "ignore" });
-      const r = () => {
-        if (b) {
+      T = C(e, [], { stdio: "ignore" });
+      const t = () => {
+        if (T) {
           try {
-            b.kill("SIGTERM");
+            T.kill("SIGTERM");
           } catch {
           }
-          b = null;
+          T = null;
         }
       };
-      return process.on("exit", r), await Q(1e4) ? !0 : (console.error("markdown-api Go server did not become ready on socket:", T), r(), !1);
-    } catch (r) {
-      return console.error("Failed to spawn markdown-api Go server:", r), b = null, !1;
+      return process.once("exit", t), await $(ee()) ? !0 : (console.error("markdown-api Go server did not become ready on socket:", b), t(), process.removeListener("exit", t), !1);
+    } catch (t) {
+      return console.error("Failed to spawn markdown-api Go server:", t), T = null, !1;
     }
   })();
-  const t = await g;
-  return t || (g = null), t;
-}, de = async (t, e, r, i, o = !0) => {
-  await Y();
-  let d = !0, a, n, s, c, f, l;
-  typeof o == "boolean" ? d = o : o && typeof o == "object" && (d = o.validateExistence ?? !0, a = o.enableSubscript, n = o.enableSuperscript, s = o.enableMark, c = o.enableTableMerge, f = o.enableEmbeds, l = o.enableZennDirectives);
+  const r = await v;
+  return r || (v = null), r;
+}, we = async (r, e, t, m, o = !0) => {
+  if (!await te()) {
+    const g = A ? ` ${A}` : "";
+    throw new Error(`markdown service is not reachable on ${b}.${g}`);
+  }
+  let f = !0, a, n, s, i, d, c;
+  typeof o == "boolean" ? f = o : o && typeof o == "object" && (f = o.validateExistence ?? !0, a = o.enableSubscript, n = o.enableSuperscript, s = o.enableMark, i = o.enableTableMerge, d = o.enableEmbeds, c = o.enableZennDirectives);
   const u = {};
-  i && (u.Authorization = `Bearer ${i}`);
-  const p = await Z.convert(
+  m && (u.Authorization = `Bearer ${m}`);
+  const p = await X.convert(
     {
-      markdownText: t,
+      markdownText: r,
       filePath: e,
-      workspaceRoot: r,
-      validateExistence: d,
+      workspaceRoot: t,
+      validateExistence: f,
       enableSubscript: a,
       enableSuperscript: n,
       enableMark: s,
-      enableTableMerge: c,
-      enableEmbeds: f,
-      enableZennDirectives: l
+      enableTableMerge: i,
+      enableEmbeds: d,
+      enableZennDirectives: c
     },
     { headers: u }
   );
   return {
     htmlContent: p.htmlContent,
-    headings: p.headings.map((F) => ({
-      text: F.text,
-      depth: F.depth,
-      id: F.id
+    headings: p.headings.map((g) => ({
+      text: g.text,
+      depth: g.depth,
+      id: g.id
     }))
   };
 };
 export {
-  de as parseMarkdown,
-  me as remarkImportDirective,
-  ue as remarkResolveUriAsync,
+  we as parseMarkdown,
+  pe as remarkImportDirective,
+  he as remarkResolveUriAsync,
   M as transformUriAsync
 };
 //# sourceMappingURL=index.server.js.map