goscript 0.1.2 → 0.1.4

package/gs/sync/sync.ts

@@ -3,6 +3,8 @@
 // low-level library routines. Higher-level synchronization is better done via
 // channels and communication.
 
+import { comparableEqual } from '@goscript/builtin/index.js'
+
 // Locker represents an object that can be locked and unlocked
 export interface Locker {
   Lock(): Promise<void>
@@ -334,7 +336,10 @@ export class Map {
   public async Delete(key: any): Promise<void> {
     await this._m.Lock()
     try {
-      this._data.delete(key)
+      const entry = this.findEntry(key)
+      if (entry.found) {
+        this._data.delete(entry.key)
+      }
     } finally {
       this._m.Unlock()
     }
@@ -344,10 +349,11 @@ export class Map {
   public async CompareAndDelete(key: any, old: any): Promise<boolean> {
     await this._m.Lock()
     try {
-      if (!this._data.has(key) || this._data.get(key) !== old) {
+      const entry = this.findEntry(key)
+      if (!entry.found || !comparableEqual(entry.value, old)) {
         return false
       }
-      this._data.delete(key)
+      this._data.delete(entry.key)
       return true
     } finally {
       this._m.Unlock()
@@ -356,10 +362,11 @@ export class Map {
 
   // CompareAndSwap swaps the old and new values for key if the stored value is old.
   public CompareAndSwap(key: any, old: any, value: any): boolean {
-    if (!this._data.has(key) || this._data.get(key) !== old) {
+    const entry = this.findEntry(key)
+    if (!entry.found || !comparableEqual(entry.value, old)) {
       return false
     }
-    this._data.set(key, value)
+    this._data.set(entry.key, value)
     return true
   }
 
@@ -367,8 +374,8 @@ export class Map {
   public async Load(key: any): Promise<[any, boolean]> {
     await this._m.RLock()
     try {
-      const value = this._data.get(key)
-      return [value, this._data.has(key)]
+      const entry = this.findEntry(key)
+      return entry.found ? [entry.value, true] : [undefined, false]
     } finally {
       this._m.RUnlock()
     }
@@ -378,10 +385,12 @@ export class Map {
   public async LoadAndDelete(key: any): Promise<[any, boolean]> {
     await this._m.Lock()
     try {
-      const value = this._data.get(key)
-      const loaded = this._data.has(key)
-      this._data.delete(key)
-      return [value, loaded]
+      const entry = this.findEntry(key)
+      if (!entry.found) {
+        return [undefined, false]
+      }
+      this._data.delete(entry.key)
+      return [entry.value, true]
     } finally {
       this._m.Unlock()
     }
@@ -391,8 +400,9 @@ export class Map {
   public async LoadOrStore(key: any, value: any): Promise<[any, boolean]> {
     await this._m.Lock()
     try {
-      if (this._data.has(key)) {
-        return [this._data.get(key), true]
+      const entry = this.findEntry(key)
+      if (entry.found) {
+        return [entry.value, true]
       }
       this._data.set(key, value)
       return [value, false]
@@ -423,12 +433,27 @@ export class Map {
   public async Store(key: any, value: any): Promise<void> {
     await this._m.Lock()
     try {
-      this._data.set(key, value)
+      const entry = this.findEntry(key)
+      this._data.set(entry.found ? entry.key : key, value)
     } finally {
       this._m.Unlock()
     }
   }
 
+  private findEntry(
+    key: any,
+  ): { found: false } | { found: true; key: any; value: any } {
+    if (this._data.has(key)) {
+      return { found: true, key, value: this._data.get(key) }
+    }
+    for (const [candidate, value] of this._data.entries()) {
+      if (candidate !== key && comparableEqual(candidate, key)) {
+        return { found: true, key: candidate, value }
+      }
+    }
+    return { found: false }
+  }
+
   // Swap swaps the value for a key and returns the previous value if any
   public async Swap(key: any, value: any): Promise<[any, boolean]> {
     await this._m.Lock()
@@ -458,12 +483,12 @@ export class Pool {
   }
 
   // Get selects an arbitrary item from the Pool, removes it from the Pool, and returns it to the caller
-  public Get(): any {
+  public async Get(): Promise<any> {
     if (this._pool.length > 0) {
       return this._pool.pop()
     }
     if (this.New) {
-      return this.New()
+      return await this.New()
     }
     return null
   }

package/gs/syscall/js/index.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, test } from 'vitest'
+
+import * as $ from '@goscript/builtin/index.js'
+
+import { ValueOf } from './index.js'
+
+describe('syscall/js override', () => {
+  test('ValueOf unwraps generated interface numeric boxes', () => {
+    const value = ValueOf(
+      $.namedValueInterfaceValue(41, 'int', {}, {
+        kind: $.TypeKind.Basic,
+        name: 'int',
+      }),
+    )
+
+    expect(value.Int()).toBe(41)
+  })
+})

package/gs/syscall/js/index.ts

@@ -365,6 +365,9 @@ export function ValueOf(x: unknown): Value {
   if (x instanceof Func) {
     return x.Value.clone()
   }
+  if (isGoInterfaceValue(x)) {
+    return ValueOf(x.__goValue)
+  }
   if (x === null || x === undefined) {
     return Null()
   }
@@ -394,6 +397,15 @@ export function ValueOf(x: unknown): Value {
   return new Value({ raw: x })
 }
 
+function isGoInterfaceValue(value: unknown): value is { __goValue: unknown } {
+  return (
+    value !== null &&
+    typeof value === 'object' &&
+    '__goValue' in value &&
+    typeof (value as { __goType?: unknown }).__goType === 'string'
+  )
+}
+
 export function FuncOf(
   fn: (this$: Value, args: $.Slice<Value>) => unknown,
 ): Func {

package/gs/testing/testing.test.ts

@@ -1,4 +1,6 @@
 import { describe, expect, it } from 'vitest'
+import { existsSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
 
 import { B, F, Short, T, type TB } from './testing.js'
 import { runTests } from './testing.js'
@@ -101,7 +103,9 @@ describe('testing.T', () => {
 
     t.Cleanup(null)
 
-    await expect(t.runCleanups()).rejects.toThrow('testing: nil cleanup function')
+    await expect(t.runCleanups()).rejects.toThrow(
+      'testing: nil cleanup function',
+    )
   })
 
   it('returns a non-nil context', () => {
@@ -110,6 +114,21 @@ describe('testing.T', () => {
     expect(t.Context()).not.toBeNull()
   })
 
+  it('creates unique TempDir paths and removes them during cleanup', async () => {
+    const t = new T('root')
+
+    const first = t.TempDir()
+    const second = t.TempDir()
+    expect(first).not.toBe(second)
+    writeFileSync(join(first, 'marker.txt'), 'marker')
+    expect(existsSync(first)).toBe(true)
+
+    await t.runCleanups()
+
+    expect(existsSync(first)).toBe(false)
+    expect(existsSync(second)).toBe(false)
+  })
+
   it('formats common testing printf verbs', () => {
     const t = new T('root')
     const messages: string[] = []
@@ -118,13 +137,23 @@ describe('testing.T', () => {
       messages.push(String(message))
     }
     try {
-      t.Logf('quoted=%q value=%#v plus=%+v number=%d string=%s plain=%v', 'key', 7, { ok: true }, 3, 'ok', true)
+      t.Logf(
+        'quoted=%q value=%#v plus=%+v number=%d string=%s plain=%v',
+        'key',
+        7,
+        { ok: true },
+        3,
+        'ok',
+        true,
+      )
       t.flushLogs()
     } finally {
       console.log = originalLog
     }
 
-    expect(messages).toEqual(['    quoted="key" value=7 plus=[object Object] number=3 string=ok plain=true'])
+    expect(messages).toEqual([
+      '    quoted="key" value=7 plus=[object Object] number=3 string=ok plain=true',
+    ])
   })
 
   it('formats Go-style error objects with Error methods', () => {

package/gs/testing/testing.ts

@@ -1,4 +1,4 @@
-import { mkdirSync } from 'node:fs'
+import * as nodeFS from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
@@ -153,20 +153,23 @@ export class T {
   }
 
   public TempDir(): string {
-    const path = join(
-      tmpdir(),
-      'goscript-test-' +
-        this.testName.replace(/[^A-Za-z0-9_.-]/g, '_') +
-        '-' +
-        String(this.tempDirs.length),
+    const path = (nodeFS as any).mkdtempSync(
+      join(
+        tmpdir(),
+        'goscript-test-' +
+          this.testName.replace(/[^A-Za-z0-9_.-]/g, '_') +
+          '-' +
+          String(this.tempDirs.length),
+      ) + '-',
     )
-    mkdirSync(path, { recursive: true })
     this.tempDirs.push(path)
+    this.Cleanup(() => {
+      ;(nodeFS as any).rmSync(path, { force: true, recursive: true })
+    })
     return path
   }
 
-  public Parallel(): void {
-  }
+  public Parallel(): void {}
 
   public Setenv(key: string, value: string): void {
     const proc = (globalThis as any).process as

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "goscript",
   "description": "Go to TypeScript transpiler",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "author": {
     "name": "Aperture Robotics LLC.",
     "email": "support@aperture.us",