Add preOffsetTypeNode and postOffsetTypeNode

.changeset/happy-ducks-behave.md

@@ -0,0 +1,5 @@
+---
+"@metaplex-foundation/kinobi": minor
+---
+
+Add preOffsetTypeNode and postOffsetTypeNode

src/nodes/typeNodes/NestedTypeNode.ts

@@ -1,19 +1,24 @@
 import { Node, isNode } from '../Node';
 import { FixedSizeTypeNode } from './FixedSizeTypeNode';
+import { PostOffsetTypeNode } from './PostOffsetTypeNode';
+import { PreOffsetTypeNode } from './PreOffsetTypeNode';
 import { SizePrefixTypeNode } from './SizePrefixTypeNode';
 import { TYPE_NODES, TypeNode } from './TypeNode';
 
 export type NestedTypeNode<TType extends TypeNode> =
   | TType
-  | ((FixedSizeTypeNode | SizePrefixTypeNode) & {
-      type: NestedTypeNode<TType>;
-    });
+  | FixedSizeTypeNode<NestedTypeNode<TType>>
+  | PostOffsetTypeNode<NestedTypeNode<TType>>
+  | PreOffsetTypeNode<NestedTypeNode<TType>>
+  | SizePrefixTypeNode<NestedTypeNode<TType>>;
 
 export function resolveNestedTypeNode<TType extends TypeNode>(
   typeNode: NestedTypeNode<TType>
 ): TType {
   switch (typeNode.kind) {
     case 'fixedSizeTypeNode':
+    case 'postOffsetTypeNode':
+    case 'preOffsetTypeNode':
     case 'sizePrefixTypeNode':
       return resolveNestedTypeNode<TType>(
         typeNode.type as NestedTypeNode<TType>
@@ -32,6 +37,8 @@ export function transformNestedTypeNode<
 ): NestedTypeNode<TTo> {
   switch (typeNode.kind) {
     case 'fixedSizeTypeNode':
+    case 'postOffsetTypeNode':
+    case 'preOffsetTypeNode':
     case 'sizePrefixTypeNode':
       return {
         ...typeNode,

src/nodes/typeNodes/PostOffsetTypeNode.ts

@@ -0,0 +1,20 @@
+import { TypeNode } from './TypeNode';
+
+export interface PostOffsetTypeNode<TType extends TypeNode = TypeNode> {
+  readonly kind: 'postOffsetTypeNode';
+
+  // Children.
+  readonly type: TType;
+
+  // Data.
+  readonly offset: number;
+  readonly strategy?: 'relative' | 'absolute' | 'padded' | 'preOffset';
+}
+
+export function postOffsetTypeNode<TType extends TypeNode>(
+  type: TType,
+  offset: number,
+  strategy?: PostOffsetTypeNode['strategy']
+): PostOffsetTypeNode<TType> {
+  return { kind: 'postOffsetTypeNode', type, offset, strategy };
+}

src/nodes/typeNodes/PreOffsetTypeNode.ts

@@ -0,0 +1,20 @@
+import { TypeNode } from './TypeNode';
+
+export interface PreOffsetTypeNode<TType extends TypeNode = TypeNode> {
+  readonly kind: 'preOffsetTypeNode';
+
+  // Children.
+  readonly type: TType;
+
+  // Data.
+  readonly offset: number;
+  readonly strategy?: 'relative' | 'absolute' | 'padded';
+}
+
+export function preOffsetTypeNode<TType extends TypeNode>(
+  type: TType,
+  offset: number,
+  strategy?: PreOffsetTypeNode['strategy']
+): PreOffsetTypeNode<TType> {
+  return { kind: 'preOffsetTypeNode', type, offset, strategy };
+}

src/nodes/typeNodes/TypeNode.ts

@@ -16,6 +16,8 @@ import { FixedSizeTypeNode } from './FixedSizeTypeNode';
 import { MapTypeNode, mapTypeNodeFromIdl } from './MapTypeNode';
 import { NumberTypeNode, numberTypeNode } from './NumberTypeNode';
 import { OptionTypeNode, optionTypeNodeFromIdl } from './OptionTypeNode';
+import { PostOffsetTypeNode } from './PostOffsetTypeNode';
+import { PreOffsetTypeNode } from './PreOffsetTypeNode';
 import { PublicKeyTypeNode, publicKeyTypeNode } from './PublicKeyTypeNode';
 import { SetTypeNode, setTypeNodeFromIdl } from './SetTypeNode';
 import { SizePrefixTypeNode, sizePrefixTypeNode } from './SizePrefixTypeNode';
@@ -37,6 +39,8 @@ export type StandaloneTypeNode =
   | MapTypeNode
   | NumberTypeNode
   | OptionTypeNode
+  | PostOffsetTypeNode
+  | PreOffsetTypeNode
   | PublicKeyTypeNode
   | SetTypeNode
   | SizePrefixTypeNode
@@ -55,6 +59,8 @@ export const STANDALONE_TYPE_NODE_KINDS = [
   'mapTypeNode',
   'numberTypeNode',
   'optionTypeNode',
+  'postOffsetTypeNode',
+  'preOffsetTypeNode',
   'publicKeyTypeNode',
   'setTypeNode',
   'sizePrefixTypeNode',

src/nodes/typeNodes/index.ts

@@ -13,6 +13,8 @@ export * from './MapTypeNode';
 export * from './NestedTypeNode';
 export * from './NumberTypeNode';
 export * from './OptionTypeNode';
+export * from './PostOffsetTypeNode';
+export * from './PreOffsetTypeNode';
 export * from './PublicKeyTypeNode';
 export * from './SetTypeNode';
 export * from './SizePrefixTypeNode';

src/visitors/getDebugStringVisitor.ts

@@ -126,6 +126,10 @@ function getNodeDetails(node: Node): string[] {
       return [node.size.toString()];
     case 'fixedSizeTypeNode':
       return [node.size.toString()];
+    case 'preOffsetTypeNode':
+      return [node.offset.toString(), node.strategy ?? 'relative'];
+    case 'postOffsetTypeNode':
+      return [node.offset.toString(), node.strategy ?? 'relative'];
     default:
       return 'name' in node ? [node.name] : [];
   }

src/visitors/identityVisitor.ts

@@ -39,6 +39,8 @@ import {
   pdaNode,
   pdaSeedValueNode,
   pdaValueNode,
+  postOffsetTypeNode,
+  preOffsetTypeNode,
   prefixedCountNode,
   programNode,
   removeNullAndAssertIsNodeFilter,
@@ -609,5 +611,23 @@ export function identityVisitor<TNodeKind extends NodeKind = NodeKind>(
     };
   }
 
+  if (castedNodeKeys.includes('preOffsetTypeNode')) {
+    visitor.visitPreOffsetType = function visitPreOffsetType(node) {
+      const type = visit(this)(node.type);
+      if (type === null) return null;
+      assertIsNode(type, TYPE_NODES);
+      return preOffsetTypeNode(type, node.offset, node.strategy);
+    };
+  }
+
+  if (castedNodeKeys.includes('postOffsetTypeNode')) {
+    visitor.visitPostOffsetType = function visitPostOffsetType(node) {
+      const type = visit(this)(node.type);
+      if (type === null) return null;
+      assertIsNode(type, TYPE_NODES);
+      return postOffsetTypeNode(type, node.offset, node.strategy);
+    };
+  }
+
   return visitor as Visitor<Node, TNodeKind>;
 }

src/visitors/mergeVisitor.ts

@@ -335,5 +335,17 @@ export function mergeVisitor<TReturn, TNodeKind extends NodeKind = NodeKind>(
     };
   }
 
+  if (castedNodeKeys.includes('preOffsetTypeNode')) {
+    visitor.visitPreOffsetType = function visitPreOffsetType(node) {
+      return merge(node, visit(this)(node.type));
+    };
+  }
+
+  if (castedNodeKeys.includes('postOffsetTypeNode')) {
+    visitor.visitPostOffsetType = function visitPostOffsetType(node) {
+      return merge(node, visit(this)(node.type));
+    };
+  }
+
   return visitor as Visitor<TReturn, TNodeKind>;
 }

test/visitors/nodes/typeNodes/PostOffsetTypeNode.test.ts

@@ -0,0 +1,32 @@
+import test from 'ava';
+import { postOffsetTypeNode, stringTypeNode } from '../../../../src';
+import {
+  deleteNodesVisitorMacro,
+  getDebugStringVisitorMacro,
+  identityVisitorMacro,
+  mergeVisitorMacro,
+} from '../_setup';
+
+const node = postOffsetTypeNode(stringTypeNode(), 42);
+
+test(mergeVisitorMacro, node, 2);
+test(identityVisitorMacro, node);
+test(deleteNodesVisitorMacro, node, '[stringTypeNode]', null);
+test(deleteNodesVisitorMacro, node, '[postOffsetTypeNode]', null);
+test(
+  getDebugStringVisitorMacro,
+  node,
+  `
+postOffsetTypeNode [42.relative]
+|   stringTypeNode [utf8]`
+);
+
+// Different strategy.
+test(
+  'getDebugStringVisitor: different strategy',
+  getDebugStringVisitorMacro,
+  postOffsetTypeNode(stringTypeNode(), 42, 'absolute'),
+  `
+postOffsetTypeNode [42.absolute]
+|   stringTypeNode [utf8]`
+);

test/visitors/nodes/typeNodes/PreOffsetTypeNode.test.ts

@@ -0,0 +1,32 @@
+import test from 'ava';
+import { preOffsetTypeNode, stringTypeNode } from '../../../../src';
+import {
+  deleteNodesVisitorMacro,
+  getDebugStringVisitorMacro,
+  identityVisitorMacro,
+  mergeVisitorMacro,
+} from '../_setup';
+
+const node = preOffsetTypeNode(stringTypeNode(), 42);
+
+test(mergeVisitorMacro, node, 2);
+test(identityVisitorMacro, node);
+test(deleteNodesVisitorMacro, node, '[stringTypeNode]', null);
+test(deleteNodesVisitorMacro, node, '[preOffsetTypeNode]', null);
+test(
+  getDebugStringVisitorMacro,
+  node,
+  `
+preOffsetTypeNode [42.relative]
+|   stringTypeNode [utf8]`
+);
+
+// Different strategy.
+test(
+  'getDebugStringVisitor: different strategy',
+  getDebugStringVisitorMacro,
+  preOffsetTypeNode(stringTypeNode(), 42, 'absolute'),
+  `
+preOffsetTypeNode [42.absolute]
+|   stringTypeNode [utf8]`
+);