@igstack/app-catalog-backend-core 0.3.1-alpha-20260405015231 → 0.4.0

package/src/modules/appCatalog/service.ts

@@ -4,20 +4,19 @@ import type {
   AppApprovalMethod,
   AppCatalogData,
   AppCategory,
-  AppForCatalog,
   GroupingTagDefinition,
+  Resource,
 } from '../../types/common/appCatalogTypes'
 import type {
   CustomConfig,
   ServiceConfig,
 } from '../../types/common/approvalMethodTypes'
 import type { Group, Person } from '../../types/common/personGroupTypes'
-import type { SubResource } from '../../types/common/subResourceTypes'
 import { omit } from 'radashi'
 import { parseSourceSlug } from '../../utils/parseSourceSlug'
 
-/** Prisma query result for DbAppForCatalog with sourceRefs included (used by rowToAppForCatalog) */
-type AppRowWithSourceRefs = Prisma.DbAppForCatalogGetPayload<{
+/** Prisma query result for DbResource with sourceRefs included (used by rowToResource) */
+type ResourceRowWithSourceRefs = Prisma.DbResourceGetPayload<{
   include: { sourceRefs: true }
 }>
 
@@ -34,16 +33,16 @@ export async function getGroupingTagDefinitionsFromPrisma(): Promise<
   // Fetch all tag definitions
   const rows = await prisma.dbAppTagDefinition.findMany()
 
-  // Fetch all apps to count tag usage
-  const apps = await prisma.dbAppForCatalog.findMany({
+  // Fetch all resources to count tag usage
+  const resources = await prisma.dbResource.findMany({
     select: { tags: true },
   })
 
-  // Count tag values across all apps
+  // Count tag values across all resources
   const tagCounts = new Map<string, Map<string, number>>()
 
-  for (const app of apps) {
-    const tags = (app.tags as unknown as string[] | null) ?? []
+  for (const resource of resources) {
+    const tags = (resource.tags as unknown as string[] | null) ?? []
     for (const tag of tags) {
       const [prefix, value] = tag.split(':')
       if (prefix && value) {
@@ -80,7 +79,7 @@ export async function getApprovalMethodsFromPrisma(): Promise<
 > {
   const prisma = getDbClient()
 
-  // Fetch all apps
+  // Fetch all approval methods
   const rows = await prisma.dbApprovalMethod.findMany()
 
   return rows.map((row) => {
@@ -129,13 +128,13 @@ export async function getApprovalMethodsFromPrisma(): Promise<
   })
 }
 
-function rowToAppForCatalog(row: AppRowWithSourceRefs): AppForCatalog {
+function rowToResource(row: ResourceRowWithSourceRefs): Resource {
   const accessRequest =
-    row.accessRequest as unknown as AppForCatalog['accessRequest']
+    row.accessRequest as unknown as Resource['accessRequest']
   const teams = (row.teams as unknown as string[] | null) ?? []
-  const tags = (row.tags as unknown as AppForCatalog['tags']) ?? []
+  const tags = (row.tags as unknown as Resource['tags']) ?? []
   const screenshotIds =
-    (row.screenshotIds as unknown as AppForCatalog['screenshotIds']) ?? []
+    (row.screenshotIds as unknown as Resource['screenshotIds']) ?? []
   const sources = row.sourceRefs.map((ref) => ({
     sourceSlug: ref.sourceSlug,
     url: ref.url,
@@ -151,19 +150,18 @@ function rowToAppForCatalog(row: AppRowWithSourceRefs): AppForCatalog {
   const deprecated =
     row.deprecated == null
       ? undefined
-      : (row.deprecated as unknown as AppForCatalog['deprecated'])
+      : (row.deprecated as unknown as Resource['deprecated'])
   const aiPrompt = row.aiPrompt == null ? undefined : row.aiPrompt
   const urlIssues = (row.urlIssues as unknown as string[] | null)?.length
     ? (row.urlIssues as unknown as string[])
     : undefined
   const tiers =
-    row.tiers == null
-      ? undefined
-      : (row.tiers as unknown as AppForCatalog['tiers'])
+    row.tiers == null ? undefined : (row.tiers as unknown as Resource['tiers'])
 
   return {
     id: row.id,
     slug: row.slug,
+    type: row.type,
     displayName: row.displayName,
     abbreviation,
     nicknames,
@@ -180,21 +178,37 @@ function rowToAppForCatalog(row: AppRowWithSourceRefs): AppForCatalog {
     aiPrompt,
     urlIssues,
     tiers,
+    // Fields from former SubResource
+    parentSlug: row.parentSlug ?? undefined,
+    tier: row.tier ?? undefined,
+    familySlug: row.familySlug ?? undefined,
+    aliases: row.aliases.length ? row.aliases : undefined,
+    ownerPersonSlug: row.ownerPersonSlug ?? undefined,
+    accessMaintainerGroupSlugs: row.accessMaintainerGroupSlugs.length
+      ? row.accessMaintainerGroupSlugs
+      : undefined,
+    accessComments: row.accessComments ?? undefined,
+    extra: row.extra
+      ? (row.extra as unknown as Record<string, unknown>)
+      : undefined,
   }
 }
 
-export async function getAppsFromPrisma(): Promise<AppForCatalog[]> {
+export async function getResourcesFromPrisma(): Promise<Resource[]> {
   const prisma = getDbClient()
 
-  const rows = await prisma.dbAppForCatalog.findMany({
+  const rows = await prisma.dbResource.findMany({
     include: {
       sourceRefs: true,
     },
   })
 
-  return rows.map(rowToAppForCatalog)
+  return rows.map(rowToResource)
 }
 
+/** @deprecated Use getResourcesFromPrisma instead */
+export const getAppsFromPrisma = getResourcesFromPrisma
+
 export interface UpdateAppInput {
   id: string
   data: {
@@ -208,7 +222,7 @@ export interface UpdateAppInput {
   }
 }
 
-export async function updateApp(input: UpdateAppInput): Promise<AppForCatalog> {
+export async function updateApp(input: UpdateAppInput): Promise<Resource> {
   const prisma = getDbClient()
   const { id, data } = input
 
@@ -230,7 +244,7 @@ export async function updateApp(input: UpdateAppInput): Promise<AppForCatalog> {
     updatePayload.description = data.description
   if (data.aiPrompt !== undefined) updatePayload.aiPrompt = data.aiPrompt
 
-  const updated = await prisma.dbAppForCatalog.update({
+  const updated = await prisma.dbResource.update({
     where: { id },
     data: updatePayload,
     include: { sourceRefs: true },
@@ -249,34 +263,34 @@ export async function updateApp(input: UpdateAppInput): Promise<AppForCatalog> {
     }
 
     await prisma.sourceReference.deleteMany({
-      where: { appId: updated.id },
+      where: { resourceId: updated.id },
     })
 
     if (urls.length > 0) {
       await prisma.sourceReference.createMany({
         data: urls.map((url) => ({
-          appId: updated.id,
+          resourceId: updated.id,
           sourceSlug: parseSourceSlug(url),
           url: url.trim(),
         })),
       })
     }
 
-    const refetched = await prisma.dbAppForCatalog.findUnique({
+    const refetched = await prisma.dbResource.findUnique({
       where: { id },
       include: { sourceRefs: true },
     })
-    if (!refetched) throw new Error('App not found after update')
-    return rowToAppForCatalog(refetched)
+    if (!refetched) throw new Error('Resource not found after update')
+    return rowToResource(refetched)
   }
 
-  return rowToAppForCatalog(updated)
+  return rowToResource(updated)
 }
 
-export function deriveCategories(apps: AppForCatalog[]): AppCategory[] {
+export function deriveCategories(resources: Resource[]): AppCategory[] {
   const tagSet = new Set<string>()
-  for (const app of apps) {
-    for (const tag of app.tags ?? []) {
+  for (const resource of resources) {
+    for (const tag of resource.tags ?? []) {
       const normalized = tag.trim().toLowerCase()
       if (normalized) tagSet.add(normalized)
     }
@@ -312,43 +326,18 @@ export async function getGroupsFromPrisma(): Promise<Group[]> {
   }))
 }
 
-export async function getSubResourcesFromPrisma(): Promise<SubResource[]> {
-  const prisma = getDbClient()
-  const rows = await prisma.dbSubResource.findMany()
-  return rows.map((row) => ({
-    slug: row.slug,
-    displayName: row.displayName,
-    description: row.description ?? undefined,
-    appSlug: row.appSlug,
-    familySlug: row.familySlug ?? undefined,
-    tierSlug: row.tierSlug ?? undefined,
-    aliases: row.aliases as unknown as string[],
-    ownerPersonSlug: row.ownerPersonSlug ?? undefined,
-    accessMaintainerGroupSlugs:
-      row.accessMaintainerGroupSlugs as unknown as string[],
-    accessRequest: row.accessRequest
-      ? (row.accessRequest as unknown as SubResource['accessRequest'])
-      : undefined,
-    accessComments: row.accessComments ?? undefined,
-    extra: row.extra
-      ? (row.extra as unknown as Record<string, unknown>)
-      : undefined,
-  }))
-}
-
 export async function getAppCatalogData(
-  getAppsOptional?: () => Promise<AppForCatalog[]>,
+  getResourcesOptional?: () => Promise<Resource[]>,
 ): Promise<AppCatalogData> {
-  const apps = getAppsOptional
-    ? await getAppsOptional()
-    : await getAppsFromPrisma()
+  const resources = getResourcesOptional
+    ? await getResourcesOptional()
+    : await getResourcesFromPrisma()
 
   return {
-    apps,
+    resources,
     tagsDefinitions: await getGroupingTagDefinitionsFromPrisma(),
     approvalMethods: await getApprovalMethodsFromPrisma(),
     persons: await getPersonsFromPrisma(),
     groups: await getGroupsFromPrisma(),
-    subResources: await getSubResourcesFromPrisma(),
   }
 }

package/src/modules/assets/screenshotRestController.ts

@@ -33,7 +33,7 @@ export function registerScreenshotRestController(
         const prisma = getDbClient()
 
         // Find app by slug
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug: appSlug },
           select: { screenshotIds: true },
         })
@@ -82,7 +82,7 @@ export function registerScreenshotRestController(
         const prisma = getDbClient()
 
         // Find app by slug
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug: appSlug },
           select: { screenshotIds: true },
         })

package/src/modules/assets/screenshotRouter.ts

@@ -50,7 +50,7 @@ export function createScreenshotRouter() {
         const prisma = getDbClient()
 
         // Find app by slug
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug: input.appSlug },
           select: { screenshotIds: true },
         })
@@ -88,7 +88,7 @@ export function createScreenshotRouter() {
         const prisma = getDbClient()
 
         // Find app by slug
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug: input.appSlug },
           select: { screenshotIds: true },
         })

package/src/modules/assets/syncAssets.ts

@@ -176,7 +176,7 @@ async function syncScreenshotsFromDirectory(
     for (const [appId, screenshots] of screenshotsByApp) {
       try {
         // Check if app exists
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug: appId },
           select: { id: true },
         })
@@ -200,14 +200,14 @@ async function syncScreenshotsFromDirectory(
 
             if (existing) {
               // Link to app via screenshotIds array if not already linked
-              const existingApp = await prisma.dbAppForCatalog.findUnique({
+              const existingApp = await prisma.dbResource.findUnique({
                 where: { slug: appId },
               })
               if (
                 existingApp &&
                 !existingApp.screenshotIds.includes(existing.id)
               ) {
-                await prisma.dbAppForCatalog.update({
+                await prisma.dbResource.update({
                   where: { slug: appId },
                   data: {
                     screenshotIds: [...existingApp.screenshotIds, existing.id],
@@ -245,7 +245,7 @@ async function syncScreenshotsFromDirectory(
             })
 
             // Link screenshot to app via screenshotIds array
-            await prisma.dbAppForCatalog.update({
+            await prisma.dbResource.update({
               where: { slug: appId },
               data: {
                 screenshotIds: {

package/src/modules/lighthouseKeeper/tools.ts

@@ -44,7 +44,7 @@ export function createAppCatalogAITools(
     inputSchema: getAppCardSchema,
     execute: async ({ slug }: { slug: string }) => {
       try {
-        const app = await prisma.dbAppForCatalog.findUnique({
+        const app = await prisma.dbResource.findUnique({
           where: { slug },
           include: {
             sourceRefs: true,

package/src/prisma-json-types.d.ts

@@ -17,22 +17,22 @@ declare global {
     // DbApprovalMethod.config - Type-specific configuration
     type ApprovalMethodConfig = import('./types/index').ApprovalMethodConfig
 
-    // DbAppForCatalog.accessRequest - Per-app approval configuration
-    type AppAccessRequest = import('./types/index').AppAccessRequest
+    // DbResource.accessRequest - Per-resource approval configuration
+    type AccessRequest = import('./types/index').AppAccessRequest
 
-    // DbAppForCatalog.links - Array of links
+    // DbResource.links - Array of links
     interface AppLink {
       displayName?: string
       url: string
     }
 
-    // AppRole used within accessRequest
-    type AppRole = import('./types/index').AppRole
+    // Role used within accessRequest
+    type Role = import('./types/index').AppRole
 
-    // DbAppForCatalog.tiers - Tier variants (prod/dev)
-    type AppTierVariant = import('./types/index').AppTierVariant
+    // DbResource.tiers - Tier variants (prod/dev)
+    type TierVariant = import('./types/index').TierVariant
 
-    // DbSubResource.extra - Arbitrary extra data
+    // DbResource.extra - Arbitrary extra data
     type SubResourceExtra = Record<string, unknown>
   }
 }

package/src/server/controller.ts

@@ -3,7 +3,7 @@ import {
   updateApp as updateAppService,
 } from '../modules/appCatalog/service'
 import type { AppCatalogData } from '../types'
-import type { AppForCatalog } from '../types/common/appCatalogTypes'
+import type { Resource } from '../types/common/appCatalogTypes'
 
 import type { BetterAuth } from '../modules/auth/auth'
 import { createAuthRouter } from '../modules/auth/authRouter.js'
@@ -50,7 +50,7 @@ export function createTrpcRouter(
       ),
       updateApp: publicProcedure
         .input(updateAppInputSchema)
-        .mutation(async ({ input }): Promise<AppForCatalog> => {
+        .mutation(async ({ input }): Promise<Resource> => {
           return updateAppService(input)
         }),
     }),

package/src/types/common/appCatalogTypes.ts

@@ -8,17 +8,16 @@
 
 import type { AppAccessRequest, ApprovalMethod } from './approvalMethodTypes'
 import type { Group, Person } from './personGroupTypes'
-import type { SubResource } from './subResourceTypes'
 
 // ============================================================================
-// APP TIER VARIANT
+// TIER VARIANT
 // ============================================================================
 
 /**
- * A tier variant of an app (e.g., prod/dev environments).
+ * A tier variant of a resource (e.g., prod/dev environments).
  * Each tier can have its own URL and access process.
  */
-export interface AppTierVariant {
+export interface TierVariant {
   tierSlug: string
   displayName?: string
   description?: string
@@ -41,11 +40,14 @@ export interface SourceReference {
 }
 
 /**
- * Application entry in the catalog
+ * Resource entry in the catalog (application or sub-resource).
+ * Unified model: applications have no parentSlug; sub-resources have parentSlug.
  */
-export interface AppForCatalog {
+export interface Resource {
   id: string
   slug: string
+  /** Discriminator: "application" for top-level apps, "sub-resource" for children, etc. */
+  type?: string
   displayName: string
   abbreviation?: string // Optional short abbreviation (e.g. K8s, ECR, LV)
   nicknames?: string[] // Alternative names / AKA
@@ -72,7 +74,25 @@ export interface AppForCatalog {
   /** URL health issues detected by automated scanning */
   urlIssues?: string[]
   /** Optional tier variants (e.g., prod/dev) with per-tier URLs and access */
-  tiers?: AppTierVariant[]
+  tiers?: TierVariant[]
+
+  // --- Fields merged from former SubResource ---
+  /** Slug of parent resource (undefined for top-level applications) */
+  parentSlug?: string
+  /** Tier slug (e.g. "prod", "dev") — for sub-resources */
+  tier?: string
+  /** Groups tier variants visually */
+  familySlug?: string
+  /** Alternative identifiers */
+  aliases?: string[]
+  /** Person slug of the owner */
+  ownerPersonSlug?: string
+  /** Group slugs of access maintainers */
+  accessMaintainerGroupSlugs?: string[]
+  /** Free-text access comments */
+  accessComments?: string
+  /** Arbitrary extra data */
+  extra?: Record<string, unknown>
 }
 
 // Derived catalog data returned by backend
@@ -115,11 +135,10 @@ export interface AppVersionInfo {
 }
 
 export interface AppCatalogData {
-  apps: AppForCatalog[]
+  resources: Resource[]
   tagsDefinitions: GroupingTagDefinition[]
   approvalMethods: AppApprovalMethod[]
   persons: Person[]
   groups: Group[]
-  subResources: SubResource[]
   versions?: AppVersionInfo
 }

package/src/types/common/approvalMethodTypes.ts

@@ -151,3 +151,9 @@ export interface AppAccessRequest {
    */
   urls?: ApprovalUrl[]
 }
+
+/** @deprecated Use AppAccessRequest instead (same type, new canonical name) */
+export type AccessRequest = AppAccessRequest
+
+/** @deprecated Use AppRole instead (same type, new canonical name) */
+export type Role = AppRole

package/src/types/index.ts

@@ -4,7 +4,6 @@ export * from './common/resourceTypes.js'
 export * from './common/appCatalogTypes.js'
 export * from './common/approvalMethodTypes.js'
 export * from './common/personGroupTypes.js'
-export * from './common/subResourceTypes.js'
 export * from './common/env/envTypes.js'
 export * from './common/app/appTypes.js'
 export * from './common/app/ui/appUiTypes.js'