@metaplex-foundation/kinobi 0.5.0 → 0.7.0-alpha.0

package/src/renderers/js/templates/instructionsPage.njk

@@ -17,25 +17,15 @@ export function {{ instruction.name | camelCase }}(
     {{- '| \'payer\'' if needsPayer else '' }}
   >,
   {% set accountsType = instruction.name | pascalCase + 'InstructionAccounts' %}
-  {% if instruction.hasPdaAccounts %}
-    {% set argsType %}
-      Omit<{{ instruction.name | pascalCase + 'InstructionDataArgs' }}, 
-      {%- for account in instruction.pdaAccounts -%}
-        "{{ account.pdaBumpArg }}"{% if not loop.last %} | {% endif %}
-      {%- endfor -%}
-      >
-    {% endset %}
-  {% else %}
-    {% set argsType = instruction.name | pascalCase + 'InstructionDataArgs' %}
-  {% endif %}
+  {% set argsType = instruction.name | pascalCase + 'InstructionArgs' %}
   {% if canMergeAccountsAndArgs %}
     {% set accountsObj = 'input' %}
     {% set argsObj = 'input' %}
-    {% if instruction.hasAccounts and instruction.hasArgs %}
+    {% if instruction.hasAccounts and instruction.hasAnyArgs %}
       input: {{ accountsType }} & {{ argsType }},
     {% elif instruction.hasAccounts %}
       input: {{ accountsType }},
-    {% elif instruction.hasArgs %}
+    {% elif instruction.hasAnyArgs %}
       input: {{ argsType }},
     {% endif %}
   {% else %}
@@ -44,7 +34,7 @@ export function {{ instruction.name | camelCase }}(
     {% if instruction.hasAccounts %}
       accounts: {{ accountsType }},
     {% endif %}
-    {% if instruction.hasArgs %}
+    {% if instruction.hasAnyArgs %}
       args: {{ argsType }},
     {% endif %}
   {% endif %}
@@ -53,20 +43,15 @@ export function {{ instruction.name | camelCase }}(
   const keys: AccountMeta[] = [];
 
   // Program ID.
-  const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
+  const programId = { ...context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}'), isWritable: false };
+
+  {% include "instructionsPageResolvedInputs.njk" %}
 
   {% include "instructionsPageAccountMetas.njk" -%}
 
   // Data.
-  {% if instruction.hasArgs and instruction.hasPdaAccounts %}
-    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({
-      ...{{ argsObj }},
-      {% for account in instruction.pdaAccounts %}
-        {{ account.pdaBumpArg }}: {{ account.name | camelCase }}Account.bump,
-      {% endfor %}
-    });
-  {% elif instruction.hasArgs %}
-    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({{ argsObj }});
+  {% if instruction.hasArgs %}
+    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize(resolvedArgs);
   {% elif instruction.hasData %}
     const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({});
   {% else %}
@@ -81,6 +66,8 @@ export function {{ instruction.name | camelCase }}(
     const bytesCreatedOnChain = Number({{ argsObj }}.{{ bytes.name }}){% if bytes.includeHeader %} + ACCOUNT_HEADER_SIZE{% endif %};
   {% elif bytes.kind === 'account' %}
     const bytesCreatedOnChain = get{{ bytes.name | pascalCase }}Size(){% if bytes.includeHeader %} + ACCOUNT_HEADER_SIZE{% endif %};
+  {% elif bytes.kind === 'resolver' %}
+    const bytesCreatedOnChain = {{ bytes.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
   {% else %}
     const bytesCreatedOnChain = 0;
   {% endif %}

package/src/renderers/js/templates/instructionsPageAccountMetas.njk

@@ -1,62 +1,19 @@
-{% if accounts.length > 0 %}
-  // Resolved accounts.
-  {% for account in accounts | sort(false, false, 'dependencyPosition') %}
-    {% if not account.defaultsTo %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
-    {% elif account.defaultsTo.kind === 'account' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? {{ account.defaultsTo.name | camelCase }}Account;
-    {% elif account.defaultsTo.kind === 'pda' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? find{{ account.defaultsTo.pdaAccount | pascalCase }}Pda(context,
-      {%- if (account.defaultsTo.seeds | length) > 0 -%}
-        {
-          {%- for seedKey, seedValue in account.defaultsTo.seeds -%}
-            {%- if seedValue.kind === 'value' -%}
-              {{ seedKey }}: {{ seedValue.render }},
-            {%- elif seedValue.kind === 'account' -%}
-              {{ seedKey }}: publicKey({{ seedValue.name | camelCase }}Account),
-            {%- else -%}
-              {{ seedKey }}: {{ argsObj }}.{{ seedValue.name | camelCase }},
-            {%- endif -%}
-          {%- endfor -%}
-        }
-      {%- endif -%}
-      );
-    {% elif account.defaultsTo.kind === 'publicKey' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? publicKey('{{ account.defaultsTo.publicKey }}');
-    {% elif account.defaultsTo.kind === 'program' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
-    {% elif account.defaultsTo.kind === 'programId' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
-    {% elif account.defaultsTo.kind === 'identity' and (account.isSigner !== false) %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity;
-    {% elif account.defaultsTo.kind === 'identity' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity.publicKey;
-    {% elif account.defaultsTo.kind === 'payer' and (account.isSigner !== false) %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer;
-    {% elif account.defaultsTo.kind === 'payer' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer.publicKey;
-    {% else %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
-    {% endif %}
-  {% endfor %}
-{% endif %}
-
-{% for account in accounts | sort(false, false, 'position') %}
+{% for account in accounts %}
   {% set isWritableString = 'true' if account.isWritable else 'false' %}
   // {{ account.name | camelCase | titleCase }}{% if account.resolvedIsOptional %} (optional){% endif %}.
   {% if account.resolvedIsOptional %}
-  if ({{ account.name | camelCase }}Account) {
+  if (resolvedAccounts.{{ account.name | camelCase }}) {
   {% endif %}
     {% if account.resolvedIsSigner === 'either' %}
-      if (isSigner({{ account.name | camelCase }}Account)) {
-        signers.push({{ account.name | camelCase }}Account);
+      if (isSigner(resolvedAccounts.{{ account.name | camelCase }})) {
+        signers.push(resolvedAccounts.{{ account.name | camelCase }});
       }
-      keys.push({ pubkey: publicKey({{ account.name | camelCase }}Account), isSigner: isSigner({{ account.name | camelCase }}Account), isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      keys.push({ pubkey: publicKey(resolvedAccounts.{{ account.name | camelCase }}), isSigner: isSigner(resolvedAccounts.{{ account.name | camelCase }}), isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% elif account.resolvedIsSigner  %}
-      signers.push({{ account.name | camelCase }}Account);
-      keys.push({ pubkey: {{ account.name | camelCase }}Account.publicKey, isSigner: true, isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      signers.push(resolvedAccounts.{{ account.name | camelCase }});
+      keys.push({ pubkey: resolvedAccounts.{{ account.name | camelCase }}.publicKey, isSigner: true, isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% else %}
-      keys.push({ pubkey: {{ account.name | camelCase }}Account, isSigner: false, isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      keys.push({ pubkey: resolvedAccounts.{{ account.name | camelCase }}, isSigner: false, isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% endif %}
   {% if account.resolvedIsOptional %}
   }

package/src/renderers/js/templates/instructionsPageArgs.njk

@@ -1,7 +1,36 @@
-{% if not instruction.isLinked and instruction.hasData %}
-// Arguments.
-{{ macros.exportType(instruction.name | pascalCase + 'InstructionData', typeManifest) }}
+{% if not instruction.hasLinkedArgs and instruction.hasData %}
+  // Data.
+  {{ macros.exportType(instruction.name | pascalCase + 'InstructionData', argManifest) }}
 
-{{ macros.exportSerializer(instruction.name | pascalCase + 'InstructionData', typeManifest) }}
+  {{ macros.exportSerializer(instruction.name | pascalCase + 'InstructionData', argManifest) }}
+{% endif %}
 
-{% endif %}
+{% if not instruction.hasLinkedExtraArgs and instruction.hasExtraArgs %}
+  // Extra Args.
+  export type {{ instruction.name | pascalCase + 'InstructionExtraArgs' }} = {{ extraArgManifest.looseType }};
+{% endif %}
+
+{% if instruction.hasAnyArgs %}
+  {% set argType %}
+    {% if instruction.hasArgs and instruction.hasExtraArgs %}
+      {{ instruction.name | pascalCase + 'InstructionDataArgs' }} & {{ instruction.name | pascalCase + 'InstructionExtraArgs' }}
+    {% elif instruction.hasArgs %}
+      {{ instruction.name | pascalCase + 'InstructionDataArgs' }}
+    {% elif instruction.hasExtraArgs %}
+      {{ instruction.name | pascalCase + 'InstructionExtraArgs' }}
+    {% endif %}
+  {% endset %}
+
+  // Args.
+  {% if argDefaultKeys.length > 0 %}
+    type PickPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+    export type {{ instruction.name | pascalCase + 'InstructionArgs' }} = PickPartial<
+      {{ argType }}, 
+      {% for key in argDefaultKeys %}
+        "{{ key }}"{% if not loop.last %} | {% endif %}
+      {% endfor %}
+    >;
+  {% else %}
+    export type {{ instruction.name | pascalCase + 'InstructionArgs' }} = {{ argType }};
+  {% endif %}
+{% endif %}

package/src/renderers/js/templates/instructionsPageResolvedInputs.njk

@@ -0,0 +1,63 @@
+{% set hasResolvedAccounts = accounts.length > 0 or instruction.hasResolvers %}
+{% set hasResolvedArgs = instruction.hasArgs or instruction.hasArgDefaults or instruction.hasResolvers %}
+
+{% if resolvedInputs.length > 0 or hasResolvedAccounts or hasResolvedArgs %}
+  // Resolved inputs.
+  {% if hasResolvedAccounts %}
+    const resolvedAccounts: any = { ...{{ accountsObj }} };
+  {% endif %}
+  {% if hasResolvedArgs %}
+    const resolvedArgs: any = { ...{{ argsObj }} };
+  {% endif %}
+  {% for input in resolvedInputs %}
+    {% if input.kind === 'account' and input.defaultsTo %}
+      {% if input.defaultsTo.kind === 'account' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'pda' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
+        {%- if (input.defaultsTo.seeds | length) > 0 -%}
+          {
+            {%- for seedKey, seedValue in input.defaultsTo.seeds -%}
+              {%- if seedValue.kind === 'value' -%}
+                {{ seedKey }}: {{ seedValue.render }},
+              {%- elif seedValue.kind === 'account' -%}
+                {{ seedKey }}: publicKey(resolvedAccounts.{{ seedValue.name | camelCase }}),
+              {%- else -%}
+                {{ seedKey }}: resolvedArgs.{{ seedValue.name | camelCase }},
+              {%- endif -%}
+            {%- endfor -%}
+          }
+        {%- endif -%}
+        );
+      {% elif input.defaultsTo.kind === 'publicKey' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? publicKey('{{ input.defaultsTo.publicKey }}');
+      {% elif input.defaultsTo.kind === 'program' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ input.defaultsTo.program.name }}', '{{ input.defaultsTo.program.publicKey }}'), isWritable: false };
+      {% elif input.defaultsTo.kind === 'programId' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? programId;
+      {% elif input.defaultsTo.kind === 'identity' and (input.isSigner !== false) %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.identity;
+      {% elif input.defaultsTo.kind === 'identity' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.identity.publicKey;
+      {% elif input.defaultsTo.kind === 'payer' and (input.isSigner !== false) %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.payer;
+      {% elif input.defaultsTo.kind === 'payer' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.payer.publicKey;
+      {% elif input.defaultsTo.kind === 'resolver' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? {{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
+      {% endif %}
+    {% elif input.kind === 'arg' %}
+      {% if input.defaultsTo.kind === 'arg' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedArgs.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'account' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'accountBump' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }}.bump;
+      {% elif input.defaultsTo.kind === 'value' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? {{ input.defaultsTo.render }};
+      {% elif input.defaultsTo.kind === 'resolver' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? {{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endif %}

package/src/renderers/js/templates/programsPage.njk

@@ -4,11 +4,13 @@
 {% block main %}
 {{ imports }}
 
+export const {{ program.name | snakeCase | upper }}_PROGRAM_ID = publicKey('{{ program.metadata.publicKey }}');
+
 {{ macros.docblock(program.docs) }}
-export function get{{ program.name | pascalCase }}Program(): Program {
+export function create{{ program.name | pascalCase }}Program(): Program {
   return {
     name: '{{ program.name | camelCase }}',
-    publicKey: publicKey('{{ program.metadata.publicKey }}'),
+    publicKey: {{ program.name | snakeCase | upper }}_PROGRAM_ID,
     getErrorFromCode(code: number, cause?: Error) {
       return get{{ program.name | pascalCase }}ErrorFromCode(code, this, cause);
     },
@@ -20,4 +22,12 @@ export function get{{ program.name | pascalCase }}Program(): Program {
     },
   };
 }
+
+export function get{{ program.name | pascalCase }}Program<T extends Program = Program>(context: Pick<Context, 'programs'>, clusterFilter?: ClusterFilter): T {
+  return context.programs.get<T>("{{ program.name | camelCase }}", clusterFilter);
+}
+
+export function get{{ program.name | pascalCase }}ProgramId(context: Pick<Context, 'programs'>, clusterFilter?: ClusterFilter): PublicKey {
+  return context.programs.getPublicKey("{{ program.name | camelCase }}", {{ program.name | snakeCase | upper }}_PROGRAM_ID, clusterFilter);
+}
 {% endblock %}

package/src/visitors/BaseNodeOrNullVisitor.ts

@@ -63,10 +63,15 @@ export class BaseNodeOrNullVisitor implements Visitor<nodes.Node | null> {
     const args = instruction.args.accept(this);
     if (args === null) return null;
     nodes.assertTypeStructOrDefinedLinkNode(args);
+    const extraArgs = instruction.extraArgs?.accept(this) ?? null;
+    if (extraArgs !== null) {
+      nodes.assertTypeStructOrDefinedLinkNode(args);
+    }
     return new nodes.InstructionNode(
       instruction.metadata,
       instruction.accounts,
       args,
+      extraArgs as nodes.TypeStructNode | nodes.TypeDefinedLinkNode | null,
       instruction.subInstructions
         .map((ix) => ix.accept(this))
         .filter(

package/src/visitors/BaseNodeVisitor.ts

@@ -51,10 +51,15 @@ export class BaseNodeVisitor implements Visitor<nodes.Node> {
   visitInstruction(instruction: nodes.InstructionNode): nodes.Node {
     const args = instruction.args.accept(this);
     nodes.assertTypeStructOrDefinedLinkNode(args);
+    const extraArgs = instruction.extraArgs?.accept(this) ?? null;
+    if (extraArgs !== null) {
+      nodes.assertTypeStructOrDefinedLinkNode(args);
+    }
     return new nodes.InstructionNode(
       instruction.metadata,
       instruction.accounts,
       args,
+      extraArgs as nodes.TypeStructNode | nodes.TypeDefinedLinkNode | null,
       instruction.subInstructions
         .map((ix) => ix.accept(this))
         .filter(

package/src/visitors/BaseVoidVisitor.ts

@@ -21,6 +21,7 @@ export abstract class BaseVoidVisitor implements Visitor<void> {
 
   visitInstruction(instruction: nodes.InstructionNode): void {
     instruction.args.accept(this);
+    instruction.extraArgs?.accept(this);
     instruction.subInstructions.forEach((ix) => ix.accept(this));
   }
 

package/src/visitors/aggregators/GetDefaultValidatorBagVisitor.ts

@@ -1,8 +1,9 @@
 import * as nodes from '../../nodes';
+import { mainCase } from '../../utils';
 import { NodeStack } from '../NodeStack';
 import { ValidatorBag } from '../ValidatorBag';
 import { Visitor } from '../Visitor';
-import { GetResolvedInstructionAccountsVisitor } from './GetResolvedInstructionAccountsVisitor';
+import { GetResolvedInstructionInputsVisitor } from './GetResolvedInstructionInputsVisitor';
 
 export class GetDefaultValidatorBagVisitor implements Visitor<ValidatorBag> {
   protected stack: NodeStack = new NodeStack();
@@ -84,7 +85,7 @@ export class GetDefaultValidatorBagVisitor implements Visitor<ValidatorBag> {
     });
 
     // Check for cyclic dependencies in account defaults.
-    const cyclicCheckVisitor = new GetResolvedInstructionAccountsVisitor();
+    const cyclicCheckVisitor = new GetResolvedInstructionInputsVisitor();
     try {
       instruction.accept(cyclicCheckVisitor);
     } catch (error) {
@@ -95,8 +96,53 @@ export class GetDefaultValidatorBagVisitor implements Visitor<ValidatorBag> {
       );
     }
 
+    // Check args.
     bag.mergeWith([instruction.args.accept(this)]);
 
+    // Check extra args.
+    if (instruction.extraArgs) {
+      bag.mergeWith([instruction.extraArgs.accept(this)]);
+      if (
+        nodes.isTypeStructNode(instruction.args) &&
+        nodes.isTypeStructNode(instruction.extraArgs)
+      ) {
+        const names = [
+          ...instruction.args.fields.map(({ name }) => mainCase(name)),
+          ...instruction.extraArgs.fields.map(({ name }) => mainCase(name)),
+        ];
+        const duplicates = names.filter((e, i, a) => a.indexOf(e) !== i);
+        const uniqueDuplicates = [...new Set(duplicates)];
+        const hasConflictingNames = uniqueDuplicates.length > 0;
+        if (hasConflictingNames) {
+          bag.error(
+            `The names of the following instruction arguments are conflicting: ` +
+              `[${uniqueDuplicates.join(', ')}].`,
+            instruction,
+            this.stack
+          );
+        }
+      }
+    }
+
+    // Check arg defaults.
+    Object.entries(instruction.metadata.argDefaults).forEach(
+      ([name, defaultsTo]) => {
+        if (defaultsTo.kind === 'accountBump') {
+          const defaultAccount = instruction.accounts.find(
+            (account) => account.name === defaultsTo.name
+          );
+          if (defaultAccount && defaultAccount.isSigner !== false) {
+            bag.error(
+              `Argument ${name} cannot default to the bump attribute of ` +
+                `the [${defaultsTo.name}] account as it may be a Signer.`,
+              instruction,
+              this.stack
+            );
+          }
+        }
+      }
+    );
+
     // Check sub-instructions.
     bag.mergeWith(instruction.subInstructions.map((ix) => ix.accept(this)));
 

package/src/visitors/aggregators/GetNodeInlineStringVisitor.ts

@@ -32,11 +32,12 @@ export class GetNodeInlineStringVisitor implements Visitor<string> {
   visitInstruction(instruction: nodes.InstructionNode): string {
     const accounts = instruction.accounts.map((account) => account.name);
     const args = instruction.args.accept(this);
+    const extraArgs = instruction.extraArgs?.accept(this);
+    const extraArgsString = extraArgs ? `,extraArgs:(${extraArgs})` : '';
     return (
       `${INSTRUCTION_PREFIX}[${instruction.name}](` +
       `accounts:(${accounts.join(',')}),` +
-      `args:(${args})` +
-      `)`
+      `args:(${args})${extraArgsString})`
     );
   }
 

package/src/visitors/aggregators/GetNodeTreeStringVisitor.ts

@@ -91,6 +91,12 @@ export class GetNodeTreeStringVisitor implements Visitor<string> {
     this.indent += 1;
     children.push(instruction.args.accept(this));
     this.indent -= 1;
+    if (instruction.extraArgs) {
+      children.push(this.indented('extra arguments:'));
+      this.indent += 1;
+      children.push(instruction.extraArgs.accept(this));
+      this.indent -= 1;
+    }
     this.indent -= 1;
     return children.join('\n');
   }