Skip to content

Refactor JS type manifest visitors #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2024
+32 −39
Merged

Refactor JS type manifest visitors #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions packages/renderers-js-umi/src/getRenderMapVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { logWarn } from '@codama/errors';
import {
camelCase,
CamelCaseString,
definedTypeNode,
FieldDiscriminatorNode,
getAllAccounts,
getAllDefinedTypes,
Expand Down Expand Up @@ -37,7 +38,7 @@ import {
} from '@codama/visitors-core';

import { ContextMap } from './ContextMap';
import { getTypeManifestVisitor as baseGetTypeManifestVisitor } from './getTypeManifestVisitor';
import { getTypeManifestVisitor } from './getTypeManifestVisitor';
import { ImportMap } from './ImportMap';
import { renderInstructionDefaults } from './renderInstructionDefaults';
import {
Expand Down Expand Up @@ -88,17 +89,14 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}): Visitor<
const customInstructionData = parseCustomDataOptions(options.customInstructionData ?? [], 'InstructionData');
const getImportFrom = getImportFromFactory(options.linkOverrides ?? {}, customAccountData, customInstructionData);

const getTypeManifestVisitor = (parentName?: { loose: string; strict: string }) =>
baseGetTypeManifestVisitor({
customAccountData,
customInstructionData,
getImportFrom,
linkables,
nonScalarEnums,
parentName,
stack,
});
const typeManifestVisitor = getTypeManifestVisitor();
const typeManifestVisitor = getTypeManifestVisitor({
customAccountData,
customInstructionData,
getImportFrom,
linkables,
nonScalarEnums,
stack,
});
const resolvedInstructionInputVisitor = getResolvedInstructionInputsVisitor();
const byteSizeVisitor = getByteSizeVisitor(linkables, { stack });

Expand Down Expand Up @@ -386,12 +384,11 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}): Visitor<
}

// Extra args.
const extraArgStruct = structTypeNodeFromInstructionArgumentNodes(node.extraArguments ?? []);
const visitor = getTypeManifestVisitor({
loose: `${node.name}InstructionExtraArgs`,
strict: `${node.name}InstructionExtra`,
const extraArgStruct = definedTypeNode({
name: `${node.name}InstructionExtra`,
type: structTypeNodeFromInstructionArgumentNodes(node.extraArguments ?? []),
});
const extraArgManifest = visit(extraArgStruct, visitor);
const extraArgManifest = visit(extraArgStruct, typeManifestVisitor);
imports.mergeWith(extraArgManifest.looseImports);

// Arg defaults.
Expand Down
5 changes: 2 additions & 3 deletions packages/renderers-js-umi/src/getTypeManifestVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@ export function getTypeManifestVisitor(input: {
getImportFrom: GetImportFromFunction;
linkables: LinkableDictionary;
nonScalarEnums: CamelCaseString[];
parentName?: { loose: string; strict: string };
stack?: NodeStack;
}) {
const { linkables, nonScalarEnums, customAccountData, customInstructionData, getImportFrom } = input;
let parentName = input.parentName ?? null;
let parentSize: NumberTypeNode | number | null = null;
const stack = input.stack ?? new NodeStack();
let parentName: { loose: string; strict: string } | null = null;
let parentSize: NumberTypeNode | number | null = null;

return pipe(
staticVisitor(
Expand Down
32 changes: 15 additions & 17 deletions packages/renderers-js/src/getRenderMapVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { logWarn } from '@codama/errors';
import {
camelCase,
CamelCaseString,
definedTypeNode,
getAllAccounts,
getAllDefinedTypes,
getAllInstructionsWithSubs,
Expand Down Expand Up @@ -47,7 +48,7 @@ import {
getTypeDiscriminatedUnionHelpersFragment,
getTypeWithCodecFragment,
} from './fragments';
import { getTypeManifestVisitor as baseGetTypeManifestVisitor, TypeManifestVisitor } from './getTypeManifestVisitor';
import { getTypeManifestVisitor, TypeManifestVisitor } from './getTypeManifestVisitor';
import { ImportMap } from './ImportMap';
import { DEFAULT_NAME_TRANSFORMERS, getNameApi, NameApi, NameTransformers } from './nameTransformers';
import {
Expand Down Expand Up @@ -105,18 +106,15 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}) {
const customInstructionData = parseCustomDataOptions(options.customInstructionData ?? [], 'InstructionData');
const getImportFrom = getImportFromFactory(options.linkOverrides ?? {}, customAccountData, customInstructionData);

const getTypeManifestVisitor = (parentName?: { loose: string; strict: string }) =>
baseGetTypeManifestVisitor({
customAccountData,
customInstructionData,
getImportFrom,
linkables,
nameApi,
nonScalarEnums,
parentName,
stack,
});
const typeManifestVisitor = getTypeManifestVisitor();
const typeManifestVisitor = getTypeManifestVisitor({
customAccountData,
customInstructionData,
getImportFrom,
linkables,
nameApi,
nonScalarEnums,
stack,
});
const resolvedInstructionInputVisitor = getResolvedInstructionInputsVisitor();

const globalScope: GlobalFragmentScope = {
Expand Down Expand Up @@ -233,11 +231,11 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}) {
...globalScope,
dataArgsManifest: visit(node, typeManifestVisitor),
extraArgsManifest: visit(
structTypeNodeFromInstructionArgumentNodes(node.extraArguments ?? []),
getTypeManifestVisitor({
loose: nameApi.dataArgsType(instructionExtraName),
strict: nameApi.dataType(instructionExtraName),
definedTypeNode({
name: instructionExtraName,
type: structTypeNodeFromInstructionArgumentNodes(node.extraArguments ?? []),
}),
typeManifestVisitor,
),
instructionPath,
renamedArgs: getRenamedArgsMap(node),
Expand Down
3 changes: 1 addition & 2 deletions packages/renderers-js/src/getTypeManifestVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@ export function getTypeManifestVisitor(input: {
linkables: LinkableDictionary;
nameApi: NameApi;
nonScalarEnums: CamelCaseString[];
parentName?: { loose: string; strict: string };
stack?: NodeStack;
}) {
const { nameApi, linkables, nonScalarEnums, customAccountData, customInstructionData, getImportFrom } = input;
const stack = input.stack ?? new NodeStack();
let parentName = input.parentName ?? null;
let parentName: { loose: string; strict: string } | null = null;

return pipe(
staticVisitor(
Expand Down