codama-renderers-dart 0.5.4 → 0.5.6

package/dist/index.browser.js

@@ -382,7 +382,8 @@ var WELL_KNOWN_ADDRESSES = /* @__PURE__ */ new Map([
   ["TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", "tokenProgramAddress"],
   ["TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb", "token2022ProgramAddress"],
   ["ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL", "associatedTokenProgramAddress"],
-  ["MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr", "memoProgramAddress"],
+  ["Memo4c2pN8afCj432Lb7RMVKi9PbQnnW7ewFFaV3oAH", "memoProgramAddress"],
+  ["MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr", "memoLegacyProgramAddressV3"],
   ["Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo", "memoLegacyProgramAddress"],
   // Metaplex programs
   ["metaqbxxU9qX8rZXkmUJ7haCrXXz2W1PSUq1Rn3E1od", "tokenMetadataProgramAddress"],
@@ -501,7 +502,8 @@ function getDiscriminatorValidationFragment(node, scope) {
             `Discriminator size must be a non-negative safe integer, got ${discriminator.size}.`
           );
         }
-        return fragment`if (bytes.length - offset != ${fragmentFromString(String(discriminator.size))}) {
+        const comparison = node.kind === "accountNode" ? "<" : "!=";
+        return fragment`if (bytes.length - offset ${fragmentFromString(comparison)} ${fragmentFromString(String(discriminator.size))}) {
   throw ${use("SolanaError", "solanaErrors")}(
     ${use("SolanaErrorCode", "solanaErrors")}.codecsInvalidByteLength,
     {
@@ -615,7 +617,12 @@ function emptyTypeManifest() {
 
 // src/visitors/getTypeManifestVisitor.ts
 function getTypeManifestVisitor(input) {
-  const { nameApi, linkables, nonScalarEnums = [] } = input;
+  const {
+    nameApi,
+    linkables,
+    nonScalarEnums = [],
+    linkOverrides = {}
+  } = input;
   const baseVisitor = staticVisitor(
     (node) => {
       throw new CodamaError(CODAMA_ERROR__UNEXPECTED_NODE_KIND, {
@@ -743,8 +750,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 +774,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 +792,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(
@@ -1096,6 +1103,17 @@ function getTypeManifestVisitor(input) {
     },
     visitDefinedTypeLink(node, { self }) {
       const name = node.name;
+      const override = linkOverrides[name];
+      if (override != null) {
+        const moduleKey2 = `linkOverride:${override.path}`;
+        return {
+          type: use(override.type, moduleKey2),
+          encoder: use(override.encoder, moduleKey2),
+          decoder: use(override.decoder, moduleKey2),
+          value: emptyTypeManifest().value,
+          isEnum: false
+        };
+      }
       const typeName = nameApi.dataType(name);
       const isNonScalar = nonScalarEnums.includes(node.name);
       const moduleKey = `definedType:${snakeCase(name)}`;
@@ -1177,7 +1195,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 +1204,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 +1223,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 +1242,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 +1608,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 +1616,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}
 `
   );
 }
@@ -2715,7 +2733,9 @@ function getRenderMapVisitor(options = {}) {
   const linkables = new LinkableDictionary();
   const typeManifestVisitor = getTypeManifestVisitor({
     nameApi,
-    linkables});
+    linkables,
+    linkOverrides: options.linkOverrides
+  });
   const scope = {
     nameApi,
     typeManifestVisitor};
@@ -2894,13 +2914,14 @@ function renderVisitor(outputDir, options = {}) {
     deleteFolderBeforeRendering = true,
     formatCode = false,
     nameApi,
-    dependencyMap
+    dependencyMap,
+    linkOverrides
   } = options;
   return rootNodeVisitor((root) => {
     const normalizedRoot = normalizeRootNode(root);
     const renderMap = visit(
       normalizedRoot,
-      getRenderMapVisitor({ nameApi, dependencyMap })
+      getRenderMapVisitor({ nameApi, dependencyMap, linkOverrides })
     );
     const typePathMap = {};
     for (const renderPath of renderMap.keys()) {
@@ -2925,7 +2946,14 @@ function renderVisitor(outputDir, options = {}) {
         }
         internalMap[key] = rel;
       }
-      const content = resolveFragmentContent(frag, dependencyMap ?? {}, internalMap);
+      const content = resolveFragmentContent(
+        frag,
+        {
+          ...dependencyMap ?? {},
+          ...linkOverrideImports(outputDir, filePath, options.linkOverrides ?? {})
+        },
+        internalMap
+      );
       files.push([fullPath, content]);
     }
     if (deleteFolderBeforeRendering && existsSync(outputDir)) {
@@ -2940,6 +2968,35 @@ function renderVisitor(outputDir, options = {}) {
     }
   });
 }
+function linkOverrideImports(outputDir, generatedFilePath, overrides) {
+  const resolved = {};
+  if (Object.keys(overrides).length === 0) return resolved;
+  const libRoot = findLibRoot(outputDir);
+  if (libRoot == null) {
+    throw new Error(
+      `Cannot resolve linkOverrides because the render output directory "${outputDir}" has no "lib" ancestor.`
+    );
+  }
+  const generatedAbsolute = posix.join(
+    posix.resolve(outputDir),
+    generatedFilePath
+  );
+  for (const override of Object.values(overrides)) {
+    const overrideAbsolute = posix.join(libRoot, override.path);
+    let rel = posix.relative(posix.dirname(generatedAbsolute), overrideAbsolute);
+    if (!rel.startsWith(".")) {
+      rel = `./${rel}`;
+    }
+    resolved[`linkOverride:${override.path}`] = rel;
+  }
+  return resolved;
+}
+function findLibRoot(outputDir) {
+  const segments = posix.resolve(outputDir).split("/");
+  const libIndex = segments.lastIndexOf("lib");
+  if (libIndex < 0) return null;
+  return segments.slice(0, libIndex + 1).join("/");
+}
 function resolveFragmentContent(frag, dependencyMap, internalMap = {}) {
   const { content, imports } = frag;
   const importStr = imports.toString({