@backstage/plugin-catalog-backend 0.17.2 → 0.17.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-backend
 
+## 0.17.3
+
+### Patch Changes
+
+- 86bef79ad1: Allow singleton and flexibly nested EntityFilters
+- Updated dependencies
+  - @backstage/backend-common@0.9.9
+  - @backstage/catalog-client@0.5.1
+
 ## 0.17.2
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -2633,13 +2633,16 @@ class CommonDatabase {
     var _a, _b;
     const tx = txOpaque;
     let entitiesQuery = tx("entities");
+    if ((request == null ? void 0 : request.filter) && (request.filter.hasOwnProperty("key") || request.filter.hasOwnProperty("allOf"))) {
+      throw new Error("Filters for the legacy CommonDatabase must obey the { anyOf: [{ allOf: [] }] } format.");
+    }
     for (const singleFilter of (_b = (_a = request == null ? void 0 : request.filter) == null ? void 0 : _a.anyOf) != null ? _b : []) {
       entitiesQuery = entitiesQuery.orWhere(function singleFilterFn() {
-        for (const {
-          key,
-          matchValueIn,
-          matchValueExists
-        } of singleFilter.allOf) {
+        for (const filter of singleFilter.allOf) {
+          if (filter.hasOwnProperty("anyOf") || filter.hasOwnProperty("allOf")) {
+            throw new Error("Nested filters are not supported in the legacy CommonDatabase");
+          }
+          const {key, matchValueIn, matchValueExists} = filter;
           const matchQuery = tx("entities_search").select("entity_id").where(function keyFilter() {
             this.andWhere({key: key.toLowerCase()});
             if (matchValueExists !== false && matchValueIn) {
@@ -4131,34 +4134,60 @@ function stringifyPagination(input) {
   const base64 = Buffer.from(json, "utf8").toString("base64");
   return base64;
 }
+function addCondition(queryBuilder, db, {key, matchValueIn, matchValueExists}) {
+  const matchQuery = db("search").select("entity_id").where(function keyFilter() {
+    this.andWhere({key: key.toLowerCase()});
+    if (matchValueExists !== false && matchValueIn) {
+      if (matchValueIn.length === 1) {
+        this.andWhere({value: matchValueIn[0].toLowerCase()});
+      } else if (matchValueIn.length > 1) {
+        this.andWhere("value", "in", matchValueIn.map((v) => v.toLowerCase()));
+      }
+    }
+  });
+  queryBuilder.andWhere("entity_id", matchValueExists === false ? "not in" : "in", matchQuery);
+}
+function isEntitiesSearchFilter(filter) {
+  return filter.hasOwnProperty("key");
+}
+function isAndEntityFilter(filter) {
+  return filter.hasOwnProperty("allOf");
+}
+function isOrEntityFilter(filter) {
+  return filter.hasOwnProperty("anyOf");
+}
+function parseFilter(filter, query, db) {
+  var _a, _b;
+  if (isEntitiesSearchFilter(filter)) {
+    return query.where(function filterFunction() {
+      addCondition(this, db, filter);
+    });
+  }
+  if (isOrEntityFilter(filter)) {
+    let cumulativeQuery = query;
+    for (const subFilter of (_a = filter.anyOf) != null ? _a : []) {
+      cumulativeQuery = cumulativeQuery.orWhere((subQuery) => parseFilter(subFilter, subQuery, db));
+    }
+    return cumulativeQuery;
+  }
+  if (isAndEntityFilter(filter)) {
+    let cumulativeQuery = query;
+    for (const subFilter of (_b = filter.allOf) != null ? _b : []) {
+      cumulativeQuery = cumulativeQuery.andWhere((subQuery) => parseFilter(subFilter, subQuery, db));
+    }
+    return cumulativeQuery;
+  }
+  return query;
+}
 class NextEntitiesCatalog {
   constructor(database) {
     this.database = database;
   }
   async entities(request) {
-    var _a, _b;
     const db = this.database;
     let entitiesQuery = db("final_entities");
-    for (const singleFilter of (_b = (_a = request == null ? void 0 : request.filter) == null ? void 0 : _a.anyOf) != null ? _b : []) {
-      entitiesQuery = entitiesQuery.orWhere(function singleFilterFn() {
-        for (const {
-          key,
-          matchValueIn,
-          matchValueExists
-        } of singleFilter.allOf) {
-          const matchQuery = db("search").select("entity_id").where(function keyFilter() {
-            this.andWhere({key: key.toLowerCase()});
-            if (matchValueExists !== false && matchValueIn) {
-              if (matchValueIn.length === 1) {
-                this.andWhere({value: matchValueIn[0].toLowerCase()});
-              } else if (matchValueIn.length > 1) {
-                this.andWhere("value", "in", matchValueIn.map((v) => v.toLowerCase()));
-              }
-            }
-          });
-          this.andWhere("entity_id", matchValueExists === false ? "not in" : "in", matchQuery);
-        }
-      });
+    if (request == null ? void 0 : request.filter) {
+      entitiesQuery = parseFilter(request.filter, entitiesQuery, db);
     }
     entitiesQuery = entitiesQuery.select("final_entities.*").whereNotNull("final_entities.final_entity").orderBy("entity_id", "asc");
     const {limit, offset} = parsePagination(request == null ? void 0 : request.pagination);