@codama/renderers-js 1.1.0 → 1.1.2

package/dist/index.node.cjs

@@ -839,17 +839,16 @@ accounts.${inputName}.isWritable = ${isWritable ? "true" : "false"}`
         const pdaSeeds2 = defaultValue.pda.seeds.flatMap((seed) => {
           if (nodes.isNode(seed, "constantPdaSeedNode") && nodes.isNode(seed.value, "programIdValueNode")) {
             return [
-              fragment(`getAddressEncoder().encode(${pdaProgram})`).mergeImportsWith(pdaProgram).addImports("solanaAddresses", "getAddressEncoder")
+              fragment(`getAddressEncoder().encode(${pdaProgram.render})`).mergeImportsWith(pdaProgram).addImports("solanaAddresses", "getAddressEncoder")
             ];
           }
           if (nodes.isNode(seed, "constantPdaSeedNode") && !nodes.isNode(seed.value, "programIdValueNode")) {
             const typeManifest2 = visitorsCore.visit(seed.type, typeManifestVisitor);
             const valueManifest2 = visitorsCore.visit(seed.value, typeManifestVisitor);
             return [
-              fragment(`${typeManifest2.encoder}.encode(${valueManifest2.value})`).mergeImportsWith(
-                typeManifest2.encoder,
-                valueManifest2.value
-              )
+              fragment(
+                `${typeManifest2.encoder.render}.encode(${valueManifest2.value.render})`
+              ).mergeImportsWith(typeManifest2.encoder, valueManifest2.value)
             ];
           }
           if (nodes.isNode(seed, "variablePdaSeedNode")) {
@@ -859,23 +858,22 @@ accounts.${inputName}.isWritable = ${isWritable ? "true" : "false"}`
             if (nodes.isNode(valueSeed, "accountValueNode")) {
               return [
                 fragment(
-                  `${typeManifest2.encoder}.encode(expectAddress(accounts.${nodes.camelCase(valueSeed.name)}.value))`
+                  `${typeManifest2.encoder.render}.encode(expectAddress(accounts.${nodes.camelCase(valueSeed.name)}.value))`
                 ).mergeImportsWith(typeManifest2.encoder).addImports("shared", "expectAddress")
               ];
             }
             if (nodes.isNode(valueSeed, "argumentValueNode")) {
               return [
                 fragment(
-                  `${typeManifest2.encoder}.encode(expectSome(args.${nodes.camelCase(valueSeed.name)}))`
+                  `${typeManifest2.encoder.render}.encode(expectSome(args.${nodes.camelCase(valueSeed.name)}))`
                 ).mergeImportsWith(typeManifest2.encoder).addImports("shared", "expectSome")
               ];
             }
             const valueManifest2 = visitorsCore.visit(valueSeed, typeManifestVisitor);
             return [
-              fragment(`${typeManifest2.encoder}.encode(${valueManifest2.value})`).mergeImportsWith(
-                typeManifest2.encoder,
-                valueManifest2.value
-              )
+              fragment(
+                `${typeManifest2.encoder.render}.encode(${valueManifest2.value.render})`
+              ).mergeImportsWith(typeManifest2.encoder, valueManifest2.value)
             ];
           }
           return [];
@@ -1946,19 +1944,19 @@ function getTypeManifestVisitor(input) {
       visitHiddenPrefixType(node, { self }) {
         const manifest = visitorsCore.visit(node.type, self);
         const prefixes = node.prefix.map((c) => visitorsCore.visit(c, self).value);
-        const prefixEncoders = fragment(prefixes.map((c) => `getConstantEncoder(${c})`).join(", ")).addImports("solanaCodecsCore", "getConstantEncoder").mergeImportsWith(...prefixes);
-        const prefixDecoders = fragment(prefixes.map((c) => `getConstantDecoder(${c})`).join(", ")).addImports("solanaCodecsCore", "getConstantDecoder").mergeImportsWith(...prefixes);
-        manifest.encoder.mapRender((r) => `getHiddenPrefixEncoder(${r}, [${prefixEncoders}])`).mergeImportsWith(prefixEncoders).addImports("solanaCodecsDataStructures", "getHiddenPrefixEncoder");
-        manifest.decoder.mapRender((r) => `getHiddenPrefixDecoder(${r}, [${prefixDecoders}])`).mergeImportsWith(prefixDecoders).addImports("solanaCodecsDataStructures", "getHiddenPrefixDecoder");
+        const prefixEncoders = fragment(prefixes.map((c) => `getConstantEncoder(${c.render})`).join(", ")).addImports("solanaCodecsCore", "getConstantEncoder").mergeImportsWith(...prefixes);
+        const prefixDecoders = fragment(prefixes.map((c) => `getConstantDecoder(${c.render})`).join(", ")).addImports("solanaCodecsCore", "getConstantDecoder").mergeImportsWith(...prefixes);
+        manifest.encoder.mapRender((r) => `getHiddenPrefixEncoder(${r}, [${prefixEncoders.render}])`).mergeImportsWith(prefixEncoders).addImports("solanaCodecsDataStructures", "getHiddenPrefixEncoder");
+        manifest.decoder.mapRender((r) => `getHiddenPrefixDecoder(${r}, [${prefixDecoders.render}])`).mergeImportsWith(prefixDecoders).addImports("solanaCodecsDataStructures", "getHiddenPrefixDecoder");
         return manifest;
       },
       visitHiddenSuffixType(node, { self }) {
         const manifest = visitorsCore.visit(node.type, self);
         const suffixes = node.suffix.map((c) => visitorsCore.visit(c, self).value);
-        const suffixEncoders = fragment(suffixes.map((c) => `getConstantEncoder(${c})`).join(", ")).addImports("solanaCodecsCore", "getConstantEncoder").mergeImportsWith(...suffixes);
-        const suffixDecoders = fragment(suffixes.map((c) => `getConstantDecoder(${c})`).join(", ")).addImports("solanaCodecsCore", "getConstantDecoder").mergeImportsWith(...suffixes);
-        manifest.encoder.mapRender((r) => `getHiddenSuffixEncoder(${r}, [${suffixEncoders}])`).mergeImportsWith(suffixEncoders).addImports("solanaCodecsDataStructures", "getHiddenSuffixEncoder");
-        manifest.decoder.mapRender((r) => `getHiddenSuffixDecoder(${r}, [${suffixDecoders}])`).mergeImportsWith(suffixDecoders).addImports("solanaCodecsDataStructures", "getHiddenSuffixDecoder");
+        const suffixEncoders = fragment(suffixes.map((c) => `getConstantEncoder(${c.render})`).join(", ")).addImports("solanaCodecsCore", "getConstantEncoder").mergeImportsWith(...suffixes);
+        const suffixDecoders = fragment(suffixes.map((c) => `getConstantDecoder(${c.render})`).join(", ")).addImports("solanaCodecsCore", "getConstantDecoder").mergeImportsWith(...suffixes);
+        manifest.encoder.mapRender((r) => `getHiddenSuffixEncoder(${r}, [${suffixEncoders.render}])`).mergeImportsWith(suffixEncoders).addImports("solanaCodecsDataStructures", "getHiddenSuffixEncoder");
+        manifest.decoder.mapRender((r) => `getHiddenSuffixDecoder(${r}, [${suffixDecoders.render}])`).mergeImportsWith(suffixDecoders).addImports("solanaCodecsDataStructures", "getHiddenSuffixDecoder");
         return manifest;
       },
       visitInstruction(instruction, { self }) {
@@ -2126,8 +2124,8 @@ function getTypeManifestVisitor(input) {
       visitSentinelType(node, { self }) {
         const manifest = visitorsCore.visit(node.type, self);
         const sentinel = visitorsCore.visit(node.sentinel, self).value;
-        manifest.encoder.mapRender((r) => `addEncoderSentinel(${r}, ${sentinel})`).mergeImportsWith(sentinel).addImports("solanaCodecsCore", "addEncoderSentinel");
-        manifest.decoder.mapRender((r) => `addDecoderSentinel(${r}, ${sentinel})`).mergeImportsWith(sentinel).addImports("solanaCodecsCore", "addDecoderSentinel");
+        manifest.encoder.mapRender((r) => `addEncoderSentinel(${r}, ${sentinel.render})`).mergeImportsWith(sentinel).addImports("solanaCodecsCore", "addEncoderSentinel");
+        manifest.decoder.mapRender((r) => `addDecoderSentinel(${r}, ${sentinel.render})`).mergeImportsWith(sentinel).addImports("solanaCodecsCore", "addDecoderSentinel");
         return manifest;
       },
       visitSetType(setType, { self }) {
@@ -2150,8 +2148,8 @@ function getTypeManifestVisitor(input) {
       visitSizePrefixType(node, { self }) {
         const manifest = visitorsCore.visit(node.type, self);
         const prefix = visitorsCore.visit(node.prefix, self);
-        manifest.encoder.mapRender((r) => `addEncoderSizePrefix(${r}, ${prefix.encoder})`).mergeImportsWith(prefix.encoder).addImports("solanaCodecsCore", "addEncoderSizePrefix");
-        manifest.decoder.mapRender((r) => `addDecoderSizePrefix(${r}, ${prefix.decoder})`).mergeImportsWith(prefix.decoder).addImports("solanaCodecsCore", "addDecoderSizePrefix");
+        manifest.encoder.mapRender((r) => `addEncoderSizePrefix(${r}, ${prefix.encoder.render})`).mergeImportsWith(prefix.encoder).addImports("solanaCodecsCore", "addEncoderSizePrefix");
+        manifest.decoder.mapRender((r) => `addDecoderSizePrefix(${r}, ${prefix.decoder.render})`).mergeImportsWith(prefix.decoder).addImports("solanaCodecsCore", "addDecoderSizePrefix");
         return manifest;
       },
       visitSolAmountType({ number }, { self }) {