betterstart-cli 0.0.5 → 0.0.6

package/dist/cli.js

@@ -3867,6 +3867,61 @@ function generateFieldMapping(field, source = "input") {
 function getFieldType(field, mode = "output") {
   return toTypeScriptType(field, mode);
 }
+function getReadFieldType(field) {
+  if (field.type === "select") return "SelectOptionValue[]";
+  if (field.type === "group" && field.fields && field.fields.length > 0) {
+    const groupType = field.fields.map(
+      (nestedField) => `${quotePropertyName(nestedField.name)}?: ${getReadFieldType(nestedField)}`
+    ).join("; ");
+    return `{ ${groupType} }`;
+  }
+  if (field.type === "list" && field.fields && field.fields.length > 0) {
+    const nestedType = field.fields.flatMap((nestedField) => {
+      const fields = [`${quotePropertyName(nestedField.name)}?: ${getReadFieldType(nestedField)}`];
+      if (nestedField.hasIcon) {
+        fields.push(`${quotePropertyName(`${nestedField.name}Icon`)}?: string`);
+      }
+      return fields;
+    }).join("; ");
+    return `Array<{ ${nestedType} }>`;
+  }
+  return getFieldType(field, "output");
+}
+function collectReadSelectFields(fields, path52 = []) {
+  const matches = fields.flatMap((field) => {
+    const currentPath = [...path52, field.name];
+    const matches2 = field.type === "select" ? [{ field, path: currentPath }] : [];
+    if (field.fields) {
+      matches2.push(...collectReadSelectFields(field.fields, currentPath));
+    }
+    if (field.tabs) {
+      for (const tab of field.tabs) {
+        matches2.push(...collectReadSelectFields(tab.fields ?? [], currentPath));
+        if (tab.slot?.main?.fields) {
+          matches2.push(...collectReadSelectFields(tab.slot.main.fields, currentPath));
+        }
+        if (tab.slot?.sidebar?.fields) {
+          matches2.push(...collectReadSelectFields(tab.slot.sidebar.fields, currentPath));
+        }
+      }
+    }
+    return matches2;
+  });
+  const seen = /* @__PURE__ */ new Set();
+  return matches.filter((match) => {
+    const key = match.path.join(".");
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+function buildReadSelectOptionType(selectFields) {
+  if (selectFields.length === 0) return null;
+  return `export interface SelectOptionValue {
+  label: string
+  value: string
+}`;
+}
 function buildRelationshipSelect(allDbFields, relationshipFields, tableVar, htmlFields = [], extraSelects = [], extraJoins = "") {
   const fieldSelects = allDbFields.filter((f) => f.type !== "relationship").map((f) => `        ${f.name}: ${tableVar}.${f.name}`);
   const htmlSelects = htmlFields.map((f) => `        ${f.name}Html: ${tableVar}.${f.name}Html`);
@@ -3931,7 +3986,7 @@ ${rowMappings}
   return `${mapBlock}
 
     return {
-      ${camelPlural}: mapped${Plural} as ${Singular}[],
+      ${camelPlural}: mapped${Plural} as unknown as ${Singular}[],
       total
     }`;
 }
@@ -3956,7 +4011,7 @@ function buildSingleRowMapping(allDbFields, _relationshipFields, typeName, htmlF
   ].join(",\n");
   return `{
 ${mappings}
-    } as ${typeName}`;
+    } as unknown as ${typeName}`;
 }
 function buildExplicitSelect(fields, tableVar, htmlFields = [], extraSelects = [], extraJoins = "") {
   const fieldSelects = fields.map((f) => `      ${f.name}: ${tableVar}.${f.name}`);
@@ -4382,6 +4437,14 @@ function sampleSchemaOutputValue(field) {
   if (field.name === "id") return SAMPLE_UUID;
   if (field.name === "createdAt" || field.name === "updatedAt") return "2026-01-01T00:00:00.000Z";
   if (field.name === "createdBy" || field.name === "updatedBy") return "user-id";
+  if (field.type === "select") {
+    const sampleValue = sampleSchemaFieldValue(field);
+    const values = Array.isArray(sampleValue) ? sampleValue : sampleValue ? [sampleValue] : [];
+    return values.filter((value) => typeof value === "string" && value.length > 0).map((value) => ({
+      label: field.options?.find((option) => option.value === value)?.label ?? value,
+      value
+    }));
+  }
   if (field.type === "relationship" && field.relationship && !field.multiple) {
     return {
       id: SAMPLE_UUID,
@@ -4391,6 +4454,18 @@ function sampleSchemaOutputValue(field) {
       label: "Example related record"
     };
   }
+  if (field.type === "group" && field.fields && field.fields.length > 0) {
+    return Object.fromEntries(
+      field.fields.filter((nestedField) => nestedField.name && !isLayoutField(nestedField.type)).map((nestedField) => [nestedField.name, sampleSchemaOutputValue(nestedField)])
+    );
+  }
+  if (field.type === "list" && field.fields && field.fields.length > 0) {
+    return [
+      Object.fromEntries(
+        field.fields.filter((nestedField) => nestedField.name && !isLayoutField(nestedField.type)).map((nestedField) => [nestedField.name, sampleSchemaOutputValue(nestedField)])
+      )
+    ];
+  }
   return sampleSchemaFieldValue(field);
 }
 function sampleSingleOutputValue(field) {
@@ -8030,7 +8105,10 @@ function genHelpersContent(ctx) {
     drizzleImports.add("inArray");
     schemaImports.add("adminMedia");
   }
-  if (ctx.hasM2M || ctx.hasListRels || ctx.hasMediaFields) {
+  if (ctx.hasCreatableSelectFields) {
+    schemaImports.add(ctx.selectOptionsTableVar);
+  }
+  if (ctx.hasM2M || ctx.hasListRels || ctx.hasMediaFields || ctx.hasCreatableSelectFields) {
     lines.push(`import db from '@admin/db'`);
   }
   const tables = [...schemaImports].sort();
@@ -8043,7 +8121,8 @@ function genHelpersContent(ctx) {
   if (ctx.hasMediaFields) {
     lines.push(`import type { AdminMedia } from '@admin/types'`);
   }
-  lines.push(`import type { ${ctx.Singular} } from './types'`);
+  const typeImports = ctx.hasSelectFields ? `${ctx.Singular}, SelectOptionValue` : ctx.Singular;
+  lines.push(`import type { ${typeImports} } from './types'`);
   lines.push("");
   lines.push(`export function formatActionDate(value: unknown): string {
   if (typeof value !== 'string') return ''
@@ -8067,6 +8146,10 @@ function genHelpersContent(ctx) {
     lines.push(generateResolveMediaFunction(ctx));
     lines.push("");
   }
+  if (ctx.hasSelectFields) {
+    lines.push(generateResolveSelectFieldsFunction(ctx));
+    lines.push("");
+  }
   lines.push(generateVersionSnapshotHelpers(ctx));
   lines.push("");
   return lines.join("\n");
@@ -8117,7 +8200,7 @@ const VERSION_RESTORE_KEYS = [${restoreKeys}] as const
 const VERSION_M2M_KEYS = [${m2mKeys}] as const
 
 export function build${ctx.Singular}VersionSnapshot(row: Partial<${ctx.Singular}> | Record<string, unknown>): Record<string, unknown> {
-  const source = row as Record<string, unknown>
+  const source = row as unknown as Record<string, unknown>
   const snapshot: Record<string, unknown> = {}
 
   for (const key of VERSION_SNAPSHOT_KEYS) {
@@ -8222,6 +8305,95 @@ ${assignArray}` : ""}
   return rows
 }`;
 }
+function generateResolveSelectFieldsFunction(ctx) {
+  const staticLabelMaps = ctx.selectFields.map((readField) => {
+    const key = readField.path.join(".");
+    const entries = (readField.field.options ?? []).map((option) => `${JSON.stringify(option.value)}: ${JSON.stringify(option.label)}`).join(", ");
+    return `  ${JSON.stringify(key)}: { ${entries} }`;
+  }).join(",\n");
+  const dynamicRowsBlock = ctx.hasCreatableSelectFields ? `
+  const dynamicRows = await db
+    .select({
+      fieldName: ${ctx.selectOptionsTableVar}.fieldName,
+      label: ${ctx.selectOptionsTableVar}.label,
+      value: ${ctx.selectOptionsTableVar}.value
+    })
+    .from(${ctx.selectOptionsTableVar})
+
+  for (const row of dynamicRows) {
+    labelMaps[row.fieldName] ??= {}
+    labelMaps[row.fieldName][row.value] = row.label
+  }
+` : "";
+  const assignments = ctx.selectFields.map((readField) => {
+    const key = readField.path.join(".");
+    return `    resolveSelectFieldPath(source, ${JSON.stringify(readField.path)}, labelMaps[${JSON.stringify(key)}] ?? {})`;
+  }).join("\n");
+  return `const STATIC_SELECT_OPTION_LABELS = {
+${staticLabelMaps}
+} satisfies Record<string, Record<string, string>>
+
+function cloneSelectOptionLabelMaps(): Record<string, Record<string, string>> {
+  return Object.fromEntries(
+    Object.entries(STATIC_SELECT_OPTION_LABELS).map(([fieldName, labels]) => [
+      fieldName,
+      { ...labels }
+    ])
+  )
+}
+
+function toSelectOptionValues(value: unknown, labels: Record<string, string>): SelectOptionValue[] {
+  const values = Array.isArray(value) ? value : value ? [value] : []
+
+  return values
+    .filter((item): item is string => typeof item === 'string' && item.length > 0)
+    .map((item) => ({
+      label: labels[item] ?? item,
+      value: item
+    }))
+}
+
+function resolveSelectFieldPath(
+  source: Record<string, unknown>,
+  path: readonly string[],
+  labels: Record<string, string>
+): void {
+  const [fieldName, ...rest] = path
+  if (!fieldName) return
+
+  if (rest.length === 0) {
+    source[fieldName] = toSelectOptionValues(source[fieldName], labels)
+    return
+  }
+
+  const value = source[fieldName]
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      if (item && typeof item === 'object') {
+        resolveSelectFieldPath(item as Record<string, unknown>, rest, labels)
+      }
+    }
+    return
+  }
+
+  if (value && typeof value === 'object') {
+    resolveSelectFieldPath(value as Record<string, unknown>, rest, labels)
+  }
+}
+
+export async function resolve${ctx.Singular}SelectFields(rows: ${ctx.Singular}[]): Promise<${ctx.Singular}[]> {
+  if (rows.length === 0) return rows
+
+  const labelMaps = cloneSelectOptionLabelMaps()
+${dynamicRowsBlock}
+  for (const row of rows) {
+    const source = row as unknown as Record<string, unknown>
+${assignments}
+  }
+
+  return rows
+}`;
+}
 function genGetPluralContent(ctx) {
   const dbImports = [ctx.tableVar, "user", ...ctx.relTableImports].sort();
   const drizzle = ["asc", "desc"];
@@ -8235,6 +8407,7 @@ function genGetPluralContent(ctx) {
   const sortedDrizzle = [...new Set(drizzle)].sort();
   const typeImports = [`${ctx.Plural}Page`, `${ctx.Plural}Query`, `${ctx.Singular}`];
   const helperImports = ["formatActionDate"];
+  if (ctx.hasSelectFields) helperImports.push(`resolve${ctx.Singular}SelectFields`);
   if (ctx.hasListRels) helperImports.push(`populate${ctx.Singular}ListRelationships`);
   if (ctx.hasMediaFields) helperImports.push(`resolve${ctx.Singular}MediaFields`);
   const populateImport = helperImports.length > 0 ? `
@@ -8325,6 +8498,7 @@ function genGetByIdContent(ctx) {
   const drizzle = ["eq"];
   const sortedDrizzle = [...new Set(drizzle)].sort();
   const byIdHelperImports = ["formatActionDate"];
+  if (ctx.hasSelectFields) byIdHelperImports.push(`resolve${ctx.Singular}SelectFields`);
   if (ctx.hasListRels) byIdHelperImports.push(`populate${ctx.Singular}ListRelationships`);
   if (ctx.hasMediaFields) byIdHelperImports.push(`resolve${ctx.Singular}MediaFields`);
   const populateImport = byIdHelperImports.length > 0 ? `
@@ -8363,6 +8537,7 @@ function genGetBySlugContent(ctx) {
   const drizzle = ["eq"];
   const sortedDrizzle = [...new Set(drizzle)].sort();
   const bySlugHelperImports = ["formatActionDate"];
+  if (ctx.hasSelectFields) bySlugHelperImports.push(`resolve${ctx.Singular}SelectFields`);
   if (ctx.hasListRels) bySlugHelperImports.push(`populate${ctx.Singular}ListRelationships`);
   if (ctx.hasMediaFields) bySlugHelperImports.push(`resolve${ctx.Singular}MediaFields`);
   const populateImport = bySlugHelperImports.length > 0 ? `
@@ -8398,7 +8573,7 @@ export async function get${ctx.Singular}BySlug(slug: string): Promise<${ctx.Sing
 function genCreateContent(ctx) {
   const kebabSingular = toKebabCase(ctx.singular);
   const snapshotImport = ctx.hasM2M ? `build${ctx.Singular}VersionSnapshotWithRelationships` : `build${ctx.Singular}VersionSnapshot`;
-  const snapshotData = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(createdRow as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(createdRow as ${ctx.Singular})`;
+  const snapshotData = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(createdRow as unknown as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(createdRow as unknown as ${ctx.Singular})`;
   const slugImport = ctx.hasAutoSlug ? `
 import { slugify } from '@admin/utils/validation/validation'` : "";
   const markdownImport = ctx.hasHtmlOutput ? `
@@ -8492,7 +8667,7 @@ ${ctx.htmlCreateMappings},` : ""}${ctx.hasDraft ? `
       typeof created${ctx.Singular}Id === 'string'
         ? await get${ctx.Singular}ById(created${ctx.Singular}Id)
         : null
-    const created${ctx.Singular}Data = created${ctx.Singular} ?? (result[0] as ${ctx.Singular})
+    const created${ctx.Singular}Data = created${ctx.Singular} ?? (result[0] as unknown as ${ctx.Singular})
     const created${ctx.Singular}Context = ${createResultContext}
     ${afterHook("afterCreate", `created${ctx.Singular}Context`)}
 ${createAfterPublishBlock}
@@ -8511,7 +8686,7 @@ ${createAfterPublishBlock}
 function genUpdateContent(ctx) {
   const kebabSingular = toKebabCase(ctx.singular);
   const snapshotImport = ctx.hasM2M ? `build${ctx.Singular}VersionSnapshotWithRelationships` : `build${ctx.Singular}VersionSnapshot`;
-  const previousSnapshot = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(previousRow as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(previousRow as ${ctx.Singular})`;
+  const previousSnapshot = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(previousRow as unknown as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(previousRow as unknown as ${ctx.Singular})`;
   const slugImport = ctx.hasAutoSlug ? `
 import { slugify } from '@admin/utils/validation/validation'` : "";
   const markdownImport = ctx.hasHtmlOutput ? `
@@ -8635,7 +8810,7 @@ ${htmlUpdateBlock}
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.byId(id))
     ${ctx.cacheInvalidationFn}(entityVersionsCacheTags.for('${ctx.plural}', id))
     const updated${ctx.Singular} = await get${ctx.Singular}ById(id)
-    const updated${ctx.Singular}Data = updated${ctx.Singular} ?? (result[0] as ${ctx.Singular})
+    const updated${ctx.Singular}Data = updated${ctx.Singular} ?? (result[0] as unknown as ${ctx.Singular})
     const updated${ctx.Singular}Context = ${updateResultContext}
 ${updateAfterPublishBlock}
     ${afterHook("afterUpdate", `updated${ctx.Singular}Context`)}
@@ -8690,7 +8865,7 @@ function buildRestoreManyToManyStatements(ctx) {
 function genRestoreContent(ctx) {
   const kebabSingular = toKebabCase(ctx.singular);
   const snapshotImport = ctx.hasM2M ? `build${ctx.Singular}VersionSnapshotWithRelationships` : `build${ctx.Singular}VersionSnapshot`;
-  const currentSnapshot = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(currentRow as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(currentRow as ${ctx.Singular})`;
+  const currentSnapshot = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(currentRow as unknown as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(currentRow as unknown as ${ctx.Singular})`;
   const dbImports = [
     "entityVersions",
     ctx.tableVar,
@@ -8769,7 +8944,7 @@ ${restoreM2M}
 
     return {
       success: true,
-      ${ctx.camelSingular}: restored${ctx.Singular} ?? (result[0] as ${ctx.Singular})
+      ${ctx.camelSingular}: restored${ctx.Singular} ?? (result[0] as unknown as ${ctx.Singular})
     }
   } catch (error) {
     console.error('Error restoring ${ctx.singular} version:', error)
@@ -9812,6 +9987,8 @@ function buildEntityContext(schema, nextMajorVersion) {
     (f) => f.type === "select" && f.creatable === true
   );
   const hasCreatableSelectFields = creatableSelectFields.length > 0;
+  const selectFields = collectReadSelectFields(allDbFields);
+  const hasSelectFields = selectFields.length > 0;
   const dateRangeFilterFields = new Set(
     resolvedFilters.filter((filter) => filter.type === "date-range").map((filter) => filter.field)
   );
@@ -9835,7 +10012,7 @@ function buildEntityContext(schema, nextMajorVersion) {
   const relTableImports = relationshipFields.map((f) => toCamelCase(f.relationship));
   const listRelTableImports = allListRelQueries.map((q) => q.relTable);
   const dataFields = allDbFields.map(
-    (f) => `  ${quotePropertyName(f.name)}: ${getFieldType(f, "output")}${f.required || f.primaryKey ? "" : " | null"}`
+    (f) => `  ${quotePropertyName(f.name)}: ${getReadFieldType(f)}${f.type === "select" || f.required || f.primaryKey ? "" : " | null"}`
   ).join("\n");
   const m2mFieldTypes = m2mFields.map((f) => `  ${quotePropertyName(f.name)}: string[]`).join("\n");
   const htmlFieldTypes = htmlOutputFields.map((f) => `  ${f.name}Html: string`).join("\n");
@@ -9849,7 +10026,10 @@ 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()}
+  const readSelectOptionType = buildReadSelectOptionType(selectFields);
+  const dataInterface = `${mediaTypeImport}${buildAuthorshipUserType()}${readSelectOptionType ? `
+
+${readSelectOptionType}` : ""}
 
 export interface ${Singular} {
 ${dataFields}${htmlFieldTypes ? `
@@ -9954,7 +10134,8 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     Singular,
     hasListRels
   );
-  const resultMapping = hasMediaFields ? wrapWithMediaResolution(baseResultMapping, camelPlural, Singular) : baseResultMapping;
+  const selectResultMapping = hasSelectFields ? wrapWithSelectResolution(baseResultMapping, camelPlural, Singular) : baseResultMapping;
+  const resultMapping = hasMediaFields ? wrapWithMediaResolution(selectResultMapping, camelPlural, Singular) : selectResultMapping;
   const baseListResultMapping = hasHtmlOutput ? buildResultMapping(
     listDbFields,
     relationshipFields,
@@ -9963,7 +10144,8 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     Singular,
     hasListRels
   ) : baseResultMapping;
-  const listResultMapping = hasMediaFields ? wrapWithMediaResolution(baseListResultMapping, camelPlural, Singular) : baseListResultMapping;
+  const selectListResultMapping = hasSelectFields ? wrapWithSelectResolution(baseListResultMapping, camelPlural, Singular) : baseListResultMapping;
+  const listResultMapping = hasMediaFields ? wrapWithMediaResolution(selectListResultMapping, camelPlural, Singular) : selectListResultMapping;
   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 ? `
@@ -10004,9 +10186,11 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     return `const row = result[0]
     return ${singleRowMapping}`;
   })();
-  const singleRowReturn = hasMediaFields ? `${baseSingleRowReturn.replace(/return ([\s\S]+)$/, `const singleRow = $1
-    const [resolved] = await resolve${Singular}MediaFields([singleRow])
-    return resolved`)}` : baseSingleRowReturn;
+  const singleRowResolvers = [
+    ...hasSelectFields ? [`resolve${Singular}SelectFields`] : [],
+    ...hasMediaFields ? [`resolve${Singular}MediaFields`] : []
+  ];
+  const singleRowReturn = singleRowResolvers.length > 0 ? wrapSingleRowReturnWithResolvers(baseSingleRowReturn, singleRowResolvers) : baseSingleRowReturn;
   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'`;
@@ -10036,9 +10220,11 @@ ${searchFields.map((f) => `          ilike(${tableVar}.${f}, searchTerm)`).join(
     hasSearch,
     hasFilters,
     hasAutoSlug,
+    hasSelectFields,
     hasCreatableSelectFields,
     searchFields,
     htmlOutputFields,
+    selectFields,
     creatableSelectFields,
     m2mFields,
     filterableFields,
@@ -10089,11 +10275,135 @@ function wrapWithMediaResolution(mapping, camelPlural, Singular) {
   }
   return mapping.replace(
     new RegExp(`${camelPlural}: (results as ${Singular}\\[\\])`),
-    `${camelPlural}: await resolve${Singular}MediaFields($1)`
+    `${camelPlural}: await resolve${Singular}MediaFields($1 as unknown as ${Singular}[])`
   );
 }
+function wrapWithSelectResolution(mapping, camelPlural, Singular) {
+  const returnPattern = new RegExp(
+    `return \\{\\n\\s+${camelPlural}: ([^,]+),\\n\\s+total\\n\\s+\\}`
+  );
+  const match = mapping.match(returnPattern);
+  if (match) {
+    const arrayExpr = match[1].trim();
+    return mapping.replace(
+      match[0],
+      `const resolved${Singular}SelectFields = await resolve${Singular}SelectFields(${arrayExpr})
+
+    return {
+      ${camelPlural}: resolved${Singular}SelectFields,
+      total
+    }`
+    );
+  }
+  return mapping.replace(
+    new RegExp(`${camelPlural}: (results as ${Singular}\\[\\])`),
+    `${camelPlural}: await resolve${Singular}SelectFields($1 as unknown as ${Singular}[])`
+  );
+}
+function wrapSingleRowReturnWithResolvers(singleRowReturn, resolvers) {
+  return singleRowReturn.replace(/return ([\s\S]+)$/, (_, expression) => {
+    const lines = [`const singleRow = ${expression}`];
+    let current = "singleRow";
+    for (const resolver of resolvers) {
+      const resolvedName = resolver.replace(/^resolve/, "resolved").replace(/Fields$/, "Row");
+      lines.push(`    const [${resolvedName}] = await ${resolver}([${current}])`);
+      current = resolvedName;
+    }
+    lines.push(`    return ${current}`);
+    return lines.join("\n");
+  });
+}
 
 // adapters/next/generators/actions/single-actions.ts
+function generateSingleResolveSelectFieldsFunction(Singular, selectFields, selectOptionsTableVar, hasCreatableSelectFields) {
+  const staticLabelMaps = selectFields.map((readField) => {
+    const key = readField.path.join(".");
+    const entries = (readField.field.options ?? []).map((option) => `${JSON.stringify(option.value)}: ${JSON.stringify(option.label)}`).join(", ");
+    return `  ${JSON.stringify(key)}: { ${entries} }`;
+  }).join(",\n");
+  const dynamicRowsBlock = hasCreatableSelectFields ? `
+  const dynamicRows = await db
+    .select({
+      fieldName: ${selectOptionsTableVar}.fieldName,
+      label: ${selectOptionsTableVar}.label,
+      value: ${selectOptionsTableVar}.value
+    })
+    .from(${selectOptionsTableVar})
+
+  for (const row of dynamicRows) {
+    labelMaps[row.fieldName] ??= {}
+    labelMaps[row.fieldName][row.value] = row.label
+  }
+` : "";
+  const assignments = selectFields.map((readField) => {
+    const key = readField.path.join(".");
+    return `    resolveSelectFieldPath(source, ${JSON.stringify(readField.path)}, labelMaps[${JSON.stringify(key)}] ?? {})`;
+  }).join("\n");
+  return `const STATIC_SELECT_OPTION_LABELS = {
+${staticLabelMaps}
+} satisfies Record<string, Record<string, string>>
+
+function cloneSelectOptionLabelMaps(): Record<string, Record<string, string>> {
+  return Object.fromEntries(
+    Object.entries(STATIC_SELECT_OPTION_LABELS).map(([fieldName, labels]) => [
+      fieldName,
+      { ...labels }
+    ])
+  )
+}
+
+function toSelectOptionValues(value: unknown, labels: Record<string, string>): SelectOptionValue[] {
+  const values = Array.isArray(value) ? value : value ? [value] : []
+
+  return values
+    .filter((item): item is string => typeof item === 'string' && item.length > 0)
+    .map((item) => ({
+      label: labels[item] ?? item,
+      value: item
+    }))
+}
+
+function resolveSelectFieldPath(
+  source: Record<string, unknown>,
+  path: readonly string[],
+  labels: Record<string, string>
+): void {
+  const [fieldName, ...rest] = path
+  if (!fieldName) return
+
+  if (rest.length === 0) {
+    source[fieldName] = toSelectOptionValues(source[fieldName], labels)
+    return
+  }
+
+  const value = source[fieldName]
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      if (item && typeof item === 'object') {
+        resolveSelectFieldPath(item as Record<string, unknown>, rest, labels)
+      }
+    }
+    return
+  }
+
+  if (value && typeof value === 'object') {
+    resolveSelectFieldPath(value as Record<string, unknown>, rest, labels)
+  }
+}
+
+async function resolve${Singular}SelectFields(rows: ${Singular}[]): Promise<${Singular}[]> {
+  if (rows.length === 0) return rows
+
+  const labelMaps = cloneSelectOptionLabelMaps()
+${dynamicRowsBlock}
+  for (const row of rows) {
+    const source = row as unknown as Record<string, unknown>
+${assignments}
+  }
+
+  return rows
+}`;
+}
 function generateSingleActions(schema, actionsDir, options = {}) {
   const singular = singularize(schema.name);
   const plural = pluralize(schema.name);
@@ -10113,6 +10423,8 @@ function generateSingleActions(schema, actionsDir, options = {}) {
     (field) => field.type === "select" && field.creatable === true
   );
   const hasCreatableSelectFields = creatableSelectFields.length > 0;
+  const selectFields = collectReadSelectFields(dbFields);
+  const hasSelectFields = selectFields.length > 0;
   const allDbFields = [...dbFields];
   if (!dbFields.some((f) => f.name === "createdAt")) {
     allDbFields.push({ name: "createdAt", type: "timestamp", required: true });
@@ -10129,7 +10441,7 @@ function generateSingleActions(schema, actionsDir, options = {}) {
     (f) => !f.primaryKey && f.name !== "createdAt" && f.name !== "updatedAt" && !isAuthorshipFieldName(f.name)
   );
   const dataFields = allDbFields.map(
-    (f) => `  ${quotePropertyName(f.name)}: ${getFieldType(f, "output")}${f.required || f.primaryKey ? "" : " | null"}`
+    (f) => `  ${quotePropertyName(f.name)}: ${getReadFieldType(f)}${f.type === "select" || 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");
@@ -10158,6 +10470,7 @@ function generateSingleActions(schema, actionsDir, options = {}) {
   };
   const typesContent = `${[
     buildAuthorshipUserType(),
+    buildReadSelectOptionType(selectFields),
     `export interface ${Singular} {
 ${dataFields}${htmlFieldTypes ? `
 ${htmlFieldTypes}` : ""}${timestampFields}
@@ -10186,17 +10499,29 @@ ${upsertInterfaceFields}
     authorshipSelects,
     authorshipJoins
   );
-  const singleRowReturn = `const row = result[0]
-    return ${buildSingleRowMapping(allDbFields, [], `${Singular}`, htmlOutputFields)}`;
+  const singleRowMapping = buildSingleRowMapping(allDbFields, [], `${Singular}`, htmlOutputFields);
+  const singleRowReturn = hasSelectFields ? `const row = result[0]
+    const singleRow = ${singleRowMapping}
+    const [resolvedSelectRow] = await resolve${Singular}SelectFields([singleRow])
+    return resolvedSelectRow` : `const row = result[0]
+    return ${singleRowMapping}`;
+  const getDbImports = [
+    tableVar,
+    "user",
+    ...hasCreatableSelectFields ? [`${tableVar}SelectOptions`] : []
+  ].sort();
+  const selectResolutionFunctions = hasSelectFields ? `
+${generateSingleResolveSelectFieldsFunction(Singular, selectFields, `${tableVar}SelectOptions`, hasCreatableSelectFields)}
+` : "";
   const getContent = `'use server'
 
 import db from '@admin/db'
-import { ${tableVar}, user } from '@admin/db/schema'
+import { ${getDbImports.join(", ")} } from '@admin/db/schema'
 import { eq } from 'drizzle-orm'
 import { alias } from 'drizzle-orm/pg-core'
 ${cacheReadImport}
 import { ${cacheTagsVar} } from './types'
-import type { ${Singular} } from './types'
+import type { ${Singular}${hasSelectFields ? ", SelectOptionValue" : ""} } from './types'
 
 ${buildAuthorshipAliasBlock()}
 
@@ -10214,7 +10539,7 @@ function formatActionDate(value: unknown): string {
     timeZone: 'UTC'
   })
 }
-
+${selectResolutionFunctions}
 export async function get${Singular}(): Promise<${Singular} | null> {
   'use cache'${cacheLifeLine}
   cacheTag(${cacheTagsVar}.all)
@@ -10294,7 +10619,7 @@ ${htmlUpsertBlock}
 
     return {
       success: true,
-      ${camelSingular}: saved${Singular} ?? (result[0] as ${Singular})
+      ${camelSingular}: saved${Singular} ?? (result[0] as unknown as ${Singular})
     }
   } catch (error) {
     console.error('Error upserting ${singular}:', error)
@@ -10523,6 +10848,22 @@ function fieldHasMediaCompanion(column, fields) {
   const field = fields.find((item) => item.name === column.accessorKey);
   return field?.type === "image" || field?.type === "media" || field?.type === "video";
 }
+function fieldIsSelect(column, fields) {
+  return fields.find((item) => item.name === column.accessorKey)?.type === "select";
+}
+function generateSelectLabel(valueExpression) {
+  return `const label = Array.isArray(${valueExpression})
+        ? ${valueExpression}
+            .map((option) =>
+              typeof option === 'object' && option !== null && 'label' in option
+                ? String(option.label)
+                : String(option)
+            )
+            .join(', ')
+        : ${valueExpression} === null || ${valueExpression} === undefined
+          ? null
+          : String(${valueExpression})`;
+}
 function buildImageUrlExpression(column, fields, fallbackExpression) {
   const fallback = `(${fallbackExpression} as string | null | undefined)`;
   if (!fieldHasMediaCompanion(column, fields)) {
@@ -10603,6 +10944,7 @@ function generateColumnDef2(column, fields) {
     }` : `header: '${column.header}'`;
   let cellDef = "";
   const authorshipUserAccessor = getAuthorshipUserAccessor(column.accessorKey);
+  const isSelectColumn = fieldIsSelect(column, fields);
   if (authorshipUserAccessor) {
     cellDef = `cell: ({ row }) => {
       ${generateAuthorshipValue(authorshipUserAccessor)}
@@ -10623,7 +10965,15 @@ function generateColumnDef2(column, fields) {
     }`;
         break;
       case "badge":
-        cellDef = `cell: ({ row }) => {
+        cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.getValue('${column.accessorKey}')
+      ${generateSelectLabel("value")}
+      return (
+        <Badge variant="outline">
+          {label || 'Unavailable'}
+        </Badge>
+      )
+    }` : `cell: ({ row }) => {
       const value = row.getValue('${column.accessorKey}')
       return (
         <Badge variant="outline">
@@ -10705,14 +11055,22 @@ function generateColumnDef2(column, fields) {
       return <${column.component} data={row.original} />
     }`;
         } else {
-          cellDef = `cell: ({ row }) => {
+          cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.getValue('${column.accessorKey}')
+      ${generateSelectLabel("value")}
+      return <div>{label || 'Unavailable'}</div>
+    }` : `cell: ({ row }) => {
       const value = row.getValue('${column.accessorKey}')
       return <div>{value === null || value === undefined ? 'Unavailable' : String(value)}</div>
     }`;
         }
         break;
       default:
-        cellDef = `cell: ({ row }) => {
+        cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.getValue('${column.accessorKey}')
+      ${generateSelectLabel("value")}
+      return <div>{label || 'Unavailable'}</div>
+    }` : `cell: ({ row }) => {
       const value = row.getValue('${column.accessorKey}')
       return <div>{value === null || value === undefined ? 'Unavailable' : String(value)}</div>
     }`;
@@ -10754,6 +11112,7 @@ function generateFirstColumnDef(column, fields, options = {}) {
     )`;
   let cellDef = "";
   const authorshipUserAccessor = getAuthorshipUserAccessor(column.accessorKey);
+  const isSelectColumn = fieldIsSelect(column, fields);
   if (authorshipUserAccessor) {
     cellDef = `cell: ({ row }) => {
       ${generateAuthorshipValue(authorshipUserAccessor)}
@@ -10785,7 +11144,22 @@ function generateFirstColumnDef(column, fields, options = {}) {
     }`;
         break;
       case "badge":
-        cellDef = `cell: ({ row }) => {
+        cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.original.${column.accessorKey}
+      ${generateSelectLabel("value")}
+      return (
+        <div className="flex items-center gap-4 h-full pl-1">
+          <Checkbox
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+            aria-label="Select row"
+          />
+          <Badge variant="outline">
+            {label || 'Unavailable'}
+          </Badge>
+        </div>
+      )
+    }` : `cell: ({ row }) => {
       const value = row.original.${column.accessorKey}
       return (
         <div className="flex items-center gap-4 h-full pl-1">
@@ -10908,7 +11282,22 @@ function generateFirstColumnDef(column, fields, options = {}) {
       )
     }`;
         } else {
-          cellDef = `cell: ({ row }) => {
+          cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.original.${column.accessorKey}
+      ${generateSelectLabel("value")}
+      return (
+        <div className="flex items-center gap-4 h-full pl-1">
+          <Checkbox
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+            aria-label="Select row"
+          />
+          <span className="truncate max-w-[300px]">
+            {label || 'Unavailable'}
+          </span>
+        </div>
+      )
+    }` : `cell: ({ row }) => {
       const value = row.original.${column.accessorKey}
       return (
         <div className="flex items-center gap-4 h-full pl-1">
@@ -10954,7 +11343,22 @@ function generateFirstColumnDef(column, fields, options = {}) {
     }`;
         break;
       default:
-        cellDef = `cell: ({ row }) => {
+        cellDef = isSelectColumn ? `cell: ({ row }) => {
+      const value = row.original.${column.accessorKey}
+      ${generateSelectLabel("value")}
+      return (
+        <div className="flex items-center gap-4 h-full pl-1">
+          <Checkbox
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+            aria-label="Select row"
+          />
+          <span className="truncate max-w-[300px]">
+            {label || 'Unavailable'}
+          </span>
+        </div>
+      )
+    }` : `cell: ({ row }) => {
       const value = row.original.${column.accessorKey}
       return (
         <div className="flex items-center gap-4 h-full pl-1">
@@ -11626,9 +12030,38 @@ function defaultFallbackValue(f) {
 function hasInitialValueExpression(fieldName, dataSource = "initialData") {
   return `${dataSource}?.${fieldName} !== undefined && ${dataSource}?.${fieldName} !== null && ${dataSource}?.${fieldName} !== ''`;
 }
+function selectReadValuesExpression(fieldName, dataSource = "initialData") {
+  return `(() => {
+        const selectValue = ${dataSource}?.${fieldName} as unknown
+        const values = Array.isArray(selectValue) ? selectValue : [selectValue]
+        return values
+          .map((option) => {
+            if (typeof option === 'string') return option
+            if (option && typeof option === 'object' && 'value' in option) {
+              return String(option.value)
+            }
+            return null
+          })
+          .filter((value): value is string => typeof value === 'string' && value.length > 0)
+      })()`;
+}
 function generateDefaultValue(f, fieldMap, dataSource = "initialData") {
   if (f.defaultValueFrom && f.defaultValueFrom.trim() !== f.name && fieldMap?.has(f.defaultValueFrom.trim())) {
     const sourceName = f.defaultValueFrom.trim();
+    if (f.type === "select") {
+      const targetValuesExpression = selectReadValuesExpression(f.name, dataSource);
+      const sourceValuesExpression = selectReadValuesExpression(sourceName, dataSource);
+      if (f.multiple) {
+        const fallback2 = JSON.stringify(selectDefaultValues(f));
+        return `      ${f.name}: ${targetValuesExpression}.length > 0
+        ? ${targetValuesExpression}
+        : ${sourceValuesExpression}.length > 0
+          ? ${sourceValuesExpression}
+          : ${fallback2}`;
+      }
+      const fallback = f.default !== void 0 && f.default !== null ? JSON.stringify(f.default) : "''";
+      return `      ${f.name}: ${targetValuesExpression}[0] ?? ${sourceValuesExpression}[0] ?? ${fallback}`;
+    }
     return `      ${f.name}: ${hasInitialValueExpression(f.name, dataSource)}
         ? ${dataSource}.${f.name}
         : ${hasInitialValueExpression(sourceName, dataSource)}
@@ -11658,22 +12091,23 @@ function generateDefaultValue(f, fieldMap, dataSource = "initialData") {
     return `      ${f.name}: ${dataSource}?.${f.name} ?? undefined`;
   }
   if (f.type === "select") {
+    const selectedValuesExpression = selectReadValuesExpression(f.name, dataSource);
     if (f.multiple) {
       const fallback2 = JSON.stringify(selectDefaultValues(f));
       if (f.creatable) {
-        return `      ${f.name}: Array.isArray(${dataSource}?.${f.name}) ? ${dataSource}?.${f.name} : ${fallback2}`;
+        return `      ${f.name}: ${selectedValuesExpression}.length > 0 ? ${selectedValuesExpression} : ${fallback2}`;
       }
       const validValuesExpression2 = `([${(f.options || []).map((option) => JSON.stringify(option.value)).join(", ")}] as const as readonly string[])`;
-      return `      ${f.name}: Array.isArray(${dataSource}?.${f.name})
-        ? ${dataSource}?.${f.name}.filter((value) => ${validValuesExpression2}.includes(value))
+      return `      ${f.name}: ${selectedValuesExpression}.length > 0
+        ? ${selectedValuesExpression}.filter((value) => ${validValuesExpression2}.includes(value))
         : ${fallback2}`;
     }
     const fallback = f.default !== void 0 && f.default !== null ? JSON.stringify(f.default) : "''";
     if (f.creatable) {
-      return `      ${f.name}: typeof ${dataSource}?.${f.name} === 'string' ? ${dataSource}?.${f.name} : ${fallback}`;
+      return `      ${f.name}: ${selectedValuesExpression}[0] ?? ${fallback}`;
     }
     const validValuesExpression = `([${(f.options || []).map((option) => JSON.stringify(option.value)).join(", ")}] as const as readonly string[])`;
-    return `      ${f.name}: typeof ${dataSource}?.${f.name} === 'string' && ${validValuesExpression}.includes(${dataSource}?.${f.name}) ? ${dataSource}?.${f.name} : ${fallback}`;
+    return `      ${f.name}: ${selectedValuesExpression}[0] && ${validValuesExpression}.includes(${selectedValuesExpression}[0]) ? ${selectedValuesExpression}[0] : ${fallback}`;
   }
   if (f.default !== void 0 && f.default !== null) {
     const def = typeof f.default === "string" ? `'${f.default}'` : f.default;