betterstart-cli 0.0.3 → 0.0.4

package/dist/cli.js

@@ -7935,7 +7935,6 @@ function genTypesContent(ctx) {
   }
   const parts = [
     ctx.dataInterface,
-    ctx.displayDataInterface || null,
     ctx.responseInterface,
     ctx.filtersInterface,
     ctx.hasCreatableSelectFields ? buildSelectOptionTypes(ctx) : null,
@@ -8302,14 +8301,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 = [];
+  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 +8317,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 +9212,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`,
@@ -9799,18 +9797,6 @@ ${m2mFieldTypes}` : ""}${mediaCompanionTypes ? `
 ${mediaCompanionTypes}` : ""}
 ${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 +9856,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 +9946,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 +9984,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,
@@ -14123,9 +14075,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 +14092,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 +14144,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)),