goscript 0.0.32 → 0.0.34

package/dist/gs/maps/maps.gs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"maps.gs.js","sourceRoot":"","sources":["../../../gs/maps/maps.gs.ts"],"names":[],"mappings":"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"}

package/dist/gs/slices/slices.d.ts

@@ -6,3 +6,9 @@ import * as $ from '@goscript/builtin/builtin.js';
  * @returns An iterator function that yields index-value pairs
  */
 export declare function All<T>(s: $.Slice<T>): (yieldFunc: (index: number, value: T) => boolean) => void;
+/**
+ * Sort sorts a slice in ascending order.
+ * This is equivalent to Go's slices.Sort function.
+ * @param s The slice to sort in place
+ */
+export declare function Sort<T extends string | number>(s: $.Slice<T>): void;

package/dist/gs/slices/slices.js

@@ -17,4 +17,12 @@ export function All(s) {
         }
     };
 }
+/**
+ * Sort sorts a slice in ascending order.
+ * This is equivalent to Go's slices.Sort function.
+ * @param s The slice to sort in place
+ */
+export function Sort(s) {
+    $.sortSlice(s);
+}
 //# sourceMappingURL=slices.js.map

package/dist/gs/slices/slices.js.map

@@ -1 +1 @@
-{"version":3,"file":"slices.js","sourceRoot":"","sources":["../../../gs/slices/slices.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,OAAO,KAAK,CAAC,MAAM,8BAA8B,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CACjB,CAAa;IAEb,OAAO,UAAU,MAA4C;QAC3D,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,KAAK,GAAI,CAAS,CAAC,CAAC,CAAM,CAAA,CAAC,2CAA2C;YAC5E,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"slices.js","sourceRoot":"","sources":["../../../gs/slices/slices.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,OAAO,KAAK,CAAC,MAAM,8BAA8B,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CACjB,CAAa;IAEb,OAAO,UAAU,MAA4C;QAC3D,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,KAAK,GAAI,CAAS,CAAC,CAAC,CAAM,CAAA,CAAC,2CAA2C;YAC5E,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,IAAI,CAA4B,CAAa;IAC3D,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC"}

package/gs/builtin/builtin.ts

@@ -6,6 +6,10 @@ export * from './map.js'
 export * from './slice.js'
 export * from './type.js'
 
+// Bytes represents all valid []byte representations in TypeScript
+// This includes Uint8Array (the preferred representation) and $.Slice<number> (which includes null)
+export type Bytes = Uint8Array | import('./slice.js').Slice<number>
+
 // int converts a value to a Go int type, handling proper signed integer conversion
 // This ensures that values like 2147483648 (2^31) are properly handled according to Go semantics
 export function int(value: number): number {
@@ -169,3 +173,37 @@ export function normalizeBytes(
 
   throw new Error(`Cannot normalize bytes of type ${typeof bytes}: ${bytes}`)
 }
+
+/**
+ * sortSlice sorts a slice in ascending order.
+ * Handles all slice types including null, arrays, Uint8Array, and SliceProxy.
+ * @param s The slice to sort in place
+ */
+export function sortSlice<T extends string | number>(s: import('./slice.js').Slice<T>): void {
+  if (s === null || s === undefined) {
+    return // Nothing to sort for nil slice
+  }
+  
+  if (Array.isArray(s)) {
+    s.sort()
+    return
+  }
+  
+  if (s instanceof Uint8Array) {
+    s.sort()
+    return
+  }
+  
+  // Handle SliceProxy case - sort the backing array in-place within the slice bounds
+  if (s && typeof s === 'object' && '__meta__' in s) {
+    const proxy = s as import('./slice.js').SliceProxy<T>
+    const meta = proxy.__meta__
+    const section = meta.backing.slice(meta.offset, meta.offset + meta.length)
+    section.sort()
+    // Copy sorted section back to the backing array
+    for (let i = 0; i < section.length; i++) {
+      meta.backing[meta.offset + i] = section[i]
+    }
+    return
+  }
+}

package/gs/builtin/map.ts

@@ -6,18 +6,19 @@ export const makeMap = <K, V>(): Map<K, V> => {
   return new Map<K, V>()
 }
 /**
- * Gets a value from a map, with a default value if the key doesn't exist.
+ * Gets a value from a map, returning a tuple [value, exists].
  * @param map The map to get from.
  * @param key The key to get.
- * @param defaultValue The default value to return if the key doesn't exist (defaults to 0).
- * @returns The value for the key, or the default value if the key doesn't exist.
+ * @param defaultValue The default value to return if the key doesn't exist.
+ * @returns A tuple [value, exists] where value is the map value or defaultValue, and exists is whether the key was found.
  */
-export const mapGet = <K, V>(
-  map: Map<K, V>,
-  key: K,
-  defaultValue: V | null = null,
-): V | null => {
-  return map.has(key) ? map.get(key)! : defaultValue
+export function mapGet<K, V, D>(map: Map<K, V>, key: K, defaultValue: D): [V, true] | [D, false] {
+  const exists = map.has(key)
+  if (exists) {
+    return [map.get(key)!, true]
+  } else {
+    return [defaultValue, false]
+  }
 }
 
 /**

package/gs/builtin/slice.ts

@@ -910,8 +910,7 @@ export const sliceString = (
     // Attempt to decode with strict UTF-8 validation
     const result = new TextDecoder('utf-8', { fatal: true }).decode(slicedBytes)
     return result
-  } catch (_e) {
-    //eslint-disable-line @typescript-eslint/no-unused-vars
+  } catch (_e) { //eslint-disable-line @typescript-eslint/no-unused-vars
     // If we get here, the slice would create invalid UTF-8
     // This is a fundamental limitation of JavaScript string handling
     throw new Error(
@@ -975,20 +974,20 @@ export function genericBytesOrStringToString(
 }
 
 /**
- * Indexes into a value that could be either a string or Uint8Array.
+ * Indexes into a value that could be either a string or bytes.
  * Used for generic type parameters with constraint string | []byte.
  * Both cases return a byte value (number).
- * @param value Value that is either a string or Uint8Array
+ * @param value Value that is either a string or bytes (Uint8Array or Slice<number>)
  * @param index The index to access
  * @returns The byte value at the specified index
  */
 export function indexStringOrBytes(
-  value: string | Uint8Array,
+  value: string | import('./builtin.js').Bytes,
   index: number,
 ): number {
   if (typeof value === 'string') {
     return indexString(value, index)
-  } else {
+  } else if (value instanceof Uint8Array) {
     // For Uint8Array, direct access returns the byte value
     if (index < 0 || index >= value.length) {
       throw new Error(
@@ -996,19 +995,32 @@ export function indexStringOrBytes(
       )
     }
     return value[index]
+  } else if (value === null) {
+    throw new Error(
+      `runtime error: index out of range [${index}] with length 0`,
+    )
+  } else {
+    // For Slice<number> (including SliceProxy)
+    const length = len(value)
+    if (index < 0 || index >= length) {
+      throw new Error(
+        `runtime error: index out of range [${index}] with length ${length}`,
+      )
+    }
+    return (value as any)[index] as number
   }
 }
 
 /**
- * Slices a value that could be either a string or Uint8Array.
+ * Slices a value that could be either a string or bytes.
  * Used for generic type parameters with constraint string | []byte.
- * @param value Value that is either a string or Uint8Array
+ * @param value Value that is either a string or bytes (Uint8Array or Slice<number>)
  * @param low Starting index (inclusive). Defaults to 0.
  * @param high Ending index (exclusive). Defaults to length.
- * @param max Capacity limit (only used for Uint8Array, ignored for strings)
+ * @param max Capacity limit (only used for bytes, ignored for strings)
  * @returns The sliced value of the same type as input
  */
-export function sliceStringOrBytes<T extends string | Uint8Array>(
+export function sliceStringOrBytes<T extends string | import('./builtin.js').Bytes>(
   value: T,
   low?: number,
   high?: number,
@@ -1018,7 +1030,7 @@ export function sliceStringOrBytes<T extends string | Uint8Array>(
     // For strings, use sliceString and ignore max parameter
     return sliceString(value, low, high) as T
   } else {
-    // For Uint8Array, use goSlice
+    // For bytes (Uint8Array or Slice<number>), use goSlice
     return goSlice(value as Slice<number>, low, high, max) as T
   }
 }

package/gs/maps/index.ts

@@ -0,0 +1,2 @@
+export { All, Collect, Insert, Keys, Values } from "./iter.gs.js"
+export { Clone, Copy, DeleteFunc, Equal, EqualFunc } from "./maps.gs.js"

package/gs/maps/iter.gs.ts

@@ -0,0 +1,71 @@
+import * as $ from "@goscript/builtin/builtin.js";
+
+import * as iter from "@goscript/iter/index.js"
+
+// All returns an iterator over key-value pairs from m.
+// The iteration order is not specified and is not guaranteed
+// to be the same from one call to the next.
+export function All<K extends $.Comparable, V>(m: Map<K, V>): iter.Seq2<K, V> {
+	return (_yield: ((p0: K, p1: V) => boolean) | null): void => {
+		for (const [k, v] of m.entries()) {
+			{
+				if (!_yield!(k, v)) {
+					return 
+				}
+			}
+		}
+	}
+}
+
+// Keys returns an iterator over keys in m.
+// The iteration order is not specified and is not guaranteed
+// to be the same from one call to the next.
+export function Keys<K extends $.Comparable, V>(m: Map<K, V>): iter.Seq<K> {
+	return (_yield: ((p0: K) => boolean) | null): void => {
+		for (const [k, _v] of m.entries()) {
+			{
+				if (!_yield!(k)) {
+					return 
+				}
+			}
+		}
+	}
+}
+
+// Values returns an iterator over values in m.
+// The iteration order is not specified and is not guaranteed
+// to be the same from one call to the next.
+export function Values<K extends $.Comparable, V>(m: Map<K, V>): iter.Seq<V> {
+	return (_yield: ((p0: V) => boolean) | null): void => {
+		for (const [_k, v] of m.entries()) {
+			{
+				if (!_yield!(v)) {
+					return 
+				}
+			}
+		}
+	}
+}
+
+// Insert adds the key-value pairs from seq to m.
+// If a key in seq already exists in m, its value will be overwritten.
+export function Insert<K extends $.Comparable, V>(m: Map<K, V>, seq: iter.Seq2<K, V>): void {
+	;(() => {
+		let shouldContinue = true
+		seq!((k, v) => {
+			{
+				$.mapSet(m, k, v)
+			}
+			return shouldContinue
+		})
+	})()
+}
+
+// Collect collects key-value pairs from seq into a new map
+// and returns it.
+export function Collect<K extends $.Comparable, V extends any>(seq: iter.Seq2<K, V>): Map<K, V> {
+	let m = $.makeMap<K, V>()
+	Insert(m, seq)
+	return m
+}
+

package/gs/maps/maps.gs.ts

@@ -0,0 +1,87 @@
+import * as $ from "@goscript/builtin/builtin.js";
+
+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, V extends $.Comparable>(m1: Map<K, V>, m2: Map<K, V>): boolean {
+	if ($.len(m1) != $.len(m2)) {
+		return false
+	}
+	for (const [k, v1] of m1.entries()) {
+		{
+			{
+				let [v2, ok] = $.mapGet(m2, k, null as any)
+				if (!ok || v1 != v2) {
+					return false
+				}
+			}
+		}
+	}
+	return true
+}
+
+// EqualFunc is like Equal, but compares values using eq.
+// Keys are still compared with ==.
+export function EqualFunc<K extends $.Comparable, V1, V2>(m1: Map<K, V1>, m2: Map<K, V2>, eq: ((p0: V1, p1: V2) => boolean) | null): boolean {
+	if ($.len(m1) != $.len(m2)) {
+		return false
+	}
+	for (const [k, v1] of m1.entries()) {
+		{
+			{
+				let [v2, ok] = $.mapGet(m2, k, null as any)
+				if (!ok || !eq!(v1, v2)) {
+					return false
+				}
+			}
+		}
+	}
+	return true
+}
+
+// clone returns a shallow copy of the map.
+export function clone<K extends $.Comparable, V>(m: Map<K, V> | null): Map<K, V> | null {
+	if (m == null) {
+		return null
+	}
+	const result = $.makeMap<K, V>()
+	for (const [k, v] of m.entries()) {
+		$.mapSet(result, k, v)
+	}
+	return result
+}
+
+// Clone returns a copy of m.  This is a shallow clone:
+// the new keys and values are set using ordinary assignment.
+export function Clone<K extends $.Comparable, V>(m: Map<K, V>): Map<K, V> {
+	// Preserve nil in case it matters.
+	if (m == null) {
+		return null as unknown as Map<K, V>
+	}
+	return clone(m)!
+}
+
+// Copy copies all key/value pairs in src adding them to dst.
+// When a key in src is already present in dst,
+// the value in dst will be overwritten by the value associated
+// with the key in src.
+export function Copy<K extends $.Comparable, V>(dst: Map<K, V>, src: Map<K, V>): void {
+	for (const [k, v] of src.entries()) {
+		{
+			$.mapSet(dst, k, v)
+		}
+	}
+}
+
+// DeleteFunc deletes any key/value pairs from m for which del returns true.
+export function DeleteFunc<K extends $.Comparable, V>(m: Map<K, V>, del: ((p0: K, p1: V) => boolean) | null): void {
+	for (const [k, v] of m.entries()) {
+		{
+			if (del!(k, v)) {
+				$.deleteMapEntry(m, k)
+			}
+		}
+	}
+}
+

package/gs/slices/slices.ts

@@ -20,3 +20,12 @@ export function All<T>(
     }
   }
 }
+
+/**
+ * Sort sorts a slice in ascending order.
+ * This is equivalent to Go's slices.Sort function.
+ * @param s The slice to sort in place
+ */
+export function Sort<T extends string | number>(s: $.Slice<T>): void {
+  $.sortSlice(s)
+}

package/package.json

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