@backstage/plugin-catalog-backend 1.9.1-next.0 → 1.9.1-next.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @backstage/plugin-catalog-backend
 
+## 1.9.1-next.2
+
+### Patch Changes
+
+- ce8d203235b: Ensure that entity cache state is only written to the database when actually changed
+- 485a6c5f7b5: Internal refactoring for performance in the service handlers
+- 3587a968dcd: Fixed a bug in the `queryEntities` endpoint that was causing filtered entities to be included in cursor requests.
+- 12a345317ab: Remove unnecessary join in the entity facets endpoint, exclude nulls
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.3.0-next.0
+  - @backstage/config@1.0.7
+
+## 1.9.1-next.1
+
+### Patch Changes
+
+- 27956d78671: Adjusted the OpenAPI schema file name according to the new structure
+- Updated dependencies
+  - @backstage/backend-common@0.18.5-next.1
+  - @backstage/backend-tasks@0.5.2-next.1
+  - @backstage/plugin-catalog-node@1.3.6-next.1
+  - @backstage/plugin-permission-node@0.7.8-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.1-next.1
+  - @backstage/backend-plugin-api@0.5.2-next.1
+  - @backstage/config@1.0.7
+
 ## 1.9.1-next.0
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.9.1-next.0",
+  "version": "1.9.1-next.2",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var alpha = require('@backstage/plugin-catalog-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
-var CatalogBuilder = require('./cjs/CatalogBuilder-ecfd2db6.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-77581d41.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha$1 = require('@backstage/plugin-catalog-node/alpha');
 var backendCommon = require('@backstage/backend-common');

package/dist/cjs/{CatalogBuilder-ecfd2db6.cjs.js → CatalogBuilder-77581d41.cjs.js}

@@ -1563,7 +1563,8 @@ class DefaultCatalogProcessingEngine {
           });
           track.markProcessorsCompleted(result);
           if (result.ok) {
-            if (stableStringify__default["default"](state) !== stableStringify__default["default"](result.state)) {
+            const { ttl: _, ...stateWithoutTtl } = state != null ? state : {};
+            if (stableStringify__default["default"](stateWithoutTtl) !== stableStringify__default["default"](result.state)) {
               await this.processingDatabase.transaction(async (tx) => {
                 await this.processingDatabase.updateEntityCache(tx, {
                   id,
@@ -2018,46 +2019,45 @@ function parsePagination(input) {
     return {};
   }
   let { limit, offset } = input;
-  if (input.after !== void 0) {
-    let cursor;
-    try {
-      const json = Buffer.from(input.after, "base64").toString("utf8");
-      cursor = JSON.parse(json);
-    } catch {
-      throw new errors.InputError("Malformed after cursor, could not be parsed");
-    }
-    if (cursor.limit !== void 0) {
-      if (!Number.isInteger(cursor.limit)) {
-        throw new errors.InputError("Malformed after cursor, limit was not an number");
-      }
-      limit = cursor.limit;
+  if (input.after === void 0) {
+    return { limit, offset };
+  }
+  let cursor;
+  try {
+    const json = Buffer.from(input.after, "base64").toString("utf8");
+    cursor = JSON.parse(json);
+  } catch {
+    throw new errors.InputError("Malformed after cursor, could not be parsed");
+  }
+  if (cursor.limit !== void 0) {
+    if (!Number.isInteger(cursor.limit)) {
+      throw new errors.InputError("Malformed after cursor, limit was not an number");
     }
-    if (cursor.offset !== void 0) {
-      if (!Number.isInteger(cursor.offset)) {
-        throw new errors.InputError("Malformed after cursor, offset was not a number");
-      }
-      offset = cursor.offset;
+    limit = cursor.limit;
+  }
+  if (cursor.offset !== void 0) {
+    if (!Number.isInteger(cursor.offset)) {
+      throw new errors.InputError("Malformed after cursor, offset was not a number");
     }
+    offset = cursor.offset;
   }
   return { limit, offset };
 }
 function stringifyPagination(input) {
-  const json = JSON.stringify({ limit: input.limit, offset: input.offset });
+  const { limit, offset } = input;
+  const json = JSON.stringify({ limit, offset });
   const base64 = Buffer.from(json, "utf8").toString("base64");
   return base64;
 }
 function addCondition(queryBuilder, db, filter, negate = false, entityIdField = "entity_id") {
-  const matchQuery = db("search").select("search.entity_id").where({ key: filter.key.toLowerCase() }).andWhere(function keyFilter() {
-    if (filter.values) {
-      if (filter.values.length === 1) {
-        this.where({ value: filter.values[0].toLowerCase() });
-      } else {
-        this.andWhere(
-          "value",
-          "in",
-          filter.values.map((v) => v.toLowerCase())
-        );
-      }
+  var _a;
+  const key = filter.key.toLowerCase();
+  const values = (_a = filter.values) == null ? void 0 : _a.map((v) => v.toLowerCase());
+  const matchQuery = db("search").select("search.entity_id").where({ key }).andWhere(function keyFilter() {
+    if ((values == null ? void 0 : values.length) === 1) {
+      this.where({ value: values.at(0) });
+    } else if (values) {
+      this.andWhere("value", "in", values);
     }
   });
   queryBuilder.andWhere(entityIdField, negate ? "not in" : "in", matchQuery);
@@ -2072,14 +2072,14 @@ function isNegationEntityFilter(filter) {
   return filter.hasOwnProperty("not");
 }
 function parseFilter(filter, query, db, negate = false, entityIdField = "entity_id") {
+  if (isNegationEntityFilter(filter)) {
+    return parseFilter(filter.not, query, db, !negate, entityIdField);
+  }
   if (isEntitiesSearchFilter(filter)) {
     return query.andWhere(function filterFunction() {
       addCondition(this, db, filter, negate, entityIdField);
     });
   }
-  if (isNegationEntityFilter(filter)) {
-    return parseFilter(filter.not, query, db, !negate, entityIdField);
-  }
   return query[negate ? "andWhereNot" : "andWhere"](function filterFunction() {
     var _a, _b;
     if (isOrEntityFilter(filter)) {
@@ -2256,13 +2256,12 @@ class DefaultEntitiesCatalog {
     const countQuery = dbQuery.clone();
     const isOrderingDescending = sortField.order === "desc";
     if (prevItemOrderFieldValue) {
-      dbQuery.andWhere(
-        "value",
-        isFetchingBackwards !== isOrderingDescending ? "<" : ">",
-        prevItemOrderFieldValue
-      );
-      dbQuery.orWhere(function nested() {
-        this.where("value", "=", prevItemOrderFieldValue).andWhere(
+      dbQuery.andWhere(function nested() {
+        this.where(
+          "value",
+          isFetchingBackwards !== isOrderingDescending ? "<" : ">",
+          prevItemOrderFieldValue
+        ).orWhere("value", "=", prevItemOrderFieldValue).andWhere(
           "search.entity_id",
           isFetchingBackwards !== isOrderingDescending ? "<" : ">",
           prevItemUid
@@ -2416,7 +2415,7 @@ class DefaultEntitiesCatalog {
     const facets = {};
     const db = this.database;
     for (const facet of request.facets) {
-      const dbQuery = db("search").join("final_entities", "search.entity_id", "final_entities.entity_id").where("search.key", facet.toLocaleLowerCase("en-US")).count("search.entity_id as count").select({ value: "search.original_value" }).groupBy("search.original_value");
+      const dbQuery = db("search").where("search.key", facet.toLocaleLowerCase("en-US")).whereNotNull("search.original_value").select({ value: "search.original_value", count: db.raw("count(*)") }).groupBy("search.original_value");
       if (request == null ? void 0 : request.filter) {
         parseFilter(request.filter, dbQuery, db, false, "search.entity_id");
       }
@@ -5056,4 +5055,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-ecfd2db6.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-77581d41.cjs.js.map