new API rework to share engine with vscode plugin

wavedrom · Jan 22, 2024 · 5d0795a · 5d0795a
1 parent 4e19c2c
commit 5d0795a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 217 deletions.
diff --git a/lib/get-element.js b/lib/get-element.js
diff --git a/lib/get-listing.js b/lib/get-listing.js
diff --git a/lib/get-readers.js b/lib/get-readers.js
@@ -50,7 +50,7 @@ const urlZip = {
 
 const getReaders = async (handler, vcdPath) => {
   const res = [];
-  if (vcdPath) {
+  if (typeof vcdPath === 'string') {
     const resp = await fetch(vcdPath);
     const body = await resp.body;
     const reader = body.getReader();
@@ -63,6 +63,11 @@ const getReaders = async (handler, vcdPath) => {
       reader
     });
     // return;
+  } else
+  if (typeof vcdPath === 'function') {
+    console.log('vcdPath is function');
+    const context = vcdPath(handler);
+    console.log(context);
   } else {
     const urlSearchParams = new URLSearchParams(window.location.search);
     for (const [key, value] of urlSearchParams) {

diff --git a/lib/get-vcd.js b/lib/get-vcd.js
diff --git a/lib/lister.js b/lib/lister.js
diff --git a/lib/vcd-pipe-deso.js b/lib/vcd-pipe-deso.js
diff --git a/lib/vcdrom.js b/lib/vcdrom.js
@@ -4,6 +4,8 @@ const pkg = require('../package.json');
 
 const createVCD = require('vcd-stream/out/vcd.js');
 const webVcdParser = require('vcd-stream/lib/web-vcd-parser.js');
+const vcdPipeDeso = require('vcd-stream/lib/vcd-pipe-deso.js');
+const getVcd = require('vcd-stream/lib/get-vcd.js');
 
 const stringify = require('onml/stringify.js');
 
@@ -15,6 +17,8 @@ const {
   pluginRenderTimeGrid,
   keyBindo,
   mountTree,
+  getElement,
+  getListing,
   // renderMenu,
   // mountCodeMirror5,
   genKeyHandler,
@@ -23,16 +27,15 @@ const {
   helpPanel
 } = require('@wavedrom/doppler');
 
-const {mountCodeMirror6} = require('waveql');
+const {
+  createCodeMirrorState,
+  mountCodeMirror6
+} = require('waveql');
 
 const getReaders = require('./get-readers.js');
-const vcdPipeDeso = require('./vcd-pipe-deso.js');
 const dropZone = require('./drop-zone.js');
 const getWaveql = require('./get-waveql.js');
-const getListing = require('./get-listing.js');
-const getVcd = require('./get-vcd.js');
 const getJsonls = require('./get-jsonls.js');
-const getElement = require('./get-element.js');
 const pluginLocalStore = require('./plugin-local-store.js');
 
 const getHandler = (content, inst) => async readers => {
@@ -42,7 +45,7 @@ const getHandler = (content, inst) => async readers => {
   const jsonls = await getJsonls(readers);
   const timeOpt = readers.find(row => row.key === 'time');
 
-  vcdPipeDeso({}, inst, deso => {
+  vcdPipeDeso({wires: {body: []}}, inst, deso => {
     // console.log('parsed', deso);
     content.innerHTML = '';
     deso.waveql = waveql;
@@ -63,7 +66,8 @@ const getHandler = (content, inst) => async readers => {
       }
     });
 
-    const {render} = container.start(content, deso);
+    content.appendChild(container.pstate.container);
+    container.start(deso);
 
     container.elo.menu.innerHTML = stringify(helpPanel.mlIcon('https://github.com/wavedrom/vcdrom/blob/trunk/help.md'));
     container.elo.menu.addEventListener('click', () => helpPanel.toggle(container.pstate));
@@ -79,22 +83,35 @@ const getHandler = (content, inst) => async readers => {
     //     });
     //   });
 
+    deso.hasHistory = true;
+    deso.isRO = true;
+    deso.updater = (str) => {
+      console.log('updater');
+    };
+
+    const cmState = createCodeMirrorState(
+      deso,
+      container.pstate
+    );
 
     const cm = mountCodeMirror6(
+      cmState,
       container.elo.waveqlPanel,
       deso,
-      container.pstate,
-      render
+      container.pstate
     );
-    container.elo.container.addEventListener('keydown', genKeyHandler.genKeyHandler(content, container.pstate, render, cm, keyBindo));
-    container.elo.container.addEventListener('wheel', genOnWheel(content, container.pstate, render, cm, keyBindo));
+
+    cm.view.dispatch({changes: {from: 0, insert: ' '}});
+    cm.view.dispatch({changes: {from: 0, to: 1, insert: ''}});
+
+    container.elo.container.addEventListener('keydown', genKeyHandler.genKeyHandler(content, container.pstate, deso, cm, keyBindo));
+    container.elo.container.addEventListener('wheel', genOnWheel(content, container.pstate, deso, cm, keyBindo));
     // console.log(cm);
     cm.view.focus();
-
   });
 
   await getVcd(readers, content, inst);
-
+  console.log('getVcd');
 };
 
 global.VCDrom = async (divName, vcdPath) => {