Remove JS Zed Query Parser

.github/actions/setup-zui/action.yml

@@ -1,7 +1,7 @@
 name: Setup Zui
 description: Shared steps for setting up Zui in workflows
 runs:
-  using: "composite"
+  using: 'composite'
   steps:
     - name: Install Go
       uses: actions/setup-go@v2
@@ -21,6 +21,10 @@ runs:
       run: yarn --inline-builds
       shell: bash
 
+    - name: Install Playwright Deps
+      run: yarn workspace @brimdata/zed-wasm run playwright install
+      shell: bash
+
     - name: Yarn Build
       run: yarn run build
       shell: bash

.node-version

@@ -1 +1 @@
-16.10.0
+18.18.2

apps/zui/.swcrc

@@ -14,5 +14,4 @@
     "type": "commonjs",
     "ignoreDynamic": true
   }
-
 }

apps/zui/package.json

@@ -33,6 +33,7 @@
     "release-insiders": "electron-builder --config electron-builder-insiders.json --publish always"
   },
   "dependencies": {
+    "@brimdata/zed-wasm": "workspace:*",
     "keytar": "^7.7.0"
   },
   "devDependencies": {

apps/zui/scripts/esbuild.mjs

@@ -10,7 +10,7 @@ const context = await esbuild.context({
   platform: "node",
   sourcemap: true,
   target: "node16",
-  external: ["keytar", "electron"],
+  external: ["keytar", "electron", "@brimdata/zed-wasm"],
   tsconfig: "./tsconfig.json",
 })
 

apps/zui/src/core/query/run.ts

@@ -1,5 +1,6 @@
 import {ResultStream} from "@brimdata/zed-js"
 import ErrorFactory from "src/js/models/ErrorFactory"
+import ast from "src/js/models/ast"
 import Current from "src/js/state/Current"
 import Results from "src/js/state/Results"
 import {Thunk} from "src/js/state/types"
@@ -20,7 +21,8 @@ export function firstPage(opts: {id: string; query: string}): Thunk {
     const {id, query} = opts
     const key = Current.getLocation(getState()).key
     const tabId = api.current.tabId
-    dispatch(Results.init({query, key, id, tabId}))
+    const aggregation = (await ast(query)).hasAnalytics()
+    dispatch(Results.init({query, key, id, tabId, aggregation}))
     dispatch(run(id))
   }
 }

apps/zui/src/domain/editor/handlers.ts

@@ -1,5 +1,5 @@
 import * as zed from "@brimdata/zed-js"
-import program from "src/js/models/program"
+import {drillDown} from "src/js/models/program"
 import {
   appendQueryCountBy,
   appendQueryExclude,
@@ -88,14 +88,12 @@ export const newSearchWithValue = createHandler(
 
 export const pivotToValues = createHandler(
   "editor.pivotToValues",
-  ({select, dispatch}) => {
+  async ({select, dispatch}) => {
     const field = select(Selection.getField)
     const query = select(Editor.getValue)
     // So this only works if the count() by field is in the editor, not in a pin.
     const record = field.rootRecord
-    const newProgram = program(query)
-      .drillDown(record as zed.Record)
-      .string()
+    const newProgram = await drillDown(query, record as zed.Record)
 
     if (newProgram) {
       dispatch(Editor.setValue(newProgram))

apps/zui/src/electron/run-main/run-protocol-handlers.ts

@@ -1,5 +1,13 @@
-import {app, protocol} from "electron"
+import {app, protocol, net} from "electron"
 import path from "path"
+import {pathToFileURL} from "url"
+
+protocol.registerSchemesAsPrivileged([
+  {
+    scheme: "app-asset",
+    privileges: {standard: true, supportFetchAPI: true, bypassCSP: true},
+  },
+])
 
 export function runProtocolHandlers() {
   app.whenReady().then(() => {
@@ -10,5 +18,16 @@ export function runProtocolHandlers() {
       const absPath = path.join(rootPath, relPath)
       callback(absPath)
     })
+
+    protocol.handle("app-asset", (request) => {
+      const {host, pathname, href} = new URL(request.url)
+      if (host === "node_modules") {
+        const path = pathname.slice(1)
+        const file = require.resolve(path)
+        const url = pathToFileURL(file).toString()
+        return net.fetch(url, {bypassCustomProtocolHandlers: true})
+      }
+      throw new Error("Unknown App Asset " + href)
+    })
   })
 }

apps/zui/src/js/initializers/init-zed-wasm.ts

@@ -0,0 +1,11 @@
+// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+import {initZedWasm} from "@brimdata/zed-wasm/dist/browser.js"
+
+export async function initializeZedWasm() {
+  if (!globalThis.zedWasm) {
+    const resp = fetch(
+      "app-asset://node_modules/@brimdata/zed-wasm/dist/main.wasm"
+    )
+    globalThis.zedWasm = await initZedWasm(resp)
+  }
+}

apps/zui/src/js/initializers/initialize.ts

@@ -13,6 +13,7 @@ import {initLake} from "./init-lake"
 import {initializeTabs} from "./init-tabs"
 import {initializeMonaco} from "./init-monaco"
 import {initializePluginContextSync} from "./init-plugin-context-sync"
+import {initializeZedWasm} from "./init-zed-wasm"
 import toast from "react-hot-toast"
 import {startTransition} from "react"
 import {initResizeListener} from "./init-resize-listener"
@@ -60,5 +61,6 @@ export default async function initialize(
   initializeMonaco()
   initializePluginContextSync(store)
   initResizeListener()
+  await initializeZedWasm()
   return {store, api}
 }

apps/zui/src/js/models/ast.ts

@@ -1,8 +1,22 @@
 import {toFieldPath} from "../zed-script/toZedScript"
 
+function parse(s: string) {
+  return globalThis.zedWasm.parse(s)
+}
+
 type ColumnName = string | string[]
 
-export default function ast(tree: any) {
+export default async function ast(string: string) {
+  let tree
+  try {
+    let res = await parse(string)
+    if (res.error) throw res.error
+    tree = res.ast
+  } catch (error) {
+    console.error(error)
+    tree = {error}
+  }
+
   return {
     valid() {
       return !tree.error
@@ -27,6 +41,12 @@ export default function ast(tree: any) {
     self() {
       return tree
     },
+    hasAnalytics() {
+      for (const proc of this.getProcs()) {
+        if (ANALYTIC_PROCS.includes(proc.kind)) return true
+      }
+      return false
+    },
   }
 }