@temporalio/common 0.23.0 → 1.0.0

package/lib/otel.js

@@ -0,0 +1,87 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.linkSpans = exports.headersWithContext = exports.extractSpanContextFromHeaders = exports.extractContextFromHeaders = exports.NUM_JOBS_ATTR_KEY = exports.TASK_TOKEN_ATTR_KEY = exports.RUN_ID_ATTR_KEY = exports.TRACE_HEADER = void 0;
+const otel = __importStar(require("@opentelemetry/api"));
+const payload_converters_1 = require("./converter/payload-converters");
+/** Default trace header for opentelemetry interceptors */
+exports.TRACE_HEADER = '_tracer-data';
+/** As in workflow run id */
+exports.RUN_ID_ATTR_KEY = 'run_id';
+/** For a workflow or activity task */
+exports.TASK_TOKEN_ATTR_KEY = 'task_token';
+/** Number of jobs in a workflow activation */
+exports.NUM_JOBS_ATTR_KEY = 'num_jobs';
+const payloadConverter = payload_converters_1.defaultPayloadConverter;
+/**
+ * If found, return an otel Context deserialized from the provided headers
+ */
+async function extractContextFromHeaders(headers) {
+    const encodedSpanContext = headers[exports.TRACE_HEADER];
+    if (encodedSpanContext === undefined) {
+        return undefined;
+    }
+    const textMap = payloadConverter.fromPayload(encodedSpanContext);
+    return otel.propagation.extract(otel.context.active(), textMap, otel.defaultTextMapGetter);
+}
+exports.extractContextFromHeaders = extractContextFromHeaders;
+/**
+ * If found, return an otel SpanContext deserialized from the provided headers
+ */
+async function extractSpanContextFromHeaders(headers) {
+    const context = await extractContextFromHeaders(headers);
+    if (context === undefined) {
+        return undefined;
+    }
+    return otel.trace.getSpanContext(context);
+}
+exports.extractSpanContextFromHeaders = extractSpanContextFromHeaders;
+/**
+ * Given headers, return new headers with the current otel context inserted
+ */
+async function headersWithContext(headers) {
+    const carrier = {};
+    otel.propagation.inject(otel.context.active(), carrier, otel.defaultTextMapSetter);
+    return { ...headers, [exports.TRACE_HEADER]: payloadConverter.toPayload(carrier) };
+}
+exports.headersWithContext = headersWithContext;
+/**
+ * Link a span to an maybe-existing span context
+ */
+function linkSpans(fromSpan, toContext) {
+    if (toContext !== undefined) {
+        // TODO: I have to go around typescript because otel api 😢
+        //  See https://github.com/open-telemetry/opentelemetry-js-api/issues/124
+        const links = fromSpan.links;
+        if (links === undefined) {
+            fromSpan.links = [{ context: toContext }];
+        }
+        else {
+            links.push({ context: toContext });
+        }
+    }
+}
+exports.linkSpans = linkSpans;
+//# sourceMappingURL=otel.js.map

package/lib/otel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2C;AAE3C,uEAAyE;AAEzE,0DAA0D;AAC7C,QAAA,YAAY,GAAG,cAAc,CAAC;AAC3C,4BAA4B;AACf,QAAA,eAAe,GAAG,QAAQ,CAAC;AACxC,sCAAsC;AACzB,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAChD,8CAA8C;AACjC,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAE5C,MAAM,gBAAgB,GAAG,4CAAuB,CAAC;AAEjD;;GAEG;AACI,KAAK,UAAU,yBAAyB,CAAC,OAAgB;IAC9D,MAAM,kBAAkB,GAAG,OAAO,CAAC,oBAAY,CAAC,CAAC;IACjD,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACpC,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAA2B,gBAAgB,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IACzF,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC7F,CAAC;AAPD,8DAOC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B,CAAC,OAAgB;IAClE,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACzD,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAPD,sEAOC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAgB;IACvD,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACnF,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,oBAAY,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;AAC7E,CAAC;AAJD,gDAIC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,QAAmB,EAAE,SAA4B;IACzE,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,2DAA2D;QAC3D,yEAAyE;QACzE,MAAM,KAAK,GAAI,QAAgB,CAAC,KAAK,CAAC;QACtC,IAAI,KAAK,KAAK,SAAS,EAAE;YACtB,QAAgB,CAAC,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;SACpD;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;SACpC;KACF;AACH,CAAC;AAXD,8BAWC"}

package/lib/proto-utils.d.ts

@@ -0,0 +1,28 @@
+import proto from '@temporalio/proto';
+export declare type History = proto.temporal.api.history.v1.IHistory;
+export declare type Payload = proto.temporal.api.common.v1.IPayload;
+/**
+ * Convert a proto JSON representation of History to a valid History object
+ */
+export declare function historyFromJSON(history: unknown): History;
+/**
+ * JSON representation of Temporal's {@link Payload} protobuf object
+ */
+export interface JSONPayload {
+    /**
+     * Mapping of key to base64 encoded value
+     */
+    metadata?: Record<string, string> | null;
+    /**
+     * base64 encoded value
+     */
+    data?: string | null;
+}
+/**
+ * Convert from protobuf payload to JSON
+ */
+export declare function payloadToJSON(payload: Payload): JSONPayload;
+/**
+ * Convert from JSON to protobuf payload
+ */
+export declare function JSONToPayload(json: JSONPayload): Payload;

package/lib/proto-utils.js

@@ -0,0 +1,85 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSONToPayload = exports.payloadToJSON = exports.historyFromJSON = void 0;
+const proto_1 = __importDefault(require("@temporalio/proto"));
+const proto3_json_serializer_1 = require("proto3-json-serializer");
+const patch_protobuf_root_1 = require("@temporalio/proto/lib/patch-protobuf-root");
+// Cast to any because the generated proto module types are missing the lookupType method
+const patched = (0, patch_protobuf_root_1.patchProtobufRoot)(proto_1.default);
+const historyType = patched.lookupType('temporal.api.history.v1.History');
+const payloadType = patched.lookupType('temporal.api.common.v1.Payload');
+function pascalCaseToConstantCase(s) {
+    return s.replace(/[^\b][A-Z]/g, (m) => `${m[0]}_${m[1]}`).toUpperCase();
+}
+function fixEnumValue(obj, attr, prefix) {
+    return (obj[attr] && {
+        [attr]: `${prefix}_${pascalCaseToConstantCase(obj[attr])}`,
+    });
+}
+function fixHistoryEvent(e) {
+    const type = Object.keys(e).find((k) => k.endsWith('EventAttributes'));
+    if (!type) {
+        throw new TypeError(`Missing attributes in history event: ${JSON.stringify(e)}`);
+    }
+    return {
+        ...e,
+        ...fixEnumValue(e, 'eventType', 'EVENT_TYPE'),
+        [type]: {
+            ...e[type],
+            ...(e[type].taskQueue && {
+                taskQueue: { ...e[type].taskQueue, ...fixEnumValue(e[type].taskQueue, 'kind', 'TASK_QUEUE_KIND') },
+            }),
+            ...fixEnumValue(e[type], 'parentClosePolicy', 'PARENT_CLOSE_POLICY'),
+            ...fixEnumValue(e[type], 'workflowIdReusePolicy', 'WORKFLOW_ID_REUSE_POLICY'),
+            ...fixEnumValue(e[type], 'initiator', 'CONTINUE_AS_NEW_INITIATOR'),
+            ...fixEnumValue(e[type], 'retryState', 'RETRY_STATE'),
+            ...(e[type].childWorkflowExecutionFailureInfo && {
+                childWorkflowExecutionFailureInfo: {
+                    ...e[type].childWorkflowExecutionFailureInfo,
+                    ...fixEnumValue(e[type].childWorkflowExecutionFailureInfo, 'retryState', 'RETRY_STATE'),
+                },
+            }),
+        },
+    };
+}
+function fixHistory(h) {
+    return {
+        events: h.events.map(fixHistoryEvent),
+    };
+}
+/**
+ * Convert a proto JSON representation of History to a valid History object
+ */
+function historyFromJSON(history) {
+    if (typeof history !== 'object' || history == null || !Array.isArray(history.events)) {
+        throw new TypeError('Invalid history, expected an object with an array of events');
+    }
+    const loaded = (0, proto3_json_serializer_1.fromProto3JSON)(historyType, fixHistory(history));
+    if (loaded === null) {
+        throw new TypeError('Invalid history');
+    }
+    return loaded;
+}
+exports.historyFromJSON = historyFromJSON;
+/**
+ * Convert from protobuf payload to JSON
+ */
+function payloadToJSON(payload) {
+    return (0, proto3_json_serializer_1.toProto3JSON)(patched.temporal.api.common.v1.Payload.create(payload));
+}
+exports.payloadToJSON = payloadToJSON;
+/**
+ * Convert from JSON to protobuf payload
+ */
+function JSONToPayload(json) {
+    const loaded = (0, proto3_json_serializer_1.fromProto3JSON)(payloadType, json);
+    if (loaded === null) {
+        throw new TypeError('Invalid payload');
+    }
+    return loaded;
+}
+exports.JSONToPayload = JSONToPayload;
+//# sourceMappingURL=proto-utils.js.map

package/lib/proto-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proto-utils.js","sourceRoot":"","sources":["../src/proto-utils.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAsC;AACtC,mEAAsE;AACtE,mFAA8E;AAK9E,yFAAyF;AACzF,MAAM,OAAO,GAAG,IAAA,uCAAiB,EAAC,eAAK,CAAQ,CAAC;AAChD,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC;AAC1E,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,gCAAgC,CAAC,CAAC;AAEzE,SAAS,wBAAwB,CAAC,CAAS;IACzC,OAAO,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,YAAY,CAAgC,GAAM,EAAE,IAAa,EAAE,MAAc;IACxF,OAAO,CACL,GAAG,CAAC,IAAI,CAAC,IAAI;QACX,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,IAAI,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE;KAC3D,CACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,CAAsB;IAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,SAAS,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KAClF;IAED,OAAO;QACL,GAAG,CAAC;QACJ,GAAG,YAAY,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC;QAC7C,CAAC,IAAI,CAAC,EAAE;YACN,GAAG,CAAC,CAAC,IAAI,CAAC;YACV,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI;gBACvB,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE;aACnG,CAAC;YACF,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,mBAAmB,EAAE,qBAAqB,CAAC;YACpE,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,uBAAuB,EAAE,0BAA0B,CAAC;YAC7E,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,2BAA2B,CAAC;YAClE,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC;YACrD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,iCAAiC,IAAI;gBAC/C,iCAAiC,EAAE;oBACjC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,iCAAiC;oBAC5C,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,iCAAiC,EAAE,YAAY,EAAE,aAAa,CAAC;iBACxF;aACF,CAAC;SACH;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,CAAsB;IACxC,OAAO;QACL,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;KACtC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,OAAgB;IAC9C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAE,OAAe,CAAC,MAAM,CAAC,EAAE;QAC7F,MAAM,IAAI,SAAS,CAAC,6DAA6D,CAAC,CAAC;KACpF;IACD,MAAM,MAAM,GAAG,IAAA,uCAAc,EAAC,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;KACxC;IACD,OAAO,MAAa,CAAC;AACvB,CAAC;AATD,0CASC;AAgBD;;GAEG;AACH,SAAgB,aAAa,CAAC,OAAgB;IAC5C,OAAO,IAAA,qCAAY,EAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAQ,CAAC;AACrF,CAAC;AAFD,sCAEC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAiB;IAC7C,MAAM,MAAM,GAAG,IAAA,uCAAc,EAAC,WAAW,EAAE,IAAW,CAAC,CAAC;IACxD,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;KACxC;IACD,OAAO,MAAa,CAAC;AACvB,CAAC;AAND,sCAMC"}

package/lib/protobufs.d.ts

@@ -1,6 +1,6 @@
 /**
  * Entry point for classes and utilities related to using
- * [Protobufs](https://docs.temporal.io/docs/typescript/data-converters#protobufs) for serialization.
+ * {@link https://docs.temporal.io/typescript/data-converters#protobufs | Protobufs} for serialization.
  *
  * Import from `@temporalio/common/lib/protobufs`, for example:
  *
@@ -10,4 +10,4 @@
  * @module
  */
 export * from './converter/protobuf-payload-converters';
-export * from './converter/patch-protobuf-root';
+export { patchProtobufRoot } from '@temporalio/proto/lib/patch-protobuf-root';

package/lib/protobufs.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * Entry point for classes and utilities related to using
- * [Protobufs](https://docs.temporal.io/docs/typescript/data-converters#protobufs) for serialization.
+ * {@link https://docs.temporal.io/typescript/data-converters#protobufs | Protobufs} for serialization.
  *
  * Import from `@temporalio/common/lib/protobufs`, for example:
  *
@@ -25,7 +25,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchProtobufRoot = void 0;
 // Don't export from index, so we save space in Workflow bundles of users who don't use Protobufs
 __exportStar(require("./converter/protobuf-payload-converters"), exports);
-__exportStar(require("./converter/patch-protobuf-root"), exports);
+var patch_protobuf_root_1 = require("@temporalio/proto/lib/patch-protobuf-root");
+Object.defineProperty(exports, "patchProtobufRoot", { enumerable: true, get: function () { return patch_protobuf_root_1.patchProtobufRoot; } });
 //# sourceMappingURL=protobufs.js.map

package/lib/protobufs.js.map

@@ -1 +1 @@
-{"version":3,"file":"protobufs.js","sourceRoot":"","sources":["../src/protobufs.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;AAEH,iGAAiG;AACjG,0EAAwD;AACxD,kEAAgD"}
+{"version":3,"file":"protobufs.js","sourceRoot":"","sources":["../src/protobufs.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;AAEH,iGAAiG;AACjG,0EAAwD;AACxD,iFAA8E;AAArE,wHAAA,iBAAiB,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/common",
-  "version": "0.23.0",
+  "version": "1.0.0",
   "description": "Common library for code that's used across the Client, Worker, and/or Workflow",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -9,12 +9,14 @@
     "workflow",
     "worker"
   ],
-  "author": "Loren Sands-Ramshaw <loren@temporal.io>",
+  "author": "Temporal Technologies Inc. <sdk@temporal.io>",
   "license": "MIT",
   "dependencies": {
-    "@temporalio/internal-workflow-common": "^0.23.0",
-    "@temporalio/proto": "^0.23.0",
-    "proto3-json-serializer": "^0.1.6"
+    "@opentelemetry/api": "^1.0.3",
+    "@temporalio/internal-workflow-common": "^1.0.0",
+    "@temporalio/proto": "^1.0.0",
+    "proto3-json-serializer": "^1.0.2",
+    "protobufjs": "6.11.2"
   },
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"
@@ -23,8 +25,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
-    "protobufjs": "^6.11.2"
-  },
-  "gitHead": "81ee3fd09c2fd866b31b1dbfabce7ef221e338ea"
+  "files": [
+    "src",
+    "lib"
+  ],
+  "gitHead": "c4fc4dc608bf58701c11b6ae02d1d63b4457718d"
 }

package/src/converter/data-converter.ts

@@ -1,15 +1,15 @@
 import { PayloadCodec } from './payload-codec';
+import { PayloadConverter } from './payload-converter';
 import { defaultPayloadConverter } from './payload-converters';
-import { WrappedPayloadConverter } from './wrapped-payload-converter';
 
 /**
  * When your data (arguments and return values) is sent over the wire and stored by Temporal Server, it is encoded in
  * binary in a {@link Payload} Protobuf message.
  *
  * The default `DataConverter` supports `undefined`, `Uint8Array`, and JSON serializables (so if
- * [`JSON.stringify(yourArgOrRetval)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description)
- * works, the default data converter will work). Protobufs are supported via [this
- * API](https://docs.temporal.io/docs/typescript/data-converters#protobufs).
+ * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description | `JSON.stringify(yourArgOrRetval)`}
+ * works, the default data converter will work). Protobufs are supported via
+ * {@link https://docs.temporal.io/typescript/data-converters#protobufs | this API}.
  *
  * Use a custom `DataConverter` to control the contents of your {@link Payload}s. Common reasons for using a custom
  * `DataConverter` are:
@@ -48,11 +48,11 @@ export interface DataConverter {
  * A {@link DataConverter} that has been loaded via {@link loadDataConverter}.
  */
 export interface LoadedDataConverter {
-  payloadConverter: WrappedPayloadConverter;
+  payloadConverter: PayloadConverter;
   payloadCodecs: PayloadCodec[];
 }
 
 export const defaultDataConverter: LoadedDataConverter = {
-  payloadConverter: new WrappedPayloadConverter(defaultPayloadConverter),
+  payloadConverter: defaultPayloadConverter,
   payloadCodecs: [],
 };

package/src/converter/json-payload-converter.ts

@@ -0,0 +1,37 @@
+import { ValueError } from '@temporalio/internal-workflow-common';
+import { PayloadConverterWithEncoding } from './payload-converters';
+import { encodingKeys, encodingTypes, METADATA_ENCODING_KEY, Payload, str, u8 } from './types';
+
+/**
+ * Converts between non-undefined values and serialized JSON Payload
+ */
+export class JsonPayloadConverter implements PayloadConverterWithEncoding {
+  public encodingType = encodingTypes.METADATA_ENCODING_JSON;
+
+  public toPayload(value: unknown): Payload | undefined {
+    if (value === undefined) {
+      return undefined;
+    }
+
+    let json;
+    try {
+      json = JSON.stringify(value);
+    } catch (e) {
+      return undefined;
+    }
+
+    return {
+      metadata: {
+        [METADATA_ENCODING_KEY]: encodingKeys.METADATA_ENCODING_JSON,
+      },
+      data: u8(json),
+    };
+  }
+
+  public fromPayload<T>(content: Payload): T {
+    if (content.data === undefined || content.data === null) {
+      throw new ValueError('Got payload with no data');
+    }
+    return JSON.parse(str(content.data));
+  }
+}

package/src/converter/payload-converter.ts

@@ -1,10 +1,9 @@
 import { Payload } from './types';
-import { WrappedPayloadConverter } from './wrapped-payload-converter';
 
 /**
  * Used by the framework to serialize/deserialize data like parameters and return values.
  *
- * This is called inside the [Workflow isolate](https://docs.temporal.io/docs/typescript/determinism).
+ * This is called inside the {@link https://docs.temporal.io/typescript/determinism | Workflow isolate}.
  * To write async code or use Node APIs (or use packages that use Node APIs), use a {@link PayloadCodec}.
  */
 export interface PayloadConverter {
@@ -12,9 +11,12 @@ export interface PayloadConverter {
    * Converts a value to a {@link Payload}.
    *
    * @param value The value to convert. Example values include the Workflow args sent from the Client and the values returned by a Workflow or Activity.
-   * @returns The {@link Payload}, or `undefined` if unable to convert.
+   *
+   * @returns The {@link Payload}.
+   *
+   * Should throw {@link ValueError} if unable to convert.
    */
-  toPayload<T>(value: T): Payload | undefined;
+  toPayload<T>(value: T): Payload;
 
   /**
    * Converts a {@link Payload} back to a value.
@@ -22,15 +24,6 @@ export interface PayloadConverter {
   fromPayload<T>(payload: Payload): T;
 }
 
-/**
- * Tries to convert `value` to a {@link Payload}. Throws if conversion fails.
- *
- * @throws {@link ValueError}
- */
-export function toPayload(converter: WrappedPayloadConverter, value: unknown): Payload {
-  return converter.toPayload(value);
-}
-
 /**
  * Implements conversion of a list of values.
  *
@@ -40,12 +33,12 @@ export function toPayload(converter: WrappedPayloadConverter, value: unknown): P
  * @throws {@link ValueError} if conversion of the value passed as parameter failed for any
  *     reason.
  */
-export function toPayloads(converter: WrappedPayloadConverter, ...values: unknown[]): Payload[] | undefined {
+export function toPayloads(converter: PayloadConverter, ...values: unknown[]): Payload[] | undefined {
   if (values.length === 0) {
     return undefined;
   }
 
-  return values.map((value) => toPayload(converter, value));
+  return values.map((value) => converter.toPayload(value));
 }
 
 /**
@@ -53,12 +46,9 @@ export function toPayloads(converter: WrappedPayloadConverter, ...values: unknow
  *
  * @throws {@link ValueError} if conversion of any value in the map fails
  */
-export function mapToPayloads<K extends string>(
-  converter: WrappedPayloadConverter,
-  map: Record<K, any>
-): Record<K, Payload> {
+export function mapToPayloads<K extends string>(converter: PayloadConverter, map: Record<K, any>): Record<K, Payload> {
   return Object.fromEntries(
-    Object.entries(map).map(([k, v]): [K, Payload] => [k as K, toPayload(converter, v)])
+    Object.entries(map).map(([k, v]): [K, Payload] => [k as K, converter.toPayload(v)])
   ) as Record<K, Payload>;
 }
 
@@ -73,11 +63,7 @@ export function mapToPayloads<K extends string>(
  * @throws {@link PayloadConverterError} if conversion of the data passed as parameter failed for any
  *     reason.
  */
-export function fromPayloadsAtIndex<T>(
-  converter: WrappedPayloadConverter,
-  index: number,
-  payloads?: Payload[] | null
-): T {
+export function fromPayloadsAtIndex<T>(converter: PayloadConverter, index: number, payloads?: Payload[] | null): T {
   // To make adding arguments a backwards compatible change
   if (payloads === undefined || payloads === null || index >= payloads.length) {
     return undefined as any;
@@ -88,7 +74,7 @@ export function fromPayloadsAtIndex<T>(
 /**
  * Run {@link PayloadConverter.fromPayload} on each value in the array.
  */
-export function arrayFromPayloads(converter: WrappedPayloadConverter, payloads?: Payload[] | null): unknown[] {
+export function arrayFromPayloads(converter: PayloadConverter, payloads?: Payload[] | null): unknown[] {
   if (!payloads) {
     return [];
   }
@@ -96,10 +82,10 @@ export function arrayFromPayloads(converter: WrappedPayloadConverter, payloads?:
 }
 
 export function mapFromPayloads<K extends string>(
-  converter: WrappedPayloadConverter,
+  converter: PayloadConverter,
   map?: Record<K, Payload> | null | undefined
-): Record<K, unknown> | undefined {
-  if (map === undefined || map === null) return undefined;
+): Record<K, unknown> | undefined | null {
+  if (map == null) return map;
   return Object.fromEntries(
     Object.entries(map).map(([k, payload]): [K, unknown] => {
       const value = converter.fromPayload(payload as Payload);

package/src/converter/payload-converters.ts

@@ -1,9 +1,23 @@
 import { PayloadConverterError, ValueError } from '@temporalio/internal-workflow-common';
+import { JsonPayloadConverter } from './json-payload-converter';
 import { PayloadConverter } from './payload-converter';
-import { encodingKeys, encodingTypes, METADATA_ENCODING_KEY, Payload, str, u8 } from './types';
-import { WrappedPayloadConverter } from './wrapped-payload-converter';
+import { SearchAttributePayloadConverter } from './search-attribute-payload-converter';
+import { encodingKeys, encodingTypes, METADATA_ENCODING_KEY, Payload, str } from './types';
+
+export interface PayloadConverterWithEncoding {
+  /**
+   * Converts a value to a {@link Payload}.
+   *
+   * @param value The value to convert. Example values include the Workflow args sent from the Client and the values returned by a Workflow or Activity.
+   * @returns The {@link Payload}, or `undefined` if unable to convert.
+   */
+  toPayload<T>(value: T): Payload | undefined;
+
+  /**
+   * Converts a {@link Payload} back to a value.
+   */
+  fromPayload<T>(payload: Payload): T;
 
-export interface PayloadConverterWithEncoding extends PayloadConverter {
   readonly encodingType: string;
 }
 
@@ -30,9 +44,9 @@ export class CompositePayloadConverter implements PayloadConverter {
 
   /**
    * Tries to run `.toPayload(value)` on each converter in the order provided at construction.
-   * Returns the first successful result, or `undefined` if there is no converter that can handle the value.
+   * Returns the first successful result, throws {@link ValueError} if there is no converter that can handle the value.
    */
-  public toPayload<T>(value: T): Payload | undefined {
+  public toPayload<T>(value: T): Payload {
     for (const converter of this.converters) {
       const result = converter.toPayload(value);
       if (result !== undefined) {
@@ -40,7 +54,7 @@ export class CompositePayloadConverter implements PayloadConverter {
       }
     }
 
-    return undefined;
+    throw new ValueError(`Unable to convert ${value} to payload`);
   }
 
   /**
@@ -82,40 +96,6 @@ export class UndefinedPayloadConverter implements PayloadConverterWithEncoding {
   }
 }
 
-/**
- * Converts between non-undefined values and serialized JSON Payload
- */
-export class JsonPayloadConverter implements PayloadConverterWithEncoding {
-  public encodingType = encodingTypes.METADATA_ENCODING_JSON;
-
-  public toPayload(value: unknown): Payload | undefined {
-    if (value === undefined) {
-      return undefined;
-    }
-
-    let json;
-    try {
-      json = JSON.stringify(value);
-    } catch (e) {
-      return undefined;
-    }
-
-    return {
-      metadata: {
-        [METADATA_ENCODING_KEY]: encodingKeys.METADATA_ENCODING_JSON,
-      },
-      data: u8(json),
-    };
-  }
-
-  public fromPayload<T>(content: Payload): T {
-    if (content.data === undefined || content.data === null) {
-      throw new ValueError('Got payload with no data');
-    }
-    return JSON.parse(str(content.data));
-  }
-}
-
 /**
  * Converts between binary data types and RAW Payload
  */
@@ -142,7 +122,7 @@ export class BinaryPayloadConverter implements PayloadConverterWithEncoding {
   }
 }
 
-export const searchAttributePayloadConverter = new WrappedPayloadConverter(new JsonPayloadConverter());
+export const searchAttributePayloadConverter = new SearchAttributePayloadConverter();
 
 export class DefaultPayloadConverter extends CompositePayloadConverter {
   // Match the order used in other SDKs, but exclude Protobuf converters so that the code, including
@@ -157,8 +137,9 @@ export class DefaultPayloadConverter extends CompositePayloadConverter {
 }
 
 /**
- * The default {@link PayloadConverter} used by the SDK.
- * Supports `Uint8Array` and JSON serializables (so if [`JSON.stringify(yourArgOrRetval)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description) works, the default payload converter will work).
+ * The default {@link PayloadConverter} used by the SDK. Supports `Uint8Array` and JSON serializables (so if
+ * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description | `JSON.stringify(yourArgOrRetval)`}
+ * works, the default payload converter will work).
  *
  * To also support Protobufs, create a custom payload converter with {@link DefaultPayloadConverter}:
  *

package/src/converter/protobuf-payload-converters.ts

@@ -8,10 +8,10 @@ import {
 } from '@temporalio/internal-workflow-common';
 import * as protoJsonSerializer from 'proto3-json-serializer';
 import type { Message, Namespace, Root, Type } from 'protobufjs';
+import { JsonPayloadConverter } from './json-payload-converter';
 import {
   BinaryPayloadConverter,
   CompositePayloadConverter,
-  JsonPayloadConverter,
   PayloadConverterWithEncoding,
   UndefinedPayloadConverter,
 } from './payload-converters';