@backstage/plugin-catalog-backend 1.8.1-next.1 → 1.8.1-next.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @backstage/plugin-catalog-backend
 
+## 1.8.1-next.2
+
+### Patch Changes
+
+- 62a725e3a94: Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
+- c36b89f2af3: Fixed bug in the `DefaultCatalogProcessingEngine` where entities that contained multiple different types of relations for the same source entity would not properly trigger stitching for that source entity.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.8.1-next.1
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.8.1-next.1",
+  "version": "1.8.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-adbbf6ff.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-d0919a35.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/alpha.d.ts

@@ -1,5 +1,5 @@
-import { E as EntitiesSearchFilter } from './types/types.d-681f9283.js';
-export { E as EntitiesSearchFilter } from './types/types.d-681f9283.js';
+import { E as EntitiesSearchFilter } from './types/types.d-c2093007.js';
+export { E as EntitiesSearchFilter } from './types/types.d-c2093007.js';
 import * as _backstage_plugin_permission_common from '@backstage/plugin-permission-common';
 import { PermissionRuleParams } from '@backstage/plugin-permission-common';
 import * as _backstage_plugin_permission_node from '@backstage/plugin-permission-node';
@@ -68,7 +68,7 @@ declare const catalogConditions: _backstage_plugin_permission_node.Conditions<{
  *
  * @alpha
  */
-declare const createCatalogConditionalDecision: (permission: _backstage_plugin_permission_common.ResourcePermission<"catalog-entity">, conditions: _backstage_plugin_permission_common.PermissionCriteria<_backstage_plugin_permission_common.PermissionCondition<"catalog-entity", _backstage_plugin_permission_common.PermissionRuleParams>>) => _backstage_plugin_permission_common.ConditionalPolicyDecision;
+declare const createCatalogConditionalDecision: (permission: _backstage_plugin_permission_common.ResourcePermission<"catalog-entity">, conditions: _backstage_plugin_permission_common.PermissionCriteria<_backstage_plugin_permission_common.PermissionCondition<"catalog-entity">>) => _backstage_plugin_permission_common.ConditionalPolicyDecision;
 
 /**
  * Convenience type for {@link @backstage/plugin-permission-node#PermissionRule}
@@ -77,7 +77,7 @@ declare const createCatalogConditionalDecision: (permission: _backstage_plugin_p
  *
  * @alpha
  */
-declare type CatalogPermissionRule<TParams extends PermissionRuleParams = PermissionRuleParams> = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
+type CatalogPermissionRule<TParams extends PermissionRuleParams = PermissionRuleParams> = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 /**
  * Helper function for creating correctly-typed
  * {@link @backstage/plugin-permission-node#PermissionRule}s for the

package/dist/cjs/{CatalogBuilder-adbbf6ff.cjs.js → CatalogBuilder-d0919a35.cjs.js}

@@ -1589,26 +1589,30 @@ class DefaultCatalogProcessingEngine {
               locationKey,
               refreshKeys: result.refreshKeys
             });
-            oldRelationSources = new Set(
-              previous.relations.map((r) => r.source_entity_ref)
+            oldRelationSources = new Map(
+              previous.relations.map((r) => [
+                `${r.source_entity_ref}:${r.type}`,
+                r.source_entity_ref
+              ])
             );
           });
-          const newRelationSources = new Set(
-            result.relations.map(
-              (relation) => catalogModel.stringifyEntityRef(relation.source)
-            )
+          const newRelationSources = new Map(
+            result.relations.map((relation) => {
+              const sourceEntityRef = catalogModel.stringifyEntityRef(relation.source);
+              return [`${sourceEntityRef}:${relation.type}`, sourceEntityRef];
+            })
           );
           const setOfThingsToStitch = /* @__PURE__ */ new Set([
             catalogModel.stringifyEntityRef(result.completedEntity)
           ]);
-          newRelationSources.forEach((r) => {
-            if (!oldRelationSources.has(r)) {
-              setOfThingsToStitch.add(r);
+          newRelationSources.forEach((sourceEntityRef, uniqueKey) => {
+            if (!oldRelationSources.has(uniqueKey)) {
+              setOfThingsToStitch.add(sourceEntityRef);
             }
           });
-          oldRelationSources.forEach((r) => {
-            if (!newRelationSources.has(r)) {
-              setOfThingsToStitch.add(r);
+          oldRelationSources.forEach((sourceEntityRef, uniqueKey) => {
+            if (!newRelationSources.has(uniqueKey)) {
+              setOfThingsToStitch.add(sourceEntityRef);
             }
           });
           await this.stitcher.stitch(setOfThingsToStitch);
@@ -4962,4 +4966,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-adbbf6ff.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-d0919a35.cjs.js.map