@a9i5k4/dsh-literature 0.2.8 → 0.2.11

package/lib/index.js

@@ -1768,15 +1768,52 @@ var cite_exports = {};
 __export(cite_exports, {
   bibtex: () => bibtex,
   cite: () => cite,
-  listStyles: () => listStyles
+  citeDetailed: () => citeDetailed,
+  listStyles: () => listStyles,
+  segmentsToHtml: () => segmentsToHtml,
+  stripItalic: () => stripItalic,
+  toSegments: () => toSegments
 });
-function authorsList(record, { max = 99, ellipsis = ", et al." } = {}) {
+function apaInitials(firstName) {
+  const s = String(firstName ?? "").trim();
+  if (!s) return "";
+  return s.charAt(0).toUpperCase() + ".";
+}
+function apaAuthors(record) {
   const list = record.authors ?? [];
   if (!list.length) return "";
-  const names = list.map((a) => [a.lastName, a.firstName].filter(Boolean).join(", "));
-  if (names.length === 1) return names[0];
-  if (names.length <= max) return names.slice(0, -1).join(", ") + ", & " + names[names.length - 1];
-  return names.slice(0, max).join(", ") + ellipsis;
+  const name2 = (a) => {
+    if (CJK.test(a.lastName ?? "") || CJK.test(a.firstName ?? "")) return `${a.lastName ?? ""}${a.firstName ?? ""}`;
+    return [a.lastName, apaInitials(a.firstName)].filter(Boolean).join(", ");
+  };
+  if (list.length === 1) return name2(list[0]);
+  if (list.length <= 20) {
+    const names = list.map(name2);
+    return names.slice(0, -1).join(", ") + ", & " + names[names.length - 1];
+  }
+  return list.slice(0, 19).map(name2).join(", ") + ", \u2026 " + name2(list[list.length - 1]);
+}
+function mlaAuthors(record) {
+  const list = record.authors ?? [];
+  if (!list.length) return "";
+  const inverted = (a) => [a.lastName, a.firstName].filter(Boolean).join(", ");
+  const upright = (a) => [a.firstName, a.lastName].filter(Boolean).join(" ");
+  if (list.length === 1) return inverted(list[0]);
+  if (list.length === 2) return inverted(list[0]) + ", and " + upright(list[1]);
+  return inverted(list[0]) + ", et al";
+}
+function chicagoAuthors(record) {
+  const list = record.authors ?? [];
+  if (!list.length) return "";
+  const inverted = (a) => [a.lastName, a.firstName].filter(Boolean).join(", ");
+  const upright = (a) => [a.firstName, a.lastName].filter(Boolean).join(" ");
+  if (list.length === 1) return inverted(list[0]);
+  if (list.length === 2) return inverted(list[0]) + ", and " + upright(list[1]);
+  if (list.length <= 10) {
+    const parts = [inverted(list[0]), ...list.slice(1, -1).map(upright)];
+    return parts.join(", ") + ", and " + upright(list[list.length - 1]);
+  }
+  return list.slice(0, 7).map(inverted).join(", ") + ", et al";
 }
 function authorsShort(record) {
   const list = record.authors ?? [];
@@ -1796,13 +1833,13 @@ function doiUrl(record) {
   return record.doi ? `https://doi.org/${record.doi}` : record.url ?? "";
 }
 function apa(record) {
-  const authors2 = authorsList(record, { max: 20 });
-  const who = authors2 ? `${authors2}. ` : "";
+  const authors2 = apaAuthors(record);
+  const who = authors2 ? `${authors2} ` : "";
   const year = `(${yearStr(record)}). `;
   const title = (record.title ?? "Untitled").trim();
   if (record.itemType === "journalArticle" || record.itemType === "preprint") {
     const journal = record.container ? `*${record.container}*, ` : "";
-    const vol = record.volume ? `${record.volume}` : "";
+    const vol = record.volume ? `*${record.volume}*` : "";
     const issue = record.issue ? `(${record.issue})` : "";
     const pages = pagesStr(record) ? `, ${pagesStr(record)}` : "";
     const volPart = vol || issue || pages ? `${vol}${issue}${pages}. ` : "";
@@ -1829,10 +1866,16 @@ function apa(record) {
 }
 function gb(record) {
   const list = record.authors ?? [];
+  const cjk = (s) => /[\u4e00-\u9fff]/.test(s ?? "");
+  const gbName = (a) => {
+    if (cjk(a.lastName) || cjk(a.firstName)) return `${a.lastName ?? ""}${a.firstName ?? ""}`;
+    const ini = String(a.firstName ?? "").trim();
+    return [a.lastName, ini ? ini.charAt(0).toUpperCase() : ""].filter(Boolean).join(" ");
+  };
   let who;
   if (!list.length) who = "";
-  else if (list.length <= 3) who = list.map((a) => `${a.lastName}${a.firstName ? " " + a.firstName : ""}`).join(", ");
-  else who = `${list.slice(0, 3).map((a) => `${a.lastName}${a.firstName ? " " + a.firstName : ""}`).join(", ")}, \u7B49`;
+  else if (list.length <= 3) who = list.map(gbName).join(", ");
+  else who = `${list.slice(0, 3).map(gbName).join(", ")}, \u7B49`;
   const whoPart = who ? `${who}. ` : "";
   const title = (record.title ?? "").trim();
   const year = yearStr(record);
@@ -1861,8 +1904,8 @@ function gb(record) {
   return `${whoPart}${title}[Z]. ${year}.`.trim();
 }
 function mla(record) {
-  const list = record.authors ?? [];
-  const who = list.length ? list.map((a) => `${a.lastName}, ${a.firstName ?? ""}`.trim()).join(", ") + ". " : "";
+  const who0 = mlaAuthors(record);
+  const who = who0 ? who0 + ". " : "";
   const title = (record.title ?? "Untitled").trim();
   if (record.itemType === "journalArticle" || record.itemType === "preprint") {
     const journal = record.container ? ` *${record.container}*, ` : "";
@@ -1880,15 +1923,15 @@ function mla(record) {
   return `${who}"${title}." ${record.publisher ?? ""} ${yearStr(record)}.`.trim();
 }
 function chicago(record) {
-  const list = record.authors ?? [];
-  const who = list.length ? list.map((a) => `${a.firstName ?? ""} ${a.lastName ?? ""}`.trim()).join(", ") + ". " : "";
+  const who0 = chicagoAuthors(record);
+  const who = who0 ? who0 + ". " : "";
   const title = (record.title ?? "Untitled").trim();
   if (record.itemType === "journalArticle" || record.itemType === "preprint") {
-    const journal = record.container ? ` "${record.container}"` : "";
+    const journal = record.container ? ` *${record.container}*` : "";
     const vol = record.volume ? ` ${record.volume}` : "";
     const issue = record.issue ? `, no. ${record.issue}` : "";
     const pages = pagesStr(record) ? `: ${pagesStr(record)}` : "";
-    return `${who}"${title}.${journal}" ${vol}${issue} (${yearStr(record)})${pages}.`.trim();
+    return `${who}"${title}."${journal}${vol}${issue} (${yearStr(record)})${pages}.`.replace(/\s+/g, " ").replace(/ ,/g, ",").trim();
   }
   const pub = record.publisher ? ` ${record.publisher},` : "";
   return `${who}*${title}.*${pub} ${yearStr(record)}.`.trim();
@@ -1930,36 +1973,71 @@ function bibtex(record) {
   const body = fields.map(([k, v]) => `  ${k} = {${bibtexEscape(v)}}`).join(",\n");
   return "@" + type + "{" + key + ",\n" + body + "\n}\n";
 }
+function stripItalic(text) {
+  return String(text ?? "").replace(/\*([^*]+)\*/g, "$1");
+}
+function toSegments(text) {
+  const s = String(text ?? "");
+  const out = [];
+  const re = /\*([^*]+)\*/g;
+  let last = 0;
+  let m;
+  while (m = re.exec(s)) {
+    if (m.index > last) out.push({ text: s.slice(last, m.index) });
+    out.push({ text: m[1], italic: true });
+    last = m.index + m[0].length;
+  }
+  if (last < s.length) out.push({ text: s.slice(last) });
+  return out.length ? out : [{ text: s }];
+}
+function escapeHtml(text) {
+  return String(text ?? "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function segmentsToHtml(segments) {
+  return segments.map((seg) => seg.italic ? `<i>${escapeHtml(seg.text)}</i>` : escapeHtml(seg.text)).join("");
+}
 function cite(record, opts = {}) {
+  return citeDetailed(record, opts).text;
+}
+function citeDetailed(record, opts = {}) {
   const style = STYLES[opts.style] ?? STYLES.apa;
   const mode = opts.mode ?? "reference";
-  if (opts.style === "bibtex") return style.format(record);
+  if (opts.style === "bibtex") {
+    const text2 = style.format(record);
+    return { text: text2, segments: [{ text: text2 }], html: escapeHtml(text2), style: opts.style, mode: "reference" };
+  }
+  let raw;
   if (mode === "intext") {
     if (opts.style === "gb") {
-      return `\uFF08${authorsShortGb(record)}\uFF0C${yearStr(record)}\uFF09`;
+      raw = `\uFF08${authorsShortGb(record)}\uFF0C${yearStr(record)}\uFF09`;
+    } else {
+      raw = `(${authorsShort(record)}, ${yearStr(record)})`;
     }
-    return `(${authorsShort(record)}, ${yearStr(record)})`;
-  }
-  if (mode === "direct") {
+  } else if (mode === "direct") {
     const pages = opts.pages ? opts.style === "gb" ? `\uFF0C\u7B2C ${opts.pages} \u9875` : `, p. ${opts.pages}` : "";
-    if (opts.style === "gb") return `\u201C${(record.title ?? "").trim()}\u201D\uFF08${authorsShortGb(record)}\uFF0C${yearStr(record)}${pages}\uFF09`;
-    return `"${(record.title ?? "").trim()}" (${authorsShort(record)}, ${yearStr(record)}${pages})`;
+    if (opts.style === "gb") raw = `\u201C${(record.title ?? "").trim()}\u201D\uFF08${authorsShortGb(record)}\uFF0C${yearStr(record)}${pages}\uFF09`;
+    else raw = `"${(record.title ?? "").trim()}" (${authorsShort(record)}, ${yearStr(record)}${pages})`;
+  } else {
+    raw = style.format(record);
   }
-  return style.format(record);
+  const text = stripItalic(raw);
+  const segments = toSegments(raw);
+  return { text, segments, html: segmentsToHtml(segments), style: opts.style ?? "apa", mode };
 }
 function authorsShortGb(record) {
   const list = record.authors ?? [];
   if (!list.length) return "\u4F5A\u540D";
   if (list.length === 1) return list[0].lastName;
   if (list.length === 2) return `${list[0].lastName}\u3001${list[1].lastName}`;
-  return `${list[0].lastName}\u7B49`;
+  return `${list[0].lastName} \u7B49`;
 }
 function listStyles() {
   return Object.entries(STYLES).map(([id, s]) => ({ id, label: s.label }));
 }
-var STYLES;
+var CJK, STYLES;
 var init_cite = __esm({
   "src/node/cite.js"() {
+    CJK = /[\u4e00-\u9fff]/;
     STYLES = {
       apa: { label: "APA 7th", format: apa },
       gb: { label: "GB/T 7714-2015", format: gb },
@@ -35823,13 +35901,13 @@ async function handler(req, res, ctx) {
         writeJson(res, 404, { error: "\u6761\u76EE\u7F3A\u5C11\u5143\u6570\u636E\uFF0C\u65E0\u6CD5\u751F\u6210\u5F15\u7528", code: "noMetadataCite" });
         return;
       }
-      const { cite: cite2 } = await Promise.resolve().then(() => (init_cite(), cite_exports));
-      const text = cite2(item.record, {
+      const { citeDetailed: citeDetailed2 } = await Promise.resolve().then(() => (init_cite(), cite_exports));
+      const detail = citeDetailed2(item.record, {
         style: body?.style ?? "apa",
         mode: body?.mode ?? "reference",
         pages: body?.pages
       });
-      writeJson(res, 200, { text, style: body?.style ?? "apa", mode: body?.mode ?? "reference" });
+      writeJson(res, 200, { ...detail, style: body?.style ?? "apa", mode: body?.mode ?? "reference" });
       return;
     }
     if (head === "scan-dir" && methodOk(req, "POST")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a9i5k4/dsh-literature",
-  "version": "0.2.8",
+  "version": "0.2.11",
   "description": "DSH Literature 文献侧窗：在 DeepSeek Harness 侧边栏识别 DOI/arXiv/标题、抓取元数据与全文、写入本地文献库或导出目录，并提供内置 PDF 阅读器（缩放/翻页/目录/搜索/高亮/笔记）。",
   "type": "module",
   "main": "lib/index.js",