@solidxai/core 0.1.13-beta.12 → 0.1.13-beta.13

package/dist/theme/theme-registry.js

@@ -0,0 +1,147 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThemeModeFromThemeKey = getThemeModeFromThemeKey;
+exports.getCoreThemes = getCoreThemes;
+exports.getRegisteredThemes = getRegisteredThemes;
+exports.getThemesByMode = getThemesByMode;
+exports.getDefaultThemeKey = getDefaultThemeKey;
+exports.isRegisteredThemeKey = isRegisteredThemeKey;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const DEFAULT_THEME_KEYS = {
+    light: "solid-light-purple",
+    dark: "solid-dark-purple",
+};
+const THEME_MODE_TOKENS = {
+    light: "-light-",
+    dark: "-dark-",
+};
+const THEME_MODE_SUFFIXES = {
+    light: "-light",
+    dark: "-dark",
+};
+function normalizeThemeKey(value) {
+    const normalized = value?.trim().toLowerCase();
+    return normalized || null;
+}
+function matchesThemeMode(value, mode) {
+    return (value.includes(THEME_MODE_TOKENS[mode])
+        || value.endsWith(THEME_MODE_SUFFIXES[mode])
+        || value === mode);
+}
+function titleCase(value) {
+    return value
+        .split(/[-_\s]+/)
+        .filter(Boolean)
+        .map((token) => {
+        if (token.toLowerCase() === "solid")
+            return "SolidX";
+        return token.charAt(0).toUpperCase() + token.slice(1);
+    })
+        .join(" ");
+}
+function getThemeModeFromThemeKey(value) {
+    const normalized = normalizeThemeKey(value);
+    if (!normalized)
+        return null;
+    if (matchesThemeMode(normalized, "light"))
+        return "light";
+    if (matchesThemeMode(normalized, "dark"))
+        return "dark";
+    return null;
+}
+function createThemeDefinition(key, defaultTheme = false) {
+    const mode = getThemeModeFromThemeKey(key);
+    if (!mode) {
+        throw new Error(`Invalid theme key: ${key}`);
+    }
+    return {
+        key,
+        label: titleCase(key),
+        mode,
+        default: defaultTheme,
+    };
+}
+function createDefaultTheme(mode) {
+    return createThemeDefinition(DEFAULT_THEME_KEYS[mode], true);
+}
+function groupThemesByMode(themes, mode) {
+    return themes.filter((theme) => theme.mode === mode);
+}
+function pickDefaultThemeKey(themes, mode) {
+    const themesForMode = groupThemesByMode(themes, mode);
+    return (themesForMode.find((theme) => theme.default)?.key
+        ?? themesForMode[0]?.key
+        ?? DEFAULT_THEME_KEYS[mode]);
+}
+function resolveThemeDirectory() {
+    const themeDirectory = path_1.default.resolve(process.cwd(), "..", "solid-ui", "public", "themes");
+    try {
+        if (fs_1.default.existsSync(themeDirectory) && fs_1.default.statSync(themeDirectory).isDirectory()) {
+            return path_1.default.resolve(themeDirectory);
+        }
+    }
+    catch {
+        return null;
+    }
+    return null;
+}
+function isThemeDirectory(themeDirectory, entryName) {
+    return fs_1.default.existsSync(path_1.default.join(themeDirectory, entryName, "theme.css"));
+}
+function readThemesFromPath() {
+    const themeDirectory = resolveThemeDirectory();
+    if (!themeDirectory) {
+        return [];
+    }
+    try {
+        const directoryEntries = fs_1.default.readdirSync(themeDirectory, { withFileTypes: true });
+        return directoryEntries
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => entry.name.trim())
+            .filter(Boolean)
+            .filter((entryName) => isThemeDirectory(themeDirectory, entryName))
+            .flatMap((entryName) => {
+            const mode = getThemeModeFromThemeKey(entryName);
+            if (!mode)
+                return [];
+            return [createThemeDefinition(entryName, entryName === DEFAULT_THEME_KEYS[mode])];
+        })
+            .sort((left, right) => left.label.localeCompare(right.label));
+    }
+    catch {
+        return [];
+    }
+}
+function getThemes() {
+    const discoveredThemes = readThemesFromPath();
+    if (discoveredThemes.length) {
+        return discoveredThemes;
+    }
+    return [createDefaultTheme("light"), createDefaultTheme("dark")];
+}
+function getCoreThemes() {
+    return getThemes();
+}
+function getRegisteredThemes() {
+    return getThemes();
+}
+function getThemesByMode(mode) {
+    return groupThemesByMode(getRegisteredThemes(), mode);
+}
+function getDefaultThemeKey(mode = "light") {
+    return pickDefaultThemeKey(getRegisteredThemes(), mode);
+}
+function isRegisteredThemeKey(value, mode) {
+    if (!value)
+        return false;
+    return getRegisteredThemes().some((theme) => {
+        if (theme.key !== value)
+            return false;
+        return mode ? theme.mode === mode : true;
+    });
+}
+//# sourceMappingURL=theme-registry.js.map

package/dist/theme/theme-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"theme-registry.js","sourceRoot":"","sources":["../../src/theme/theme-registry.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\n/**\n * Backend theme registry.\n *\n * Responsibilities:\n * - discover theme folders from the filesystem\n * - classify each theme as light/dark from its key\n * - expose default and grouped theme helpers for backend settings\n *\n * Shared pure parsing helpers are intentionally mirrored in solid-core-ui,\n * but all filesystem discovery stays here.\n */\nexport type ThemeMode = \"light\" | \"dark\";\n\nexport type AppThemeDefinition = {\n  key: string;\n  label: string;\n  mode: ThemeMode;\n  default?: boolean;\n};\n\nconst DEFAULT_THEME_KEYS: Record<ThemeMode, string> = {\n  light: \"solid-light-purple\",\n  dark: \"solid-dark-purple\",\n};\n\nconst THEME_MODE_TOKENS: Record<ThemeMode, string> = {\n  light: \"-light-\",\n  dark: \"-dark-\",\n};\n\nconst THEME_MODE_SUFFIXES: Record<ThemeMode, string> = {\n  light: \"-light\",\n  dark: \"-dark\",\n};\n\nfunction normalizeThemeKey(value?: string | null): string | null {\n  const normalized = value?.trim().toLowerCase();\n  return normalized || null;\n}\n\nfunction matchesThemeMode(value: string, mode: ThemeMode): boolean {\n  return (\n    value.includes(THEME_MODE_TOKENS[mode])\n    || value.endsWith(THEME_MODE_SUFFIXES[mode])\n    || value === mode\n  );\n}\n\nfunction titleCase(value: string): string {\n  return value\n    .split(/[-_\\s]+/)\n    .filter(Boolean)\n    .map((token) => {\n      if (token.toLowerCase() === \"solid\") return \"SolidX\";\n      return token.charAt(0).toUpperCase() + token.slice(1);\n    })\n    .join(\" \");\n}\n\nexport function getThemeModeFromThemeKey(value?: string | null): ThemeMode | null {\n  const normalized = normalizeThemeKey(value);\n  if (!normalized) return null;\n\n  if (matchesThemeMode(normalized, \"light\")) return \"light\";\n  if (matchesThemeMode(normalized, \"dark\")) return \"dark\";\n\n  return null;\n}\n\nfunction createThemeDefinition(key: string, defaultTheme = false): AppThemeDefinition {\n  const mode = getThemeModeFromThemeKey(key);\n  if (!mode) {\n    throw new Error(`Invalid theme key: ${key}`);\n  }\n\n  return {\n    key,\n    label: titleCase(key),\n    mode,\n    default: defaultTheme,\n  };\n}\n\nfunction createDefaultTheme(mode: ThemeMode): AppThemeDefinition {\n  return createThemeDefinition(DEFAULT_THEME_KEYS[mode], true);\n}\n\nfunction groupThemesByMode(themes: AppThemeDefinition[], mode: ThemeMode): AppThemeDefinition[] {\n  return themes.filter((theme) => theme.mode === mode);\n}\n\nfunction pickDefaultThemeKey(themes: AppThemeDefinition[], mode: ThemeMode): string {\n  const themesForMode = groupThemesByMode(themes, mode);\n\n  return (\n    themesForMode.find((theme) => theme.default)?.key\n    ?? themesForMode[0]?.key\n    ?? DEFAULT_THEME_KEYS[mode]\n  );\n}\n\nfunction resolveThemeDirectory(): string | null {\n  const themeDirectory = path.resolve(process.cwd(), \"..\", \"solid-ui\", \"public\", \"themes\");\n  try {\n    if (fs.existsSync(themeDirectory) && fs.statSync(themeDirectory).isDirectory()) {\n      return path.resolve(themeDirectory);\n    }\n  } catch {\n    return null;\n  }\n\n  return null;\n}\n\nfunction isThemeDirectory(themeDirectory: string, entryName: string): boolean {\n  return fs.existsSync(path.join(themeDirectory, entryName, \"theme.css\"));\n}\n\nfunction readThemesFromPath(): AppThemeDefinition[] {\n  const themeDirectory = resolveThemeDirectory();\n  if (!themeDirectory) {\n    return [];\n  }\n\n  try {\n    const directoryEntries = fs.readdirSync(themeDirectory, { withFileTypes: true });\n\n    return directoryEntries\n      .filter((entry) => entry.isDirectory())\n      .map((entry) => entry.name.trim())\n      .filter(Boolean)\n      .filter((entryName) => isThemeDirectory(themeDirectory, entryName))\n      .flatMap((entryName) => {\n        const mode = getThemeModeFromThemeKey(entryName);\n        if (!mode) return [];\n\n        return [createThemeDefinition(entryName, entryName === DEFAULT_THEME_KEYS[mode])];\n      })\n      .sort((left, right) => left.label.localeCompare(right.label));\n  } catch {\n    return [];\n  }\n}\n\nfunction getThemes(): AppThemeDefinition[] {\n  const discoveredThemes = readThemesFromPath();\n\n  if (discoveredThemes.length) {\n    return discoveredThemes;\n  }\n\n  return [createDefaultTheme(\"light\"), createDefaultTheme(\"dark\")];\n}\n\nexport function getCoreThemes(): AppThemeDefinition[] {\n  return getThemes();\n}\n\nexport function getRegisteredThemes(): AppThemeDefinition[] {\n  return getThemes();\n}\n\nexport function getThemesByMode(mode: ThemeMode): AppThemeDefinition[] {\n  return groupThemesByMode(getRegisteredThemes(), mode);\n}\n\nexport function getDefaultThemeKey(mode: ThemeMode = \"light\"): string {\n  return pickDefaultThemeKey(getRegisteredThemes(), mode);\n}\n\nexport function isRegisteredThemeKey(value?: string | null, mode?: ThemeMode): value is string {\n  if (!value) return false;\n\n  return getRegisteredThemes().some((theme) => {\n    if (theme.key !== value) return false;\n    return mode ? theme.mode === mode : true;\n  });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.13-beta.12",
+  "version": "0.1.13-beta.13",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/seeders/seed-data/solid-core-metadata.json

@@ -12591,7 +12591,7 @@
             50
           ],
           "enableGlobalSearch": true,
-          "create": true,
+          "create": false,
           "edit": true,
           "delete": true,
           "import": true,

package/src/services/1.js

@@ -0,0 +1,6 @@
+1. Do i need to create a storeStreams method for aws service too?
+    - Handle later
+2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
+    - startExport should either return the data or return the transaction id
+3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
+    - show the userKey

package/src/services/chatter-message.service.ts

@@ -37,6 +37,16 @@ interface ChatterMention {
     id?: string | number;
 }
 
+/**
+ * Server-side-only overrides for `postMessage`. Not part of `PostChatterMessageDto`, so
+ * nothing here is settable over HTTP - only in-process callers such as migration or
+ * back-fill services can supply it.
+ */
+export interface PostChatterMessageOptions {
+    /** Backdate the message instead of stamping it with the current time. */
+    createdAt?: Date;
+}
+
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
     private readonly _logger = new Logger(ChatterMessageService.name);
@@ -389,7 +399,14 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         return this.trimMessageUser(savedMessage);
     }
 
-    async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
+    /**
+     * Post a chatter message.
+     *
+     * `options` is deliberately kept out of `PostChatterMessageDto` so it can only be supplied
+     * by server-side callers (migrations, back-fills). The controller binds the DTO alone, so
+     * an API client has no way to backdate a message.
+     */
+    async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = [], options: PostChatterMessageOptions = {}) {
         const coModelName = lowerFirst(postDto.coModelName);
         await this.assertRecordAccess(coModelName, postDto.coModelEntityId);
 
@@ -404,6 +421,10 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
         chatterMessage.coModelName = coModelName;
         chatterMessage.modelUserKey = postDto.modelUserKey ?? null;
+        // Left unset otherwise, so the @CreateDateColumn default still applies.
+        if (options.createdAt) {
+            chatterMessage.createdAt = options.createdAt;
+        }
 
         const model = await this.modelMetadataRepo.findOne({
             where: { singularName: coModelName },

package/src/services/crud-helper.service.ts

@@ -889,25 +889,25 @@ export class CrudHelperService {
         };
     }
 
-    async countGroupedRecords(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string) { //TODO : Check how to pass a type to SelectQueryBuilder instead of any
-        const { limit, offset, ...rest } = basicFilterDto;
-        const filteredDto = { ...rest, limit: undefined, offset: undefined };
+    // async countGroupedRecords(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string, internationalisation?: boolean, draftPublishWorkflow?: boolean, moduleRef?: any) { //TODO : Check how to pass a type to SelectQueryBuilder instead of any
+    //     const { limit, offset, ...rest } = basicFilterDto;
+    //     const filteredDto = { ...rest, limit: undefined, offset: undefined };
 
-        const filteredQB = this.buildFilterQuery(qb, filteredDto as BasicFilterDto, entityAlias, undefined, undefined, undefined, FilterCombinator.AND, false, false);
+    //     const filteredQB = this.buildFilterQuery(qb, filteredDto as BasicFilterDto, entityAlias, internationalisation, draftPublishWorkflow, moduleRef, FilterCombinator.AND, false, false);
 
-        const groupByFields = this.normalize(filteredDto.groupBy);
+    //     const groupByFields = this.normalize(filteredDto.groupBy);
 
-        if (!groupByFields || groupByFields.length === 0) {
-            throw new Error(ERROR_MESSAGES.INVALID_GROUP_BY_COUNT);
-        }
+    //     if (!groupByFields || groupByFields.length === 0) {
+    //         throw new Error(ERROR_MESSAGES.INVALID_GROUP_BY_COUNT);
+    //     }
 
-        this.applyGroupBySelections(filteredQB, groupByFields, entityAlias);
-        this.applyAggregates(filteredQB, ['count'], entityAlias);
-        filteredQB.limit(undefined).offset(undefined).take(undefined).skip(undefined);
+    //     this.applyGroupBySelections(filteredQB, groupByFields, entityAlias);
+    //     this.applyAggregates(filteredQB, ['count'], entityAlias);
+    //     filteredQB.limit(undefined).offset(undefined).take(undefined).skip(undefined);
 
-        const rawResults = await filteredQB.getRawMany();
-        return rawResults.length;
-    }
+    //     const rawResults = await filteredQB.getRawMany();
+    //     return rawResults.length;
+    // }
 
     hasReadPermissionOnModel = (activeUser: ActiveUserData, modelName: string) => {
         const permissionNames = [`${classify(modelName)}Controller.findOne`, `${classify(modelName)}Controller.findMany`];
@@ -980,7 +980,10 @@ export class CrudHelperService {
         basicFilterDto: BasicFilterDto,
         alias: string,
         createQbFn: () => Promise<SelectQueryBuilder<T>>,
-        postProcessEntities?: (entities: T[]) => Promise<void>
+        postProcessEntities?: (entities: T[]) => Promise<void>,
+        internationalisation?: boolean,
+        draftPublishWorkflow?: boolean,
+        moduleRef?: any
     ): Promise<{ meta: { totalRecords: number }; groupMeta: any[]; groupRecords: any[] }> {
         const groupByFields = this.normalize(basicFilterDto.groupBy);
         if (!groupByFields.length) throw new BadRequestException(ERROR_MESSAGES.INVALID_GROUP_BY_COUNT);
@@ -1015,7 +1018,7 @@ export class CrudHelperService {
                     aggregates: undefined,
                     sort: basicFilterDto.groupFilter?.sort,
                 };
-                groupQb = this.buildFilterQuery(groupQb, groupFilterDto, alias);
+                groupQb = this.buildFilterQuery(groupQb, groupFilterDto, alias, internationalisation, draftPublishWorkflow, moduleRef);
                 groupQb = this.buildGroupByRecordsQuery(groupQb, group, alias, groupAliasMap, aggregateAliasMap, groupExpressionMap);
                 const [entities, count] = await groupQb.getManyAndCount();
                 if (postProcessEntities) await postProcessEntities(entities);

package/src/services/crud.service.ts

@@ -583,7 +583,8 @@ private async prepareManyToManyAuditSnapshot(entity: T,id: number,modelSingularN
                 async (entities) => {
                     if (populateUserIdFields?.length) await this.handlePopulateUserIdFields(populateUserIdFields, entities);
                     if (populateMedia?.length) await this.handlePopulateMedia(populateMedia, entities);
-                }
+                },
+                internationalisation, draftPublishWorkflow, this.moduleRef
             );
         }
         else {

package/src/services/draft-publish-helper.service.ts

@@ -333,13 +333,65 @@ export class DraftPublishHelperService {
             throw new BadRequestException(`${modelName} with id ${id} is already unpublished`);
         }
 
-        return repo.save({
-            ...entity,
-            isPublished: false,
-            updatedBy: activeUser?.sub ?? entity.updatedBy,
+        const chainId = entity.initialEntityVersionId || entity.id;
+
+        return repo.manager.transaction(async (manager) => {
+            const transactionalRepo = manager.getRepository(repo.metadata.target);
+
+            // Release the "na" published tracker before anything else can claim it, mirroring
+            // publishRecord's archive-others-then-publish ordering in reverse. unpublishRecord
+            // only ever acts on the latest version (see loadLatestEntityForPublishAction), so
+            // this always becomes a Draft rather than an Archived version — clear publishedAt
+            // to match applyCreateDefaults' Draft convention instead of leaving a stale date.
+            const unpublishedEntity = await transactionalRepo.save({
+                ...entity,
+                isPublished: false,
+                publishedAt: null,
+                publishedTracker: this.createPublishedVersionTracker(entity.id),
+                updatedBy: activeUser?.sub ?? entity.updatedBy,
+            } as any) as unknown as T;
+
+            const chainVersions = await transactionalRepo.find({
+                where: [
+                    { initialEntityVersionId: chainId },
+                    { id: chainId },
+                ] as any,
+            }) as unknown as T[];
+
+            const versionToRestore = this.pickMostRecentlyPublishedVersion(
+                chainVersions.filter(version => version.id !== entity.id),
+            );
+
+            if (versionToRestore) {
+                await transactionalRepo.save({
+                    ...versionToRestore,
+                    isPublished: true,
+                    publishedAt: new Date(),
+                    publishedTracker: "na",
+                } as any);
+            }
+
+            return unpublishedEntity;
         });
     }
 
+    /**
+     * Among the other versions in a chain, find the one that was live most recently before
+     * being superseded (i.e. the "Archived" version unpublishRecord should restore). Ties on
+     * publishedAt fall back to the highest id, matching pickCurrentLocaleRecord's ordering.
+     */
+    private pickMostRecentlyPublishedVersion<T extends CommonEntity>(versions: T[]): T | null {
+        const previouslyPublished = versions.filter(version => Boolean(version.publishedAt));
+        if (previouslyPublished.length === 0) return null;
+
+        return previouslyPublished.sort((a, b) => {
+            const aPublishedAt = new Date(a.publishedAt as any).getTime();
+            const bPublishedAt = new Date(b.publishedAt as any).getTime();
+            if (aPublishedAt !== bPublishedAt) return bPublishedAt - aPublishedAt;
+            return Number(b.id) - Number(a.id);
+        })[0];
+    }
+
     /**
      * Load the latest version of a draft/publish-enabled record for a publish/unpublish
      * action, applying the two checks both actions share (workflow enabled, version is latest).

package/src/services/settings/default-settings-provider.service.ts

@@ -6,6 +6,7 @@ import {
   SettingDefinition,
   SettingLevel,
 } from "src/interfaces";
+import { getDefaultThemeKey, getThemesByMode } from "src/theme/theme-registry";
 
 export const DEFAULT_MEDIA_UPLOAD_DIR = "media-uploads";
 export const DEFAULT_MEDIA_FILE_STORAGE_DIR = "media-files-storage";
@@ -224,14 +225,44 @@ const getSolidCoreSettings = (isProd: boolean) =>
     },
     {
       moduleName: "solid-core",
-      key: "enableDarkMode",
+      key: "showThemeToggle",
       value: true,
       level: SettingLevel.SystemAdminEditable,
-      label: "Enable Dark Mode",
+      label: "Show Theme Toggle",
       group: "app-settings",
       sortOrder: 120,
       controlType: "boolean",
-      helpText: "Enables dark theme support for frontend surfaces that honor the global appearance setting.",
+      helpText: "Shows the theme toggle in the frontend so users can switch between light and dark themes.",
+    },
+    {
+      moduleName: "solid-core",
+      key: "lightTheme",
+      value: getDefaultThemeKey("light"),
+      level: SettingLevel.SystemAdminEditable,
+      label: "Light Theme",
+      group: "app-settings",
+      sortOrder: 125,
+      controlType: "selectionStatic",
+      options: getThemesByMode("light").map((theme) => ({
+        label: theme.label,
+        value: theme.key,
+      })),
+      helpText: "Selects the theme used whenever the application is in light mode.",
+    },
+    {
+      moduleName: "solid-core",
+      key: "darkTheme",
+      value: getDefaultThemeKey("dark"),
+      level: SettingLevel.SystemAdminEditable,
+      label: "Dark Theme",
+      group: "app-settings",
+      sortOrder: 126,
+      controlType: "selectionStatic",
+      options: getThemesByMode("dark").map((theme) => ({
+        label: theme.label,
+        value: theme.key,
+      })),
+      helpText: "Selects the theme used whenever the application is in dark mode.",
     },
     {
       moduleName: "solid-core",

package/src/theme/theme-registry.ts

@@ -0,0 +1,181 @@
+import fs from "fs";
+import path from "path";
+
+/**
+ * Backend theme registry.
+ *
+ * Responsibilities:
+ * - discover theme folders from the filesystem
+ * - classify each theme as light/dark from its key
+ * - expose default and grouped theme helpers for backend settings
+ *
+ * Shared pure parsing helpers are intentionally mirrored in solid-core-ui,
+ * but all filesystem discovery stays here.
+ */
+export type ThemeMode = "light" | "dark";
+
+export type AppThemeDefinition = {
+  key: string;
+  label: string;
+  mode: ThemeMode;
+  default?: boolean;
+};
+
+const DEFAULT_THEME_KEYS: Record<ThemeMode, string> = {
+  light: "solid-light-purple",
+  dark: "solid-dark-purple",
+};
+
+const THEME_MODE_TOKENS: Record<ThemeMode, string> = {
+  light: "-light-",
+  dark: "-dark-",
+};
+
+const THEME_MODE_SUFFIXES: Record<ThemeMode, string> = {
+  light: "-light",
+  dark: "-dark",
+};
+
+function normalizeThemeKey(value?: string | null): string | null {
+  const normalized = value?.trim().toLowerCase();
+  return normalized || null;
+}
+
+function matchesThemeMode(value: string, mode: ThemeMode): boolean {
+  return (
+    value.includes(THEME_MODE_TOKENS[mode])
+    || value.endsWith(THEME_MODE_SUFFIXES[mode])
+    || value === mode
+  );
+}
+
+function titleCase(value: string): string {
+  return value
+    .split(/[-_\s]+/)
+    .filter(Boolean)
+    .map((token) => {
+      if (token.toLowerCase() === "solid") return "SolidX";
+      return token.charAt(0).toUpperCase() + token.slice(1);
+    })
+    .join(" ");
+}
+
+export function getThemeModeFromThemeKey(value?: string | null): ThemeMode | null {
+  const normalized = normalizeThemeKey(value);
+  if (!normalized) return null;
+
+  if (matchesThemeMode(normalized, "light")) return "light";
+  if (matchesThemeMode(normalized, "dark")) return "dark";
+
+  return null;
+}
+
+function createThemeDefinition(key: string, defaultTheme = false): AppThemeDefinition {
+  const mode = getThemeModeFromThemeKey(key);
+  if (!mode) {
+    throw new Error(`Invalid theme key: ${key}`);
+  }
+
+  return {
+    key,
+    label: titleCase(key),
+    mode,
+    default: defaultTheme,
+  };
+}
+
+function createDefaultTheme(mode: ThemeMode): AppThemeDefinition {
+  return createThemeDefinition(DEFAULT_THEME_KEYS[mode], true);
+}
+
+function groupThemesByMode(themes: AppThemeDefinition[], mode: ThemeMode): AppThemeDefinition[] {
+  return themes.filter((theme) => theme.mode === mode);
+}
+
+function pickDefaultThemeKey(themes: AppThemeDefinition[], mode: ThemeMode): string {
+  const themesForMode = groupThemesByMode(themes, mode);
+
+  return (
+    themesForMode.find((theme) => theme.default)?.key
+    ?? themesForMode[0]?.key
+    ?? DEFAULT_THEME_KEYS[mode]
+  );
+}
+
+function resolveThemeDirectory(): string | null {
+  const themeDirectory = path.resolve(process.cwd(), "..", "solid-ui", "public", "themes");
+  try {
+    if (fs.existsSync(themeDirectory) && fs.statSync(themeDirectory).isDirectory()) {
+      return path.resolve(themeDirectory);
+    }
+  } catch {
+    return null;
+  }
+
+  return null;
+}
+
+function isThemeDirectory(themeDirectory: string, entryName: string): boolean {
+  return fs.existsSync(path.join(themeDirectory, entryName, "theme.css"));
+}
+
+function readThemesFromPath(): AppThemeDefinition[] {
+  const themeDirectory = resolveThemeDirectory();
+  if (!themeDirectory) {
+    return [];
+  }
+
+  try {
+    const directoryEntries = fs.readdirSync(themeDirectory, { withFileTypes: true });
+
+    return directoryEntries
+      .filter((entry) => entry.isDirectory())
+      .map((entry) => entry.name.trim())
+      .filter(Boolean)
+      .filter((entryName) => isThemeDirectory(themeDirectory, entryName))
+      .flatMap((entryName) => {
+        const mode = getThemeModeFromThemeKey(entryName);
+        if (!mode) return [];
+
+        return [createThemeDefinition(entryName, entryName === DEFAULT_THEME_KEYS[mode])];
+      })
+      .sort((left, right) => left.label.localeCompare(right.label));
+  } catch {
+    return [];
+  }
+}
+
+function getThemes(): AppThemeDefinition[] {
+  const discoveredThemes = readThemesFromPath();
+
+  if (discoveredThemes.length) {
+    return discoveredThemes;
+  }
+
+  return [createDefaultTheme("light"), createDefaultTheme("dark")];
+}
+
+export function getCoreThemes(): AppThemeDefinition[] {
+  return getThemes();
+}
+
+export function getRegisteredThemes(): AppThemeDefinition[] {
+  return getThemes();
+}
+
+export function getThemesByMode(mode: ThemeMode): AppThemeDefinition[] {
+  return groupThemesByMode(getRegisteredThemes(), mode);
+}
+
+export function getDefaultThemeKey(mode: ThemeMode = "light"): string {
+  return pickDefaultThemeKey(getRegisteredThemes(), mode);
+}
+
+export function isRegisteredThemeKey(value?: string | null, mode?: ThemeMode): value is string {
+  if (!value) return false;
+
+  return getRegisteredThemes().some((theme) => {
+    if (theme.key !== value) return false;
+    return mode ? theme.mode === mode : true;
+  });
+}