@backstage/frontend-app-api 0.3.0-next.0 → 0.3.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @backstage/frontend-app-api
 
+## 0.3.0-next.1
+
+### Patch Changes
+
+- fe6d09953d: Fix for app node output IDs not being serialized correctly.
+- 77f009b35d: Internal updates to match changes in the experimental `@backstage/frontend-plugin-api`.
+- 4d6fa921db: Internal refactor to rename the app graph to app tree
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-graphiql@0.3.0-next.1
+  - @backstage/core-components@0.13.8-next.1
+  - @backstage/config@1.1.1
+  - @backstage/core-app-api@1.11.1-next.0
+  - @backstage/core-plugin-api@1.8.0-next.0
+  - @backstage/theme@0.4.4-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.7-next.0
+
 ## 0.3.0-next.0
 
 ### Minor Changes

package/dist/index.esm.js

@@ -60,10 +60,10 @@ const Core = createExtension({
   output: {
     root: coreExtensionData.reactElement
   },
-  factory({ bind, inputs }) {
-    bind({
+  factory({ inputs }) {
+    return {
       root: inputs.root.element
-    });
+    };
   }
 });
 
@@ -80,7 +80,7 @@ const CoreRoutes = createExtension({
   output: {
     element: coreExtensionData.reactElement
   },
-  factory({ bind, inputs }) {
+  factory({ inputs }) {
     const Routes = () => {
       const element = useRoutes(
         inputs.routes.map((route) => ({
@@ -90,9 +90,9 @@ const CoreRoutes = createExtension({
       );
       return element;
     };
-    bind({
+    return {
       element: /* @__PURE__ */ React.createElement(Routes, null)
-    });
+    };
   }
 });
 
@@ -116,10 +116,10 @@ const CoreLayout = createExtension({
   output: {
     element: coreExtensionData.reactElement
   },
-  factory({ bind, inputs }) {
-    bind({
+  factory({ inputs }) {
+    return {
       element: /* @__PURE__ */ React.createElement(SidebarPage, null, inputs.nav.element, inputs.content.element)
-    });
+    };
   }
 });
 
@@ -214,10 +214,10 @@ const CoreNav = createExtension({
   output: {
     element: coreExtensionData.reactElement
   },
-  factory({ bind, inputs }) {
-    bind({
+  factory({ inputs }) {
+    return {
       element: /* @__PURE__ */ React.createElement(Sidebar, null, /* @__PURE__ */ React.createElement(SidebarLogo, null), /* @__PURE__ */ React.createElement(SidebarDivider, null), inputs.items.map((item, index) => /* @__PURE__ */ React.createElement(SidebarNavItem, { ...item.target, key: index })))
-    });
+    };
   }
 });
 
@@ -1827,7 +1827,7 @@ class SerializableAppNode {
   }
   toString() {
     const dataRefs = this.instance && [...this.instance.getDataRefs()];
-    const out = dataRefs && dataRefs.length > 0 ? ` out=[${[...dataRefs.keys()].join(", ")}]` : "";
+    const out = dataRefs && dataRefs.length > 0 ? ` out=[${[...dataRefs].map((r) => r.id).join(", ")}]` : "";
     if (this.edges.attachments.size === 0) {
       return `<${this.spec.id}${out} />`;
     }
@@ -1840,7 +1840,7 @@ class SerializableAppNode {
     ].join("\n");
   }
 }
-function resolveAppGraph(rootNodeId, specs) {
+function resolveAppTree(rootNodeId, specs) {
   const nodes = /* @__PURE__ */ new Map();
   let rootNode = void 0;
   const orphansByParent = /* @__PURE__ */ new Map();
@@ -1874,7 +1874,7 @@ function resolveAppGraph(rootNodeId, specs) {
     }
   }
   if (!rootNode) {
-    throw new Error(`No root node with id '${rootNodeId}' found in app graph`);
+    throw new Error(`No root node with id '${rootNodeId}' found in app tree`);
   }
   return {
     root: rootNode,
@@ -2035,7 +2035,7 @@ function resolveAppNodeSpecs(options) {
       throw new Error(`Extension ${extensionId} does not exist`);
     }
   }
-  return configuredExtensions.filter((override) => !override.params.disabled).map((param) => ({
+  return configuredExtensions.map((param) => ({
     id: param.extension.id,
     attachTo: param.params.attachTo,
     extension: param.extension,
@@ -2106,26 +2106,24 @@ function createAppNodeInstance(options) {
     );
   }
   try {
-    extension.factory({
+    const namedOutputs = extension.factory({
       source,
       config: parsedConfig,
-      bind: (namedOutputs) => {
-        for (const [name, output] of Object.entries(namedOutputs)) {
-          const ref = extension.output[name];
-          if (!ref) {
-            throw new Error(`unknown output provided via '${name}'`);
-          }
-          if (extensionData.has(ref.id)) {
-            throw new Error(
-              `duplicate extension data '${ref.id}' received via output '${name}'`
-            );
-          }
-          extensionData.set(ref.id, output);
-          extensionDataRefs.add(ref);
-        }
-      },
       inputs: resolveInputs(extension.inputs, attachments)
     });
+    for (const [name, output] of Object.entries(namedOutputs)) {
+      const ref = extension.output[name];
+      if (!ref) {
+        throw new Error(`unknown output provided via '${name}'`);
+      }
+      if (extensionData.has(ref.id)) {
+        throw new Error(
+          `duplicate extension data '${ref.id}' received via output '${name}'`
+        );
+      }
+      extensionData.set(ref.id, output);
+      extensionDataRefs.add(ref);
+    }
   } catch (e) {
     throw new Error(
       `Failed to instantiate extension '${id}'${e.name === "Error" ? `, ${e.message}` : `; caused by ${e}`}`
@@ -2168,8 +2166,8 @@ function instantiateAppNodeTree(rootNode) {
   createInstance(rootNode);
 }
 
-function createAppGraph(options) {
-  const appGraph = resolveAppGraph(
+function createAppTree(options) {
+  const tree = resolveAppTree(
     "core",
     resolveAppNodeSpecs({
       features: options.features,
@@ -2178,8 +2176,8 @@ function createAppGraph(options) {
       forbidden: /* @__PURE__ */ new Set(["core"])
     })
   );
-  instantiateAppNodeTree(appGraph.root);
-  return appGraph;
+  instantiateAppNodeTree(tree.root);
+  return tree;
 }
 
 const builtinExtensions = [
@@ -2192,7 +2190,7 @@ const builtinExtensions = [
 ];
 function createExtensionTree(options) {
   const features = getAvailableFeatures(options.config);
-  const graph = createAppGraph({
+  const tree = createAppTree({
     features,
     builtinExtensions,
     config: options.config
@@ -2208,11 +2206,11 @@ function createExtensionTree(options) {
   }
   return {
     getExtension(id) {
-      return convertNode(graph.nodes.get(id));
+      return convertNode(tree.nodes.get(id));
     },
     getExtensionAttachments(id, inputName) {
       var _a, _b, _c;
-      return (_c = (_b = (_a = graph.nodes.get(id)) == null ? void 0 : _a.edges.attachments.get(inputName)) == null ? void 0 : _b.map(convertNode).filter((node) => Boolean(node))) != null ? _c : [];
+      return (_c = (_b = (_a = tree.nodes.get(id)) == null ? void 0 : _a.edges.attachments.get(inputName)) == null ? void 0 : _b.map(convertNode).filter((node) => Boolean(node))) != null ? _c : [];
     },
     getRootRoutes() {
       return this.getExtensionAttachments("core.routes", "routes").map((node) => {
@@ -2279,7 +2277,7 @@ function createApp(options) {
       ...loadedFeatures,
       ...(_e = options.features) != null ? _e : []
     ]);
-    const appGraph = createAppGraph({
+    const tree = createAppTree({
       features: allFeatures,
       builtinExtensions,
       config
@@ -2290,19 +2288,17 @@ function createApp(options) {
       )
     );
     const routeIds = collectRouteIds(allFeatures);
-    const App = () => /* @__PURE__ */ React.createElement(ApiProvider, { apis: createApiHolder(appGraph.root, config) }, /* @__PURE__ */ React.createElement(AppContextProvider, { appContext }, /* @__PURE__ */ React.createElement(AppThemeProvider, null, /* @__PURE__ */ React.createElement(
+    const App = () => /* @__PURE__ */ React.createElement(ApiProvider, { apis: createApiHolder(tree.root, config) }, /* @__PURE__ */ React.createElement(AppContextProvider, { appContext }, /* @__PURE__ */ React.createElement(AppThemeProvider, null, /* @__PURE__ */ React.createElement(
       RoutingProvider,
       {
-        ...extractRouteInfoFromAppNode(appGraph.root),
+        ...extractRouteInfoFromAppNode(tree.root),
         routeBindings: resolveRouteBindings(
           options.bindRoutes,
           config,
           routeIds
         )
       },
-      /* @__PURE__ */ React.createElement(BrowserRouter, null, appGraph.root.instance.getData(
-        coreExtensionData.reactElement
-      ))
+      /* @__PURE__ */ React.createElement(BrowserRouter, null, tree.root.instance.getData(coreExtensionData.reactElement))
     ))));
     return { default: App };
   }