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

package/src/db/syncAppCatalog.ts

@@ -1,6 +1,6 @@
 import type {
-  AppForCatalog,
   GroupingTagDefinition,
+  Resource,
 } from '../types/common/appCatalogTypes'
 import { getDbClient } from './client'
 import { TABLE_SYNC_MAGAZINE } from './tableSyncMagazine'
@@ -8,7 +8,7 @@ import { tableSyncPrisma } from './tableSyncPrismaAdapter'
 import { readFile, readdir, stat } from 'node:fs/promises'
 import { group } from 'radashi'
 import { upsertAsset } from '../modules/assets/upsertAsset'
-import type { ApprovalMethod, Group, Person, SubResource } from '../types'
+import type { ApprovalMethod, Group, Person } from '../types'
 import type { PrismaClient } from '../generated/prisma/client'
 import { naturalSort } from '../utils/naturalSort'
 import { parseSourceSlug } from '../utils/parseSourceSlug'
@@ -103,12 +103,12 @@ async function syncAppAssets(
 }
 
 async function syncAssetsFromFileSystem(
-  apps: AppForCatalog[],
+  resources: Resource[],
   allAppsAssetsPath: string,
 ) {
   const appDirectories = await readdir(allAppsAssetsPath)
   const prisma = getDbClient()
-  const bySlug = group(apps, (a) => a.slug)
+  const bySlug = group(resources, (a) => a.slug)
 
   for (const appDirName of appDirectories) {
     try {
@@ -150,7 +150,7 @@ async function syncAssetsFromFileSystem(
       }
 
       if (Object.keys(updateData).length > 0) {
-        await prisma.dbAppForCatalog.update({
+        await prisma.dbResource.update({
           where: { slug: appSlug },
           data: updateData,
         })
@@ -171,20 +171,19 @@ async function syncAssetsFromFileSystem(
 export interface SyncAppCatalogOptions {
   persons?: Person[]
   groups?: Group[]
-  subResources?: SubResource[]
 }
 
 /**
  * Syncs app catalog data to the database using table sync.
- * This will create new apps, update existing ones, and delete any that are no longer in the input.
+ * This will create new resources, update existing ones, and delete any that are no longer in the input.
  *
  * Note: Call connectDb() before and disconnectDb() after if running in a script.
  */
 export async function syncAppCatalog(
-  apps: AppForCatalog[],
+  resources: Resource[],
   tagsDefinitions: GroupingTagDefinition[],
   approvalMethods: ApprovalMethod[],
-  sreenshotsPath?: string,
+  screenshotsPath?: string,
   options?: SyncAppCatalogOptions,
 ): Promise<SyncAppCatalogResult> {
   try {
@@ -236,7 +235,7 @@ export async function syncAppCatalog(
 
     const sync = tableSyncPrisma({
       prisma,
-      ...TABLE_SYNC_MAGAZINE.DbAppForCatalog,
+      ...TABLE_SYNC_MAGAZINE.DbResource,
     })
 
     await tableSyncPrisma({
@@ -246,8 +245,8 @@ export async function syncAppCatalog(
 
     // Collect all unique source slugs for sync
     const uniqueSourceSlugs = new Set<string>()
-    for (const app of apps) {
-      for (const source of app.sources ?? []) {
+    for (const resource of resources) {
+      for (const source of resource.sources ?? []) {
         const url = typeof source === 'string' ? source : source.url
         const sourceSlug = parseSourceSlug(url)
         uniqueSourceSlugs.add(sourceSlug)
@@ -264,67 +263,84 @@ export async function syncAppCatalog(
       ...TABLE_SYNC_MAGAZINE.Source,
     }).sync(sources)
 
-    // Transform AppForCatalog to DbAppForCatalog format (scalar fields only)
-    const dbApps = apps.map((app) => {
+    // Sort resources: parents first (no parentSlug), then children — for FK integrity
+    const sortedResources = [...resources].sort((a, b) => {
+      const aIsChild = a.parentSlug ? 1 : 0
+      const bIsChild = b.parentSlug ? 1 : 0
+      return aIsChild - bIsChild
+    })
+
+    // Transform Resource to DbResource format (scalar fields only)
+    const dbResources = sortedResources.map((resource) => {
       const slug =
-        app.slug ||
-        app.displayName
+        resource.slug ||
+        resource.displayName
           .toLowerCase()
           .replace(/[^a-z0-9]+/g, '-')
           .replace(/^-+|-+$/g, '')
 
       return {
         slug,
-        displayName: app.displayName,
-        abbreviation: app.abbreviation ?? null,
-        nicknames: app.nicknames ?? [],
-        description: app.description,
-        teams: app.teams ?? [],
-        accessRequest: app.accessRequest ?? null,
-        notes: app.notes ?? null,
-        tags: app.tags ?? [],
-        appUrl: app.appUrl ?? null,
-        links: app.links ?? null,
-        iconName: app.iconName ?? null,
-        screenshotIds: app.screenshotIds ?? [],
-        deprecated: app.deprecated ?? null,
-        aiPrompt: app.aiPrompt ?? null,
-        urlIssues: app.urlIssues ?? [],
-        tiers: app.tiers ?? null,
+        type: resource.type ?? 'application',
+        displayName: resource.displayName,
+        abbreviation: resource.abbreviation ?? null,
+        nicknames: resource.nicknames ?? [],
+        description: resource.description,
+        teams: resource.teams ?? [],
+        accessRequest: resource.accessRequest ?? null,
+        notes: resource.notes ?? null,
+        tags: resource.tags ?? [],
+        appUrl: resource.appUrl ?? null,
+        links: resource.links ?? null,
+        iconName: resource.iconName ?? null,
+        screenshotIds: resource.screenshotIds ?? [],
+        deprecated: resource.deprecated ?? null,
+        aiPrompt: resource.aiPrompt ?? null,
+        urlIssues: resource.urlIssues ?? [],
+        tiers: resource.tiers ?? null,
+        // Fields from former SubResource
+        parentSlug: resource.parentSlug ?? null,
+        tier: resource.tier ?? null,
+        familySlug: resource.familySlug ?? null,
+        aliases: resource.aliases ?? [],
+        ownerPersonSlug: resource.ownerPersonSlug ?? null,
+        accessMaintainerGroupSlugs: resource.accessMaintainerGroupSlugs ?? [],
+        accessComments: resource.accessComments ?? null,
+        extra: resource.extra ?? null,
       }
     })
 
-    // Sync apps first
-    const result = await sync.sync(dbApps)
+    // Sync resources
+    const result = await sync.sync(dbResources)
 
-    // Resolve slug -> id for synced apps so SourceReference can reference by appId
-    const slugs = dbApps.map((a) => a.slug)
-    const appRows = await prisma.dbAppForCatalog.findMany({
+    // Resolve slug -> id for synced resources so SourceReference can reference by resourceId
+    const slugs = dbResources.map((a) => a.slug)
+    const resourceRows = await prisma.dbResource.findMany({
       where: { slug: { in: slugs } },
       select: { slug: true, id: true },
     })
-    const slugToId = Object.fromEntries(appRows.map((r) => [r.slug, r.id]))
+    const slugToId = Object.fromEntries(resourceRows.map((r) => [r.slug, r.id]))
 
-    // Build allSourceRefs with appId (slug already resolved to id)
-    const allSourceRefs = apps.flatMap((app) => {
-      const appSlug =
-        app.slug ||
-        app.displayName
+    // Build allSourceRefs with resourceId (slug already resolved to id)
+    const allSourceRefs = sortedResources.flatMap((resource) => {
+      const resourceSlug =
+        resource.slug ||
+        resource.displayName
           .toLowerCase()
           .replace(/[^a-z0-9]+/g, '-')
           .replace(/^-+|-+$/g, '')
-      const appId = slugToId[appSlug]
-      if (!appId) {
+      const resourceId = slugToId[resourceSlug]
+      if (!resourceId) {
         throw new Error(
-          `App '${appSlug}' has no id after sync. Existing slugs: ${Object.keys(slugToId).join(', ')}`,
+          `Resource '${resourceSlug}' has no id after sync. Existing slugs: ${Object.keys(slugToId).join(', ')}`,
         )
       }
 
-      return (app.sources ?? []).map((source) => {
+      return (resource.sources ?? []).map((source) => {
         const url = typeof source === 'string' ? source : source.url
         const sourceSlug = parseSourceSlug(url)
         return {
-          appId,
+          resourceId,
           sourceSlug,
           url,
           parseDate: null,
@@ -340,39 +356,18 @@ export async function syncAppCatalog(
       ...TABLE_SYNC_MAGAZINE.SourceReference,
     }).sync(allSourceRefs)
 
-    // Sync SubResources (after apps, since they reference appSlug)
-    if (options?.subResources) {
-      const dbSubResources = options.subResources.map((sr) => ({
-        slug: sr.slug,
-        displayName: sr.displayName,
-        description: sr.description ?? null,
-        appSlug: sr.appSlug,
-        familySlug: sr.familySlug ?? null,
-        tierSlug: sr.tierSlug ?? null,
-        aliases: sr.aliases,
-        ownerPersonSlug: sr.ownerPersonSlug ?? null,
-        accessMaintainerGroupSlugs: sr.accessMaintainerGroupSlugs,
-        accessRequest: sr.accessRequest ?? null,
-        accessComments: sr.accessComments ?? null,
-        extra: sr.extra ?? null,
-      }))
-      await tableSyncPrisma({
-        prisma,
-        ...TABLE_SYNC_MAGAZINE.DbSubResource,
-      }).sync(dbSubResources)
-    }
-
     // Get actual synced data to calculate stats
     const actual = result.getActual()
 
-    if (sreenshotsPath) {
-      await syncAssetsFromFileSystem(apps, sreenshotsPath)
+    if (screenshotsPath) {
+      await syncAssetsFromFileSystem(resources, screenshotsPath)
     } else {
       console.warn('Do not sync screenhots')
     }
 
     return {
-      created: actual.length - apps.length + (apps.length - actual.length),
+      created:
+        actual.length - resources.length + (resources.length - actual.length),
       updated: 0, // TableSync doesn't expose this directly
       deleted: 0, // TableSync doesn't expose this directly
       total: actual.length,

package/src/db/tableSyncMagazine.ts

@@ -27,8 +27,8 @@ export const TABLE_SYNC_MAGAZINE = {
     prismaModelName: 'DbGroupMembership',
     uniqColumns: ['groupSlug', 'personSlug'],
   },
-  DbAppForCatalog: {
-    prismaModelName: 'DbAppForCatalog',
+  DbResource: {
+    prismaModelName: 'DbResource',
     uniqColumns: ['slug'],
   },
   DbAppTagDefinition: {
@@ -45,13 +45,9 @@ export const TABLE_SYNC_MAGAZINE = {
     prismaModelName: 'Source',
     uniqColumns: ['slug'],
   },
-  DbSubResource: {
-    prismaModelName: 'DbSubResource',
-    uniqColumns: ['slug'],
-  },
   SourceReference: {
     prismaModelName: 'SourceReference',
-    uniqColumns: ['appId', 'url'],
+    uniqColumns: ['resourceId', 'url'],
   },
 } as const satisfies TableSyncMagazineType
 

package/src/db/tableSyncPrismaAdapter.ts

@@ -12,7 +12,7 @@ export type ScalarFilter<TPrismaModelName extends Prisma.ModelName> = Partial<
 >
 
 export type GetOperationFns<TModel extends Prisma.ModelName> = {
-  [TOperation in keyof Prisma.TypeMap['model']['DbAppForCatalog']['operations']]: (
+  [TOperation in keyof Prisma.TypeMap['model']['DbResource']['operations']]: (
     args: Prisma.TypeMap['model'][TModel]['operations'][TOperation]['args'],
   ) => Promise<
     Prisma.TypeMap['model'][TModel]['operations'][TOperation]['result']

package/src/generated/prisma/browser.ts

@@ -58,15 +58,10 @@ export type DbGroupMembership = Prisma.DbGroupMembershipModel
  */
 export type DbApprovalMethod = Prisma.DbApprovalMethodModel
 /**
- * Model DbAppForCatalog
+ * Model DbResource
  * 
  */
-export type DbAppForCatalog = Prisma.DbAppForCatalogModel
-/**
- * Model DbSubResource
- * 
- */
-export type DbSubResource = Prisma.DbSubResourceModel
+export type DbResource = Prisma.DbResourceModel
 /**
  * Model DbAppTagDefinition
  * 

package/src/generated/prisma/client.ts

@@ -82,15 +82,10 @@ export type DbGroupMembership = Prisma.DbGroupMembershipModel
  */
 export type DbApprovalMethod = Prisma.DbApprovalMethodModel
 /**
- * Model DbAppForCatalog
+ * Model DbResource
  * 
  */
-export type DbAppForCatalog = Prisma.DbAppForCatalogModel
-/**
- * Model DbSubResource
- * 
- */
-export type DbSubResource = Prisma.DbSubResourceModel
+export type DbResource = Prisma.DbResourceModel
 /**
  * Model DbAppTagDefinition
  *