goscript 0.1.0 → 0.1.2

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) {
@@ -269,28 +269,30 @@ export class Buffer {
 	// error except io.EOF encountered during the read is also returned. If the
 	// buffer becomes too large, ReadFrom will panic with [ErrTooLarge].
 	public ReadFrom(r: io.Reader): [number, $.GoError] {
-		const b = this
-		b.lastRead = 0
-		let n = 0
-		for (; ; ) {
-			let i = b.grow(512)
-			b.buf = $.goSlice(b.buf, undefined, i)
-			let [m, e] = r!.Read($.bytesToUint8Array($.goSlice(b.buf, i, $.cap(b.buf))))
-			if (m < 0) {
-				$.panic(errNegativeRead)
-			}
+		return (async (): Promise<[number, $.GoError]> => {
+			const b = $.pointerValue<Buffer>(this)
+			b.lastRead = 0
+			let n = 0
+			for (; ; ) {
+				let i = b.grow(512)
+				b.buf = $.goSlice(b.buf, undefined, i)
+				let [m, e] = await (r!.Read($.bytesToUint8Array($.goSlice(b.buf, i, $.cap(b.buf)))) as any)
+				if (m < 0) {
+					$.panic(errNegativeRead)
+				}
 
-			b.buf = $.goSlice(b.buf, undefined, i + m)
-			n += (m as number)
+				b.buf = $.goSlice(b.buf, undefined, i + m)
+				n += (m as number)
 
-			// e is EOF, so return nil explicitly
-			if (e == io.EOF) {
-				return [n, null]
-			}
-			if (e != null) {
-				return [n, e]
+				// e is EOF, so return nil explicitly
+				if (e == io.EOF) {
+					return [n, null]
+				}
+				if (e != null) {
+					return [n, e]
+				}
 			}
-		}
+		})() as any
 	}
 
 	// WriteTo writes data to w until the buffer is drained or an error occurs.
@@ -298,30 +300,32 @@ export class Buffer {
 	// int, but it is int64 to match the [io.WriterTo] interface. Any error
 	// encountered during the write is also returned.
 	public WriteTo(w: io.Writer): [number, $.GoError] {
-		const b = this
-		b.lastRead = 0
-		let n = 0
-		{
-			let nBytes = b.Len()
-			if (nBytes > 0) {
-				let [m, e] = w!.Write($.bytesToUint8Array($.goSlice(b.buf, b.off, undefined)))
-				if (m > nBytes) {
-					$.panic("bytes.Buffer.WriteTo: invalid Write count")
-				}
-				b.off += m
-				n = (m as number)
-				if (e != null) {
-					return [n, e]
-				}
-				// all bytes should have been written, by definition of
-				// Write method in io.Writer
-				if (m != nBytes) {
-					return [n, io.ErrShortWrite]
+		return (async (): Promise<[number, $.GoError]> => {
+			const b = $.pointerValue<Buffer>(this)
+			b.lastRead = 0
+			let n = 0
+			{
+				let nBytes = b.Len()
+				if (nBytes > 0) {
+					let [m, e] = await (w!.Write($.bytesToUint8Array($.goSlice(b.buf, b.off, undefined))) as any)
+					if (m > nBytes) {
+						$.panic("bytes.Buffer.WriteTo: invalid Write count")
+					}
+					b.off += m
+					n = (m as number)
+					if (e != null) {
+						return [n, e]
+					}
+					// all bytes should have been written, by definition of
+					// Write method in io.Writer
+					if (m != nBytes) {
+						return [n, io.ErrShortWrite]
+					}
 				}
 			}
-		}
-		b.Reset()
-		return [n, null]
+			b.Reset()
+			return [n, null]
+		})() as any
 	}
 
 	// WriteByte appends the byte c to the buffer, growing the buffer as needed.
@@ -329,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) {
@@ -344,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]
@@ -363,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.
@@ -373,7 +377,7 @@ export class Buffer {
 			}
 			return [0, io.EOF]
 		}
-		const n = $.copy($.bytesToUint8Array(p), $.bytesToUint8Array($.goSlice(b.buf, b.off, undefined)))
+		const n = $.copy(p, $.goSlice(b.buf, b.off, undefined))
 		b.off += n
 		if (n > 0) {
 			b.lastRead = -1
@@ -386,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) {
@@ -403,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")]
 		}
@@ -424,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()
@@ -442,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()
@@ -468,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")
 		}
@@ -484,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
 		}
@@ -502,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]
@@ -510,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
@@ -532,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)
@@ -603,8 +607,8 @@ export function growSlice(b: $.Bytes, n: number): $.Bytes {
 		// we could rely purely on append to determine the growth rate.
 		c = 2 * $.cap(b)
 	}
-	let b2 = $.append<number>(null, new Uint8Array(c))
-	let i = $.copy($.bytesToUint8Array(b2), $.bytesToUint8Array(b))
+	let b2 = $.makeSlice<number>(c, c, 'byte')
+	let i = $.copy(b2, b)
 	return $.goSlice(b2, undefined, i)
 }
 

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/bytes/meta.json

@@ -1,10 +1,15 @@
 {
   "dependencies": [
     "errors",
-    "io", 
+    "io",
     "iter",
     "unicode",
     "unicode/utf8",
     "unsafe"
-  ]
-} 
+  ],
+  "asyncMethods": {
+    "Buffer.ReadFrom": true,
+    "Buffer.WriteTo": true,
+    "Reader.WriteTo": true
+  }
+}

package/gs/bytes/reader.gs.ts

@@ -80,7 +80,7 @@ export class Reader {
 			return [0, io.EOF]
 		}
 		r.prevRune = -1
-		const n = $.copy($.bytesToUint8Array(b), $.bytesToUint8Array($.goSlice(r.s, r.i, undefined)))
+		const n = $.copy(b, $.goSlice(r.s, r.i, undefined))
 		r.i += (n as number)
 		return [n, null]
 	}
@@ -94,7 +94,7 @@ export class Reader {
 		if (off >= ($.len(r.s) as number)) {
 			return [0, io.EOF]
 		}
-		const n = $.copy($.bytesToUint8Array(b), $.bytesToUint8Array($.goSlice(r.s, off, undefined)))
+		const n = $.copy(b, $.goSlice(r.s, off, undefined))
 		let err: $.GoError = null
 		if (n < $.len(b)) {
 			err = io.EOF
@@ -187,22 +187,24 @@ export class Reader {
 
 	// WriteTo implements the [io.WriterTo] interface.
 	public WriteTo(w: io.Writer): [number, $.GoError] {
-		const r = this
-		r.prevRune = -1
-		if (r.i >= ($.len(r.s) as number)) {
-			return [0, null]
-		}
-		const b = $.goSlice(r.s, r.i, undefined)
-		const [m, err] = w!.Write($.bytesToUint8Array(b))
-		if (m > $.len(b)) {
-			$.panic("bytes.Reader.WriteTo: invalid Write count")
-		}
-		r.i += (m as number)
-		const n = (m as number)
-		if (m != $.len(b) && err == null) {
-			return [n, io.ErrShortWrite]
-		}
-		return [n, err]
+		return (async (): Promise<[number, $.GoError]> => {
+			const r = this
+			r.prevRune = -1
+			if (r.i >= ($.len(r.s) as number)) {
+				return [0, null]
+			}
+			const b = $.goSlice(r.s, r.i, undefined)
+			const [m, err] = await (w!.Write($.bytesToUint8Array(b)) as any)
+			if (m > $.len(b)) {
+				$.panic("bytes.Reader.WriteTo: invalid Write count")
+			}
+			r.i += (m as number)
+			const n = (m as number)
+			if (m != $.len(b) && err == null) {
+				return [n, io.ErrShortWrite]
+			}
+			return [n, err]
+		})() as any
 	}
 
 	// Reset resets the [Reader] to be reading from b.
@@ -227,4 +229,3 @@ export class Reader {
 export function NewReader(b: $.Bytes): Reader {
 	return new Reader({s: $.normalizeBytes(b), i: 0, prevRune: -1})
 }
-

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')
+  })
+})