@sentio/sdk 2.44.0-rc.5 → 2.44.0-rc.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -127,6 +127,9 @@ ${''
127
127
  }
128
128
  }
129
129
 
130
+ type LogIdFilter<T> = T | T[]
131
+ ${getLogConstants(logByTypes)}
132
+
130
133
  export class ${name}Processor extends FuelAbstractProcessor<${name}> {
131
134
  static bind(options: Omit<FuelProcessorConfig, 'abi'>) {
132
135
  if (!options.name) {
@@ -209,11 +212,30 @@ function collectImportedTypes(types) {
209
212
  }
210
213
  return Array.from(ret);
211
214
  }
215
+ function getLogConstants(logByTypes) {
216
+ return Object.entries(logByTypes)
217
+ .map(([t, ids]) => {
218
+ const name = getTypeName(t);
219
+ if (ids.length == 1) {
220
+ return `const Log${name}Id = "${ids[0]}"`;
221
+ }
222
+ return ids.map((id, idx) => `const Log${name}Id${idx} = "${id}"`).join('\n');
223
+ })
224
+ .join('\n');
225
+ }
212
226
  function genOnLogFunction(contractName, [type, ids]) {
213
227
  const name = getTypeName(type);
228
+ if (ids.length == 1) {
229
+ return `
230
+ onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>) {
231
+ return super.onLog<${type}>([Log${name}Id], (log, ctx) => handler(log, ctx))
232
+ }`;
233
+ }
234
+ const logIdFilterValues = ids.map((_, idx) => `Log${name}Id${idx}`);
214
235
  return `
215
- onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>, logIdFilter?: string | string[]) {
216
- return super.onLog<${type}>(logIdFilter ?? [${ids.map((id) => `"${id}"`).join(', ')}], (log, ctx) => handler(log, ctx))
236
+ onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>,
237
+ logIdFilter?: LogIdFilter<${logIdFilterValues.map((d) => `typeof ${d}`).join(' | ')}> ) {
238
+ return super.onLog<${type}>(logIdFilter ?? [${logIdFilterValues.join(', ')}], (log, ctx) => handler(log, ctx))
217
239
  }`;
218
240
  }
219
241
  function getTypeName(type) {
@@ -1 +1 @@
1
- {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sentio/sdk",
3
- "version": "2.44.0-rc.5",
3
+ "version": "2.44.0-rc.6",
4
4
  "license": "Apache-2.0",
5
5
  "type": "module",
6
6
  "exports": {
@@ -84,8 +84,8 @@
84
84
  "typechain": "^8.3.2",
85
85
  "utility-types": "^3.11.0",
86
86
  "yaml": "^2.3.4",
87
- "@sentio/protos": "2.44.0-rc.5",
88
- "@sentio/runtime": "^2.44.0-rc.5"
87
+ "@sentio/protos": "2.44.0-rc.6",
88
+ "@sentio/runtime": "^2.44.0-rc.6"
89
89
  },
90
90
  "peerDependencies": {
91
91
  "tsup": "npm:@sentio/tsup@^6.7.5"
@@ -144,6 +144,9 @@ ${
144
144
  }
145
145
  }
146
146
 
147
+ type LogIdFilter<T> = T | T[]
148
+ ${getLogConstants(logByTypes)}
149
+
147
150
  export class ${name}Processor extends FuelAbstractProcessor<${name}> {
148
151
  static bind(options: Omit<FuelProcessorConfig, 'abi'>) {
149
152
  if (!options.name) {
@@ -234,11 +237,33 @@ function collectImportedTypes(types: any[]): string[] {
234
237
  return Array.from(ret)
235
238
  }
236
239
 
240
+ function getLogConstants(logByTypes: Record<string, string[]>) {
241
+ return Object.entries(logByTypes)
242
+ .map(([t, ids]) => {
243
+ const name = getTypeName(t)
244
+ if (ids.length == 1) {
245
+ return `const Log${name}Id = "${ids[0]}"`
246
+ }
247
+ return ids.map((id, idx) => `const Log${name}Id${idx} = "${id}"`).join('\n')
248
+ })
249
+ .join('\n')
250
+ }
251
+
237
252
  function genOnLogFunction(contractName: string, [type, ids]: [string, string[]]) {
238
253
  const name = getTypeName(type)
254
+
255
+ if (ids.length == 1) {
256
+ return `
257
+ onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>) {
258
+ return super.onLog<${type}>([Log${name}Id], (log, ctx) => handler(log, ctx))
259
+ }`
260
+ }
261
+ const logIdFilterValues = ids.map((_, idx) => `Log${name}Id${idx}`)
262
+
239
263
  return `
240
- onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>, logIdFilter?: string | string[]) {
241
- return super.onLog<${type}>(logIdFilter ?? [${ids.map((id) => `"${id}"`).join(', ')}], (log, ctx) => handler(log, ctx))
264
+ onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>,
265
+ logIdFilter?: LogIdFilter<${logIdFilterValues.map((d) => `typeof ${d}`).join(' | ')}> ) {
266
+ return super.onLog<${type}>(logIdFilter ?? [${logIdFilterValues.join(', ')}], (log, ctx) => handler(log, ctx))
242
267
  }`
243
268
  }
244
269