From bc94d20605466d8afa85fb4d56b34def684b375b Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Mon, 16 Nov 2026 12:19:07 -0500 Subject: [PATCH 1/2] chore: avoid using lib imports --- features/data_converter/binary/feature.ts | 2 +- .../binary_protobuf/binary_protobuf_converter.ts | 2 +- features/data_converter/codec/feature.ts | 2 +- features/data_converter/empty/feature.ts | 2 +- features/data_converter/json_protobuf/feature.ts | 4 ++-- .../data_converter/json_protobuf/json_protobuf_converter.ts | 2 +- features/serialization_context/sercontext/sercontext.ts | 2 +- harness/ts/main.ts | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features/data_converter/binary/feature.ts b/features/data_converter/binary/feature.ts index cdd02a15..3438f832 100644 --- a/features/data_converter/binary/feature.ts +++ b/features/data_converter/binary/feature.ts @@ -1,5 +1,5 @@ import * as assert from 'assert'; -import { JSONToPayload } from '@temporalio/common/lib/proto-utils'; +import { JSONToPayload } from '@temporalio/common/proto-utils'; import { Feature } from '@temporalio/harness'; import expectedPayload from './payload.json'; diff --git a/features/data_converter/binary_protobuf/binary_protobuf_converter.ts b/features/data_converter/binary_protobuf/binary_protobuf_converter.ts index c4939822..923b7bed 100644 --- a/features/data_converter/binary_protobuf/binary_protobuf_converter.ts +++ b/features/data_converter/binary_protobuf/binary_protobuf_converter.ts @@ -2,7 +2,7 @@ import * as proto from '@temporalio/proto'; import { DefaultPayloadConverterWithProtobufsOptions, ProtobufBinaryPayloadConverter, -} from '@temporalio/common/lib/protobufs'; +} from '@temporalio/common/protobufs'; import { CompositePayloadConverter } from '@temporalio/common'; diff --git a/features/data_converter/codec/feature.ts b/features/data_converter/codec/feature.ts index 1b8c1427..5621e994 100644 --- a/features/data_converter/codec/feature.ts +++ b/features/data_converter/codec/feature.ts @@ -2,7 +2,7 @@ import * as assert from 'assert'; import { Feature } from '@temporalio/harness'; import { METADATA_ENCODING_KEY, Payload, PayloadCodec, ValueError } from '@temporalio/common'; import * as proto from '@temporalio/proto'; -import { decode, encode } from '@temporalio/common/lib/encoding'; +import { decode, encode } from '@temporalio/common/encoding'; const toBase64 = (inArray: Uint8Array): Uint8Array => { const buf = Buffer.from(inArray); diff --git a/features/data_converter/empty/feature.ts b/features/data_converter/empty/feature.ts index 25bd3054..a53c7eac 100644 --- a/features/data_converter/empty/feature.ts +++ b/features/data_converter/empty/feature.ts @@ -1,5 +1,5 @@ import * as assert from 'assert'; -import { JSONToPayload } from '@temporalio/common/lib/proto-utils'; +import { JSONToPayload } from '@temporalio/common/proto-utils'; import { Feature } from '@temporalio/harness'; import { ApplicationFailure } from '@temporalio/common'; import * as wf from '@temporalio/workflow'; diff --git a/features/data_converter/json_protobuf/feature.ts b/features/data_converter/json_protobuf/feature.ts index 8c2a53d1..377ffdf8 100644 --- a/features/data_converter/json_protobuf/feature.ts +++ b/features/data_converter/json_protobuf/feature.ts @@ -2,8 +2,8 @@ import * as assert from 'assert'; import * as protojson from 'protobufjs/ext/protojson'; import { Feature } from '@temporalio/harness'; import * as proto from '@temporalio/proto'; -import { patchProtobufRoot } from '@temporalio/proto/lib/patch-protobuf-root'; -import { decode } from '@temporalio/common/lib/encoding'; +import { patchProtobufRoot } from '@temporalio/common/protobufs'; +import { decode } from '@temporalio/common/encoding'; // Cast to `any` because the generated proto module types are missing the `lookupType` method const patched = patchProtobufRoot(proto) as any; diff --git a/features/data_converter/json_protobuf/json_protobuf_converter.ts b/features/data_converter/json_protobuf/json_protobuf_converter.ts index 6419ab77..7f3d4548 100644 --- a/features/data_converter/json_protobuf/json_protobuf_converter.ts +++ b/features/data_converter/json_protobuf/json_protobuf_converter.ts @@ -2,7 +2,7 @@ import * as proto from '@temporalio/proto'; import { DefaultPayloadConverterWithProtobufsOptions, ProtobufJsonPayloadConverter, -} from '@temporalio/common/lib/protobufs'; +} from '@temporalio/common/protobufs'; import { CompositePayloadConverter } from '@temporalio/common'; diff --git a/features/serialization_context/sercontext/sercontext.ts b/features/serialization_context/sercontext/sercontext.ts index 504fac03..720536b8 100644 --- a/features/serialization_context/sercontext/sercontext.ts +++ b/features/serialization_context/sercontext/sercontext.ts @@ -1,5 +1,5 @@ import { Payload, PayloadCodec, SerializationContext } from '@temporalio/common'; -import { decode, encode } from '@temporalio/common/lib/encoding'; +import { decode, encode } from '@temporalio/common/encoding'; export const METADATA_KEY = 'ctx-signature'; export const NO_CONTEXT = 'none'; diff --git a/harness/ts/main.ts b/harness/ts/main.ts index 15685046..c4c5ce2e 100644 --- a/harness/ts/main.ts +++ b/harness/ts/main.ts @@ -2,7 +2,7 @@ import * as path from 'path'; import * as fs from 'fs'; import { Command } from 'commander'; import { Runtime, DefaultLogger } from '@temporalio/worker'; -import pkg from '@temporalio/worker/lib/pkg'; +import pkg from '@temporalio/worker/internal/pkg'; import { TLSConfig } from '@temporalio/client'; import { FeatureSource, Runner } from './harness'; From 9cfdcf5f4cb7438a89df02905cc57a9e74cd8935 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Mon, 16 Nov 2026 14:20:47 -0500 Subject: [PATCH 2/2] chore: remove catch all tsconfig paths --- cmd/run_typescript.go | 2 +- sdkbuild/typescript.go | 39 +++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cmd/run_typescript.go b/cmd/run_typescript.go index 967e98ed..9fc734a5 100644 --- a/cmd/run_typescript.go +++ b/cmd/run_typescript.go @@ -37,7 +37,7 @@ func (p *Preparer) BuildTypeScriptProgram(ctx context.Context) (sdkbuild.Program DirName: p.config.DirName, Version: version, TSConfigPaths: map[string][]string{ - "@temporalio/harness": {"./tslib/harness/ts/harness.js", "../harness/ts/harness.ts"}, + "@temporalio/harness": {"./tslib/harness/ts/harness.js", "./harness/ts/harness.ts"}, }, }) if err != nil { diff --git a/sdkbuild/typescript.go b/sdkbuild/typescript.go index 614e90d4..385b8530 100644 --- a/sdkbuild/typescript.go +++ b/sdkbuild/typescript.go @@ -2,6 +2,7 @@ package sdkbuild import ( "context" + "encoding/json" "fmt" "os" "os/exec" @@ -163,21 +164,24 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO } // Create tsconfig - var tsConfigPathStr string + // Compile sources inside the prepared project so package resolution can find + // its node_modules and honor package exports/typesVersions. A wildcard paths + // mapping to node_modules only resolves physical files, not package subpaths. + for _, sourceDir := range []string{"features", "harness/ts"} { + if err := os.CopyFS(filepath.Join(dir, sourceDir), os.DirFS(filepath.Join(options.BaseDir, sourceDir))); err != nil { + return nil, fmt.Errorf("failed copying TypeScript sources from %s: %w", sourceDir, err) + } + } for name, paths := range options.TSConfigPaths { if len(paths) == 0 { - return nil, fmt.Errorf("harness path slice is empty") + return nil, fmt.Errorf("tsconfig path slice for %s is empty", name) } - tsConfigPathStr += fmt.Sprintf("%q: [", name) - for i, path := range paths { - if i > 0 { - tsConfigPathStr += ", " - } - tsConfigPathStr += strconv.Quote(path) - } - tsConfigPathStr += "],\n " } - includes := []string{"../features/**/*.ts", "../harness/ts/**/*.ts"} + tsConfigPaths, err := json.Marshal(options.TSConfigPaths) + if err != nil { + return nil, fmt.Errorf("failed encoding tsconfig paths: %w", err) + } + includes := []string{"features/**/*.ts", "harness/ts/**/*.ts"} if len(options.Includes) > 0 { includes = options.Includes } @@ -186,10 +190,8 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO // are versioned independently of the SDK under test. They are type-checked by // the root tsconfig.json in the `build-typescript` CI job instead. excludes := []string{ - "../node_modules", - "../harness/go", - "../harness/java", - "../features/snippets/external_storage", + "node_modules", + "features/snippets/external_storage", } if len(options.Excludes) > 0 { excludes = options.Excludes @@ -208,11 +210,8 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO "compilerOptions": { "baseUrl": ".", "outDir": "./tslib", - "rootDirs": ["../", "."], - "paths": { - ` + tsConfigPathStr + ` - "*": ["node_modules/*", "node_modules/@types/*"] - }, + "rootDir": ".", + "paths": ` + string(tsConfigPaths) + `, "typeRoots": ["node_modules/@types"], "module": "commonjs", "moduleResolution": "node",