sequoia-cli 0.1.1 → 0.1.2-beta.0

package/dist/index.js

@@ -67266,10 +67266,18 @@ function parseFrontmatter(content, mapping) {
   const raw = {};
   const lines = frontmatterStr.split(`
 `);
-  for (const line of lines) {
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line === undefined) {
+      i++;
+      continue;
+    }
     const sepIndex = line.indexOf(separator);
-    if (sepIndex === -1)
+    if (sepIndex === -1) {
+      i++;
       continue;
+    }
     const key = line.slice(0, sepIndex).trim();
     let value = line.slice(sepIndex + 1).trim();
     if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
@@ -67278,6 +67286,36 @@ function parseFrontmatter(content, mapping) {
     if (value.startsWith("[") && value.endsWith("]")) {
       const arrayContent = value.slice(1, -1);
       raw[key] = arrayContent.split(",").map((item) => item.trim().replace(/^["']|["']$/g, ""));
+    } else if (value === "" && !isToml) {
+      const arrayItems = [];
+      let j2 = i + 1;
+      while (j2 < lines.length) {
+        const nextLine = lines[j2];
+        if (nextLine === undefined) {
+          j2++;
+          continue;
+        }
+        const listMatch = nextLine.match(/^\s+-\s*(.*)$/);
+        if (listMatch && listMatch[1] !== undefined) {
+          let itemValue = listMatch[1].trim();
+          if (itemValue.startsWith('"') && itemValue.endsWith('"') || itemValue.startsWith("'") && itemValue.endsWith("'")) {
+            itemValue = itemValue.slice(1, -1);
+          }
+          arrayItems.push(itemValue);
+          j2++;
+        } else if (nextLine.trim() === "") {
+          j2++;
+        } else {
+          break;
+        }
+      }
+      if (arrayItems.length > 0) {
+        raw[key] = arrayItems;
+        i = j2;
+        continue;
+      } else {
+        raw[key] = value;
+      }
     } else if (value === "true") {
       raw[key] = true;
     } else if (value === "false") {
@@ -67285,6 +67323,7 @@ function parseFrontmatter(content, mapping) {
     } else {
       raw[key] = value;
     }
+    i++;
   }
   const frontmatter = {};
   const titleField = mapping?.title || "title";
@@ -67310,11 +67349,36 @@ function parseFrontmatter(content, mapping) {
   const tagsField = mapping?.tags || "tags";
   frontmatter.tags = raw[tagsField] || raw.tags;
   frontmatter.atUri = raw.atUri;
-  return { frontmatter, body };
+  return { frontmatter, body, rawFrontmatter: raw };
 }
 function getSlugFromFilename(filename) {
   return filename.replace(/\.mdx?$/, "").toLowerCase().replace(/\s+/g, "-");
 }
+function getSlugFromOptions(relativePath, rawFrontmatter, options = {}) {
+  const { slugSource = "filename", slugField = "slug", removeIndexFromSlug = false } = options;
+  let slug;
+  switch (slugSource) {
+    case "path":
+      slug = relativePath.replace(/\.mdx?$/, "").toLowerCase().replace(/\s+/g, "-");
+      break;
+    case "frontmatter":
+      const frontmatterValue = rawFrontmatter[slugField] || rawFrontmatter.slug || rawFrontmatter.url;
+      if (frontmatterValue && typeof frontmatterValue === "string") {
+        slug = frontmatterValue.replace(/^\//, "").toLowerCase().replace(/\s+/g, "-");
+      } else {
+        slug = getSlugFromFilename(path3.basename(relativePath));
+      }
+      break;
+    case "filename":
+    default:
+      slug = getSlugFromFilename(path3.basename(relativePath));
+      break;
+  }
+  if (removeIndexFromSlug) {
+    slug = slug.replace(/\/_?index$/, "");
+  }
+  return slug;
+}
 async function getContentHash(content) {
   const encoder = new TextEncoder;
   const data = encoder.encode(content);
@@ -67330,7 +67394,23 @@ function shouldIgnore(relativePath, ignorePatterns) {
   }
   return false;
 }
-async function scanContentDirectory(contentDir, frontmatterMapping, ignorePatterns = []) {
+async function scanContentDirectory(contentDir, frontmatterMappingOrOptions, ignorePatterns = []) {
+  let options;
+  if (frontmatterMappingOrOptions && (("slugSource" in frontmatterMappingOrOptions) || ("frontmatterMapping" in frontmatterMappingOrOptions) || ("ignorePatterns" in frontmatterMappingOrOptions))) {
+    options = frontmatterMappingOrOptions;
+  } else {
+    options = {
+      frontmatterMapping: frontmatterMappingOrOptions,
+      ignorePatterns
+    };
+  }
+  const {
+    frontmatterMapping,
+    ignorePatterns: ignore = [],
+    slugSource,
+    slugField,
+    removeIndexFromSlug
+  } = options;
   const patterns = ["**/*.md", "**/*.mdx"];
   const posts = [];
   for (const pattern of patterns) {
@@ -67339,21 +67419,25 @@ async function scanContentDirectory(contentDir, frontmatterMapping, ignorePatter
       absolute: false
     });
     for (const relativePath of files) {
-      if (shouldIgnore(relativePath, ignorePatterns)) {
+      if (shouldIgnore(relativePath, ignore)) {
         continue;
       }
       const filePath = path3.join(contentDir, relativePath);
       const rawContent = await fs2.readFile(filePath, "utf-8");
       try {
-        const { frontmatter, body } = parseFrontmatter(rawContent, frontmatterMapping);
-        const filename = path3.basename(relativePath);
-        const slug = getSlugFromFilename(filename);
+        const { frontmatter, body, rawFrontmatter } = parseFrontmatter(rawContent, frontmatterMapping);
+        const slug = getSlugFromOptions(relativePath, rawFrontmatter, {
+          slugSource,
+          slugField,
+          removeIndexFromSlug
+        });
         posts.push({
           filePath,
           slug,
           frontmatter,
           content: body,
-          rawContent
+          rawContent,
+          rawFrontmatter
         });
       } catch (error) {
         console.error(`Error parsing ${relativePath}:`, error);
@@ -67496,8 +67580,13 @@ async function resolveImagePath(ogImage, imagesDir, contentDir) {
 async function createDocument(agent, post, config, coverImage) {
   const pathPrefix = config.pathPrefix || "/posts";
   const postPath = `${pathPrefix}/${post.slug}`;
-  const textContent = stripMarkdownForText(post.content);
   const publishDate = new Date(post.frontmatter.publishDate);
+  let textContent;
+  if (config.textContentField && post.rawFrontmatter?.[config.textContentField]) {
+    textContent = String(post.rawFrontmatter[config.textContentField]);
+  } else {
+    textContent = stripMarkdownForText(post.content);
+  }
   const record = {
     $type: "site.standard.document",
     title: post.frontmatter.title,
@@ -67507,6 +67596,9 @@ async function createDocument(agent, post, config, coverImage) {
     publishedAt: publishDate.toISOString(),
     canonicalUrl: `${config.siteUrl}${postPath}`
   };
+  if (post.frontmatter.description) {
+    record.description = post.frontmatter.description;
+  }
   if (coverImage) {
     record.coverImage = coverImage;
   }
@@ -67528,8 +67620,13 @@ async function updateDocument(agent, post, atUri, config, coverImage) {
   const [, , collection, rkey] = uriMatch;
   const pathPrefix = config.pathPrefix || "/posts";
   const postPath = `${pathPrefix}/${post.slug}`;
-  const textContent = stripMarkdownForText(post.content);
   const publishDate = new Date(post.frontmatter.publishDate);
+  let textContent;
+  if (config.textContentField && post.rawFrontmatter?.[config.textContentField]) {
+    textContent = String(post.rawFrontmatter[config.textContentField]);
+  } else {
+    textContent = stripMarkdownForText(post.content);
+  }
   const record = {
     $type: "site.standard.document",
     title: post.frontmatter.title,
@@ -67539,6 +67636,9 @@ async function updateDocument(agent, post, atUri, config, coverImage) {
     publishedAt: publishDate.toISOString(),
     canonicalUrl: `${config.siteUrl}${postPath}`
   };
+  if (post.frontmatter.description) {
+    record.description = post.frontmatter.description;
+  }
   if (coverImage) {
     record.coverImage = coverImage;
   }
@@ -67818,6 +67918,18 @@ function generateConfigTemplate(options) {
   if (options.ignore && options.ignore.length > 0) {
     config.ignore = options.ignore;
   }
+  if (options.slugSource && options.slugSource !== "filename") {
+    config.slugSource = options.slugSource;
+  }
+  if (options.slugField && options.slugField !== "slug") {
+    config.slugField = options.slugField;
+  }
+  if (options.removeIndexFromSlug) {
+    config.removeIndexFromSlug = options.removeIndexFromSlug;
+  }
+  if (options.textContentField) {
+    config.textContentField = options.textContentField;
+  }
   return JSON.stringify(config, null, 2);
 }
 async function loadState(configDir) {
@@ -68104,38 +68216,24 @@ var injectCommand = import_cmd_ts3.command({
     const resolvedOutputDir = path7.isAbsolute(outputDir) ? outputDir : path7.join(configDir, outputDir);
     R2.info(`Scanning for HTML files in: ${resolvedOutputDir}`);
     const state = await loadState(configDir);
-    const genericFilenames = new Set([
-      "+page",
-      "index",
-      "_index",
-      "page",
-      "readme"
-    ]);
-    const pathToAtUri = new Map;
+    const slugToAtUri = new Map;
     for (const [filePath, postState] of Object.entries(state.posts)) {
-      if (postState.atUri) {
-        let basename4 = path7.basename(filePath, path7.extname(filePath));
-        if (genericFilenames.has(basename4.toLowerCase())) {
-          const pathParts = filePath.split(/[/\\]/).filter((p) => p && !(p.startsWith("(") && p.endsWith(")")));
-          if (pathParts.length >= 2) {
-            const slug = pathParts[pathParts.length - 2];
-            if (slug && slug !== "." && slug !== "content" && slug !== "routes" && slug !== "src") {
-              basename4 = slug;
-            }
-          }
-        }
-        pathToAtUri.set(basename4, postState.atUri);
-        const dirName = path7.basename(path7.dirname(filePath));
-        if (dirName !== "." && dirName !== "content" && !(dirName.startsWith("(") && dirName.endsWith(")"))) {
-          pathToAtUri.set(`${dirName}/${basename4}`, postState.atUri);
+      if (postState.atUri && postState.slug) {
+        slugToAtUri.set(postState.slug, postState.atUri);
+        const lastSegment = postState.slug.split("/").pop();
+        if (lastSegment && lastSegment !== postState.slug) {
+          slugToAtUri.set(lastSegment, postState.atUri);
         }
+      } else if (postState.atUri) {
+        const basename4 = path7.basename(filePath, path7.extname(filePath));
+        slugToAtUri.set(basename4.toLowerCase(), postState.atUri);
       }
     }
-    if (pathToAtUri.size === 0) {
+    if (slugToAtUri.size === 0) {
       R2.warn("No published posts found in state. Run 'sequoia publish' first.");
       return;
     }
-    R2.info(`Found ${pathToAtUri.size} published posts in state`);
+    R2.info(`Found ${slugToAtUri.size} slug mappings from published posts`);
     const htmlFiles = await glob("**/*.html", {
       cwd: resolvedOutputDir,
       absolute: false
@@ -68154,19 +68252,16 @@ var injectCommand = import_cmd_ts3.command({
       const htmlDir = path7.dirname(relativePath);
       const htmlBasename = path7.basename(relativePath, ".html");
       let atUri;
-      atUri = pathToAtUri.get(htmlBasename);
+      atUri = slugToAtUri.get(htmlBasename);
       if (!atUri && htmlBasename === "index" && htmlDir !== ".") {
-        const slug = path7.basename(htmlDir);
-        atUri = pathToAtUri.get(slug);
+        atUri = slugToAtUri.get(htmlDir);
         if (!atUri) {
-          const parentDir = path7.dirname(htmlDir);
-          if (parentDir !== ".") {
-            atUri = pathToAtUri.get(`${path7.basename(parentDir)}/${slug}`);
-          }
+          const lastDir = path7.basename(htmlDir);
+          atUri = slugToAtUri.get(lastDir);
         }
       }
       if (!atUri && htmlDir !== ".") {
-        atUri = pathToAtUri.get(`${htmlDir}/${htmlBasename}`);
+        atUri = slugToAtUri.get(`${htmlDir}/${htmlBasename}`);
       }
       if (!atUri) {
         skippedCount++;
@@ -68266,7 +68361,13 @@ var publishCommand = import_cmd_ts4.command({
     const state = await loadState(configDir);
     const s = Ie();
     s.start("Scanning for posts...");
-    const posts = await scanContentDirectory(contentDir, config.frontmatter, config.ignore);
+    const posts = await scanContentDirectory(contentDir, {
+      frontmatterMapping: config.frontmatter,
+      ignorePatterns: config.ignore,
+      slugSource: config.slugSource,
+      slugField: config.slugField,
+      removeIndexFromSlug: config.removeIndexFromSlug
+    });
     s.stop(`Found ${posts.length} posts`);
     const postsToPublish = [];
     for (const post of posts) {
@@ -68360,7 +68461,8 @@ Dry run complete. No changes made.`);
         state.posts[relativeFilePath] = {
           contentHash,
           atUri,
-          lastPublished: new Date().toISOString()
+          lastPublished: new Date().toISOString(),
+          slug: post.slug
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -68447,11 +68549,18 @@ var syncCommand = import_cmd_ts5.command({
     }
     const contentDir = path9.isAbsolute(config.contentDir) ? config.contentDir : path9.join(configDir, config.contentDir);
     s.start("Scanning local content...");
-    const localPosts = await scanContentDirectory(contentDir, config.frontmatter);
+    const localPosts = await scanContentDirectory(contentDir, {
+      frontmatterMapping: config.frontmatter,
+      ignorePatterns: config.ignore,
+      slugSource: config.slugSource,
+      slugField: config.slugField,
+      removeIndexFromSlug: config.removeIndexFromSlug
+    });
     s.stop(`Found ${localPosts.length} local posts`);
+    const pathPrefix = config.pathPrefix || "/posts";
     const postsByPath = new Map;
     for (const post of localPosts) {
-      const postPath = `/posts/${post.slug}`;
+      const postPath = `${pathPrefix}/${post.slug}`;
       postsByPath.set(postPath, post);
     }
     const state = await loadState(configDir);
@@ -68549,7 +68658,7 @@ Publish evergreen content to the ATmosphere
 
 > https://tangled.org/stevedylan.dev/sequoia
 	`,
-  version: "0.1.1",
+  version: "0.1.2-beta.0",
   cmds: {
     auth: authCommand,
     init: initCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sequoia-cli",
-	"version": "0.1.1",
+	"version": "0.1.2-beta.0",
 	"type": "module",
 	"bin": {
 		"sequoia": "dist/index.js"