@floegence/floe-webapp-core 0.36.32 → 0.36.33

package/dist/components/editor/CodeEditor.d.ts

@@ -1,25 +1,30 @@
 import { type JSX } from 'solid-js';
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import type * as Monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
 import 'monaco-editor/min/vs/editor/editor.main.css';
 import { type CodeEditorRuntimeOptions } from './monacoStandaloneRuntime';
+type MonacoEditorOptions = Monaco.editor.IStandaloneEditorConstructionOptions;
+type MonacoStandaloneCodeEditor = Monaco.editor.IStandaloneCodeEditor;
+type MonacoTextModel = Monaco.editor.ITextModel;
+type MonacoModelContentChangedEvent = Monaco.editor.IModelContentChangedEvent;
 export interface CodeEditorProps {
     path: string;
     language?: string;
     value: string;
-    options?: monaco.editor.IStandaloneEditorConstructionOptions;
+    options?: MonacoEditorOptions;
     runtimeOptions?: CodeEditorRuntimeOptions;
     class?: string;
     style?: JSX.CSSProperties;
     onReady?: (api: CodeEditorApi) => void;
-    onContentChange?: (e: monaco.editor.IModelContentChangedEvent, api: CodeEditorApi) => void;
+    onContentChange?: (e: MonacoModelContentChangedEvent, api: CodeEditorApi) => void;
     onSelectionChange?: (selectionText: string, api: CodeEditorApi) => void;
     onChange?: (value: string) => void;
 }
 export interface CodeEditorApi {
-    editor: monaco.editor.IStandaloneCodeEditor;
-    model: monaco.editor.ITextModel;
+    editor: MonacoStandaloneCodeEditor;
+    model: MonacoTextModel;
     getValue: () => string;
     getSelectedText: () => string;
     focus: () => void;
 }
 export declare function CodeEditor(props: CodeEditorProps): JSX.Element;
+export {};

package/dist/components/editor/CodeEditor.js

@@ -1,14 +1,13 @@
-import { use as L, effect as O, className as D, style as F, template as V } from "solid-js/web";
-import { onMount as b, onCleanup as q, createEffect as g } from "solid-js";
-import { useTheme as w } from "../../context/ThemeContext.js";
-import { useResizeObserver as A } from "../../hooks/useResizeObserver.js";
-import * as f from "monaco-editor/esm/vs/editor/editor.api.js";
+import { use as L, effect as O, className as A, style as D, template as F } from "solid-js/web";
+import { onMount as V, onCleanup as b, createEffect as g } from "solid-js";
+import { useTheme as q } from "../../context/ThemeContext.js";
+import { useResizeObserver as w } from "../../hooks/useResizeObserver.js";
 import "monaco-editor/min/vs/editor/editor.main.css";
 import { resolveCodeEditorLanguageSpec as U } from "./languages.js";
 import { ensureMonacoEnvironment as p } from "./monacoEnvironment.js";
-import { ensureMonacoStandaloneRuntime as N } from "./monacoStandaloneRuntime.js";
-var _ = /* @__PURE__ */ V("<div>");
-const E = {
+import { loadMonacoEditorApi as N } from "./monacoStandaloneRuntime.js";
+var _ = /* @__PURE__ */ F("<div>");
+const T = {
   readOnly: !0,
   automaticLayout: !1,
   minimap: {
@@ -21,21 +20,21 @@ const E = {
   fontFamily: "var(--font-mono)"
 };
 let $ = 0;
-function k(t, c) {
-  return f.Uri.parse(`inmemory://model/${t}/${encodeURIComponent(c)}`);
+function k(t, d, a) {
+  return t.Uri.parse(`inmemory://model/${d}/${encodeURIComponent(a)}`);
 }
-function B(t, c) {
-  if (!t || !c) return "";
-  const r = t.getSelection();
-  return !r || r.isEmpty() ? "" : c.getValueInRange(r);
+function B(t, d) {
+  if (!t || !d) return "";
+  const a = t.getSelection();
+  return !a || a.isEmpty() ? "" : d.getValueInRange(a);
 }
 function X(t) {
-  const c = w();
-  let r;
-  const R = ++$;
-  let n, o, d, S = null, v = 0;
-  const x = A(() => r), y = () => {
-    f.editor.setTheme(c.resolvedTheme() === "dark" ? "vs-dark" : "vs");
+  const d = q();
+  let a;
+  const x = ++$;
+  let l, n, o, s, y = null, v = 0;
+  const R = w(() => a), S = () => {
+    l && l.editor.setTheme(d.resolvedTheme() === "dark" ? "vs-dark" : "vs");
   }, m = () => !n || !o ? null : {
     editor: n,
     model: o,
@@ -45,73 +44,73 @@ function X(t) {
   }, C = () => {
     const e = m();
     if (!e) return;
-    const a = e.model.uri.toString();
-    a !== S && (S = a, t.onReady?.(e));
+    const r = e.model.uri.toString();
+    r !== y && (y = r, t.onReady?.(e));
   }, M = () => {
     const e = m();
     e && t.onSelectionChange?.(e.getSelectedText(), e);
-  }, I = async () => {
-    if (!n) return;
-    const e = ++v, a = U(t.language);
-    let i = a.id;
+  }, E = async () => {
+    if (!n || !l) return;
+    const e = ++v, r = U(t.language);
+    let i = r.id;
     try {
-      await a.load?.();
+      await r.load?.();
     } catch {
       if (e !== v) return;
       i = "plaintext";
     }
     if (!n || e !== v) return;
-    const u = k(R, t.path);
+    const u = k(l, x, t.path);
     if (o && o.uri.toString() === u.toString()) {
-      o.getLanguageId() !== i && f.editor.setModelLanguage(o, i), o.getValue() !== t.value && o.setValue(t.value), C(), M();
+      o.getLanguageId() !== i && l.editor.setModelLanguage(o, i), o.getValue() !== t.value && o.setValue(t.value), C(), M();
       return;
     }
-    const l = f.editor.createModel(t.value, i, u);
-    o?.dispose(), o = l, n.setModel(o), C(), M();
+    const c = l.editor.createModel(t.value, i, u);
+    o?.dispose(), o = c, n.setModel(o), C(), M();
   };
-  return b(() => {
-    let e = !1, a, i;
+  return V(() => {
+    let e = !1, r, i;
     (async () => {
-      if (!r || (p(), await N(t.runtimeOptions), e || !r) || (n = f.editor.create(r, {
+      if (!a || (p(), l = await N(t.runtimeOptions), e || !a) || (n = l.editor.create(a, {
         model: null,
-        ...E,
+        ...T,
         ...t.options ?? {}
-      }), y(), await I(), e || !n)) return;
-      const l = t.onContentChange, T = t.onChange, z = t.onSelectionChange;
-      a = n.onDidChangeModelContent((s) => {
+      }), S(), await E(), e || !n)) return;
+      const c = t.onContentChange, I = t.onChange, z = t.onSelectionChange;
+      r = n.onDidChangeModelContent((f) => {
         const h = m();
-        h && (l?.(s, h), T && T(h.getValue()));
+        h && (c?.(f, h), I && I(h.getValue()));
       }), i = n.onDidChangeCursorSelection(() => {
-        const s = m();
-        s && z?.(s.getSelectedText(), s);
+        const f = m();
+        f && z?.(f.getSelectedText(), f);
       });
-    })().catch((l) => {
-      console.error("Failed to initialize Monaco editor runtime", l);
-    }), q(() => {
-      e = !0, a?.dispose(), i?.dispose(), d && cancelAnimationFrame(d), n?.dispose(), o?.dispose(), n = void 0, o = void 0;
+    })().catch((c) => {
+      console.error("Failed to initialize Monaco editor runtime", c);
+    }), b(() => {
+      e = !0, r?.dispose(), i?.dispose(), s && cancelAnimationFrame(s), n?.dispose(), o?.dispose(), l = void 0, n = void 0, o = void 0;
     });
   }), g(() => {
-    y();
+    S();
   }), g(() => {
     n && n.updateOptions({
-      ...E,
+      ...T,
       ...t.options ?? {}
     });
   }), g(() => {
-    t.path, t.language, t.value, I();
+    t.path, t.language, t.value, E();
   }), g(() => {
-    const e = x();
-    !e || !n || (d && cancelAnimationFrame(d), d = requestAnimationFrame(() => {
+    const e = R();
+    !e || !n || (s && cancelAnimationFrame(s), s = requestAnimationFrame(() => {
       n?.layout({
         width: e.width,
         height: e.height
       });
     }));
   }), (() => {
-    var e = _(), a = r;
-    return typeof a == "function" ? L(a, e) : r = e, O((i) => {
-      var u = t.class, l = t.style;
-      return u !== i.e && D(e, i.e = u), i.t = F(e, l, i.t), i;
+    var e = _(), r = a;
+    return typeof r == "function" ? L(r, e) : a = e, O((i) => {
+      var u = t.class, c = t.style;
+      return u !== i.e && A(e, i.e = u), i.t = D(e, c, i.t), i;
     }, {
       e: void 0,
       t: void 0

package/dist/components/editor/monacoStandaloneRuntime.d.ts

@@ -1,3 +1,4 @@
+type MonacoEditorApi = typeof import('monaco-editor/esm/vs/editor/editor.api.js');
 export interface MonacoRuntimeFeatureSet {
     suggestMemory: boolean;
     codeLensCache: boolean;
@@ -25,11 +26,12 @@ export interface ResolvedMonacoRuntimeRequest {
     cacheKey: string;
     blueprint: MonacoStandaloneRuntimeBlueprint;
 }
-type MonacoStandaloneRuntimeLoader = (request: ResolvedMonacoRuntimeRequest) => Promise<unknown>;
+type MonacoStandaloneRuntimeLoader = (request: ResolvedMonacoRuntimeRequest) => Promise<void>;
 export declare function normalizeMonacoRuntimeFeatureSet(standaloneFeatures?: Partial<MonacoRuntimeFeatureSet>): MonacoRuntimeFeatureSet;
 export declare const MONACO_RUNTIME_BLUEPRINTS: Record<MonacoRuntimeProfileName, MonacoStandaloneRuntimeBlueprint>;
 export declare function resolveMonacoRuntimeProfile(options?: CodeEditorRuntimeOptions): MonacoRuntimeProfileName;
 export declare function resolveMonacoRuntimeRequest(options?: CodeEditorRuntimeOptions): ResolvedMonacoRuntimeRequest;
 export declare function createMonacoStandaloneRuntime(loader: MonacoStandaloneRuntimeLoader): (options?: CodeEditorRuntimeOptions) => Promise<void>;
 export declare const ensureMonacoStandaloneRuntime: (options?: CodeEditorRuntimeOptions) => Promise<void>;
+export declare function loadMonacoEditorApi(options?: CodeEditorRuntimeOptions): Promise<MonacoEditorApi>;
 export {};

package/dist/components/editor/monacoStandaloneRuntime.js

@@ -1,32 +1,52 @@
-const l = {
+const s = {
   suggestMemory: !0,
   codeLensCache: !0,
   inlayHintsCache: !0,
   treeViewsDnd: !0,
   actionWidget: !0
 }, a = "editor_full";
-function u(e) {
+function d(e) {
   return {
-    ...l,
+    ...s,
     ...e ?? {}
   };
 }
-const s = [
+const c = [
   {
-    id: "editor.main",
-    load: () => import("monaco-editor/esm/vs/editor/editor.main.js")
+    id: "edcore.main",
+    load: () => import("monaco-editor/esm/vs/editor/edcore.main.js")
+  },
+  {
+    id: "suggestMemory",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestMemory.js")
+  },
+  {
+    id: "codeLensCache",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/codelens/browser/codeLensCache.js")
+  },
+  {
+    id: "inlayHintsContribution",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.js")
+  },
+  {
+    id: "treeViewsDndService",
+    load: () => import("monaco-editor/esm/vs/editor/common/services/treeViewsDndService.js")
+  },
+  {
+    id: "actionWidget",
+    load: () => import("monaco-editor/esm/vs/platform/actionWidget/browser/actionWidget.js")
   }
-], d = {
+], f = c, m = c, p = {
   editor_full: {
     profile: "editor_full",
-    modules: s
+    modules: f
   },
   preview_basic: {
     profile: "preview_basic",
-    modules: []
+    modules: m
   }
 };
-function f(e) {
+function M(e) {
   return e.suggestMemory === !1 && e.codeLensCache === !1 && e.inlayHintsCache === !1 && e.treeViewsDnd === !1 && e.actionWidget === !1;
 }
 function _(e) {
@@ -34,42 +54,50 @@ function _(e) {
     return e.profile;
   if (!e?.standaloneFeatures)
     return a;
-  const n = u(e.standaloneFeatures);
-  return f(n) ? "preview_basic" : a;
+  const n = d(e.standaloneFeatures);
+  return M(n) ? "preview_basic" : a;
 }
-function m(e) {
+function E(e) {
   const n = _(e);
   return {
     profile: n,
     cacheKey: `profile:${n}`,
-    blueprint: d[n]
+    blueprint: p[n]
   };
 }
-function M(e) {
+function O(e) {
   const n = /* @__PURE__ */ new Map();
-  return (i) => {
-    const t = m(i), o = n.get(t.cacheKey);
-    if (o) return o;
-    const r = e(t).then(() => {
-    }).catch((c) => {
-      throw n.delete(t.cacheKey), c;
+  return (l) => {
+    const o = E(l), i = n.get(o.cacheKey);
+    if (i) return i;
+    const r = e(o).then(() => {
+    }).catch((u) => {
+      throw n.delete(o.cacheKey), u;
     });
-    return n.set(t.cacheKey, r), r;
+    return n.set(o.cacheKey, r), r;
   };
 }
-function p(e) {
-  return Promise.all(e.blueprint.modules.map((n) => n.load()));
+function A(e) {
+  return Promise.all(e.blueprint.modules.map((n) => n.load())).then(() => {
+  });
 }
-const R = M(
-  p
+const h = O(
+  A
 );
+let t = null;
+async function L(e) {
+  return await h(e), t || (t = import("monaco-editor/esm/vs/editor/editor.api.js").catch((n) => {
+    throw t = null, n;
+  }), t);
+}
 export {
   a as DEFAULT_MONACO_RUNTIME_PROFILE,
-  l as DEFAULT_MONACO_STANDALONE_FEATURES,
-  d as MONACO_RUNTIME_BLUEPRINTS,
-  M as createMonacoStandaloneRuntime,
-  R as ensureMonacoStandaloneRuntime,
-  u as normalizeMonacoRuntimeFeatureSet,
+  s as DEFAULT_MONACO_STANDALONE_FEATURES,
+  p as MONACO_RUNTIME_BLUEPRINTS,
+  O as createMonacoStandaloneRuntime,
+  h as ensureMonacoStandaloneRuntime,
+  L as loadMonacoEditorApi,
+  d as normalizeMonacoRuntimeFeatureSet,
   _ as resolveMonacoRuntimeProfile,
-  m as resolveMonacoRuntimeRequest
+  E as resolveMonacoRuntimeRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-core",
-  "version": "0.36.32",
+  "version": "0.36.33",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",