goscript 0.1.1 → 0.1.2

package/gs/builtin/type.ts

@@ -18,6 +18,7 @@ export enum TypeKind {
  */
 export interface BaseTypeInfo {
   name?: string
+  typeName?: string
   kind: TypeKind
   zeroValue?: any
 }
@@ -204,6 +205,19 @@ export interface Comparable {
 
 // Registry to store runtime type information
 const typeRegistry = new Map<string, TypeInfo>()
+const duplicateTypeRegistry = new Map<string, TypeInfo[]>()
+
+function registerTypeInfo(name: string, typeInfo: TypeInfo): void {
+  const existing = typeRegistry.get(name)
+  if (existing && existing !== typeInfo) {
+    const candidates = duplicateTypeRegistry.get(name) ?? [existing]
+    if (!candidates.includes(typeInfo)) {
+      candidates.push(typeInfo)
+    }
+    duplicateTypeRegistry.set(name, candidates)
+  }
+  typeRegistry.set(name, typeInfo)
+}
 
 /**
  * Registers a struct type with the runtime type system.
@@ -230,7 +244,7 @@ export const registerStructType = (
     ctor,
     fields,
   }
-  typeRegistry.set(name, typeInfo)
+  registerTypeInfo(name, typeInfo)
   return typeInfo
 }
 
@@ -260,7 +274,7 @@ export const registerInterfaceType = (
     zeroValue,
     methods,
   }
-  typeRegistry.set(name, typeInfo)
+  registerTypeInfo(name, typeInfo)
   return typeInfo
 }
 
@@ -301,6 +315,14 @@ function normalizeTypeInfo(info: string | TypeInfo): TypeInfo {
   return info
 }
 
+function typeInfoRuntimeName(info: TypeInfo): string | undefined {
+  return info.typeName || info.name
+}
+
+function goTypeMatchesTypeInfo(goType: string, info: TypeInfo): boolean {
+  return goType === typeInfoRuntimeName(info)
+}
+
 function compareOptionalTypeInfo(
   type1?: string | TypeInfo,
   type2?: string | TypeInfo,
@@ -530,11 +552,13 @@ function matchesStructType(value: any, info: TypeInfo): boolean {
  */
 function matchesInterfaceType(value: any, info: TypeInfo): boolean {
   // Check basic conditions first
-  if (
-    !isInterfaceTypeInfo(info) ||
-    typeof value !== 'object' ||
-    value === null
-  ) {
+  if (!isInterfaceTypeInfo(info) || value === null || value === undefined) {
+    return false
+  }
+  if (info.methods.length === 0) {
+    return true
+  }
+  if (typeof value !== 'object') {
     return false
   }
 
@@ -740,6 +764,18 @@ export function cloneStructValue<T>(value: T): T {
   throw new Error('runtime error: value is not cloneable')
 }
 
+export function cloneArrayValue<T>(value: T): T {
+  if (value instanceof Uint8Array) {
+    const out = new Uint8Array(value.length)
+    out.set(value)
+    return out as T
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => cloneArrayValue(item)) as T
+  }
+  return value
+}
+
 // Check if a struct instance is marked as a value
 function isMarkedAsStructValue(value: any): boolean {
   return (
@@ -900,7 +936,7 @@ function matchesType(value: any, info: TypeInfo): boolean {
   if (
     typeof value === 'object' &&
     typeof value.__goType === 'string' &&
-    value.__goType === info.name
+    goTypeMatchesTypeInfo(value.__goType, info)
   ) {
     return true
   }
@@ -1086,7 +1122,7 @@ export function typeAssert<T>(
     typeof value === 'object' &&
     value !== null &&
     typeof value.__goType === 'string' &&
-    value.__goType === normalizedType.name
+    goTypeMatchesTypeInfo(value.__goType, normalizedType)
   ) {
     if ('__goValue' in value) {
       return { value: value.__goValue as T, ok: true }
@@ -1147,6 +1183,14 @@ export function typeAssert<T>(
     return { value: value as T, ok: true }
   }
 
+  if (typeof typeInfo === 'string') {
+    for (const candidate of duplicateTypeRegistry.get(typeInfo) ?? []) {
+      if (candidate !== normalizedType && matchesType(value, candidate)) {
+        return { value: value as T, ok: true }
+      }
+    }
+  }
+
   // If we get here, the assertion failed
   // For registered types, use the zero value from the registry
   if (typeof typeInfo === 'string') {

package/gs/builtin/varRef.ts

@@ -10,6 +10,8 @@ export type VarRef<T> = {
   __isVarRef?: true
   __goType?: string
   __goAddress?: () => number
+  __goCollection?: unknown
+  __goIndex?: number
 }
 
 /** Wrap a non-null T in a variable reference. */

package/gs/bytes/buffer.gs.ts

@@ -66,7 +66,7 @@ export class Buffer {
 	// The slice aliases the buffer content at least until the next buffer modification,
 	// so immediate changes to the slice will affect the result of future reads.
 	public Bytes(): $.Bytes {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.goSlice(b.buf, b.off, undefined)
 	}
 
@@ -75,7 +75,7 @@ export class Buffer {
 	// passed to an immediately succeeding [Buffer.Write] call.
 	// The buffer is only valid until the next write operation on b.
 	public AvailableBuffer(): $.Bytes {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.goSlice(b.buf, $.len(b.buf), undefined)
 	}
 
@@ -84,7 +84,7 @@ export class Buffer {
 	//
 	// To build strings more efficiently, see the [strings.Builder] type.
 	public String(): string {
-		const b = this
+		const b = $.pointerValueOrNil<Buffer>(this)
 		if (b == null) {
 			// Special case, useful in debugging.
 			return "<nil>"
@@ -97,27 +97,27 @@ export class Buffer {
 
 	// empty reports whether the unread portion of the buffer is empty.
 	public empty(): boolean {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.len(b.buf) <= b.off
 	}
 
 	// Len returns the number of bytes of the unread portion of the buffer;
 	// b.Len() == len(b.Bytes()).
 	public Len(): number {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.len(b.buf) - b.off
 	}
 
 	// Cap returns the capacity of the buffer's underlying byte slice, that is, the
 	// total space allocated for the buffer's data.
 	public Cap(): number {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.cap(b.buf)
 	}
 
 	// Available returns how many bytes are unused in the buffer.
 	public Available(): number {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		return $.cap(b.buf) - $.len(b.buf)
 	}
 
@@ -125,7 +125,7 @@ export class Buffer {
 	// but continues to use the same allocated storage.
 	// It panics if n is negative or greater than the length of the buffer.
 	public Truncate(n: number): void {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (n == 0) {
 			b.Reset()
 			return 
@@ -141,7 +141,7 @@ export class Buffer {
 	// but it retains the underlying storage for use by future writes.
 	// Reset is the same as [Buffer.Truncate](0).
 	public Reset(): void {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.buf = $.goSlice(b.buf, undefined, 0)
 		b.off = 0
 		b.lastRead = 0
@@ -151,7 +151,7 @@ export class Buffer {
 	// internal buffer only needs to be resliced.
 	// It returns the index where bytes should be written and whether it succeeded.
 	public tryGrowByReslice(n: number): [number, boolean] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (b.buf === null) {
 			return [0, false]
 		}
@@ -169,7 +169,7 @@ export class Buffer {
 	// It returns the index where bytes should be written.
 	// If the buffer can't grow it will panic with ErrTooLarge.
 	public grow(n: number): number {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		let m = b.Len()
 		if (m == 0 && b.off != 0) {
 			b.Reset()
@@ -210,7 +210,7 @@ export class Buffer {
 	// If n is negative, Grow will panic.
 	// If the buffer can't grow it will panic with [ErrTooLarge].
 	public Grow(n: number): void {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (n < 0) {
 			$.panic("bytes.Buffer.Grow: negative count")
 		}
@@ -222,7 +222,7 @@ export class Buffer {
 	// needed. The return value n is the length of p; err is always nil. If the
 	// buffer becomes too large, Write will panic with [ErrTooLarge].
 	public Write(p: $.Bytes): [number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.lastRead = 0
 		let [m, ok] = b.tryGrowByReslice($.len(p))
 		if (!ok) {
@@ -248,7 +248,7 @@ export class Buffer {
 	// needed. The return value n is the length of s; err is always nil. If the
 	// buffer becomes too large, WriteString will panic with [ErrTooLarge].
 	public WriteString(s: string): [number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.lastRead = 0
 		let [m, ok] = b.tryGrowByReslice($.len(s))
 		if (!ok) {
@@ -270,7 +270,7 @@ export class Buffer {
 	// buffer becomes too large, ReadFrom will panic with [ErrTooLarge].
 	public ReadFrom(r: io.Reader): [number, $.GoError] {
 		return (async (): Promise<[number, $.GoError]> => {
-			const b = this
+			const b = $.pointerValue<Buffer>(this)
 			b.lastRead = 0
 			let n = 0
 			for (; ; ) {
@@ -301,7 +301,7 @@ export class Buffer {
 	// encountered during the write is also returned.
 	public WriteTo(w: io.Writer): [number, $.GoError] {
 		return (async (): Promise<[number, $.GoError]> => {
-			const b = this
+			const b = $.pointerValue<Buffer>(this)
 			b.lastRead = 0
 			let n = 0
 			{
@@ -333,7 +333,7 @@ export class Buffer {
 	// WriteByte. If the buffer becomes too large, WriteByte will panic with
 	// [ErrTooLarge].
 	public WriteByte(c: number): $.GoError {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.lastRead = 0
 		let [m, ok] = b.tryGrowByReslice(1)
 		if (!ok) {
@@ -348,7 +348,7 @@ export class Buffer {
 	// included to match [bufio.Writer]'s WriteRune. The buffer is grown as needed;
 	// if it becomes too large, WriteRune will panic with [ErrTooLarge].
 	public WriteRune(r: number): [number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if ((r as number) < utf8.RuneSelf) {
 			b.WriteByte($.byte(r))
 			return [1, null]
@@ -367,7 +367,7 @@ export class Buffer {
 	// buffer has no data to return, err is [io.EOF] (unless len(p) is zero);
 	// otherwise it is nil.
 	public Read(p: $.Bytes): [number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.lastRead = 0
 		if (b.empty()) {
 			// Buffer is empty, reset to recover space.
@@ -390,7 +390,7 @@ export class Buffer {
 	// If there are fewer than n bytes in the buffer, Next returns the entire buffer.
 	// The slice is only valid until the next call to a read or write method.
 	public Next(n: number): $.Bytes {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		b.lastRead = 0
 		let m = b.Len()
 		if (n > m) {
@@ -407,7 +407,7 @@ export class Buffer {
 	// Peek returns the next n bytes without advancing the buffer.
 	// If fewer than n bytes are available, it returns the unread bytes and io.EOF.
 	public Peek(n: number): [$.Bytes, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (n < 0) {
 			return [null, errors.New("bytes.Buffer.Peek: negative count")]
 		}
@@ -428,7 +428,7 @@ export class Buffer {
 	// ReadByte reads and returns the next byte from the buffer.
 	// If no byte is available, it returns error [io.EOF].
 	public ReadByte(): [number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (b.empty()) {
 			// Buffer is empty, reset to recover space.
 			b.Reset()
@@ -446,7 +446,7 @@ export class Buffer {
 	// If the bytes are an erroneous UTF-8 encoding, it
 	// consumes one byte and returns U+FFFD, 1.
 	public ReadRune(): [number, number, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (b.empty()) {
 			// Buffer is empty, reset to recover space.
 			b.Reset()
@@ -472,7 +472,7 @@ export class Buffer {
 	// it is stricter than [Buffer.UnreadByte], which will unread the last byte
 	// from any read operation.)
 	public UnreadRune(): $.GoError {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (b.lastRead <= 0) {
 			return errors.New("bytes.Buffer: UnreadRune: previous operation was not a successful ReadRune")
 		}
@@ -488,7 +488,7 @@ export class Buffer {
 	// the last read, if the last read returned an error, or if the read read zero
 	// bytes, UnreadByte returns an error.
 	public UnreadByte(): $.GoError {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		if (b.lastRead == 0) {
 			return errUnreadByte
 		}
@@ -506,7 +506,7 @@ export class Buffer {
 	// ReadBytes returns err != nil if and only if the returned data does not end in
 	// delim.
 	public ReadBytes(delim: number): [$.Bytes, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		let [slice, err] = b.readSlice(delim)
 		let line = $.append<number>(null, slice)
 		return [line, err]
@@ -514,7 +514,7 @@ export class Buffer {
 
 	// readSlice is like ReadBytes but returns a reference to internal buffer data.
 	public readSlice(delim: number): [$.Bytes, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		let i = IndexByte($.goSlice(b.buf, b.off, undefined), delim)
 		let end = b.off + i + 1
 		let err: $.GoError = null
@@ -536,7 +536,7 @@ export class Buffer {
 	// ReadString returns err != nil if and only if the returned data does not end
 	// in delim.
 	public ReadString(delim: number): [string, $.GoError] {
-		const b = this
+		const b = $.pointerValue<Buffer>(this)
 		let slice: $.Bytes
 		let err: $.GoError
 		[slice, err] = b.readSlice(delim)

package/gs/bytes/iter.gs.ts

@@ -13,7 +13,7 @@ import * as utf8 from "@goscript/unicode/utf8/index.js"
 // If s does not end in a newline, the final yielded line will not end in a newline.
 // It returns a single-use iterator.
 export function Lines(s: $.Bytes): iter.Seq<$.Bytes> {
-	return (_yield: ((p0: $.Bytes) => boolean) | null): void => {
+	return async (_yield: ((p0: $.Bytes) => iter.YieldResult) | null): Promise<void> => {
 		for (; $.len(s) > 0; ) {
 			let line: $.Bytes = new Uint8Array(0)
 			{
@@ -24,7 +24,7 @@ export function Lines(s: $.Bytes): iter.Seq<$.Bytes> {
 					[line, s] = [s, null]
 				}
 			}
-			if (!_yield!($.goSlice(line, undefined, $.len(line), $.len(line)))) {
+			if (!await _yield!($.goSlice(line, undefined, $.len(line), $.len(line)))) {
 				return 
 			}
 		}
@@ -34,10 +34,10 @@ export function Lines(s: $.Bytes): iter.Seq<$.Bytes> {
 
 // explodeSeq returns an iterator over the runes in s.
 export function explodeSeq(s: $.Bytes): iter.Seq<$.Bytes> {
-	return (_yield: ((p0: $.Bytes) => boolean) | null): void => {
+	return async (_yield: ((p0: $.Bytes) => iter.YieldResult) | null): Promise<void> => {
 		for (; $.len(s) > 0; ) {
 			let [, size] = utf8.DecodeRune(s)
-			if (!_yield!($.goSlice(s, undefined, size, size))) {
+			if (!await _yield!($.goSlice(s, undefined, size, size))) {
 				return 
 			}
 			s = $.goSlice(s, size, undefined)
@@ -51,19 +51,19 @@ export function splitSeq(s: $.Bytes, sep: $.Bytes, sepSave: number): iter.Seq<$.
 	if ($.len(sep) == 0) {
 		return explodeSeq(s)
 	}
-	return (_yield: ((p0: $.Bytes) => boolean) | null): void => {
+	return async (_yield: ((p0: $.Bytes) => iter.YieldResult) | null): Promise<void> => {
 		for (; ; ) {
 			let i = Index(s, sep)
 			if (i < 0) {
 				break
 			}
 			let frag = $.goSlice(s, undefined, i + sepSave)
-			if (!_yield!($.goSlice(frag, undefined, $.len(frag), $.len(frag)))) {
+			if (!await _yield!($.goSlice(frag, undefined, $.len(frag), $.len(frag)))) {
 				return 
 			}
 			s = $.goSlice(s, i + $.len(sep), undefined)
 		}
-		_yield!($.goSlice(s, undefined, $.len(s), $.len(s)))
+		await _yield!($.goSlice(s, undefined, $.len(s), $.len(s)))
 	}
 }
 
@@ -88,7 +88,7 @@ export function SplitAfterSeq(s: $.Bytes, sep: $.Bytes): iter.Seq<$.Bytes> {
 // The iterator yields the same subslices that would be returned by [Fields](s),
 // but without constructing a new slice containing the subslices.
 export function FieldsSeq(s: $.Bytes): iter.Seq<$.Bytes> {
-	return (_yield: ((p0: $.Bytes) => boolean) | null): void => {
+	return async (_yield: ((p0: $.Bytes) => iter.YieldResult) | null): Promise<void> => {
 		let start = -1
 		for (let i = 0; i < $.len(s); ) {
 			let size = 1
@@ -100,7 +100,7 @@ export function FieldsSeq(s: $.Bytes): iter.Seq<$.Bytes> {
 			}
 			if (isSpace) {
 				if (start >= 0) {
-					if (!_yield!($.goSlice(s, start, i, i))) {
+					if (!await _yield!($.goSlice(s, start, i, i))) {
 						return 
 					}
 					start = -1
@@ -111,7 +111,7 @@ export function FieldsSeq(s: $.Bytes): iter.Seq<$.Bytes> {
 			i += size
 		}
 		if (start >= 0) {
-			_yield!($.goSlice(s, start, $.len(s), $.len(s)))
+			await _yield!($.goSlice(s, start, $.len(s), $.len(s)))
 		}
 	}
 }
@@ -121,7 +121,7 @@ export function FieldsSeq(s: $.Bytes): iter.Seq<$.Bytes> {
 // The iterator yields the same subslices that would be returned by [FieldsFunc](s),
 // but without constructing a new slice containing the subslices.
 export function FieldsFuncSeq(s: $.Bytes, f: ((p0: number) => boolean) | null): iter.Seq<$.Bytes> {
-	return (_yield: ((p0: $.Bytes) => boolean) | null): void => {
+	return async (_yield: ((p0: $.Bytes) => iter.YieldResult) | null): Promise<void> => {
 		let start = -1
 		for (let i = 0; i < $.len(s); ) {
 			let size = 1
@@ -131,7 +131,7 @@ export function FieldsFuncSeq(s: $.Bytes, f: ((p0: number) => boolean) | null):
 			}
 			if (f!(r)) {
 				if (start >= 0) {
-					if (!_yield!($.goSlice(s, start, i, i))) {
+					if (!await _yield!($.goSlice(s, start, i, i))) {
 						return 
 					}
 					start = -1
@@ -142,8 +142,7 @@ export function FieldsFuncSeq(s: $.Bytes, f: ((p0: number) => boolean) | null):
 			i += size
 		}
 		if (start >= 0) {
-			_yield!($.goSlice(s, start, $.len(s), $.len(s)))
+			await _yield!($.goSlice(s, start, $.len(s), $.len(s)))
 		}
 	}
 }
-

package/gs/compress/zlib/index.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, test } from 'vitest'
+
+import * as $ from '@goscript/builtin/index.js'
+import * as bytes from '@goscript/bytes/index.js'
+import * as io from '@goscript/io/index.js'
+
+import { NewReader, NewWriter } from './index.js'
+
+describe('compress/zlib override', () => {
+  test('round trips bytes through writer and reader', async () => {
+    const input = $.stringToBytes('hello compressed world')
+    const buf = $.markAsStructValue(new bytes.Buffer())
+    const writer = NewWriter(buf)
+
+    const [written, writeErr] = writer.Write(input)
+    expect(writeErr).toBeNull()
+    expect(written).toBe(input.length)
+    expect(await writer.Close()).toBeNull()
+
+    const [reader, readerErr] = await NewReader(bytes.NewReader(buf.Bytes()))
+    expect(readerErr).toBeNull()
+    expect(reader).not.toBeNull()
+
+    const [out, readErr] = await io.ReadAll(reader!)
+    expect(readErr).toBeNull()
+    expect($.bytesToString(out)).toBe('hello compressed world')
+  })
+})