goscript 0.2.6 → 0.2.7

package/compiler/config.go

@@ -14,6 +14,8 @@ type Config struct {
 	Dir string
 	// OutputPath is the output path root.
 	OutputPath string
+	// CacheRoot is the explicit compiler cache root. Empty disables caching.
+	CacheRoot string
 	// BuildFlags are the Go build flags to use during package loading.
 	BuildFlags []string
 	// OverrideDirs are additional GoScript override roots.

package/compiler/index.test.ts

@@ -1,4 +1,4 @@
-import { mkdtemp, mkdir, readFile, writeFile } from 'node:fs/promises'
+import { mkdtemp, mkdir, readFile, readdir, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { describe, it, expect } from 'vitest'
@@ -79,4 +79,29 @@ describe('GoScript Compiler API', () => {
       stderr: expect.stringContaining('example.test/apiblock -> example.test/apiblock/dep'),
     })
   }, 30000)
+
+  it('forwards the compiler cache root to the CLI adapter', async () => {
+    const dir = await mkdtemp(join(tmpdir(), 'goscript-api-cache-'))
+    const output = join(dir, 'output')
+    const cacheRoot = join(dir, 'cache')
+    await mkdir(dir, { recursive: true })
+    await writeFile(join(dir, 'go.mod'), 'module example.test/apicache\n\ngo 1.25.3\n')
+    await writeFile(join(dir, 'main.go'), [
+      'package apicache',
+      'const Value = 1',
+      '',
+    ].join('\n'))
+
+    await compile({
+      pkg: '.',
+      output,
+      dir,
+      compilerCacheRoot: cacheRoot,
+    })
+
+    const generated = await readFile(join(output, '@goscript', 'example.test', 'apicache', 'main.gs.ts'), 'utf8')
+    expect(generated).toContain('Value: number = 1')
+    const cacheRootEntries = await readdir(join(cacheRoot, 'goscript-package-artifact-v1', 'entries'))
+    expect(cacheRootEntries.length).toBeGreaterThan(0)
+  }, 30000)
 })

package/compiler/index.ts

@@ -19,6 +19,8 @@ export interface CompileConfig {
   output?: string
   /** The working directory for the compiler. Defaults to the current working directory. */
   dir?: string
+  /** Explicit compiler package artifact cache root. Defaults to disabled. */
+  compilerCacheRoot?: string
   /** Compile all transitive dependencies of the requested package. */
   allDependencies?: boolean
   /** Go import paths to reject from the compiled package graph. */
@@ -49,6 +51,9 @@ export async function compile(config: CompileConfig): Promise<void> {
   if (config.allDependencies) {
     args.push('--all-dependencies')
   }
+  if (config.compilerCacheRoot) {
+    args.push('--compiler-cache-root', path.resolve(config.compilerCacheRoot))
+  }
   const packageBlocklist = normalizePackageBlocklist(config.packageBlocklist)
   if (packageBlocklist) {
     args.push('--package-blocklist', packageBlocklist)

package/compiler/lowered-program.go

@@ -2,7 +2,8 @@ package compiler
 
 // LoweredProgram is the compiler-owned IR consumed by TypeScript emission.
 type LoweredProgram struct {
-	packages []*loweredPackage
+	packages     []*loweredPackage
+	trimTypeInfo bool
 }
 
 type loweredPackage struct {
@@ -87,25 +88,31 @@ type loweredStructField struct {
 }
 
 type loweredFunction struct {
-	exported         bool
-	indexExported    bool
-	init             bool
-	async            bool
-	sourcePath       string
-	name             string
-	typeParams       []string
-	runtimeName      string
-	runtimeSignature string
-	receiverAlias    string
-	receiverType     string
-	receiverValue    string
-	receiverMutable  bool
-	params           []loweredParam
-	paramBindings    []loweredStmt
-	namedResults     []loweredNamedResult
-	result           string
-	body             []loweredStmt
-	deferState       *loweredDeferState
+	exported                bool
+	indexExported           bool
+	init                    bool
+	async                   bool
+	sourcePath              string
+	name                    string
+	typeParams              []string
+	runtimeName             string
+	runtimeSignature        string
+	runtimeTrimmedSignature string
+	receiverAlias           string
+	receiverType            string
+	receiverValue           string
+	receiverMutable         bool
+	params                  []loweredParam
+	paramBindings           []loweredStmt
+	namedResults            []loweredNamedResult
+	result                  string
+	body                    []loweredStmt
+	deferState              *loweredDeferState
+	// recoverReturn is the return statement emitted after a deferred recover()
+	// swallows a panic in a defer+recover function: the named results, the zero
+	// values for unnamed results, or empty for a void function. Only used when
+	// deferState.recover is set.
+	recoverReturn string
 }
 
 type loweredParam struct {
@@ -150,6 +157,10 @@ type loweredRangeBranch struct {
 type loweredDeferState struct {
 	used  bool
 	async bool
+	// recover is set when the function both registers a defer and lexically
+	// contains a recover() call, so it must emit the panic-aware try/catch shape
+	// that lets a deferred recover() stop an unwinding panic.
+	recover bool
 }
 
 type loweredSwitch struct {