goscript 0.2.1 → 0.2.3

package/gs/io/fs/readdir.ts

@@ -17,7 +17,11 @@ export type ReadDirFS =
   | ({
       // ReadDir reads the named directory
       // and returns a list of directory entries sorted by filename.
-      ReadDir(name: string): [$.Slice<DirEntry>, $.GoError]
+      ReadDir(
+        name: string,
+      ):
+        | [$.Slice<DirEntry>, $.GoError]
+        | Promise<[$.Slice<DirEntry>, $.GoError]>
     } & FS)
 
 $.registerInterfaceType(
@@ -55,51 +59,50 @@ $.registerInterfaceType(
 // If fs implements [ReadDirFS], ReadDir calls fs.ReadDir.
 // Otherwise ReadDir calls fs.Open and uses ReadDir and Close
 // on the returned file.
-export function ReadDir(
+export async function ReadDir(
   fsys: FS,
   name: string,
-): [$.Slice<DirEntry>, $.GoError] {
-  using __defer = new $.DisposableStack()
+): Promise<[$.Slice<DirEntry>, $.GoError]> {
   {
     let { value: fsysTyped, ok: ok } = $.typeAssert<ReadDirFS>(
       fsys,
       'ReadDirFS',
     )
     if (ok) {
-      return fsysTyped!.ReadDir(name)
+      return await fsysTyped!.ReadDir(name)
     }
   }
 
-  let [file, err] = fsys!.Open(name)
+  let [file, err] = await fsys!.Open(name)
   if (err != null) {
     return [null, err]
   }
-  __defer.defer(() => {
-    file!.Close()
-  })
-
-  let { value: dir, ok: ok } = $.typeAssert<ReadDirFile>(file, 'ReadDirFile')
-  if (!ok) {
-    return [
-      null,
-      new PathError({
-        Err: errors.New('not implemented'),
-        Op: 'readdir',
-        Path: name,
-      }),
-    ]
-  }
+  try {
+    let { value: dir, ok: ok } = $.typeAssert<ReadDirFile>(file, 'ReadDirFile')
+    if (!ok) {
+      return [
+        null,
+        new PathError({
+          Err: errors.New('not implemented'),
+          Op: 'readdir',
+          Path: name,
+        }),
+      ]
+    }
 
-  let list: $.Slice<DirEntry>
-  ;[list, err] = dir!.ReadDir(-1)
-  if (list) {
-    list.sort((a: DirEntry, b: DirEntry): number => {
-      return $.pointerValue<Exclude<DirEntry, null>>(a)
-        .Name()
-        .localeCompare($.pointerValue<Exclude<DirEntry, null>>(b).Name())
-    })
+    let list: $.Slice<DirEntry>
+    ;[list, err] = await dir!.ReadDir(-1)
+    if (list) {
+      list.sort((a: DirEntry, b: DirEntry): number => {
+        return $.pointerValue<Exclude<DirEntry, null>>(a)
+          .Name()
+          .localeCompare($.pointerValue<Exclude<DirEntry, null>>(b).Name())
+      })
+    }
+    return [list, err]
+  } finally {
+    await file!.Close()
   }
-  return [list, err]
 }
 
 class dirInfo {

package/gs/io/fs/sub.ts

@@ -164,14 +164,14 @@ class subFS {
     return [file, f!.fixErr(err)]
   }
 
-  public ReadDir(name: string): [$.Slice<DirEntry>, $.GoError] {
+  public async ReadDir(name: string): Promise<[$.Slice<DirEntry>, $.GoError]> {
     const f = this
     let [full, err] = f!.fullName('read', name)
     if (err != null) {
       return [null, err]
     }
     let dir: $.Slice<DirEntry>
-    ;[dir, err] = ReadDir(f!.fsys, full)
+    ;[dir, err] = await ReadDir(f!.fsys, full)
     return [dir, f!.fixErr(err)]
   }
 
@@ -186,7 +186,7 @@ class subFS {
     return [data, f!.fixErr(err)]
   }
 
-  public Glob(pattern: string): [$.Slice<string>, $.GoError] {
+  public async Glob(pattern: string): Promise<[$.Slice<string>, $.GoError]> {
     const f = this
     {
       let [, err] = path.Match(pattern, '')
@@ -198,7 +198,7 @@ class subFS {
       return [$.arrayToSlice<string>(['.']), null]
     }
     let full = f!.dir + '/' + pattern
-    let [list, err] = Glob(f!.fsys, full)
+    let [list, err] = await Glob(f!.fsys, full)
     for (let i = 0; i < $.len(list); i++) {
       const name = list![i]
       {

package/gs/io/fs/walk.ts

@@ -39,7 +39,7 @@ export async function walkDir(
     }
   }
 
-  let [dirs, err] = ReadDir(fsys, name)
+  let [dirs, err] = await ReadDir(fsys, name)
 
   // Second call, to report ReadDir error.
   if (err != null) {

package/gs/io/io.test.ts

@@ -1,5 +1,12 @@
 import * as $ from '@goscript/builtin/index.js'
-import { LimitedReader, MultiWriter, NopCloser, Pipe, TeeReader } from './index.js'
+import {
+  LimitedReader,
+  MultiWriter,
+  NewSectionReader,
+  NopCloser,
+  Pipe,
+  TeeReader,
+} from './index.js'
 import { describe, expect, test } from 'vitest'
 
 class sliceReader {
@@ -22,6 +29,15 @@ class captureWriter {
   }
 }
 
+class syncReaderAt {
+  constructor(private data: Uint8Array) {}
+
+  ReadAt(p: $.Bytes, off: number): [number, $.GoError] {
+    const n = $.copy(p, this.data.subarray(off))
+    return [n, n < $.len(p) ? (new Error('EOF') as $.GoError) : null]
+  }
+}
+
 describe('io override', () => {
   test('LimitedReader accepts generated struct-literal construction', async () => {
     const reader = new LimitedReader({
@@ -118,6 +134,45 @@ describe('io override', () => {
     expect(Buffer.from(chunks).toString('utf8')).toBe('abc')
   })
 
+  test('SectionReader preserves sync reads for sync ReaderAt', () => {
+    const reader = NewSectionReader(
+      new syncReaderAt($.stringToBytes('abcdef')),
+      1,
+      3,
+    )
+    const buf = new Uint8Array(4)
+
+    const result = reader.Read(buf)
+    expect(result).not.toBeInstanceOf(Promise)
+    const [n, err] = result
+
+    expect(err).toBeNull()
+    expect(n).toBe(3)
+    expect(Buffer.from(buf.subarray(0, n)).toString('utf8')).toBe('bcd')
+  })
+
+  test('SectionReader awaits async ReaderAt', async () => {
+    const reader = NewSectionReader(
+      {
+        async ReadAt(p: $.Bytes, off: number): Promise<[number, $.GoError]> {
+          await Promise.resolve()
+          const data = $.stringToBytes('abcdef')
+          const n = $.copy(p, data.subarray(off))
+          return [n, n < $.len(p) ? (new Error('EOF') as $.GoError) : null]
+        },
+      } as any,
+      1,
+      3,
+    )
+    const buf = new Uint8Array(4)
+
+    const [n, err] = await reader.Read(buf)
+
+    expect(err).toBeNull()
+    expect(n).toBe(3)
+    expect(Buffer.from(buf.subarray(0, n)).toString('utf8')).toBe('bcd')
+  })
+
   test('PipeReader waits for a later write', async () => {
     const [reader, writer] = Pipe()
     const buf = new Uint8Array(5)

package/gs/io/io.ts

@@ -363,7 +363,15 @@ export class SectionReader implements Reader, Seeker, ReaderAt {
       p = $.goSlice(p, 0, max)
     }
 
-    const [n, err] = this.r.ReadAt(p, this.off)
+    const res = this.r.ReadAt(p, this.off) as any
+    if (res instanceof Promise) {
+      return res.then(([n, err]: [number, $.GoError]) => {
+        this.off += n
+        return [n, err]
+      }) as any
+    }
+
+    const [n, err] = res
     this.off += n
     return [n, err]
   }
@@ -400,7 +408,16 @@ export class SectionReader implements Reader, Seeker, ReaderAt {
     off += this.base
     if (off + $.len(p) > this.limit) {
       p = $.goSlice(p, 0, this.limit - off)
-      const [n, err] = this.r.ReadAt(p, off)
+      const res = this.r.ReadAt(p, off) as any
+      if (res instanceof Promise) {
+        return res.then(([n, err]: [number, $.GoError]) => {
+          if (err === null) {
+            return [n, EOF]
+          }
+          return [n, err]
+        }) as any
+      }
+      const [n, err] = res
       if (err === null) {
         return [n, EOF]
       }

package/gs/maps/iter.ts

@@ -8,9 +8,9 @@ import * as iter from '@goscript/iter/index.js'
 export function All<K extends $.Comparable | null, V>(
   m: Map<K, V> | null,
 ): iter.Seq2<K, V> {
-  return (_yield: ((p0: K, p1: V) => iter.YieldResult) | null):
-    | void
-    | globalThis.Promise<void> => iteratePairs(m?.entries() ?? [], _yield)
+  return (
+    _yield: ((p0: K, p1: V) => iter.YieldResult) | null,
+  ): void | globalThis.Promise<void> => iteratePairs(m?.entries() ?? [], _yield)
 }
 
 // Keys returns an iterator over keys in m.
@@ -19,9 +19,9 @@ export function All<K extends $.Comparable | null, V>(
 export function Keys<K extends $.Comparable | null, V>(
   m: Map<K, V> | null,
 ): iter.Seq<K> {
-  return (_yield: ((p0: K) => iter.YieldResult) | null):
-    | void
-    | globalThis.Promise<void> => iterateValues(mapKeys(m), _yield)
+  return (
+    _yield: ((p0: K) => iter.YieldResult) | null,
+  ): void | globalThis.Promise<void> => iterateValues(mapKeys(m), _yield)
 }
 
 // Values returns an iterator over values in m.
@@ -30,9 +30,9 @@ export function Keys<K extends $.Comparable | null, V>(
 export function Values<K extends $.Comparable | null, V>(
   m: Map<K, V> | null,
 ): iter.Seq<V> {
-  return (_yield: ((p0: V) => iter.YieldResult) | null):
-    | void
-    | globalThis.Promise<void> => iterateValues(mapValues(m), _yield)
+  return (
+    _yield: ((p0: V) => iter.YieldResult) | null,
+  ): void | globalThis.Promise<void> => iterateValues(mapValues(m), _yield)
 }
 
 // Insert adds the key-value pairs from seq to m.

package/gs/maps/maps.ts

@@ -4,10 +4,10 @@ import * as _ from '@goscript/unsafe/index.js'
 
 // Equal reports whether two maps contain the same key/value pairs.
 // Values are compared using ==.
-export function Equal<K extends $.Comparable | null, V extends $.Comparable | null>(
-  m1: Map<K, V>,
-  m2: Map<K, V>,
-): boolean {
+export function Equal<
+  K extends $.Comparable | null,
+  V extends $.Comparable | null,
+>(m1: Map<K, V>, m2: Map<K, V>): boolean {
   if ($.len(m1) != $.len(m2)) {
     return false
   }

package/gs/math/bits/index.test.ts

@@ -1,6 +1,15 @@
 import { describe, expect, it } from 'vitest'
 
-import { Mul64, Rem, Rem32, Rem64, RotateLeft16, RotateLeft32, RotateLeft64, RotateLeft8 } from './index.js'
+import {
+  Mul64,
+  Rem,
+  Rem32,
+  Rem64,
+  RotateLeft16,
+  RotateLeft32,
+  RotateLeft64,
+  RotateLeft8,
+} from './index.js'
 
 describe('math/bits override', () => {
   it('returns the full 128-bit product from Mul64', () => {

package/gs/mime/index.test.ts

@@ -22,14 +22,15 @@ describe('mime override', () => {
     expect(mediaType).toBe('text/plain')
     expect(params.get('charset')).toBe('utf-8')
     expect(params.get('format')).toBe('flowed')
-    const [trailingMediaType, trailingParams, trailingErr] = ParseMediaType('text/plain;')
+    const [trailingMediaType, trailingParams, trailingErr] =
+      ParseMediaType('text/plain;')
     expect(trailingErr).toBeNull()
     expect(trailingMediaType).toBe('text/plain')
     expect(trailingParams.size).toBe(0)
 
-    expect(
-      FormatMediaType('text/plain', new Map([['charset', 'utf-8']])),
-    ).toBe('text/plain; charset=utf-8')
+    expect(FormatMediaType('text/plain', new Map([['charset', 'utf-8']]))).toBe(
+      'text/plain; charset=utf-8',
+    )
     expect(
       FormatMediaType('Attachment', new Map([['FileName', 'hello.txt']])),
     ).toBe('attachment; filename=hello.txt')
@@ -37,10 +38,13 @@ describe('mime override', () => {
       FormatMediaType('attachment', new Map([['filename', 'foo bar.txt']])),
     ).toBe('attachment; filename="foo bar.txt"')
     expect(
-      FormatMediaType('text/plain', new Map([
-        ['z', 'last'],
-        ['a', 'first'],
-      ])),
+      FormatMediaType(
+        'text/plain',
+        new Map([
+          ['z', 'last'],
+          ['a', 'first'],
+        ]),
+      ),
     ).toBe('text/plain; a=first; z=last')
 
     const encoded = FormatMediaType(
@@ -51,13 +55,17 @@ describe('mime override', () => {
     const [, encodedParams, encodedErr] = ParseMediaType(encoded)
     expect(encodedErr).toBeNull()
     expect(encodedParams.get('filename')).toBe('résumé.txt')
-    const [, pathParams, pathErr] = ParseMediaType('form-data; filename="C:\\dev\\go.txt"; quoted="a\\"b"')
+    const [, pathParams, pathErr] = ParseMediaType(
+      'form-data; filename="C:\\dev\\go.txt"; quoted="a\\"b"',
+    )
     expect(pathErr).toBeNull()
     expect(pathParams.get('filename')).toBe('C:\\dev\\go.txt')
     expect(pathParams.get('quoted')).toBe('a"b')
 
     expect(TypeByExtension('.json')).toBe('application/json')
-    expect(AddExtensionType('.goscript', 'text/plain; charset=utf-8')).toBeNull()
+    expect(
+      AddExtensionType('.goscript', 'text/plain; charset=utf-8'),
+    ).toBeNull()
     const [extensions, extensionErr] = ExtensionsByType('text/plain')
     expect(extensionErr).toBeNull()
     expect(extensions).toContain('.goscript')
@@ -66,10 +74,18 @@ describe('mime override', () => {
   it('reports invalid media parameters', () => {
     const [, , err] = ParseMediaType('text/plain; broken')
     expect(err).toBe(ErrInvalidMediaParameter)
-    expect(ParseMediaType('text/plain; filename=foo bar')[2]).toBe(ErrInvalidMediaParameter)
-    expect(ParseMediaType('text/plain; filename="unterminated')[2]).toBe(ErrInvalidMediaParameter)
-    expect(ParseMediaType('text/plain; x=1; x=2')[2]).toBe(ErrInvalidMediaParameter)
-    expect(ParseMediaType('text/plain; bad[]=x')[2]).toBe(ErrInvalidMediaParameter)
+    expect(ParseMediaType('text/plain; filename=foo bar')[2]).toBe(
+      ErrInvalidMediaParameter,
+    )
+    expect(ParseMediaType('text/plain; filename="unterminated')[2]).toBe(
+      ErrInvalidMediaParameter,
+    )
+    expect(ParseMediaType('text/plain; x=1; x=2')[2]).toBe(
+      ErrInvalidMediaParameter,
+    )
+    expect(ParseMediaType('text/plain; bad[]=x')[2]).toBe(
+      ErrInvalidMediaParameter,
+    )
     expect(ParseMediaType('text/plain; bad{}=x')[1].get('bad{}')).toBe('x')
   })
 
@@ -83,7 +99,9 @@ describe('mime override', () => {
     expect(qWord).toBe('hello world')
 
     const encodedQWord = WordEncoder_Encode(QEncoding, 'utf-8', 'héllo world')
-    const [header, err] = new WordDecoder().DecodeHeader(`subject ${encodedQWord}`)
+    const [header, err] = new WordDecoder().DecodeHeader(
+      `subject ${encodedQWord}`,
+    )
     expect(err).toBeNull()
     expect(header).toBe('subject héllo world')
   })

package/gs/mime/index.ts

@@ -52,7 +52,11 @@ export function FormatMediaType(
     param instanceof Map ?
       Array.from(param.entries())
     : Object.entries(param ?? {})
-  entries.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
+  entries.sort(([a], [b]) =>
+    a < b ? -1
+    : a > b ? 1
+    : 0,
+  )
   for (const [key, value] of entries) {
     if (!isToken(key)) {
       return ''
@@ -92,7 +96,10 @@ export function ParseMediaType(
     if (key.endsWith('*')) {
       const decoded = decode2231Value(value)
       if (decoded !== null) {
-        if (params.has(key.slice(0, -1)) && params.get(key.slice(0, -1)) !== decoded) {
+        if (
+          params.has(key.slice(0, -1)) &&
+          params.get(key.slice(0, -1)) !== decoded
+        ) {
           return ['', new Map(), ErrInvalidMediaParameter]
         }
         params.set(key.slice(0, -1), decoded)

package/gs/net/http/httptest/index.test.ts

@@ -47,20 +47,34 @@ describe('net/http/httptest override', () => {
   })
 
   it('exports request defaults and recorder compatibility helpers', () => {
-    const req = NewRequestWithContext(context.Background(), '', 'https://example.invalid/path', null)
+    const req = NewRequestWithContext(
+      context.Background(),
+      '',
+      'https://example.invalid/path',
+      null,
+    )
     expect(DefaultRemoteAddr).toBe('1.2.3.4')
     expect(req.Method).toBe(MethodGet)
     expect(req.Host).toBe('example.invalid')
     expect(req.RemoteAddr).toBe('192.0.2.1:1234')
     expect(req.TLS).not.toBeNull()
 
-    const pathReq = NewRequestWithContext(context.Background(), MethodGet, '/local?x=1', null)
+    const pathReq = NewRequestWithContext(
+      context.Background(),
+      MethodGet,
+      '/local?x=1',
+      null,
+    )
     expect(pathReq.Host).toBe('example.com')
     expect(pathReq.RequestURI).toBe('/local?x=1')
     expect(pathReq.URL.Host).toBe('')
     expect(pathReq.URL.Scheme).toBe('')
 
-    const bodyReq = NewTestRequest(MethodPost, '/body', bytes.NewReader($.stringToBytes('abc')))
+    const bodyReq = NewTestRequest(
+      MethodPost,
+      '/body',
+      bytes.NewReader($.stringToBytes('abc')),
+    )
     expect(bodyReq.ContentLength).toBe(3)
     const noBodyReq = NewTestRequest(MethodPost, '/empty', NoBody)
     expect(noBodyReq.ContentLength).toBe(0)

package/gs/net/http/httptest/index.ts

@@ -117,7 +117,11 @@ function requestBodyContentLength(body: io.Reader | null): number {
   if (value === http.NoBody) {
     return 0
   }
-  if (value instanceof bytes.Buffer || value instanceof bytes.Reader || value instanceof strings.Reader) {
+  if (
+    value instanceof bytes.Buffer ||
+    value instanceof bytes.Reader ||
+    value instanceof strings.Reader
+  ) {
     return value.Len()
   }
   return -1
@@ -133,7 +137,8 @@ export class Server {
 
   constructor(init?: Partial<Server> & { Handler?: http.Handler | null }) {
     this.handler = init?.Handler ?? null
-    this.ConfigValue = init?.ConfigValue ?? new http.Server({ Handler: this.handler })
+    this.ConfigValue =
+      init?.ConfigValue ?? new http.Server({ Handler: this.handler })
     this.URL = init?.URL ?? http.RegisterInProcessServer(this.handler)
   }
 
@@ -200,7 +205,7 @@ function serverRequest(request: http.Request): http.Request {
   const rawQuery = request.URL?.RawQuery ?? ''
   const query = rawQuery === '' ? '' : `?${rawQuery}`
   req.RequestURI = `${request.URL?.Path ?? '/'}${query}`
-  req.Host = request.Host === '' ? request.URL?.Host ?? '' : request.Host
+  req.Host = request.Host === '' ? (request.URL?.Host ?? '') : request.Host
   if (req.URL?.clone != null) {
     req.URL = req.URL.clone()
     req.URL.Scheme = ''