goscript 0.0.84 → 0.1.1

package/gs/path/filepath/match.ts

@@ -1,4 +1,5 @@
 import * as $ from '@goscript/builtin/index.js'
+import { getHostRuntime, type NodeFSModule } from '@goscript/builtin/hostio.js'
 
 export const ErrBadPattern = $.newError('syntax error in pattern')
 
@@ -238,12 +239,186 @@ function matchCharClass(
 // The only possible returned error is ErrBadPattern, when pattern is malformed.
 export function Glob(pattern: string): [string[], $.GoError] {
   try {
-    // Validate the pattern using the same logic as Match
     validatePattern(pattern)
-    // We don't have filesystem access, so return empty array
-    return [[], null]
+    return [globHost(pattern), null]
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (err) {
     return [[], ErrBadPattern]
   }
 }
+
+function hasMeta(path: string): boolean {
+  return /[*?[\\]/.test(path)
+}
+
+function splitPattern(pattern: string): { absolute: boolean; segments: string[] } {
+  const absolute = pattern.startsWith('/')
+  const segments = pattern.split('/').filter((segment, index) => {
+    if (index === 0 && segment === '') {
+      return false
+    }
+    return segment !== '' && segment !== '.'
+  })
+  return { absolute, segments }
+}
+
+function cleanMatch(path: string): string {
+  const absolute = path.startsWith('/')
+  const parts: string[] = []
+  for (const part of path.split('/')) {
+    if (part === '' || part === '.') {
+      continue
+    }
+    if (part === '..') {
+      if (parts.length > 0 && parts[parts.length - 1] !== '..') {
+        parts.pop()
+      } else if (!absolute) {
+        parts.push(part)
+      }
+      continue
+    }
+    parts.push(part)
+  }
+  const out = parts.join('/')
+  if (absolute) {
+    return '/' + out
+  }
+  return out === '' ? '.' : out
+}
+
+function joinPath(dir: string, name: string): string {
+  if (dir === '' || dir === '.') {
+    return name
+  }
+  if (dir === '/') {
+    return '/' + name
+  }
+  return dir.replace(/\/+$/, '') + '/' + name
+}
+
+type HostDirEntry = { name: string; isDir: boolean }
+
+function readDir(path: string): HostDirEntry[] | null {
+  const runtime = getHostRuntime()
+  const denoObj = runtime.deno
+  if (denoObj?.readDirSync) {
+    try {
+      const entries: HostDirEntry[] = []
+      for (const entry of denoObj.readDirSync(path)) {
+        entries.push({ name: entry.name, isDir: !!entry.isDirectory })
+      }
+      entries.sort((a, b) => a.name.localeCompare(b.name))
+      return entries
+    } catch {
+      return null
+    }
+  }
+
+  const nodeFS = runtime.nodeFS
+  if (nodeFS?.readdirSync) {
+    try {
+      const entries = nodeFS
+        .readdirSync(path, { withFileTypes: true })
+        .map((entry: any) => ({
+          name: String(entry.name),
+          isDir:
+            typeof entry.isDirectory === 'function' ?
+              entry.isDirectory()
+            : false,
+        }))
+      entries.sort((a, b) => a.name.localeCompare(b.name))
+      return entries
+    } catch {
+      return null
+    }
+  }
+
+  return null
+}
+
+function exists(path: string): boolean {
+  const runtime = getHostRuntime()
+  if (runtime.deno?.statSync) {
+    try {
+      runtime.deno.statSync(path)
+      return true
+    } catch {
+      return false
+    }
+  }
+
+  const nodeFS = runtime.nodeFS
+  if (nodeFS?.statSync) {
+    try {
+      nodeFS.statSync(path)
+      return true
+    } catch {
+      return false
+    }
+  }
+
+  return false
+}
+
+function isDir(path: string, nodeFS?: NodeFSModule | null): boolean {
+  const runtime = getHostRuntime()
+  if (runtime.deno?.statSync) {
+    try {
+      return !!runtime.deno.statSync(path).isDirectory
+    } catch {
+      return false
+    }
+  }
+
+  const fs = nodeFS ?? runtime.nodeFS
+  if (fs?.statSync) {
+    try {
+      const stat = fs.statSync(path)
+      return typeof stat.isDirectory === 'function' ? stat.isDirectory() : false
+    } catch {
+      return false
+    }
+  }
+
+  return false
+}
+
+function globHost(pattern: string): string[] {
+  const { absolute, segments } = splitPattern(pattern)
+  if (!hasMeta(pattern)) {
+    return exists(pattern) ? [cleanMatch(pattern)] : []
+  }
+
+  let prefixes = [absolute ? '/' : '.']
+  for (const [index, segment] of segments.entries()) {
+    const next: string[] = []
+    const last = index === segments.length - 1
+    const segmentHasMeta = hasMeta(segment)
+    for (const prefix of prefixes) {
+      if (!segmentHasMeta) {
+        const candidate = joinPath(prefix, segment)
+        if (last || isDir(candidate)) {
+          next.push(candidate)
+        }
+        continue
+      }
+
+      const entries = readDir(prefix)
+      if (entries === null) {
+        continue
+      }
+      for (const entry of entries) {
+        const [matched, err] = Match(segment, entry.name)
+        if (err !== null || !matched) {
+          continue
+        }
+        if (last || entry.isDir) {
+          next.push(joinPath(prefix, entry.name))
+        }
+      }
+    }
+    prefixes = next
+  }
+
+  return prefixes.map(cleanMatch).sort()
+}

package/gs/path/filepath/path.test.ts

@@ -1,4 +1,7 @@
 import { describe, it, expect } from 'vitest'
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 import {
   Base,
   Dir,
@@ -16,6 +19,7 @@ import {
   Abs,
   Rel,
   EvalSymlinks,
+  Walk,
   Separator,
   ListSeparator,
 } from './path.js'
@@ -201,6 +205,27 @@ describe('path/filepath - Path manipulation functions', () => {
     })
   })
 
+  describe('Walk', () => {
+    it('should visit host filesystem paths in lexical order', () => {
+      const root = mkdtempSync(join(tmpdir(), 'goscript-filepath-walk-'))
+      try {
+        mkdirSync(join(root, 'a', 'b'), { recursive: true })
+        writeFileSync(join(root, 'a', 'b', 'file.txt'), 'ok')
+
+        const visited: string[] = []
+        const err = Walk(root, (path) => {
+          visited.push(path.slice(root.length).replace(/^\/?/, '') || '.')
+          return null
+        })
+
+        expect(err).toBeNull()
+        expect(visited).toEqual(['.', 'a', 'a/b', 'a/b/file.txt'])
+      } finally {
+        rmSync(root, { force: true, recursive: true })
+      }
+    })
+  })
+
   describe('Constants', () => {
     it('should have correct separator constants', () => {
       expect(Separator).toBe(47)

package/gs/path/filepath/path.ts

@@ -1,6 +1,21 @@
 // Package filepath implements utility routines for manipulating filename paths
 // in a way compatible with the target operating system-defined file paths.
 import * as $ from '@goscript/builtin/index.js'
+import { getHostRuntime } from '@goscript/builtin/hostio.js'
+
+type JoinElement = string | $.Slice<string>
+
+function normalizeJoinElements(elem: JoinElement[]): string[] {
+  if (elem.length === 1 && typeof elem[0] !== 'string') {
+    const slice = elem[0]
+    const parts: string[] = []
+    for (let i = 0; i < $.len(slice); i++) {
+      parts.push(slice![i])
+    }
+    return parts
+  }
+  return elem as string[]
+}
 
 // Path separator constants
 export const Separator = $.stringToRune('/')
@@ -123,15 +138,16 @@ export function Clean(path: string): string {
 // are ignored. The result is Cleaned. However, if the argument
 // list is empty or all its elements are empty, Join returns
 // an empty string.
-export function Join(...elem: string[]): string {
-  if (elem.length === 0) {
+export function Join(...elem: JoinElement[]): string {
+  const partsArg = normalizeJoinElements(elem)
+  if (partsArg.length === 0) {
     return ''
   }
 
   // Filter out empty elements but handle absolute paths
   const parts: string[] = []
 
-  for (const e of elem) {
+  for (const e of partsArg) {
     if (e === '') {
       continue
     }
@@ -307,8 +323,7 @@ export function Glob(_pattern: string): [string[], $.GoError] {
 export type WalkFunc = (path: string, info: any, err: $.GoError) => $.GoError
 
 export function Walk(root: string, walkFn: WalkFunc): $.GoError {
-  // No filesystem support, just call the function with the root
-  return walkFn(root, null, $.newError('filesystem not supported'))
+  return walkHost(root, walkFn)
 }
 
 export function WalkDir(_root: string, _walkFn: any): $.GoError {
@@ -320,3 +335,142 @@ export function WalkDir(_root: string, _walkFn: any): $.GoError {
 export function Localize(path: string): [string, $.GoError] {
   return [path, null]
 }
+
+type HostStat = {
+  isDirectory?: boolean | (() => boolean)
+  mode?: number
+  mtimeMs?: number
+  size?: number
+}
+
+type HostEntry = {
+  name: string
+  isDir: boolean
+}
+
+function hostError(err: unknown): $.GoError {
+  const message =
+    err instanceof Error ? err.message
+    : typeof err === 'string' ? err
+    : String(err)
+  return { Error: () => message }
+}
+
+function statIsDir(stat: HostStat): boolean {
+  if (typeof stat.isDirectory === 'function') {
+    return stat.isDirectory()
+  }
+  return !!stat.isDirectory
+}
+
+function fileInfo(path: string, stat: HostStat): any {
+  return {
+    IsDir: () => statIsDir(stat),
+    ModTime: () => null,
+    Mode: () => (stat.mode ?? 0) + (statIsDir(stat) ? 2147483648 : 0),
+    Name: () => Base(path),
+    Size: () => stat.size ?? 0,
+    Sys: () => stat,
+  }
+}
+
+function statPath(path: string): [HostStat | null, $.GoError] {
+  const runtime = getHostRuntime()
+  if (runtime.deno?.statSync) {
+    try {
+      return [runtime.deno.statSync(path), null]
+    } catch (err) {
+      return [null, hostError(err)]
+    }
+  }
+
+  const nodeFS = runtime.nodeFS
+  if (nodeFS?.statSync) {
+    try {
+      return [nodeFS.statSync(path), null]
+    } catch (err) {
+      return [null, hostError(err)]
+    }
+  }
+
+  return [null, $.newError('filesystem not supported')]
+}
+
+function readDir(path: string): [HostEntry[] | null, $.GoError] {
+  const runtime = getHostRuntime()
+  if (runtime.deno?.readDirSync) {
+    try {
+      const entries: HostEntry[] = []
+      for (const entry of runtime.deno.readDirSync(path)) {
+        entries.push({ name: entry.name, isDir: !!entry.isDirectory })
+      }
+      entries.sort((a, b) => a.name.localeCompare(b.name))
+      return [entries, null]
+    } catch (err) {
+      return [null, hostError(err)]
+    }
+  }
+
+  const nodeFS = runtime.nodeFS
+  if (nodeFS?.readdirSync) {
+    try {
+      const entries = nodeFS
+        .readdirSync(path, { withFileTypes: true })
+        .map((entry: any) => ({
+          name: String(entry.name),
+          isDir:
+            typeof entry.isDirectory === 'function' ?
+              entry.isDirectory()
+            : false,
+        }))
+      entries.sort((a, b) => a.name.localeCompare(b.name))
+      return [entries, null]
+    } catch (err) {
+      return [null, hostError(err)]
+    }
+  }
+
+  return [null, $.newError('filesystem not supported')]
+}
+
+function walkHost(path: string, walkFn: WalkFunc): $.GoError {
+  const [stat, statErr] = statPath(path)
+  if (statErr !== null) {
+    return walkFn(path, null, statErr)
+  }
+
+  const visitErr = walkFn(path, fileInfo(path, stat!), null)
+  if (visitErr === SkipAll) {
+    return null
+  }
+  if (visitErr !== null) {
+    if (visitErr === SkipDir && statIsDir(stat!)) {
+      return null
+    }
+    return visitErr
+  }
+  if (!statIsDir(stat!)) {
+    return null
+  }
+
+  const [entries, readErr] = readDir(path)
+  if (readErr !== null) {
+    return walkFn(path, fileInfo(path, stat!), readErr)
+  }
+  for (const entry of entries!) {
+    const err = walkHost(Join(path, entry.name), walkFn)
+    if (err === SkipDir) {
+      if (entry.isDir) {
+        continue
+      }
+      return err
+    }
+    if (err === SkipAll) {
+      return null
+    }
+    if (err !== null) {
+      return err
+    }
+  }
+  return null
+}

package/gs/path/path.ts

@@ -1,5 +1,19 @@
 import * as $ from '@goscript/builtin/index.js'
 
+type JoinElement = string | $.Slice<string>
+
+function normalizeJoinElements(elem: JoinElement[]): string[] {
+  if (elem.length === 1 && typeof elem[0] !== 'string') {
+    const slice = elem[0]
+    const parts: string[] = []
+    for (let i = 0; i < $.len(slice); i++) {
+      parts.push(slice![i])
+    }
+    return parts
+  }
+  return elem as string[]
+}
+
 class lazybuf {
   public get s(): string {
     return this._fields.s.value
@@ -245,10 +259,11 @@ export function Split(path: string): [string, string] {
 // The result is Cleaned. However, if the argument list is
 // empty or all its elements are empty, Join returns
 // an empty string.
-export function Join(...elem: string[]): string {
+export function Join(...elem: JoinElement[]): string {
+  const parts = normalizeJoinElements(elem)
   let size = 0
-  for (let _i = 0; _i < $.len(elem); _i++) {
-    const e = elem![_i]
+  for (let _i = 0; _i < $.len(parts); _i++) {
+    const e = parts![_i]
     {
       size += $.len(e)
     }
@@ -257,8 +272,8 @@ export function Join(...elem: string[]): string {
     return ''
   }
   let buf: string[] = []
-  for (let _i = 0; _i < $.len(elem); _i++) {
-    const e = elem![_i]
+  for (let _i = 0; _i < $.len(parts); _i++) {
+    const e = parts![_i]
     {
       if ($.len(buf) > 0 || e != '') {
         if ($.len(buf) > 0) {

package/gs/reflect/index.ts

@@ -2,6 +2,7 @@
 export {
   TypeOf,
   TypeFor,
+  TypeAssert,
   ValueOf,
   Value,
   Kind_String,
@@ -47,7 +48,6 @@ export {
 } from './types.js'
 export type {
   uintptr,
-  Pointer,
   Method,
   SelectDir,
   SliceHeader,
@@ -80,6 +80,7 @@ export {
   Interface,
   Map,
   Ptr,
+  Pointer,
   Slice,
   String,
   Struct,

package/gs/reflect/map.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { MapIter } from './map.js'
+import { ValueOf } from './type.js'
 
 describe('MapIter', () => {
   it('should iterate over map entries with proper typing', () => {
@@ -29,3 +30,21 @@ describe('MapIter', () => {
     expect(iter.Value().Interface()).toBe(100)
   })
 })
+
+describe('Value.MapKeys', () => {
+  it('returns map keys as reflect values', () => {
+    const map = new Map<string, number>()
+    map.set('alpha', 1)
+    map.set('beta', 2)
+
+    const keys = ValueOf(map).MapKeys()
+
+    expect(keys?.map((key) => key.String()).sort()).toEqual(['alpha', 'beta'])
+  })
+
+  it('returns an empty slice for empty maps', () => {
+    const emptyMap = new Map<string, number>()
+
+    expect(ValueOf(emptyMap).MapKeys()).toEqual([])
+  })
+})

package/gs/reflect/map.ts

@@ -78,6 +78,10 @@ class MapType implements Type {
     return 0
   }
 
+  public Len(): number {
+    throw new Error('reflect: Len of non-array type map')
+  }
+
   public Bits(): number {
     throw new Error('reflect: Bits of non-sized type map')
   }