@metaplex-foundation/kinobi 0.17.5 → 0.17.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.
Files changed (4) hide show
  1. package/dist/cjs/renderers/js-experimental/fragments/programInstructions.js +6 -2
  2. package/dist/cjs/renderers/js-experimental/fragments/programInstructions.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/renderers/js-experimental/fragments/programInstructions.ts +9 -2
package/dist/cjs/renderers/js-experimental/fragments/programInstructions.js CHANGED
@@ -56,13 +56,17 @@ function getProgramInstructionsIdentifierFunctionFragment(scope) {
56
56
  }
57
57
  function getProgramInstructionsParsedUnionTypeFragment(scope) {
58
58
  const { programNode, allInstructions, nameApi } = scope;
59
+ const programAddress = programNode.publicKey;
59
60
  const programInstructionsType = nameApi.programInstructionsParsedUnionType(programNode.name);
60
61
  const programInstructionsEnum = nameApi.programInstructionsEnum(programNode.name);
61
62
  const typeVariants = allInstructions.map((instruction) => {
62
63
  const instructionEnumVariant = nameApi.programInstructionsEnumVariant(instruction.name);
63
64
  const parsedInstructionType = nameApi.instructionParsedType(instruction.name);
64
- return (0, common_1.fragment)(`| { instructionType: ${programInstructionsEnum}.${instructionEnumVariant} } & ${parsedInstructionType}`).addImports('generatedInstructions', parsedInstructionType);
65
+ return (0, common_1.fragment)(`| { instructionType: ${programInstructionsEnum}.${instructionEnumVariant} } & ${parsedInstructionType}<TProgram>`).addImports('generatedInstructions', parsedInstructionType);
65
66
  });
66
- return (0, common_1.mergeFragments)([(0, common_1.fragment)(`export type ${programInstructionsType} =`), ...typeVariants], (r) => r.join('\n'));
67
+ return (0, common_1.mergeFragments)([
68
+ (0, common_1.fragment)(`export type ${programInstructionsType}<TProgram extends string = '${programAddress}'> =`),
69
+ ...typeVariants,
70
+ ], (r) => r.join('\n'));
67
71
  }
68
72
  //# sourceMappingURL=programInstructions.js.map
package/dist/cjs/renderers/js-experimental/fragments/programInstructions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"programInstructions.js","sourceRoot":"","sources":["../../../../../src/renderers/js-experimental/fragments/programInstructions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"programInstructions.js","sourceRoot":"","sources":["../../../../../src/renderers/js-experimental/fragments/programInstructions.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metaplex-foundation/kinobi",
3
- "version": "0.17.5",
3
+ "version": "0.17.6",
4
4
  "description": "Generate powerful clients for your Solana programs",
5
5
  "main": "dist/cjs/index.js",
6
6
  "types": "dist/types/index.d.ts",
package/src/renderers/js-experimental/fragments/programInstructions.ts CHANGED
@@ -113,6 +113,8 @@ function getProgramInstructionsParsedUnionTypeFragment(
113
113
  ): Fragment {
114
114
  const { programNode, allInstructions, nameApi } = scope;
115
115
 
116
+ const programAddress = programNode.publicKey;
117
+
116
118
  const programInstructionsType = nameApi.programInstructionsParsedUnionType(
117
119
  programNode.name
118
120
  );
@@ -131,12 +133,17 @@ function getProgramInstructionsParsedUnionTypeFragment(
131
133
  );
132
134
 
133
135
  return fragment(
134
- `| { instructionType: ${programInstructionsEnum}.${instructionEnumVariant} } & ${parsedInstructionType}`
136
+ `| { instructionType: ${programInstructionsEnum}.${instructionEnumVariant} } & ${parsedInstructionType}<TProgram>`
135
137
  ).addImports('generatedInstructions', parsedInstructionType);
136
138
  });
137
139
 
138
140
  return mergeFragments(
139
- [fragment(`export type ${programInstructionsType} =`), ...typeVariants],
141
+ [
142
+ fragment(
143
+ `export type ${programInstructionsType}<TProgram extends string = '${programAddress}'> =`
144
+ ),
145
+ ...typeVariants,
146
+ ],
140
147
  (r) => r.join('\n')
141
148
  );
142
149
  }