goscript 0.0.59 → 0.0.60

package/compiler/analysis.go

@@ -2,7 +2,6 @@ package compiler
 
 import (
 	"encoding/json"
-	"fmt"
 	"go/ast"
 	"go/token"
 	"go/types"
@@ -1472,6 +1471,14 @@ func (a *Analysis) loadGsMetadata(metaFilePath string) *GsMetadata {
 	return &metadata
 }
 
+// isHandwrittenPackage checks if a package path corresponds to a handwritten package in gs/
+func (a *Analysis) isHandwrittenPackage(pkgPath string) bool {
+	// Check if the package exists in the embedded gs/ directory
+	metaFilePath := filepath.Join("gs", pkgPath, "meta.json")
+	_, err := goscript.GsOverrides.ReadFile(metaFilePath)
+	return err == nil
+}
+
 // IsMethodAsync checks if a method call is async based on package metadata
 func (a *Analysis) IsMethodAsync(pkgPath, typeName, methodName string) bool {
 	// First, check pre-computed method async status
@@ -2246,13 +2253,49 @@ func (v *analysisVisitor) analyzeAllMethodsAsync() {
 	// Initialize visitingMethods map
 	v.visitingMethods = make(map[MethodKey]bool)
 
-	// Analyze methods in current package
-	v.analyzePackageMethodsAsync(v.pkg)
+	// Fixed-point iteration: keep analyzing until nothing changes
+	// This handles cases where method A calls method B, but B is analyzed after A
+	maxIterations := 10
+	for iteration := 0; iteration < maxIterations; iteration++ {
+		// Clear visitingMethods map for this iteration
+		v.visitingMethods = make(map[MethodKey]bool)
 
-	// Analyze methods in all dependency packages
-	for _, pkg := range v.analysis.AllPackages {
-		if pkg != v.pkg {
-			v.analyzePackageMethodsAsync(pkg)
+		// Track if anything changed in this iteration
+		changed := false
+
+		// Save previous state
+		previousState := make(map[MethodKey]bool)
+		for k, v := range v.analysis.MethodAsyncStatus {
+			previousState[k] = v
+		}
+
+		// Re-analyze methods in current package
+		v.analyzePackageMethodsAsync(v.pkg)
+
+		// Re-analyze methods in all dependency packages
+		for _, pkg := range v.analysis.AllPackages {
+			if pkg != v.pkg {
+				v.analyzePackageMethodsAsync(pkg)
+			}
+		}
+
+		// Check if anything changed
+		for k, newValue := range v.analysis.MethodAsyncStatus {
+			oldValue, existed := previousState[k]
+			if !existed {
+				// New method added - check if it's async (if sync, no need to re-analyze dependents)
+				if newValue {
+					changed = true
+				}
+			} else if oldValue != newValue {
+				// Method changed from sync to async (or vice versa)
+				changed = true
+			}
+		}
+
+		// If nothing changed, we've reached a fixed point
+		if !changed {
+			break
 		}
 	}
 
@@ -2311,11 +2354,6 @@ func (v *analysisVisitor) analyzeFunctionLiteralAsync(funcLit *ast.FuncLit, pkg
 func (v *analysisVisitor) analyzeMethodAsync(funcDecl *ast.FuncDecl, pkg *packages.Package) {
 	methodKey := v.getMethodKey(funcDecl, pkg)
 
-	// Check if already analyzed
-	if _, exists := v.analysis.MethodAsyncStatus[methodKey]; exists {
-		return
-	}
-
 	// Check for cycles
 	if v.visitingMethods[methodKey] {
 		// Cycle detected, assume sync to break recursion
@@ -2329,17 +2367,32 @@ func (v *analysisVisitor) analyzeMethodAsync(funcDecl *ast.FuncDecl, pkg *packag
 	// Determine if method is async
 	isAsync := false
 
-	// Determine if this is a truly external package vs a package being compiled locally
-	isExternalPackage := pkg.Types != v.pkg.Types && v.analysis.AllPackages[pkg.Types.Path()] == nil
+	// Determine if this is a handwritten package (from gs/ directory)
+	// Handwritten packages should not have their bodies analyzed
+	isHandwrittenPackage := v.analysis.isHandwrittenPackage(methodKey.PackagePath)
 
-	if isExternalPackage {
-		// Truly external package: check metadata first
-		isAsync = v.checkExternalMethodMetadata(methodKey.PackagePath, methodKey.ReceiverType, methodKey.MethodName)
-	}
-	// If not determined async yet and body exists, analyze it
-	if !isAsync && funcDecl.Body != nil {
+	if isHandwrittenPackage {
+		// For handwritten packages, check if we have pre-loaded metadata
+		metadataKey := MethodKey{
+			PackagePath:  methodKey.PackagePath,
+			ReceiverType: methodKey.ReceiverType,
+			MethodName:   methodKey.MethodName,
+		}
+		metadataIsAsync, hasMetadata := v.analysis.MethodAsyncStatus[metadataKey]
+
+		if hasMetadata {
+			// Use explicit metadata from handwritten packages (gs/)
+			isAsync = metadataIsAsync
+		} else {
+			// Handwritten package but no explicit metadata: assume sync
+			isAsync = false
+		}
+	} else if funcDecl.Body != nil {
+		// Not a handwritten package and has body: always analyze for async operations
+		// This allows fixed-point iteration to update results
 		isAsync = v.containsAsyncOperationsComplete(funcDecl.Body, pkg)
 	}
+	// Otherwise leave isAsync as false
 
 	// Store result in MethodAsyncStatus
 	v.analysis.MethodAsyncStatus[methodKey] = isAsync
@@ -2417,16 +2470,8 @@ func (v *analysisVisitor) containsAsyncOperationsComplete(node ast.Node, pkg *pa
 
 		case *ast.CallExpr:
 			// Check if we're calling a function known to be async
-			isCallAsyncResult := v.isCallAsync(s, pkg)
-			if isCallAsyncResult {
+			if v.isCallAsync(s, pkg) {
 				hasAsync = true
-				callName := ""
-				if ident, ok := s.Fun.(*ast.Ident); ok {
-					callName = ident.Name
-				} else if sel, ok := s.Fun.(*ast.SelectorExpr); ok {
-					callName = sel.Sel.Name
-				}
-				asyncReasons = append(asyncReasons, fmt.Sprintf("async call: %s", callName))
 				return false
 			}
 		}

package/go.mod

@@ -3,18 +3,18 @@ module github.com/aperturerobotics/goscript
 go 1.25.3
 
 require (
-	github.com/aperturerobotics/cli v1.0.0
+	github.com/aperturerobotics/cli v1.0.1
 	github.com/aperturerobotics/protobuf-go-lite v0.11.0
-	github.com/aperturerobotics/util v1.31.3
+	github.com/aperturerobotics/util v1.31.4
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 	golang.org/x/tools v0.38.0
 )
 
 require (
-	github.com/aperturerobotics/common v0.22.10 // indirect
+	github.com/aperturerobotics/common v0.22.12 // indirect
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 // indirect
-	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	golang.org/x/mod v0.29.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect

package/go.sum

@@ -1,13 +1,19 @@
 github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
 github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
+github.com/aperturerobotics/cli v1.0.1 h1:9KsECHGESJ/iGU13Z4zNQzKFz5bMave4bA6lPXGjtOU=
+github.com/aperturerobotics/cli v1.0.1/go.mod h1:s1Gh4eTOGGlrPqpyi/q8aIQwk0T6yDCF7C2xPyBMtek=
 github.com/aperturerobotics/common v0.22.10 h1:XFfXq9NGrirjW6rtqq525qiY1IN+1siGBZwIsvBJGfQ=
 github.com/aperturerobotics/common v0.22.10/go.mod h1:xMXHNN6oCvG0FfG1tY6+2Si7iWh1QfSSCSrqohFUeIk=
+github.com/aperturerobotics/common v0.22.12 h1:uSo+fDQg6xCoNI34Y7gueW1cW9Cy4d/2FQb/T006LZQ=
+github.com/aperturerobotics/common v0.22.12/go.mod h1:xMXHNN6oCvG0FfG1tY6+2Si7iWh1QfSSCSrqohFUeIk=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 h1:So9JeziaWKx2Fw8sK4AUN/szqKtJ0jEMhS6bU4sHbxs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008/go.mod h1:snaApCEDtrHHP6UWSLKiYNOZU9A5NyzccKenx9oZEzg=
 github.com/aperturerobotics/protobuf-go-lite v0.11.0 h1:IAaZISqrEpodqECYxk0yKWgROEbZtMhs7bErP+Zma9o=
 github.com/aperturerobotics/protobuf-go-lite v0.11.0/go.mod h1:c4kGy7Dkfz6B1m0t4QBIMQoNeQ7m+nYj3Qxxnlwhygo=
 github.com/aperturerobotics/util v1.31.3 h1:3irvlwlwwvOl4jD2lHg/N8bBp9B/3kx9Ec4qlJxQKEU=
 github.com/aperturerobotics/util v1.31.3/go.mod h1:G5yKUDojt6uzVvs7kGByey0lBfKdDg4O4jXmdkSqO6Y=
+github.com/aperturerobotics/util v1.31.4 h1:2F4j5CML/Hb4dQT1E1pjkZd3AdJhsAQiaRCR9pD/dwo=
+github.com/aperturerobotics/util v1.31.4/go.mod h1:qfeWUnkC60QpjxH4yocO6Q/No+J1E488yzuconPgF8c=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -25,6 +31,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
+github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
 golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=

package/package.json

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