@igstack/app-catalog-frontend-core 0.3.1-alpha-20260405015231 → 0.3.1-alpha-20260406011911

package/dist/esm/modules/appCatalog/utils/resolveHelpers.d.ts

@@ -1,4 +1,7 @@
-import { Group, Person, SubResource } from '@igstack/app-catalog-backend-core';
+import { Group, Person, Resource } from '@igstack/app-catalog-backend-core';
 export declare function getPersonBySlug(persons: Person[], slug: string): Person | undefined;
 export declare function getGroupBySlug(groups: Group[], slug: string): Group | undefined;
-export declare function getSubResourcesForApp(subResources: SubResource[], appSlug: string): SubResource[];
+export declare function getChildResources(resources: Resource[], parentSlug: string): Resource[];
+export declare function getRootResources(resources: Resource[]): Resource[];
+/** @deprecated Use getChildResources instead */
+export declare const getSubResourcesForApp: typeof getChildResources;

package/dist/esm/modules/appCatalog/utils/resolveHelpers.js

@@ -4,12 +4,12 @@ function getPersonBySlug(persons, slug) {
 function getGroupBySlug(groups, slug) {
   return groups.find((g) => g.slug === slug);
 }
-function getSubResourcesForApp(subResources, appSlug) {
-  return subResources.filter((sr) => sr.appSlug === appSlug);
+function getChildResources(resources, parentSlug) {
+  return resources.filter((r) => r.parentSlug === parentSlug);
 }
 export {
+  getChildResources,
   getGroupBySlug,
-  getPersonBySlug,
-  getSubResourcesForApp
+  getPersonBySlug
 };
 //# sourceMappingURL=resolveHelpers.js.map

package/dist/esm/modules/appCatalog/utils/resolveHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveHelpers.js","sources":["../../../../../src/modules/appCatalog/utils/resolveHelpers.ts"],"sourcesContent":["import type {\n  Group,\n  Person,\n  SubResource,\n} from '@igstack/app-catalog-backend-core'\n\nexport function getPersonBySlug(\n  persons: Person[],\n  slug: string,\n): Person | undefined {\n  return persons.find((p) => p.slug === slug)\n}\n\nexport function getGroupBySlug(\n  groups: Group[],\n  slug: string,\n): Group | undefined {\n  return groups.find((g) => g.slug === slug)\n}\n\nexport function getSubResourcesForApp(\n  subResources: SubResource[],\n  appSlug: string,\n): SubResource[] {\n  return subResources.filter((sr) => sr.appSlug === appSlug)\n}\n"],"names":[],"mappings":"AAMO,SAAS,gBACd,SACA,MACoB;AACpB,SAAO,QAAQ,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI;AAC5C;AAEO,SAAS,eACd,QACA,MACmB;AACnB,SAAO,OAAO,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI;AAC3C;AAEO,SAAS,sBACd,cACA,SACe;AACf,SAAO,aAAa,OAAO,CAAC,OAAO,GAAG,YAAY,OAAO;AAC3D;"}
+{"version":3,"file":"resolveHelpers.js","sources":["../../../../../src/modules/appCatalog/utils/resolveHelpers.ts"],"sourcesContent":["import type { Group, Person, Resource } from '@igstack/app-catalog-backend-core'\n\nexport function getPersonBySlug(\n  persons: Person[],\n  slug: string,\n): Person | undefined {\n  return persons.find((p) => p.slug === slug)\n}\n\nexport function getGroupBySlug(\n  groups: Group[],\n  slug: string,\n): Group | undefined {\n  return groups.find((g) => g.slug === slug)\n}\n\nexport function getChildResources(\n  resources: Resource[],\n  parentSlug: string,\n): Resource[] {\n  return resources.filter((r) => r.parentSlug === parentSlug)\n}\n\nexport function getRootResources(resources: Resource[]): Resource[] {\n  return resources.filter((r) => !r.parentSlug)\n}\n\n/** @deprecated Use getChildResources instead */\nexport const getSubResourcesForApp = getChildResources\n"],"names":[],"mappings":"AAEO,SAAS,gBACd,SACA,MACoB;AACpB,SAAO,QAAQ,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI;AAC5C;AAEO,SAAS,eACd,QACA,MACmB;AACnB,SAAO,OAAO,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI;AAC3C;AAEO,SAAS,kBACd,WACA,YACY;AACZ,SAAO,UAAU,OAAO,CAAC,MAAM,EAAE,eAAe,UAAU;AAC5D;"}

package/dist/esm/modules/appCatalog/utils/searchApps.d.ts

@@ -1,4 +1,4 @@
-import { AppForCatalog, SubResource } from '@igstack/app-catalog-backend-core';
+import { Resource } from '@igstack/app-catalog-backend-core';
 export interface SearchMatch {
     /** Field where the match occurred */
     field: 'displayName' | 'abbreviation' | 'nicknames' | 'slug' | 'tags' | 'teams' | 'description' | 'subResource';
@@ -6,11 +6,14 @@ export interface SearchMatch {
     type: 'exact' | 'prefix' | 'contains';
 }
 export interface SearchResult {
-    app: AppForCatalog;
+    app: Resource;
     match: SearchMatch;
 }
 /**
- * Search and sort apps by relevance with highlighting support.
+ * Search and sort resources by relevance with highlighting support.
+ * Only root resources (no parentSlug) are scored and returned.
+ * Child resources (with parentSlug) contribute to their parent's score.
+ *
  * Priority order:
  * 0. Exact match in abbreviation
  * 1. Exact match in displayName
@@ -27,11 +30,11 @@ export interface SearchResult {
  * 12. Teams
  * 13. Description
  *
- * @param apps - Array of apps to search
+ * @param resources - Array of all resources (root + children)
  * @param searchQuery - Search query string
- * @returns Filtered and sorted array of apps with search results
+ * @returns Filtered and sorted array of root resources
  */
-export declare function searchApps(apps: AppForCatalog[], searchQuery: string, subResources?: SubResource[]): AppForCatalog[];
+export declare function searchResources(resources: Resource[], searchQuery: string): Resource[];
 /**
  * Highlight matching text in a string
  * @param text - Text to highlight
@@ -42,3 +45,5 @@ export declare function highlightText(text: string, query: string): {
     text: string;
     highlight: boolean;
 }[];
+/** @deprecated Use searchResources instead */
+export declare const searchApps: typeof searchResources;

package/dist/esm/modules/appCatalog/utils/searchApps.js

@@ -1,19 +1,20 @@
-function searchApps(apps, searchQuery, subResources) {
+function searchResources(resources, searchQuery) {
   const normalizedQuery = searchQuery.trim().toLowerCase();
+  const rootResources = resources.filter((r) => !r.parentSlug);
   if (normalizedQuery === "") {
-    return apps;
+    return rootResources;
   }
   const queryTerms = normalizedQuery.split(/\s+/).filter(Boolean);
   const allTermsMatch = (text) => queryTerms.every((term) => text.includes(term));
-  const subResourcesByApp = /* @__PURE__ */ new Map();
-  if (subResources) {
-    for (const sr of subResources) {
-      const list = subResourcesByApp.get(sr.appSlug) ?? [];
-      list.push(sr);
-      subResourcesByApp.set(sr.appSlug, list);
+  const childrenByParent = /* @__PURE__ */ new Map();
+  for (const r of resources) {
+    if (r.parentSlug) {
+      const list = childrenByParent.get(r.parentSlug) ?? [];
+      list.push(r);
+      childrenByParent.set(r.parentSlug, list);
     }
   }
-  const scoredApps = apps.map((app) => {
+  const scoredApps = rootResources.map((app) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const name = app.displayName.toLowerCase();
     const abbreviation = ((_a = app.abbreviation) == null ? void 0 : _a.toLowerCase()) || "";
@@ -63,10 +64,10 @@ function searchApps(apps, searchQuery, subResources) {
     if (allTermsMatch(description)) {
       return { app, match: { field: "description", type: "contains" } };
     }
-    const appSubResources = subResourcesByApp.get(app.slug);
-    if (appSubResources) {
-      const subMatch = appSubResources.some(
-        (sr) => allTermsMatch(sr.displayName.toLowerCase()) || sr.aliases.some((a) => allTermsMatch(a.toLowerCase())) || (sr.description ? allTermsMatch(sr.description.toLowerCase()) : false)
+    const children = childrenByParent.get(app.slug);
+    if (children) {
+      const subMatch = children.some(
+        (r) => allTermsMatch(r.displayName.toLowerCase()) || (r.aliases ?? []).some((a) => allTermsMatch(a.toLowerCase())) || (r.description ? allTermsMatch(r.description.toLowerCase()) : false)
       );
       if (subMatch) {
         return { app, match: { field: "subResource", type: "contains" } };
@@ -138,6 +139,6 @@ function highlightText(text, query) {
 }
 export {
   highlightText,
-  searchApps
+  searchResources
 };
 //# sourceMappingURL=searchApps.js.map

package/dist/esm/modules/appCatalog/utils/searchApps.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchApps.js","sources":["../../../../../src/modules/appCatalog/utils/searchApps.ts"],"sourcesContent":["import type {\n  AppForCatalog,\n  SubResource,\n} from '@igstack/app-catalog-backend-core'\n\nexport interface SearchMatch {\n  /** Field where the match occurred */\n  field:\n    | 'displayName'\n    | 'abbreviation'\n    | 'nicknames'\n    | 'slug'\n    | 'tags'\n    | 'teams'\n    | 'description'\n    | 'subResource'\n  /** Type of match */\n  type: 'exact' | 'prefix' | 'contains'\n}\n\nexport interface SearchResult {\n  app: AppForCatalog\n  match: SearchMatch\n}\n\n/**\n * Search and sort apps by relevance with highlighting support.\n * Priority order:\n * 0. Exact match in abbreviation\n * 1. Exact match in displayName\n * 2. Exact match in nickname\n * 3. Prefix match in abbreviation\n * 4. Prefix match in displayName\n * 5. Prefix match in nickname\n * 6. Exact match in tags\n * 7. Prefix match in tags\n * 8. Contains match in abbreviation\n * 9. Contains match in displayName\n * 10. Contains match in nickname\n * 11. Contains match in tags\n * 12. Teams\n * 13. Description\n *\n * @param apps - Array of apps to search\n * @param searchQuery - Search query string\n * @returns Filtered and sorted array of apps with search results\n */\nexport function searchApps(\n  apps: AppForCatalog[],\n  searchQuery: string,\n  subResources?: SubResource[],\n): AppForCatalog[] {\n  const normalizedQuery = searchQuery.trim().toLowerCase()\n\n  if (normalizedQuery === '') {\n    return apps\n  }\n\n  // Split query into terms for multi-word matching (AND logic)\n  const queryTerms = normalizedQuery.split(/\\s+/).filter(Boolean)\n\n  // Helper: all terms appear in the text (order-independent)\n  const allTermsMatch = (text: string): boolean =>\n    queryTerms.every((term) => text.includes(term))\n\n  // Build sub-resource lookup: appSlug -> SubResource[]\n  const subResourcesByApp = new Map<string, SubResource[]>()\n  if (subResources) {\n    for (const sr of subResources) {\n      const list = subResourcesByApp.get(sr.appSlug) ?? []\n      list.push(sr)\n      subResourcesByApp.set(sr.appSlug, list)\n    }\n  }\n\n  // Filter and score apps\n  const scoredApps = apps\n    .map((app): SearchResult | null => {\n      const name = app.displayName.toLowerCase()\n      const abbreviation = app.abbreviation?.toLowerCase() || ''\n      const nicknames = app.nicknames?.map((n) => n.toLowerCase()) || []\n      const description = app.description?.toLowerCase() || ''\n      const tags = app.tags?.join(' ').toLowerCase() || ''\n      const teams = app.teams?.join(' ').toLowerCase() || ''\n\n      // Check exact matches first - prioritize abbreviation over displayName\n      if (abbreviation && abbreviation === normalizedQuery) {\n        return { app, match: { field: 'abbreviation', type: 'exact' } }\n      }\n      if (name === normalizedQuery) {\n        return { app, match: { field: 'displayName', type: 'exact' } }\n      }\n      if (nicknames.some((n) => n === normalizedQuery)) {\n        return { app, match: { field: 'nicknames', type: 'exact' } }\n      }\n\n      // Check prefix matches\n      if (abbreviation && abbreviation.startsWith(normalizedQuery)) {\n        return { app, match: { field: 'abbreviation', type: 'prefix' } }\n      }\n      if (name.startsWith(normalizedQuery)) {\n        return { app, match: { field: 'displayName', type: 'prefix' } }\n      }\n      if (nicknames.some((n) => n.startsWith(normalizedQuery))) {\n        return { app, match: { field: 'nicknames', type: 'prefix' } }\n      }\n\n      // Check exact match in tags (any tag exactly matches query)\n      if (app.tags?.some((tag) => tag.toLowerCase() === normalizedQuery)) {\n        return { app, match: { field: 'tags', type: 'exact' } }\n      }\n\n      // Check tags - prefix match (any tag starts with query)\n      if (\n        app.tags?.some((tag) => tag.toLowerCase().startsWith(normalizedQuery))\n      ) {\n        return { app, match: { field: 'tags', type: 'prefix' } }\n      }\n\n      // Check contains matches - prioritize abbreviation over displayName\n      if (abbreviation && abbreviation.includes(normalizedQuery)) {\n        return { app, match: { field: 'abbreviation', type: 'contains' } }\n      }\n      if (name.includes(normalizedQuery)) {\n        return { app, match: { field: 'displayName', type: 'contains' } }\n      }\n      if (nicknames.some((n) => n.includes(normalizedQuery))) {\n        return { app, match: { field: 'nicknames', type: 'contains' } }\n      }\n\n      // Check tags - contains match\n      if (tags.includes(normalizedQuery)) {\n        return { app, match: { field: 'tags', type: 'contains' } }\n      }\n\n      // Check teams (multi-word)\n      if (allTermsMatch(teams)) {\n        return { app, match: { field: 'teams', type: 'contains' } }\n      }\n\n      // Check description (multi-word)\n      if (allTermsMatch(description)) {\n        return { app, match: { field: 'description', type: 'contains' } }\n      }\n\n      // Check sub-resources (name, aliases, description) — supports multi-word queries\n      const appSubResources = subResourcesByApp.get(app.slug)\n      if (appSubResources) {\n        const subMatch = appSubResources.some(\n          (sr) =>\n            allTermsMatch(sr.displayName.toLowerCase()) ||\n            sr.aliases.some((a) => allTermsMatch(a.toLowerCase())) ||\n            (sr.description\n              ? allTermsMatch(sr.description.toLowerCase())\n              : false),\n        )\n        if (subMatch) {\n          return { app, match: { field: 'subResource', type: 'contains' } }\n        }\n      }\n\n      // No match found\n      return null\n    })\n    .filter((item): item is SearchResult => item !== null)\n\n  // Calculate numeric scores for sorting\n  const scoreMap = new Map<string, number>()\n  scoredApps.forEach(({ app, match }) => {\n    let score = 0\n\n    // Exact matches: 0-2 (abbreviation, displayName, nicknames)\n    if (match.type === 'exact') {\n      if (match.field === 'abbreviation') score = 0\n      else if (match.field === 'displayName') score = 1\n      else if (match.field === 'nicknames') score = 2\n      else if (match.field === 'tags') score = 6\n      else score = 999\n    }\n    // Prefix matches: 3-5 (abbreviation, displayName, nicknames), 7 (tags)\n    else if (match.type === 'prefix') {\n      if (match.field === 'abbreviation') score = 3\n      else if (match.field === 'displayName') score = 4\n      else if (match.field === 'nicknames') score = 5\n      else if (match.field === 'tags') score = 7\n      else score = 999\n    }\n    // Contains matches\n    else {\n      if (match.field === 'abbreviation') score = 8\n      else if (match.field === 'displayName') score = 9\n      else if (match.field === 'nicknames') score = 10\n      else if (match.field === 'tags') score = 11\n      else if (match.field === 'teams') score = 12\n      else if (match.field === 'subResource') score = 13\n      else score = 14 // description\n    }\n\n    scoreMap.set(app.id, score)\n  })\n\n  // Sort by score (ascending - lower score = higher priority)\n  scoredApps.sort((a, b) => {\n    const scoreA = scoreMap.get(a.app.id) ?? 999\n    const scoreB = scoreMap.get(b.app.id) ?? 999\n\n    if (scoreA !== scoreB) {\n      return scoreA - scoreB\n    }\n    // If same score, sort alphabetically by display name\n    return a.app.displayName.localeCompare(b.app.displayName)\n  })\n\n  return scoredApps.map((item) => item.app)\n}\n\n/**\n * Highlight matching text in a string\n * @param text - Text to highlight\n * @param query - Search query\n * @returns Array of text segments with highlight flags\n */\nexport function highlightText(\n  text: string,\n  query: string,\n): { text: string; highlight: boolean }[] {\n  if (!query.trim()) {\n    return [{ text, highlight: false }]\n  }\n\n  const normalizedQuery = query.trim().toLowerCase()\n  const lowerText = text.toLowerCase()\n  const index = lowerText.indexOf(normalizedQuery)\n\n  if (index === -1) {\n    return [{ text, highlight: false }]\n  }\n\n  const segments: { text: string; highlight: boolean }[] = []\n\n  // Text before match\n  if (index > 0) {\n    segments.push({ text: text.slice(0, index), highlight: false })\n  }\n\n  // Matched text\n  segments.push({\n    text: text.slice(index, index + normalizedQuery.length),\n    highlight: true,\n  })\n\n  // Text after match\n  if (index + normalizedQuery.length < text.length) {\n    segments.push({\n      text: text.slice(index + normalizedQuery.length),\n      highlight: false,\n    })\n  }\n\n  return segments\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"searchApps.js","sources":["../../../../../src/modules/appCatalog/utils/searchApps.ts"],"sourcesContent":["import type { Resource } from '@igstack/app-catalog-backend-core'\n\nexport interface SearchMatch {\n  /** Field where the match occurred */\n  field:\n    | 'displayName'\n    | 'abbreviation'\n    | 'nicknames'\n    | 'slug'\n    | 'tags'\n    | 'teams'\n    | 'description'\n    | 'subResource'\n  /** Type of match */\n  type: 'exact' | 'prefix' | 'contains'\n}\n\nexport interface SearchResult {\n  app: Resource\n  match: SearchMatch\n}\n\n/**\n * Search and sort resources by relevance with highlighting support.\n * Only root resources (no parentSlug) are scored and returned.\n * Child resources (with parentSlug) contribute to their parent's score.\n *\n * Priority order:\n * 0. Exact match in abbreviation\n * 1. Exact match in displayName\n * 2. Exact match in nickname\n * 3. Prefix match in abbreviation\n * 4. Prefix match in displayName\n * 5. Prefix match in nickname\n * 6. Exact match in tags\n * 7. Prefix match in tags\n * 8. Contains match in abbreviation\n * 9. Contains match in displayName\n * 10. Contains match in nickname\n * 11. Contains match in tags\n * 12. Teams\n * 13. Description\n *\n * @param resources - Array of all resources (root + children)\n * @param searchQuery - Search query string\n * @returns Filtered and sorted array of root resources\n */\nexport function searchResources(\n  resources: Resource[],\n  searchQuery: string,\n): Resource[] {\n  const normalizedQuery = searchQuery.trim().toLowerCase()\n\n  // Separate root resources from children\n  const rootResources = resources.filter((r) => !r.parentSlug)\n\n  if (normalizedQuery === '') {\n    return rootResources\n  }\n\n  // Split query into terms for multi-word matching (AND logic)\n  const queryTerms = normalizedQuery.split(/\\s+/).filter(Boolean)\n\n  // Helper: all terms appear in the text (order-independent)\n  const allTermsMatch = (text: string): boolean =>\n    queryTerms.every((term) => text.includes(term))\n\n  // Build children lookup: parentSlug -> Resource[]\n  const childrenByParent = new Map<string, Resource[]>()\n  for (const r of resources) {\n    if (r.parentSlug) {\n      const list = childrenByParent.get(r.parentSlug) ?? []\n      list.push(r)\n      childrenByParent.set(r.parentSlug, list)\n    }\n  }\n\n  // Filter and score root resources\n  const scoredApps = rootResources\n    .map((app): SearchResult | null => {\n      const name = app.displayName.toLowerCase()\n      const abbreviation = app.abbreviation?.toLowerCase() || ''\n      const nicknames = app.nicknames?.map((n) => n.toLowerCase()) || []\n      const description = app.description?.toLowerCase() || ''\n      const tags = app.tags?.join(' ').toLowerCase() || ''\n      const teams = app.teams?.join(' ').toLowerCase() || ''\n\n      // Check exact matches first - prioritize abbreviation over displayName\n      if (abbreviation && abbreviation === normalizedQuery) {\n        return { app, match: { field: 'abbreviation', type: 'exact' } }\n      }\n      if (name === normalizedQuery) {\n        return { app, match: { field: 'displayName', type: 'exact' } }\n      }\n      if (nicknames.some((n) => n === normalizedQuery)) {\n        return { app, match: { field: 'nicknames', type: 'exact' } }\n      }\n\n      // Check prefix matches\n      if (abbreviation && abbreviation.startsWith(normalizedQuery)) {\n        return { app, match: { field: 'abbreviation', type: 'prefix' } }\n      }\n      if (name.startsWith(normalizedQuery)) {\n        return { app, match: { field: 'displayName', type: 'prefix' } }\n      }\n      if (nicknames.some((n) => n.startsWith(normalizedQuery))) {\n        return { app, match: { field: 'nicknames', type: 'prefix' } }\n      }\n\n      // Check exact match in tags (any tag exactly matches query)\n      if (app.tags?.some((tag) => tag.toLowerCase() === normalizedQuery)) {\n        return { app, match: { field: 'tags', type: 'exact' } }\n      }\n\n      // Check tags - prefix match (any tag starts with query)\n      if (\n        app.tags?.some((tag) => tag.toLowerCase().startsWith(normalizedQuery))\n      ) {\n        return { app, match: { field: 'tags', type: 'prefix' } }\n      }\n\n      // Check contains matches - prioritize abbreviation over displayName\n      if (abbreviation && abbreviation.includes(normalizedQuery)) {\n        return { app, match: { field: 'abbreviation', type: 'contains' } }\n      }\n      if (name.includes(normalizedQuery)) {\n        return { app, match: { field: 'displayName', type: 'contains' } }\n      }\n      if (nicknames.some((n) => n.includes(normalizedQuery))) {\n        return { app, match: { field: 'nicknames', type: 'contains' } }\n      }\n\n      // Check tags - contains match\n      if (tags.includes(normalizedQuery)) {\n        return { app, match: { field: 'tags', type: 'contains' } }\n      }\n\n      // Check teams (multi-word)\n      if (allTermsMatch(teams)) {\n        return { app, match: { field: 'teams', type: 'contains' } }\n      }\n\n      // Check description (multi-word)\n      if (allTermsMatch(description)) {\n        return { app, match: { field: 'description', type: 'contains' } }\n      }\n\n      // Check child resources (name, aliases, description) — supports multi-word queries\n      const children = childrenByParent.get(app.slug)\n      if (children) {\n        const subMatch = children.some(\n          (r) =>\n            allTermsMatch(r.displayName.toLowerCase()) ||\n            (r.aliases ?? []).some((a) => allTermsMatch(a.toLowerCase())) ||\n            (r.description\n              ? allTermsMatch(r.description.toLowerCase())\n              : false),\n        )\n        if (subMatch) {\n          return { app, match: { field: 'subResource', type: 'contains' } }\n        }\n      }\n\n      // No match found\n      return null\n    })\n    .filter((item): item is SearchResult => item !== null)\n\n  // Calculate numeric scores for sorting\n  const scoreMap = new Map<string, number>()\n  scoredApps.forEach(({ app, match }) => {\n    let score = 0\n\n    // Exact matches: 0-2 (abbreviation, displayName, nicknames)\n    if (match.type === 'exact') {\n      if (match.field === 'abbreviation') score = 0\n      else if (match.field === 'displayName') score = 1\n      else if (match.field === 'nicknames') score = 2\n      else if (match.field === 'tags') score = 6\n      else score = 999\n    }\n    // Prefix matches: 3-5 (abbreviation, displayName, nicknames), 7 (tags)\n    else if (match.type === 'prefix') {\n      if (match.field === 'abbreviation') score = 3\n      else if (match.field === 'displayName') score = 4\n      else if (match.field === 'nicknames') score = 5\n      else if (match.field === 'tags') score = 7\n      else score = 999\n    }\n    // Contains matches\n    else {\n      if (match.field === 'abbreviation') score = 8\n      else if (match.field === 'displayName') score = 9\n      else if (match.field === 'nicknames') score = 10\n      else if (match.field === 'tags') score = 11\n      else if (match.field === 'teams') score = 12\n      else if (match.field === 'subResource') score = 13\n      else score = 14 // description\n    }\n\n    scoreMap.set(app.id, score)\n  })\n\n  // Sort by score (ascending - lower score = higher priority)\n  scoredApps.sort((a, b) => {\n    const scoreA = scoreMap.get(a.app.id) ?? 999\n    const scoreB = scoreMap.get(b.app.id) ?? 999\n\n    if (scoreA !== scoreB) {\n      return scoreA - scoreB\n    }\n    // If same score, sort alphabetically by display name\n    return a.app.displayName.localeCompare(b.app.displayName)\n  })\n\n  return scoredApps.map((item) => item.app)\n}\n\n/**\n * Highlight matching text in a string\n * @param text - Text to highlight\n * @param query - Search query\n * @returns Array of text segments with highlight flags\n */\nexport function highlightText(\n  text: string,\n  query: string,\n): { text: string; highlight: boolean }[] {\n  if (!query.trim()) {\n    return [{ text, highlight: false }]\n  }\n\n  const normalizedQuery = query.trim().toLowerCase()\n  const lowerText = text.toLowerCase()\n  const index = lowerText.indexOf(normalizedQuery)\n\n  if (index === -1) {\n    return [{ text, highlight: false }]\n  }\n\n  const segments: { text: string; highlight: boolean }[] = []\n\n  // Text before match\n  if (index > 0) {\n    segments.push({ text: text.slice(0, index), highlight: false })\n  }\n\n  // Matched text\n  segments.push({\n    text: text.slice(index, index + normalizedQuery.length),\n    highlight: true,\n  })\n\n  // Text after match\n  if (index + normalizedQuery.length < text.length) {\n    segments.push({\n      text: text.slice(index + normalizedQuery.length),\n      highlight: false,\n    })\n  }\n\n  return segments\n}\n\n/** @deprecated Use searchResources instead */\nexport const searchApps = searchResources\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igstack/app-catalog-frontend-core",
-  "version": "0.3.1-alpha-20260405015231",
+  "version": "0.3.1-alpha-20260406011911",
   "description": "Frontend core library for App Catalog",
   "homepage": "https://github.com/lislon/app-catalog",
   "repository": {
@@ -134,8 +134,8 @@
     "vite-plugin-static-copy": "^3.1.4",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "^4.1.2",
-    "@igstack/app-catalog-backend-core": "0.3.1-alpha-20260405015231",
-    "@igstack/app-catalog-shared-core": "0.3.1-alpha-20260405015231"
+    "@igstack/app-catalog-backend-core": "0.3.1-alpha-20260406011911",
+    "@igstack/app-catalog-shared-core": "0.3.1-alpha-20260406011911"
   },
   "peerDependencies": {
     "react": "19.1.2",

package/src/__tests__/integration/appCatalog.integration.test.ts

@@ -125,19 +125,19 @@ describe('App Catalog Integration', () => {
         backendCfg.withSubResource({
           appSlug: app.slug,
           displayName: 'acct-prod',
-          tierSlug: 'prod',
+          tier: 'prod',
           ownerPersonSlug: 'jsmith',
         })
         backendCfg.withSubResource({
           appSlug: app.slug,
           displayName: 'acct-dev',
-          tierSlug: 'dev',
+          tier: 'dev',
           ownerPersonSlug: 'jdoe',
         })
         backendCfg.withSubResource({
           appSlug: app.slug,
           displayName: 'acct-staging',
-          tierSlug: 'staging',
+          tier: 'staging',
         })
       }),
     )

package/src/__tests__/integration/harness/MockBackendVerifier.ts

@@ -1,14 +1,14 @@
-import type { AppForCatalog } from '@igstack/app-catalog-backend-core'
+import type { Resource } from '@igstack/app-catalog-backend-core'
 import type { MockDb } from '../mock-backend/MockDb'
 
 export class MockBackendVerifier {
   constructor(readonly db: MockDb) {}
 
-  apps(): AppForCatalog[] {
-    return this.db.getApps()
+  apps(): Resource[] {
+    return this.db.getResources()
   }
 
-  getApp(slug: string): AppForCatalog {
-    return this.db.getApp(slug)
+  getApp(slug: string): Resource {
+    return this.db.getResource(slug)
   }
 }

package/src/__tests__/integration/mock-backend/MockBackendConfigurer.ts

@@ -1,8 +1,7 @@
 import type {
   AppApprovalMethod,
-  AppForCatalog,
   GroupingTagDefinition,
-  SubResource,
+  Resource,
 } from '@igstack/app-catalog-backend-core'
 import type { MockDb } from './MockDb'
 import type { MockUserContext, UserConfig } from './MockUserContext'
@@ -24,9 +23,9 @@ export class MockBackendConfigurer {
     readonly userContext: MockUserContext,
   ) {}
 
-  withApp(overrides?: Partial<AppForCatalog>): AppForCatalog {
+  withApp(overrides?: Partial<Resource>): Resource {
     const id = overrides?.id ?? nextId()
-    const app: AppForCatalog = {
+    const app: Resource = {
       id,
       slug: overrides?.slug ?? nextSlug(),
       displayName: overrides?.displayName ?? `App ${counter}`,
@@ -35,7 +34,7 @@ export class MockBackendConfigurer {
       screenshotIds: overrides?.screenshotIds ?? [],
       ...overrides,
     }
-    this.db.upsertApp(app)
+    this.db.upsertResource(app)
     return app
   }
 
@@ -67,17 +66,22 @@ export class MockBackendConfigurer {
   }
 
   withSubResource(
-    overrides: Partial<SubResource> & { appSlug: string },
-  ): SubResource {
-    const sr: SubResource = {
-      slug: overrides.slug ?? `sr-${nextId()}`,
+    overrides: Partial<Resource> & { appSlug: string },
+  ): Resource {
+    const appSlug = overrides.appSlug
+    const id = overrides.id ?? nextId()
+    const resource: Resource = {
+      id,
+      slug: overrides.slug ?? `sr-${id}`,
       displayName: overrides.displayName ?? `Sub Resource ${counter}`,
       aliases: overrides.aliases ?? [],
       accessMaintainerGroupSlugs: overrides.accessMaintainerGroupSlugs ?? [],
-      ...overrides,
+      parentSlug: appSlug,
+      tier: overrides.tier,
+      ownerPersonSlug: overrides.ownerPersonSlug,
     }
-    this.db.addSubResource(sr)
-    return sr
+    this.db.upsertResource(resource)
+    return resource
   }
 
   withUser(overrides: Partial<UserConfig>): void {

package/src/__tests__/integration/mock-backend/MockDb.ts

@@ -1,33 +1,49 @@
 import type {
   AppApprovalMethod,
   AppCatalogData,
-  AppForCatalog,
   GroupingTagDefinition,
-  SubResource,
+  Resource,
 } from '@igstack/app-catalog-backend-core'
 
 export class MockDb {
-  apps: AppForCatalog[] = []
+  resources: Resource[] = []
   tagsDefinitions: GroupingTagDefinition[] = []
   approvalMethods: AppApprovalMethod[] = []
-  subResources: SubResource[] = []
 
-  upsertApp(app: AppForCatalog): void {
-    this.apps = [...this.apps.filter((a) => a.id !== app.id), app]
+  upsertResource(resource: Resource): void {
+    this.resources = [
+      ...this.resources.filter((r) => r.id !== resource.id),
+      resource,
+    ]
+  }
+
+  /** @deprecated Use upsertResource */
+  upsertApp(app: Resource): void {
+    this.upsertResource(app)
+  }
+
+  getResources(): Resource[] {
+    return this.resources
   }
 
-  getApps(): AppForCatalog[] {
-    return this.apps
+  /** @deprecated Use getResources */
+  getApps(): Resource[] {
+    return this.getResources()
   }
 
-  getApp(slug: string): AppForCatalog {
-    const app = this.apps.find((a) => a.slug === slug)
-    if (!app) {
+  getResource(slug: string): Resource {
+    const resource = this.resources.find((r) => r.slug === slug)
+    if (!resource) {
       throw new Error(
-        `MockDb: app with slug "${slug}" not found. Available: ${this.apps.map((a) => a.slug).join(', ')}`,
+        `MockDb: resource with slug "${slug}" not found. Available: ${this.resources.map((r) => r.slug).join(', ')}`,
       )
     }
-    return app
+    return resource
+  }
+
+  /** @deprecated Use getResource */
+  getApp(slug: string): Resource {
+    return this.getResource(slug)
   }
 
   setTagDefinitions(defs: GroupingTagDefinition[]): void {
@@ -38,21 +54,13 @@ export class MockDb {
     this.approvalMethods = methods
   }
 
-  addSubResource(sr: SubResource): void {
-    this.subResources = [
-      ...this.subResources.filter((s) => s.slug !== sr.slug),
-      sr,
-    ]
-  }
-
   getAppCatalogData(): AppCatalogData {
     return {
-      apps: this.apps,
+      resources: this.resources,
       tagsDefinitions: this.tagsDefinitions,
       approvalMethods: this.approvalMethods,
       persons: [],
       groups: [],
-      subResources: this.subResources,
     }
   }
 }

package/src/__tests__/modules/appCatalog/ScreenshotPreview.test.tsx

@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'
 import { describe, expect, it } from 'vitest'
 import '@testing-library/jest-dom/vitest'
 
-import type { AppForCatalog } from '@igstack/app-catalog-backend-core'
+import type { Resource } from '@igstack/app-catalog-backend-core'
 import { AppDetailModal } from '~/modules/appCatalog/ui/components/AppDetailModal'
 import { AppCatalogContext } from '~/modules/appCatalog/context/AppCatalogContext'
 import type { AppCatalogContextIface } from '~/modules/appCatalog/context/AppCatalogContext'
@@ -10,16 +10,15 @@ import type { AppCatalogContextIface } from '~/modules/appCatalog/context/AppCat
 // Minimal context value — ScreenshotPreview doesn't use context directly,
 // but AccessSection (sibling in AppDetailModal) does.
 const minimalContext: AppCatalogContextIface = {
-  apps: [],
+  resources: [],
   isLoadingApps: false,
   tagsDefinitions: [],
   approvalMethods: [],
   persons: [],
   groups: [],
-  subResources: [],
 }
 
-function renderWithContext(app: AppForCatalog) {
+function renderWithContext(app: Resource) {
   return render(
     <AppCatalogContext value={minimalContext}>
       <AppDetailModal app={app} isOpen={true} onClose={() => {}} />
@@ -27,7 +26,7 @@ function renderWithContext(app: AppForCatalog) {
   )
 }
 
-function makeApp(screenshotIds: string[]): AppForCatalog {
+function makeApp(screenshotIds: string[]): Resource {
   return {
     id: 'app-1',
     slug: 'test-app',

package/src/__tests__/modules/appCatalog/utils/searchApps.test.ts

@@ -1,13 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import type {
-  AppForCatalog,
-  SubResource,
-} from '@igstack/app-catalog-backend-core'
-import { searchApps } from '~/modules/appCatalog/utils/searchApps'
+import type { Resource } from '@igstack/app-catalog-backend-core'
+import { searchResources } from '~/modules/appCatalog/utils/searchApps'
 
-function makeApp(
-  overrides: Partial<AppForCatalog> & { slug: string },
-): AppForCatalog {
+function makeApp(overrides: Partial<Resource> & { slug: string }): Resource {
   return {
     id: overrides.slug,
     displayName: overrides.slug,
@@ -15,10 +10,11 @@ function makeApp(
   }
 }
 
-function makeSubResource(
-  overrides: Partial<SubResource> & { slug: string; appSlug: string },
-): SubResource {
+function makeChildResource(
+  overrides: Partial<Resource> & { slug: string; parentSlug: string },
+): Resource {
   return {
+    id: overrides.slug,
     displayName: overrides.slug,
     aliases: [],
     accessMaintainerGroupSlugs: [],
@@ -26,8 +22,8 @@ function makeSubResource(
   }
 }
 
-describe('searchApps', () => {
-  const apps: AppForCatalog[] = [
+describe('searchResources', () => {
+  const apps: Resource[] = [
     makeApp({
       slug: 'jira',
       displayName: 'Jira',
@@ -41,51 +37,53 @@ describe('searchApps', () => {
     makeApp({ slug: 'slack', displayName: 'Slack', description: 'Messaging' }),
   ]
 
-  it('returns all apps when query is empty', () => {
-    expect(searchApps(apps, '')).toHaveLength(3)
+  it('returns all root apps when query is empty', () => {
+    expect(searchResources(apps, '')).toHaveLength(3)
   })
 
   it('finds app by displayName', () => {
-    const results = searchApps(apps, 'jira')
+    const results = searchResources(apps, 'jira')
     expect(results).toHaveLength(1)
     expect(results[0]!.slug).toBe('jira')
   })
 
-  describe('sub-resource search', () => {
-    const subResources: SubResource[] = [
-      makeSubResource({
+  describe('child resource search', () => {
+    const childResources: Resource[] = [
+      makeChildResource({
         slug: 'aws-natera-pipelines-dev',
         displayName: 'natera-pipelines-biomarkers-ici-dev',
-        appSlug: 'aws-console',
+        parentSlug: 'aws-console',
         aliases: ['043902793406'],
       }),
-      makeSubResource({
+      makeChildResource({
         slug: 'aws-natera-infosec-dev',
         displayName: 'natera-infosec-dev',
-        appSlug: 'aws-console',
+        parentSlug: 'aws-console',
         aliases: [],
       }),
     ]
 
-    it('finds app by sub-resource displayName', () => {
-      const results = searchApps(apps, 'pipelines biomarkers', subResources)
+    const allResources = [...apps, ...childResources]
+
+    it('finds app by child resource displayName', () => {
+      const results = searchResources(allResources, 'pipelines biomarkers')
       expect(results).toHaveLength(1)
       expect(results[0]!.slug).toBe('aws-console')
     })
 
-    it('finds app by sub-resource alias (account ID)', () => {
-      const results = searchApps(apps, '043902793406', subResources)
+    it('finds app by child resource alias (account ID)', () => {
+      const results = searchResources(allResources, '043902793406')
       expect(results).toHaveLength(1)
       expect(results[0]!.slug).toBe('aws-console')
     })
 
-    it('does not match sub-resources when no subResources provided', () => {
-      const results = searchApps(apps, '043902793406')
+    it('does not match child resources when none provided', () => {
+      const results = searchResources(apps, '043902793406')
       expect(results).toHaveLength(0)
     })
 
-    it('direct app match ranks higher than sub-resource match', () => {
-      const results = searchApps(apps, 'aws', subResources)
+    it('direct app match ranks higher than child resource match', () => {
+      const results = searchResources(allResources, 'aws')
       // 'aws-console' matches by displayName, should appear
       expect(results.length).toBeGreaterThanOrEqual(1)
       expect(results[0]!.slug).toBe('aws-console')

package/src/__tests__/modules/gallery/EscapeDismissal.integration.test.tsx

@@ -2,7 +2,7 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import '@testing-library/jest-dom/vitest'
 
-import type { AppForCatalog } from '@igstack/app-catalog-backend-core'
+import type { Resource } from '@igstack/app-catalog-backend-core'
 import { AppDetailModal } from '~/modules/appCatalog/ui/components/AppDetailModal'
 import { AppCatalogContext } from '~/modules/appCatalog/context/AppCatalogContext'
 import type { AppCatalogContextIface } from '~/modules/appCatalog/context/AppCatalogContext'
@@ -13,16 +13,15 @@ import type { AppCatalogContextIface } from '~/modules/appCatalog/context/AppCat
 // Each Escape press dismisses only the innermost active layer.
 
 const minimalContext: AppCatalogContextIface = {
-  apps: [],
+  resources: [],
   isLoadingApps: false,
   tagsDefinitions: [],
   approvalMethods: [],
   persons: [],
   groups: [],
-  subResources: [],
 }
 
-function makeApp(): AppForCatalog {
+function makeApp(): Resource {
   return {
     id: 'app-1',
     slug: 'test-app',

package/src/modules/appCatalog/context/AppCatalogContext.tsx

@@ -1,11 +1,10 @@
 import type {
   AppApprovalMethod,
-  AppForCatalog,
   AppVersionInfo,
   Group,
   GroupingTagDefinition,
   Person,
-  SubResource,
+  Resource,
 } from '@igstack/app-catalog-backend-core'
 import { useQuery } from '@tanstack/react-query'
 import type { ReactNode } from 'react'
@@ -14,13 +13,12 @@ import { ApiQueryMagazineAppCatalog } from '~/modules/appCatalog'
 import { useUiSettings } from '~/context/UiSettingsContext'
 
 export interface AppCatalogContextIface {
-  apps: AppForCatalog[]
+  resources: Resource[]
   isLoadingApps: boolean
   tagsDefinitions: GroupingTagDefinition[]
   approvalMethods: AppApprovalMethod[]
   persons: Person[]
   groups: Group[]
-  subResources?: SubResource[]
   versions?: AppVersionInfo
 }
 
@@ -40,13 +38,12 @@ export function AppCatalogProvider({ children }: AppCatalogProviderProps) {
 
   const contextValue = useMemo<AppCatalogContextIface>(
     () => ({
-      apps: data?.apps ?? [],
+      resources: data?.resources ?? [],
       isLoadingApps,
       tagsDefinitions: data?.tagsDefinitions ?? [],
       approvalMethods: data?.approvalMethods ?? [],
       persons: data?.persons ?? [],
       groups: data?.groups ?? [],
-      subResources: data?.subResources ?? [],
       versions: {
         ...data?.versions,
         ...(uiSettings.frontendBuildId && {
@@ -61,11 +58,10 @@ export function AppCatalogProvider({ children }: AppCatalogProviderProps) {
     }),
     [
       data?.approvalMethods,
-      data?.apps,
+      data?.resources,
       data?.tagsDefinitions,
       data?.persons,
       data?.groups,
-      data?.subResources,
       data?.versions,
       uiSettings.frontendBuildId,
       isLoadingApps,