@metaplex-foundation/kinobi 0.3.3 → 0.4.0

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 (105) hide show
  1. package/dist/cjs/nodes/AccountNode.js +2 -10
  2. package/dist/cjs/nodes/AccountNode.js.map +1 -1
  3. package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js +50 -19
  4. package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js.map +1 -1
  5. package/dist/cjs/renderers/js/GetJavaScriptValidatorBagVisitor.js +46 -32
  6. package/dist/cjs/renderers/js/GetJavaScriptValidatorBagVisitor.js.map +1 -1
  7. package/dist/cjs/renderers/js/templates/accountsPage.njk +5 -5
  8. package/dist/cjs/visitors/BaseNodeOrNullVisitor.js +21 -1
  9. package/dist/cjs/visitors/BaseNodeOrNullVisitor.js.map +1 -1
  10. package/dist/cjs/visitors/BaseNodeVisitor.js +13 -1
  11. package/dist/cjs/visitors/BaseNodeVisitor.js.map +1 -1
  12. package/dist/cjs/visitors/BaseVoidVisitor.js +1 -0
  13. package/dist/cjs/visitors/BaseVoidVisitor.js.map +1 -1
  14. package/dist/cjs/visitors/DefaultVisitor.js +2 -1
  15. package/dist/cjs/visitors/DefaultVisitor.js.map +1 -1
  16. package/dist/cjs/visitors/NodeSelector.js +3 -47
  17. package/dist/cjs/visitors/NodeSelector.js.map +1 -1
  18. package/dist/cjs/visitors/aggregators/GetNodeTreeStringVisitor.js +1 -1
  19. package/dist/cjs/visitors/aggregators/GetNodeTreeStringVisitor.js.map +1 -1
  20. package/dist/cjs/visitors/transformers/AutoSetAccountGpaFieldsVisitor.js +70 -0
  21. package/dist/cjs/visitors/transformers/AutoSetAccountGpaFieldsVisitor.js.map +1 -0
  22. package/dist/cjs/visitors/transformers/AutoSetAnchorDiscriminatorsVisitor.js +1 -1
  23. package/dist/cjs/visitors/transformers/AutoSetAnchorDiscriminatorsVisitor.js.map +1 -1
  24. package/dist/cjs/visitors/transformers/CreateSubInstructionsFromEnumArgsVisitor.js +3 -3
  25. package/dist/cjs/visitors/transformers/CreateSubInstructionsFromEnumArgsVisitor.js.map +1 -1
  26. package/dist/cjs/visitors/transformers/DeduplicateIdenticalDefinedTypesVisitor.js +1 -1
  27. package/dist/cjs/visitors/transformers/DeduplicateIdenticalDefinedTypesVisitor.js.map +1 -1
  28. package/dist/cjs/visitors/transformers/{UnwrapInstructionArgsStructVisitor.js → FlattenInstructionArgsStructVisitor.js} +4 -4
  29. package/dist/cjs/visitors/transformers/FlattenInstructionArgsStructVisitor.js.map +1 -0
  30. package/dist/cjs/visitors/transformers/{UnwrapStructVisitor.js → FlattenStructVisitor.js} +9 -9
  31. package/dist/cjs/visitors/transformers/FlattenStructVisitor.js.map +1 -0
  32. package/dist/cjs/visitors/transformers/SetAccountDiscriminatorFromFieldVisitor.js +2 -2
  33. package/dist/cjs/visitors/transformers/SetAccountDiscriminatorFromFieldVisitor.js.map +1 -1
  34. package/dist/cjs/visitors/transformers/SetInstructionDiscriminatorsVisitor.js +1 -1
  35. package/dist/cjs/visitors/transformers/SetInstructionDiscriminatorsVisitor.js.map +1 -1
  36. package/dist/cjs/visitors/transformers/SetNumberWrappersVisitor.js +1 -1
  37. package/dist/cjs/visitors/transformers/SetNumberWrappersVisitor.js.map +1 -1
  38. package/dist/cjs/visitors/transformers/SetStructDefaultValuesVisitor.js +1 -1
  39. package/dist/cjs/visitors/transformers/SetStructDefaultValuesVisitor.js.map +1 -1
  40. package/dist/cjs/visitors/transformers/TransformDefinedTypesIntoAccountsVisitor.js +51 -0
  41. package/dist/cjs/visitors/transformers/TransformDefinedTypesIntoAccountsVisitor.js.map +1 -0
  42. package/dist/cjs/visitors/transformers/UnwrapTypeDefinedLinksVisitor.js +61 -0
  43. package/dist/cjs/visitors/transformers/UnwrapTypeDefinedLinksVisitor.js.map +1 -0
  44. package/dist/cjs/visitors/transformers/UpdateAccountsVisitor.js +15 -19
  45. package/dist/cjs/visitors/transformers/UpdateAccountsVisitor.js.map +1 -1
  46. package/dist/cjs/visitors/transformers/UpdateDefinedTypesVisitor.js +6 -2
  47. package/dist/cjs/visitors/transformers/UpdateDefinedTypesVisitor.js.map +1 -1
  48. package/dist/cjs/visitors/transformers/UpdateErrorsVisitor.js +1 -1
  49. package/dist/cjs/visitors/transformers/UpdateErrorsVisitor.js.map +1 -1
  50. package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js +9 -20
  51. package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js.map +1 -1
  52. package/dist/cjs/visitors/transformers/UpdateProgramsVisitor.js +1 -1
  53. package/dist/cjs/visitors/transformers/UpdateProgramsVisitor.js.map +1 -1
  54. package/dist/cjs/visitors/transformers/UseCustomAccountSerializerVisitor.js +102 -0
  55. package/dist/cjs/visitors/transformers/UseCustomAccountSerializerVisitor.js.map +1 -0
  56. package/dist/cjs/visitors/transformers/UseCustomInstructionSerializerVisitor.js +87 -0
  57. package/dist/cjs/visitors/transformers/UseCustomInstructionSerializerVisitor.js.map +1 -0
  58. package/dist/cjs/visitors/transformers/index.js +7 -2
  59. package/dist/cjs/visitors/transformers/index.js.map +1 -1
  60. package/dist/types/nodes/AccountNode.d.ts +15 -9
  61. package/dist/types/visitors/NodeSelector.d.ts +1 -2
  62. package/dist/types/visitors/transformers/AutoSetAccountGpaFieldsVisitor.d.ts +14 -0
  63. package/dist/types/visitors/transformers/FlattenStructVisitor.d.ts +8 -0
  64. package/dist/types/visitors/transformers/TransformDefinedTypesIntoAccountsVisitor.d.ts +7 -0
  65. package/dist/types/visitors/transformers/UnwrapTypeDefinedLinksVisitor.d.ts +8 -0
  66. package/dist/types/visitors/transformers/UpdateAccountsVisitor.d.ts +0 -5
  67. package/dist/types/visitors/transformers/UpdateInstructionsVisitor.d.ts +0 -5
  68. package/dist/types/visitors/transformers/UseCustomAccountSerializerVisitor.d.ts +16 -0
  69. package/dist/types/visitors/transformers/UseCustomInstructionSerializerVisitor.d.ts +16 -0
  70. package/dist/types/visitors/transformers/index.d.ts +7 -2
  71. package/package.json +1 -1
  72. package/src/nodes/AccountNode.ts +15 -14
  73. package/src/renderers/js/GetJavaScriptRenderMapVisitor.ts +54 -27
  74. package/src/renderers/js/GetJavaScriptValidatorBagVisitor.ts +47 -32
  75. package/src/renderers/js/templates/accountsPage.njk +5 -5
  76. package/src/visitors/BaseNodeOrNullVisitor.ts +21 -1
  77. package/src/visitors/BaseNodeVisitor.ts +15 -1
  78. package/src/visitors/BaseVoidVisitor.ts +1 -0
  79. package/src/visitors/DefaultVisitor.ts +3 -1
  80. package/src/visitors/NodeSelector.ts +3 -35
  81. package/src/visitors/aggregators/GetNodeTreeStringVisitor.ts +1 -1
  82. package/src/visitors/transformers/AutoSetAccountGpaFieldsVisitor.ts +61 -0
  83. package/src/visitors/transformers/AutoSetAnchorDiscriminatorsVisitor.ts +1 -1
  84. package/src/visitors/transformers/CreateSubInstructionsFromEnumArgsVisitor.ts +3 -3
  85. package/src/visitors/transformers/DeduplicateIdenticalDefinedTypesVisitor.ts +1 -1
  86. package/src/visitors/transformers/{UnwrapInstructionArgsStructVisitor.ts → FlattenInstructionArgsStructVisitor.ts} +3 -3
  87. package/src/visitors/transformers/{UnwrapStructVisitor.ts → FlattenStructVisitor.ts} +8 -8
  88. package/src/visitors/transformers/SetAccountDiscriminatorFromFieldVisitor.ts +2 -2
  89. package/src/visitors/transformers/SetInstructionDiscriminatorsVisitor.ts +1 -1
  90. package/src/visitors/transformers/SetNumberWrappersVisitor.ts +1 -1
  91. package/src/visitors/transformers/SetStructDefaultValuesVisitor.ts +1 -1
  92. package/src/visitors/transformers/TransformDefinedTypesIntoAccountsVisitor.ts +40 -0
  93. package/src/visitors/transformers/UnwrapTypeDefinedLinksVisitor.ts +41 -0
  94. package/src/visitors/transformers/UpdateAccountsVisitor.ts +20 -31
  95. package/src/visitors/transformers/UpdateDefinedTypesVisitor.ts +6 -2
  96. package/src/visitors/transformers/UpdateErrorsVisitor.ts +1 -1
  97. package/src/visitors/transformers/UpdateInstructionsVisitor.ts +18 -32
  98. package/src/visitors/transformers/UpdateProgramsVisitor.ts +1 -1
  99. package/src/visitors/transformers/UseCustomAccountSerializerVisitor.ts +115 -0
  100. package/src/visitors/transformers/UseCustomInstructionSerializerVisitor.ts +97 -0
  101. package/src/visitors/transformers/index.ts +7 -2
  102. package/dist/cjs/visitors/transformers/UnwrapInstructionArgsStructVisitor.js.map +0 -1
  103. package/dist/cjs/visitors/transformers/UnwrapStructVisitor.js.map +0 -1
  104. package/dist/types/visitors/transformers/UnwrapStructVisitor.d.ts +0 -8
  105. /package/dist/types/visitors/transformers/{UnwrapInstructionArgsStructVisitor.d.ts → FlattenInstructionArgsStructVisitor.d.ts} +0 -0
@@ -34,8 +34,9 @@ class AccountNode {
34
34
  docs: (_d = idl.docs) !== null && _d !== void 0 ? _d : [],
35
35
  internal: false,
36
36
  size: (_e = idl.size) !== null && _e !== void 0 ? _e : null,
37
- discriminator: null,
38
37
  seeds,
38
+ discriminator: null,
39
+ gpaFields: [],
39
40
  };
40
41
  return new AccountNode(metadata, type);
41
42
  }
@@ -51,15 +52,6 @@ class AccountNode {
51
52
  get isLinked() {
52
53
  return (0, TypeDefinedLinkNode_1.isTypeDefinedLinkNode)(this.type);
53
54
  }
54
- get discriminatorField() {
55
- var _a, _b;
56
- if ((0, TypeDefinedLinkNode_1.isTypeDefinedLinkNode)(this.type))
57
- return null;
58
- if (((_a = this.metadata.discriminator) === null || _a === void 0 ? void 0 : _a.kind) !== 'field')
59
- return null;
60
- const { name } = this.metadata.discriminator;
61
- return name ? (_b = this.type.fields.find((f) => f.name === name)) !== null && _b !== void 0 ? _b : null : null;
62
- }
63
55
  get variableSeeds() {
64
56
  return this.metadata.seeds.filter((seed) => seed.kind === 'variable');
65
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AccountNode.js","sourceRoot":"","sources":["../../../src/nodes/AccountNode.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AccountNode.js","sourceRoot":"","sources":["../../../src/nodes/AccountNode.ts"],"names":[],"mappings":"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"}
@@ -161,31 +161,61 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
161
161
  'RpcAccount',
162
162
  'RpcGetAccountOptions',
163
163
  'RpcGetAccountsOptions',
164
+ ...(!nodes.isTypeDefinedLinkNode(account.type) ? ['Serializer'] : []),
164
165
  ])
165
166
  .remove('generatedTypes', [account.name]);
166
- // GPA Fields.
167
- let gpaFields = null;
168
- if (!nodes.isTypeDefinedLinkNode(account.type)) {
169
- imports.add('core', ['gpaBuilder', 'Serializer']);
170
- const gpaFieldManifests = account.type.fields.map((field) => {
171
- const fieldWithNoDefaults = new nodes.TypeStructFieldNode({ ...field.metadata, defaultsTo: null, docs: [] }, field.type);
172
- const fieldManifest = fieldWithNoDefaults.accept(this.typeManifestVisitor);
173
- imports.mergeWith(fieldManifest.imports);
174
- return fieldManifest;
175
- });
176
- const { discriminatorField } = account;
177
- const discriminatorValue = ((_a = discriminatorField === null || discriminatorField === void 0 ? void 0 : discriminatorField.metadata.defaultsTo) === null || _a === void 0 ? void 0 : _a.value)
167
+ // Discriminator.
168
+ const { discriminator } = account.metadata;
169
+ let resolvedDiscriminator = null;
170
+ if ((discriminator === null || discriminator === void 0 ? void 0 : discriminator.kind) === 'field' && discriminator.value !== null) {
171
+ const rendered = (0, RenderJavaScriptValueNode_1.renderJavaScriptValueNode)(discriminator.value);
172
+ imports.mergeWith(rendered.imports);
173
+ resolvedDiscriminator = {
174
+ kind: 'field',
175
+ name: discriminator.name,
176
+ value: rendered.render,
177
+ };
178
+ }
179
+ else if ((discriminator === null || discriminator === void 0 ? void 0 : discriminator.kind) === 'field' &&
180
+ !nodes.isTypeDefinedLinkNode(account.type)) {
181
+ const discriminatorField = (_a = account.type.fields.find((f) => f.name === discriminator.name)) !== null && _a !== void 0 ? _a : null;
182
+ const discriminatorValue = ((_b = discriminatorField === null || discriminatorField === void 0 ? void 0 : discriminatorField.metadata.defaultsTo) === null || _b === void 0 ? void 0 : _b.value)
178
183
  ? (0, RenderJavaScriptValueNode_1.renderJavaScriptValueNode)(discriminatorField.metadata.defaultsTo.value)
179
184
  : undefined;
180
185
  if (discriminatorValue) {
181
186
  imports.mergeWith(discriminatorValue.imports);
187
+ resolvedDiscriminator = {
188
+ kind: 'field',
189
+ name: discriminator.name,
190
+ value: discriminatorValue.render,
191
+ };
182
192
  }
183
- gpaFields = {
184
- type: `{ ${gpaFieldManifests.map((m) => m.looseType).join('')} }`,
185
- serializers: `[${gpaFieldManifests
186
- .map((m) => m.serializer)
187
- .join(', ')}]`,
188
- discriminator: (_b = discriminatorValue === null || discriminatorValue === void 0 ? void 0 : discriminatorValue.render) !== null && _b !== void 0 ? _b : null,
193
+ }
194
+ else if ((discriminator === null || discriminator === void 0 ? void 0 : discriminator.kind) === 'size') {
195
+ resolvedDiscriminator =
196
+ account.metadata.size !== null
197
+ ? { kind: 'size', value: `${account.metadata.size}` }
198
+ : null;
199
+ }
200
+ // GPA Fields.
201
+ const gpaFields = account.metadata.gpaFields.map((gpaField) => {
202
+ const gpaFieldManifest = gpaField.type.accept(this.typeManifestVisitor);
203
+ imports.mergeWith(gpaFieldManifest.imports);
204
+ return { ...gpaField, manifest: gpaFieldManifest };
205
+ });
206
+ let resolvedGpaFields = null;
207
+ if (gpaFields.length > 0) {
208
+ imports.add('core', ['gpaBuilder']);
209
+ resolvedGpaFields = {
210
+ type: `{ ${gpaFields
211
+ .map((f) => `'${f.name}': ${f.manifest.looseType}`)
212
+ .join(', ')} }`,
213
+ argument: `{ ${gpaFields
214
+ .map((f) => {
215
+ const offset = f.offset === null ? 'null' : `${f.offset}`;
216
+ return `'${f.name}': [${offset}, ${f.manifest.serializer}]`;
217
+ })
218
+ .join(', ')} }`,
189
219
  };
190
220
  }
191
221
  // Seeds.
@@ -208,7 +238,8 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
208
238
  imports: imports.toString(this.options.dependencyMap),
209
239
  program: this.program,
210
240
  typeManifest,
211
- gpaFields,
241
+ discriminator: resolvedDiscriminator,
242
+ gpaFields: resolvedGpaFields,
212
243
  seeds,
213
244
  pdaHelperNeedsSerializer,
214
245
  }));
@@ -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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"}
@@ -52,20 +52,26 @@ class GetJavaScriptValidatorBagVisitor extends visitors_1.GetDefaultValidatorBag
52
52
  visitAccount(account) {
53
53
  const bag = super.visitAccount(account);
54
54
  this.pushNode(account);
55
+ const pascalCaseName = (0, utils_1.pascalCase)(account.name);
55
56
  const exports = {
56
- [account.name]: 'type',
57
- [`${account.name}AccountData`]: 'type',
58
- [`${account.name}AccountDataArgs`]: 'type',
59
- [`fetch${account.name}`]: 'function',
60
- [`safeFetch${account.name}`]: 'function',
61
- [`deserialize${account.name}`]: 'function',
62
- [`get${account.name}AccountDataSerializer`]: 'function',
63
- [`get${account.name}Size`]: 'function',
57
+ [pascalCaseName]: 'type',
58
+ [`${pascalCaseName}AccountData`]: 'type',
59
+ [`${pascalCaseName}AccountDataArgs`]: 'type',
60
+ [`fetch${pascalCaseName}`]: 'function',
61
+ [`safeFetch${pascalCaseName}`]: 'function',
62
+ [`deserialize${pascalCaseName}`]: 'function',
63
+ [`get${pascalCaseName}AccountDataSerializer`]: 'function',
64
+ [`get${pascalCaseName}Size`]: 'function',
64
65
  };
65
66
  if (account.metadata.seeds.length > 0) {
66
- exports[`find${account.name}Pda`] = 'function';
67
+ exports[`find${pascalCaseName}Pda`] = 'function';
68
+ }
69
+ if (account.metadata.gpaFields.length > 0) {
70
+ exports[`get${pascalCaseName}GpaBuilder`] = 'function';
71
+ }
72
+ if (!account.metadata.internal) {
73
+ bag.mergeWith([this.checkExportConflicts(account, exports)]);
67
74
  }
68
- bag.mergeWith([this.checkExportConflicts(account, exports)]);
69
75
  const reservedAccountFields = new Set(['publicKey', 'header']);
70
76
  if (!nodes.isTypeDefinedLinkNode(account.type)) {
71
77
  const invalidFields = account.type.fields
@@ -85,15 +91,19 @@ class GetJavaScriptValidatorBagVisitor extends visitors_1.GetDefaultValidatorBag
85
91
  visitInstruction(instruction) {
86
92
  const bag = super.visitInstruction(instruction);
87
93
  this.pushNode(instruction);
88
- bag.mergeWith([
89
- this.checkExportConflicts(instruction, {
90
- [(0, utils_1.camelCase)(instruction.name)]: 'function',
91
- [`${instruction.name}InstructionAccounts`]: 'type',
92
- [`${instruction.name}InstructionData`]: 'type',
93
- [`${instruction.name}InstructionDataArgs`]: 'type',
94
- [`get${instruction.name}InstructionDataSerializer`]: 'function',
95
- }),
96
- ]);
94
+ const camelCaseName = (0, utils_1.camelCase)(instruction.name);
95
+ const pascalCaseName = (0, utils_1.pascalCase)(instruction.name);
96
+ if (!instruction.metadata.internal) {
97
+ bag.mergeWith([
98
+ this.checkExportConflicts(instruction, {
99
+ [camelCaseName]: 'function',
100
+ [`${pascalCaseName}InstructionAccounts`]: 'type',
101
+ [`${pascalCaseName}InstructionData`]: 'type',
102
+ [`${pascalCaseName}InstructionDataArgs`]: 'type',
103
+ [`get${pascalCaseName}InstructionDataSerializer`]: 'function',
104
+ }),
105
+ ]);
106
+ }
97
107
  this.popNode();
98
108
  return bag;
99
109
  }
@@ -101,19 +111,23 @@ class GetJavaScriptValidatorBagVisitor extends visitors_1.GetDefaultValidatorBag
101
111
  const bag = super.visitDefinedType(definedType);
102
112
  this.pushNode(definedType);
103
113
  const isDataEnum = nodes.isTypeEnumNode(definedType.type) && definedType.type.isDataEnum();
104
- bag.mergeWith([
105
- this.checkExportConflicts(definedType, {
106
- [definedType.name]: 'type',
107
- [`${definedType.name}Args`]: 'type',
108
- [`fetch${definedType.name}`]: 'function',
109
- ...(isDataEnum
110
- ? {
111
- [(0, utils_1.camelCase)(definedType.name)]: 'function',
112
- [`is${definedType.name}`]: 'function',
113
- }
114
- : {}),
115
- }),
116
- ]);
114
+ const camelCaseName = (0, utils_1.camelCase)(definedType.name);
115
+ const pascalCaseName = (0, utils_1.pascalCase)(definedType.name);
116
+ if (!definedType.metadata.internal) {
117
+ bag.mergeWith([
118
+ this.checkExportConflicts(definedType, {
119
+ [pascalCaseName]: 'type',
120
+ [`${pascalCaseName}Args`]: 'type',
121
+ [`fetch${pascalCaseName}`]: 'function',
122
+ ...(isDataEnum
123
+ ? {
124
+ [camelCaseName]: 'function',
125
+ [`is${pascalCaseName}`]: 'function',
126
+ }
127
+ : {}),
128
+ }),
129
+ ]);
130
+ }
117
131
  this.popNode();
118
132
  return bag;
119
133
  }
@@ -1 +1 @@
1
- {"version":3,"file":"GetJavaScriptValidatorBagVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptValidatorBagVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GetJavaScriptValidatorBagVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptValidatorBagVisitor.ts"],"names":[],"mappings":"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"}
@@ -72,12 +72,12 @@ export async function safeFetchAll{{ account.name | pascalCase }}(
72
72
  const s = context.serializer;
73
73
  const programId = context.programs.get('{{ program.name | camelCase }}').publicKey;
74
74
  return gpaBuilder(context, programId)
75
- .registerFields<{{ gpaFields.type }}>({{ gpaFields.serializers }})
75
+ .registerFields<{{ gpaFields.type }}>({{ gpaFields.argument }})
76
76
  .deserializeUsing<{{ account.name | pascalCase }}>((account) => deserialize{{ account.name | pascalCase }}(context, account))
77
- {%- if account.metadata.discriminator.kind === 'field' and gpaFields.discriminator %}
78
- .whereField('{{ account.metadata.discriminator.name }}', {{ gpaFields.discriminator }})
79
- {% elif account.metadata.discriminator.kind === 'size' and account.metadata.size %}
80
- .whereSize({{ account.metadata.size }})
77
+ {%- if discriminator.kind === 'field' %}
78
+ .whereField('{{ discriminator.name }}', {{ discriminator.value }})
79
+ {% elif discriminator.kind === 'size' %}
80
+ .whereSize({{ discriminator.value }})
81
81
  {% endif -%}
82
82
  ;
83
83
  }
@@ -47,7 +47,27 @@ class BaseNodeOrNullVisitor {
47
47
  if (accountType === null)
48
48
  return null;
49
49
  nodes.assertTypeStructOrDefinedLinkNode(accountType);
50
- return new nodes.AccountNode(account.metadata, accountType);
50
+ const seeds = account.metadata.seeds
51
+ .map((seed) => {
52
+ if (seed.kind !== 'variable')
53
+ return seed;
54
+ const newType = seed.type.accept(this);
55
+ if (newType === null)
56
+ return null;
57
+ nodes.assertTypeNode(newType);
58
+ return { ...seed, type: newType };
59
+ })
60
+ .filter((s) => s !== null);
61
+ const gpaFields = account.metadata.gpaFields
62
+ .map((gpaField) => {
63
+ const newType = gpaField.type.accept(this);
64
+ if (newType === null)
65
+ return null;
66
+ nodes.assertTypeNode(newType);
67
+ return { ...gpaField, type: newType };
68
+ })
69
+ .filter((f) => f !== null);
70
+ return new nodes.AccountNode({ ...account.metadata, seeds, gpaFields }, accountType);
51
71
  }
52
72
  visitInstruction(instruction) {
53
73
  const args = instruction.args.accept(this);
@@ -1 +1 @@
1
- {"version":3,"file":"BaseNodeOrNullVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeOrNullVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseNodeOrNullVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeOrNullVisitor.ts"],"names":[],"mappings":"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"}
@@ -45,7 +45,19 @@ class BaseNodeVisitor {
45
45
  visitAccount(account) {
46
46
  const accountType = account.type.accept(this);
47
47
  nodes.assertTypeStructOrDefinedLinkNode(accountType);
48
- return new nodes.AccountNode(account.metadata, accountType);
48
+ const seeds = account.metadata.seeds.map((seed) => {
49
+ if (seed.kind !== 'variable')
50
+ return seed;
51
+ const newType = seed.type.accept(this);
52
+ nodes.assertTypeNode(newType);
53
+ return { ...seed, type: newType };
54
+ });
55
+ const gpaFields = account.metadata.gpaFields.map((gpaField) => {
56
+ const newType = gpaField.type.accept(this);
57
+ nodes.assertTypeNode(newType);
58
+ return { ...gpaField, type: newType };
59
+ });
60
+ return new nodes.AccountNode({ ...account.metadata, seeds, gpaFields }, accountType);
49
61
  }
50
62
  visitInstruction(instruction) {
51
63
  const args = instruction.args.accept(this);
@@ -1 +1 @@
1
- {"version":3,"file":"BaseNodeVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseNodeVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeVisitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkC;AAElC,MAAa,eAAe;IAC1B,SAAS,CAAC,IAAoB;QAC5B,OAAO,IAAI,KAAK,CAAC,QAAQ,CACvB,IAAI,CAAC,QAAQ;aACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACtC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAC3D,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,OAAO,IAAI,KAAK,CAAC,WAAW,CAC1B,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ;aACb,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACtC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,EAC1D,OAAO,CAAC,YAAY;aACjB,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC9C,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAC9D,OAAO,CAAC,YAAY;aACjB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAChC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAC9D,OAAO,CAAC,MAAM;aACX,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAClC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CACzD,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,KAAK,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAChD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,KAAK,CAAC,WAAW,CAC1B,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EACzC,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,WAAkC;QACjD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,KAAK,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,IAAI,KAAK,CAAC,eAAe,CAC9B,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,QAAQ,EACpB,IAAI,EACJ,WAAW,CAAC,eAAe;aACxB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC5B,MAAM,CACL,KAAK,CAAC,6BAA6B,CAAC,KAAK,CAAC,qBAAqB,CAAC,CACjE,CACJ,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,WAAkC;QACjD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,IAAI,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,UAAU,CAAC,KAAsB;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,oBAAoB,CAAC,eAA0C;QAC7D,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,aAAa,CAAC,QAA4B;QACxC,OAAO,IAAI,KAAK,CAAC,YAAY,CAC3B,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxC,KAAK,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC5C,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,oBAAoD;QAEpD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,0BAA0B,CACxB,qBAAsD;QAEtD,MAAM,SAAS,GAAG,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5D,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,IAAI,KAAK,CAAC,yBAAyB,CACxC,qBAAqB,CAAC,IAAI,EAC1B,SAAS,CACV,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,oBAAoD;QAEpD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzD,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,CAAC,wBAAwB,CACvC,oBAAoB,CAAC,IAAI,EACzB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,OAAO,IAAI,KAAK,CAAC,cAAc,CAC7B,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAA6B,EAAE;YACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpC,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;YAC1C,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,eAA0C;QAC7D,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,IAAI,KAAK,CAAC,mBAAmB,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,OAAO,IAAI,KAAK,CAAC,aAAa,CAC5B,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,QAA4B;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,sBAAsB,CACpB,iBAA8C;QAE9C,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjD,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,IAAI,KAAK,CAAC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,kBAAkB,CAAC,aAAsC;QACvD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAnMD,0CAmMC"}
@@ -14,6 +14,7 @@ class BaseVoidVisitor {
14
14
  visitAccount(account) {
15
15
  account.type.accept(this);
16
16
  account.variableSeeds.forEach((seed) => seed.type.accept(this));
17
+ account.metadata.gpaFields.forEach((field) => field.type.accept(this));
17
18
  }
18
19
  visitInstruction(instruction) {
19
20
  instruction.args.accept(this);
@@ -1 +1 @@
1
- {"version":3,"file":"BaseVoidVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseVoidVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseVoidVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseVoidVisitor.ts"],"names":[],"mappings":"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"}
@@ -38,9 +38,10 @@ class DefaultVisitor extends BaseThrowVisitor_1.BaseThrowVisitor {
38
38
  // Defined types.
39
39
  updateRoot(new transformers_1.DeduplicateIdenticalDefinedTypesVisitor());
40
40
  // Accounts.
41
+ updateRoot(new transformers_1.AutoSetAnchorDiscriminatorsVisitor());
41
42
  updateRoot(new transformers_1.AutoSetFixedAccountSizesVisitor());
43
+ updateRoot(new transformers_1.AutoSetAccountGpaFieldsVisitor());
42
44
  // Instructions.
43
- updateRoot(new transformers_1.AutoSetAnchorDiscriminatorsVisitor());
44
45
  updateRoot(new transformers_1.SetInstructionAccountDefaultValuesVisitor(transformers_1.DEFAULT_INSTRUCTION_ACCOUNT_DEFAULT_RULES));
45
46
  updateRoot(new transformers_1.UnwrapInstructionArgsDefinedTypesVisitor());
46
47
  updateRoot(new transformers_1.UnwrapInstructionArgsStructVisitor());
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultVisitor.js","sourceRoot":"","sources":["../../../src/visitors/DefaultVisitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,yDAAsD;AACtD,iDASwB;AAGxB,MAAa,cAAe,SAAQ,mCAAgC;IAClE,SAAS,CAAC,WAA2B;QACnC,IAAI,IAAI,GAAe,WAAW,CAAC;QACnC,MAAM,UAAU,GAAG,CAAC,OAAmC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,GAAG,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,iBAAiB;QACjB,UAAU,CAAC,IAAI,sDAAuC,EAAE,CAAC,CAAC;QAE1D,YAAY;QACZ,UAAU,CAAC,IAAI,8CAA+B,EAAE,CAAC,CAAC;QAElD,gBAAgB;QAChB,UAAU,CAAC,IAAI,iDAAkC,EAAE,CAAC,CAAC;QACrD,UAAU,CACR,IAAI,wDAAyC,CAC3C,wDAAyC,CAC1C,CACF,CAAC;QACF,UAAU,CAAC,IAAI,uDAAwC,EAAE,CAAC,CAAC;QAC3D,UAAU,CAAC,IAAI,iDAAkC,EAAE,CAAC,CAAC;QAErD,UAAU;QACV,UAAU,CAAC,IAAI,8CAA+B,EAAE,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA9BD,wCA8BC"}
1
+ {"version":3,"file":"DefaultVisitor.js","sourceRoot":"","sources":["../../../src/visitors/DefaultVisitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,yDAAsD;AACtD,iDAUwB;AAGxB,MAAa,cAAe,SAAQ,mCAAgC;IAClE,SAAS,CAAC,WAA2B;QACnC,IAAI,IAAI,GAAe,WAAW,CAAC;QACnC,MAAM,UAAU,GAAG,CAAC,OAAmC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,GAAG,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,iBAAiB;QACjB,UAAU,CAAC,IAAI,sDAAuC,EAAE,CAAC,CAAC;QAE1D,YAAY;QACZ,UAAU,CAAC,IAAI,iDAAkC,EAAE,CAAC,CAAC;QACrD,UAAU,CAAC,IAAI,8CAA+B,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,IAAI,6CAA8B,EAAE,CAAC,CAAC;QAEjD,gBAAgB;QAChB,UAAU,CACR,IAAI,wDAAyC,CAC3C,wDAAyC,CAC1C,CACF,CAAC;QACF,UAAU,CAAC,IAAI,uDAAwC,EAAE,CAAC,CAAC;QAC3D,UAAU,CAAC,IAAI,iDAAkC,EAAE,CAAC,CAAC;QAErD,UAAU;QACV,UAAU,CAAC,IAAI,8CAA+B,EAAE,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA/BD,wCA+BC"}
@@ -1,58 +1,14 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
3
  exports.toNodeSelectorFunction = void 0;
27
- const nodes = __importStar(require("../nodes"));
28
4
  const utils_1 = require("../utils");
29
5
  const toNodeSelectorFunction = (selector) => {
30
6
  if (typeof selector === 'function')
31
7
  return selector;
32
8
  const checkType = (node) => {
33
- switch (selector.type) {
34
- case 'program':
35
- return nodes.isProgramNode(node);
36
- case 'instruction':
37
- return nodes.isInstructionNode(node);
38
- case 'account':
39
- return nodes.isAccountNode(node);
40
- case 'definedType':
41
- return nodes.isDefinedTypeNode(node);
42
- case 'error':
43
- return nodes.isErrorNode(node);
44
- case 'typeDefinedLink':
45
- return nodes.isTypeDefinedLinkNode(node);
46
- case 'typeStruct':
47
- return nodes.isTypeStructNode(node);
48
- case 'typeString':
49
- return nodes.isTypeStringNode(node);
50
- case 'typeNumber':
51
- return nodes.isTypeNumberNode(node);
52
- case '*':
53
- default:
54
- return true;
55
- }
9
+ if (!selector.type || selector.type === '*')
10
+ return true;
11
+ return selector.type === node.nodeClass;
56
12
  };
57
13
  const checkName = (node) => {
58
14
  if (selector.name === undefined)
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSelector.js","sourceRoot":"","sources":["../../../src/visitors/NodeSelector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,oCAAoC;AA6B7B,MAAM,sBAAsB,GAAG,CACpC,QAAsB,EACA,EAAE;IACxB,IAAI,OAAO,QAAQ,KAAK,UAAU;QAAE,OAAO,QAAQ,CAAC;IAEpD,MAAM,SAAS,GAAyB,CAAC,IAAI,EAAE,EAAE;QAC/C,QAAQ,QAAQ,CAAC,IAAI,EAAE;YACrB,KAAK,SAAS;gBACZ,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACnC,KAAK,aAAa;gBAChB,OAAO,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,SAAS;gBACZ,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACnC,KAAK,aAAa;gBAChB,OAAO,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,OAAO;gBACV,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjC,KAAK,iBAAiB;gBACpB,OAAO,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC3C,KAAK,YAAY;gBACf,OAAO,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACtC,KAAK,YAAY;gBACf,OAAO,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACtC,KAAK,YAAY;gBACf,OAAO,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACtC,KAAK,GAAG,CAAC;YACT;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC;IAEF,MAAM,SAAS,GAAyB,CAAC,IAAI,EAAE,EAAE;QAC/C,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC7C,OAAO,IAAA,gBAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,KAAM,IAA0B,CAAC,IAAI,CAAC;IACtE,CAAC,CAAC;IAEF,MAAM,UAAU,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACvD,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjD,CAAC,CAAC,QAAQ,CAAC,KAAK;YAChB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,MAAM,YAAY,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAClE,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAChD,OAAO,CAAC,CAAC,OAAO,IAAI,IAAA,gBAAQ,EAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAClE,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAC9B,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAC/B,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAC/B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAChC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC;AAtDW,QAAA,sBAAsB,0BAsDjC"}
1
+ {"version":3,"file":"NodeSelector.js","sourceRoot":"","sources":["../../../src/visitors/NodeSelector.ts"],"names":[],"mappings":";;;AACA,oCAAoC;AAkB7B,MAAM,sBAAsB,GAAG,CACpC,QAAsB,EACA,EAAE;IACxB,IAAI,OAAO,QAAQ,KAAK,UAAU;QAAE,OAAO,QAAQ,CAAC;IAEpD,MAAM,SAAS,GAAyB,CAAC,IAAI,EAAE,EAAE;QAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACzD,OAAO,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC;IAC1C,CAAC,CAAC;IAEF,MAAM,SAAS,GAAyB,CAAC,IAAI,EAAE,EAAE;QAC/C,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC7C,OAAO,IAAA,gBAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,KAAM,IAA0B,CAAC,IAAI,CAAC;IACtE,CAAC,CAAC;IAEF,MAAM,UAAU,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACvD,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjD,CAAC,CAAC,QAAQ,CAAC,KAAK;YAChB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,MAAM,YAAY,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAClE,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAChD,OAAO,CAAC,CAAC,OAAO,IAAI,IAAA,gBAAQ,EAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAClE,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAC9B,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAC/B,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAC/B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;QAChC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC;AAjCW,QAAA,sBAAsB,0BAiCjC"}
@@ -161,7 +161,7 @@ class GetNodeTreeStringVisitor {
161
161
  this.indent += 1;
162
162
  const item = typeOption.item.accept(this);
163
163
  this.indent -= 1;
164
- const prefix = typeOption.prefix.accept(this);
164
+ const prefix = typeOption.prefix.toString();
165
165
  const fixed = typeOption.fixed ? ', fixed' : '';
166
166
  return [
167
167
  this.indented(`[TypeOptionNode] prefix: ${prefix}${fixed}`),