merge dev

package.json

@@ -2,15 +2,14 @@
 	"name": "carta",
 	"type": "module",
 	"module": "esnext",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/BearToCode/carta-md.git"
 	},
 	"scripts": {
 		"preinstall": "npx only-allow pnpm",
-		"postinstall": "node ./scripts/gen-speed-highlight.js",
 		"core": "cd packages/carta-md && npm run dev",
 		"dev": "cd demo && npm run dev",
 		"check": "cd packages/carta-md && npm run check",

packages/carta-md/package.json

@@ -18,7 +18,7 @@
 		"./light.css": "./dist/light.css",
 		"./dark.css": "./dist/dark.css"
 	},
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "svelte-kit sync && svelte-package",
@@ -37,6 +37,7 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"@speed-highlight/core": "^1.2.2",
 		"marked": "^4.3.0"
 	},
 	"peerDependencies": {

packages/carta-md/src/lib/internal/carta.ts

@@ -12,11 +12,11 @@ import type { SvelteComponentTyped } from 'svelte';
 import { CartaRenderer } from './renderer';
 import {
 	loadCustomLanguage,
-	type HighlightLanguage,
-	type HighlightFunctions,
 	highlight,
-	highlightAutodetect
+	highlightAutodetect,
+	type HighlightFunctions
 } from './highlight.js';
+import type { ShjLanguageDefinition } from '@speed-highlight/core/index';
 
 /**
  * Carta-specific event with extra payload.
@@ -126,7 +126,7 @@ export interface CartaExtension {
 	/**
 	 * Custom markdown highlight rules. See [Speed-Highlight Wiki](https://github.com/speed-highlight/core/wiki/Create-or-suggest-new-languages).
 	 */
-	highlightRules?: HighlightLanguage;
+	highlightRules?: ShjLanguageDefinition;
 	/**
 	 * This function can be used to access a reference to the `Carta` class immediately after initialization.
 	 */
@@ -141,7 +141,7 @@ export class Carta {
 	public readonly keyboardShortcuts: KeyboardShortcut[];
 	public readonly icons: CartaIcon[];
 	public readonly prefixes: Prefix[];
-	public readonly highlightRules: HighlightLanguage;
+	public readonly highlightRules: ShjLanguageDefinition;
 	public readonly listeners: CartaListeners;
 	public readonly components: CartaExtensionComponents;
 

packages/carta-md/src/lib/internal/highlight.ts

@@ -1,17 +1,5 @@
-import { detectLanguage } from '@speed-highlight/core/detect';
-import { highlightText, loadLanguage } from '@speed-highlight/core';
-
-export type HighlightRule =
-	| { type: string; match: RegExp }
-	| { extand: string }
-	| {
-			match: RegExp;
-			sub:
-				| string
-				| ((code: string) => { type: string; sub: Array<{ match: RegExp; sub: string }> });
-	  };
-
-export type HighlightLanguage = Array<HighlightRule>;
+import { detectLanguage } from '@speed-highlight/core/detect.js';
+import { highlightText, loadLanguage, type ShjLanguageDefinition } from '@speed-highlight/core';
 
 /**
  * Highlight text using Speed-Highlight. May return null on error(usually if requested
@@ -27,7 +15,7 @@ export async function highlight(
 	hideLineNumbers?: boolean
 ): Promise<string | null> {
 	try {
-		return await highlightText(text, lang, true, { hideLineNumbers });
+		return await highlightText(text, lang, true, { hideLineNumbers: hideLineNumbers ?? true });
 	} catch (_) {
 		return null;
 	}
@@ -40,8 +28,8 @@ export async function highlight(
  * @returns Highlighted html text.
  */
 export async function highlightAutodetect(text: string, hideLineNumbers?: boolean) {
-	const lang = detectLanguage(text);
-	return await highlightText(text, lang, true, { hideLineNumbers });
+	const lang = await detectLanguage(text);
+	return await highlightText(text, lang, true, { hideLineNumbers: hideLineNumbers ?? true });
 }
 
 /**
@@ -66,7 +54,7 @@ export async function highlightAutodetect(text: string, hideLineNumbers?: boolea
  *   .then(module => Carta.loadCustomLanguage("lang-name", module));
  * ```
  */
-export function loadCustomLanguage(id: string, langModule: { default: HighlightLanguage }) {
+export function loadCustomLanguage(id: string, langModule: { default: ShjLanguageDefinition }) {
 	return loadLanguage(id, langModule);
 }
 

packages/carta-md/src/lib/internal/shj.ts

@@ -1,10 +1,10 @@
-import type { ShjLanguage } from '@speed-highlight/core';
-import { detectLanguage } from '@speed-highlight/core/detect';
+import { detectLanguage } from '@speed-highlight/core/detect.js';
+import type { ShjLanguageDefinition } from '@speed-highlight/core';
 
 /**
  * Markdown syntax highlighting rules.
  */
-const cartaMarkdown: ShjLanguage = [
+const cartaMarkdown: ShjLanguageDefinition = [
 	{
 		type: 'cmnt',
 		match: /^>.*|(=|-)\1+/gm

packages/carta-md/svelte.config.js

@@ -8,10 +8,7 @@ const config = {
 	preprocess: vitePreprocess(),
 
 	kit: {
-		adapter: adapter(),
-		alias: {
-			'@speed-highlight/core': './src/lib/speed-highlight'
-		}
+		adapter: adapter()
 	}
 };
 

packages/carta-md/tsconfig.json

@@ -15,13 +15,12 @@
 		"ignoreDeprecations": "5.0",
 		"plugins": [],
 		"baseUrl": "./",
-		"typeRoots": ["./node_modules/@types", "./typings"],
 		"paths": {
 			"$lib": ["src/lib"],
 			"$lib/*": ["src/lib/*"]
 		}
 	},
-	"include": ["./src", "./typings"]
+	"include": ["./src"]
 	// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
 	//
 	// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes

packages/plugin-code/package.json

@@ -22,13 +22,13 @@
 		"typescript-cp": "^0.1.8"
 	},
 	"peerDependencies": {
-		"carta-md": "^2.0.5",
+		"carta-md": "^2.0.6",
 		"marked": "^4.3.0"
 	},
 	"files": [
 		"dist"
 	],
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"dependencies": {
 		"marked-highlight": "^2.0.0"
 	},

packages/plugin-emoji/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cartamd/plugin-emoji",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -39,7 +39,7 @@
 	},
 	"peerDependencies": {
 		"svelte": "^3.54.0",
-		"carta-md": "^2.0.5",
+		"carta-md": "^2.0.6",
 		"marked": "^4.3.0"
 	},
 	"devDependencies": {

packages/plugin-math/package.json

@@ -23,7 +23,7 @@
 		"typescript": "^5.0.4"
 	},
 	"peerDependencies": {
-		"carta-md": "^2.0.5",
+		"carta-md": "^2.0.6",
 		"katex": "^0.16.7",
 		"marked": "^4.3.0"
 	},
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"katex": "^0.16.7"
 	},
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"keywords": [
 		"carta",
 		"markdown",

packages/plugin-math/src/latex.ts

@@ -1,5 +1,3 @@
-import type { HighlightLanguage } from 'carta-md';
-
 export default [
 	{
 		match:
@@ -37,4 +35,4 @@ export default [
 		match: /[0-9]+/g,
 		type: 'num'
 	}
-] satisfies HighlightLanguage;
+];

packages/plugin-slash/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cartamd/plugin-slash",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -38,7 +38,7 @@
 	},
 	"peerDependencies": {
 		"svelte": "^3.54.0",
-		"carta-md": "^2.0.5"
+		"carta-md": "^2.0.6"
 	},
 	"devDependencies": {
 		"carta-md": "workspace:*",

packages/plugin-tikz/package.json

@@ -30,13 +30,13 @@
 		"md5": "^2.3.0"
 	},
 	"peerDependencies": {
-		"carta-md": "^2.0.5",
+		"carta-md": "^2.0.6",
 		"marked": "^4.3.0"
 	},
 	"files": [
 		"dist"
 	],
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"keywords": [
 		"carta",
 		"markdown",

packages/plugin-tikz/src/tikz.ts

@@ -1,5 +1,3 @@
-import type { HighlightLanguage } from 'carta-md';
-
 export default [
 	{
 		match: /\\(usepackage|input|usemodule)(?![a-zA-Z0-9])/g,
@@ -25,4 +23,4 @@ export default [
 		match: /[0-9]+[a-z]{0,3}/g,
 		type: 'num'
 	}
-] satisfies HighlightLanguage;
+];