@marimo-team/frontend 0.24.1-dev61 → 0.24.1-dev62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{CellStatus-DeTZJKkI.js → CellStatus-ByrqmRbF.js} +1 -1
- package/dist/assets/{JsonOutput-CucHb-Xd.js → JsonOutput-DbjqR1zZ.js} +1 -1
- package/dist/assets/{MarimoErrorOutput-9BDdSrft.js → MarimoErrorOutput-CidvW8yi.js} +1 -1
- package/dist/assets/{RenderHTML-9AmE10az.js → RenderHTML-DyTQ_aJR.js} +1 -1
- package/dist/assets/{RunButton-B1OO4yPE.js → RunButton-Cv_ckYEH.js} +1 -1
- package/dist/assets/{add-cell-with-ai-B382kx-8.js → add-cell-with-ai-DKAX5Wkq.js} +1 -1
- package/dist/assets/{add-connection-dialog-CCgzVaXE.js → add-connection-dialog-k-xbLWdR.js} +1 -1
- package/dist/assets/{agent-panel-tC3KSuFA.js → agent-panel-BJEEx6sL.js} +1 -1
- package/dist/assets/{ai-model-dropdown-BwTphSMd.js → ai-model-dropdown-Cwwyj9FR.js} +1 -1
- package/dist/assets/{app-config-button-C3LicTtk.js → app-config-button-DOupOPfE.js} +1 -1
- package/dist/assets/{blob-EfjbJ__b.js → blob-D2x71aTK.js} +1 -1
- package/dist/assets/{cell-editor-CR6poe2J.js → cell-editor-CA-TDKsV.js} +1 -1
- package/dist/assets/{cell-link-q2lv7md_.js → cell-link-c74wFaiz.js} +1 -1
- package/dist/assets/{cells-v0dAmt79.js → cells-DNoi9Edm.js} +3 -3
- package/dist/assets/{chat-display-C-KzQ4Sl.js → chat-display-1WcDqz9D.js} +1 -1
- package/dist/assets/{chat-panel-BM8a5kkg.js → chat-panel-BwFn9Fqv.js} +1 -1
- package/dist/assets/{chat-ui-B10QUDuE.js → chat-ui-Dh1Yvmb2.js} +1 -1
- package/dist/assets/{column-preview-DahZx7i3.js → column-preview-BrO557-t.js} +1 -1
- package/dist/assets/{command-palette-DLDqpso1.js → command-palette-09UTreJu.js} +1 -1
- package/dist/assets/{common-C-hdr6As.js → common-CAMZMCwq.js} +1 -1
- package/dist/assets/{components-Cnt-rCdC.js → components-DJLtV_Mj.js} +1 -1
- package/dist/assets/{datasource-Bq9EwG3Q.js → datasource-DVv7qUFu.js} +1 -1
- package/dist/assets/{dependency-graph-panel-DLgUYv2G.js → dependency-graph-panel-IgEoFXFw.js} +1 -1
- package/dist/assets/{documentation-panel-BIqV8dCY.js → documentation-panel-CpJX3LTt.js} +1 -1
- package/dist/assets/{download-D-WORhyV.js → download-CCPBCjzu.js} +1 -1
- package/dist/assets/{edit-page-rjLWDywQ.js → edit-page-acN1qybv.js} +4 -4
- package/dist/assets/{error-entries-DOcZqCs5.js → error-entries-DOS37j7f.js} +1 -1
- package/dist/assets/{error-panel-xPtHRph4.js → error-panel-B3q6q2Gs.js} +1 -1
- package/dist/assets/{file-explorer-panel-YhKO1Kb8.js → file-explorer-panel-uum_XPfd.js} +1 -1
- package/dist/assets/{file-icons-BI3Xijjz.js → file-icons-CLGmPKoJ.js} +1 -1
- package/dist/assets/{file-name-input-B0v9VVzS.js → file-name-input-DC441YXk.js} +1 -1
- package/dist/assets/{floating-outline-fI7KiW7l.js → floating-outline-W5HJSoBY.js} +1 -1
- package/dist/assets/{home-page-BMzFHuuq.js → home-page-ChhDXfUJ.js} +1 -1
- package/dist/assets/{index-B2a_xizI.js → index-CTgrlfah.js} +3 -3
- package/dist/assets/{layout-Dqce0OL2.js → layout-D6bpFA5-.js} +3 -3
- package/dist/assets/{logs-panel-BlKmgk9O.js → logs-panel-DmbccYWJ.js} +1 -1
- package/dist/assets/{markdown-renderer-BHFj8yJ6.js → markdown-renderer-CB2UurmB.js} +1 -1
- package/dist/assets/{name-cell-input-9y9cdffD.js → name-cell-input-CX4R8mJV.js} +1 -1
- package/dist/assets/{outline-panel-BkyU6F0r.js → outline-panel-LEx0BFUs.js} +1 -1
- package/dist/assets/{packages-panel-DGuBWpad.js → packages-panel-C1GVBEEm.js} +1 -1
- package/dist/assets/{panel-accordion-state-C2vAFKpP.js → panel-accordion-state-HNISBQa4.js} +1 -1
- package/dist/assets/{panels-ZCSZ8vcg.js → panels-DHzJd4RF.js} +1 -1
- package/dist/assets/{process-output-DmEilKB6.js → process-output-DIhqtgs6.js} +1 -1
- package/dist/assets/{readonly-code-display-2N0THiJK.js → readonly-code-display-Cee30pk_.js} +1 -1
- package/dist/assets/{readonly-python-code-DyB_sdtx.js → readonly-python-code-m_9bVgtt.js} +1 -1
- package/dist/assets/{reveal-component-DmwU8_uO.js → reveal-component-UsIugcdk.js} +1 -1
- package/dist/assets/{run-page-C-fKIihG.js → run-page-BBlp0Qjt.js} +1 -1
- package/dist/assets/{scratchpad-panel-D_0HEFCV.js → scratchpad-panel-H9rBgtaS.js} +1 -1
- package/dist/assets/{session-panel-BAqFjL9-.js → session-panel-F_IDPTWG.js} +1 -1
- package/dist/assets/{skeleton-BUOlBrWg.js → skeleton-HSX1nQ-v.js} +1 -1
- package/dist/assets/{snippets-panel-C4dcsNOG.js → snippets-panel-DpCuVkpq.js} +1 -1
- package/dist/assets/{state-Du63Xg9M.js → state-CHqSZb7R.js} +1 -1
- package/dist/assets/{state-C8pDImyF.js → state-DGgHgBN9.js} +1 -1
- package/dist/assets/{tracing-DPTkPFxO.js → tracing-BEJAq4zg.js} +1 -1
- package/dist/assets/{tracing-panel-3SQN2w-o.js → tracing-panel-D8QL7Nar.js} +2 -2
- package/dist/assets/{tree-actions-Bn9POqng.js → tree-actions-CxkW_mv4.js} +1 -1
- package/dist/assets/{useAddCell-DtdPi8nq.js → useAddCell-CAX4gqgE.js} +1 -1
- package/dist/assets/{useCellActionButton-BS300A54.js → useCellActionButton-Cje0V_da.js} +1 -1
- package/dist/assets/{useDeleteCell-Ha8ut0yy.js → useDeleteCell-CL_90v2g.js} +1 -1
- package/dist/assets/{useDependencyPanelTab-DsrUeu8t.js → useDependencyPanelTab-BEA9Hqzv.js} +1 -1
- package/dist/assets/{useNotebookActions-DdgIE9oe.js → useNotebookActions-Rn6aXLN2.js} +1 -1
- package/dist/assets/{useRunCells-CIALOcRX.js → useRunCells-DttzF-pt.js} +1 -1
- package/dist/assets/{useSplitCell-dEuZjk85.js → useSplitCell-BD2q-Clc.js} +1 -1
- package/dist/index.html +19 -19
- package/package.json +1 -1
- package/src/core/codemirror/copilot/__tests__/getCodes.test.ts +66 -1
- package/src/core/codemirror/copilot/getCodes.ts +22 -25
- package/src/core/codemirror/lsp/__tests__/notebook-lsp.test.ts +25 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
import{a as e}from"./rolldown-runtime-B0Z9INg1.js";import{c as t,f as n,l as r,t as i,u as a}from"./useEvent-xfs0Sn4r.js";import{t as o}from"./react-CBDbhulC.js";import{Cn as s,Dn as c,K as ee,Rt as l,bn as u,fn as d,gn as f,hn as p,mn as m,vn as h,xn as g,yn as _,zn as v}from"./cells-
|
|
1
|
+
import{a as e}from"./rolldown-runtime-B0Z9INg1.js";import{c as t,f as n,l as r,t as i,u as a}from"./useEvent-xfs0Sn4r.js";import{t as o}from"./react-CBDbhulC.js";import{Cn as s,Dn as c,K as ee,Rt as l,bn as u,fn as d,gn as f,hn as p,mn as m,vn as h,xn as g,yn as _,zn as v}from"./cells-DNoi9Edm.js";import{t as y}from"./compiler-runtime-CYIjoINj.js";import{t as b}from"./cn-ldLVeaqm.js";import{t as x}from"./jsx-runtime-B74pBk57.js";import{d as te}from"./alert-dialog-DBoy-FMx.js";import{a as ne,n as re,o as ie,t as ae}from"./tooltip-D7dq6bnc.js";import{t as oe}from"./useCellActionButton-Cje0V_da.js";import{a as se,i as ce}from"./renderShortcut-CS4ccH3x.js";var S=y(),C=e(o(),1),w=x(),T=C.memo(C.forwardRef((e,t)=>{let n=(0,S.c)(39),{children:r,showTooltip:a,...o}=e,l=a===void 0||a,[y,x]=(0,C.useState)(!1),T;n[0]===Symbol.for(`react.memo_cache_sentinel`)?(T=()=>x(!1),n[0]=T):T=n[0];let E=T,D=(0,C.useRef)(null),j=oe({cell:o,closePopover:E}).map(O).filter(k),M=te(),N;n[1]===Symbol.for(`react.memo_cache_sentinel`)?(N=()=>{ee(()=>{D.current&&D.current.scrollIntoView({behavior:`auto`,block:`nearest`})})},n[1]=N):N=n[1];let P=i(N),F;n[2]===P?F=n[3]:(F=e=>{x(t=>{let n=typeof e==`function`?e(t):e;return n&&P(),n})},n[2]=P,n[3]=F);let I=i(F),L;n[4]===I?L=n[5]:(L=()=>({toggle:()=>I(A)}),n[4]=I,n[5]=L),(0,C.useImperativeHandle)(t,L);let R=m,z=f,B=v(o.cellId),V;n[6]===B?V=n[7]:(V=(0,w.jsx)(u,{placeholder:`Search actions...`,className:`h-6 m-1`,...B}),n[6]=B,n[7]=V);let H=c,U;n[8]===Symbol.for(`react.memo_cache_sentinel`)?(U=(0,w.jsx)(h,{children:`No results`}),n[8]=U):U=n[8];let W=j.map((e,t)=>(0,w.jsxs)(C.Fragment,{children:[(0,w.jsx)(_,{children:e.map(e=>{let t=(0,w.jsxs)(`div`,{className:`flex items-center flex-1`,children:[e.icon&&(0,w.jsx)(`div`,{className:`mr-2 w-5 text-muted-foreground`,children:e.icon}),(0,w.jsx)(`div`,{className:`flex-1`,children:e.label}),(0,w.jsxs)(`div`,{className:`shrink-0 text-sm`,children:[e.hotkey&&ce(e.hotkey),e.rightElement]})]});return e.tooltip&&(t=(0,w.jsx)(ae,{content:e.tooltip,delayDuration:100,children:t})),(0,w.jsx)(g,{className:b(e.disabled&&`opacity-50!`),onSelect:()=>{e.disableClick||e.disabled||(e.handle(),x(!1))},variant:e.variant,children:t},e.label)})},t),t<j.length-1&&(0,w.jsx)(s,{})]},t)),G;n[9]!==H||n[10]!==U||n[11]!==W?(G=(0,w.jsxs)(H,{children:[U,W]}),n[9]=H,n[10]=U,n[11]=W,n[12]=G):G=n[12];let K;n[13]!==z||n[14]!==G||n[15]!==V?(K=(0,w.jsxs)(z,{children:[V,G]}),n[13]=z,n[14]=G,n[15]=V,n[16]=K):K=n[16];let q;n[17]!==R||n[18]!==M||n[19]!==K?(q=(0,w.jsx)(R,{className:`w-[300px] p-0 pt-1 overflow-auto`,scrollable:!0,...M,children:K}),n[17]=R,n[18]=M,n[19]=K,n[20]=q):q=n[20];let J=q;if(!l){let e;n[21]===r?e=n[22]:(e=(0,w.jsx)(p,{asChild:!0,children:r}),n[21]=r,n[22]=e);let t;return n[23]!==J||n[24]!==I||n[25]!==y||n[26]!==e?(t=(0,w.jsxs)(d,{open:y,onOpenChange:I,children:[e,J]}),n[23]=J,n[24]=I,n[25]=y,n[26]=e,n[27]=t):t=n[27],t}let Y;n[28]===Symbol.for(`react.memo_cache_sentinel`)?(Y=(0,w.jsx)(re,{tabIndex:-1,children:se(`cell.cellActions`)}),n[28]=Y):Y=n[28];let X=!y&&Y,Z;n[29]===r?Z=n[30]:(Z=(0,w.jsx)(ie,{ref:D,children:(0,w.jsx)(p,{className:`flex`,children:r})}),n[29]=r,n[30]=Z);let Q;n[31]!==X||n[32]!==Z?(Q=(0,w.jsxs)(ne,{delayDuration:200,disableHoverableContent:!0,children:[X,Z]}),n[31]=X,n[32]=Z,n[33]=Q):Q=n[33];let $;return n[34]!==J||n[35]!==I||n[36]!==y||n[37]!==Q?($=(0,w.jsxs)(d,{open:y,onOpenChange:I,children:[Q,J]}),n[34]=J,n[35]=I,n[36]=y,n[37]=Q,n[38]=$):$=n[38],$})),E=C.memo(e=>{let t=(0,S.c)(5),{children:n,cellId:i}=e,a;t[0]===i?a=t[1]:(a=l(i),t[0]=i,t[1]=a);let o=r(a);if(!o)return null;let s;return t[2]!==n||t[3]!==o?(s=(0,w.jsx)(T,{showTooltip:!1,...o,children:n}),t[2]=n,t[3]=o,t[4]=s):s=t[4],s});E.displayName=`ConnectionCellActionsDropdown`;function D(e){return!e.redundant}function O(e){return e.filter(D)}function k(e){return e.length>0}function A(e){return!e}var j=n(`minimap`);function M(){let e=(0,S.c)(3),[n,r]=t(j),i;return e[0]!==n||e[1]!==r?(i={dependencyPanelTab:n,setDependencyPanelTab:r},e[0]=n,e[1]=r,e[2]=i):i=e[2],i}function N(){return a(j)}export{E as i,N as n,T as r,M as t};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{a as e}from"./rolldown-runtime-B0Z9INg1.js";import{c as t,f as n,l as r,r as i,u as a}from"./useEvent-xfs0Sn4r.js";import{t as o}from"./react-CBDbhulC.js";import{Bi as s,Ct as c,E as l,Fa as u,It as d,Kr as f,Qi as p,Qr as m,T as h,Wn as g,Xi as _,Xr as v,Zi as y,Zr as b,bo as x,cn as S,do as C,ei as w,g as T,go as ee,ir as E,jo as D,li as O,ln as te,m as k,ra as A,sa as j,t as M,ta as N,ti as P,y as ne,zi as F}from"./cells-
|
|
1
|
+
import{a as e}from"./rolldown-runtime-B0Z9INg1.js";import{c as t,f as n,l as r,r as i,u as a}from"./useEvent-xfs0Sn4r.js";import{t as o}from"./react-CBDbhulC.js";import{Bi as s,Ct as c,E as l,Fa as u,It as d,Kr as f,Qi as p,Qr as m,T as h,Wn as g,Xi as _,Xr as v,Zi as y,Zr as b,bo as x,cn as S,do as C,ei as w,g as T,go as ee,ir as E,jo as D,li as O,ln as te,m as k,ra as A,sa as j,t as M,ta as N,ti as P,y as ne,zi as F}from"./cells-DNoi9Edm.js";import{Cn as I,kt as L,vt as R}from"./schemas-aTUejmFi.js";import{t as z}from"./compiler-runtime-CYIjoINj.js";import{r as re,w as B}from"./utils-CUZQNAWJ.js";import{C as V,n as H,r as U}from"./ai-model-dropdown-Cwwyj9FR.js";import{g as W,n as ie}from"./useEventListener-D27Dii_l.js";import{t as ae}from"./objects-snlMn4yk.js";import{n as G,t as K}from"./constants-BDbGiS7O.js";import{A as oe,M as se,N as q,O as ce,T as le,j as ue,k as de,v as fe}from"./config-DaNyNpZL.js";import{t as pe}from"./switch-27TbonxF.js";import{c as me}from"./readonly-python-code-m_9bVgtt.js";import{t as J}from"./cn-ldLVeaqm.js";import{t as he}from"./jsx-runtime-B74pBk57.js";import{o as ge}from"./alert-dialog-DBoy-FMx.js";import{i as _e,n as ve,r as ye,t as be}from"./tabs-c6mpccpH.js";import{a as xe,c as Se,i as Ce,n as we,r as Te,s as Ee,t as De}from"./select-BUEX2Vfl.js";import{Pt as Oe,X as ke}from"./JsonOutput-DbjqR1zZ.js";import{a as Ae,c as Y,o as je,p as Me,t as Ne}from"./download-CCPBCjzu.js";import{t as Pe}from"./tooltip-D7dq6bnc.js";import{n as Fe,r as Ie,t as Le}from"./button-BMBznEru.js";import{i as Re,r as ze,t as Be}from"./strings-CpYReX2Q.js";import{r as Ve}from"./requests-C6_IaFh7.js";import{t as X}from"./createLucideIcon-B7HeEoG2.js";import{F as He,I as Ue,L as We,P as Ge,a as Ke,i as qe,u as Je}from"./layout-D6bpFA5-.js";import{t as Ye}from"./check-BoA6XBpj.js";import{r as Xe}from"./useCellActionButton-Cje0V_da.js";import{t as Ze}from"./code-CF0HKE9K.js";import{t as Qe}from"./copy-BMXKNElG.js";import{t as $e}from"./eye-off-CFuPxa9F.js";import{t as et}from"./external-link-Bp3BxyRA.js";import{t as tt}from"./file-DF8n85RA.js";import{t as nt}from"./globe-BQf75qV_.js";import{n as rt,r as it,t as at}from"./youtube-DCJ-ihUU.js";import{n as ot}from"./components-ib4asSo7.js";import{i as st,n as ct,r as lt}from"./markdown-export-0rLbaq8b.js";import{t as ut}from"./image-ab13yGv4.js";import{D as dt,E as ft,O as pt,T as mt,b as ht,j as gt}from"./write-secret-modal-BG_B6y1P.js";import{t as _t}from"./link-Cap-MZiw.js";import{t as vt}from"./spinner-Ck-Hgfvj.js";import{r as yt}from"./input-DeyycFtq.js";import{t as bt}from"./settings-C-cYas75.js";import{t as xt}from"./square-B58Ib8Ir.js";import{t as St}from"./triangle-alert-MihykDYG.js";import{t as Ct}from"./use-toast-DpWHUGuF.js";import{n as wt,t as Tt}from"./paths-zcL04qUW.js";import{o as Et}from"./session-CEdta5_Q.js";import{n as Dt}from"./useAsyncData-Buhk-UgR.js";import{n as Ot}from"./copy-Cg05mM3C.js";import{t as kt}from"./copy-icon-LPQzn7_f.js";import{r as At}from"./useRunCells-DttzF-pt.js";import{r as jt,t as Mt}from"./share-C2MPy_VX.js";import{n as Nt,t as Pt}from"./alert-dmKwNsrp.js";import{a as Ft}from"./cell-link-c74wFaiz.js";import{t as It}from"./icons-CjLa9BiH.js";import{i as Lt,n as Rt}from"./error-entries-DOS37j7f.js";import{n as zt,t as Bt}from"./pair-with-agent-modal-TbFSfxnC.js";import{n as Vt}from"./add-connection-dialog-k-xbLWdR.js";import{t as Ht}from"./github-YRgb6LMu.js";import{n as Ut}from"./marimo-icons-C3KxMV9A.js";import{t as Wt}from"./links-DPh7yoP-.js";import{i as Gt,n as Kt,t as qt}from"./skeleton-HSX1nQ-v.js";import{t as Jt}from"./types-CoHi_MQq.js";var Yt=X(`circle-chevron-down`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m16 10-4 4-4-4`,key:`894hmk`}]]),Xt=X(`circle-chevron-right`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m10 8 4 4-4 4`,key:`1wy4r4`}]]),Zt=X(`clipboard-copy`,[[`rect`,{width:`8`,height:`4`,x:`8`,y:`2`,rx:`1`,ry:`1`,key:`tgr4d6`}],[`path`,{d:`M8 4H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-2`,key:`4jdomd`}],[`path`,{d:`M16 4h2a2 2 0 0 1 2 2v4`,key:`3hqy98`}],[`path`,{d:`M21 14H11`,key:`1bme5i`}],[`path`,{d:`m15 10-4 4 4 4`,key:`5dvupr`}]]),Qt=X(`cloud-download`,[[`path`,{d:`M12 13v8l-4-4`,key:`1f5nwf`}],[`path`,{d:`m12 21 4-4`,key:`1lfcce`}],[`path`,{d:`M4.393 15.269A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 2.436 8.284`,key:`ui1hmy`}]]),$t=X(`command`,[[`path`,{d:`M15 6v12a3 3 0 1 0 3-3H6a3 3 0 1 0 3 3V6a3 3 0 1 0-3 3h12a3 3 0 1 0-3-3`,key:`11bfej`}]]),en=X(`diamond-plus`,[[`path`,{d:`M12 8v8`,key:`napkw2`}],[`path`,{d:`M2.7 10.3a2.41 2.41 0 0 0 0 3.41l7.59 7.59a2.41 2.41 0 0 0 3.41 0l7.59-7.59a2.41 2.41 0 0 0 0-3.41L13.7 2.71a2.41 2.41 0 0 0-3.41 0z`,key:`1ey20j`}],[`path`,{d:`M8 12h8`,key:`1wcyev`}]]),tn=X(`fast-forward`,[[`path`,{d:`M12 6a2 2 0 0 1 3.414-1.414l6 6a2 2 0 0 1 0 2.828l-6 6A2 2 0 0 1 12 18z`,key:`b19h5q`}],[`path`,{d:`M2 6a2 2 0 0 1 3.414-1.414l6 6a2 2 0 0 1 0 2.828l-6 6A2 2 0 0 1 2 18z`,key:`h7h5ge`}]]),nn=X(`files`,[[`path`,{d:`M15 2h-4a2 2 0 0 0-2 2v11a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V8`,key:`14sh0y`}],[`path`,{d:`M16.706 2.706A2.4 2.4 0 0 0 15 2v5a1 1 0 0 0 1 1h5a2.4 2.4 0 0 0-.706-1.706z`,key:`1970lx`}],[`path`,{d:`M5 7a2 2 0 0 0-2 2v11a2 2 0 0 0 2 2h8a2 2 0 0 0 1.732-1`,key:`l4dndm`}]]),rn=X(`list`,[[`path`,{d:`M3 5h.01`,key:`18ugdj`}],[`path`,{d:`M3 12h.01`,key:`nlz23k`}],[`path`,{d:`M3 19h.01`,key:`noohij`}],[`path`,{d:`M8 5h13`,key:`1pao27`}],[`path`,{d:`M8 12h13`,key:`1za7za`}],[`path`,{d:`M8 19h13`,key:`m83p4d`}]]),an=X(`message-circle-question-mark`,[[`path`,{d:`M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719`,key:`1sd12s`}],[`path`,{d:`M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3`,key:`1u773s`}],[`path`,{d:`M12 17h.01`,key:`p32p05`}]]),on=X(`notebook`,[[`path`,{d:`M2 6h4`,key:`aawbzj`}],[`path`,{d:`M2 10h4`,key:`l0bgd4`}],[`path`,{d:`M2 14h4`,key:`1gsvsf`}],[`path`,{d:`M2 18h4`,key:`1bu2t1`}],[`rect`,{width:`16`,height:`20`,x:`4`,y:`2`,rx:`2`,key:`1nb95v`}],[`path`,{d:`M16 2v20`,key:`rotuqe`}]]),sn=X(`panel-left`,[[`rect`,{width:`18`,height:`18`,x:`3`,y:`3`,rx:`2`,key:`afitv7`}],[`path`,{d:`M9 3v18`,key:`fh3hqa`}]]),cn=X(`presentation`,[[`path`,{d:`M2 3h20`,key:`91anmk`}],[`path`,{d:`M21 3v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V3`,key:`2k9sn8`}],[`path`,{d:`m7 21 5-5 5 5`,key:`bip4we`}]]),ln=X(`share-2`,[[`circle`,{cx:`18`,cy:`5`,r:`3`,key:`gq8acd`}],[`circle`,{cx:`6`,cy:`12`,r:`3`,key:`w7nqdw`}],[`circle`,{cx:`18`,cy:`19`,r:`3`,key:`1xt0gg`}],[`line`,{x1:`8.59`,x2:`15.42`,y1:`13.51`,y2:`17.49`,key:`47mynk`}],[`line`,{x1:`15.41`,x2:`8.59`,y1:`6.51`,y2:`10.49`,key:`1n3mei`}]]),un=X(`square-power`,[[`path`,{d:`M12 7v4`,key:`xawao1`}],[`path`,{d:`M7.998 9.003a5 5 0 1 0 8-.005`,key:`1pek45`}],[`rect`,{x:`3`,y:`3`,width:`18`,height:`18`,rx:`2`,key:`h1oib`}]]),dn=X(`undo-2`,[[`path`,{d:`M9 14 4 9l5-5`,key:`102s5s`}],[`path`,{d:`M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5a5.5 5.5 0 0 1-5.5 5.5H11`,key:`f3b9sd`}]]),Z=he(),Q=z(),$=e(o(),1);function fn(e,t){let n=(0,Q.c)(11),r;n[0]===t?r=n[1]:(r=new C(t),n[0]=t,n[1]=r);let i=r,a;n[2]!==e||n[3]!==i?(a=()=>i.get(e),n[2]=e,n[3]=i,n[4]=a):a=n[4];let[o,s]=(0,$.useState)(a),c;n[5]!==e||n[6]!==i?(c=t=>{s(t),i.set(e,t)},n[5]=e,n[6]=i,n[7]=c):c=n[7];let l=c,u;return n[8]!==l||n[9]!==o?(u=[o,l],n[8]=l,n[9]=o,n[10]=u):u=n[10],u}function pn(e,t){return{...e,Binaries:{...e.Binaries,Browser:t}}}function mn(e,t,n,r){return{marimo:e,Locale:n||void 0,Binaries:{Browser:t},"Environment Collection Error":r}}function hn(e,t){let n=Math.max(2,...Array.from(t.matchAll(/`+/g),e=>e[0].length)),r="`".repeat(n+1);return`${r}${e}\n${t}\n${r}`}function gn(e,t){let n=e.includes(`?`)?`&`:`?`,r=[],i=e,a=0;for(let[e,o]of Object.entries(t)){if(o.length===0)continue;let t=`${e}=${encodeURIComponent(o)}`,s=`${i}${a===0?n:`&`}${t}`;if(s.length>6e3){r.push(e);continue}i=s,a+=1}return{url:i,omitted:r}}function _n(e,t){return[`<details>`,`<summary>${Be.htmlEscape(e)??``}</summary>`,``,t,``,`</details>`].join(`
|
|
2
2
|
`)}function vn(e){return _n(`Environment`,hn(`json`,JSON.stringify(e,null,2)))}function yn(e){return _n(`Errors`,hn(`text`,e.map(Rt).join(`
|
|
3
3
|
|
|
4
4
|
---
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{f as e,t,u as n}from"./useEvent-xfs0Sn4r.js";import{E as r,Ia as i,Ua as a,ht as o,m as s,si as c}from"./cells-
|
|
1
|
+
import{f as e,t,u as n}from"./useEvent-xfs0Sn4r.js";import{E as r,Ia as i,Ua as a,ht as o,m as s,si as c}from"./cells-DNoi9Edm.js";import{t as l}from"./compiler-runtime-CYIjoINj.js";import{g as u}from"./useEventListener-D27Dii_l.js";import{o as d}from"./dist-Dz_04liz.js";import{r as f}from"./requests-C6_IaFh7.js";var p=l(),m=e(!1);function h(){let e=(0,p.c)(2),n=v(),r;return e[0]===n?r=e[1]:(r=()=>n(a(s())),e[0]=n,e[1]=r),t(r)}function g(e){let n=(0,p.c)(3),r=v(),i;return n[0]!==e||n[1]!==r?(i=()=>{e!==void 0&&r([e])},n[0]=e,n[1]=r,n[2]=i):i=n[2],t(i)}function _(){let e=(0,p.c)(2),n=v(),r;return e[0]===n?r=e[1]:(r=()=>n(i(s())),e[0]=n,e[1]=r),t(r)}function v(){let e=(0,p.c)(4),{prepareForRun:i}=r(),{sendRun:a}=f(),o=n(m),c;return e[0]!==i||e[1]!==a||e[2]!==o?(c=async e=>{if(e.length===0)return;let t=s();return o(!0),y({cellIds:e,sendRun:a,prepareForRun:i,notebook:t})},e[0]=i,e[1]=a,e[2]=o,e[3]=c):c=e[3],t(c)}async function y({cellIds:e,sendRun:t,prepareForRun:n,notebook:r}){if(e.length===0)return;let{cellHandles:i,cellData:a}=r,s=[];for(let t of e){let e=i[t]?.current?.editorView,r;e?(c(e)!==`markdown`&&d(e),r=o(e)):r=a[t]?.code||``,s.push(r),n({cellId:t})}await t({cellIds:e,codes:s}).catch(e=>{u.error(e)})}export{v as a,g as i,y as n,h as o,_ as r,m as t};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{t as e}from"./useEvent-xfs0Sn4r.js";import{E as t,d as n,ht as r}from"./cells-
|
|
1
|
+
import{t as e}from"./useEvent-xfs0Sn4r.js";import{E as t,d as n,ht as r}from"./cells-DNoi9Edm.js";import{t as i}from"./compiler-runtime-CYIjoINj.js";import{t as a}from"./jsx-runtime-B74pBk57.js";import{r as o}from"./useDeleteCell-CL_90v2g.js";import{t as s}from"./use-toast-DpWHUGuF.js";var c=i(),l=a();function u(){let i=(0,c.c)(3),{splitCell:a,undoSplitCell:u}=t(),d;return i[0]!==a||i[1]!==u?(d=e=>{let t=n(e.cellId);if(!t)return;let i=r(t);a(e);let{dismiss:c}=s({title:`Cell split`,action:(0,l.jsx)(o,{"data-testid":`undo-split-button`,size:`sm`,variant:`outline`,onClick:()=>{u({...e,snapshot:i}),d()},children:`Undo`})}),d=c},i[0]=a,i[1]=u,i[2]=d):d=i[2],e(d)}export{u as t};
|
package/dist/index.html
CHANGED
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
|
|
67
67
|
<!-- /TODO -->
|
|
68
68
|
<title>{{ title }}</title>
|
|
69
|
-
<script type="module" crossorigin src="./assets/index-
|
|
69
|
+
<script type="module" crossorigin src="./assets/index-CTgrlfah.js"></script>
|
|
70
70
|
<link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-B0Z9INg1.js">
|
|
71
71
|
<link rel="modulepreload" crossorigin href="./assets/react-CBDbhulC.js">
|
|
72
72
|
<link rel="modulepreload" crossorigin href="./assets/compiler-runtime-CYIjoINj.js">
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
<link rel="modulepreload" crossorigin href="./assets/useTheme-D3zvxdF3.js">
|
|
139
139
|
<link rel="modulepreload" crossorigin href="./assets/useAsyncData-Buhk-UgR.js">
|
|
140
140
|
<link rel="modulepreload" crossorigin href="./assets/purify.es-DrVcFY1Q.js">
|
|
141
|
-
<link rel="modulepreload" crossorigin href="./assets/cells-
|
|
141
|
+
<link rel="modulepreload" crossorigin href="./assets/cells-DNoi9Edm.js">
|
|
142
142
|
<link rel="modulepreload" crossorigin href="./assets/get-DjNf4SIX.js">
|
|
143
143
|
<link rel="modulepreload" crossorigin href="./assets/_hasPath-BmRQipI0.js">
|
|
144
144
|
<link rel="modulepreload" crossorigin href="./assets/hasIn-yw4sIeJR.js">
|
|
@@ -151,42 +151,42 @@
|
|
|
151
151
|
<link rel="modulepreload" crossorigin href="./assets/copy-Cg05mM3C.js">
|
|
152
152
|
<link rel="modulepreload" crossorigin href="./assets/extends-CvVTau-c.js">
|
|
153
153
|
<link rel="modulepreload" crossorigin href="./assets/esm-Dw0vvSg2.js">
|
|
154
|
-
<link rel="modulepreload" crossorigin href="./assets/useAddCell-
|
|
155
|
-
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-
|
|
154
|
+
<link rel="modulepreload" crossorigin href="./assets/useAddCell-CAX4gqgE.js">
|
|
155
|
+
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-m_9bVgtt.js">
|
|
156
156
|
<link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-YVX2AZaI.js">
|
|
157
157
|
<link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-D9Dr-k4J.js">
|
|
158
158
|
<link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-CRg4xQWg.js">
|
|
159
|
-
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-
|
|
159
|
+
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-CB2UurmB.js">
|
|
160
160
|
<link rel="modulepreload" crossorigin href="./assets/copy-icon-LPQzn7_f.js">
|
|
161
|
-
<link rel="modulepreload" crossorigin href="./assets/useRunCells-
|
|
162
|
-
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-
|
|
163
|
-
<link rel="modulepreload" crossorigin href="./assets/blob-
|
|
161
|
+
<link rel="modulepreload" crossorigin href="./assets/useRunCells-DttzF-pt.js">
|
|
162
|
+
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-DyTQ_aJR.js">
|
|
163
|
+
<link rel="modulepreload" crossorigin href="./assets/blob-D2x71aTK.js">
|
|
164
164
|
<link rel="modulepreload" crossorigin href="./assets/share-C2MPy_VX.js">
|
|
165
165
|
<link rel="modulepreload" crossorigin href="./assets/events-CbeVJ6OD.js">
|
|
166
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
166
|
+
<link rel="modulepreload" crossorigin href="./assets/state-DGgHgBN9.js">
|
|
167
167
|
<link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-TUuUdxHz.js">
|
|
168
168
|
<link rel="modulepreload" crossorigin href="./assets/config-Cl3eMWxb.js">
|
|
169
169
|
<link rel="modulepreload" crossorigin href="./assets/tabs-c6mpccpH.js">
|
|
170
170
|
<link rel="modulepreload" crossorigin href="./assets/chevron-right-CKA5zVsM.js">
|
|
171
171
|
<link rel="modulepreload" crossorigin href="./assets/dropdown-menu-CqNabM1f.js">
|
|
172
172
|
<link rel="modulepreload" crossorigin href="./assets/html-to-image-DMn_7CCA.js">
|
|
173
|
-
<link rel="modulepreload" crossorigin href="./assets/download-
|
|
173
|
+
<link rel="modulepreload" crossorigin href="./assets/download-CCPBCjzu.js">
|
|
174
174
|
<link rel="modulepreload" crossorigin href="./assets/table-CUK1W5bI.js">
|
|
175
175
|
<link rel="modulepreload" crossorigin href="./assets/refresh-cw-Bf-rx_aV.js">
|
|
176
|
-
<link rel="modulepreload" crossorigin href="./assets/tree-actions-
|
|
176
|
+
<link rel="modulepreload" crossorigin href="./assets/tree-actions-CxkW_mv4.js">
|
|
177
177
|
<link rel="modulepreload" crossorigin href="./assets/ellipsis-Dfik_tuW.js">
|
|
178
178
|
<link rel="modulepreload" crossorigin href="./assets/external-link-Bp3BxyRA.js">
|
|
179
179
|
<link rel="modulepreload" crossorigin href="./assets/spinner-Ck-Hgfvj.js">
|
|
180
180
|
<link rel="modulepreload" crossorigin href="./assets/message-circle-BQB1AIAg.js">
|
|
181
181
|
<link rel="modulepreload" crossorigin href="./assets/hat-glasses-C8LSY3HT.js">
|
|
182
182
|
<link rel="modulepreload" crossorigin href="./assets/package-DPlscLzt.js">
|
|
183
|
-
<link rel="modulepreload" crossorigin href="./assets/datasource-
|
|
183
|
+
<link rel="modulepreload" crossorigin href="./assets/datasource-DVv7qUFu.js">
|
|
184
184
|
<link rel="modulepreload" crossorigin href="./assets/kbd-Cwh96ZBE.js">
|
|
185
185
|
<link rel="modulepreload" crossorigin href="./assets/alert-dmKwNsrp.js">
|
|
186
186
|
<link rel="modulepreload" crossorigin href="./assets/useInstallPackage-Bq7SlWgN.js">
|
|
187
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
188
|
-
<link rel="modulepreload" crossorigin href="./assets/cell-link-
|
|
189
|
-
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-
|
|
187
|
+
<link rel="modulepreload" crossorigin href="./assets/state-CHqSZb7R.js">
|
|
188
|
+
<link rel="modulepreload" crossorigin href="./assets/cell-link-c74wFaiz.js">
|
|
189
|
+
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-CidvW8yi.js">
|
|
190
190
|
<link rel="modulepreload" crossorigin href="./assets/VisuallyHidden-DurJ_JBW.js">
|
|
191
191
|
<link rel="modulepreload" crossorigin href="./assets/useDateFormatter-BiqAQ-zI.js">
|
|
192
192
|
<link rel="modulepreload" crossorigin href="./assets/en-US-yTIMUO13.js">
|
|
@@ -205,7 +205,7 @@
|
|
|
205
205
|
<link rel="modulepreload" crossorigin href="./assets/formats-DSzGCKeO.js">
|
|
206
206
|
<link rel="modulepreload" crossorigin href="./assets/table-DmqOOjfe.js">
|
|
207
207
|
<link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-BSRAHC4P.js">
|
|
208
|
-
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-
|
|
208
|
+
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-DbjqR1zZ.js">
|
|
209
209
|
<link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-ChZdjJhj.js">
|
|
210
210
|
<link rel="modulepreload" crossorigin href="./assets/square-function-DkZweMAs.js">
|
|
211
211
|
<link rel="modulepreload" crossorigin href="./assets/spec-CUFquO6R.js">
|
|
@@ -216,11 +216,11 @@
|
|
|
216
216
|
<link rel="modulepreload" crossorigin href="./assets/file-headphone-rFCxFRI8.js">
|
|
217
217
|
<link rel="modulepreload" crossorigin href="./assets/file-DF8n85RA.js">
|
|
218
218
|
<link rel="modulepreload" crossorigin href="./assets/image-ab13yGv4.js">
|
|
219
|
-
<link rel="modulepreload" crossorigin href="./assets/file-icons-
|
|
219
|
+
<link rel="modulepreload" crossorigin href="./assets/file-icons-CLGmPKoJ.js">
|
|
220
220
|
<link rel="modulepreload" crossorigin href="./assets/globe-BQf75qV_.js">
|
|
221
221
|
<link rel="modulepreload" crossorigin href="./assets/markdown-export-0rLbaq8b.js">
|
|
222
222
|
<link rel="modulepreload" crossorigin href="./assets/types-BflGgckY.js">
|
|
223
|
-
<link rel="modulepreload" crossorigin href="./assets/column-preview-
|
|
223
|
+
<link rel="modulepreload" crossorigin href="./assets/column-preview-BrO557-t.js">
|
|
224
224
|
<link rel="modulepreload" crossorigin href="./assets/square-B58Ib8Ir.js">
|
|
225
225
|
<link rel="modulepreload" crossorigin href="./assets/triangle-alert-MihykDYG.js">
|
|
226
226
|
<link rel="modulepreload" crossorigin href="./assets/prop-types-Djf4O40e.js">
|
|
@@ -230,7 +230,7 @@
|
|
|
230
230
|
<link rel="modulepreload" crossorigin href="./assets/icons-CjLa9BiH.js">
|
|
231
231
|
<link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-CLytDdMl.js">
|
|
232
232
|
<link rel="modulepreload" crossorigin href="./assets/pathUtils-Cryrlpma.js">
|
|
233
|
-
<link rel="modulepreload" crossorigin href="./assets/floating-outline-
|
|
233
|
+
<link rel="modulepreload" crossorigin href="./assets/floating-outline-W5HJSoBY.js">
|
|
234
234
|
<link rel="stylesheet" crossorigin href="./assets/cells-D-c15Ks-.css">
|
|
235
235
|
<link rel="stylesheet" crossorigin href="./assets/markdown-renderer-CU2Wa_Bt.css">
|
|
236
236
|
<link rel="stylesheet" crossorigin href="./assets/JsonOutput-BQtz7-np.css">
|
package/package.json
CHANGED
|
@@ -5,13 +5,18 @@ import { EditorView } from "@codemirror/view";
|
|
|
5
5
|
import { describe, expect, it } from "vitest";
|
|
6
6
|
import { cellId, variableName } from "@/__tests__/branded";
|
|
7
7
|
import { initialNotebookState, notebookAtom } from "@/core/cells/cells";
|
|
8
|
+
import { createCell } from "@/core/cells/types";
|
|
8
9
|
import { OverridingHotkeyProvider } from "@/core/hotkeys/hotkeys";
|
|
9
10
|
import { store } from "@/core/state/jotai";
|
|
10
11
|
import { variablesAtom } from "@/core/variables/state";
|
|
11
12
|
import { MultiColumn } from "@/utils/id-tree";
|
|
12
13
|
import { cellConfigExtension } from "../../config/extension";
|
|
13
14
|
import { adaptiveLanguageConfiguration } from "../../language/extension";
|
|
14
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
getCodes,
|
|
17
|
+
getTopologicalCellIds,
|
|
18
|
+
topologicalCodesAtom,
|
|
19
|
+
} from "../getCodes";
|
|
15
20
|
|
|
16
21
|
const Cells = {
|
|
17
22
|
cell1: cellId("cell1"),
|
|
@@ -208,4 +213,64 @@ describe("getCodes", () => {
|
|
|
208
213
|
const result = getCodes(otherCode);
|
|
209
214
|
expect(result).toEqual("import os\nx = 1\ny = x + 1\nprint('Hello World')");
|
|
210
215
|
});
|
|
216
|
+
|
|
217
|
+
it("should read code from the store when no editor is mounted", () => {
|
|
218
|
+
const otherCode = "print('Hello World')";
|
|
219
|
+
store.set(notebookAtom, {
|
|
220
|
+
...initialNotebookState(),
|
|
221
|
+
cellIds: MultiColumn.from([[Cells.cell1, Cells.cell2]]),
|
|
222
|
+
cellData: {
|
|
223
|
+
[Cells.cell1]: createCell({ id: Cells.cell1, code: "import os" }),
|
|
224
|
+
[Cells.cell2]: createCell({ id: Cells.cell2, code: "x = 1" }),
|
|
225
|
+
},
|
|
226
|
+
});
|
|
227
|
+
const result = getCodes(otherCode);
|
|
228
|
+
expect(result).toEqual("import os\nx = 1\nprint('Hello World')");
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
it("should prefer the mounted editor code over the store code", () => {
|
|
232
|
+
const otherCode = "print('Hello World')";
|
|
233
|
+
store.set(notebookAtom, {
|
|
234
|
+
...initialNotebookState(),
|
|
235
|
+
cellIds: MultiColumn.from([[Cells.cell1, Cells.cell2]]),
|
|
236
|
+
cellData: {
|
|
237
|
+
[Cells.cell1]: createCell({ id: Cells.cell1, code: "import os" }),
|
|
238
|
+
[Cells.cell2]: createCell({ id: Cells.cell2, code: "x = 1" }),
|
|
239
|
+
},
|
|
240
|
+
cellHandles: {
|
|
241
|
+
[Cells.cell2]: { current: createMockEditorView("x = 2") },
|
|
242
|
+
},
|
|
243
|
+
});
|
|
244
|
+
const result = getCodes(otherCode);
|
|
245
|
+
expect(result).toEqual("import os\nx = 2\nprint('Hello World')");
|
|
246
|
+
});
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
describe("topologicalCodesAtom", () => {
|
|
250
|
+
it("should include every cell when no editor is mounted", () => {
|
|
251
|
+
store.set(notebookAtom, {
|
|
252
|
+
...initialNotebookState(),
|
|
253
|
+
cellIds: MultiColumn.from([[Cells.cell1, Cells.cell2, Cells.cell3]]),
|
|
254
|
+
cellData: {
|
|
255
|
+
[Cells.cell1]: createCell({ id: Cells.cell1, code: "import os" }),
|
|
256
|
+
[Cells.cell2]: createCell({ id: Cells.cell2, code: "x = 1" }),
|
|
257
|
+
[Cells.cell3]: createCell({ id: Cells.cell3, code: "y = x + 1" }),
|
|
258
|
+
},
|
|
259
|
+
});
|
|
260
|
+
store.set(variablesAtom, {
|
|
261
|
+
[Variables.var1]: {
|
|
262
|
+
name: Variables.var1,
|
|
263
|
+
declaredBy: [Cells.cell1],
|
|
264
|
+
usedBy: [Cells.cell2, Cells.cell3],
|
|
265
|
+
},
|
|
266
|
+
});
|
|
267
|
+
|
|
268
|
+
const { cellIds, codes } = store.get(topologicalCodesAtom);
|
|
269
|
+
expect(cellIds).toEqual([Cells.cell1, Cells.cell2, Cells.cell3]);
|
|
270
|
+
expect(codes).toEqual({
|
|
271
|
+
[Cells.cell1]: "import os",
|
|
272
|
+
[Cells.cell2]: "x = 1",
|
|
273
|
+
[Cells.cell3]: "y = x + 1",
|
|
274
|
+
});
|
|
275
|
+
});
|
|
211
276
|
});
|
|
@@ -1,13 +1,32 @@
|
|
|
1
1
|
/* Copyright 2026 Marimo. All rights reserved. */
|
|
2
2
|
|
|
3
3
|
import { atom } from "jotai";
|
|
4
|
-
import {
|
|
4
|
+
import { notebookAtom } from "@/core/cells/cells";
|
|
5
5
|
import type { CellId } from "@/core/cells/ids";
|
|
6
|
+
import { store } from "@/core/state/jotai";
|
|
6
7
|
import { variablesAtom } from "@/core/variables/state";
|
|
7
8
|
import type { Variables } from "@/core/variables/types";
|
|
8
9
|
import { Objects } from "@/utils/objects";
|
|
9
10
|
import { getEditorCodeAsPython } from "../language/utils";
|
|
10
11
|
|
|
12
|
+
const notebookCellCodes = atom((get) => {
|
|
13
|
+
const notebook = get(notebookAtom);
|
|
14
|
+
const codes = Objects.fromEntries(
|
|
15
|
+
notebook.cellIds.inOrderIds.map((id) => {
|
|
16
|
+
// A cell editor mounts progressively, so the notebook store is the only
|
|
17
|
+
// complete source of code until every editor is built.
|
|
18
|
+
const editorView = notebook.cellHandles[id]?.current?.editorViewOrNull;
|
|
19
|
+
return [
|
|
20
|
+
id,
|
|
21
|
+
editorView
|
|
22
|
+
? getEditorCodeAsPython(editorView)
|
|
23
|
+
: (notebook.cellData[id]?.code ?? ""),
|
|
24
|
+
];
|
|
25
|
+
}),
|
|
26
|
+
);
|
|
27
|
+
return codes;
|
|
28
|
+
});
|
|
29
|
+
|
|
11
30
|
export function getCodes(otherCode: string) {
|
|
12
31
|
const codes = getOtherCellsCode(otherCode);
|
|
13
32
|
|
|
@@ -18,15 +37,8 @@ export function getOtherCellsCode(otherCode: string) {
|
|
|
18
37
|
// Get all other cells' code
|
|
19
38
|
// Put `import` statements at the top, as it can help copilot give better suggestions
|
|
20
39
|
// TODO: we should sort this topologically
|
|
21
|
-
const codes =
|
|
22
|
-
.
|
|
23
|
-
const code = getEditorCodeAsPython(editorView);
|
|
24
|
-
if (code === otherCode) {
|
|
25
|
-
return null;
|
|
26
|
-
}
|
|
27
|
-
return code;
|
|
28
|
-
})
|
|
29
|
-
.filter(Boolean)
|
|
40
|
+
const codes = Object.values(store.get(notebookCellCodes))
|
|
41
|
+
.filter((code) => code !== "" && code !== otherCode)
|
|
30
42
|
.toSorted((a, b) => {
|
|
31
43
|
if (a.startsWith("import") && !b.startsWith("import")) {
|
|
32
44
|
return -1;
|
|
@@ -40,21 +52,6 @@ export function getOtherCellsCode(otherCode: string) {
|
|
|
40
52
|
return codes;
|
|
41
53
|
}
|
|
42
54
|
|
|
43
|
-
const notebookCellCodes = atom((get) => {
|
|
44
|
-
const notebook = get(notebookAtom);
|
|
45
|
-
const codes = Objects.fromEntries(
|
|
46
|
-
notebook.cellIds.inOrderIds.map((id) => {
|
|
47
|
-
const handle = notebook.cellHandles[id];
|
|
48
|
-
return [
|
|
49
|
-
id,
|
|
50
|
-
handle?.current?.editorView
|
|
51
|
-
? getEditorCodeAsPython(handle.current.editorView)
|
|
52
|
-
: "",
|
|
53
|
-
];
|
|
54
|
-
}),
|
|
55
|
-
);
|
|
56
|
-
return codes;
|
|
57
|
-
});
|
|
58
55
|
const inOrderCellIdsAtom = atom((get) => {
|
|
59
56
|
const notebook = get(notebookAtom);
|
|
60
57
|
return notebook.cellIds.inOrderIds;
|
|
@@ -8,7 +8,10 @@ import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
|
|
|
8
8
|
import * as LSP from "vscode-languageserver-protocol";
|
|
9
9
|
import { cellId } from "@/__tests__/branded";
|
|
10
10
|
import type { CellId } from "@/core/cells/ids";
|
|
11
|
+
import { initialNotebookState, notebookAtom } from "@/core/cells/cells";
|
|
12
|
+
import { createCell } from "@/core/cells/types";
|
|
11
13
|
import { store } from "@/core/state/jotai";
|
|
14
|
+
import { MultiColumn } from "@/utils/id-tree";
|
|
12
15
|
import { topologicalCodesAtom } from "../../copilot/getCodes";
|
|
13
16
|
import { lspWorkspaceAtom } from "@/core/saving/file-state";
|
|
14
17
|
import { languageAdapterState } from "../../language/extension";
|
|
@@ -62,6 +65,28 @@ function isPublishDiagnosticsNotification(
|
|
|
62
65
|
);
|
|
63
66
|
}
|
|
64
67
|
|
|
68
|
+
describe("merged document with unmounted editors", () => {
|
|
69
|
+
it("should include the code of cells whose editors are not mounted", () => {
|
|
70
|
+
store.set(notebookAtom, {
|
|
71
|
+
...initialNotebookState(),
|
|
72
|
+
cellIds: MultiColumn.from([[Cells.cell1, Cells.cell2]]),
|
|
73
|
+
cellData: {
|
|
74
|
+
[Cells.cell1]: createCell({ id: Cells.cell1, code: "import math" }),
|
|
75
|
+
[Cells.cell2]: createCell({
|
|
76
|
+
id: Cells.cell2,
|
|
77
|
+
code: "print(math.sqrt(4))",
|
|
78
|
+
}),
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
const { cellIds, codes } = store.get(topologicalCodesAtom);
|
|
83
|
+
const lens = createNotebookLens(cellIds, codes);
|
|
84
|
+
|
|
85
|
+
expect(lens.mergedText).toContain("import math");
|
|
86
|
+
expect(lens.mergedText).toContain("print(math.sqrt(4))");
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
|
|
65
90
|
describe("createNotebookLens", () => {
|
|
66
91
|
it("should produce correct lens for same inputs", () => {
|
|
67
92
|
// Use unique content for this test
|