Added tokenURI to ERC721Enumeration implementation

Author: mudgen

src/ERC721/ERC721/ERC721Facet.sol

@@ -18,7 +18,7 @@ interface IERC721Receiver {
         returns (bytes4);
 }
 
-/// @title ERC-721 Token (Zero-Dependency Implementation)
+/// @title ERC-721 Token
 /// @notice A complete, dependency-free ERC-721 implementation using the diamond storage pattern.
 /// @dev This facet provides metadata, ownership, approvals, safe transfers, minting, burning, and helpers.
 contract ERC721Facet {
@@ -90,6 +90,23 @@ contract ERC721Facet {
         return getStorage().symbol;
     }
 
+    /// @notice Provide the metadata URI for a given token ID.
+    /// @param _tokenId tokenID of the NFT to query the metadata from
+    /// @return the URI providing the detailed metadata of the specified tokenID
+    function tokenURI(uint256 _tokenId) external view returns (string memory) {
+        ERC721Storage storage s = getStorage();
+        address owner = s.ownerOf[_tokenId];
+        if (owner == address(0)) {
+            revert ERC721NonexistentToken(_tokenId);
+        }
+
+        if (bytes(s.baseURI).length == 0) {
+            return "";
+        }
+
+        return string.concat(s.baseURI, LibUtils.toString(_tokenId));
+    }
+
     /// @notice Returns the number of tokens owned by a given address.
     /// @param _owner The address to query the balance of.
     /// @return The balance (number of tokens) owned by `_owner`.
@@ -242,21 +259,4 @@ contract ERC721Facet {
             }
         }
     }
-
-    /// @notice Provide the metadata URI for a given token ID.
-    /// @param _tokenId tokenID of the NFT to query the metadata from
-    /// @return the URI providing the detailed metadata of the specified tokenID
-    function tokenURI(uint256 _tokenId) external view returns (string memory) {
-        ERC721Storage storage s = getStorage();
-        address owner = s.ownerOf[_tokenId];
-        if (owner == address(0)) {
-            revert ERC721NonexistentToken(_tokenId);
-        }
-
-        if (bytes(s.baseURI).length == 0) {
-            return "";
-        }
-
-        return string.concat(s.baseURI, LibUtils.toString(_tokenId));
-    }
 }

src/ERC721/ERC721Enumerable/ERC721EnumerableFacet.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.30;
 
+import {LibUtils} from "../../Libraries/LibUtils.sol";
+
 /// @title ERC721 Receiver Interface
 /// @notice Interface for contracts that want to support safe ERC721 token transfers.
 /// @dev Implementers must return the function selector to confirm token receipt.
@@ -16,7 +18,7 @@ interface IERC721Receiver {
         returns (bytes4);
 }
 
-/// @title ERC-721 Enumerable Token (Zero-dependency Implementation)
+/// @title ERC-721 Enumerable Token
 /// @notice A complete, dependency-free ERC-721 implementation with enumeration support using a custom storage layout.
 /// @dev Provides metadata, ownership, approvals, enumeration, safe transfers, minting, and burning features.
 contract ERC721EnumerableFacet {
@@ -52,6 +54,7 @@ contract ERC721EnumerableFacet {
     struct ERC721EnumerableStorage {
         string name;
         string symbol;
+        string baseURI;
         mapping(uint256 tokenId => string tokenURI) tokenURIOf;
         mapping(uint256 tokenId => address owner) ownerOf;
         mapping(address owner => uint256[] ownedTokens) ownedTokensOf;
@@ -83,6 +86,23 @@ contract ERC721EnumerableFacet {
         return getStorage().symbol;
     }
 
+    /// @notice Provide the metadata URI for a given token ID.
+    /// @param _tokenId tokenID of the NFT to query the metadata from
+    /// @return the URI providing the detailed metadata of the specified tokenID
+    function tokenURI(uint256 _tokenId) external view returns (string memory) {
+        ERC721EnumerableStorage storage s = getStorage();
+        address owner = s.ownerOf[_tokenId];
+        if (owner == address(0)) {
+            revert ERC721NonexistentToken(_tokenId);
+        }
+
+        if (bytes(s.baseURI).length == 0) {
+            return "";
+        }
+
+        return string.concat(s.baseURI, LibUtils.toString(_tokenId));
+    }
+
     /// @notice Returns the total number of tokens in existence.
     /// @return The total supply of tokens.
     function totalSupply() external view returns (uint256) {

src/ERC721/ERC721Enumerable/libraries/LibERC721Enumerable.sol

@@ -44,6 +44,7 @@ library LibERC721 {
     struct ERC721EnumerableStorage {
         string name;
         string symbol;
+        string baseURI;
         mapping(uint256 tokenId => address owner) ownerOf;
         mapping(address owner => uint256[] ownedTokens) ownedTokensOf;
         mapping(uint256 tokenId => uint256 ownedTokensIndex) ownedTokensIndexOf;