@betterstart/cli 0.1.31 → 0.1.33

package/dist/cli.js

@@ -2723,6 +2723,10 @@ function generateActions(schema, cwd, actionsDir, options = {}) {
     }
   }
   const populateListRelsFn = hasListRels ? generatePopulateListRelsFunction(allListRelQueries, Singular) : "";
+  const htmlOutputFields = regularDbFields.filter(
+    (f) => (f.type === "richtext" || f.type === "markdown") && f.output === "html"
+  );
+  const hasHtmlOutput = htmlOutputFields.length > 0;
   const hasSlug = regularDbFields.some((f) => f.name === "slug");
   const hasDraft = schema.actions?.draft === true;
   const hasPublished = regularDbFields.some((f) => f.name === "published");
@@ -2769,8 +2773,10 @@ function generateActions(schema, cwd, actionsDir, options = {}) {
     (f) => `  ${quotePropertyName2(f.name)}: ${getFieldType(f, "output")}${f.required ? "" : " | null"}`
   ).join("\n");
   const m2mFieldTypes = m2mFields.map((f) => `  ${quotePropertyName2(f.name)}: number[]`).join("\n");
+  const htmlFieldTypes = htmlOutputFields.map((f) => `  ${f.name}Html: string`).join("\n");
   const dataInterface = `export interface ${Singular}Data {
-${dataFields}${m2mFieldTypes ? `
+${dataFields}${htmlFieldTypes ? `
+${htmlFieldTypes}` : ""}${m2mFieldTypes ? `
 ${m2mFieldTypes}` : ""}
 }`;
   const responseInterface = `export interface ${Plural}Response {
@@ -2837,6 +2843,10 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     }`;
   const fieldMeta = createFields.map((f) => `{ name: '${f.name}', type: '${f.type}', required: ${f.required ?? false} }`).join(",\n    ");
   const createMappings = createFields.map((f) => `      ${f.name}: ${generateFieldMapping(f)}`).join(",\n");
+  const htmlCreateBlock = hasHtmlOutput ? `
+    const { renderMarkdownSync } = await import('@cms/lib/markdown/render')
+` + htmlOutputFields.map((f) => `    const ${f.name}Html = renderMarkdownSync(input.${f.name} || '')`).join("\n") + "\n" : "";
+  const htmlCreateMappings = htmlOutputFields.map((f) => `      ${f.name}Html`).join(",\n");
   const distinctFns = hasFilters ? (schema.filters || []).map(
     (filter) => `
 export async function getDistinct${Plural}${toPascalCase5(filter.field)}(): Promise<string[]> {
@@ -3004,9 +3014,10 @@ export async function create${Singular}(input: Create${Singular}Input): Promise<
       .orderBy(desc(${tableVar}.sortOrder))
       .limit(1)
     const nextSortOrder = (maxSortOrderResult[0]?.maxOrder ?? 0) + 1
-
+${htmlCreateBlock}
     const result = await db.insert(${tableVar}).values({
-${createMappings},${hasDraft ? `
+${createMappings},${hasHtmlOutput ? `
+${htmlCreateMappings},` : ""}${hasDraft ? `
       published: input.published ?? false,` : ""}
       sortOrder: nextSortOrder,
       createdAt: new Date().toISOString(),
@@ -3046,7 +3057,11 @@ ${autoSlugUpdate}
         processedData[key] = value
       }
     }
-
+${hasHtmlOutput ? `
+    const { renderMarkdownSync } = await import('@cms/lib/markdown/render')
+` + htmlOutputFields.map((f) => `    if (processedData.${f.name} !== undefined) {
+      processedData.${f.name}Html = renderMarkdownSync(String(processedData.${f.name} || ''))
+    }`).join("\n") + "\n" : ""}
     const result = await db.update(${tableVar})
       .set({ ...processedData, updatedAt: new Date().toISOString() })
       .where(eq(${tableVar}.id, id))
@@ -3150,6 +3165,10 @@ function generateSingleActions(schema, cwd, actionsDir, options = {}) {
   const dbFields = flattenFields(schema.fields).filter(
     (f) => !(f.type === "relationship" && f.multiple === true)
   );
+  const singleHtmlOutputFields = dbFields.filter(
+    (f) => (f.type === "richtext" || f.type === "markdown") && f.output === "html"
+  );
+  const singleHasHtmlOutput = singleHtmlOutputFields.length > 0;
   const allDbFields = [...dbFields];
   if (!dbFields.some((f) => f.name === "createdAt")) {
     allDbFields.push({ name: "createdAt", type: "timestamp", required: true });
@@ -3163,8 +3182,10 @@ function generateSingleActions(schema, cwd, actionsDir, options = {}) {
   const dataFields = allDbFields.map(
     (f) => `  ${quotePropertyName2(f.name)}: ${getFieldType(f, "output")}${f.required ? "" : " | null"}`
   ).join("\n");
+  const singleHtmlFieldTypes = singleHtmlOutputFields.map((f) => `  ${f.name}Html: string`).join("\n");
   const dataInterface = `export interface ${Singular}Data {
-${dataFields}
+${dataFields}${singleHtmlFieldTypes ? `
+${singleHtmlFieldTypes}` : ""}
 }`;
   const upsertInterfaceFields = upsertFields.map(
     (f) => `  ${quotePropertyName2(f.name)}${f.required ? "" : "?"}: ${getFieldType(f, "input")}`
@@ -3175,6 +3196,7 @@ ${upsertInterfaceFields}
   const upsertMappings = upsertFields.map((f) => `      ${f.name}: ${generateFieldMapping(f)}`).join(",\n");
   const fieldMeta = upsertFields.map((f) => `{ name: '${f.name}', type: '${f.type}', required: ${f.required ?? false} }`).join(",\n    ");
   const cacheTag = `${schema.name}:all`;
+  const singleHtmlUpsertMappings = singleHtmlOutputFields.map((f) => `      ${f.name}Html`).join(",\n");
   const content = `'use server'
 
 import db from '@cms/db'
@@ -3223,14 +3245,18 @@ export async function upsert${Singular}(input: Upsert${Singular}Input): Promise<
         processedData[key] = value
       }
     }
-
+${singleHasHtmlOutput ? `
+    const { renderMarkdownSync } = await import('@cms/lib/markdown/render')
+` + singleHtmlOutputFields.map((f) => `    if (processedData.${f.name} !== undefined) {
+      processedData.${f.name}Html = renderMarkdownSync(String(processedData.${f.name} || ''))
+    }`).join("\n") + "\n" + singleHtmlOutputFields.map((f) => `    const ${f.name}Html = renderMarkdownSync(input.${f.name} || '')`).join("\n") + "\n" : ""}
     const now = new Date().toISOString()
 
     const result = await db
       .insert(${tableVar})
       .values({
         id: 1,
-${upsertMappings},
+${upsertMappings},${singleHasHtmlOutput ? "\n" + singleHtmlOutputFields.map((f) => `      ${f.name}Html`).join(",\n") + "," : ""}
         createdAt: now,
         updatedAt: now
       })
@@ -4553,7 +4579,14 @@ function generateTableDefinition(schema, requiredImports, needsSql) {
   const fieldDefs = dbFields.map((field) => {
     const drizzleType = toDrizzleType(field, requiredImports);
     const modifiers = getFieldModifiers(field, needsSql);
-    return `    ${field.name}: ${drizzleType}${modifiers}`;
+    const line = `    ${field.name}: ${drizzleType}${modifiers}`;
+    if ((field.type === "richtext" || field.type === "markdown") && field.output === "html") {
+      const snakeName = field.name.replace(/([A-Z])/g, "_$1").toLowerCase();
+      requiredImports.add("text");
+      return `${line},
+    ${field.name}Html: text('${snakeName}_html')`;
+    }
+    return line;
   }).join(",\n");
   let publishedField = "";
   if (hasDraftMode && !hasPublishedField) {
@@ -7550,23 +7583,28 @@ var LOCKFILE_MAP = {
   "bun.lock": "bun"
 };
 function detectPackageManager(cwd) {
-  for (const [lockfile, pm] of Object.entries(LOCKFILE_MAP)) {
-    if (fs20.existsSync(path20.join(cwd, lockfile))) {
-      return pm;
+  let dir = path20.resolve(cwd);
+  const root = path20.parse(dir).root;
+  while (dir !== root) {
+    for (const [lockfile, pm] of Object.entries(LOCKFILE_MAP)) {
+      if (fs20.existsSync(path20.join(dir, lockfile))) {
+        return pm;
+      }
     }
-  }
-  const pkgPath = path20.join(cwd, "package.json");
-  if (fs20.existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(fs20.readFileSync(pkgPath, "utf-8"));
-      if (typeof pkg.packageManager === "string") {
-        const name = pkg.packageManager.split("@")[0];
-        if (name === "pnpm" || name === "npm" || name === "yarn" || name === "bun") {
-          return name;
+    const pkgPath = path20.join(dir, "package.json");
+    if (fs20.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs20.readFileSync(pkgPath, "utf-8"));
+        if (typeof pkg.packageManager === "string") {
+          const name = pkg.packageManager.split("@")[0];
+          if (name === "pnpm" || name === "npm" || name === "yarn" || name === "bun") {
+            return name;
+          }
         }
+      } catch {
       }
-    } catch {
     }
+    dir = path20.dirname(dir);
   }
   return "npm";
 }
@@ -10580,7 +10618,6 @@ function markdownRenderTemplate() {
   return `import { transformerNotationDiff, transformerNotationHighlight } from '@shikijs/transformers'
 import { renderToString } from 'katex'
 import MarkdownIt from 'markdown-it'
-import dollarmath from 'markdown-it-dollarmath'
 import { createHighlighterCoreSync } from 'shiki/core'
 import { createJavaScriptRegexEngine } from 'shiki/engine/javascript'
 import css from 'shiki/langs/css.mjs'
@@ -10668,6 +10705,68 @@ function headingAnchorPlugin(md: MarkdownIt) {
   })
 }
 
+// --- Inline KaTeX math plugin (replaces markdown-it-dollarmath) ---
+
+function mathPlugin(md: MarkdownIt) {
+  // Inline: $...$
+  md.inline.ruler.after('escape', 'math_inline', (state, silent) => {
+    if (state.src.charCodeAt(state.pos) !== 0x24) return false
+    if (state.src.charCodeAt(state.pos + 1) === 0x24) return false
+    const start = state.pos + 1
+    let end = start
+    while (end < state.posMax && state.src.charCodeAt(end) !== 0x24) {
+      if (state.src.charCodeAt(end) === 0x5C) end++
+      end++
+    }
+    if (end >= state.posMax) return false
+    const content = state.src.slice(start, end).trim()
+    if (!content) return false
+    if (!silent) {
+      const token = state.push('math_inline', 'math', 0)
+      token.content = content
+      token.markup = '$'
+    }
+    state.pos = end + 1
+    return true
+  })
+
+  md.renderer.rules.math_inline = (tokens, idx) => {
+    return renderToString(tokens[idx].content, { displayMode: false, throwOnError: false, strict: 'ignore' })
+  }
+
+  // Block: $$...$$
+  md.block.ruler.after('blockquote', 'math_block', (state, startLine, endLine, silent) => {
+    const startPos = state.bMarks[startLine] + state.tShift[startLine]
+    if (state.src.charCodeAt(startPos) !== 0x24 || state.src.charCodeAt(startPos + 1) !== 0x24) return false
+    if (silent) return true
+    let nextLine = startLine
+    let found = false
+    while (nextLine < endLine) {
+      nextLine++
+      if (nextLine >= endLine) break
+      const pos = state.bMarks[nextLine] + state.tShift[nextLine]
+      const max = state.eMarks[nextLine]
+      const line = state.src.slice(pos, max).trim()
+      if (line === '$$') { found = true; break }
+    }
+    if (!found) return false
+    const contentLines: string[] = []
+    for (let i = startLine + 1; i < nextLine; i++) {
+      contentLines.push(state.src.slice(state.bMarks[i] + state.tShift[i], state.eMarks[i]))
+    }
+    const token = state.push('math_block', 'math', 0)
+    token.content = contentLines.join('\\n').trim()
+    token.markup = '$$'
+    token.map = [startLine, nextLine + 1]
+    state.line = nextLine + 1
+    return true
+  })
+
+  md.renderer.rules.math_block = (tokens, idx) => {
+    return '<div class="math-display">' + renderToString(tokens[idx].content, { displayMode: true, throwOnError: false, strict: 'ignore' }) + '</div>\\n'
+  }
+}
+
 // --- Markdown-it Instance ---
 
 const md = MarkdownIt({
@@ -10688,26 +10787,7 @@ const md = MarkdownIt({
   },
 })
   .use(headingAnchorPlugin)
-  .use(dollarmath, {
-    allow_space: false,
-    allow_digits: false,
-    double_inline: true,
-    allow_labels: true,
-    allow_blank_lines: true,
-    renderer(content: string, { displayMode }: { displayMode: boolean }) {
-      return renderToString(content, {
-        displayMode,
-        throwOnError: false,
-        strict: 'ignore',
-      })
-    },
-    labelNormalizer(label: string) {
-      return label.replace(/[\\s]+/g, '-')
-    },
-    labelRenderer(label: string) {
-      return \`<a href="#\${label}" class="mathlabel" title="Permalink to this equation">\xB6</a>\`
-    },
-  })
+  .use(mathPlugin)
 
 export function renderMarkdownSync(src: string): string {
   const trimmedContent = trimMathBlock(src)
@@ -11560,7 +11640,6 @@ var CORE_DEPS = [
   "@shikijs/transformers",
   "katex",
   "markdown-it",
-  "markdown-it-dollarmath",
   // Drag-and-drop
   "@dnd-kit/core",
   "@dnd-kit/sortable",
@@ -11632,6 +11711,8 @@ async function installDependenciesAsync({
 
 // src/init/scaffolders/env.ts
 import crypto from "crypto";
+import { existsSync, readFileSync } from "fs";
+import { join } from "path";
 
 // src/utils/env.ts
 import fs27 from "fs";
@@ -11688,7 +11769,22 @@ ${lines.join("\n")}` : header + lines.join("\n");
 }
 
 // src/init/scaffolders/env.ts
-function getCoreEnvSections(databaseUrl) {
+function detectDevPort(cwd) {
+  const pkgPath = join(cwd, "package.json");
+  if (!existsSync(pkgPath)) return 3e3;
+  try {
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    const devScript = pkg.scripts?.dev ?? "";
+    const match = devScript.match(/--port\s+(\d+)|-p\s+(\d+)/);
+    if (match) {
+      const port = Number.parseInt(match[1] ?? match[2], 10);
+      if (port > 0 && port <= 65535) return port;
+    }
+  } catch {
+  }
+  return 3e3;
+}
+function getCoreEnvSections(databaseUrl, devPort) {
   const authSecret = crypto.randomBytes(32).toString("base64");
   return [
     {
@@ -11699,7 +11795,7 @@ function getCoreEnvSections(databaseUrl) {
       header: "Authentication",
       vars: [
         { key: "BETTERSTART_AUTH_SECRET", value: authSecret },
-        { key: "BETTERSTART_AUTH_URL", value: "http://localhost:3000" },
+        { key: "BETTERSTART_AUTH_URL", value: `http://localhost:${devPort}` },
         { key: "BETTERSTART_AUTH_BASE_PATH", value: "/api/cms/auth" }
       ]
     },
@@ -11725,7 +11821,8 @@ function getEmailEnvSection() {
   };
 }
 function scaffoldEnv(cwd, options) {
-  const sections = getCoreEnvSections(options.databaseUrl);
+  const devPort = detectDevPort(cwd);
+  const sections = getCoreEnvSections(options.databaseUrl, devPort);
   if (options.includeEmail) {
     sections.push(getEmailEnvSection());
   }
@@ -13954,7 +14051,7 @@ Run manually: ${pc2.cyan("npx betterstart seed")}`,
         "",
         `Admin: ${pc2.cyan(seedEmail)}`,
         `Password: ${pc2.cyan(seedPassword)}`,
-        `CMS: ${pc2.cyan("http://localhost:3000/cms/login")}`
+        `CMS: ${pc2.cyan(`http://localhost:${detectDevPort(cwd)}/cms/login`)}`
       );
     }
     const nextSteps = [];