remanso-cli 0.1.2 → 0.2.0

package/dist/index.js

@@ -102413,6 +102413,12 @@ function parseFrontmatter(content, mapping) {
   if (draftValue !== undefined) {
     frontmatter.draft = draftValue === true || draftValue === "true";
   }
+  const discoverableValue = raw.discoverable;
+  if (discoverableValue === false || discoverableValue === "false") {
+    frontmatter.discoverable = false;
+  } else {
+    frontmatter.discoverable = true;
+  }
   frontmatter.atUri = raw.atUri;
   return {
     frontmatter,
@@ -102448,35 +102454,6 @@ function getSlugFromOptions(relativePath, rawFrontmatter, options = {}) {
 function slugifyTitle(title) {
   return (title || "").toLowerCase().replace(/\s+/g, "-").replace(/[^\w-]/g, "");
 }
-function resolvePathTemplate(template, post) {
-  const publishDate = new Date(post.frontmatter.publishDate);
-  const year = String(publishDate.getFullYear());
-  const yearUTC = String(publishDate.getUTCFullYear());
-  const month = String(publishDate.getMonth() + 1).padStart(2, "0");
-  const monthUTC = String(publishDate.getUTCMonth() + 1).padStart(2, "0");
-  const day = String(publishDate.getDate()).padStart(2, "0");
-  const dayUTC = String(publishDate.getUTCDate()).padStart(2, "0");
-  const slugifiedTitle = slugifyTitle(post.frontmatter.title);
-  let result = template.replace(/\{slug\}/g, post.slug).replace(/\{year\}/g, year).replace(/\{yearUTC\}/g, yearUTC).replace(/\{month\}/g, month).replace(/\{monthUTC\}/g, monthUTC).replace(/\{day\}/g, day).replace(/\{dayUTC\}/g, dayUTC).replace(/\{title\}/g, slugifiedTitle);
-  result = result.replace(/\{(\w+)\}/g, (_match, field) => {
-    const value = post.rawFrontmatter[field];
-    if (value != null && typeof value === "string") {
-      return value;
-    }
-    return "";
-  });
-  if (!result.startsWith("/")) {
-    result = `/${result}`;
-  }
-  return result;
-}
-function resolvePostPath(post, pathPrefix, pathTemplate) {
-  if (pathTemplate) {
-    return resolvePathTemplate(pathTemplate, post);
-  }
-  const prefix = pathPrefix || "/posts";
-  return `${prefix}/${post.slug}`;
-}
 async function getContentHash(content) {
   const encoder = new TextEncoder;
   const data = encoder.encode(content);
@@ -102866,7 +102843,6 @@ async function resolveImagePath(ogImage, imagesDir, contentDir) {
   return null;
 }
 async function createDocument(agent, post, config, coverImage) {
-  const postPath = resolvePostPath(post, config.pathPrefix, config.pathTemplate);
   const publishDate = new Date(post.frontmatter.publishDate);
   const trimmedContent = post.content.trim();
   const textContent = getTextContent(post, config.textContentField);
@@ -102876,13 +102852,10 @@ async function createDocument(agent, post, config, coverImage) {
     $type: "site.standard.document",
     title,
     site: config.publicationUri,
-    path: postPath,
+    path: `/${post.slug}`,
     textContent: textContent.slice(0, 1e4),
     publishedAt: publishDate.toISOString()
   };
-  if (!config.canonicalUrlBuilder) {
-    record.canonicalUrl = `${config.siteUrl}${postPath}`;
-  }
   if (post.frontmatter.description) {
     record.description = post.frontmatter.description;
   }
@@ -102898,17 +102871,17 @@ async function createDocument(agent, post, config, coverImage) {
     record
   });
   const atUri = response.data.uri;
-  if (config.canonicalUrlBuilder) {
-    const parsed = parseAtUri(atUri);
-    if (parsed) {
-      record.canonicalUrl = config.canonicalUrlBuilder(atUri, post);
-      await agent.com.atproto.repo.putRecord({
-        repo: agent.did,
-        collection: parsed.collection,
-        rkey: parsed.rkey,
-        record
-      });
-    }
+  const parsed = parseAtUri(atUri);
+  if (parsed) {
+    const finalPath = `/pub/${parsed.rkey}/${post.slug}`;
+    record.path = finalPath;
+    record.canonicalUrl = config.canonicalUrlBuilder ? config.canonicalUrlBuilder(atUri, post) : `${config.siteUrl}${finalPath}`;
+    await agent.com.atproto.repo.putRecord({
+      repo: agent.did,
+      collection: parsed.collection,
+      rkey: parsed.rkey,
+      record
+    });
   }
   return atUri;
 }
@@ -102918,7 +102891,7 @@ async function updateDocument(agent, post, atUri, config, coverImage) {
     throw new Error(`Invalid atUri format: ${atUri}`);
   }
   const [, , collection, rkey] = uriMatch;
-  const postPath = resolvePostPath(post, config.pathPrefix, config.pathTemplate);
+  const finalPath = `/pub/${rkey}/${post.slug}`;
   const publishDate = new Date(post.frontmatter.publishDate);
   const trimmedContent = post.content.trim();
   const textContent = getTextContent(post, config.textContentField);
@@ -102928,10 +102901,10 @@ async function updateDocument(agent, post, atUri, config, coverImage) {
     $type: "site.standard.document",
     title,
     site: config.publicationUri,
-    path: postPath,
+    path: finalPath,
     textContent: textContent.slice(0, 1e4),
     publishedAt: publishDate.toISOString(),
-    canonicalUrl: config.canonicalUrlBuilder ? config.canonicalUrlBuilder(atUri, post) : `${config.siteUrl}${postPath}`
+    canonicalUrl: config.canonicalUrlBuilder ? config.canonicalUrlBuilder(atUri, post) : `${config.siteUrl}${finalPath}`
   };
   if (post.frontmatter.description) {
     record.description = post.frontmatter.description;
@@ -103424,8 +103397,14 @@ async function setSecrets() {
       appPassword = creds.password;
       R2.info(`Using stored credentials for: ${identifier}`);
     } else {
-      identifier = exitOnCancel(await Qt({ message: "ATProto handle (ATP_IDENTIFIER):", placeholder: "you.bsky.social" }));
-      appPassword = exitOnCancel(await Qt({ message: "App Password (ATP_APP_PASSWORD):", placeholder: "xxxx-xxxx-xxxx-xxxx" }));
+      identifier = exitOnCancel(await Qt({
+        message: "ATProto handle (ATP_IDENTIFIER):",
+        placeholder: "you.bsky.social"
+      }));
+      appPassword = exitOnCancel(await Qt({
+        message: "App Password (ATP_APP_PASSWORD):",
+        placeholder: "xxxx-xxxx-xxxx-xxxx"
+      }));
     }
   } else if (storedIds.length > 1) {
     const { select } = await Promise.resolve().then(() => (init_dist2(), exports_dist));
@@ -103441,13 +103420,27 @@ async function setSecrets() {
     identifier = creds.identifier;
     appPassword = creds.password;
   } else {
-    identifier = exitOnCancel(await Qt({ message: "ATProto handle (ATP_IDENTIFIER):", placeholder: "you.bsky.social" }));
-    appPassword = exitOnCancel(await Qt({ message: "App Password (ATP_APP_PASSWORD):", placeholder: "xxxx-xxxx-xxxx-xxxx" }));
+    identifier = exitOnCancel(await Qt({
+      message: "ATProto handle (ATP_IDENTIFIER):",
+      placeholder: "you.bsky.social"
+    }));
+    appPassword = exitOnCancel(await Qt({
+      message: "App Password (ATP_APP_PASSWORD):",
+      placeholder: "xxxx-xxxx-xxxx-xxxx"
+    }));
   }
   const s = Ie();
   const repoFlag = `${remote.owner}/${remote.repo}`;
   s.start("Setting ATP_IDENTIFIER secret...");
-  const r1 = spawnSync("gh", ["secret", "set", "ATP_IDENTIFIER", "--body", identifier, "--repo", repoFlag], { stdio: "pipe" });
+  const r1 = spawnSync("gh", [
+    "secret",
+    "set",
+    "ATP_IDENTIFIER",
+    "--body",
+    identifier,
+    "--repo",
+    repoFlag
+  ], { stdio: "pipe" });
   if (r1.status === 0) {
     s.stop("ATP_IDENTIFIER set");
   } else {
@@ -103455,7 +103448,15 @@ async function setSecrets() {
     R2.warn(r1.stderr?.toString() || "Unknown error");
   }
   s.start("Setting ATP_APP_PASSWORD secret...");
-  const r2 = spawnSync("gh", ["secret", "set", "ATP_APP_PASSWORD", "--body", appPassword, "--repo", repoFlag], { stdio: "pipe" });
+  const r2 = spawnSync("gh", [
+    "secret",
+    "set",
+    "ATP_APP_PASSWORD",
+    "--body",
+    appPassword,
+    "--repo",
+    repoFlag
+  ], { stdio: "pipe" });
   if (r2.status === 0) {
     s.stop("ATP_APP_PASSWORD set");
   } else {
@@ -104027,6 +104028,7 @@ async function buildNoteRecord(agent, post, options) {
   if (post.frontmatter.fontFamily) {
     record.fontFamily = post.frontmatter.fontFamily;
   }
+  record.discoverable = post.frontmatter.discoverable ?? true;
   return record;
 }
 async function deleteNote(agent, atUri) {
@@ -104487,7 +104489,9 @@ async function matchesPDS(localPost, doc, agent) {
         rkey
       });
       const noteValue = noteResponse.data.value;
-      if ((localPost.frontmatter.theme || undefined) !== noteValue.theme || (localPost.frontmatter.fontSize || undefined) !== noteValue.fontSize || (localPost.frontmatter.fontFamily || undefined) !== noteValue.fontFamily) {
+      const localDiscoverable = localPost.frontmatter.discoverable ?? true;
+      const noteDiscoverable = noteValue.discoverable ?? true;
+      if ((localPost.frontmatter.theme || undefined) !== noteValue.theme || (localPost.frontmatter.fontSize || undefined) !== noteValue.fontSize || (localPost.frontmatter.fontFamily || undefined) !== noteValue.fontFamily || localDiscoverable !== noteDiscoverable) {
         return false;
       }
     } catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "remanso-cli",
-	"version": "0.1.2",
+	"version": "0.2.0",
 	"type": "module",
 	"bin": {
 		"remanso": "dist/index.js"