Format the code

TomBener · TomBener · commit d505bd623f4f · 2025-10-22T15:52:47.000-04:00
diff --git a/src/tools/findRecordsByCitationKey.ts b/src/tools/findRecordsByCitationKey.ts
@@ -6,9 +6,7 @@ import {
 	generateFinderPathVariants,
 	lookupZoteroMetadataByCitationKey,
 } from "../utils/zoteroMetadata.js";
-import {
-	convertDevonthinkRecordHelper,
-} from "../utils/jxaHelpers.js";
+import { convertDevonthinkRecordHelper } from "../utils/jxaHelpers.js";
 import type {
 	ZoteroMatchType,
 	ZoteroMetadataDescriptor,
@@ -20,22 +18,21 @@ type ToolInput = z.infer<typeof ToolInputSchema>;
 
 const FinderPathLookupSchema = z
 	.object({
-		citationKey: z.string().min(1, "citationKey must not be empty").describe("Zotero citation key"),
-		zoteroJsonPath: z
-			.string()
-			.optional()
-			.describe("Override path to Zotero JSON export"),
-		zoteroBibPath: z
+		citationKey: z
 			.string()
-			.optional()
-			.describe("Override path to Zotero BibTeX export"),
+			.min(1, "citationKey must not be empty")
+			.describe("Zotero citation key"),
+		zoteroJsonPath: z.string().optional().describe("Override path to Zotero JSON export"),
+		zoteroBibPath: z.string().optional().describe("Override path to Zotero BibTeX export"),
 		maxRecordsPerPath: z
 			.number()
 			.int()
 			.min(1)
 			.max(50)
 			.optional()
-			.describe("Maximum number of DEVONthink records to return for each attachment path (default 5)"),
+			.describe(
+				"Maximum number of DEVONthink records to return for each attachment path (default 5)",
+			),
 	})
 	.strict();
 
@@ -284,4 +281,3 @@ export const findRecordsByCitationKeyTool: Tool = {
 	inputSchema: zodToJsonSchema(FinderPathLookupSchema) as ToolInput,
 	run: findRecordsByCitationKey,
 };
-
diff --git a/src/tools/getZoteroMetadata.ts b/src/tools/getZoteroMetadata.ts
@@ -5,21 +5,15 @@ import { executeJxa } from "../applescript/execute.js";
 import { escapeStringForJXA, isJXASafeString } from "../utils/escapeString.js";
 import { getRecordLookupHelpers, getDatabaseHelper } from "../utils/jxaHelpers.js";
 import { lookupZoteroMetadataByPath } from "../utils/zoteroMetadata.js";
-import type {
-	ZoteroMatchType,
-	ZoteroMetadataDescriptor,
-} from "../utils/zoteroMetadata.js";
+import type { ZoteroMatchType, ZoteroMetadataDescriptor } from "../utils/zoteroMetadata.js";
 
 const ToolInputSchema = ToolSchema.shape.inputSchema;
 type ToolInput = z.infer<typeof ToolInputSchema>;
 
 const GetZoteroMetadataSchema = z
 	.object({
 		uuid: z.string().optional().describe("UUID of the DEVONthink record"),
-		id: z
-			.number()
-			.optional()
-			.describe("DEVONthink record ID (requires databaseName)"),
+		id: z.number().optional().describe("DEVONthink record ID (requires databaseName)"),
 		databaseName: z
 			.string()
 			.optional()
@@ -141,19 +135,15 @@ const buildRecordLookupScript = (input: {
 	parts.push(`    let resolvedDatabase = null;`);
 
 	if (input.uuid) {
-		parts.push(
-			`    lookupOptions["uuid"] = "${escapeStringForJXA(input.uuid)}";`,
-		);
+		parts.push(`    lookupOptions["uuid"] = "${escapeStringForJXA(input.uuid)}";`);
 	}
 
 	if (input.id !== undefined) {
 		parts.push(`    lookupOptions["id"] = ${input.id};`);
 	}
 
 	if (input.recordPath) {
-		parts.push(
-			`    lookupOptions["path"] = "${escapeStringForJXA(input.recordPath)}";`,
-		);
+		parts.push(`    lookupOptions["path"] = "${escapeStringForJXA(input.recordPath)}";`);
 	}
 
 	if (input.databaseName) {
@@ -175,8 +165,8 @@ const buildRecordLookupScript = (input: {
 	parts.push(`      const response = {};`);
 	parts.push(`      response["success"] = false;`);
 	parts.push(
-			`      const lookupError = lookupResult && lookupResult.error ? lookupResult.error : "Record not found";`,
-		);
+		`      const lookupError = lookupResult && lookupResult.error ? lookupResult.error : "Record not found";`,
+	);
 	parts.push(`      response["error"] = lookupError;`);
 	parts.push(`      return JSON.stringify(response);`);
 	parts.push(`    }`);
@@ -192,17 +182,21 @@ const buildRecordLookupScript = (input: {
 	parts.push(`    const response = {};`);
 	parts.push(`    response["success"] = true;`);
 	parts.push(`    response["finderPath"] = finderPath;`);
-	parts.push(
-			`    response["lookupMethod"] = lookupResult.method ? lookupResult.method : null;`,
-		);
+	parts.push(`    response["lookupMethod"] = lookupResult.method ? lookupResult.method : null;`);
 
 	parts.push(`    const recordInfo = {};`);
-	parts.push(`    try { recordInfo["uuid"] = record.uuid(); } catch (e) { recordInfo["uuid"] = null; }`);
-	parts.push(`    try { recordInfo["id"] = record.id(); } catch (e) { recordInfo["id"] = null; }`);
-	parts.push(`    try { recordInfo["name"] = record.name(); } catch (e) { recordInfo["name"] = null; }`);
 	parts.push(
-			`    try { recordInfo["location"] = record.location(); } catch (e) { recordInfo["location"] = null; }`,
-		);
+		`    try { recordInfo["uuid"] = record.uuid(); } catch (e) { recordInfo["uuid"] = null; }`,
+	);
+	parts.push(
+		`    try { recordInfo["id"] = record.id(); } catch (e) { recordInfo["id"] = null; }`,
+	);
+	parts.push(
+		`    try { recordInfo["name"] = record.name(); } catch (e) { recordInfo["name"] = null; }`,
+	);
+	parts.push(
+		`    try { recordInfo["location"] = record.location(); } catch (e) { recordInfo["location"] = null; }`,
+	);
 	parts.push(`    recordInfo["path"] = finderPath;`);
 	parts.push(`    try {`);
 	parts.push(`      const db = record.database();`);
@@ -234,9 +228,7 @@ const buildRecordLookupScript = (input: {
 	return parts.join("\n");
 };
 
-const getRecordFinderPath = async (
-	input: GetZoteroMetadataInput,
-): Promise<RecordLookupResult> => {
+const getRecordFinderPath = async (input: GetZoteroMetadataInput): Promise<RecordLookupResult> => {
 	try {
 		const script = buildRecordLookupScript(input);
 		return await executeJxa<RecordLookupResult>(script);
@@ -251,15 +243,7 @@ const getRecordFinderPath = async (
 const getZoteroMetadata = async (
 	input: GetZoteroMetadataInput,
 ): Promise<ZoteroMetadataToolSuccess | ZoteroMetadataToolFailure> => {
-	const {
-		uuid,
-		id,
-		databaseName,
-		recordPath,
-		finderPath,
-		zoteroJsonPath,
-		zoteroBibPath,
-	} = input;
+	const { uuid, id, databaseName, recordPath, finderPath, zoteroJsonPath, zoteroBibPath } = input;
 
 	const metadataJsonPath = zoteroJsonPath ?? process.env.ZOTERO_BIBLIOGRAPHY_JSON ?? null;
 	const metadataBibPath = zoteroBibPath ?? process.env.ZOTERO_BIBLIOGRAPHY_BIB ?? null;
diff --git a/src/utils/zoteroMetadata.ts b/src/utils/zoteroMetadata.ts
@@ -242,10 +242,7 @@ const collectJsonAttachmentPaths = (item: Record<string, unknown>): string[] =>
 	return Array.from(paths);
 };
 
-const getFirstStringFromKeys = (
-	source: Record<string, unknown>,
-	keys: string[],
-): string | null => {
+const getFirstStringFromKeys = (source: Record<string, unknown>, keys: string[]): string | null => {
 	for (const key of keys) {
 		const candidate = source[key];
 		if (typeof candidate === "string" && candidate.trim()) {
@@ -277,12 +274,9 @@ const findMatchingTopLevelField = (
 };
 
 const buildJsonDescriptor = (item: Record<string, unknown>): ZoteroMetadataDescriptor => {
-	const citationKey =
-		getFirstStringFromKeys(item, ["citationKey", "citationkey", "id"]) ?? null;
-	const zoteroId =
-		getFirstStringFromKeys(item, ["zoteroId", "zotero_id", "key", "id"]) ?? null;
-	const title =
-		getFirstStringFromKeys(item, ["title"]) ?? null;
+	const citationKey = getFirstStringFromKeys(item, ["citationKey", "citationkey", "id"]) ?? null;
+	const zoteroId = getFirstStringFromKeys(item, ["zoteroId", "zotero_id", "key", "id"]) ?? null;
+	const title = getFirstStringFromKeys(item, ["title"]) ?? null;
 
 	return {
 		source: "json",
@@ -294,7 +288,10 @@ const buildJsonDescriptor = (item: Record<string, unknown>): ZoteroMetadataDescr
 };
 
 const parseBibFileField = (value: string): string[] => {
-	const segments = value.split(";").map((segment) => segment.trim()).filter(Boolean);
+	const segments = value
+		.split(";")
+		.map((segment) => segment.trim())
+		.filter(Boolean);
 	const paths: string[] = [];
 
 	for (const segment of segments) {
@@ -339,11 +336,7 @@ const collectBibAttachmentPaths = (entry: BibEntry): string[] => {
 
 const buildBibDescriptor = (entry: BibEntry): ZoteroMetadataDescriptor => {
 	const citationKey = entry.key ?? null;
-	const zoteroId =
-		entry.fields.zotero_id ??
-		entry.fields.id ??
-		entry.fields.citationkey ??
-		null;
+	const zoteroId = entry.fields.zotero_id ?? entry.fields.id ?? entry.fields.citationkey ?? null;
 	const title = entry.fields.title ?? entry.fields["title"] ?? null;
 
 	return {
@@ -402,11 +395,7 @@ const findPathInJsonValue = (
 	if (value && typeof value === "object") {
 		const obj = value as Record<string, unknown>;
 		for (const key of Object.keys(obj)) {
-			const childResult = findPathInJsonValue(
-				obj[key],
-				variants,
-				propertyPath.concat(key),
-			);
+			const childResult = findPathInJsonValue(obj[key], variants, propertyPath.concat(key));
 			if (childResult) {
 				return childResult;
 			}
@@ -671,7 +660,11 @@ const lookupCitationInJson = async (
 		if (!entry || typeof entry !== "object") continue;
 		const item = entry as Record<string, unknown>;
 		const descriptor = buildJsonDescriptor(item);
-		const matchInfo = findMatchingTopLevelField(item, ["citationKey", "citationkey", "id"], citationKey);
+		const matchInfo = findMatchingTopLevelField(
+			item,
+			["citationKey", "citationkey", "id"],
+			citationKey,
+		);
 		if (matchInfo) {
 			return {
 				success: true,
@@ -807,7 +800,9 @@ export const lookupZoteroMetadataByCitationKey = async (
 			if (jsonMatch) {
 				return jsonMatch;
 			}
-			errors.push(`No entry with citation key '${trimmedKey}' in JSON metadata at ${jsonPath}`);
+			errors.push(
+				`No entry with citation key '${trimmedKey}' in JSON metadata at ${jsonPath}`,
+			);
 		} else {
 			errors.push(`JSON metadata file not found at ${jsonPath}`);
 		}
@@ -820,7 +815,9 @@ export const lookupZoteroMetadataByCitationKey = async (
 			if (bibMatch) {
 				return bibMatch;
 			}
-			errors.push(`No entry with citation key '${trimmedKey}' in BibTeX metadata at ${bibPath}`);
+			errors.push(
+				`No entry with citation key '${trimmedKey}' in BibTeX metadata at ${bibPath}`,
+			);
 		} else {
 			errors.push(`BibTeX metadata file not found at ${bibPath}`);
 		}
diff --git a/tests/fixtures/zotero/bibliography.json b/tests/fixtures/zotero/bibliography.json
@@ -1,47 +1,43 @@
 [
-  {
-    "id": "smith2024deep",
-    "type": "article-journal",
-    "title": "Deep Learning for Citation Matching",
-    "author": [
-      {
-        "family": "Smith",
-        "given": "Alex"
-      }
-    ],
-    "issued": {
-      "date-parts": [
-        [
-          2024
-        ]
-      ]
-    },
-    "attachments": [
-      {
-        "title": "Full Text PDF",
-        "localPath": "/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024.pdf"
-      },
-      {
-        "title": "Supplement",
-        "localPath": "file:///Users/alex/Documents/Zotero/storage/ABC12345/Smith2024-supplement.pdf"
-      }
-    ]
-  },
-  {
-    "id": "miller2023notes",
-    "type": "paper-conference",
-    "title": "Notes on Knowledge Graphs",
-    "author": [
-      {
-        "family": "Miller",
-        "given": "Jordan"
-      }
-    ],
-    "attachments": [
-      {
-        "title": "Conference Paper",
-        "path": "/Users/alex/Documents/Zotero/storage/XYZ9876/Miller2023.pdf"
-      }
-    ]
-  }
+	{
+		"id": "smith2024deep",
+		"type": "article-journal",
+		"title": "Deep Learning for Citation Matching",
+		"author": [
+			{
+				"family": "Smith",
+				"given": "Alex"
+			}
+		],
+		"issued": {
+			"date-parts": [[2024]]
+		},
+		"attachments": [
+			{
+				"title": "Full Text PDF",
+				"localPath": "/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024.pdf"
+			},
+			{
+				"title": "Supplement",
+				"localPath": "file:///Users/alex/Documents/Zotero/storage/ABC12345/Smith2024-supplement.pdf"
+			}
+		]
+	},
+	{
+		"id": "miller2023notes",
+		"type": "paper-conference",
+		"title": "Notes on Knowledge Graphs",
+		"author": [
+			{
+				"family": "Miller",
+				"given": "Jordan"
+			}
+		],
+		"attachments": [
+			{
+				"title": "Conference Paper",
+				"path": "/Users/alex/Documents/Zotero/storage/XYZ9876/Miller2023.pdf"
+			}
+		]
+	}
 ]
diff --git a/tests/utils/zoteroMetadata.test.ts b/tests/utils/zoteroMetadata.test.ts
@@ -19,8 +19,7 @@ describe("lookupZoteroMetadataByPath", () => {
 	});
 
 	it("finds metadata from the JSON export when the attachment path matches directly", async () => {
-		const finderPath =
-			"/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024.pdf";
+		const finderPath = "/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024.pdf";
 
 		const result = await lookupZoteroMetadataByPath(finderPath, {
 			jsonPath: jsonFixturePath,
@@ -43,8 +42,7 @@ describe("lookupZoteroMetadataByPath", () => {
 	});
 
 	it("finds metadata from the JSON export when the attachment stores a file URL", async () => {
-		const finderPath =
-			"/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024-supplement.pdf";
+		const finderPath = "/Users/alex/Documents/Zotero/storage/ABC12345/Smith2024-supplement.pdf";
 
 		const result = await lookupZoteroMetadataByPath(finderPath, {
 			jsonPath: jsonFixturePath,
@@ -64,8 +62,7 @@ describe("lookupZoteroMetadataByPath", () => {
 	});
 
 	it("falls back to the BibTeX export when JSON is missing the attachment", async () => {
-		const finderPath =
-			"/Users/alex/Documents/Zotero/storage/GAR5566/Garcia2021.pdf";
+		const finderPath = "/Users/alex/Documents/Zotero/storage/GAR5566/Garcia2021.pdf";
 
 		const result = await lookupZoteroMetadataByPath(finderPath, {
 			jsonPath: jsonFixturePath,
