diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f8fb9fd..2f9da11a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -161,6 +161,7 @@ jobs: @temporalio/external-storage-gcs @temporalio/external-storage-gcs-google-sdk @temporalio/external-storage-s3 @temporalio/external-storage-s3-aws-sdk @temporalio/plugin @temporalio/proto @temporalio/worker @temporalio/workflow + nexus-rpc - run: npm run build - run: npm run lint diff --git a/package-lock.json b/package-lock.json index b8fd2229..41fabb4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@temporalio/workflow": "^1.25.0", "commander": "^8.3.0", "ms": "^3.0.0-canary.1", - "nexus-rpc": "^0.0.1", + "nexus-rpc": "^0.0.3", "protobufjs": "^8.7.1" }, "devDependencies": { @@ -1694,15 +1694,6 @@ "protobufjs": "^8.7.1" } }, - "node_modules/@temporalio/client/node_modules/nexus-rpc": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", - "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", - "license": "MIT", - "engines": { - "node": ">= 20.0.0" - } - }, "node_modules/@temporalio/common": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/@temporalio/common/-/common-1.25.0.tgz", @@ -1721,15 +1712,6 @@ "protobufjs": "^8.7.1" } }, - "node_modules/@temporalio/common/node_modules/nexus-rpc": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", - "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", - "license": "MIT", - "engines": { - "node": ">= 20.0.0" - } - }, "node_modules/@temporalio/core-bridge": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/@temporalio/core-bridge/-/core-bridge-1.25.0.tgz", @@ -1834,15 +1816,6 @@ "protobufjs": "^8.7.1" } }, - "node_modules/@temporalio/nexus/node_modules/nexus-rpc": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", - "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", - "license": "MIT", - "engines": { - "node": ">= 20.0.0" - } - }, "node_modules/@temporalio/plugin": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/@temporalio/plugin/-/plugin-1.25.0.tgz", @@ -1899,15 +1872,6 @@ "protobufjs": "^8.7.1" } }, - "node_modules/@temporalio/worker/node_modules/nexus-rpc": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", - "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", - "license": "MIT", - "engines": { - "node": ">= 20.0.0" - } - }, "node_modules/@temporalio/workflow": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/@temporalio/workflow/-/workflow-1.25.0.tgz", @@ -1926,15 +1890,6 @@ "protobufjs": "^8.7.1" } }, - "node_modules/@temporalio/workflow/node_modules/nexus-rpc": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", - "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", - "license": "MIT", - "engines": { - "node": ">= 20.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz", @@ -5719,12 +5674,12 @@ "license": "MIT" }, "node_modules/nexus-rpc": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.1.tgz", - "integrity": "sha512-hAWn8Hh2eewpB5McXR5EW81R3pR/ziuGhKCF3wFyUVCklanPqrIgMNr7jKCbzXeNVad0nUDfWpFRqh2u+zxQtw==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/nexus-rpc/-/nexus-rpc-0.0.3.tgz", + "integrity": "sha512-ksIBeYHDv6FHAR1h3Vwk0kQ6REhdo1STqDHXMzu/yn/VN/XzgOor2IUjewG6paoA7IgxlIPZoOU/PD78PC6HTg==", "license": "MIT", "engines": { - "node": ">= 18.0.0" + "node": ">= 20.0.0" } }, "node_modules/node-fetch": { diff --git a/package.json b/package.json index c4def422..c854df2a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@temporalio/workflow": "^1.25.0", "commander": "^8.3.0", "ms": "^3.0.0-canary.1", - "nexus-rpc": "^0.0.1", + "nexus-rpc": "^0.0.3", "protobufjs": "^8.7.1" }, "devDependencies": { diff --git a/sdkbuild/typescript.go b/sdkbuild/typescript.go index 385b8530..5cddfb03 100644 --- a/sdkbuild/typescript.go +++ b/sdkbuild/typescript.go @@ -126,6 +126,9 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO } moreDeps := "" for dep, version := range options.MoreDependencies { + if dep == "nexus-rpc" { + continue + } moreDeps += fmt.Sprintf(` "%v": "%v",`, dep, version) + "\n" } @@ -141,7 +144,6 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO "@grpc/grpc-js": "^1.12.4", "commander": "^8.3.0", "ms": "^3.0.0-canary.1", - "nexus-rpc": "^0.0.1", "protobufjs": "^8.7.1" }, "devDependencies": { @@ -240,6 +242,31 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO if err := cmd.Run(); err != nil { return nil, fmt.Errorf("failed installing: %w", err) } + // Read the selected SDK's dependency after installation. This works for + // both published packages and links to a local checkout, and avoids + // resolving a version range or tag separately from the SDK installation. + workerPackage, err := os.ReadFile(filepath.Join(dir, "node_modules", "@temporalio", "worker", "package.json")) + if err != nil { + return nil, fmt.Errorf("failed reading installed SDK package.json: %w", err) + } + nexusVersion, err := typeScriptNexusDependency(workerPackage) + if err != nil { + return nil, err + } + if version, ok := options.MoreDependencies["nexus-rpc"]; ok && version != nexusVersion { + return nil, fmt.Errorf("nexus-rpc dependency %q does not match SDK dependency %q", version, nexusVersion) + } + cmd = exec.CommandContext(ctx, "corepack", "pnpm", "add", "--ignore-scripts", "nexus-rpc@"+nexusVersion) + cmd.Dir = dir + cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr + if options.ApplyToCommand != nil { + if err := options.ApplyToCommand(ctx, cmd); err != nil { + return nil, err + } + } + if err := cmd.Run(); err != nil { + return nil, fmt.Errorf("failed installing matching nexus-rpc dependency: %w", err) + } // Compile cmd = exec.CommandContext(ctx, "corepack", "pnpm", "run", "build") @@ -258,6 +285,20 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO return &TypeScriptProgram{dir}, nil } +func typeScriptNexusDependency(data []byte) (string, error) { + var pkg struct { + Dependencies map[string]string `json:"dependencies"` + } + if err := json.Unmarshal(data, &pkg); err != nil { + return "", fmt.Errorf("failed decoding SDK package metadata: %w", err) + } + version := pkg.Dependencies["nexus-rpc"] + if version == "" { + return "", fmt.Errorf("nexus-rpc dependency not found in SDK package metadata") + } + return version, nil +} + // TypeScriptProgramFromDir recreates the TypeScript program from a Dir() result // of a BuildTypeScriptProgram(). Note, the base directory of dir when it was // built must also be present.