Connect refactor

tests/extension/serializer.test.ts

@@ -8,14 +8,14 @@ import {
 } from 'vscode'
 import { expect, vi, it, describe, beforeEach } from 'vitest'
 import { isValid } from 'ulidx'
+import { RunmeIdentity, Notebook } from '@buf/stateful_runme.bufbuild_es/runme/parser/v1/parser_pb'
 
 import {
   GrpcSerializer,
   SerializerBase,
   WasmSerializer,
   GrpcSerializerBase,
 } from '../../src/extension/serializer'
-import { RunmeIdentity } from '../../src/extension/grpc/serializerTypes'
 import type { Kernel } from '../../src/extension/kernel'
 import { EventEmitter, Uri } from '../../__mocks__/vscode'
 import { Serializer } from '../../src/types'
@@ -373,7 +373,7 @@ describe('GrpcSerializer', () => {
       const serializer: any = new GrpcSerializer(context, new Server(), new Kernel())
       serializer.client = {
         deserialize: vi.fn().mockResolvedValue({
-          response: { notebook: { cells: descells, metadata } },
+          notebook: { cells: descells, metadata },
         }),
       }
       vi.mocked(workspace.applyEdit).mockResolvedValue(true)
@@ -471,8 +471,8 @@ describe('GrpcSerializer', () => {
       expect(summary?.success).toStrictEqual(false)
 
       expect(summary?.timing).toBeDefined()
-      expect(summary?.timing?.startTime).toStrictEqual('1701444499517')
-      expect(summary?.timing?.endTime).toStrictEqual('1701444501696')
+      expect(summary?.timing?.startTime).toStrictEqual(1701444499517n)
+      expect(summary?.timing?.endTime).toStrictEqual(1701444501696n)
     })
   })
 
@@ -487,6 +487,8 @@ describe('GrpcSerializer', () => {
       const items = cells.outputs[0].items
       expect(items.length).toBe(2)
       items.forEach((item) => {
+        // item.data is a Uint8Array in both the es and ts proto type
+        // is this a bug? if so where: in the fixture, the proto, the serializer?
         expect((item.data as any).type).toBe('Buffer')
         expect(item.mime).toBeDefined()
       })
@@ -495,7 +497,7 @@ describe('GrpcSerializer', () => {
       expect(processInfo?.exitReason?.type).toStrictEqual('exit')
       expect(processInfo?.exitReason?.code).toStrictEqual(16)
       expect(processInfo?.pid).toBeDefined()
-      expect(processInfo?.pid).toStrictEqual('98354')
+      expect(processInfo?.pid).toStrictEqual(98354n)
     })
   })
 
@@ -632,7 +634,7 @@ describe('GrpcSerializer', () => {
         const fixture = deepCopyFixture()
         const writeableSer: any = new GrpcSerializer(context, new Server(), new Kernel())
         writeableSer.client = {
-          serialize: vi.fn().mockResolvedValue({ response: { result: fakeCachedBytes } }),
+          serialize: vi.fn().mockResolvedValue({ result: fakeCachedBytes }),
         }
         writeableSer.cacheDocUriMapping.set(fixture.metadata['runme.dev/cacheId'], fakeSrcDocUri)
         ContextState.getKey = vi.fn().mockImplementation(() => true)
@@ -681,20 +683,18 @@ describe('GrpcSerializer', () => {
       const context: any = {
         extensionUri: { fsPath: '/foo/bar' },
       }
-      const fixture = {
+      const fixture = new Notebook({
         cells: [],
         metadata: {
           'runme.dev/finalLineBreaks': '1',
           'runme.dev/frontmatter':
             '---\nrunme:\n  id: 01HF7B0KJPF469EG9ZWDNKKACQ\n  version: v2.0\n---',
         },
-      }
+      })
 
       const serialize = vi.fn().mockImplementation(() =>
         Promise.resolve({
-          response: {
-            result: new Uint8Array([4, 3, 2, 1]),
-          },
+          result: new Uint8Array([4, 3, 2, 1]),
         }),
       )
       const ser = new GrpcSerializer(context, new Server(), new Kernel())