betterstart-cli 0.0.3 → 0.0.5

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/copyable-code-block.tsx

@@ -66,7 +66,7 @@ export function CopyableCodeBlock({ label, code, language, tabs }: CopyableCodeB
 
           {codeTabs.map((tab) => (
             <TabsContent key={tab.id} value={tab.id} className="min-h-0 overflow-auto">
-              <CardContent className="p-0 overflow-auto">
+              <CardContent className="p-0 overflow-auto select-text">
                 <React.Suspense fallback={<PlainCodeFallback code={tab.code} />}>
                   <LazyCodeMirror code={tab.code} language={tab.language} theme={codeTheme} />
                 </React.Suspense>
@@ -92,7 +92,7 @@ export function CopyableCodeBlock({ label, code, language, tabs }: CopyableCodeB
               {isCopied ? <Check /> : <Copy />}
             </Button>
           </CardHeader>
-          <CardContent className="p-0 overflow-auto">
+          <CardContent className="p-0 overflow-auto select-text">
             <React.Suspense fallback={<PlainCodeFallback code={code} />}>
               <LazyCodeMirror code={code} language={language} theme={codeTheme} />
             </React.Suspense>

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/dev-mode-code-mirror.tsx

@@ -19,10 +19,20 @@ const compactCodeTheme = EditorView.theme({
   '&': {
     fontSize: '12px'
   },
+  '.cm-editor': {
+    userSelect: 'text'
+  },
   '.cm-content': {
+    userSelect: 'text',
     padding: '10px 0 14px'
   },
+  '.cm-scroller': {
+    userSelect: 'text',
+    fontFamily:
+      'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace'
+  },
   '.cm-gutters': {
+    userSelect: 'none',
     padding: '0 0 14px'
   },
   '.cm-content, .cm-gutters': {
@@ -33,10 +43,6 @@ const compactCodeTheme = EditorView.theme({
   },
   '.cm-line': {
     padding: '0 16px'
-  },
-  '.cm-scroller': {
-    fontFamily:
-      'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace'
   }
 })
 
@@ -58,8 +64,8 @@ export default function DevModeCodeMirror({ code, language, theme }: DevModeCode
   return (
     <CodeMirror
       value={code}
-      editable={false}
       readOnly
+      className="select-text"
       basicSetup={codeMirrorSetup}
       extensions={extensions}
       theme={theme === 'dark' ? githubDark : githubLight}

package/dist/assets/adapters/next/templates/init/lib/actions/media/types.ts

@@ -2,7 +2,15 @@ import type { AdminMedia } from '@admin/types'
 
 export type CreateMediaInput = Omit<
   AdminMedia,
-  'id' | 'createdAt' | 'updatedAt' | 'createdBy' | 'updatedBy' | 'createdByUser' | 'updatedByUser'
+  | 'id'
+  | 'createdAt'
+  | 'updatedAt'
+  | 'createdAtFormatted'
+  | 'updatedAtFormatted'
+  | 'createdBy'
+  | 'updatedBy'
+  | 'createdByUser'
+  | 'updatedByUser'
 >
 
 export interface CreateMediaResult {

package/dist/assets/adapters/next/templates/init/types/index.ts

@@ -20,6 +20,8 @@ export interface AdminMedia {
   tags: string[] | null
   createdAt: string
   updatedAt: string
+  createdAtFormatted?: string
+  updatedAtFormatted?: string
   createdBy: string | null
   updatedBy: string | null
   createdByUser?: AdminUserSummary | null

package/dist/cli.js

@@ -3892,12 +3892,17 @@ function buildResultMapping(allDbFields, relationshipFields, Plural, camelPlural
     `      const createdByUser = row.createdByUser as { id?: string | null; name?: string | null; email?: string | null } | null | undefined`,
     `      const updatedByUser = row.updatedByUser as { id?: string | null; name?: string | null; email?: string | null } | null | undefined`
   ].filter(Boolean).join("\n");
+  const mappedTimestampFields = allDbFields.some((f) => f.name === "createdAtFormatted") ? [] : [
+    `        createdAtFormatted: formatActionDate(row.createdAt)`,
+    `        updatedAtFormatted: formatActionDate(row.updatedAt)`
+  ];
   const rowMappings = allDbFields.map((f) => {
     if (f.type === "relationship" && !f.multiple) {
       return `        ${f.name}: ${f.name}?.id ? { id: ${f.name}.id, name: ${f.name}.name ?? undefined, title: ${f.name}.title ?? undefined, slug: ${f.name}.slug ?? undefined, label: ${f.name}.label ?? undefined } : null`;
     }
     return `        ${f.name}: row.${f.name}`;
   }).concat([
+    ...mappedTimestampFields,
     `        createdByUser: createdByUser?.id ? { id: createdByUser.id, name: createdByUser.name ?? '', email: createdByUser.email ?? '' } : null`,
     `        updatedByUser: updatedByUser?.id ? { id: updatedByUser.id, name: updatedByUser.name ?? '', email: updatedByUser.email ?? '' } : null`
   ]).join(",\n");
@@ -3938,9 +3943,14 @@ function buildSingleRowMapping(allDbFields, _relationshipFields, typeName, htmlF
     return `      ${f.name}: row.${f.name}`;
   });
   const htmlMappings = htmlFields.map((f) => `      ${f.name}Html: row.${f.name}Html`);
+  const singleTimestampFields = allDbFields.some((f) => f.name === "createdAtFormatted") ? [] : [
+    `      createdAtFormatted: formatActionDate(row.createdAt)`,
+    `      updatedAtFormatted: formatActionDate(row.updatedAt)`
+  ];
   const mappings = [
     ...fieldMappings,
     ...htmlMappings,
+    ...singleTimestampFields,
     `      createdByUser: row.createdByUser?.id ? { id: row.createdByUser.id, name: row.createdByUser.name, email: row.createdByUser.email } : null`,
     `      updatedByUser: row.updatedByUser?.id ? { id: row.updatedByUser.id, name: row.updatedByUser.name, email: row.updatedByUser.email } : null`
   ].join(",\n");
@@ -4172,6 +4182,7 @@ var SINGLE_ACTION_FIELD_EXCLUSIONS = /* @__PURE__ */ new Set(["id", "createdAt",
 var DEFAULT_ADMIN_IMPORT_ALIAS = "@admin";
 var SAMPLE_UUID = "00000000-0000-4000-8000-000000000001";
 var SINGLETON_ID = "00000000-0000-0000-0000-000000000001";
+var SAMPLE_FORMATTED_TIMESTAMP = "Jan 01, 2026";
 function isActionField(field, exclusions) {
   return !field.primaryKey && !exclusions.has(field.name) && !isAuthorshipFieldName(field.name) && !isLayoutField(field.type);
 }
@@ -4354,6 +4365,8 @@ function sampleAdminMedia() {
     tags: ["example"],
     createdAt: "2026-01-01T00:00:00.000Z",
     updatedAt: "2026-01-01T00:00:00.000Z",
+    createdAtFormatted: SAMPLE_FORMATTED_TIMESTAMP,
+    updatedAtFormatted: SAMPLE_FORMATTED_TIMESTAMP,
     createdBy: "user-id",
     updatedBy: "user-id"
   };
@@ -4392,7 +4405,7 @@ function createEntityDataObject(schema) {
     return field.type === "image" || field.type === "video" || field.type === "media";
   });
   const galleryFields = regularDbFields.filter((field) => field.type === "gallery");
-  return {
+  return addFormattedTimestamps({
     ...Object.fromEntries(allDbFields.map((field) => [field.name, sampleSchemaOutputValue(field)])),
     ...Object.fromEntries(
       htmlOutputFields.map((field) => [
@@ -4407,7 +4420,17 @@ function createEntityDataObject(schema) {
     ),
     createdByUser: sampleAdminUserSummary(),
     updatedByUser: sampleAdminUserSummary()
-  };
+  });
+}
+function addFormattedTimestamps(data) {
+  const output = { ...data };
+  if (typeof output.createdAt === "string") {
+    output.createdAtFormatted = SAMPLE_FORMATTED_TIMESTAMP;
+  }
+  if (typeof output.updatedAt === "string") {
+    output.updatedAtFormatted = SAMPLE_FORMATTED_TIMESTAMP;
+  }
+  return output;
 }
 function getSingleAllDbFields(schema) {
   const dbFields = flattenFields(schema.fields).filter(
@@ -4430,7 +4453,7 @@ function getSingleAllDbFields(schema) {
 function createSingleDataObject(schema) {
   const dbFields = getSingleAllDbFields(schema);
   const htmlOutputFields = getHtmlOutputFields(dbFields);
-  return {
+  return addFormattedTimestamps({
     ...Object.fromEntries(dbFields.map((field) => [field.name, sampleSingleOutputValue(field)])),
     ...Object.fromEntries(
       htmlOutputFields.map((field) => [
@@ -4440,7 +4463,7 @@ function createSingleDataObject(schema) {
     ),
     createdByUser: sampleAdminUserSummary(),
     updatedByUser: sampleAdminUserSummary()
-  };
+  });
 }
 function createFormSubmissionObject(fields) {
   return {
@@ -7935,7 +7958,6 @@ function genTypesContent(ctx) {
   }
   const parts = [
     ctx.dataInterface,
-    ctx.displayDataInterface || null,
     ctx.responseInterface,
     ctx.filtersInterface,
     ctx.hasCreatableSelectFields ? buildSelectOptionTypes(ctx) : null,
@@ -8022,6 +8044,19 @@ function genHelpersContent(ctx) {
     lines.push(`import type { AdminMedia } from '@admin/types'`);
   }
   lines.push(`import type { ${ctx.Singular} } from './types'`);
+  lines.push("");
+  lines.push(`export function formatActionDate(value: unknown): string {
+  if (typeof value !== 'string') return ''
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return ''
+
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    timeZone: 'UTC'
+  })
+}`);
   lines.push("");
   if (ctx.hasListRels) {
     const exportedFn = ctx.populateListRelsFn.replace("async function", "export async function").trim();
@@ -8134,10 +8169,32 @@ function generateResolveMediaFunction(ctx) {
     }`
   ).join("\n");
   const assignSingle = singleFields.map(
-    (name) => `    row.${name}Media = (row.${name} && !row.${name}.startsWith('http')) ? mediaMap.get(row.${name}) ?? null : null`
+    (name) => `    row.${name}Media = row.${name} && !row.${name}.startsWith('http')
+      ? (() => {
+          const media = mediaMap.get(row.${name})
+          if (!media) return null
+          return {
+            ...media,
+            createdAtFormatted: formatActionDate(media.createdAt),
+            updatedAtFormatted: formatActionDate(media.updatedAt)
+          }
+        })()
+      : null`
   ).join("\n");
   const assignArray = arrayFields.map(
-    (name) => `    row.${name}Media = Array.isArray(row.${name}) ? row.${name}.map((id: string) => mediaMap.get(id)).filter(Boolean) as AdminMedia[] : []`
+    (name) => `    row.${name}Media = Array.isArray(row.${name})
+      ? row.${name}
+          .map((id: string) => {
+            const media = mediaMap.get(id)
+            if (!media) return null
+            return {
+              ...media,
+              createdAtFormatted: formatActionDate(media.createdAt),
+              updatedAtFormatted: formatActionDate(media.updatedAt)
+            }
+          })
+          .filter(Boolean) as AdminMedia[]
+      : []`
   ).join("\n");
   return `export async function resolve${ctx.Singular}MediaFields(rows: ${ctx.Singular}[]): Promise<${ctx.Singular}[]> {
   if (rows.length === 0) return rows
@@ -8177,7 +8234,7 @@ function genGetPluralContent(ctx) {
   if (ctx.hasRelationships) drizzle.push("eq");
   const sortedDrizzle = [...new Set(drizzle)].sort();
   const typeImports = [`${ctx.Plural}Page`, `${ctx.Plural}Query`, `${ctx.Singular}`];
-  const helperImports = [];
+  const helperImports = ["formatActionDate"];
   if (ctx.hasListRels) helperImports.push(`populate${ctx.Singular}ListRelationships`);
   if (ctx.hasMediaFields) helperImports.push(`resolve${ctx.Singular}MediaFields`);
   const populateImport = helperImports.length > 0 ? `
@@ -8267,7 +8324,7 @@ function genGetByIdContent(ctx) {
   const dbImports = [ctx.tableVar, "user", ...ctx.relTableImports].sort();
   const drizzle = ["eq"];
   const sortedDrizzle = [...new Set(drizzle)].sort();
-  const byIdHelperImports = [];
+  const byIdHelperImports = ["formatActionDate"];
   if (ctx.hasListRels) byIdHelperImports.push(`populate${ctx.Singular}ListRelationships`);
   if (ctx.hasMediaFields) byIdHelperImports.push(`resolve${ctx.Singular}MediaFields`);
   const populateImport = byIdHelperImports.length > 0 ? `
@@ -8302,14 +8359,14 @@ export async function get${ctx.Singular}ById(id: string): Promise<${ctx.Singular
 }
 function genGetBySlugContent(ctx) {
   if (!ctx.hasSlug) return null;
-  const returnType = ctx.hasHtmlOutput ? `${ctx.Singular}View` : `${ctx.Singular}`;
   const dbImports = [ctx.tableVar, "user", ...ctx.relTableImports].sort();
   const drizzle = ["eq"];
   const sortedDrizzle = [...new Set(drizzle)].sort();
-  const typeImport = ctx.hasHtmlOutput ? `${ctx.Singular}View` : `${ctx.Singular}`;
-  const extraTypes = ctx.hasListRels && ctx.hasHtmlOutput ? `, ${ctx.Singular}` : "";
-  const populateImport = ctx.hasListRels ? `
-import { populate${ctx.Singular}ListRelationships } from './helpers'` : "";
+  const bySlugHelperImports = ["formatActionDate"];
+  if (ctx.hasListRels) bySlugHelperImports.push(`populate${ctx.Singular}ListRelationships`);
+  if (ctx.hasMediaFields) bySlugHelperImports.push(`resolve${ctx.Singular}MediaFields`);
+  const populateImport = bySlugHelperImports.length > 0 ? `
+import { ${bySlugHelperImports.join(", ")} } from './helpers'` : "";
   return `'use server'
 
 import db from '@admin/db'
@@ -8318,19 +8375,19 @@ import { ${sortedDrizzle.join(", ")} } from 'drizzle-orm'
 import { alias } from 'drizzle-orm/pg-core'
 ${ctx.cacheReadImport}
 import { ${ctx.camelPlural}CacheTags } from './types'
-import type { ${typeImport}${extraTypes} } from './types'${populateImport}
+import type { ${ctx.Singular} } from './types'${populateImport}
 
 ${buildAuthorshipAliasBlock()}
 
-export async function get${ctx.Singular}BySlug(slug: string): Promise<${returnType} | null> {
+export async function get${ctx.Singular}BySlug(slug: string): Promise<${ctx.Singular} | null> {
   'use cache'${ctx.cacheLifeLine}
   cacheTag(${ctx.camelPlural}CacheTags.bySlug(slug))
   cacheTag(${ctx.camelPlural}CacheTags.all)
 
   try {
-    const result = await ${ctx.displaySelectClause}.where(eq(${ctx.tableVar}.slug, slug)).limit(1)
+    const result = await ${ctx.selectClause}.where(eq(${ctx.tableVar}.slug, slug)).limit(1)
     if (result.length === 0) return null
-    ${ctx.displaySingleRowReturn}
+    ${ctx.singleRowReturn}
   } catch (error) {
     console.error('Error fetching ${ctx.singular} by slug:', error)
     return null
@@ -9213,7 +9270,6 @@ function genBarrelContent(files, ctx) {
   const lines = [];
   const typeNames = [
     `${ctx.Singular}`,
-    ctx.hasHtmlOutput ? `${ctx.Singular}View` : null,
     `${ctx.Plural}Page`,
     `${ctx.Plural}Query`,
     `${ctx.Singular}CreateInput`,
@@ -9790,27 +9846,18 @@ function buildEntityContext(schema, nextMajorVersion) {
   const mediaTypeImport = hasMediaFields ? `
 import type { AdminMedia } from '@admin/types'
 ` : "";
+  const hasTimestampFields = allDbFields.some((f) => f.name === "createdAt") && allDbFields.some((f) => f.name === "updatedAt");
+  const hasFormattedTimestampFields = allDbFields.some((f) => f.name === "createdAtFormatted");
+  const timestampFields = hasTimestampFields && !hasFormattedTimestampFields ? "\n  createdAtFormatted: string\n  updatedAtFormatted: string" : "";
   const dataInterface = `${mediaTypeImport}${buildAuthorshipUserType()}
 
 export interface ${Singular} {
 ${dataFields}${htmlFieldTypes ? `
 ${htmlFieldTypes}` : ""}${m2mFieldTypes ? `
 ${m2mFieldTypes}` : ""}${mediaCompanionTypes ? `
-${mediaCompanionTypes}` : ""}
+${mediaCompanionTypes}` : ""}${timestampFields}
 ${buildAuthorshipDataFields()}
 }`;
-  const displayDbFields = allDbFields.filter(
-    (f) => !htmlOutputFields.some((h) => h.name === f.name)
-  );
-  const displayDataFields = displayDbFields.map(
-    (f) => `  ${quotePropertyName(f.name)}: ${getFieldType(f, "output")}${f.required || f.primaryKey ? "" : " | null"}`
-  ).join("\n");
-  const displayDataInterface = hasHtmlOutput ? `export interface ${Singular}View {
-${displayDataFields}${htmlFieldTypes ? `
-${htmlFieldTypes}` : ""}${m2mFieldTypes ? `
-${m2mFieldTypes}` : ""}
-${buildAuthorshipDataFields()}
-}` : "";
   const responseInterface = `export interface ${Plural}Page {
   ${camelPlural}: ${Singular}[]
   total: number
@@ -9870,20 +9917,6 @@ ${updateInterfaceFields}${hasDraft ? `
     authorshipSelects,
     authorshipJoins
   ) : buildExplicitSelect(listDbFields, tableVar, [], authorshipSelects, authorshipJoins) : selectClause;
-  const displaySelectClause = hasHtmlOutput && hasSlug ? hasRelationships ? buildRelationshipSelect(
-    displayDbFields,
-    relationshipFields,
-    tableVar,
-    htmlOutputFields,
-    authorshipSelects,
-    authorshipJoins
-  ) : buildExplicitSelect(
-    displayDbFields,
-    tableVar,
-    htmlOutputFields,
-    authorshipSelects,
-    authorshipJoins
-  ) : selectClause;
   const filterConditions = filterableFields.map((f) => {
     if (dateRangeFilterFields.has(f.name)) {
       return `    if (query?.${f.name}) {
@@ -9974,23 +10007,6 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
   const singleRowReturn = hasMediaFields ? `${baseSingleRowReturn.replace(/return ([\s\S]+)$/, `const singleRow = $1
     const [resolved] = await resolve${Singular}MediaFields([singleRow])
     return resolved`)}` : baseSingleRowReturn;
-  const displaySingleRowReturn = hasHtmlOutput ? (() => {
-    const displayType = `${Singular}View`;
-    if (hasRelationships && hasListRels) {
-      return `const row = result[0]
-    return await populate${Singular}ListRelationships(${buildSingleRowMapping(displayDbFields, relationshipFields, Singular, htmlOutputFields)}) as unknown as ${displayType}`;
-    }
-    if (hasRelationships) {
-      return `const row = result[0]
-    return ${buildSingleRowMapping(displayDbFields, relationshipFields, displayType, htmlOutputFields)}`;
-    }
-    if (hasListRels) {
-      return `const row = result[0]
-    return await populate${Singular}ListRelationships(${buildSingleRowMapping(displayDbFields, relationshipFields, Singular, htmlOutputFields)}) as unknown as ${displayType}`;
-    }
-    return `const row = result[0]
-    return ${buildSingleRowMapping(displayDbFields, relationshipFields, displayType, htmlOutputFields)}`;
-  })() : singleRowReturn;
   const nextMajor = nextMajorVersion ?? 16;
   const cacheInvalidationFn = nextMajor >= 16 ? "updateTag" : "revalidateTag";
   const cacheReadImport = nextMajor >= 16 ? `import { cacheLife, cacheTag } from 'next/cache'` : `import { unstable_cacheTag as cacheTag } from 'next/cache'`;
@@ -10029,20 +10045,17 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     relTableImports,
     listRelTableImports,
     dataInterface,
-    displayDataInterface,
     responseInterface,
     filtersInterface,
     createInterface,
     updateInterface,
     selectClause,
     listSelectClause,
-    displaySelectClause,
     filterConditions,
     searchBlock,
     resultMapping,
     listResultMapping,
     singleRowReturn,
-    displaySingleRowReturn,
     fieldMeta,
     createMappings,
     htmlCreateBlock,
@@ -10119,6 +10132,9 @@ function generateSingleActions(schema, actionsDir, options = {}) {
     (f) => `  ${quotePropertyName(f.name)}: ${getFieldType(f, "output")}${f.required || f.primaryKey ? "" : " | null"}`
   ).join("\n");
   const htmlFieldTypes = htmlOutputFields.map((f) => `  ${f.name}Html: string`).join("\n");
+  const hasTimestampFields = allDbFields.some((f) => f.name === "createdAt") && allDbFields.some((f) => f.name === "updatedAt");
+  const hasFormattedTimestampFields = allDbFields.some((f) => f.name === "createdAtFormatted");
+  const timestampFields = hasTimestampFields && !hasFormattedTimestampFields ? "\n  createdAtFormatted: string\n  updatedAtFormatted: string" : "";
   const upsertInterfaceFields = upsertFields.map((f) => `  ${quotePropertyName(f.name)}?: ${getFieldType(f, "input")}`).join("\n");
   const fieldMeta = upsertFields.map((f) => `{ name: '${f.name}', type: '${f.type}', required: ${f.required ?? false} }`).join(",\n    ");
   const cacheTag = `${schema.name}:all`;
@@ -10144,7 +10160,7 @@ function generateSingleActions(schema, actionsDir, options = {}) {
     buildAuthorshipUserType(),
     `export interface ${Singular} {
 ${dataFields}${htmlFieldTypes ? `
-${htmlFieldTypes}` : ""}
+${htmlFieldTypes}` : ""}${timestampFields}
 ${buildAuthorshipDataFields()}
 }`,
     `export interface ${Singular}UpsertInput {
@@ -10186,6 +10202,19 @@ ${buildAuthorshipAliasBlock()}
 
 const SINGLETON_ID = '${singletonId}'
 
+function formatActionDate(value: unknown): string {
+  if (typeof value !== 'string') return ''
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return ''
+
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    timeZone: 'UTC'
+  })
+}
+
 export async function get${Singular}(): Promise<${Singular} | null> {
   'use cache'${cacheLifeLine}
   cacheTag(${cacheTagsVar}.all)
@@ -14123,9 +14152,6 @@ function generateHook(schema, hooksDir, options = {}) {
   const Plural = toPascalCase(plural);
   const dbFields = flattenFields(schema.fields);
   const hasSlugField = dbFields.some((f) => f.name === "slug");
-  const hasHtmlOutput = dbFields.some(
-    (f) => (f.type === "richtext" || f.type === "markdown") && f.output === "html"
-  );
   const resolvedFilters = resolveEntityFilters(schema).map((filter) => ({
     ...filter,
     variableName: toCamelCase(filter.key),
@@ -14143,12 +14169,7 @@ function generateHook(schema, hooksDir, options = {}) {
       }
     }
   }
-  const typeImports = [
-    `type ${Singular}`,
-    ...hasHtmlOutput && hasSlugField ? [`type ${Singular}View`] : [],
-    `type ${Plural}Page`,
-    `type ${Plural}Query`
-  ];
+  const typeImports = [`type ${Singular}`, `type ${Plural}Page`, `type ${Plural}Query`];
   const filterParams = hasFilters ? resolvedFilters.flatMap(
     (filter) => filter.type === "date-range" ? [`${filter.fromVariableName}?: string`, `${filter.toVariableName}?: string`] : [`${filter.variableName}?: string`]
   ).join(", ") : "";
@@ -14200,10 +14221,9 @@ export function use${Singular}(id: string | null | undefined): UseQueryResult<${
     enabled: !!id,
   })
 }`;
-  const slugReturnType = hasHtmlOutput ? `${Singular}View` : `${Singular}`;
   const slugHook = hasSlugField ? `
 
-export function use${Singular}BySlug(slug: string | null | undefined): UseQueryResult<${slugReturnType} | null, Error> {
+export function use${Singular}BySlug(slug: string | null | undefined): UseQueryResult<${Singular} | null, Error> {
   return useQuery({
     queryKey: ['${singular}', 'slug', slug],
     queryFn: () => (slug ? get${Singular}BySlug(slug) : Promise.resolve(null)),