@backstage/plugin-catalog-backend 1.1.0 → 1.1.2-next.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @backstage/plugin-catalog-backend
 
+## 1.1.2-next.1
+
+### Patch Changes
+
+- 1ccbe081cc: Minor internal tweak to support TypeScript 4.6
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.1
+
+## 1.1.2-next.0
+
+### Patch Changes
+
+- 55e09b29dd: Fixing broken types for `knex` when checking returned rows
+- cfc0f19699: Updated dependency `fs-extra` to `10.1.0`.
+- 8cc75993a6: Fixed issue in `PermissionEvaluator` instance check that would cause unexpected "invalid union" errors.
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.0
+  - @backstage/integration@1.2.0-next.0
+  - @backstage/plugin-permission-node@0.6.1-next.0
+
 ## 1.1.0
 
 ### Minor Changes

package/alpha/package.json

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

package/dist/index.cjs.js

@@ -2079,11 +2079,11 @@ class DefaultEntitiesCatalog {
   }
   async entities(request) {
     const db = this.database;
-    let entitiesQuery = db("final_entities");
+    let entitiesQuery = db("final_entities").select("final_entities.*");
     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");
+    entitiesQuery = entitiesQuery.whereNotNull("final_entities.final_entity").orderBy("entity_id", "asc");
     const { limit, offset } = parsePagination(request == null ? void 0 : request.pagination);
     if (limit !== void 0) {
       entitiesQuery = entitiesQuery.limit(limit + 1);
@@ -2703,11 +2703,11 @@ class Stitcher {
       entity.metadata.etag = hash;
     }
     const searchEntries = buildEntitySearch(entityId, entity);
-    const rowsChanged = await this.database("final_entities").update({
+    const amountOfRowsChanged = await this.database("final_entities").update({
       final_entity: JSON.stringify(entity),
       hash
     }).where("entity_id", entityId).where("stitch_ticket", ticket).onConflict("entity_id").merge(["final_entity", "hash"]);
-    if (rowsChanged.length === 0) {
+    if (amountOfRowsChanged === 0) {
       this.logger.debug(`Entity ${entityRef} is already processed, skipping write.`);
       return;
     }
@@ -3475,7 +3475,7 @@ class CatalogBuilder {
     });
     const unauthorizedEntitiesCatalog = new DefaultEntitiesCatalog(dbClient);
     let permissionEvaluator;
-    if ("query" in permissions) {
+    if ("authorizeConditional" in permissions) {
       permissionEvaluator = permissions;
     } else {
       logger.warn("PermissionAuthorizer is deprecated. Please use an instance of PermissionEvaluator instead of PermissionAuthorizer in PluginEnvironment#permissions");