@metaplex-foundation/kinobi 0.18.4 → 0.18.5

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 (6) hide show
  1. package/dist/cjs/renderers/rust/getTypeManifestVisitor.js +16 -3
  2. package/dist/cjs/renderers/rust/getTypeManifestVisitor.js.map +1 -1
  3. package/dist/cjs/renderers/rust/templates/instructionsPage.njk +2 -2
  4. package/package.json +1 -1
  5. package/src/renderers/rust/getTypeManifestVisitor.ts +17 -3
  6. package/src/renderers/rust/templates/instructionsPage.njk +2 -2
package/dist/cjs/renderers/rust/getTypeManifestVisitor.js CHANGED
@@ -163,9 +163,18 @@ function getTypeManifestVisitor() {
163
163
  parentName = (0, shared_1.pascalCase)(originalParentName) + name;
164
164
  const childManifest = (0, visitors_1.visit)(enumTupleVariantType.tuple, self);
165
165
  parentName = originalParentName;
166
+ let derive = '';
167
+ if (childManifest.type === '(Pubkey)') {
168
+ derive =
169
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
170
+ }
171
+ else if (childManifest.type === '(Vec<Pubkey>)') {
172
+ derive =
173
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
174
+ }
166
175
  return {
167
176
  ...childManifest,
168
- type: `${name}${childManifest.type},`,
177
+ type: `${derive}${name}${childManifest.type},`,
169
178
  };
170
179
  },
171
180
  visitMapType(mapType, { self }) {
@@ -247,6 +256,10 @@ function getTypeManifestVisitor() {
247
256
  derive =
248
257
  '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
249
258
  }
259
+ else if (fieldManifest.type === 'Vec<Pubkey>') {
260
+ derive =
261
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
262
+ }
250
263
  else if ((structFieldType.type.kind === 'arrayTypeNode' ||
251
264
  structFieldType.type.kind === 'bytesTypeNode' ||
252
265
  structFieldType.type.kind === 'stringTypeNode') &&
@@ -337,8 +350,8 @@ function getTypeManifestVisitor() {
337
350
  }
338
351
  if ((0, nodes_1.isNode)(stringType.size, 'remainderSizeNode')) {
339
352
  return {
340
- type: `&str`,
341
- imports: new RustImportMap_1.RustImportMap(),
353
+ type: `RemainderStr`,
354
+ imports: new RustImportMap_1.RustImportMap().add(`kaigan::types::RemainderStr`),
342
355
  nestedStructs: [],
343
356
  };
344
357
  }
package/dist/cjs/renderers/rust/getTypeManifestVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getTypeManifestVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getTypeManifestVisitor.ts"],"names":[],"mappings":"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"}
package/dist/cjs/renderers/rust/templates/instructionsPage.njk CHANGED
@@ -108,7 +108,7 @@ impl {{ instruction.name | pascalCase }} {
108
108
  }
109
109
 
110
110
  #[derive(BorshDeserialize, BorshSerialize)]
111
- struct {{ instruction.name | pascalCase }}InstructionData {
111
+ pub struct {{ instruction.name | pascalCase }}InstructionData {
112
112
  {% for arg in instructionArgs %}
113
113
  {% if arg.default %}
114
114
  {{ arg.name | snakeCase }}: {{ arg.type }},
@@ -117,7 +117,7 @@ struct {{ instruction.name | pascalCase }}InstructionData {
117
117
  }
118
118
 
119
119
  impl {{ instruction.name | pascalCase }}InstructionData {
120
- fn new() -> Self {
120
+ pub fn new() -> Self {
121
121
  Self {
122
122
  {% for arg in instructionArgs %}
123
123
  {% if arg.default %}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metaplex-foundation/kinobi",
3
- "version": "0.18.4",
3
+ "version": "0.18.5",
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/rust/getTypeManifestVisitor.ts CHANGED
@@ -220,9 +220,18 @@ export function getTypeManifestVisitor() {
220
220
  const childManifest = visit(enumTupleVariantType.tuple, self);
221
221
  parentName = originalParentName;
222
222
 
223
+ let derive = '';
224
+ if (childManifest.type === '(Pubkey)') {
225
+ derive =
226
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
227
+ } else if (childManifest.type === '(Vec<Pubkey>)') {
228
+ derive =
229
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
230
+ }
231
+
223
232
  return {
224
233
  ...childManifest,
225
- type: `${name}${childManifest.type},`,
234
+ type: `${derive}${name}${childManifest.type},`,
226
235
  };
227
236
  },
228
237
 
@@ -327,6 +336,9 @@ export function getTypeManifestVisitor() {
327
336
  if (fieldManifest.type === 'Pubkey') {
328
337
  derive =
329
338
  '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
339
+ } else if (fieldManifest.type === 'Vec<Pubkey>') {
340
+ derive =
341
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
330
342
  } else if (
331
343
  (structFieldType.type.kind === 'arrayTypeNode' ||
332
344
  structFieldType.type.kind === 'bytesTypeNode' ||
@@ -439,8 +451,10 @@ export function getTypeManifestVisitor() {
439
451
 
440
452
  if (isNode(stringType.size, 'remainderSizeNode')) {
441
453
  return {
442
- type: `&str`,
443
- imports: new RustImportMap(),
454
+ type: `RemainderStr`,
455
+ imports: new RustImportMap().add(
456
+ `kaigan::types::RemainderStr`
457
+ ),
444
458
  nestedStructs: [],
445
459
  };
446
460
  }
package/src/renderers/rust/templates/instructionsPage.njk CHANGED
@@ -108,7 +108,7 @@ impl {{ instruction.name | pascalCase }} {
108
108
  }
109
109
 
110
110
  #[derive(BorshDeserialize, BorshSerialize)]
111
- struct {{ instruction.name | pascalCase }}InstructionData {
111
+ pub struct {{ instruction.name | pascalCase }}InstructionData {
112
112
  {% for arg in instructionArgs %}
113
113
  {% if arg.default %}
114
114
  {{ arg.name | snakeCase }}: {{ arg.type }},
@@ -117,7 +117,7 @@ struct {{ instruction.name | pascalCase }}InstructionData {
117
117
  }
118
118
 
119
119
  impl {{ instruction.name | pascalCase }}InstructionData {
120
- fn new() -> Self {
120
+ pub fn new() -> Self {
121
121
  Self {
122
122
  {% for arg in instructionArgs %}
123
123
  {% if arg.default %}