codama-renderers-dart 0.5.4 → 0.5.5

package/dist/index.browser.js

@@ -743,8 +743,8 @@ function getTypeManifestVisitor(input) {
     },
     visitArrayType(node, { self }) {
       const itemManifest = visit(node.item, self);
-      const encoderSizeExpr = getArraySizeExpression(node, "Encoder");
-      const decoderSizeExpr = getArraySizeExpression(node, "Decoder");
+      const encoderSizeExpr = getArraySizeExpression(node, "Encoder", self);
+      const decoderSizeExpr = getArraySizeExpression(node, "Decoder", self);
       const itemType = fragmentFromString(itemManifest.type.content);
       const itemEncoder = fragment`${use(
         "transformEncoder",
@@ -767,8 +767,8 @@ function getTypeManifestVisitor(input) {
     visitMapType(node, { self }) {
       const keyManifest = visit(node.key, self);
       const valueManifest = visit(node.value, self);
-      const encoderSizeExpr = getMapSizeExpression(node, "Encoder");
-      const decoderSizeExpr = getMapSizeExpression(node, "Decoder");
+      const encoderSizeExpr = getMapSizeExpression(node, "Encoder", self);
+      const decoderSizeExpr = getMapSizeExpression(node, "Decoder", self);
       return {
         type: fragment`Map<${keyManifest.type}, ${valueManifest.type}>`,
         encoder: fragment`${use(
@@ -785,8 +785,8 @@ function getTypeManifestVisitor(input) {
     },
     visitSetType(node, { self }) {
       const itemManifest = visit(node.item, self);
-      const encoderSizeExpr = getSetSizeExpression(node, "Encoder");
-      const decoderSizeExpr = getSetSizeExpression(node, "Decoder");
+      const encoderSizeExpr = getSetSizeExpression(node, "Encoder", self);
+      const decoderSizeExpr = getSetSizeExpression(node, "Decoder", self);
       return {
         type: fragment`Set<${itemManifest.type}>`,
         encoder: fragment`${use(
@@ -1177,7 +1177,7 @@ function getNumberCodecExpression(node, codecType) {
   const config = node.endian === "be" ? fragment`${use("NumberCodecConfig", "solanaCodecsNumbers")}(endian: ${use("Endian", "dartTypedData")}.big)` : "";
   return fragment`${use(`get${name}${codecType}`, "solanaCodecsNumbers")}(${config})`;
 }
-function getArraySizeExpression(node, codecType) {
+function getArraySizeExpression(node, codecType, self) {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -1186,17 +1186,17 @@ function getArraySizeExpression(node, codecType) {
     case "remainderCountNode":
       return ", size: RemainderArraySize()";
     case "prefixedCountNode": {
-      const resolvedPrefix = resolveNestedTypeNode(count.prefix);
-      if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
+      if (count.prefix.kind === "numberTypeNode" && count.prefix.format === "u32" && (!count.prefix.endian || count.prefix.endian === "le")) {
         return "";
       }
-      return fragment`, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix, codecType)})`;
+      const prefix = visit(count.prefix, self);
+      return fragment`, size: PrefixedArraySize(${codecType === "Encoder" ? prefix.encoder : prefix.decoder})`;
     }
     default:
       return "";
   }
 }
-function getMapSizeExpression(node, codecType) {
+function getMapSizeExpression(node, codecType, self) {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -1205,17 +1205,17 @@ function getMapSizeExpression(node, codecType) {
     case "remainderCountNode":
       return ", size: RemainderArraySize()";
     case "prefixedCountNode": {
-      const resolvedPrefix = resolveNestedTypeNode(count.prefix);
-      if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
+      if (count.prefix.kind === "numberTypeNode" && count.prefix.format === "u32" && (!count.prefix.endian || count.prefix.endian === "le")) {
         return "";
       }
-      return fragment`, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix, codecType)})`;
+      const prefix = visit(count.prefix, self);
+      return fragment`, size: PrefixedArraySize(${codecType === "Encoder" ? prefix.encoder : prefix.decoder})`;
     }
     default:
       return "";
   }
 }
-function getSetSizeExpression(node, codecType) {
+function getSetSizeExpression(node, codecType, self) {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -1224,11 +1224,11 @@ function getSetSizeExpression(node, codecType) {
     case "remainderCountNode":
       return ", size: RemainderArraySize()";
     case "prefixedCountNode": {
-      const resolvedPrefix = resolveNestedTypeNode(count.prefix);
-      if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
+      if (count.prefix.kind === "numberTypeNode" && count.prefix.format === "u32" && (!count.prefix.endian || count.prefix.endian === "le")) {
         return "";
       }
-      return fragment`, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix, codecType)})`;
+      const prefix = visit(count.prefix, self);
+      return fragment`, size: PrefixedArraySize(${codecType === "Encoder" ? prefix.encoder : prefix.decoder})`;
     }
     default:
       return "";
@@ -1590,7 +1590,7 @@ function getIndexPageFragment(fileNames, relativePath = "") {
       "// Auto-generated. Do not edit.\n// ignore_for_file: type=lint\n"
     );
   }
-  const exports = fileNames.sort().map((f) => {
+  const exports$1 = fileNames.sort().map((f) => {
     const path = relativePath ? `${relativePath}/${f}` : f;
     return `export '${path}';`;
   }).join("\n");
@@ -1598,17 +1598,17 @@ function getIndexPageFragment(fileNames, relativePath = "") {
     `// Auto-generated. Do not edit.
 // ignore_for_file: type=lint
 
-${exports}
+${exports$1}
 `
   );
 }
 function getRootIndexPageFragment(categories) {
-  const exports = categories.sort().map((cat) => `export '${cat}/${cat}.dart';`).join("\n");
+  const exports$1 = categories.sort().map((cat) => `export '${cat}/${cat}.dart';`).join("\n");
   return fragmentFromString(
     `// Auto-generated. Do not edit.
 // ignore_for_file: type=lint
 
-${exports}
+${exports$1}
 `
   );
 }