Move to typescript

Author: pomber

lib/dist/index.cjs.js

@@ -8,7 +8,7 @@ import typescript from "@rollup/plugin-typescript";
 const pkg = require("./package.json");
 
 export default {
-  input: "src/index.js",
+  input: "src/index.ts",
   output: [
     {
       file: "dist/index.cjs.js",

lib/dist/index.esm.mjs

@@ -1,14 +1,24 @@
 import { Registry } from "vscode-textmate";
-import vscodeOniguruma from "vscode-oniguruma";
+import {
+  loadWASM,
+  createOnigScanner,
+  createOnigString,
+} from "vscode-oniguruma";
+// @ts-ignore
 import onig from "vscode-oniguruma/release/onig.wasm";
 import { loadTheme, getThemeColors } from "./themes";
 import { tokenize } from "./tokenizer.js";
 import { loadGrammarByScope } from "./grammars.js";
 import { aliasToLangData } from "./language";
+import { LanguageAlias } from "./language-data";
 
-let registry = null;
+let registry: Registry | null = null;
 
-export async function highlight(code, alias, themeOrThemeName = "dark-plus") {
+export async function highlight(
+  code: string,
+  alias: LanguageAlias,
+  themeOrThemeName = "dark-plus"
+) {
   // get the language object from the alias
   const langData = aliasToLangData(alias);
 
@@ -19,9 +29,12 @@ export async function highlight(code, alias, themeOrThemeName = "dark-plus") {
 
   // initialize the registry the first time
   if (!registry) {
-    await vscodeOniguruma.loadWASM(onig);
+    const onigLibPromise = loadWASM(onig).then(() => ({
+      createOnigScanner,
+      createOnigString,
+    }));
     registry = new Registry({
-      onigLib: vscodeOniguruma,
+      onigLib: onigLibPromise,
       loadGrammar: (scopeName) => loadGrammarByScope(scopeName),
     });
   }
@@ -31,7 +44,7 @@ export async function highlight(code, alias, themeOrThemeName = "dark-plus") {
   const theme = await loadTheme(themeOrThemeName);
   registry.setTheme(theme);
 
-  const grammar = await grammarsPromise;
+  const grammar = (await grammarsPromise)!;
   const colorMap = registry.getColorMap();
 
   return {
@@ -42,8 +55,8 @@ export async function highlight(code, alias, themeOrThemeName = "dark-plus") {
 }
 
 export class UnknownLanguageError extends Error {
-  alias;
-  constructor(alias) {
+  alias: string;
+  constructor(alias: string) {
     super(`Unknown language: ${alias}`);
     this.alias = alias;
   }

lib/rollup.config.js

@@ -1,6 +1,5 @@
 // from https://github.com/browserify/resolve
 // removed the "is-core-module" dependency because it fails on edge runtime
-
 export default function resolveSync(x, options) {
   var fs = require("fs");
   var path = require("path");
@@ -9,13 +8,6 @@ export default function resolveSync(x, options) {
   var os = require("os");
 
   function normalizeOptions(x, opts) {
-    /**
-     * This file is purposefully a passthrough. It's expected that third-party
-     * environments will override it at runtime in order to inject special logic
-     * into `resolve` (by manipulating the options). One such example is the PnP
-     * code path in Yarn.
-     */
-
     return opts || {};
   }