@metaplex-foundation/kinobi 0.8.1 → 0.8.3
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.
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js +8 -13
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js.map +1 -1
- package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk +3 -1
- package/dist/cjs/visitors/aggregators/GetByteSizeVisitor.js +4 -2
- package/dist/cjs/visitors/aggregators/GetByteSizeVisitor.js.map +1 -1
- package/package.json +1 -1
- package/src/renderers/js/GetJavaScriptRenderMapVisitor.ts +17 -23
- package/src/renderers/js/templates/instructionsPageResolvedInputs.njk +3 -1
- package/src/visitors/aggregators/GetByteSizeVisitor.ts +3 -2
|
@@ -174,8 +174,7 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
174
174
|
if (!isLinked) {
|
|
175
175
|
imports.mergeWith(typeManifest.looseImports);
|
|
176
176
|
}
|
|
177
|
-
imports
|
|
178
|
-
.add('core', [
|
|
177
|
+
imports.add('core', [
|
|
179
178
|
'Account',
|
|
180
179
|
'assertAccountExists',
|
|
181
180
|
'Context',
|
|
@@ -185,8 +184,7 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
185
184
|
'RpcGetAccountOptions',
|
|
186
185
|
'RpcGetAccountsOptions',
|
|
187
186
|
...(!isLinked ? ['Serializer'] : []),
|
|
188
|
-
])
|
|
189
|
-
.remove('generatedTypes', [account.name]);
|
|
187
|
+
]);
|
|
190
188
|
// Discriminator.
|
|
191
189
|
const { discriminator } = account;
|
|
192
190
|
let resolvedDiscriminator = null;
|
|
@@ -375,14 +373,6 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
375
373
|
else if ((bytes === null || bytes === void 0 ? void 0 : bytes.kind) === 'resolver') {
|
|
376
374
|
imports.add(bytes.importFrom, (0, shared_1.camelCase)(bytes.name));
|
|
377
375
|
}
|
|
378
|
-
// Remove imports from the same module.
|
|
379
|
-
imports.remove('generatedTypes', [
|
|
380
|
-
`${instruction.name}InstructionAccounts`,
|
|
381
|
-
`${instruction.name}InstructionArgs`,
|
|
382
|
-
`${instruction.dataArgs.name}`,
|
|
383
|
-
`${instruction.dataArgs.name}Args`,
|
|
384
|
-
`${instruction.extraArgs.name}Args`,
|
|
385
|
-
]);
|
|
386
376
|
// canMergeAccountsAndArgs
|
|
387
377
|
let canMergeAccountsAndArgs = false;
|
|
388
378
|
if (!linkedDataArgs && !linkedExtraArgs) {
|
|
@@ -424,11 +414,16 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
424
414
|
}));
|
|
425
415
|
}
|
|
426
416
|
visitDefinedType(definedType) {
|
|
417
|
+
const pascalCaseName = (0, shared_1.pascalCase)(definedType.name);
|
|
427
418
|
const typeManifest = (0, visitors_1.visit)(definedType, this.typeManifestVisitor);
|
|
428
419
|
const imports = new JavaScriptImportMap_1.JavaScriptImportMap()
|
|
429
420
|
.mergeWithManifest(typeManifest)
|
|
430
421
|
.add('core', ['Context', 'Serializer'])
|
|
431
|
-
.remove('generatedTypes', [
|
|
422
|
+
.remove('generatedTypes', [
|
|
423
|
+
pascalCaseName,
|
|
424
|
+
`${pascalCaseName}Args`,
|
|
425
|
+
`get${pascalCaseName}Serializer`,
|
|
426
|
+
]);
|
|
432
427
|
return new RenderMap_1.RenderMap().add(`types/${(0, shared_1.camelCase)(definedType.name)}.ts`, this.render('definedTypesPage.njk', {
|
|
433
428
|
definedType,
|
|
434
429
|
imports: imports.toString({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetJavaScriptRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptRenderMapVisitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"GetJavaScriptRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptRenderMapVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,10 @@
|
|
|
23
23
|
{% set inputPrefix %}resolvingArgs, '{{ input.name | camelCase }}', {{ argsObj }}.{{ input.name | camelCase }} ??{% endset %}
|
|
24
24
|
{% endif %}
|
|
25
25
|
{#- Input default value. -#}
|
|
26
|
-
{% if input.defaultsTo.kind === 'account' %}
|
|
26
|
+
{% if input.defaultsTo.kind === 'account' and input.kind === 'account' %}
|
|
27
27
|
{% set inputDefault %}{{ getAccountVar(input.defaultsTo.name, accountsObj) }}{% endset %}
|
|
28
|
+
{% elif input.defaultsTo.kind === 'account' %}
|
|
29
|
+
{% set inputDefault %}publicKey({{ getAccountVar(input.defaultsTo.name, accountsObj) }}){% endset %}
|
|
28
30
|
{% elif input.defaultsTo.kind === 'pda' %}
|
|
29
31
|
{% set inputDefault -%}
|
|
30
32
|
find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
|
|
@@ -91,14 +91,16 @@ class GetByteSizeVisitor extends BaseThrowVisitor_1.BaseThrowVisitor {
|
|
|
91
91
|
return (0, Visitor_1.visit)(linkedDefinedType, this);
|
|
92
92
|
}
|
|
93
93
|
visitEnumType(enumType) {
|
|
94
|
+
var _a;
|
|
95
|
+
const prefix = (_a = (0, Visitor_1.visit)(enumType.size, this)) !== null && _a !== void 0 ? _a : 1;
|
|
94
96
|
if (nodes.isScalarEnum(enumType))
|
|
95
|
-
return
|
|
97
|
+
return prefix;
|
|
96
98
|
const variantSizes = enumType.variants.map((v) => (0, Visitor_1.visit)(v, this));
|
|
97
99
|
const allVariantHaveTheSameFixedSize = variantSizes.every((one, i, all) => one === all[0]);
|
|
98
100
|
return allVariantHaveTheSameFixedSize &&
|
|
99
101
|
variantSizes.length > 0 &&
|
|
100
102
|
variantSizes[0] !== null
|
|
101
|
-
? variantSizes[0] +
|
|
103
|
+
? variantSizes[0] + prefix
|
|
102
104
|
: null;
|
|
103
105
|
}
|
|
104
106
|
visitEnumEmptyVariantType() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetByteSizeVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetByteSizeVisitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,0DAAuD;AACvD,wCAAmC;AAEnC,MAAa,kBAAmB,SAAQ,mCAA+B;IAAvE;;QACU,0BAAqB,GAAG,IAAI,GAAG,EAAiC,CAAC;QAEjE,wBAAmB,GAAG,IAAI,GAAG,EAAyB,CAAC;QAEvD,qBAAgB,GAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"GetByteSizeVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetByteSizeVisitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -210,19 +210,17 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
210
210
|
if (!isLinked) {
|
|
211
211
|
imports.mergeWith(typeManifest.looseImports);
|
|
212
212
|
}
|
|
213
|
-
imports
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
])
|
|
225
|
-
.remove('generatedTypes', [account.name]);
|
|
213
|
+
imports.add('core', [
|
|
214
|
+
'Account',
|
|
215
|
+
'assertAccountExists',
|
|
216
|
+
'Context',
|
|
217
|
+
'deserializeAccount',
|
|
218
|
+
'PublicKey',
|
|
219
|
+
'RpcAccount',
|
|
220
|
+
'RpcGetAccountOptions',
|
|
221
|
+
'RpcGetAccountsOptions',
|
|
222
|
+
...(!isLinked ? ['Serializer'] : []),
|
|
223
|
+
]);
|
|
226
224
|
|
|
227
225
|
// Discriminator.
|
|
228
226
|
const { discriminator } = account;
|
|
@@ -467,15 +465,6 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
467
465
|
imports.add(bytes.importFrom, camelCase(bytes.name));
|
|
468
466
|
}
|
|
469
467
|
|
|
470
|
-
// Remove imports from the same module.
|
|
471
|
-
imports.remove('generatedTypes', [
|
|
472
|
-
`${instruction.name}InstructionAccounts`,
|
|
473
|
-
`${instruction.name}InstructionArgs`,
|
|
474
|
-
`${instruction.dataArgs.name}`,
|
|
475
|
-
`${instruction.dataArgs.name}Args`,
|
|
476
|
-
`${instruction.extraArgs.name}Args`,
|
|
477
|
-
]);
|
|
478
|
-
|
|
479
468
|
// canMergeAccountsAndArgs
|
|
480
469
|
let canMergeAccountsAndArgs = false;
|
|
481
470
|
if (!linkedDataArgs && !linkedExtraArgs) {
|
|
@@ -531,11 +520,16 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
531
520
|
}
|
|
532
521
|
|
|
533
522
|
visitDefinedType(definedType: nodes.DefinedTypeNode): RenderMap {
|
|
523
|
+
const pascalCaseName = pascalCase(definedType.name);
|
|
534
524
|
const typeManifest = visit(definedType, this.typeManifestVisitor);
|
|
535
525
|
const imports = new JavaScriptImportMap()
|
|
536
526
|
.mergeWithManifest(typeManifest)
|
|
537
527
|
.add('core', ['Context', 'Serializer'])
|
|
538
|
-
.remove('generatedTypes', [
|
|
528
|
+
.remove('generatedTypes', [
|
|
529
|
+
pascalCaseName,
|
|
530
|
+
`${pascalCaseName}Args`,
|
|
531
|
+
`get${pascalCaseName}Serializer`,
|
|
532
|
+
]);
|
|
539
533
|
|
|
540
534
|
return new RenderMap().add(
|
|
541
535
|
`types/${camelCase(definedType.name)}.ts`,
|
|
@@ -23,8 +23,10 @@
|
|
|
23
23
|
{% set inputPrefix %}resolvingArgs, '{{ input.name | camelCase }}', {{ argsObj }}.{{ input.name | camelCase }} ??{% endset %}
|
|
24
24
|
{% endif %}
|
|
25
25
|
{#- Input default value. -#}
|
|
26
|
-
{% if input.defaultsTo.kind === 'account' %}
|
|
26
|
+
{% if input.defaultsTo.kind === 'account' and input.kind === 'account' %}
|
|
27
27
|
{% set inputDefault %}{{ getAccountVar(input.defaultsTo.name, accountsObj) }}{% endset %}
|
|
28
|
+
{% elif input.defaultsTo.kind === 'account' %}
|
|
29
|
+
{% set inputDefault %}publicKey({{ getAccountVar(input.defaultsTo.name, accountsObj) }}){% endset %}
|
|
28
30
|
{% elif input.defaultsTo.kind === 'pda' %}
|
|
29
31
|
{% set inputDefault -%}
|
|
30
32
|
find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
|
|
@@ -80,7 +80,8 @@ export class GetByteSizeVisitor extends BaseThrowVisitor<number | null> {
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
visitEnumType(enumType: nodes.EnumTypeNode): number | null {
|
|
83
|
-
|
|
83
|
+
const prefix = visit(enumType.size, this) ?? 1;
|
|
84
|
+
if (nodes.isScalarEnum(enumType)) return prefix;
|
|
84
85
|
const variantSizes = enumType.variants.map((v) => visit(v, this));
|
|
85
86
|
const allVariantHaveTheSameFixedSize = variantSizes.every(
|
|
86
87
|
(one, i, all) => one === all[0]
|
|
@@ -88,7 +89,7 @@ export class GetByteSizeVisitor extends BaseThrowVisitor<number | null> {
|
|
|
88
89
|
return allVariantHaveTheSameFixedSize &&
|
|
89
90
|
variantSizes.length > 0 &&
|
|
90
91
|
variantSizes[0] !== null
|
|
91
|
-
? variantSizes[0] +
|
|
92
|
+
? variantSizes[0] + prefix
|
|
92
93
|
: null;
|
|
93
94
|
}
|
|
94
95
|
|