yanki 2.0.5 → 2.0.7

package/dist/lib/index.d.ts

@@ -99,7 +99,7 @@ type GlobalOptions = {
    * Exposed for Obsidian, currently only used for getting URL content hashes
    * and inferring MIME types of URLs without extensions. Note that
    * ankiConnectOptions ALSO has a fetch adapter option specifically for
-   * communicating with Anki-Connect.
+   * communicating with AnkiConnect.
    */
   fetchAdapter: FetchAdapter | undefined;
   fileAdapter: FileAdapter | undefined;

package/dist/lib/index.js

@@ -2,13 +2,45 @@ import { deepmerge } from "deepmerge-ts";
 import plur from "plur";
 import prettyMilliseconds from "pretty-ms";
 import { YankiConnect, defaultYankiConnectOptions } from "yanki-connect";
-import rehypeShiki from "@shikijs/rehype";
+import bash from "@shikijs/langs/bash";
+import c from "@shikijs/langs/c";
+import cpp from "@shikijs/langs/cpp";
+import css from "@shikijs/langs/css";
+import diff from "@shikijs/langs/diff";
+import dockerfile from "@shikijs/langs/dockerfile";
+import go from "@shikijs/langs/go";
+import html from "@shikijs/langs/html";
+import java from "@shikijs/langs/java";
+import javascript from "@shikijs/langs/javascript";
+import json from "@shikijs/langs/json";
+import jsx from "@shikijs/langs/jsx";
+import kotlin from "@shikijs/langs/kotlin";
+import markdown from "@shikijs/langs/markdown";
+import php from "@shikijs/langs/php";
+import python from "@shikijs/langs/python";
+import regex from "@shikijs/langs/regex";
+import ruby from "@shikijs/langs/ruby";
+import rust from "@shikijs/langs/rust";
+import scss from "@shikijs/langs/scss";
+import shellscript from "@shikijs/langs/shellscript";
+import sql from "@shikijs/langs/sql";
+import swift from "@shikijs/langs/swift";
+import toml from "@shikijs/langs/toml";
+import tsx from "@shikijs/langs/tsx";
+import typescript from "@shikijs/langs/typescript";
+import xml from "@shikijs/langs/xml";
+import yaml from "@shikijs/langs/yaml";
+import rehypeShikiFromHighlighter from "@shikijs/rehype/core";
+import githubDark from "@shikijs/themes/github-dark";
+import githubLight from "@shikijs/themes/github-light";
 import { toText } from "hast-util-to-text";
 import rehypeFormat from "rehype-format";
 import rehypeParse from "rehype-parse";
 import rehypeRaw from "rehype-raw";
 import rehypeStringify from "rehype-stringify";
 import remarkRehype from "remark-rehype";
+import { createHighlighterCore } from "shiki/core";
+import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 import { unified } from "unified";
 import { u } from "unist-builder";
 import { CONTINUE, EXIT, SKIP, visit } from "unist-util-visit";
@@ -71,7 +103,7 @@ function emptyIsUndefined(text) {
 *
 * @public
 */
-function css(strings, ...values) {
+function css$1(strings, ...values) {
 	return trimLeadingIndentation(strings, ...values);
 }
 const NEWLINE_REGEX$1 = /\r?\n/;
@@ -96,7 +128,7 @@ function splitAtFirstMatch(text, regex) {
 * namespace. It does change occasionally, see
 * https://github.com/ankitects/anki/blob/main/rslib/src/notetype/styling.css
 */
-const CSS_DEFAULT_STYLE = css`
+const CSS_DEFAULT_STYLE = css$1`
 	.card {
 		font-family: arial;
 		font-size: 20px;
@@ -433,7 +465,7 @@ function getSlugifiedNamespace(namespace) {
 * Only supports MIMEs for valid Anki media types.
 */
 function getFileExtensionForMimeType(mimeType) {
-	const result = {
+	const mimeToExtension = {
 		"application/octet-stream": "mp4",
 		"application/ogg": "ogx",
 		"application/pdf": "pdf",
@@ -469,9 +501,10 @@ function getFileExtensionForMimeType(mimeType) {
 		"video/x-flv": "flv",
 		"video/x-matroska": "mkv",
 		"video/x-msvideo": "avi"
-	}[mimeType];
-	if (result === void 0) return;
-	return result;
+	};
+	const normalizedMimeType = mimeType.split(";")[0].trim().toLowerCase();
+	if (normalizedMimeType === "") return;
+	return mimeToExtension[normalizedMimeType];
 }
 //#endregion
 //#region src/lib/utilities/path.ts
@@ -649,7 +682,9 @@ async function getFileExtensionFromUrl(url, fetchAdapter, mode = MEDIA_URL_CONTE
 			try {
 				const contentTypeHeaderValue = getHeadersString((await fetchAdapter(url, { method: "HEAD" }))?.headers, ["content-type"]);
 				if (contentTypeHeaderValue === void 0) throw new Error("No content-type header found");
-				return getFileExtensionForMimeType(contentTypeHeaderValue);
+				const extension = getFileExtensionForMimeType(contentTypeHeaderValue);
+				if (extension !== void 0) return extension;
+				return await getFileExtensionFromUrl(url, fetchAdapter, "name");
 			} catch {
 				return getFileExtensionFromUrl(url, fetchAdapter, "name");
 			}
@@ -804,7 +839,41 @@ const plugin$2 = function() {
 //#endregion
 //#region src/lib/parse/rehype-utilities.ts
 const DIMENSION_CHARS_REGEX = /^[\dx]+$/;
-const processor = unified().use(plugin$2).use(remarkRehype, { allowDangerousHtml: true }).use(rehypeRaw).use(plugin$3).use(rehypeShiki, {
+const highlighter = await createHighlighterCore({
+	engine: createJavaScriptRegexEngine(),
+	langs: [
+		bash,
+		c,
+		cpp,
+		css,
+		diff,
+		dockerfile,
+		go,
+		html,
+		java,
+		javascript,
+		json,
+		jsx,
+		kotlin,
+		markdown,
+		php,
+		python,
+		regex,
+		ruby,
+		rust,
+		scss,
+		shellscript,
+		sql,
+		swift,
+		toml,
+		tsx,
+		typescript,
+		xml,
+		yaml
+	],
+	themes: [githubDark, githubLight]
+});
+const processor = unified().use(plugin$2).use(remarkRehype, { allowDangerousHtml: true }).use(rehypeRaw).use(plugin$3).use(rehypeShikiFromHighlighter, highlighter, {
 	defaultLanguage: "plaintext",
 	fallbackLanguage: "plaintext",
 	themes: {
@@ -1095,6 +1164,14 @@ const yankiModelNames = yankiModels.map((model) => model.modelName);
 const legacyYankiModelNames = ["Yanki - Basic (and reversed card)"];
 //#endregion
 //#region src/lib/utilities/anki-connect.ts
+async function ensureModelExists(client, model) {
+	try {
+		await client.model.createModel(model);
+	} catch (error) {
+		if (error instanceof Error && error.message === "Model name already exists") return;
+		throw error;
+	}
+}
 async function deleteNotes(client, notes, dryRun = false) {
 	if (dryRun) return;
 	const noteIds = notes.map((note) => note.noteId).filter((noteId) => noteId !== void 0);
@@ -1127,7 +1204,7 @@ async function addNote(client, note, dryRun, fileAdapter) {
 			if (error.message === `model was not found: ${note.modelName}`) {
 				const model = yankiModels.find((model) => model.modelName === note.modelName);
 				if (model === void 0) throw new Error(`Model not found: ${note.modelName}`);
-				await client.model.createModel(model);
+				await ensureModelExists(client, model);
 				return addNote(client, note, dryRun, fileAdapter);
 			}
 			if (error.message === `deck was not found: ${note.deckName}`) {
@@ -1176,7 +1253,7 @@ async function updateNote(client, localNote, remoteNote, dryRun, fileAdapter) {
 					if (error.message === `Model '${localNote.modelName}' not found`) {
 						const model = yankiModels.find((model) => model.modelName === localNote.modelName);
 						if (model === void 0) throw new Error(`Model not found: ${localNote.modelName}`);
-						await client.model.createModel(model);
+						await ensureModelExists(client, model);
 						return updateNote(client, localNote, remoteNote, dryRun, fileAdapter);
 					}
 					throw error;
@@ -1238,23 +1315,21 @@ function areTagsEqual(localTags, remoteTags) {
 * @throws {Error}
 */
 async function getRemoteNotes(client, namespace = defaultGlobalOptions.namespace) {
-	return await getRemoteNotesById(client, await client.note.findNotes({ query: `"YankiNamespace:${namespace}"` }));
+	return (await getRemoteNotesById(client, await client.note.findNotes({ query: `"YankiNamespace:${namespace}"` }))).filter((note) => note !== void 0);
 }
 /**
 * Get all data from Anki required to populate the YankiNote type.
 *
 * Handles some extra footwork to identify the deck name and validate the model
-* name. There's no way to get everything we need in one shot from
-* Anki-Connect.
-*
-* Undefined elements in the returned array are subsequently used to identify
-* notes that need to be created.
+* name. There's no way to get everything we need in one shot from AnkiConnect.
 *
 * @param client An instance of YankiConnect
-* @param noteIds An array of local note IDs to (attempt) to fetch
+* @param noteIds An array of note IDs (from `findNotes`) to fetch
 *
-* @returns Array of YankiNote objects, with undefined for notes that could not
-*   be found.
+* @returns Array positionally aligned with `noteIds`. Entries are `undefined`
+*   when `notesInfo` does not resolve the corresponding ID — `findNotes` can
+*   return phantom IDs (e.g. left behind by `addNote` retries) that no longer
+*   exist as notes.
 * @throws {Error} If an unknown model name or multiple decks are found for a
 *   note, or if no deck is found.
 */
@@ -1378,7 +1453,7 @@ async function updateModelStyle(client, modelName, css, dryRun) {
 				const model = yankiModels.find((model) => model.modelName === modelName);
 				if (model === void 0) throw new Error(`Model not found: ${modelName}`);
 				if (dryRun) return false;
-				await client.model.createModel(model);
+				await ensureModelExists(client, model);
 				return updateModelStyle(client, model.modelName, css, dryRun);
 			}
 			throw error;
@@ -1470,7 +1545,7 @@ async function reconcileMedia(client, liveNotes, namespace, dryRun, fileAdapter)
 	};
 }
 /**
-* Request permission to access Anki through Anki-Connect.
+* Request permission to access Anki through AnkiConnect.
 *
 * @returns 'ankiUnreachable' if Anki is not open, or 'granted' if everything is
 *   copacetic
@@ -1479,7 +1554,7 @@ async function reconcileMedia(client, liveNotes, namespace, dryRun, fileAdapter)
 async function requestPermission(client) {
 	try {
 		const { permission } = await client.miscellaneous.requestPermission();
-		if (permission === "denied") throw new Error("Permission denied, please add this source to the \"webCorsOriginList\" in the Anki-Connect add-on configuration options.");
+		if (permission === "denied") throw new Error("Permission denied, please add this source to the \"webCorsOriginList\" in the AnkiConnect add-on configuration options.");
 		else return "granted";
 	} catch (error) {
 		if (error instanceof Error && (error.message === "fetch failed" || error.message === "net::ERR_CONNECTION_REFUSED")) return "ankiUnreachable";

package/dist/standalone/index.d.ts

@@ -796,7 +796,7 @@ Same as `PartialDeep`, but accepts only `object`s as inputs. Internal helper for
 */
 type PartialObjectDeep<ObjectType extends object, Options extends Required<PartialDeepOptions>> = { [KeyType in keyof ObjectType]?: _PartialDeep<ObjectType[KeyType], Options> };
 //#endregion
-//#region node_modules/.pnpm/yanki-connect@4.0.3/node_modules/yanki-connect/dist/index.d.ts
+//#region node_modules/.pnpm/yanki-connect@4.0.4/node_modules/yanki-connect/dist/index.d.ts
 //#region src/types/deck.d.ts
 type DeckStats = {
   deck_id: number;
@@ -1347,7 +1347,7 @@ type YankiConnectOptions = {
    *   instantiated.
    *
    * The Anki desktop app must be running for the client and the underlying
-   * Anki-Connect service to work.
+   * AnkiConnect service to work.
    *
    * Currently supported on macOS only.
    *
@@ -1358,7 +1358,7 @@ type YankiConnectOptions = {
   autoLaunch: 'immediately' | boolean;
   /**
    * Advanced option to customize the resource fetch implementation used to make
-   * requests to Anki-Connect.
+   * requests to AnkiConnect.
    *
    * Note that the signature reflects the subset of the built-in Fetch interface
    * that's actually used by yanki-connect.
@@ -1369,25 +1369,25 @@ type YankiConnectOptions = {
    */
   fetchAdapter: undefined | YankiFetchAdapter;
   /**
-   * Host where the Anki-Connect service is running.
+   * Host where the AnkiConnect service is running.
    *
    * @default 'http://127.0.0.1'
    */
   host: string;
   /**
-   * Anki-Connect security key (optional)
+   * AnkiConnect security key (optional)
    *
    * @default undefined
    */
   key: string | undefined;
   /**
-   * Port where the Anki-Connect service is running.
+   * Port where the AnkiConnect service is running.
    *
    * @default 8765
    */
   port: number;
   /**
-   * Anki-Connect API version.
+   * AnkiConnect API version.
    *
    * Only API version 6 is supported for now.
    *
@@ -1494,7 +1494,7 @@ type GlobalOptions = {
    * Exposed for Obsidian, currently only used for getting URL content hashes
    * and inferring MIME types of URLs without extensions. Note that
    * ankiConnectOptions ALSO has a fetch adapter option specifically for
-   * communicating with Anki-Connect.
+   * communicating with AnkiConnect.
    */
   fetchAdapter: FetchAdapter | undefined;
   fileAdapter: FileAdapter | undefined;