@backstage/backend-app-api 0.5.3-next.1 → 0.5.3-next.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @backstage/backend-app-api
 
+## 0.5.3-next.2
+
+### Patch Changes
+
+- 37a20c7f14aa: Adds include and exclude configuration to feature discovery of backend packages
+  Adds alpha modules to feature discovery
+- 3fc64b9e2f8f: Extension points are now tracked via their ID rather than reference, in order to support package duplication.
+- b219d097b3f4: Backend startup will now fail if any circular service dependencies are detected.
+- Updated dependencies
+  - @backstage/config-loader@1.5.0-next.2
+  - @backstage/config@1.1.0-next.1
+  - @backstage/backend-tasks@0.5.8-next.2
+  - @backstage/backend-common@0.19.5-next.2
+  - @backstage/plugin-auth-node@0.3.0-next.2
+  - @backstage/plugin-permission-node@0.7.14-next.2
+  - @backstage/backend-plugin-api@0.6.3-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/cli-node@0.1.3
+  - @backstage/errors@1.2.1
+  - @backstage/types@1.1.0
+
 ## 0.5.3-next.1
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-app-api",
-  "version": "0.5.3-next.1",
+  "version": "0.5.3-next.2",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -11,7 +11,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
-const LOADED_PACKAGE_ROLES = ["backend-plugin", "backend-module"];
+const LOADED_PACKAGE_ROLES = ["backend-plugin", "backend-plugin-module"];
 async function findClosestPackageDir(searchDir) {
   let path$1 = searchDir;
   for (let i = 0; i < 1e3; i++) {
@@ -31,23 +31,39 @@ async function findClosestPackageDir(searchDir) {
   );
 }
 class PackageDiscoveryService {
-  constructor(config) {
+  constructor(config, logger) {
     this.config = config;
+    this.logger = logger;
+  }
+  getDependencyNames(path) {
+    const { dependencies } = require(path);
+    const packagesConfig = this.config.getOptional("backend.packages");
+    const dependencyNames = Object.keys(dependencies || {});
+    if (packagesConfig === "all") {
+      return dependencyNames;
+    }
+    const includedPackagesConfig = this.config.getOptionalStringArray(
+      "backend.packages.include"
+    );
+    const includedPackages = includedPackagesConfig ? new Set(includedPackagesConfig) : dependencyNames;
+    const excludedPackagesSet = new Set(
+      this.config.getOptionalStringArray("backend.packages.exclude")
+    );
+    return [...includedPackages].filter((name) => !excludedPackagesSet.has(name));
   }
   async getBackendFeatures() {
     var _a, _b;
-    if (this.config.getOptionalString("backend.packages") !== "all") {
+    const packagesConfig = this.config.getOptional("backend.packages");
+    if (!packagesConfig || Object.keys(packagesConfig).length === 0) {
       return { features: [] };
     }
     const packageDir = await findClosestPackageDir(process.argv[1]);
     if (!packageDir) {
       throw new Error("Package discovery failed to find package.json");
     }
-    const { dependencies } = require(path.resolve(
-      packageDir,
-      "package.json"
-    ));
-    const dependencyNames = Object.keys(dependencies || {});
+    const dependencyNames = this.getDependencyNames(
+      path.resolve(packageDir, "package.json")
+    );
     const features = [];
     for (const name of dependencyNames) {
       const depPkg = require(require.resolve(`${name}/package.json`, {
@@ -56,13 +72,28 @@ class PackageDiscoveryService {
       if (!LOADED_PACKAGE_ROLES.includes((_b = (_a = depPkg == null ? void 0 : depPkg.backstage) == null ? void 0 : _a.role) != null ? _b : "")) {
         continue;
       }
-      const depModule = require(require.resolve(name, { paths: [packageDir] }));
-      for (const exportValue of Object.values(depModule)) {
-        if (isBackendFeature(exportValue)) {
-          features.push(exportValue);
-        }
-        if (isBackendFeatureFactory(exportValue)) {
-          features.push(exportValue());
+      const exportedModulePaths = [
+        require.resolve(name, {
+          paths: [packageDir]
+        })
+      ];
+      try {
+        exportedModulePaths.push(
+          require.resolve(`${name}/alpha`, { paths: [packageDir] })
+        );
+      } catch {
+      }
+      for (const modulePath of exportedModulePaths) {
+        const module = require(modulePath);
+        for (const [exportName, exportValue] of Object.entries(module)) {
+          if (isBackendFeature(exportValue)) {
+            this.logger.info(`Detected: ${name}#${exportName}`);
+            features.push(exportValue);
+          }
+          if (isBackendFeatureFactory(exportValue)) {
+            this.logger.info(`Detected: ${name}#${exportName}`);
+            features.push(exportValue());
+          }
         }
       }
     }
@@ -72,10 +103,11 @@ class PackageDiscoveryService {
 const featureDiscoveryServiceFactory = backendPluginApi.createServiceFactory({
   service: alpha.featureDiscoveryServiceRef,
   deps: {
-    config: backendPluginApi.coreServices.rootConfig
+    config: backendPluginApi.coreServices.rootConfig,
+    logger: backendPluginApi.coreServices.rootLogger
   },
-  factory({ config }) {
-    return new PackageDiscoveryService(config);
+  factory({ config, logger }) {
+    return new PackageDiscoveryService(config, logger);
   }
 });
 function isBackendFeature(value) {

package/dist/alpha.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"alpha.cjs.js","sources":["../src/alpha/featureDiscoveryServiceFactory.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  BackendFeature,\n  RootConfigService,\n  coreServices,\n  createServiceFactory,\n} from '@backstage/backend-plugin-api';\nimport {\n  featureDiscoveryServiceRef,\n  FeatureDiscoveryService,\n} from '@backstage/backend-plugin-api/alpha';\nimport { resolve as resolvePath, dirname } from 'path';\nimport fs from 'fs-extra';\nimport { BackstagePackageJson } from '@backstage/cli-node';\n\nconst LOADED_PACKAGE_ROLES = ['backend-plugin', 'backend-module'];\n\n/** @internal */\nasync function findClosestPackageDir(\n  searchDir: string,\n): Promise<string | undefined> {\n  let path = searchDir;\n\n  // Some confidence check to avoid infinite loop\n  for (let i = 0; i < 1000; i++) {\n    const packagePath = resolvePath(path, 'package.json');\n    const exists = await fs.pathExists(packagePath);\n    if (exists) {\n      return path;\n    }\n\n    const newPath = dirname(path);\n    if (newPath === path) {\n      return undefined;\n    }\n    path = newPath;\n  }\n\n  throw new Error(\n    `Iteration limit reached when searching for root package.json at ${searchDir}`,\n  );\n}\n\n/** @internal */\nclass PackageDiscoveryService implements FeatureDiscoveryService {\n  constructor(private readonly config: RootConfigService) {}\n\n  async getBackendFeatures(): Promise<{ features: Array<BackendFeature> }> {\n    if (this.config.getOptionalString('backend.packages') !== 'all') {\n      return { features: [] };\n    }\n\n    const packageDir = await findClosestPackageDir(process.argv[1]);\n    if (!packageDir) {\n      throw new Error('Package discovery failed to find package.json');\n    }\n    const { dependencies } = require(resolvePath(\n      packageDir,\n      'package.json',\n    )) as BackstagePackageJson;\n    const dependencyNames = Object.keys(dependencies || {});\n\n    const features: BackendFeature[] = [];\n\n    for (const name of dependencyNames) {\n      const depPkg = require(require.resolve(`${name}/package.json`, {\n        paths: [packageDir],\n      })) as BackstagePackageJson;\n      if (!LOADED_PACKAGE_ROLES.includes(depPkg?.backstage?.role ?? '')) {\n        continue;\n      }\n      const depModule = require(require.resolve(name, { paths: [packageDir] }));\n      for (const exportValue of Object.values(depModule)) {\n        if (isBackendFeature(exportValue)) {\n          features.push(exportValue);\n        }\n        if (isBackendFeatureFactory(exportValue)) {\n          features.push(exportValue());\n        }\n      }\n    }\n\n    return { features };\n  }\n}\n\n/** @alpha */\nexport const featureDiscoveryServiceFactory = createServiceFactory({\n  service: featureDiscoveryServiceRef,\n  deps: {\n    config: coreServices.rootConfig,\n  },\n  factory({ config }) {\n    return new PackageDiscoveryService(config);\n  },\n});\n\nfunction isBackendFeature(value: unknown): value is BackendFeature {\n  return (\n    !!value &&\n    typeof value === 'object' &&\n    (value as BackendFeature).$$type === '@backstage/BackendFeature'\n  );\n}\n\nfunction isBackendFeatureFactory(\n  value: unknown,\n): value is () => BackendFeature {\n  return (\n    !!value &&\n    typeof value === 'function' &&\n    (value as any).$$type === '@backstage/BackendFeatureFactory'\n  );\n}\n"],"names":["path","resolvePath","fs","dirname","createServiceFactory","featureDiscoveryServiceRef","coreServices"],"mappings":";;;;;;;;;;;;;AA8BA,MAAM,oBAAA,GAAuB,CAAC,gBAAA,EAAkB,gBAAgB,CAAA,CAAA;AAGhE,eAAe,sBACb,SAC6B,EAAA;AAC7B,EAAA,IAAIA,MAAO,GAAA,SAAA,CAAA;AAGX,EAAA,KAAA,IAAS,CAAI,GAAA,CAAA,EAAG,CAAI,GAAA,GAAA,EAAM,CAAK,EAAA,EAAA;AAC7B,IAAM,MAAA,WAAA,GAAcC,YAAY,CAAAD,MAAA,EAAM,cAAc,CAAA,CAAA;AACpD,IAAA,MAAM,MAAS,GAAA,MAAME,sBAAG,CAAA,UAAA,CAAW,WAAW,CAAA,CAAA;AAC9C,IAAA,IAAI,MAAQ,EAAA;AACV,MAAO,OAAAF,MAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,OAAA,GAAUG,aAAQH,MAAI,CAAA,CAAA;AAC5B,IAAA,IAAI,YAAYA,MAAM,EAAA;AACpB,MAAO,OAAA,KAAA,CAAA,CAAA;AAAA,KACT;AACA,IAAOA,MAAA,GAAA,OAAA,CAAA;AAAA,GACT;AAEA,EAAA,MAAM,IAAI,KAAA;AAAA,IACR,mEAAmE,SAAS,CAAA,CAAA;AAAA,GAC9E,CAAA;AACF,CAAA;AAGA,MAAM,uBAA2D,CAAA;AAAA,EAC/D,YAA6B,MAA2B,EAAA;AAA3B,IAAA,IAAA,CAAA,MAAA,GAAA,MAAA,CAAA;AAAA,GAA4B;AAAA,EAEzD,MAAM,kBAAmE,GAAA;AA9D3E,IAAA,IAAA,EAAA,EAAA,EAAA,CAAA;AA+DI,IAAA,IAAI,IAAK,CAAA,MAAA,CAAO,iBAAkB,CAAA,kBAAkB,MAAM,KAAO,EAAA;AAC/D,MAAO,OAAA,EAAE,QAAU,EAAA,EAAG,EAAA,CAAA;AAAA,KACxB;AAEA,IAAA,MAAM,aAAa,MAAM,qBAAA,CAAsB,OAAQ,CAAA,IAAA,CAAK,CAAC,CAAC,CAAA,CAAA;AAC9D,IAAA,IAAI,CAAC,UAAY,EAAA;AACf,MAAM,MAAA,IAAI,MAAM,+CAA+C,CAAA,CAAA;AAAA,KACjE;AACA,IAAM,MAAA,EAAE,YAAa,EAAA,GAAI,OAAQ,CAAAC,YAAA;AAAA,MAC/B,UAAA;AAAA,MACA,cAAA;AAAA,KACD,CAAA,CAAA;AACD,IAAA,MAAM,eAAkB,GAAA,MAAA,CAAO,IAAK,CAAA,YAAA,IAAgB,EAAE,CAAA,CAAA;AAEtD,IAAA,MAAM,WAA6B,EAAC,CAAA;AAEpC,IAAA,KAAA,MAAW,QAAQ,eAAiB,EAAA;AAClC,MAAA,MAAM,SAAS,OAAQ,CAAA,OAAA,CAAQ,OAAQ,CAAA,CAAA,EAAG,IAAI,CAAiB,aAAA,CAAA,EAAA;AAAA,QAC7D,KAAA,EAAO,CAAC,UAAU,CAAA;AAAA,OACnB,CAAC,CAAA,CAAA;AACF,MAAI,IAAA,CAAC,qBAAqB,QAAS,CAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,MAAA,IAAA,IAAA,GAAA,KAAA,CAAA,GAAA,MAAA,CAAQ,cAAR,IAAmB,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,KAAnB,IAA2B,GAAA,EAAA,GAAA,EAAE,CAAG,EAAA;AACjE,QAAA,SAAA;AAAA,OACF;AACA,MAAM,MAAA,SAAA,GAAY,OAAQ,CAAA,OAAA,CAAQ,OAAQ,CAAA,IAAA,EAAM,EAAE,KAAA,EAAO,CAAC,UAAU,CAAE,EAAC,CAAC,CAAA,CAAA;AACxE,MAAA,KAAA,MAAW,WAAe,IAAA,MAAA,CAAO,MAAO,CAAA,SAAS,CAAG,EAAA;AAClD,QAAI,IAAA,gBAAA,CAAiB,WAAW,CAAG,EAAA;AACjC,UAAA,QAAA,CAAS,KAAK,WAAW,CAAA,CAAA;AAAA,SAC3B;AACA,QAAI,IAAA,uBAAA,CAAwB,WAAW,CAAG,EAAA;AACxC,UAAS,QAAA,CAAA,IAAA,CAAK,aAAa,CAAA,CAAA;AAAA,SAC7B;AAAA,OACF;AAAA,KACF;AAEA,IAAA,OAAO,EAAE,QAAS,EAAA,CAAA;AAAA,GACpB;AACF,CAAA;AAGO,MAAM,iCAAiCG,qCAAqB,CAAA;AAAA,EACjE,OAAS,EAAAC,gCAAA;AAAA,EACT,IAAM,EAAA;AAAA,IACJ,QAAQC,6BAAa,CAAA,UAAA;AAAA,GACvB;AAAA,EACA,OAAA,CAAQ,EAAE,MAAA,EAAU,EAAA;AAClB,IAAO,OAAA,IAAI,wBAAwB,MAAM,CAAA,CAAA;AAAA,GAC3C;AACF,CAAC,EAAA;AAED,SAAS,iBAAiB,KAAyC,EAAA;AACjE,EAAA,OACE,CAAC,CAAC,KAAA,IACF,OAAO,KAAU,KAAA,QAAA,IAChB,MAAyB,MAAW,KAAA,2BAAA,CAAA;AAEzC,CAAA;AAEA,SAAS,wBACP,KAC+B,EAAA;AAC/B,EAAA,OACE,CAAC,CAAC,KAAA,IACF,OAAO,KAAU,KAAA,UAAA,IAChB,MAAc,MAAW,KAAA,kCAAA,CAAA;AAE9B;;;;"}
+{"version":3,"file":"alpha.cjs.js","sources":["../src/alpha/featureDiscoveryServiceFactory.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  BackendFeature,\n  RootConfigService,\n  RootLoggerService,\n  coreServices,\n  createServiceFactory,\n} from '@backstage/backend-plugin-api';\nimport {\n  featureDiscoveryServiceRef,\n  FeatureDiscoveryService,\n} from '@backstage/backend-plugin-api/alpha';\nimport { resolve as resolvePath, dirname } from 'path';\nimport fs from 'fs-extra';\nimport { BackstagePackageJson } from '@backstage/cli-node';\n\nconst LOADED_PACKAGE_ROLES = ['backend-plugin', 'backend-plugin-module'];\n\n/** @internal */\nasync function findClosestPackageDir(\n  searchDir: string,\n): Promise<string | undefined> {\n  let path = searchDir;\n\n  // Some confidence check to avoid infinite loop\n  for (let i = 0; i < 1000; i++) {\n    const packagePath = resolvePath(path, 'package.json');\n    const exists = await fs.pathExists(packagePath);\n    if (exists) {\n      return path;\n    }\n\n    const newPath = dirname(path);\n    if (newPath === path) {\n      return undefined;\n    }\n    path = newPath;\n  }\n\n  throw new Error(\n    `Iteration limit reached when searching for root package.json at ${searchDir}`,\n  );\n}\n\n/** @internal */\nclass PackageDiscoveryService implements FeatureDiscoveryService {\n  constructor(\n    private readonly config: RootConfigService,\n    private readonly logger: RootLoggerService,\n  ) {}\n\n  getDependencyNames(path: string) {\n    const { dependencies } = require(path) as BackstagePackageJson;\n    const packagesConfig = this.config.getOptional('backend.packages');\n\n    const dependencyNames = Object.keys(dependencies || {});\n\n    if (packagesConfig === 'all') {\n      return dependencyNames;\n    }\n\n    const includedPackagesConfig = this.config.getOptionalStringArray(\n      'backend.packages.include',\n    );\n\n    const includedPackages = includedPackagesConfig\n      ? new Set(includedPackagesConfig)\n      : dependencyNames;\n    const excludedPackagesSet = new Set(\n      this.config.getOptionalStringArray('backend.packages.exclude'),\n    );\n\n    return [...includedPackages].filter(name => !excludedPackagesSet.has(name));\n  }\n\n  async getBackendFeatures(): Promise<{ features: Array<BackendFeature> }> {\n    const packagesConfig = this.config.getOptional('backend.packages');\n    if (!packagesConfig || Object.keys(packagesConfig).length === 0) {\n      return { features: [] };\n    }\n\n    const packageDir = await findClosestPackageDir(process.argv[1]);\n    if (!packageDir) {\n      throw new Error('Package discovery failed to find package.json');\n    }\n    const dependencyNames = this.getDependencyNames(\n      resolvePath(packageDir, 'package.json'),\n    );\n\n    const features: BackendFeature[] = [];\n\n    for (const name of dependencyNames) {\n      const depPkg = require(require.resolve(`${name}/package.json`, {\n        paths: [packageDir],\n      })) as BackstagePackageJson;\n      if (!LOADED_PACKAGE_ROLES.includes(depPkg?.backstage?.role ?? '')) {\n        continue;\n      }\n\n      const exportedModulePaths = [\n        require.resolve(name, {\n          paths: [packageDir],\n        }),\n      ];\n\n      // Find modules exported as alpha\n      try {\n        exportedModulePaths.push(\n          require.resolve(`${name}/alpha`, { paths: [packageDir] }),\n        );\n      } catch {\n        /* ignore */\n      }\n\n      for (const modulePath of exportedModulePaths) {\n        const module = require(modulePath);\n        for (const [exportName, exportValue] of Object.entries(module)) {\n          if (isBackendFeature(exportValue)) {\n            this.logger.info(`Detected: ${name}#${exportName}`);\n            features.push(exportValue);\n          }\n          if (isBackendFeatureFactory(exportValue)) {\n            this.logger.info(`Detected: ${name}#${exportName}`);\n            features.push(exportValue());\n          }\n        }\n      }\n    }\n\n    return { features };\n  }\n}\n\n/** @alpha */\nexport const featureDiscoveryServiceFactory = createServiceFactory({\n  service: featureDiscoveryServiceRef,\n  deps: {\n    config: coreServices.rootConfig,\n    logger: coreServices.rootLogger,\n  },\n  factory({ config, logger }) {\n    return new PackageDiscoveryService(config, logger);\n  },\n});\n\nfunction isBackendFeature(value: unknown): value is BackendFeature {\n  return (\n    !!value &&\n    typeof value === 'object' &&\n    (value as BackendFeature).$$type === '@backstage/BackendFeature'\n  );\n}\n\nfunction isBackendFeatureFactory(\n  value: unknown,\n): value is () => BackendFeature {\n  return (\n    !!value &&\n    typeof value === 'function' &&\n    (value as any).$$type === '@backstage/BackendFeatureFactory'\n  );\n}\n"],"names":["path","resolvePath","fs","dirname","createServiceFactory","featureDiscoveryServiceRef","coreServices"],"mappings":"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"}

package/dist/index.cjs.js

@@ -1093,7 +1093,11 @@ var __privateSet$4 = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _nodes, _allProvided;
+var __privateMethod$3 = (obj, member, method) => {
+  __accessCheck$4(obj, member, "access private method");
+  return method;
+};
+var _nodeIds, _cycleKeys, _getCycleKey, getCycleKey_fn, _nodes, _allProvided;
 class Node {
   constructor(value, consumes, provides) {
     this.value = value;
@@ -1108,6 +1112,33 @@ class Node {
     );
   }
 }
+const _CycleKeySet = class _CycleKeySet {
+  constructor(nodes) {
+    __privateAdd$4(this, _getCycleKey);
+    __privateAdd$4(this, _nodeIds, void 0);
+    __privateAdd$4(this, _cycleKeys, void 0);
+    __privateSet$4(this, _nodeIds, new Map(nodes.map((n, i) => [n.value, i])));
+    __privateSet$4(this, _cycleKeys, /* @__PURE__ */ new Set());
+  }
+  static from(nodes) {
+    return new _CycleKeySet(nodes);
+  }
+  tryAdd(path) {
+    const cycleKey = __privateMethod$3(this, _getCycleKey, getCycleKey_fn).call(this, path);
+    if (__privateGet$4(this, _cycleKeys).has(cycleKey)) {
+      return false;
+    }
+    __privateGet$4(this, _cycleKeys).add(cycleKey);
+    return true;
+  }
+};
+_nodeIds = new WeakMap();
+_cycleKeys = new WeakMap();
+_getCycleKey = new WeakSet();
+getCycleKey_fn = function(path) {
+  return path.map((n) => __privateGet$4(this, _nodeIds).get(n)).sort().join(",");
+};
+let CycleKeySet = _CycleKeySet;
 const _DependencyGraph = class _DependencyGraph {
   constructor(nodes) {
     __privateAdd$4(this, _nodes, void 0);
@@ -1135,7 +1166,9 @@ const _DependencyGraph = class _DependencyGraph {
     }
     return new _DependencyGraph(nodes);
   }
-  // Find all nodes that consume dependencies that are not provided by any other node
+  /**
+   * Find all nodes that consume dependencies that are not provided by any other node.
+   */
   findUnsatisfiedDeps() {
     const unsatisfiedDependencies = [];
     for (const node of __privateGet$4(this, _nodes).values()) {
@@ -1148,9 +1181,19 @@ const _DependencyGraph = class _DependencyGraph {
     }
     return unsatisfiedDependencies;
   }
-  // Detect circular dependencies within the graph, returning the path of nodes that
-  // form a cycle, with the same node as the first and last element of the array.
+  /**
+   * Detect the first circular dependency within the graph, returning the path of nodes that
+   * form a cycle, with the same node as the first and last element of the array.
+   */
   detectCircularDependency() {
+    return this.detectCircularDependencies().next().value;
+  }
+  /**
+   * Detect circular dependencies within the graph, returning the path of nodes that
+   * form a cycle, with the same node as the first and last element of the array.
+   */
+  *detectCircularDependencies() {
+    const cycleKeys = CycleKeySet.from(__privateGet$4(this, _nodes));
     for (const startNode of __privateGet$4(this, _nodes)) {
       const visited = /* @__PURE__ */ new Set();
       const stack = new Array([
@@ -1163,16 +1206,19 @@ const _DependencyGraph = class _DependencyGraph {
           continue;
         }
         visited.add(node);
-        for (const produced of node.provides) {
-          const consumerNodes = __privateGet$4(this, _nodes).filter(
-            (other) => other.consumes.has(produced)
+        for (const consumed of node.consumes) {
+          const providerNodes = __privateGet$4(this, _nodes).filter(
+            (other) => other.provides.has(consumed)
           );
-          for (const consumer of consumerNodes) {
-            if (consumer === startNode) {
-              return [...path, startNode.value];
+          for (const provider of providerNodes) {
+            if (provider === startNode) {
+              if (cycleKeys.tryAdd(path)) {
+                yield [...path, startNode.value];
+              }
+              break;
             }
-            if (!visited.has(consumer)) {
-              stack.push([consumer, [...path, consumer.value]]);
+            if (!visited.has(provider)) {
+              stack.push([provider, [...path, provider.value]]);
             }
           }
         }
@@ -1260,7 +1306,7 @@ var __privateMethod$2 = (obj, member, method) => {
   __accessCheck$3(obj, member, "access private method");
   return method;
 };
-var _providedFactories, _loadedDefaultFactories, _implementations, _rootServiceImplementations, _resolveFactory, resolveFactory_fn, _checkForMissingDeps, checkForMissingDeps_fn;
+var _providedFactories, _loadedDefaultFactories, _implementations, _rootServiceImplementations, _resolveFactory, resolveFactory_fn, _checkForMissingDeps, checkForMissingDeps_fn, _checkForCircularDeps, checkForCircularDeps_fn;
 function toInternalServiceFactory(factory) {
   const f = factory;
   if (f.$$type !== "@backstage/BackendFeature") {
@@ -1278,10 +1324,11 @@ const pluginMetadataServiceFactory = backendPluginApi.createServiceFactory(
     factory: async () => ({ getId: () => options == null ? void 0 : options.pluginId })
   })
 );
-class ServiceRegistry {
+const _ServiceRegistry = class _ServiceRegistry {
   constructor(factories) {
     __privateAdd$3(this, _resolveFactory);
     __privateAdd$3(this, _checkForMissingDeps);
+    __privateAdd$3(this, _checkForCircularDeps);
     __privateAdd$3(this, _providedFactories, void 0);
     __privateAdd$3(this, _loadedDefaultFactories, void 0);
     __privateAdd$3(this, _implementations, void 0);
@@ -1292,6 +1339,12 @@ class ServiceRegistry {
     __privateSet$3(this, _loadedDefaultFactories, /* @__PURE__ */ new Map());
     __privateSet$3(this, _implementations, /* @__PURE__ */ new Map());
   }
+  static create(factories) {
+    var _a;
+    const registry = new _ServiceRegistry(factories);
+    __privateMethod$2(_a = registry, _checkForCircularDeps, checkForCircularDeps_fn).call(_a);
+    return registry;
+  }
   getServiceRefs() {
     return Array.from(__privateGet$3(this, _providedFactories).values()).map((f) => f.service);
   }
@@ -1367,7 +1420,7 @@ class ServiceRegistry {
       return result;
     });
   }
-}
+};
 _providedFactories = new WeakMap();
 _loadedDefaultFactories = new WeakMap();
 _implementations = new WeakMap();
@@ -1420,6 +1473,25 @@ checkForMissingDeps_fn = function(factory, pluginId) {
     );
   }
 };
+_checkForCircularDeps = new WeakSet();
+checkForCircularDeps_fn = function() {
+  const graph = DependencyGraph.fromIterable(
+    Array.from(__privateGet$3(this, _providedFactories)).map(
+      ([serviceId, serviceFactory]) => ({
+        value: serviceId,
+        provides: [serviceId],
+        consumes: Object.values(serviceFactory.deps).map((d) => d.id)
+      })
+    )
+  );
+  const circularDependencies = Array.from(graph.detectCircularDependencies());
+  if (circularDependencies.length) {
+    const cycles = circularDependencies.map((c) => c.map((id) => `'${id}'`).join(" -> ")).join("\n  ");
+    throw new errors.ConflictError(`Circular dependencies detected:
+  ${cycles}`);
+  }
+};
+let ServiceRegistry = _ServiceRegistry;
 
 var __accessCheck$2 = (obj, member, msg) => {
   if (!member.has(obj))
@@ -1511,7 +1583,7 @@ getInitDeps_fn = async function(deps, pluginId) {
   const result = /* @__PURE__ */ new Map();
   const missingRefs = /* @__PURE__ */ new Set();
   for (const [name, ref] of Object.entries(deps)) {
-    const ep = __privateGet$2(this, _extensionPoints).get(ref);
+    const ep = __privateGet$2(this, _extensionPoints).get(ref.id);
     if (ep) {
       if (ep.pluginId !== pluginId) {
         throw new Error(
@@ -1575,7 +1647,7 @@ addFeature_fn = function(feature) {
 };
 _doStart = new WeakSet();
 doStart_fn = async function() {
-  __privateSet$2(this, _serviceHolder, new ServiceRegistry([
+  __privateSet$2(this, _serviceHolder, ServiceRegistry.create([
     ...__privateGet$2(this, _defaultApiFactories),
     ...__privateGet$2(this, _providedServiceFactories)
   ]));
@@ -1601,12 +1673,12 @@ doStart_fn = async function() {
       const provides = /* @__PURE__ */ new Set();
       if (r.type === "plugin" || r.type === "module") {
         for (const [extRef, extImpl] of r.extensionPoints) {
-          if (__privateGet$2(this, _extensionPoints).has(extRef)) {
+          if (__privateGet$2(this, _extensionPoints).has(extRef.id)) {
             throw new Error(
               `ExtensionPoint with ID '${extRef.id}' is already registered`
             );
           }
-          __privateGet$2(this, _extensionPoints).set(extRef, {
+          __privateGet$2(this, _extensionPoints).set(extRef.id, {
             impl: extImpl,
             pluginId: r.pluginId
           });