create-dig-app 0.2.3 → 0.3.0

package/lib/nft-cli.js

@@ -89,10 +89,18 @@ function resolveItems(root, imageFiles) {
  * metadata_hash from the canonical metadata JSON; if a license has been generated, wires its URI +
  * hash in too.
  *
+ * The store id defaults to {@link PLACEHOLDER_STORE_ID} for the initial content-prep pass (before
+ * the capsule is published). After `digstore deploy` returns the real store id, re-run with
+ * `{ storeId }` (CLI `--store-id <id>`) to bake the REAL id into every generated URI so the minted
+ * NFT points at the published capsule — otherwise the on-chain `data_uris`/`metadata_uris`/
+ * `license_uris` keep the literal placeholder permanently (there is no separate substitution step).
+ *
  * @param {string} root Project directory.
+ * @param {{storeId?:string}} [opts] `storeId` — the real published store id; omit for the placeholder.
  * @returns {{count:number, manifestPath:string, metadataDir:string}}
  */
-export function generateMetadata(root) {
+export function generateMetadata(root, opts = {}) {
+  const storeId = opts.storeId ?? PLACEHOLDER_STORE_ID;
   const collection = loadCollection(root);
   const imageFiles = listImages(root);
   const items = resolveItems(root, imageFiles);
@@ -101,7 +109,7 @@ export function generateMetadata(root) {
   mkdirSync(metadataDir, { recursive: true });
 
   // If a license file already exists in licenses/, fold its URI + hash into each item's media.
-  const license = readGeneratedLicense(root, collection);
+  const license = readGeneratedLicense(root, collection, storeId);
 
   const mds = generateItemMetadata(collection, items);
   const manifest = [];
@@ -122,8 +130,8 @@ export function generateMetadata(root) {
     writeFileSync(join(metadataDir, metaName), metaJson + "\n");
     const metadataHash = metadataHashHex(md);
 
-    const data = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `images/${file}` });
-    const meta = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `metadata/${metaName}` });
+    const data = capsuleResourceUris({ storeId, resource: `images/${file}` });
+    const meta = capsuleResourceUris({ storeId, resource: `metadata/${metaName}` });
 
     const media = {
       data_uris: data.uris,
@@ -148,14 +156,14 @@ export function generateMetadata(root) {
 }
 
 /** Read an already-generated license file (if any) and return its uris + hash, else null. */
-function readGeneratedLicense(root, collection) {
+function readGeneratedLicense(root, collection, storeId = PLACEHOLDER_STORE_ID) {
   const id = collection?.license;
   if (!id || !LICENSES[id]) return null;
   const file = licenseFileName(id);
   const path = join(root, "licenses", file);
   if (!existsSync(path)) return null;
   const bytes = readFileSync(path);
-  const { uris } = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `licenses/${file}` });
+  const { uris } = capsuleResourceUris({ storeId, resource: `licenses/${file}` });
   return { id, file, hash: sha256Hex(bytes), uris };
 }
 
@@ -237,7 +245,7 @@ export function validateProject(root) {
         throw new Error(`item "${item.name}": metadata_hash does not match any metadata/*.json`);
       }
     }
-    // data_hash agrees with the real image bytes (resolve the image path from the dig:// URN tail).
+    // data_hash agrees with the real image bytes (resolve the image path from the URN's resource tail).
     const imgFile = resourceTail(media.data_uris?.[0]);
     if (imgFile && media.data_hash != null) {
       const imgPath = join(root, imgFile);
@@ -257,9 +265,14 @@ export function validateProject(root) {
   return { ok: true, checked };
 }
 
-/** Extract the resource path (everything after the first `/`) from a `dig://urn:…/<resource>` URI. */
+/**
+ * Extract the resource path from a capsule URI — the canonical bare URN
+ * `urn:dig:chia:<storeId>:<root>/<resource>` or the `https://<host>/<resource>` gateway fallback.
+ * Strip an optional `scheme://authority` prefix, then the resource is everything after the first `/`.
+ */
 function resourceTail(uri) {
   if (!uri || typeof uri !== "string") return null;
-  const i = uri.indexOf("/", uri.indexOf("://") + 3);
-  return i >= 0 ? uri.slice(i + 1) : null;
+  const afterAuthority = uri.includes("://") ? uri.slice(uri.indexOf("://") + 3) : uri;
+  const i = afterAuthority.indexOf("/");
+  return i >= 0 ? afterAuthority.slice(i + 1) : null;
 }

package/lib/nft-metadata.js

@@ -364,14 +364,18 @@ export function itemsFromImages(fileNames) {
   });
 }
 
-// ── Capsule resource URIs (dig:// URN first, https gateway fallback) ───────────────────────────────
+// ── Capsule resource URIs (canonical URN first, https gateway fallback) ─────────────────────────────
 
 /** The HTTPS gateway host for decrypted capsule resources (mirrors the hub's CAPSULE_HTTPS_GATEWAY). */
 export const CAPSULE_HTTPS_GATEWAY = "usercontent.dig.net";
 
 /**
- * Build the CHIP-0007 media URIs for a resource inside a capsule: the canonical `dig://` URN first,
+ * Build the CHIP-0007 media URIs for a resource inside a capsule: the canonical bare URN first,
  * then the https gateway fallback (the order the hub + digstore use).
+ *
+ * The URN is the bare, root-pinned `urn:dig:chia:<storeId>:<root>/<resource>` form — NEVER a
+ * `dig://`-prefixed URN (the `dig://urn:dig:chia:…` double-scheme is the #686 bug). `dig://` is not
+ * a content/resource scheme; the dig-urn-resolver consumes the bare URN and decides where to fetch.
  * @param {{storeId:string,root?:string,resource:string}} args
  * @returns {{urn:string,https:string,uris:string[]}}
  */
@@ -379,7 +383,7 @@ export function capsuleResourceUris({ storeId, root, resource }) {
   const sid = String(storeId ?? "").trim();
   const r = String(root ?? "").trim();
   const res = String(resource ?? "").trim().replace(/^\/+/, "");
-  const urn = `dig://urn:dig:chia:${sid}${r ? `:${r}` : ""}/${res}`;
+  const urn = `urn:dig:chia:${sid}${r ? `:${r}` : ""}/${res}`;
   const https = `https://${sid}.${CAPSULE_HTTPS_GATEWAY}/${res}`;
   return { urn, https, uris: [urn, https] };
 }

package/lib/templates.js

@@ -4,7 +4,7 @@
 // `__PLACEHOLDER__` token substitution (see substitute.js). The metadata here drives:
 //   - the interactive picker + `--template` validation (templateNames / resolveTemplate),
 //   - the dig.toml the scaffolder writes (outputDir + buildCommand, which the SDK adapter and
-//     `digstore deploy` both read — see modules/dig-sdk/src/adapters/dig-toml.ts),
+//     `digstore deploy` both read — see modules/dx/dig-sdk/src/adapters/dig-toml.ts),
 //   - which templates wire @dignetwork/dig-sdk (wallet) vs stay dependency-light static sites.
 //
 // Templates are kept MINIMAL but real: each one `npm install`s and builds, and none bundles a heavy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dig-app",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Scaffold a wallet-wired, deployable DIG Network app — free, no mint. The JS front door for building dapps, frontends, and NFT collections on Chia.",
   "license": "MIT",
   "author": "DIG Network",

package/templates/nft-collection/README.md

@@ -86,10 +86,17 @@ Everything shared by all items lives here:
 ## Mint it
 
 ```sh
-# Publish the art + metadata + licenses as ONE capsule (this is the only deploy that spends $DIG):
+# Publish the art + metadata + licenses as ONE capsule (this is the only deploy that spends $DIG).
+# The deploy prints your capsule's real store id — copy it for the next step:
 digstore deploy
 
-# Mint the NFTs on-chain from collection.json + the generated items.json (wallet-signed):
+# Bake the REAL store id into every metadata/item URI. The first `npm run generate` used a
+# placeholder (STORE_ID_AFTER_PUBLISH) because the store id isn't known until you deploy. Skip this
+# and the minted NFT points at the placeholder FOREVER — there is no later substitution step:
+npm run generate:metadata -- --store-id <store-id-from-deploy>
+npm run validate
+
+# Mint the NFTs on-chain from collection.json + the finalized items.json (wallet-signed):
 digstore collection create --name "__DISPLAY_NAME__"     # one-time: register the collection on-chain
 digstore collection mint --collection collection.json --manifest items.json --did <your-did>
 ```

package/templates/nft-collection/scripts/dig-nft.mjs

@@ -215,7 +215,7 @@ function capsuleResourceUris({ storeId, root, resource }) {
   const sid = String(storeId ?? "").trim();
   const r = String(root ?? "").trim();
   const res = String(resource ?? "").trim().replace(/^\/+/, "");
-  const urn = `dig://urn:dig:chia:${sid}${r ? `:${r}` : ""}/${res}`;
+  const urn = `urn:dig:chia:${sid}${r ? `:${r}` : ""}/${res}`;
   const https = `https://${sid}.${CAPSULE_HTTPS_GATEWAY}/${res}`;
   return { urn, https, uris: [urn, https] };
 }
@@ -346,24 +346,25 @@ function resolveItems(root, imageFiles) {
   return items.map((item, i) => ({ ...item, file: item.file || imageFiles[i] }));
 }
 
-function readGeneratedLicense(root, collection) {
+function readGeneratedLicense(root, collection, storeId = PLACEHOLDER_STORE_ID) {
   const id = collection?.license;
   if (!id || !LICENSES[id]) return null;
   const file = licenseFileName(id);
   const path = join(root, "licenses", file);
   if (!existsSync(path)) return null;
   const bytes = readFileSync(path);
-  const { uris } = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `licenses/${file}` });
+  const { uris } = capsuleResourceUris({ storeId, resource: `licenses/${file}` });
   return { id, file, hash: sha256Hex(bytes), uris };
 }
 
-function generateMetadata(root) {
+function generateMetadata(root, opts = {}) {
+  const storeId = opts.storeId ?? PLACEHOLDER_STORE_ID;
   const collection = loadCollection(root);
   const imageFiles = listImages(root);
   const items = resolveItems(root, imageFiles);
   const metadataDir = join(root, "metadata");
   mkdirSync(metadataDir, { recursive: true });
-  const license = readGeneratedLicense(root, collection);
+  const license = readGeneratedLicense(root, collection, storeId);
   const mds = generateItemMetadata(collection, items);
   const manifest = [];
   for (let i = 0; i < items.length; i++) {
@@ -378,8 +379,8 @@ function generateMetadata(root) {
     const metaName = `${stem}.json`;
     writeFileSync(join(metadataDir, metaName), canonicalJson(md) + "\n");
     const metadataHash = metadataHashHex(md);
-    const data = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `images/${file}` });
-    const meta = capsuleResourceUris({ storeId: PLACEHOLDER_STORE_ID, resource: `metadata/${metaName}` });
+    const data = capsuleResourceUris({ storeId, resource: `images/${file}` });
+    const meta = capsuleResourceUris({ storeId, resource: `metadata/${metaName}` });
     manifest.push({
       name: md.name,
       description: item.description || undefined,
@@ -461,13 +462,28 @@ function validateProject(root) {
 
 // ── CLI dispatch ──────────────────────────────────────────────────────────────────────────────────
 
+/** Read a `--flag value` / `--flag=value` option from an argv slice; undefined if absent. */
+function flagValue(args, name) {
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === name) return args[i + 1];
+    if (args[i].startsWith(`${name}=`)) return args[i].slice(name.length + 1);
+  }
+  return undefined;
+}
+
 function main() {
   const cmd = process.argv[2];
+  const args = process.argv.slice(3);
   try {
     if (cmd === "metadata") {
-      const r = generateMetadata(ROOT);
+      const storeId = flagValue(args, "--store-id");
+      const r = generateMetadata(ROOT, storeId ? { storeId } : {});
       console.log(`Generated ${r.count} CHIP-0007 metadata file(s) → metadata/ and the items.json manifest.`);
-      console.log("Next: `npm run validate`, then mint with `digstore collection mint --collection collection.json --manifest items.json`.");
+      if (storeId) {
+        console.log(`Baked store id ${storeId} into every URI. Next: \`npm run validate\`, then \`digstore collection mint --collection collection.json --manifest items.json\`.`);
+      } else {
+        console.log("Used the placeholder store id. After `digstore deploy` gives you the real store id, re-run `npm run generate:metadata -- --store-id <id>` to bake it in — otherwise the minted NFT keeps the placeholder. Then `npm run validate` and `digstore collection mint`.");
+      }
     } else if (cmd === "license") {
       const r = generateLicense(ROOT);
       console.log(`Wrote licenses/${r.file} (sha256 ${r.hash}).`);
@@ -476,8 +492,9 @@ function main() {
       const r = validateProject(ROOT);
       console.log(`OK — ${r.checked} item(s) valid: CHIP-0007 schema + data/metadata/license hashes agree with the real bytes.`);
     } else {
-      console.error("Usage: node scripts/dig-nft.mjs <metadata|license|validate>");
+      console.error("Usage: node scripts/dig-nft.mjs <metadata|license|validate> [--store-id <id>]");
       console.error("  metadata  generate CHIP-0007 metadata/*.json + items.json from images/ + collection.json");
+      console.error("            --store-id <id>  bake the REAL published store id into URIs (after `digstore deploy`)");
       console.error("  license   write the license chosen in collection.json into licenses/");
       console.error("  validate  re-verify schema + URI/hash agreement before minting");
       process.exit(2);