[WIP] Simplify core

.prettierignore

@@ -1 +1,2 @@
 /src/plugins
+tsconfig.json

benchmark/benchmark.ts

@@ -1,17 +1,18 @@
-import Benchmark from 'benchmark';
-import fetch from 'cross-fetch';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+import Benchmark from 'benchmark';
+import fetch from 'cross-fetch';
 import { gitP } from 'simple-git';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import { toArray } from '../src/util/iterables';
 import { parseLanguageNames } from '../tests/helper/test-case';
 import { config as baseConfig } from './config';
-import type { Prism } from '../src/core';
+import type { Prism } from '../src/types';
 import type { Config, ConfigOptions } from './config';
 import type { Options, Stats } from 'benchmark';
-import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -129,7 +130,6 @@ async function runBenchmark (config: Config) {
 		const name = candidates[i].name.padEnd(maxCandidateNameLength, ' ');
 		const best = String(s.best).padStart('best'.length);
 		const worst = String(s.worst).padStart('worst'.length);
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		const relative = ((s.avgRelative! / minAvgRelative).toFixed(2) + 'x').padStart(
 			'relative'.length
 		);
@@ -279,8 +279,7 @@ async function getFilePath (uri: string) {
 
 		// file path
 		const hash = crypto.createHash('md5').update(uri).digest('hex');
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const localPath = path.resolve(downloadDir, hash + '-' + /[-\w\.]*$/.exec(uri)![0]);
+		const localPath = path.resolve(downloadDir, hash + '-' + /[-.\w]*$/.exec(uri)![0]);
 
 		if (!fs.existsSync(localPath)) {
 			// download file
@@ -364,7 +363,6 @@ function createTestFunction (
 	if (testFunction === 'tokenize') {
 		return code => {
 			const grammar = Prism.components.getLanguage(mainLanguage);
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			Prism.tokenize(code, grammar!);
 		};
 	}
@@ -406,7 +404,6 @@ async function getCandidates (config: Config): Promise<Candidate[]> {
 	const baseGit = gitP(remoteBaseDir);
 
 	for (const remote of config.remotes) {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		const user = /[^/]+(?=\/prism.git)/.exec(remote.repo)![0];
 		const branch = remote.branch || 'main';
 		const remoteName = `${user}@${branch}`;
@@ -440,19 +437,4 @@ async function getCandidates (config: Config): Promise<Candidate[]> {
 	return candidates;
 }
 
-/**
- * A utility function that converts the given optional array-like value into an array.
- */
-function toArray<T extends {}> (value: T[] | T | undefined | null): readonly T[] {
-	if (Array.isArray(value)) {
-		return value;
-	}
-	else if (value != null) {
-		return [value];
-	}
-	else {
-		return [];
-	}
-}
-
 runBenchmark(getConfig()).catch(error => console.error(error));

eslint.config.mjs

@@ -1,17 +1,15 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
 import js from '@eslint/js';
-
 import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
 import tsEslintParser from '@typescript-eslint/parser';
-import { defineConfig } from 'eslint/config';
 import eslintConfigPrettier from 'eslint-config-prettier/flat';
 import eslintCommentsPlugin from 'eslint-plugin-eslint-comments';
 import jsdocPlugin from 'eslint-plugin-jsdoc';
 import regexpPlugin from 'eslint-plugin-regexp';
+import { defineConfig } from 'eslint/config';
 import globals from 'globals';
 
-import path from 'path';
-import { fileURLToPath } from 'url';
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const config = [
@@ -41,7 +39,7 @@ const config = [
 			'object-shorthand': ['warn', 'always', { avoidQuotes: true }],
 			'one-var': ['warn', 'never'],
 			'prefer-arrow-callback': 'warn',
-			'prefer-const': ['warn', { 'destructuring': 'all' }],
+			'prefer-const': 'off',
 			'prefer-spread': 'warn',
 
 			// JSDoc
@@ -154,11 +152,17 @@ const config = [
 
 			'@typescript-eslint/no-unsafe-call': 'off',
 			'@typescript-eslint/no-explicit-any': 'off',
+			'@typescript-eslint/no-unsafe-assignment': 'off',
+			'@typescript-eslint/no-unsafe-member-access': 'off',
+			'@typescript-eslint/no-unsafe-return': 'off',
+			'@typescript-eslint/no-unsafe-argument': 'off',
+			'@typescript-eslint/no-floating-promises': 'off',
+			'@typescript-eslint/await-thenable': 'off',
 		},
 	},
 	{
 		// Browser-specific parts
-		files: ['src/auto-start.ts'],
+		files: ['src/global.ts'],
 		languageOptions: {
 			globals: {
 				...globals.browser,

package.json

@@ -96,8 +96,8 @@
 		"mocha-chai-jest-snapshot": "^1.1.6",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.5.3",
-		"prettier-plugin-brace-style": "^0.7.2",
-		"prettier-plugin-merge": "^0.7.3",
+		"prettier-plugin-brace-style": "^0.7.3",
+		"prettier-plugin-merge": "^0.7.4",
 		"prettier-plugin-space-before-function-paren": "^0.0.8",
 		"refa": "^0.9.1",
 		"regexp-ast-analysis": "^0.5.1",

scripts/build.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
 import { copyFile, mkdir, readdir, readFile, rm, writeFile } from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import commonjs from '@rollup/plugin-commonjs';
@@ -13,7 +13,7 @@
 import { toArray } from '../src/util/iterables';
 import { components } from './components';
 import { parallel, runTask, series } from './tasks';
-import type { ComponentProto } from '../src/types';
+import type { ComponentProto, LanguageProto } from '../src/types';
 import type { OutputOptions, Plugin, RollupBuild, RollupOptions, SourceMapInput } from 'rollup';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -143,7 +143,7 @@
 		const data = await Promise.all(
 			[...languageIds, ...pluginIds].map(async id => {
 				const proto = await loadComponent(id);
-				return { id, alias: toArray(proto.alias) };
+				return { id, alias: toArray((proto as LanguageProto)?.alias) };
 			})
 		);
 		return Object.fromEntries(data.flatMap(({ id, alias }) => alias.map(a => [a, id])));
@@ -165,12 +165,12 @@
 		const data = (
 			await Promise.all(
 				languageIds.map(async id => {
-					const proto = await loadComponent(id);
+					const proto = (await loadComponent(id)) as LanguageProto;
 					const title = rawTitles.get(id);
 					if (!title) {
 						throw new Error(`No title for ${id}`);
 					}
-					return [id, ...toArray(proto.alias)].map(name => ({
+					return [id, ...toArray(proto?.alias)].map(name => ({
 						name,
 						title: rawTitles.get(id) ?? title,
 					}));
@@ -240,7 +240,7 @@
 	renderChunk (code) {
 		const str = new MagicString(code);
 		str.replace(
 			/\/((?:[^\n\r[\\\/]|\\.|\[(?:[^\n\r\\\]]|\\.)*\])+)\/\s*\.\s*source\b/g,
 			(m, source: string) => {
 				// escape backslashes
 				source = source.replace(/\\(.)|\[(?:\\s\\S|\\S\\s)\]/g, (m, g1: string) => {
@@ -282,7 +282,7 @@
 	renderChunk (code) {
 		const str = new MagicString(code);
 		str.replace(
 			/^(?<indent>[ \t]+)grammar: (\{[\s\S]*?^\k<indent>\})/m,
 			(m, _, grammar: string) => `\tgrammar: () => (${grammar})`
 		);
 		return toRenderedChunk(str);
@@ -321,7 +321,7 @@
 	]);
 }
 
-async function copyComponentsJson () {
+async function copyComponentsJson() {
 	const from = path.join(SRC_DIR, 'components.json');
 	const to = path.join(__dirname, '../dist/components.json');
 	await copyFile(from, to);

src/components.json

@@ -903,10 +903,6 @@
 			"title": "PHPDoc",
 			"owner": "RunDevelopment"
 		},
-		"php-extras": {
-			"title": "PHP Extras",
-			"owner": "milesj"
-		},
 		"plant-uml": {
 			"title": "PlantUML",
 			"owner": "RunDevelopment"
@@ -1304,10 +1300,6 @@
 			},
 			"owner": "freakmaxi"
 		},
-		"xml-doc": {
-			"title": "XML doc (.net)",
-			"owner": "RunDevelopment"
-		},
 		"xojo": {
 			"title": "Xojo (REALbasic)",
 			"owner": "Golmote"

src/config.ts

@@ -1,12 +1,12 @@
 const hasDOM = typeof document !== 'undefined' && typeof window !== 'undefined';
 const scriptElement: HTMLOrSVGScriptElement | null = hasDOM ? document.currentScript : null;
 const globalConfig: Record<string, PrismConfig[keyof PrismConfig] | null> =
 	// @ts-ignore
 	globalThis.Prism?.constructor?.name === 'Object' ? globalThis.Prism : {};
 
 function getGlobalSetting (name: string) {
 	// eslint-disable-next-line regexp/no-unused-capturing-group
-	const camelCaseName = name.replace(/-([a-z])/g, g => g[1].toUpperCase());
+	let camelCaseName = name.replace(/-([a-z])/g, g => g[1].toUpperCase());
 
 	if (camelCaseName in globalConfig) {
 		return globalConfig[camelCaseName];
@@ -32,12 +32,38 @@
 	return !(value === false || value === 'false');
 }
 
+function getGlobalArraySetting (name: string): string[] {
+	const value = getGlobalSetting(name);
+	if (value === null || value === undefined || value === false || value === 'false') {
+		return [];
+	}
+	else if (typeof value === 'string') {
+		return value.split(',').map(s => s.trim());
+	}
+	else if (Array.isArray(value)) {
+		return value;
+	}
+
+	return [];
+}
+
 export interface PrismConfig {
 	manual?: boolean;
+	silent?: boolean;
+	errorHandler?: (reason: any) => PromiseLike<never>;
+	plugins?: string[];
+	languages?: string[];
+	pluginPath?: string;
+	languagePath?: string;
 }
 
 export const globalDefaults: PrismConfig = {
 	manual: getGlobalBooleanSetting('manual', !hasDOM),
+	silent: getGlobalBooleanSetting('silent', false),
+	languages: getGlobalArraySetting('languages'),
+	plugins: getGlobalArraySetting('plugins'),
+	languagePath: (getGlobalSetting('language-path') ?? './languages/') as string,
+	pluginPath: (getGlobalSetting('plugin-path') ?? './plugins/') as string,
 };
 
 export default globalDefaults;

src/core.ts

@@ -1,2 +1,2 @@
-export { Prism } from './core/prism';
+export { default as Prism } from './core/classes/prism';
 export { Token } from './core/classes/token';