@metaplex-foundation/kinobi 0.10.0 → 0.10.2

package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk

@@ -80,7 +80,7 @@
     {% elif input.defaultsTo.kind === 'value' %}
       {% set inputDefault %}{{ input.defaultsTo.render }}{% endset %}
     {% elif input.defaultsTo.kind === 'resolver' %}
-      {% set inputDefault %}{{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, { ...{{ argsObj }}, ...resolvingArgs }, programId, {{ inputDefaultIsWritable }}){% endset %}
+      {% set inputDefault %}{{ input.defaultsTo.name | camelCase }}(context, { ...{{ accountsObj }}, ...resolvedAccounts }, { ...{{ argsObj }}, ...resolvingArgs }, programId, {{ inputDefaultIsWritable }}){% endset %}
     {% else %}
       {% set inputDefault %}programId /* Unrecognized default kind [{{ input.defaultsTo.kind }}]. */{% endset %}
       {% set inputDefaultIsWritable %}false{% endset %}

package/dist/cjs/visitors/transformers/UnwrapTupleEnumWithSingleStructVisitor.js

@@ -0,0 +1,88 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnwrapTupleEnumWithSingleStructVisitor = void 0;
+const nodes = __importStar(require("../../nodes"));
+const BaseThrowVisitor_1 = require("../BaseThrowVisitor");
+const Visitor_1 = require("../Visitor");
+const aggregators_1 = require("../aggregators");
+const TransformNodesVisitor_1 = require("./TransformNodesVisitor");
+const UnwrapDefinedTypesVisitor_1 = require("./UnwrapDefinedTypesVisitor");
+class UnwrapTupleEnumWithSingleStructVisitor extends BaseThrowVisitor_1.BaseThrowVisitor {
+    constructor(enumsOrVariantsToUnwrap = '*') {
+        super();
+        this.enumsOrVariantsToUnwrap = enumsOrVariantsToUnwrap;
+        this.enumsOrVariantsToUnwrap = enumsOrVariantsToUnwrap;
+    }
+    shouldUnwrap(node, stack) {
+        const stackWithNode = stack.clone();
+        stackWithNode.push(node);
+        if (this.enumsOrVariantsToUnwrap === '*')
+            return true;
+        return this.enumsOrVariantsToUnwrap.some((selector) => stackWithNode.matchesWithNames(selector.split('.')));
+    }
+    visitRoot(root) {
+        const typesToPotentiallyUnwrap = [];
+        const definedTypes = new Map();
+        nodes.getAllDefinedTypes(root).forEach((definedType) => {
+            definedTypes.set(definedType.name, definedType);
+        });
+        let newRoot = (0, Visitor_1.visit)(root, new TransformNodesVisitor_1.TransformNodesVisitor([
+            {
+                selector: { kind: 'enumTupleVariantTypeNode' },
+                transformer: (node, stack) => {
+                    nodes.assertEnumTupleVariantTypeNode(node);
+                    if (!this.shouldUnwrap(node, stack))
+                        return node;
+                    if (node.tuple.children.length !== 1)
+                        return node;
+                    let child = node.tuple.children[0];
+                    if (nodes.isLinkTypeNode(child)) {
+                        if (child.importFrom !== 'generated')
+                            return node;
+                        const definedType = definedTypes.get(child.name);
+                        if (!definedType)
+                            return node;
+                        if (!nodes.isStructTypeNode(definedType.data))
+                            return node;
+                        typesToPotentiallyUnwrap.push(child.name);
+                        child = definedType.data;
+                    }
+                    if (!nodes.isStructTypeNode(child))
+                        return node;
+                    return nodes.enumStructVariantTypeNode(node.name, child);
+                },
+            },
+        ]));
+        nodes.assertRootNode(newRoot);
+        const histogram = (0, Visitor_1.visit)(newRoot, new aggregators_1.GetDefinedTypeHistogramVisitor());
+        const typesToUnwrap = typesToPotentiallyUnwrap.filter((type) => !histogram[type] || histogram[type].total === 0);
+        newRoot = (0, Visitor_1.visit)(newRoot, new UnwrapDefinedTypesVisitor_1.UnwrapDefinedTypesVisitor(typesToUnwrap));
+        nodes.assertRootNode(newRoot);
+        return newRoot;
+    }
+}
+exports.UnwrapTupleEnumWithSingleStructVisitor = UnwrapTupleEnumWithSingleStructVisitor;
+//# sourceMappingURL=UnwrapTupleEnumWithSingleStructVisitor.js.map

package/dist/cjs/visitors/transformers/UnwrapTupleEnumWithSingleStructVisitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnwrapTupleEnumWithSingleStructVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/UnwrapTupleEnumWithSingleStructVisitor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/visitors/transformers/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./TransformNodesVisitor"), exports);
 __exportStar(require("./TransformU8ArraysToBytesVisitor"), exports);
 __exportStar(require("./UnwrapDefinedTypesVisitor"), exports);
 __exportStar(require("./UnwrapInstructionArgsDefinedTypesVisitor"), exports);
+__exportStar(require("./UnwrapTupleEnumWithSingleStructVisitor"), exports);
 __exportStar(require("./UnwrapTypeDefinedLinksVisitor"), exports);
 __exportStar(require("./UpdateAccountsVisitor"), exports);
 __exportStar(require("./UpdateDefinedTypesVisitor"), exports);

package/dist/cjs/visitors/transformers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uEAAqD;AACrD,oEAAkD;AAClD,6EAA2D;AAC3D,4EAA0D;AAC1D,uDAAqC;AACrC,wEAAsD;AACtD,yDAAuC;AACvC,4EAA0D;AAC1D,8EAA4D;AAC5D,wEAAsD;AACtD,kEAAgD;AAChD,6DAA2C;AAC3C,kEAAgD;AAChD,6EAA2D;AAC3D,0DAAwC;AACxC,oEAAkD;AAClD,8DAA4C;AAC5C,6EAA2D;AAC3D,kEAAgD;AAChD,0DAAwC;AACxC,8DAA4C;AAC5C,wDAAsC;AACtC,8DAA4C;AAC5C,0DAAwC;AACxC,sEAAoD;AACpD,0EAAwD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uEAAqD;AACrD,oEAAkD;AAClD,6EAA2D;AAC3D,4EAA0D;AAC1D,uDAAqC;AACrC,wEAAsD;AACtD,yDAAuC;AACvC,4EAA0D;AAC1D,8EAA4D;AAC5D,wEAAsD;AACtD,kEAAgD;AAChD,6DAA2C;AAC3C,kEAAgD;AAChD,6EAA2D;AAC3D,0DAAwC;AACxC,oEAAkD;AAClD,8DAA4C;AAC5C,6EAA2D;AAC3D,2EAAyD;AACzD,kEAAgD;AAChD,0DAAwC;AACxC,8DAA4C;AAC5C,wDAAsC;AACtC,8DAA4C;AAC5C,0DAAwC;AACxC,sEAAoD;AACpD,0EAAwD"}

package/dist/types/visitors/transformers/UnwrapTupleEnumWithSingleStructVisitor.d.ts

@@ -0,0 +1,9 @@
+import * as nodes from '../../nodes';
+import { BaseThrowVisitor } from '../BaseThrowVisitor';
+import { NodeStack } from '../NodeStack';
+export declare class UnwrapTupleEnumWithSingleStructVisitor extends BaseThrowVisitor<nodes.RootNode> {
+    readonly enumsOrVariantsToUnwrap: string[] | '*';
+    constructor(enumsOrVariantsToUnwrap?: string[] | '*');
+    shouldUnwrap(node: nodes.EnumTupleVariantTypeNode, stack: NodeStack): boolean;
+    visitRoot(root: nodes.RootNode): nodes.RootNode;
+}

package/dist/types/visitors/transformers/index.d.ts

@@ -16,6 +16,7 @@ export * from './TransformNodesVisitor';
 export * from './TransformU8ArraysToBytesVisitor';
 export * from './UnwrapDefinedTypesVisitor';
 export * from './UnwrapInstructionArgsDefinedTypesVisitor';
+export * from './UnwrapTupleEnumWithSingleStructVisitor';
 export * from './UnwrapTypeDefinedLinksVisitor';
 export * from './UpdateAccountsVisitor';
 export * from './UpdateDefinedTypesVisitor';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaplex-foundation/kinobi",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Generate powerful clients for your Solana programs",
   "main": "dist/cjs/index.js",
   "types": "dist/types/index.d.ts",

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

@@ -80,7 +80,7 @@
     {% elif input.defaultsTo.kind === 'value' %}
       {% set inputDefault %}{{ input.defaultsTo.render }}{% endset %}
     {% elif input.defaultsTo.kind === 'resolver' %}
-      {% set inputDefault %}{{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, { ...{{ argsObj }}, ...resolvingArgs }, programId, {{ inputDefaultIsWritable }}){% endset %}
+      {% set inputDefault %}{{ input.defaultsTo.name | camelCase }}(context, { ...{{ accountsObj }}, ...resolvedAccounts }, { ...{{ argsObj }}, ...resolvingArgs }, programId, {{ inputDefaultIsWritable }}){% endset %}
     {% else %}
       {% set inputDefault %}programId /* Unrecognized default kind [{{ input.defaultsTo.kind }}]. */{% endset %}
       {% set inputDefaultIsWritable %}false{% endset %}

package/src/visitors/transformers/UnwrapTupleEnumWithSingleStructVisitor.ts

@@ -0,0 +1,70 @@
+import * as nodes from '../../nodes';
+import { BaseThrowVisitor } from '../BaseThrowVisitor';
+import { NodeStack } from '../NodeStack';
+import { visit } from '../Visitor';
+import { GetDefinedTypeHistogramVisitor } from '../aggregators';
+import { TransformNodesVisitor } from './TransformNodesVisitor';
+import { UnwrapDefinedTypesVisitor } from './UnwrapDefinedTypesVisitor';
+
+export class UnwrapTupleEnumWithSingleStructVisitor extends BaseThrowVisitor<nodes.RootNode> {
+  constructor(readonly enumsOrVariantsToUnwrap: string[] | '*' = '*') {
+    super();
+    this.enumsOrVariantsToUnwrap = enumsOrVariantsToUnwrap;
+  }
+
+  shouldUnwrap(
+    node: nodes.EnumTupleVariantTypeNode,
+    stack: NodeStack
+  ): boolean {
+    const stackWithNode = stack.clone();
+    stackWithNode.push(node);
+    if (this.enumsOrVariantsToUnwrap === '*') return true;
+    return this.enumsOrVariantsToUnwrap.some((selector) =>
+      stackWithNode.matchesWithNames(selector.split('.'))
+    );
+  }
+
+  visitRoot(root: nodes.RootNode): nodes.RootNode {
+    const typesToPotentiallyUnwrap: string[] = [];
+    const definedTypes: Map<string, nodes.DefinedTypeNode> = new Map();
+    nodes.getAllDefinedTypes(root).forEach((definedType) => {
+      definedTypes.set(definedType.name, definedType);
+    });
+
+    let newRoot = visit(
+      root,
+      new TransformNodesVisitor([
+        {
+          selector: { kind: 'enumTupleVariantTypeNode' },
+          transformer: (node, stack) => {
+            nodes.assertEnumTupleVariantTypeNode(node);
+            if (!this.shouldUnwrap(node, stack)) return node;
+            if (node.tuple.children.length !== 1) return node;
+            let child = node.tuple.children[0];
+            if (nodes.isLinkTypeNode(child)) {
+              if (child.importFrom !== 'generated') return node;
+              const definedType = definedTypes.get(child.name);
+              if (!definedType) return node;
+              if (!nodes.isStructTypeNode(definedType.data)) return node;
+              typesToPotentiallyUnwrap.push(child.name);
+              child = definedType.data;
+            }
+            if (!nodes.isStructTypeNode(child)) return node;
+            return nodes.enumStructVariantTypeNode(node.name, child);
+          },
+        },
+      ])
+    );
+    nodes.assertRootNode(newRoot);
+
+    const histogram = visit(newRoot, new GetDefinedTypeHistogramVisitor());
+    const typesToUnwrap = typesToPotentiallyUnwrap.filter(
+      (type) => !histogram[type] || histogram[type].total === 0
+    );
+
+    newRoot = visit(newRoot, new UnwrapDefinedTypesVisitor(typesToUnwrap));
+    nodes.assertRootNode(newRoot);
+
+    return newRoot;
+  }
+}

package/src/visitors/transformers/index.ts

@@ -16,6 +16,7 @@ export * from './TransformNodesVisitor';
 export * from './TransformU8ArraysToBytesVisitor';
 export * from './UnwrapDefinedTypesVisitor';
 export * from './UnwrapInstructionArgsDefinedTypesVisitor';
+export * from './UnwrapTupleEnumWithSingleStructVisitor';
 export * from './UnwrapTypeDefinedLinksVisitor';
 export * from './UpdateAccountsVisitor';
 export * from './UpdateDefinedTypesVisitor';