goscript 0.1.1 → 0.1.2

package/gs/github.com/aperturerobotics/protobuf-go-lite/index.ts

@@ -16,15 +16,37 @@ export interface Message {
   Reset(): void
 }
 
+$.registerInterfaceType('protobuf_go_lite.Message', null, [
+  { name: 'SizeVT', args: [], returns: [] },
+  { name: 'MarshalToSizedBufferVT', args: [], returns: [] },
+  { name: 'MarshalVT', args: [], returns: [] },
+  { name: 'UnmarshalVT', args: [], returns: [] },
+  { name: 'Reset', args: [], returns: [] },
+])
+
 export interface JSONMessage {
   MarshalJSON(): [$.Slice<number>, $.GoError]
   UnmarshalJSON(data: $.Slice<number>): $.GoError
 }
 
+$.registerInterfaceType('protobuf_go_lite.JSONMessage', null, [
+  { name: 'MarshalJSON', args: [], returns: [] },
+  { name: 'UnmarshalJSON', args: [], returns: [] },
+])
+
 export interface CloneMessage extends Message {
   CloneMessageVT(): CloneMessage | null
 }
 
+$.registerInterfaceType('protobuf_go_lite.CloneMessage', null, [
+  { name: 'SizeVT', args: [], returns: [] },
+  { name: 'MarshalToSizedBufferVT', args: [], returns: [] },
+  { name: 'MarshalVT', args: [], returns: [] },
+  { name: 'UnmarshalVT', args: [], returns: [] },
+  { name: 'Reset', args: [], returns: [] },
+  { name: 'CloneMessageVT', args: [], returns: [] },
+])
+
 export interface CloneVT<T> extends CloneMessage {
   CloneVT(): T
 }
@@ -37,37 +59,37 @@ export function CompareComparable<T>(): (t1: T, t2: T) => boolean {
   return (t1, t2) => t1 === t2
 }
 
-export function IsEqualVT<T extends EqualVT<T>>(
-  t1: T | null,
-  t2: T | null,
+export function IsEqualVT<T>(
+  t1: T | $.VarRef<T> | null,
+  t2: T | $.VarRef<T> | null,
 ): boolean
-export function IsEqualVT<T extends EqualVT<T>>(
+export function IsEqualVT<T>(
   _typeArgs: unknown,
-  t1: T | null,
-  t2: T | null,
+  t1: T | $.VarRef<T> | null,
+  t2: T | $.VarRef<T> | null,
 ): boolean
-export function IsEqualVT<T extends EqualVT<T>>(
+export function IsEqualVT<T>(
   arg0: unknown,
-  arg1: T | null,
-  arg2?: T | null,
+  arg1: T | $.VarRef<T> | null,
+  arg2?: T | $.VarRef<T> | null,
 ): boolean {
-  const t1 = arg2 === undefined ? (arg0 as T | null) : arg1
-  const t2 = arg2 === undefined ? arg1 : arg2
+  const t1 = $.pointerValueOrNil(arg2 === undefined ? (arg0 as T | $.VarRef<T> | null) : arg1)
+  const t2 = $.pointerValueOrNil(arg2 === undefined ? arg1 : arg2)
   if (t1 == null || t2 == null) {
     return t1 == t2
   }
-  return t1.EqualVT(t2)
+  return (t1 as unknown as EqualVT<T>).EqualVT(t2)
 }
 
-export function CompareEqualVT<T extends EqualVT<T>>(
+export function CompareEqualVT<T>(
   _typeArgs?: unknown,
-): (t1: T | null, t2: T | null) => boolean {
+): (t1: T | $.VarRef<T> | null, t2: T | $.VarRef<T> | null) => boolean {
   return (t1, t2) => IsEqualVT(t1, t2)
 }
 
-export function IsEqualVTSlice<T extends EqualVT<T>>(
-  s1: $.Slice<T>,
-  s2: $.Slice<T>,
+export function IsEqualVTSlice<T>(
+  s1: $.Slice<T | $.VarRef<T> | null>,
+  s2: $.Slice<T | $.VarRef<T> | null>,
 ): boolean {
   if ($.len(s1) !== $.len(s2)) {
     return false
@@ -83,58 +105,78 @@ export function IsEqualVTSlice<T extends EqualVT<T>>(
 export function EncodeVarint(
   dAtA: $.Slice<number>,
   offset: number,
-  v: number,
+  v: number | bigint,
 ): number {
   offset -= SizeOfVarint(v)
   const base = offset
-  while (v >= 0x80) {
-    setByte(dAtA, offset, (v % 0x80) | 0x80)
-    v = Math.floor(v / 0x80)
+  let value = normalizedVarint(v)
+  while (value >= 0x80n) {
+    setByte(dAtA, offset, Number((value & 0x7fn) | 0x80n))
+    value >>= 7n
     offset++
   }
-  setByte(dAtA, offset, v)
+  setByte(dAtA, offset, Number(value))
   return base
 }
 
-export function AppendVarint(b: $.Slice<number>, v: number): $.Slice<number> {
+export function AppendVarint(
+  b: $.Slice<number>,
+  v: number | bigint,
+): $.Slice<number> {
   const bytes: number[] = []
-  while (v >= 0x80) {
-    bytes.push((v % 0x80) | 0x80)
-    v = Math.floor(v / 0x80)
+  let value = normalizedVarint(v)
+  while (value >= 0x80n) {
+    bytes.push(Number((value & 0x7fn) | 0x80n))
+    value >>= 7n
   }
-  bytes.push(v)
+  bytes.push(Number(value))
   return $.append(b, ...bytes)
 }
 
 export function ConsumeVarint(b: $.Slice<number>): [number, number] {
-  let v = 0
-  let shift = 0
+  let v = 0n
+  let shift = 0n
   for (let i = 0; i < 10; i++) {
     if (i >= $.len(b)) {
       return [0, -1]
     }
     const value = byteSliceValue(b, i)
-    if (shift === 63 && value > 1) {
+    if (shift === 63n && value > 1) {
       return [0, -2]
     }
-    v += (value & 0x7f) * 2 ** shift
+    v += BigInt(value & 0x7f) << shift
     if (value < 0x80) {
-      return [v, i + 1]
+      return [varintResult(v), i + 1]
     }
-    shift += 7
+    shift += 7n
   }
   return [0, -2]
 }
 
-export function SizeOfVarint(x: number): number {
+export function SizeOfVarint(x: number | bigint): number {
+  let value = normalizedVarint(x)
   let n = 1
-  while (x >= 0x80) {
-    x = Math.floor(x / 0x80)
+  while (value >= 0x80n) {
+    value >>= 7n
     n++
   }
   return n
 }
 
+function normalizedVarint(value: number | bigint): bigint {
+  if (typeof value === 'bigint') {
+    return BigInt.asUintN(64, value)
+  }
+  return BigInt.asUintN(64, BigInt(Math.trunc(value)))
+}
+
+function varintResult(value: bigint): number {
+  if (value <= BigInt(Number.MAX_SAFE_INTEGER)) {
+    return Number(value)
+  }
+  return value as unknown as number
+}
+
 export function DecodeVarint(
   b: $.Slice<number>,
   idx: number,

package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.test.ts

@@ -78,10 +78,11 @@ describe('protobuf-go-lite/json override', () => {
       a: new TestMessage('one', 1),
       b: new TestMessage('two', 2),
     })
-    const [sliceData, sliceErr] = MarshalSlice(undefined, DefaultMarshalerConfig, [
-      new TestMessage('one', 1),
-      new TestMessage('two', 2),
-    ])
+    const [sliceData, sliceErr] = MarshalSlice(
+      undefined,
+      DefaultMarshalerConfig,
+      [new TestMessage('one', 1), new TestMessage('two', 2)],
+    )
 
     expect(mapErr).toBeNull()
     expect(sliceErr).toBeNull()
@@ -99,7 +100,10 @@ describe('protobuf-go-lite/json override', () => {
       jsonBytes('{"name":"ok","count":"42"}'),
       msg,
     )
-    const state = NewUnmarshalState(jsonBytes('["Zm9vYg==","YXI="]'), DefaultUnmarshalerConfig)
+    const state = NewUnmarshalState(
+      jsonBytes('["Zm9vYg==","YXI="]'),
+      DefaultUnmarshalerConfig,
+    )
 
     expect(err).toBeNull()
     expect(msg).toEqual(new TestMessage('ok', 42))
@@ -120,7 +124,10 @@ describe('protobuf-go-lite/json override', () => {
 
   it('accepts raw wrapped values and object wrapped values', () => {
     const raw = NewUnmarshalState(jsonBytes('"abc"'), DefaultUnmarshalerConfig)
-    const object = NewUnmarshalState(jsonBytes('{"value": "def"}'), DefaultUnmarshalerConfig)
+    const object = NewUnmarshalState(
+      jsonBytes('{"value": "def"}'),
+      DefaultUnmarshalerConfig,
+    )
 
     expect(raw?.ReadWrappedString()).toBe('abc')
     expect(raw?.Err()).toBeNull()
@@ -129,13 +136,18 @@ describe('protobuf-go-lite/json override', () => {
   })
 
   it('reads and writes protobuf timestamp values as time.Time pointers', () => {
-    const state = NewUnmarshalState(jsonBytes('"2025-05-15T01:10:42Z"'), DefaultUnmarshalerConfig)
+    const state = NewUnmarshalState(
+      jsonBytes('"2025-05-15T01:10:42Z"'),
+      DefaultUnmarshalerConfig,
+    )
     const parsed = state?.ReadTime()
     const jsonStream = new JsonStream()
     const stream = new MarshalState({ stream: jsonStream })
 
     expect(state?.Err()).toBeNull()
-    expect($.pointerValue(parsed)?.Format(time.RFC3339)).toBe('2025-05-15T01:10:42Z')
+    expect($.pointerValue(parsed)?.Format(time.RFC3339)).toBe(
+      '2025-05-15T01:10:42Z',
+    )
 
     stream.WriteTime(parsed ?? null)
 
@@ -144,9 +156,18 @@ describe('protobuf-go-lite/json override', () => {
   })
 
   it('rejects invalid bool and numeric map keys', () => {
-    const boolState = NewUnmarshalState(jsonBytes('{"yes": 1}'), DefaultUnmarshalerConfig)
-    const intState = NewUnmarshalState(jsonBytes('{"1.5": 1}'), DefaultUnmarshalerConfig)
-    const uintState = NewUnmarshalState(jsonBytes('{"-1": 1}'), DefaultUnmarshalerConfig)
+    const boolState = NewUnmarshalState(
+      jsonBytes('{"yes": 1}'),
+      DefaultUnmarshalerConfig,
+    )
+    const intState = NewUnmarshalState(
+      jsonBytes('{"1.5": 1}'),
+      DefaultUnmarshalerConfig,
+    )
+    const uintState = NewUnmarshalState(
+      jsonBytes('{"-1": 1}'),
+      DefaultUnmarshalerConfig,
+    )
 
     boolState?.ReadBoolMap(() => {})
     intState?.ReadInt32Map(() => {})

package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.ts

@@ -190,18 +190,27 @@ export class MarshalState {
   }
 
   public Sub(js: JsonStream | null): MarshalState | null {
-    return new MarshalState({ config: this.configValue, stream: js ?? new JsonStream() })
+    return new MarshalState({
+      config: this.configValue,
+      stream: js ?? new JsonStream(),
+    })
   }
 
   public WithField(field: string): MarshalState | null {
-    const next = new MarshalState({ config: this.configValue, stream: this.stream })
+    const next = new MarshalState({
+      config: this.configValue,
+      stream: this.stream,
+    })
     next.fields = new Set(this.fields)
     next.fields.add(field)
     return next
   }
 
   public WithFieldMask(...paths: string[]): MarshalState | null {
-    const next = new MarshalState({ config: this.configValue, stream: this.stream })
+    const next = new MarshalState({
+      config: this.configValue,
+      stream: this.stream,
+    })
     next.fields = new Set([...this.fields, ...paths])
     return next
   }
@@ -238,7 +247,10 @@ export class MarshalState {
     this.WriteString(`${x}s`)
   }
 
-  public WriteEnum(x: number, ...valueMaps: Array<Map<number, string> | Record<number, string> | null>): void {
+  public WriteEnum(
+    x: number,
+    ...valueMaps: Array<Map<number, string> | Record<number, string> | null>
+  ): void {
     if (this.configValue.EnumsAsInts) {
       this.WriteEnumNumber(x)
       return
@@ -250,7 +262,10 @@ export class MarshalState {
     this.WriteInt32(x)
   }
 
-  public WriteEnumString(x: number, ...valueMaps: Array<Map<number, string> | Record<number, string> | null>): void {
+  public WriteEnumString(
+    x: number,
+    ...valueMaps: Array<Map<number, string> | Record<number, string> | null>
+  ): void {
     const value = enumStringValue(x, valueMaps)
     if (value == null) {
       this.WriteEnumNumber(x)
@@ -382,7 +397,10 @@ export class MarshalState {
     this.writeArray(vs, (v) => this.WriteUint64(v))
   }
 
-  private writeArray<T>(values: $.Slice<T>, writeValue: (value: T) => void): void {
+  private writeArray<T>(
+    values: $.Slice<T>,
+    writeValue: (value: T) => void,
+  ): void {
     this.WriteArrayStart()
     let wrote = false
     for (const value of sliceValues(values)) {
@@ -406,13 +424,15 @@ export class UnmarshalState {
   private objectEntries: Array<[string, unknown]> | null = null
   private objectIndex = 0
 
-  constructor(init?: Partial<{
-    config: UnmarshalerConfig
-    value: unknown
-    root: UnmarshalState
-    fieldMaskPaths: Set<string>
-    path: string[]
-  }>) {
+  constructor(
+    init?: Partial<{
+      config: UnmarshalerConfig
+      value: unknown
+      root: UnmarshalState
+      fieldMaskPaths: Set<string>
+      path: string[]
+    }>,
+  ) {
     this.configValue = init?.config?.clone() ?? DefaultUnmarshalerConfig.clone()
     this.value = init?.value ?? null
     this.root = init?.root ?? this
@@ -488,7 +508,9 @@ export class UnmarshalState {
     return $.varRef(numberFromJSON(this.value))
   }
 
-  public ReadEnum(...valueMaps: Array<Map<string, number> | Record<string, number> | null>): number {
+  public ReadEnum(
+    ...valueMaps: Array<Map<string, number> | Record<string, number> | null>
+  ): number {
     if (typeof this.value === 'number') {
       return Math.trunc(this.value)
     }
@@ -505,11 +527,12 @@ export class UnmarshalState {
   }
 
   public ReadFieldMask(): FieldMask | null {
-    const paths = typeof this.value === 'string'
-      ? this.value.split(',').filter((part) => part !== '')
-      : Array.isArray(recordValue(this.value)?.paths)
-        ? sliceValues(recordValue(this.value)?.paths as $.Slice<string>)
-        : []
+    const paths =
+      typeof this.value === 'string' ?
+        this.value.split(',').filter((part) => part !== '')
+      : Array.isArray(recordValue(this.value)?.paths) ?
+        sliceValues(recordValue(this.value)?.paths as $.Slice<string>)
+      : []
     return { GetPaths: () => $.arrayToSlice(paths) }
   }
 
@@ -671,15 +694,33 @@ export class UnmarshalState {
     })
   }
 
-  public ReadWrappedBool(): boolean { return this.readWrapped(() => this.ReadBool()) }
-  public ReadWrappedBytes(): $.Slice<number> { return this.readWrapped(() => this.ReadBytes()) }
-  public ReadWrappedFloat32(): number { return this.readWrapped(() => this.ReadFloat32()) }
-  public ReadWrappedFloat64(): number { return this.readWrapped(() => this.ReadFloat64()) }
-  public ReadWrappedInt32(): number { return this.readWrapped(() => this.ReadInt32()) }
-  public ReadWrappedInt64(): number { return this.readWrapped(() => this.ReadInt64()) }
-  public ReadWrappedString(): string { return this.readWrapped(() => this.ReadString()) }
-  public ReadWrappedUint32(): number { return this.readWrapped(() => this.ReadUint32()) }
-  public ReadWrappedUint64(): number { return this.readWrapped(() => this.ReadUint64()) }
+  public ReadWrappedBool(): boolean {
+    return this.readWrapped(() => this.ReadBool())
+  }
+  public ReadWrappedBytes(): $.Slice<number> {
+    return this.readWrapped(() => this.ReadBytes())
+  }
+  public ReadWrappedFloat32(): number {
+    return this.readWrapped(() => this.ReadFloat32())
+  }
+  public ReadWrappedFloat64(): number {
+    return this.readWrapped(() => this.ReadFloat64())
+  }
+  public ReadWrappedInt32(): number {
+    return this.readWrapped(() => this.ReadInt32())
+  }
+  public ReadWrappedInt64(): number {
+    return this.readWrapped(() => this.ReadInt64())
+  }
+  public ReadWrappedString(): string {
+    return this.readWrapped(() => this.ReadString())
+  }
+  public ReadWrappedUint32(): number {
+    return this.readWrapped(() => this.ReadUint32())
+  }
+  public ReadWrappedUint64(): number {
+    return this.readWrapped(() => this.ReadUint64())
+  }
 
   public SetError(err: $.GoError): void {
     this.root.err = err
@@ -726,7 +767,10 @@ export class UnmarshalState {
     return 0
   }
 
-  public WithField(_field: string, _mask: boolean = true): UnmarshalState | null {
+  public WithField(
+    _field: string,
+    _mask: boolean = true,
+  ): UnmarshalState | null {
     return new UnmarshalState({
       config: this.configValue,
       value: this.value,
@@ -772,7 +816,10 @@ export class UnmarshalState {
     }
     const keys = Object.keys(record)
     if (keys.length !== 1) {
-      this.SetErrorf('unexpected %q field in wrapped value', keys.find((key) => key !== 'value') ?? '')
+      this.SetErrorf(
+        'unexpected %q field in wrapped value',
+        keys.find((key) => key !== 'value') ?? '',
+      )
       return read()
     }
     const original = this.value
@@ -787,13 +834,22 @@ export function NewJsonStream(wr: unknown): JsonStream | null {
   return new JsonStream(wr)
 }
 
-export function NewMarshalState(config: MarshalerConfig, stream: JsonStream | null): MarshalState | null {
+export function NewMarshalState(
+  config: MarshalerConfig,
+  stream: JsonStream | null,
+): MarshalState | null {
   return new MarshalState({ config, stream: stream ?? new JsonStream() })
 }
 
-export function NewUnmarshalState(data: $.Slice<number>, config: UnmarshalerConfig): UnmarshalState | null {
+export function NewUnmarshalState(
+  data: $.Slice<number>,
+  config: UnmarshalerConfig,
+): UnmarshalState | null {
   try {
-    return new UnmarshalState({ config, value: JSON.parse(bytesToString(data)) })
+    return new UnmarshalState({
+      config,
+      value: JSON.parse(bytesToString(data)),
+    })
   } catch (err) {
     const state = new UnmarshalState({ config })
     state.SetError($.newError(err instanceof Error ? err.message : String(err)))
@@ -801,11 +857,16 @@ export function NewUnmarshalState(data: $.Slice<number>, config: UnmarshalerConf
   }
 }
 
-export function Marshal(c: MarshalerConfig, m: Marshaler | null): [$.Slice<number>, $.GoError] {
+export function Marshal(
+  c: MarshalerConfig,
+  m: Marshaler | null,
+): [$.Slice<number>, $.GoError] {
   return c.Marshal(m)
 }
 
-export function MarshalMap<M extends Map<string, Marshaler> | Record<string, Marshaler>>(
+export function MarshalMap<
+  M extends Map<string, Marshaler> | Record<string, Marshaler>,
+>(
   _typeArgs: $.GenericTypeArgs | undefined,
   c: MarshalerConfig,
   mm: M,
@@ -824,7 +885,9 @@ export function MarshalMap<M extends Map<string, Marshaler> | Record<string, Mar
     value?.MarshalProtoJSON(state)
   })
   state.WriteObjectEnd()
-  return state.Err() == null ? [stringToBytes(stream.String()), null] : [null, state.Err()]
+  return state.Err() == null ?
+      [stringToBytes(stream.String()), null]
+    : [null, state.Err()]
 }
 
 export function MarshalSlice<S extends $.Slice<Marshaler>>(
@@ -842,14 +905,22 @@ export function MarshalSlice<S extends $.Slice<Marshaler>>(
     value?.MarshalProtoJSON(state)
   })
   state.WriteArrayEnd()
-  return state.Err() == null ? [stringToBytes(stream.String()), null] : [null, state.Err()]
+  return state.Err() == null ?
+      [stringToBytes(stream.String()), null]
+    : [null, state.Err()]
 }
 
-export function GetEnumString(x: number, ...valueMaps: Array<Map<number, string> | Record<number, string> | null>): string {
+export function GetEnumString(
+  x: number,
+  ...valueMaps: Array<Map<number, string> | Record<number, string> | null>
+): string {
   return enumStringValue(x, valueMaps) ?? String(x)
 }
 
-export function ParseEnumString(v: string, ...valueMaps: Array<Map<string, number> | Record<string, number> | null>): [number, $.GoError] {
+export function ParseEnumString(
+  v: string,
+  ...valueMaps: Array<Map<string, number> | Record<string, number> | null>
+): [number, $.GoError] {
   for (const valueMap of valueMaps) {
     const value = lookupStringMap(valueMap, v)
     if (value !== undefined) {
@@ -857,10 +928,14 @@ export function ParseEnumString(v: string, ...valueMaps: Array<Map<string, numbe
     }
   }
   const parsed = Number(v)
-  return Number.isFinite(parsed) ? [parsed, null] : [0, $.newError(`invalid enum ${v}`)]
+  return Number.isFinite(parsed) ?
+      [parsed, null]
+    : [0, $.newError(`invalid enum ${v}`)]
 }
 
-function sliceValues<T>(values: $.Slice<T> | readonly T[] | null | undefined): T[] {
+function sliceValues<T>(
+  values: $.Slice<T> | readonly T[] | null | undefined,
+): T[] {
   return Array.from((values ?? []) as Iterable<T>)
 }
 
@@ -953,7 +1028,10 @@ function enumStringValue(
   return null
 }
 
-function lookupStringMap(valueMap: Map<string, number> | Record<string, number> | null, key: string): number | undefined {
+function lookupStringMap(
+  valueMap: Map<string, number> | Record<string, number> | null,
+  key: string,
+): number | undefined {
   if (valueMap == null) {
     return undefined
   }
@@ -964,7 +1042,8 @@ function formatError(format: string, args: unknown[]): string {
   return format.replace(/%[vqsd]/g, () => String(args.shift()))
 }
 
-const base64Alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+const base64Alphabet =
+  'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
 
 function base64Encode(bytes: $.Slice<number>): string {
   const data = sliceValues(bytes)

package/gs/github.com/aperturerobotics/starpc/srpc/index.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+
+import * as context from '@goscript/context/index.js'
+
+import { MuxedConn, NewWebSocketConn } from './index.js'
+
+describe('starpc/srpc override', () => {
+  it('wraps websocket connections with the same outbound direction as Go', () => {
+    const conn = { Close: () => null }
+
+    const [serverConn, serverErr] = NewWebSocketConn(
+      context.Background(),
+      conn,
+      true,
+      null,
+    )
+    const [clientConn, clientErr] = NewWebSocketConn(
+      context.Background(),
+      conn,
+      false,
+      null,
+    )
+
+    expect(serverErr).toBeNull()
+    expect(clientErr).toBeNull()
+    expect(serverConn).toBeInstanceOf(MuxedConn)
+    expect(clientConn).toBeInstanceOf(MuxedConn)
+    expect(serverConn?.outbound).toBe(false)
+    expect(clientConn?.outbound).toBe(true)
+  })
+})