diff --git a/.changeset/update-typescript-go-adb2ab4.md b/.changeset/update-typescript-go-adb2ab4.md new file mode 100644 index 00000000..9c2117cf --- /dev/null +++ b/.changeset/update-typescript-go-adb2ab4.md @@ -0,0 +1,5 @@ +--- +"@effect/tsgo": patch +--- + +Update the TypeScript-Go submodule to include upstream declaration emit fixes. diff --git a/_patches/005-checker-types.patch b/_patches/005-checker-types.patch index b0f9ca69..d7c55406 100644 --- a/_patches/005-checker-types.patch +++ b/_patches/005-checker-types.patch @@ -2,7 +2,7 @@ diff --git a/internal/checker/types.go b/internal/checker/types.go index 000000001..000000002 100644 --- a/internal/checker/types.go +++ b/internal/checker/types.go -@@ -340,6 +340,13 @@ type AssertionLinks struct { +@@ -386,6 +386,13 @@ type AssertionLinks struct { // SourceFile links @@ -14,13 +14,13 @@ index 000000001..000000002 100644 +} + type SourceFileLinks struct { - typeChecked bool - unusedChecked bool -@@ -350,6 +357,7 @@ type SourceFileLinks struct { - localJsxFactory *ast.EntityName - localJsxFragmentFactory *ast.EntityName - jsxFragmentType *Type -+ relationErrors []*RelationError // Collected during type checking for Effect diagnostics + typeChecked bool + unusedChecked bool +@@ -396,6 +403,7 @@ type SourceFileLinks struct { + localJsxFactory *ast.EntityName + localJsxFragmentFactory *ast.EntityName + jsxFragmentType *Type ++ relationErrors []*RelationError // Collected during type checking for Effect diagnostics } // Signature specific links diff --git a/flake.nix b/flake.nix index 2850f11e..09641ebe 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ /* Source of truth: git submodule `typescript-go` commit. Keep in sync via `_tools/update-flake-vendor-hash.sh`. */ typescript-go-src = { - url = "github:microsoft/typescript-go/092b34f534182baf2875887c20ffed2177f14d92?submodules=1"; + url = "github:microsoft/typescript-go/adb2ab4ed7d7849bb222eb27c41437d5520335a9?submodules=1"; flake = false; }; /* Source of truth: typescript-go's `_submodules/TypeScript` commit. diff --git a/shim/ast/shim.go b/shim/ast/shim.go index 781e3faf..dd486664 100644 --- a/shim/ast/shim.go +++ b/shim/ast/shim.go @@ -1170,6 +1170,8 @@ func IsModuleWithStringLiteralName(node *ast.Node) bool func IsMultiplicativeOperator(kind ast.Kind) bool //go:linkname IsMultiplicativeOperatorOrHigher github.com/microsoft/typescript-go/internal/ast.IsMultiplicativeOperatorOrHigher func IsMultiplicativeOperatorOrHigher(kind ast.Kind) bool +//go:linkname IsNamedEvaluationSource github.com/microsoft/typescript-go/internal/ast.IsNamedEvaluationSource +func IsNamedEvaluationSource(node *ast.Node) bool //go:linkname IsNamedExports github.com/microsoft/typescript-go/internal/ast.IsNamedExports func IsNamedExports(node *ast.Node) bool //go:linkname IsNamedImports github.com/microsoft/typescript-go/internal/ast.IsNamedImports @@ -1294,6 +1296,8 @@ func IsPropertyName(node *ast.Node) bool func IsPropertyNameLiteral(node *ast.Node) bool //go:linkname IsPropertySignatureDeclaration github.com/microsoft/typescript-go/internal/ast.IsPropertySignatureDeclaration func IsPropertySignatureDeclaration(node *ast.Node) bool +//go:linkname IsProtoSetter github.com/microsoft/typescript-go/internal/ast.IsProtoSetter +func IsProtoSetter(node *ast.Node) bool //go:linkname IsPrototypeAccess github.com/microsoft/typescript-go/internal/ast.IsPrototypeAccess func IsPrototypeAccess(node *ast.Node) bool //go:linkname IsPseudoLiteralKind github.com/microsoft/typescript-go/internal/ast.IsPseudoLiteralKind diff --git a/shim/checker/shim.go b/shim/checker/shim.go index 47ce824c..0b14087c 100644 --- a/shim/checker/shim.go +++ b/shim/checker/shim.go @@ -497,6 +497,33 @@ const ExpandingFlagsTarget = checker.ExpandingFlagsTarget type ExportCollision = checker.ExportCollision type ExportCollisionTable = checker.ExportCollisionTable type ExportTypeLinks = checker.ExportTypeLinks +type ExternalEmitHelpers = checker.ExternalEmitHelpers +const ExternalEmitHelpersAddDisposableResourceAndDisposeResources = checker.ExternalEmitHelpersAddDisposableResourceAndDisposeResources +const ExternalEmitHelpersAsyncDelegator = checker.ExternalEmitHelpersAsyncDelegator +const ExternalEmitHelpersAsyncDelegatorIncludes = checker.ExternalEmitHelpersAsyncDelegatorIncludes +const ExternalEmitHelpersAsyncGenerator = checker.ExternalEmitHelpersAsyncGenerator +const ExternalEmitHelpersAsyncGeneratorIncludes = checker.ExternalEmitHelpersAsyncGeneratorIncludes +const ExternalEmitHelpersAsyncValues = checker.ExternalEmitHelpersAsyncValues +const ExternalEmitHelpersAwait = checker.ExternalEmitHelpersAwait +const ExternalEmitHelpersAwaiter = checker.ExternalEmitHelpersAwaiter +const ExternalEmitHelpersClassPrivateFieldGet = checker.ExternalEmitHelpersClassPrivateFieldGet +const ExternalEmitHelpersClassPrivateFieldIn = checker.ExternalEmitHelpersClassPrivateFieldIn +const ExternalEmitHelpersClassPrivateFieldSet = checker.ExternalEmitHelpersClassPrivateFieldSet +const ExternalEmitHelpersDecorate = checker.ExternalEmitHelpersDecorate +const ExternalEmitHelpersESDecorateAndRunInitializers = checker.ExternalEmitHelpersESDecorateAndRunInitializers +const ExternalEmitHelpersExportStar = checker.ExternalEmitHelpersExportStar +const ExternalEmitHelpersFirstEmitHelper = checker.ExternalEmitHelpersFirstEmitHelper +const ExternalEmitHelpersForAwaitOfIncludes = checker.ExternalEmitHelpersForAwaitOfIncludes +const ExternalEmitHelpersImportDefault = checker.ExternalEmitHelpersImportDefault +const ExternalEmitHelpersImportStar = checker.ExternalEmitHelpersImportStar +const ExternalEmitHelpersLastEmitHelper = checker.ExternalEmitHelpersLastEmitHelper +const ExternalEmitHelpersMakeTemplateObject = checker.ExternalEmitHelpersMakeTemplateObject +const ExternalEmitHelpersMetadata = checker.ExternalEmitHelpersMetadata +const ExternalEmitHelpersParam = checker.ExternalEmitHelpersParam +const ExternalEmitHelpersPropKey = checker.ExternalEmitHelpersPropKey +const ExternalEmitHelpersRest = checker.ExternalEmitHelpersRest +const ExternalEmitHelpersRewriteRelativeImportExtension = checker.ExternalEmitHelpersRewriteRelativeImportExtension +const ExternalEmitHelpersSetFunctionName = checker.ExternalEmitHelpersSetFunctionName type FeatureMapEntry = checker.FeatureMapEntry type FlowLoopInfo = checker.FlowLoopInfo type FlowLoopKey = checker.FlowLoopKey diff --git a/typescript-go b/typescript-go index 092b34f5..adb2ab4e 160000 --- a/typescript-go +++ b/typescript-go @@ -1 +1 @@ -Subproject commit 092b34f534182baf2875887c20ffed2177f14d92 +Subproject commit adb2ab4ed7d7849bb222eb27c41437d5520335a9