pdl-editor 0.30.0 → 0.30.1

package/README.md

@@ -21,10 +21,22 @@ cross-repo development:
 ```ts
 import { PdlEditor } from "pdl-editor";
 import { loadPdlRuntime } from "pdl-wasm";
+import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
+import onigasmWasmUrl from "onigasm/lib/onigasm.wasm?url";
 
 const runtime = await loadPdlRuntime({ wasmUrl: "/wasm/pdl.wasm" });
+
+const setupOptions = {
+  createEditorWorker: () => new EditorWorker(),
+  onigasmWasmUrl,
+};
 ```
 
+The editor package keeps Vite-specific `?worker` and `?url` imports out of its
+published `dist/` entrypoints. Vite hosts should import those assets in the app
+and pass them through `setupOptions`; other bundlers can provide equivalent
+worker factories and asset URLs.
+
 Use packed mode before publishing by running `npm pack --dry-run` in
 `packages/wasm` and `editors/monaco`, then inspecting the file lists for
 `dist/`, declarations, README, package metadata, and editor assets.

package/dist/index.cjs

@@ -50,11 +50,9 @@ var import_react = __toESM(require("react"), 1);
 var monaco = __toESM(require("monaco-editor/esm/vs/editor/editor.api"), 1);
 var import_editor_main = require("monaco-editor/min/vs/editor/editor.main.css");
 var import_hoverContribution = require("monaco-editor/esm/vs/editor/contrib/hover/browser/hoverContribution");
-var import_editor = __toESM(require("monaco-editor/esm/vs/editor/editor.worker?worker"), 1);
 var import_monaco_editor_textmate = require("monaco-editor-textmate");
 var import_monaco_textmate = require("monaco-textmate");
 var import_onigasm = require("onigasm");
-var import_onigasm2 = __toESM(require("onigasm/lib/onigasm.wasm?url"), 1);
 
 // assets/language-configuration.json
 var language_configuration_default = {
@@ -689,11 +687,11 @@ function ensurePdlProviders(languageId) {
 }
 async function setupPdlMonacoOnce(options) {
   if (options.configureWorker !== false) {
-    configureMonacoWorker();
+    configureMonacoWorker(options);
   }
   registerPdlLanguage(options);
   definePdlTheme(options.themeName ?? PDL_THEME_NAME, options.theme ?? defaultPdlTheme());
-  await loadOnigasmOnce(options.onigasmWasmUrl ?? import_onigasm2.default);
+  await loadOnigasmOnce(resolveOnigasmWasmUrl(options));
   const registry = new import_monaco_textmate.Registry({
     getGrammarDefinition: async () => ({
       format: "json",
@@ -706,11 +704,25 @@ async function setupPdlMonacoOnce(options) {
     /* @__PURE__ */ new Map([[options.languageId ?? PDL_LANGUAGE_ID, options.scopeName ?? PDL_SCOPE_NAME]])
   );
 }
-function configureMonacoWorker() {
+function configureMonacoWorker(options) {
   const target = globalThis;
-  target.MonacoEnvironment ?? (target.MonacoEnvironment = {
-    getWorker: () => new import_editor.default()
-  });
+  if (target.MonacoEnvironment?.getWorker) {
+    return;
+  }
+  const createEditorWorker = options.createEditorWorker;
+  if (!createEditorWorker) {
+    throw new Error("pdl-editor requires setupPdlMonaco({ createEditorWorker }) unless configureWorker is false.");
+  }
+  target.MonacoEnvironment = {
+    ...target.MonacoEnvironment,
+    getWorker: () => createEditorWorker()
+  };
+}
+function resolveOnigasmWasmUrl(options) {
+  if (options.onigasmWasmUrl) {
+    return options.onigasmWasmUrl;
+  }
+  throw new Error("pdl-editor requires setupPdlMonaco({ onigasmWasmUrl }) for TextMate grammar loading.");
 }
 function loadOnigasmOnce(url) {
   onigasmPromise ?? (onigasmPromise = (0, import_onigasm.loadWASM)(url).catch((error) => {

package/dist/index.d.cts

@@ -102,6 +102,7 @@ interface SetupPdlMonacoOptions {
     grammar?: unknown;
     languageConfiguration?: monaco.languages.LanguageConfiguration;
     onigasmWasmUrl?: string;
+    createEditorWorker?: () => Worker | Promise<Worker>;
     configureWorker?: boolean;
 }
 declare function PdlEditor({ value, files, diagnostics, runtime, onChange, modelUri, languageId, themeName, theme, className, editorClassName, options, setupOptions, }: PdlEditorProps): React.ReactElement;

package/dist/index.d.ts

@@ -102,6 +102,7 @@ interface SetupPdlMonacoOptions {
     grammar?: unknown;
     languageConfiguration?: monaco.languages.LanguageConfiguration;
     onigasmWasmUrl?: string;
+    createEditorWorker?: () => Worker | Promise<Worker>;
     configureWorker?: boolean;
 }
 declare function PdlEditor({ value, files, diagnostics, runtime, onChange, modelUri, languageId, themeName, theme, className, editorClassName, options, setupOptions, }: PdlEditorProps): React.ReactElement;

package/dist/index.mjs

@@ -3,11 +3,9 @@ import React from "react";
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
 import "monaco-editor/min/vs/editor/editor.main.css";
 import "monaco-editor/esm/vs/editor/contrib/hover/browser/hoverContribution";
-import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
 import { wireTmGrammars } from "monaco-editor-textmate";
 import { Registry } from "monaco-textmate";
 import { loadWASM as loadOnigasm } from "onigasm";
-import onigasmWasmUrl from "onigasm/lib/onigasm.wasm?url";
 
 // assets/language-configuration.json
 var language_configuration_default = {
@@ -642,11 +640,11 @@ function ensurePdlProviders(languageId) {
 }
 async function setupPdlMonacoOnce(options) {
   if (options.configureWorker !== false) {
-    configureMonacoWorker();
+    configureMonacoWorker(options);
   }
   registerPdlLanguage(options);
   definePdlTheme(options.themeName ?? PDL_THEME_NAME, options.theme ?? defaultPdlTheme());
-  await loadOnigasmOnce(options.onigasmWasmUrl ?? onigasmWasmUrl);
+  await loadOnigasmOnce(resolveOnigasmWasmUrl(options));
   const registry = new Registry({
     getGrammarDefinition: async () => ({
       format: "json",
@@ -659,11 +657,25 @@ async function setupPdlMonacoOnce(options) {
     /* @__PURE__ */ new Map([[options.languageId ?? PDL_LANGUAGE_ID, options.scopeName ?? PDL_SCOPE_NAME]])
   );
 }
-function configureMonacoWorker() {
+function configureMonacoWorker(options) {
   const target = globalThis;
-  target.MonacoEnvironment ?? (target.MonacoEnvironment = {
-    getWorker: () => new EditorWorker()
-  });
+  if (target.MonacoEnvironment?.getWorker) {
+    return;
+  }
+  const createEditorWorker = options.createEditorWorker;
+  if (!createEditorWorker) {
+    throw new Error("pdl-editor requires setupPdlMonaco({ createEditorWorker }) unless configureWorker is false.");
+  }
+  target.MonacoEnvironment = {
+    ...target.MonacoEnvironment,
+    getWorker: () => createEditorWorker()
+  };
+}
+function resolveOnigasmWasmUrl(options) {
+  if (options.onigasmWasmUrl) {
+    return options.onigasmWasmUrl;
+  }
+  throw new Error("pdl-editor requires setupPdlMonaco({ onigasmWasmUrl }) for TextMate grammar loading.");
 }
 function loadOnigasmOnce(url) {
   onigasmPromise ?? (onigasmPromise = loadOnigasm(url).catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdl-editor",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "description": "Monaco and React editor integration for PDL browser hosts.",
   "license": "MIT OR Apache-2.0",
   "type": "module",