Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/cre-sdk/api-baseline.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export interface Runtime<C> extends BaseRuntime<C>, SecretsProvider {
* @param unwrapOptions - Optional unwrapping config for complex return types
* @returns Wrapped function that returns aggregated result
*/
runInNodeMode<TArgs extends unknown[], TOutput>(fn: (nodeRuntime: NodeRuntime<C>, ...args: TArgs) => TOutput, consensusAggregation: ConsensusAggregation<TOutput, true>, unwrapOptions?: TOutput extends PrimitiveTypes ? never : UnwrapOptions<TOutput>): (...args: TArgs) => {
runInNodeMode<TArgs extends unknown[], TInput, TOutput = TInput>(fn: (nodeRuntime: NodeRuntime<C>, ...args: TArgs) => TInput, consensusAggregation: ConsensusAggregation<TInput, TOutput, true>, unwrapOptions?: TInput extends PrimitiveTypes ? never : UnwrapOptions<TInput>): (...args: TArgs) => {
result: () => TOutput;
};
report(input: ReportRequest | ReportRequestJson): {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ export class BasicActionCapability {
runtime: NodeRuntime<unknown>,
input: CapabilityInput<TInput, NodeInputs, NodeInputsJson>,
): { result: () => NodeOutputs }
performAction<TArgs extends unknown[], TOutput>(
performAction<TArgs extends unknown[], TInput, TOutput = TInput>(
runtime: Runtime<unknown>,
fn: (performActioner: PerformActioner, ...args: TArgs) => TOutput,
consensusAggregation: ConsensusAggregation<TOutput, true>,
unwrapOptions?: TOutput extends PrimitiveTypes ? never : UnwrapOptions<TOutput>,
fn: (performActioner: PerformActioner, ...args: TArgs) => TInput,
consensusAggregation: ConsensusAggregation<TInput, TOutput, true>,
unwrapOptions?: TInput extends PrimitiveTypes ? never : UnwrapOptions<TInput>,
): (...args: TArgs) => { result: () => TOutput }
performAction(...args: unknown[]): unknown {
// Check if this is the sugar syntax overload (has function parameter)
if (typeof args[1] === 'function') {
const [runtime, fn, consensusAggregation, unwrapOptions] = args as [
Runtime<unknown>,
(performActioner: PerformActioner, ...args: unknown[]) => unknown,
ConsensusAggregation<unknown, true>,
ConsensusAggregation<unknown, unknown, true>,
UnwrapOptions<unknown> | undefined,
]
return this.performActionSugarHelper(runtime, fn, consensusAggregation, unwrapOptions)
Expand Down Expand Up @@ -96,11 +96,11 @@ export class BasicActionCapability {
},
}
}
private performActionSugarHelper<TArgs extends unknown[], TOutput>(
private performActionSugarHelper<TArgs extends unknown[], TInput, TOutput = TInput>(
runtime: Runtime<unknown>,
fn: (performActioner: PerformActioner, ...args: TArgs) => TOutput,
consensusAggregation: ConsensusAggregation<TOutput, true>,
unwrapOptions?: TOutput extends PrimitiveTypes ? never : UnwrapOptions<TOutput>,
fn: (performActioner: PerformActioner, ...args: TArgs) => TInput,
consensusAggregation: ConsensusAggregation<TInput, TOutput, true>,
unwrapOptions?: TInput extends PrimitiveTypes ? never : UnwrapOptions<TInput>,
): (...args: TArgs) => { result: () => TOutput } {
const wrappedFn = (runtime: NodeRuntime<unknown>, ...args: TArgs) => {
const performActioner = new PerformActioner(runtime, this)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ export class ClientCapability {
runtime: NodeRuntime<unknown> | TeeRuntime<unknown>,
input: CapabilityInput<TInput, Request, RequestJson>,
): { result: () => Response }
sendRequest<TArgs extends unknown[], TOutput>(
sendRequest<TArgs extends unknown[], TInput, TOutput = TInput>(
runtime: Runtime<unknown>,
fn: (sendRequester: SendRequester, ...args: TArgs) => TOutput,
consensusAggregation: ConsensusAggregation<TOutput, true>,
unwrapOptions?: TOutput extends PrimitiveTypes ? never : UnwrapOptions<TOutput>,
fn: (sendRequester: SendRequester, ...args: TArgs) => TInput,
consensusAggregation: ConsensusAggregation<TInput, TOutput, true>,
unwrapOptions?: TInput extends PrimitiveTypes ? never : UnwrapOptions<TInput>,
): (...args: TArgs) => { result: () => TOutput }
sendRequest(...args: unknown[]): unknown {
// Check if this is the sugar syntax overload (has function parameter)
if (typeof args[1] === 'function') {
const [runtime, fn, consensusAggregation, unwrapOptions] = args as [
Runtime<unknown>,
(sendRequester: SendRequester, ...args: unknown[]) => unknown,
ConsensusAggregation<unknown, true>,
ConsensusAggregation<unknown, unknown, true>,
UnwrapOptions<unknown> | undefined,
]
return this.sendRequestSugarHelper(runtime, fn, consensusAggregation, unwrapOptions)
Expand Down Expand Up @@ -107,11 +107,11 @@ export class ClientCapability {
},
}
}
private sendRequestSugarHelper<TArgs extends unknown[], TOutput>(
private sendRequestSugarHelper<TArgs extends unknown[], TInput, TOutput = TInput>(
runtime: Runtime<unknown>,
fn: (sendRequester: SendRequester, ...args: TArgs) => TOutput,
consensusAggregation: ConsensusAggregation<TOutput, true>,
unwrapOptions?: TOutput extends PrimitiveTypes ? never : UnwrapOptions<TOutput>,
fn: (sendRequester: SendRequester, ...args: TArgs) => TInput,
consensusAggregation: ConsensusAggregation<TInput, TOutput, true>,
unwrapOptions?: TInput extends PrimitiveTypes ? never : UnwrapOptions<TInput>,
): (...args: TArgs) => { result: () => TOutput } {
const wrappedFn = (runtime: NodeRuntime<unknown>, ...args: TArgs) => {
const sendRequester = new SendRequester(runtime, this)
Expand Down
8 changes: 7 additions & 1 deletion packages/cre-sdk/src/generated/sdk/v1alpha/sdk_pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { file_values_v1_values } from '../../values/v1/values_pb'
export const file_sdk_v1alpha_sdk: GenFile =
/*@__PURE__*/
fileDesc(
'ChVzZGsvdjFhbHBoYS9zZGsucHJvdG8SC3Nkay52MWFscGhhIrQBChVTaW1wbGVDb25zZW5zdXNJbnB1dHMSIQoFdmFsdWUYASABKAsyEC52YWx1ZXMudjEuVmFsdWVIABIPCgVlcnJvchgCIAEoCUgAEjUKC2Rlc2NyaXB0b3JzGAMgASgLMiAuc2RrLnYxYWxwaGEuQ29uc2Vuc3VzRGVzY3JpcHRvchIhCgdkZWZhdWx0GAQgASgLMhAudmFsdWVzLnYxLlZhbHVlQg0KC29ic2VydmF0aW9uIpABCglGaWVsZHNNYXASMgoGZmllbGRzGAEgAygLMiIuc2RrLnYxYWxwaGEuRmllbGRzTWFwLkZpZWxkc0VudHJ5Gk8KC0ZpZWxkc0VudHJ5EgsKA2tleRgBIAEoCRIvCgV2YWx1ZRgCIAEoCzIgLnNkay52MWFscGhhLkNvbnNlbnN1c0Rlc2NyaXB0b3I6AjgBIoYBChNDb25zZW5zdXNEZXNjcmlwdG9yEjMKC2FnZ3JlZ2F0aW9uGAEgASgOMhwuc2RrLnYxYWxwaGEuQWdncmVnYXRpb25UeXBlSAASLAoKZmllbGRzX21hcBgCIAEoCzIWLnNkay52MWFscGhhLkZpZWxkc01hcEgAQgwKCmRlc2NyaXB0b3IiagoNUmVwb3J0UmVxdWVzdBIXCg9lbmNvZGVkX3BheWxvYWQYASABKAwSFAoMZW5jb2Rlcl9uYW1lGAIgASgJEhQKDHNpZ25pbmdfYWxnbxgDIAEoCRIUCgxoYXNoaW5nX2FsZ28YBCABKAkilwEKDlJlcG9ydFJlc3BvbnNlEhUKDWNvbmZpZ19kaWdlc3QYASABKAwSEgoGc2VxX25yGAIgASgEQgIwABIWCg5yZXBvcnRfY29udGV4dBgDIAEoDBISCgpyYXdfcmVwb3J0GAQgASgMEi4KBHNpZ3MYBSADKAsyIC5zZGsudjFhbHBoYS5BdHRyaWJ1dGVkU2lnbmF0dXJlIjsKE0F0dHJpYnV0ZWRTaWduYXR1cmUSEQoJc2lnbmF0dXJlGAEgASgMEhEKCXNpZ25lcl9pZBgCIAEoDSJrChFDYXBhYmlsaXR5UmVxdWVzdBIKCgJpZBgBIAEoCRIlCgdwYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRIOCgZtZXRob2QYAyABKAkSEwoLY2FsbGJhY2tfaWQYBCABKAUiWgoSQ2FwYWJpbGl0eVJlc3BvbnNlEicKB3BheWxvYWQYASABKAsyFC5nb29nbGUucHJvdG9idWYuQW55SAASDwoFZXJyb3IYAiABKAlIAEIKCghyZXNwb25zZSKbAQoTVHJpZ2dlclN1YnNjcmlwdGlvbhIKCgJpZBgBIAEoCRIlCgdwYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRIOCgZtZXRob2QYAyABKAkSLwoMcmVxdWlyZW1lbnRzGAQgASgLMhkuc2RrLnYxYWxwaGEuUmVxdWlyZW1lbnRzEhAKCHByZV9ob29rGAUgASgIIkgKEVRlZVR5cGVBbmRSZWdpb25zEiIKBHR5cGUYASABKA4yFC5zZGsudjFhbHBoYS5UZWVUeXBlEg8KB3JlZ2lvbnMYAyADKAkiVQoaVHJpZ2dlclN1YnNjcmlwdGlvblJlcXVlc3QSNwoNc3Vic2NyaXB0aW9ucxgBIAMoCzIgLnNkay52MWFscGhhLlRyaWdnZXJTdWJzY3JpcHRpb24iQAoHVHJpZ2dlchIOCgJpZBgBIAEoBEICMAASJQoHcGF5bG9hZBgCIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnkiGgoHUmVnaW9ucxIPCgdyZWdpb25zGAEgAygJIlIKElRlZVR5cGVzQW5kUmVnaW9ucxI8ChR0ZWVfdHlwZV9hbmRfcmVnaW9ucxgBIAMoCzIeLnNkay52MWFscGhhLlRlZVR5cGVBbmRSZWdpb25zInwKA1RlZRIrCgthbnlfcmVnaW9ucxgBIAEoCzIULnNkay52MWFscGhhLlJlZ2lvbnNIABJAChV0ZWVfdHlwZXNfYW5kX3JlZ2lvbnMYAiABKAsyHy5zZGsudjFhbHBoYS5UZWVUeXBlc0FuZFJlZ2lvbnNIAEIGCgRpdGVtIi0KDFJlcXVpcmVtZW50cxIdCgN0ZWUYASABKAsyEC5zZGsudjFhbHBoYS5UZWUiJwoYQXdhaXRDYXBhYmlsaXRpZXNSZXF1ZXN0EgsKA2lkcxgBIAMoBSK4AQoZQXdhaXRDYXBhYmlsaXRpZXNSZXNwb25zZRJICglyZXNwb25zZXMYASADKAsyNS5zZGsudjFhbHBoYS5Bd2FpdENhcGFiaWxpdGllc1Jlc3BvbnNlLlJlc3BvbnNlc0VudHJ5GlEKDlJlc3BvbnNlc0VudHJ5EgsKA2tleRgBIAEoBRIuCgV2YWx1ZRgCIAEoCzIfLnNkay52MWFscGhhLkNhcGFiaWxpdHlSZXNwb25zZToCOAEi5AEKDkV4ZWN1dGVSZXF1ZXN0Eg4KBmNvbmZpZxgBIAEoDBIrCglzdWJzY3JpYmUYAiABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIABInCgd0cmlnZ2VyGAMgASgLMhQuc2RrLnYxYWxwaGEuVHJpZ2dlckgAEigKCHByZV9ob29rGAUgASgLMhQuc2RrLnYxYWxwaGEuVHJpZ2dlckgAEh0KEW1heF9yZXNwb25zZV9zaXplGAQgASgEQgIwABIYChBzdXNwZW5kX29uX2F3YWl0GAYgASgIQgkKB3JlcXVlc3QizAEKD0V4ZWN1dGlvblJlc3VsdBIhCgV2YWx1ZRgBIAEoCzIQLnZhbHVlcy52MS5WYWx1ZUgAEg8KBWVycm9yGAIgASgJSAASSAoVdHJpZ2dlcl9zdWJzY3JpcHRpb25zGAMgASgLMicuc2RrLnYxYWxwaGEuVHJpZ2dlclN1YnNjcmlwdGlvblJlcXVlc3RIABIxCgxyZXN0cmljdGlvbnMYBCABKAsyGS5zZGsudjFhbHBoYS5SZXN0cmljdGlvbnNIAEIICgZyZXN1bHQiVgoRR2V0U2VjcmV0c1JlcXVlc3QSLAoIcmVxdWVzdHMYASADKAsyGi5zZGsudjFhbHBoYS5TZWNyZXRSZXF1ZXN0EhMKC2NhbGxiYWNrX2lkGAIgASgFIiIKE0F3YWl0U2VjcmV0c1JlcXVlc3QSCwoDaWRzGAEgAygFIqsBChRBd2FpdFNlY3JldHNSZXNwb25zZRJDCglyZXNwb25zZXMYASADKAsyMC5zZGsudjFhbHBoYS5Bd2FpdFNlY3JldHNSZXNwb25zZS5SZXNwb25zZXNFbnRyeRpOCg5SZXNwb25zZXNFbnRyeRILCgNrZXkYASABKAUSKwoFdmFsdWUYAiABKAsyHC5zZGsudjFhbHBoYS5TZWNyZXRSZXNwb25zZXM6AjgBIi4KDVNlY3JldFJlcXVlc3QSCgoCaWQYASABKAkSEQoJbmFtZXNwYWNlGAIgASgJIkUKBlNlY3JldBIKCgJpZBgBIAEoCRIRCgluYW1lc3BhY2UYAiABKAkSDQoFb3duZXIYAyABKAkSDQoFdmFsdWUYBCABKAkiSgoLU2VjcmV0RXJyb3ISCgoCaWQYASABKAkSEQoJbmFtZXNwYWNlGAIgASgJEg0KBW93bmVyGAMgASgJEg0KBWVycm9yGAQgASgJIm4KDlNlY3JldFJlc3BvbnNlEiUKBnNlY3JldBgBIAEoCzITLnNkay52MWFscGhhLlNlY3JldEgAEikKBWVycm9yGAIgASgLMhguc2RrLnYxYWxwaGEuU2VjcmV0RXJyb3JIAEIKCghyZXNwb25zZSJBCg9TZWNyZXRSZXNwb25zZXMSLgoJcmVzcG9uc2VzGAEgAygLMhsuc2RrLnYxYWxwaGEuU2VjcmV0UmVzcG9uc2UiQgoRTWV0aG9kUmVzdHJpY3Rpb24SCgoCaWQYASABKAkSDgoGbWV0aG9kGAIgASgJEhEKCW1heF9jYWxscxgDIAEoBSJYChVDYXBhYmlsaXR5UmVzdHJpY3Rpb24SMAoGbWV0aG9kGAEgASgLMh4uc2RrLnYxYWxwaGEuTWV0aG9kUmVzdHJpY3Rpb25IAEINCgtyZXN0cmljdGlvbiKhAQoWQ2FwYWJpbGl0eVJlc3RyaWN0aW9ucxI4CgxyZXN0cmljdGlvbnMYASADKAsyIi5zZGsudjFhbHBoYS5DYXBhYmlsaXR5UmVzdHJpY3Rpb24SFwoPbWF4X3RvdGFsX2NhbGxzGAIgASgFEjQKBHR5cGUYAyABKA4yJi5zZGsudjFhbHBoYS5DYXBhYmlsaXR5UmVzdHJpY3Rpb25UeXBlIlEKF1NlY3JldFByZWZpeFJlc3RyaWN0aW9uEg4KBnByZWZpeBgBIAEoCRIRCgluYW1lc3BhY2UYAiABKAkSEwoLbWF4X3NlY3JldHMYAyABKAUikAEKEVNlY3JldFJlc3RyaWN0aW9uEisKDGV4YWN0X3NlY3JldBgBIAEoCzITLnNkay52MWFscGhhLlNlY3JldEgAEj8KD3ByZWZpeGVkX3NlY3JldBgCIAEoCzIkLnNkay52MWFscGhhLlNlY3JldFByZWZpeFJlc3RyaWN0aW9uSABCDQoLcmVzdHJpY3Rpb24iXwoSU2VjcmV0c1Jlc3RyaXRpb25zEjQKDHJlc3RyaWN0aW9ucxgBIAMoCzIeLnNkay52MWFscGhhLlNlY3JldFJlc3RyaWN0aW9uEhMKC21heF9zZWNyZXRzGAIgASgFInsKDFJlc3RyaWN0aW9ucxIwCgdzZWNyZXRzGAEgASgLMh8uc2RrLnYxYWxwaGEuU2VjcmV0c1Jlc3RyaXRpb25zEjkKDGNhcGFiaWxpdGllcxgCIAEoCzIjLnNkay52MWFscGhhLkNhcGFiaWxpdHlSZXN0cmljdGlvbnMquAEKD0FnZ3JlZ2F0aW9uVHlwZRIgChxBR0dSRUdBVElPTl9UWVBFX1VOU1BFQ0lGSUVEEAASGwoXQUdHUkVHQVRJT05fVFlQRV9NRURJQU4QARIeChpBR0dSRUdBVElPTl9UWVBFX0lERU5USUNBTBACEiIKHkFHR1JFR0FUSU9OX1RZUEVfQ09NTU9OX1BSRUZJWBADEiIKHkFHR1JFR0FUSU9OX1RZUEVfQ09NTU9OX1NVRkZJWBAEKjkKBE1vZGUSFAoQTU9ERV9VTlNQRUNJRklFRBAAEgwKCE1PREVfRE9OEAESDQoJTU9ERV9OT0RFEAIqOwoHVGVlVHlwZRIYChRURUVfVFlQRV9VTlNQRUNJRklFRBAAEhYKElRFRV9UWVBFX0FXU19OSVRSTxABKmkKGUNhcGFiaWxpdHlSZXN0cmljdGlvblR5cGUSJgoiQ0FQQUJJTElUWV9SRVNUUklDVElPTl9UWVBFX0NMT1NFRBAAEiQKIENBUEFCSUxJVFlfUkVTVFJJQ1RJT05fVFlQRV9PUEVOEAFCaAoPY29tLnNkay52MWFscGhhQghTZGtQcm90b1ABogIDU1hYqgILU2RrLlYxYWxwaGHKAgtTZGtcVjFhbHBoYeICF1Nka1xWMWFscGhhXEdQQk1ldGFkYXRh6gIMU2RrOjpWMWFscGhhYgZwcm90bzM',
'ChVzZGsvdjFhbHBoYS9zZGsucHJvdG8SC3Nkay52MWFscGhhIrQBChVTaW1wbGVDb25zZW5zdXNJbnB1dHMSIQoFdmFsdWUYASABKAsyEC52YWx1ZXMudjEuVmFsdWVIABIPCgVlcnJvchgCIAEoCUgAEjUKC2Rlc2NyaXB0b3JzGAMgASgLMiAuc2RrLnYxYWxwaGEuQ29uc2Vuc3VzRGVzY3JpcHRvchIhCgdkZWZhdWx0GAQgASgLMhAudmFsdWVzLnYxLlZhbHVlQg0KC29ic2VydmF0aW9uIpABCglGaWVsZHNNYXASMgoGZmllbGRzGAEgAygLMiIuc2RrLnYxYWxwaGEuRmllbGRzTWFwLkZpZWxkc0VudHJ5Gk8KC0ZpZWxkc0VudHJ5EgsKA2tleRgBIAEoCRIvCgV2YWx1ZRgCIAEoCzIgLnNkay52MWFscGhhLkNvbnNlbnN1c0Rlc2NyaXB0b3I6AjgBIoYBChNDb25zZW5zdXNEZXNjcmlwdG9yEjMKC2FnZ3JlZ2F0aW9uGAEgASgOMhwuc2RrLnYxYWxwaGEuQWdncmVnYXRpb25UeXBlSAASLAoKZmllbGRzX21hcBgCIAEoCzIWLnNkay52MWFscGhhLkZpZWxkc01hcEgAQgwKCmRlc2NyaXB0b3IiagoNUmVwb3J0UmVxdWVzdBIXCg9lbmNvZGVkX3BheWxvYWQYASABKAwSFAoMZW5jb2Rlcl9uYW1lGAIgASgJEhQKDHNpZ25pbmdfYWxnbxgDIAEoCRIUCgxoYXNoaW5nX2FsZ28YBCABKAkilwEKDlJlcG9ydFJlc3BvbnNlEhUKDWNvbmZpZ19kaWdlc3QYASABKAwSEgoGc2VxX25yGAIgASgEQgIwABIWCg5yZXBvcnRfY29udGV4dBgDIAEoDBISCgpyYXdfcmVwb3J0GAQgASgMEi4KBHNpZ3MYBSADKAsyIC5zZGsudjFhbHBoYS5BdHRyaWJ1dGVkU2lnbmF0dXJlIjsKE0F0dHJpYnV0ZWRTaWduYXR1cmUSEQoJc2lnbmF0dXJlGAEgASgMEhEKCXNpZ25lcl9pZBgCIAEoDSJrChFDYXBhYmlsaXR5UmVxdWVzdBIKCgJpZBgBIAEoCRIlCgdwYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRIOCgZtZXRob2QYAyABKAkSEwoLY2FsbGJhY2tfaWQYBCABKAUiWgoSQ2FwYWJpbGl0eVJlc3BvbnNlEicKB3BheWxvYWQYASABKAsyFC5nb29nbGUucHJvdG9idWYuQW55SAASDwoFZXJyb3IYAiABKAlIAEIKCghyZXNwb25zZSKbAQoTVHJpZ2dlclN1YnNjcmlwdGlvbhIKCgJpZBgBIAEoCRIlCgdwYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRIOCgZtZXRob2QYAyABKAkSLwoMcmVxdWlyZW1lbnRzGAQgASgLMhkuc2RrLnYxYWxwaGEuUmVxdWlyZW1lbnRzEhAKCHByZV9ob29rGAUgASgIIkgKEVRlZVR5cGVBbmRSZWdpb25zEiIKBHR5cGUYASABKA4yFC5zZGsudjFhbHBoYS5UZWVUeXBlEg8KB3JlZ2lvbnMYAyADKAkiVQoaVHJpZ2dlclN1YnNjcmlwdGlvblJlcXVlc3QSNwoNc3Vic2NyaXB0aW9ucxgBIAMoCzIgLnNkay52MWFscGhhLlRyaWdnZXJTdWJzY3JpcHRpb24iQAoHVHJpZ2dlchIOCgJpZBgBIAEoBEICMAASJQoHcGF5bG9hZBgCIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnkiGgoHUmVnaW9ucxIPCgdyZWdpb25zGAEgAygJIlIKElRlZVR5cGVzQW5kUmVnaW9ucxI8ChR0ZWVfdHlwZV9hbmRfcmVnaW9ucxgBIAMoCzIeLnNkay52MWFscGhhLlRlZVR5cGVBbmRSZWdpb25zInwKA1RlZRIrCgthbnlfcmVnaW9ucxgBIAEoCzIULnNkay52MWFscGhhLlJlZ2lvbnNIABJAChV0ZWVfdHlwZXNfYW5kX3JlZ2lvbnMYAiABKAsyHy5zZGsudjFhbHBoYS5UZWVUeXBlc0FuZFJlZ2lvbnNIAEIGCgRpdGVtIi0KDFJlcXVpcmVtZW50cxIdCgN0ZWUYASABKAsyEC5zZGsudjFhbHBoYS5UZWUiJwoYQXdhaXRDYXBhYmlsaXRpZXNSZXF1ZXN0EgsKA2lkcxgBIAMoBSK4AQoZQXdhaXRDYXBhYmlsaXRpZXNSZXNwb25zZRJICglyZXNwb25zZXMYASADKAsyNS5zZGsudjFhbHBoYS5Bd2FpdENhcGFiaWxpdGllc1Jlc3BvbnNlLlJlc3BvbnNlc0VudHJ5GlEKDlJlc3BvbnNlc0VudHJ5EgsKA2tleRgBIAEoBRIuCgV2YWx1ZRgCIAEoCzIfLnNkay52MWFscGhhLkNhcGFiaWxpdHlSZXNwb25zZToCOAEi5AEKDkV4ZWN1dGVSZXF1ZXN0Eg4KBmNvbmZpZxgBIAEoDBIrCglzdWJzY3JpYmUYAiABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIABInCgd0cmlnZ2VyGAMgASgLMhQuc2RrLnYxYWxwaGEuVHJpZ2dlckgAEigKCHByZV9ob29rGAUgASgLMhQuc2RrLnYxYWxwaGEuVHJpZ2dlckgAEh0KEW1heF9yZXNwb25zZV9zaXplGAQgASgEQgIwABIYChBzdXNwZW5kX29uX2F3YWl0GAYgASgIQgkKB3JlcXVlc3QizAEKD0V4ZWN1dGlvblJlc3VsdBIhCgV2YWx1ZRgBIAEoCzIQLnZhbHVlcy52MS5WYWx1ZUgAEg8KBWVycm9yGAIgASgJSAASSAoVdHJpZ2dlcl9zdWJzY3JpcHRpb25zGAMgASgLMicuc2RrLnYxYWxwaGEuVHJpZ2dlclN1YnNjcmlwdGlvblJlcXVlc3RIABIxCgxyZXN0cmljdGlvbnMYBCABKAsyGS5zZGsudjFhbHBoYS5SZXN0cmljdGlvbnNIAEIICgZyZXN1bHQiVgoRR2V0U2VjcmV0c1JlcXVlc3QSLAoIcmVxdWVzdHMYASADKAsyGi5zZGsudjFhbHBoYS5TZWNyZXRSZXF1ZXN0EhMKC2NhbGxiYWNrX2lkGAIgASgFIiIKE0F3YWl0U2VjcmV0c1JlcXVlc3QSCwoDaWRzGAEgAygFIqsBChRBd2FpdFNlY3JldHNSZXNwb25zZRJDCglyZXNwb25zZXMYASADKAsyMC5zZGsudjFhbHBoYS5Bd2FpdFNlY3JldHNSZXNwb25zZS5SZXNwb25zZXNFbnRyeRpOCg5SZXNwb25zZXNFbnRyeRILCgNrZXkYASABKAUSKwoFdmFsdWUYAiABKAsyHC5zZGsudjFhbHBoYS5TZWNyZXRSZXNwb25zZXM6AjgBIi4KDVNlY3JldFJlcXVlc3QSCgoCaWQYASABKAkSEQoJbmFtZXNwYWNlGAIgASgJIkUKBlNlY3JldBIKCgJpZBgBIAEoCRIRCgluYW1lc3BhY2UYAiABKAkSDQoFb3duZXIYAyABKAkSDQoFdmFsdWUYBCABKAkiSgoLU2VjcmV0RXJyb3ISCgoCaWQYASABKAkSEQoJbmFtZXNwYWNlGAIgASgJEg0KBW93bmVyGAMgASgJEg0KBWVycm9yGAQgASgJIm4KDlNlY3JldFJlc3BvbnNlEiUKBnNlY3JldBgBIAEoCzITLnNkay52MWFscGhhLlNlY3JldEgAEikKBWVycm9yGAIgASgLMhguc2RrLnYxYWxwaGEuU2VjcmV0RXJyb3JIAEIKCghyZXNwb25zZSJBCg9TZWNyZXRSZXNwb25zZXMSLgoJcmVzcG9uc2VzGAEgAygLMhsuc2RrLnYxYWxwaGEuU2VjcmV0UmVzcG9uc2UiQgoRTWV0aG9kUmVzdHJpY3Rpb24SCgoCaWQYASABKAkSDgoGbWV0aG9kGAIgASgJEhEKCW1heF9jYWxscxgDIAEoBSJYChVDYXBhYmlsaXR5UmVzdHJpY3Rpb24SMAoGbWV0aG9kGAEgASgLMh4uc2RrLnYxYWxwaGEuTWV0aG9kUmVzdHJpY3Rpb25IAEINCgtyZXN0cmljdGlvbiKhAQoWQ2FwYWJpbGl0eVJlc3RyaWN0aW9ucxI4CgxyZXN0cmljdGlvbnMYASADKAsyIi5zZGsudjFhbHBoYS5DYXBhYmlsaXR5UmVzdHJpY3Rpb24SFwoPbWF4X3RvdGFsX2NhbGxzGAIgASgFEjQKBHR5cGUYAyABKA4yJi5zZGsudjFhbHBoYS5DYXBhYmlsaXR5UmVzdHJpY3Rpb25UeXBlIlEKF1NlY3JldFByZWZpeFJlc3RyaWN0aW9uEg4KBnByZWZpeBgBIAEoCRIRCgluYW1lc3BhY2UYAiABKAkSEwoLbWF4X3NlY3JldHMYAyABKAUikAEKEVNlY3JldFJlc3RyaWN0aW9uEisKDGV4YWN0X3NlY3JldBgBIAEoCzITLnNkay52MWFscGhhLlNlY3JldEgAEj8KD3ByZWZpeGVkX3NlY3JldBgCIAEoCzIkLnNkay52MWFscGhhLlNlY3JldFByZWZpeFJlc3RyaWN0aW9uSABCDQoLcmVzdHJpY3Rpb24iXwoSU2VjcmV0c1Jlc3RyaXRpb25zEjQKDHJlc3RyaWN0aW9ucxgBIAMoCzIeLnNkay52MWFscGhhLlNlY3JldFJlc3RyaWN0aW9uEhMKC21heF9zZWNyZXRzGAIgASgFInsKDFJlc3RyaWN0aW9ucxIwCgdzZWNyZXRzGAEgASgLMh8uc2RrLnYxYWxwaGEuU2VjcmV0c1Jlc3RyaXRpb25zEjkKDGNhcGFiaWxpdGllcxgCIAEoCzIjLnNkay52MWFscGhhLkNhcGFiaWxpdHlSZXN0cmljdGlvbnMq3QEKD0FnZ3JlZ2F0aW9uVHlwZRIgChxBR0dSRUdBVElPTl9UWVBFX1VOU1BFQ0lGSUVEEAASGwoXQUdHUkVHQVRJT05fVFlQRV9NRURJQU4QARIeChpBR0dSRUdBVElPTl9UWVBFX0lERU5USUNBTBACEiIKHkFHR1JFR0FUSU9OX1RZUEVfQ09NTU9OX1BSRUZJWBADEiIKHkFHR1JFR0FUSU9OX1RZUEVfQ09NTU9OX1NVRkZJWBAEEiMKH0FHR1JFR0FUSU9OX1RZUEVfRlJFUVVFTkNZX0xJU1QQBSo5CgRNb2RlEhQKEE1PREVfVU5TUEVDSUZJRUQQABIMCghNT0RFX0RPThABEg0KCU1PREVfTk9ERRACKjsKB1RlZVR5cGUSGAoUVEVFX1RZUEVfVU5TUEVDSUZJRUQQABIWChJURUVfVFlQRV9BV1NfTklUUk8QASppChlDYXBhYmlsaXR5UmVzdHJpY3Rpb25UeXBlEiYKIkNBUEFCSUxJVFlfUkVTVFJJQ1RJT05fVFlQRV9DTE9TRUQQABIkCiBDQVBBQklMSVRZX1JFU1RSSUNUSU9OX1RZUEVfT1BFThABQmgKD2NvbS5zZGsudjFhbHBoYUIIU2RrUHJvdG9QAaICA1NYWKoCC1Nkay5WMWFscGhhygILU2RrXFYxYWxwaGHiAhdTZGtcVjFhbHBoYVxHUEJNZXRhZGF0YeoCDFNkazo6VjFhbHBoYWIGcHJvdG8z',
[file_google_protobuf_any, file_google_protobuf_empty, file_values_v1_values],
)

Expand Down Expand Up @@ -1636,6 +1636,11 @@ export enum AggregationType {
* @generated from enum value: AGGREGATION_TYPE_COMMON_SUFFIX = 4;
*/
COMMON_SUFFIX = 4,

/**
* @generated from enum value: AGGREGATION_TYPE_FREQUENCY_LIST = 5;
*/
FREQUENCY_LIST = 5,
}

/**
Expand All @@ -1647,6 +1652,7 @@ export type AggregationTypeJson =
| 'AGGREGATION_TYPE_IDENTICAL'
| 'AGGREGATION_TYPE_COMMON_PREFIX'
| 'AGGREGATION_TYPE_COMMON_SUFFIX'
| 'AGGREGATION_TYPE_FREQUENCY_LIST'

/**
* Describes the enum sdk.v1alpha.AggregationType.
Expand Down
12 changes: 6 additions & 6 deletions packages/cre-sdk/src/generator/generate-action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,21 @@ export function generateActionMethod(

if (modePrefix === 'Node') {
const sugarClassName = `${methodName.charAt(0).toUpperCase() + methodName.slice(1)}er`
const sugarSig = `<TArgs extends unknown[], TOutput>(
const sugarSig = `<TArgs extends unknown[], TInput, TOutput = TInput>(
runtime: Runtime<unknown>,
fn: (${methodName}er: ${sugarClassName}, ...args: TArgs) => TOutput,
consensusAggregation: ConsensusAggregation<TOutput, true>,
unwrapOptions?: TOutput extends PrimitiveTypes
fn: (${methodName}er: ${sugarClassName}, ...args: TArgs) => TInput,
consensusAggregation: ConsensusAggregation<TInput, TOutput, true>,
unwrapOptions?: TInput extends PrimitiveTypes
? never
: UnwrapOptions<TOutput>,
: UnwrapOptions<TInput>,
): (...args: TArgs) => { result: () => TOutput }`
return `
${nameAndPublicSigs}
${methodName}${sugarSig}
${methodName}(...args: unknown[]): unknown {
// Check if this is the sugar syntax overload (has function parameter)
if (typeof args[1] === 'function') {
const [runtime, fn, consensusAggregation, unwrapOptions] = args as [Runtime<unknown>, (${methodName}er: ${sugarClassName}, ...args: unknown[]) => unknown, ConsensusAggregation<unknown, true>, UnwrapOptions<unknown> | undefined]
const [runtime, fn, consensusAggregation, unwrapOptions] = args as [Runtime<unknown>, (${methodName}er: ${sugarClassName}, ...args: unknown[]) => unknown, ConsensusAggregation<unknown, unknown, true>, UnwrapOptions<unknown> | undefined]
return this.${methodName}SugarHelper(runtime, fn, consensusAggregation, unwrapOptions)
}
// Otherwise, this is the basic call overload
Expand Down
Loading