@norskvideo/ctl-dev-kit 0.2.96 → 0.2.98

package/build/Dockerfile.bundle

@@ -47,6 +47,7 @@ COPY backend/dist ./backend/dist
 COPY native/ ./backend/dist/
 COPY frontend/dist ./frontend/dist
 COPY dashboards /usr/src/dashboards
+COPY fleet-dashboards /usr/src/fleet-dashboards
 COPY components/lib /usr/src/components/lib
 # Optional product-template assets (funke's slate/black PNGs). Empty otherwise.
 COPY assets /usr/src/assets

package/build/build-bundle-image.sh

@@ -20,6 +20,8 @@
 # having the directory/script — no per-product flag to keep in sync:
 #   frontend/dist              the frontend workspace's build output
 #   dashboards/                the dashboard workspace's build output
+#   fleet-dashboards/          fleet dashboard bundles the product brings
+#                              (its manifest's defaultDashboards)
 #   components/lib             the components workspace's build output
 #   native/                    native addon(s) (probe's signer) -> beside bundle
 #   assets/                    product-template assets (funke's PNGs)
@@ -52,7 +54,7 @@ trap 'rm -rf "${stage}"' EXIT
 
 echo "==> staging artifacts"
 mkdir -p "${stage}/backend" "${stage}/frontend/dist" "${stage}/components/lib" \
-  "${stage}/dashboards" "${stage}/native" "${stage}/assets" "${stage}/docs"
+  "${stage}/dashboards" "${stage}/fleet-dashboards" "${stage}/native" "${stage}/assets" "${stage}/docs"
 # The backend bundle is the one non-negotiable payload — every bundle product has
 # one, so a missing dist is a broken build, not an absent workspace.
 cp -R "${PRODUCT_DIR}/backend/dist" "${stage}/backend/dist"
@@ -60,7 +62,7 @@ cp -R "${PRODUCT_DIR}/backend/dist" "${stage}/backend/dist"
 # Frontend / dashboards / components are produced by the workspaces of the same
 # name, so a product that has no such workspace never produces them (reuters:
 # backend-only). Staged empty in that case, exactly as native/ and assets/ below
-# — Dockerfile.bundle COPYs all six unconditionally, so the path must exist even
+# — Dockerfile.bundle COPYs every one unconditionally, so the path must exist even
 # when there is nothing to put in it.
 if [ -d "${PRODUCT_DIR}/frontend/dist" ]; then
   cp -R "${PRODUCT_DIR}/frontend/dist/." "${stage}/frontend/dist/"
@@ -68,6 +70,12 @@ fi
 if [ -d "${PRODUCT_DIR}/dashboards" ]; then
   cp -R "${PRODUCT_DIR}/dashboards/." "${stage}/dashboards/"
 fi
+# Fleet dashboards (norsk-ctl task 123): served by the control plane as the
+# bundles its manifest's defaultDashboards name. Not under dashboards/, whose
+# every directory is packed into each product template for Studio to serve.
+if [ -d "${PRODUCT_DIR}/fleet-dashboards" ]; then
+  cp -R "${PRODUCT_DIR}/fleet-dashboards/." "${stage}/fleet-dashboards/"
+fi
 if [ -d "${PRODUCT_DIR}/components/lib" ]; then
   cp -R "${PRODUCT_DIR}/components/lib/." "${stage}/components/lib/"
 fi

package/dashboard/uses.ts

@@ -1,16 +1,21 @@
 // What a fleet dashboard uses, derived from its own code when it is built
-// (RFC 0006 registration-names-what-it-uses, task 122 K): every kind its
-// `fleet.query` and `fleet.watch` calls name, read as literals. A call the
-// build cannot read, or any other use of the client, fails the build rather
-// than leave `dashboard.json` short of what the code reads.
+// (RFC 0006 registration-names-what-it-uses, task 122 K, task 123 K): every
+// kind its `fleet.query` and `fleet.watch` calls name, and every operationId
+// its `fleet.call` and `fleet.live` calls name, read as literals.
+// `fleet.state.get`/`put` use nothing a registration lists. A call the build
+// cannot read, or any other use of the client, fails the build rather than
+// leave `dashboard.json` short of what the code reaches.
 
 import ts from "typescript";
 
 export const FLEET_MODULE = "@norskvideo/ctl-sdk/fleet";
-const CALLS = new Set(["query", "watch"]);
+const KIND_CALLS = new Set(["query", "watch"]);
+const OPERATION_CALLS = new Set(["call", "live"]);
+const STATE_CALLS = new Set(["get", "put"]);
 
 export interface DashboardUses {
   kinds: string[];
+  operations: string[];
 }
 
 export type UsesResult = { status: "ok"; value: DashboardUses } | { status: "error"; error: string[] };
@@ -38,6 +43,7 @@ function kindsOfSelection(arg: ts.Expression | undefined): string[] | undefined
 
 export function dashboardUses(files: readonly { path: string; source: string }[]): UsesResult {
   const kinds = new Set<string>();
+  const operations = new Set<string>();
   const problems: string[] = [];
   for (const { path, source } of files) {
     const sf = ts.createSourceFile(path, source, ts.ScriptTarget.Latest, true);
@@ -82,17 +88,48 @@ export function dashboardUses(files: readonly { path: string; source: string }[]
         ts.isCallExpression(node) &&
         ts.isPropertyAccessExpression(node.expression) &&
         ts.isIdentifier(node.expression.expression) &&
-        clients.has(node.expression.expression.text) &&
-        CALLS.has(node.expression.name.text)
+        clients.has(node.expression.expression.text)
       ) {
-        const found = kindsOfSelection(node.arguments[0]);
-        if (found === undefined) {
-          problems.push(
-            `${where(node)}: ${node.expression.getText()} must name its kind as a literal, or a list of literals, in the selection it is passed, so the dashboard's uses can be derived`,
-          );
-        } else {
-          for (const kind of found) kinds.add(kind);
+        const method = node.expression.name.text;
+        if (KIND_CALLS.has(method)) {
+          const found = kindsOfSelection(node.arguments[0]);
+          if (found === undefined) {
+            problems.push(
+              `${where(node)}: ${node.expression.getText()} must name its kind as a literal, or a list of literals, in the selection it is passed, so the dashboard's uses can be derived`,
+            );
+          } else {
+            for (const kind of found) kinds.add(kind);
+          }
+          for (const arg of node.arguments) visit(arg);
+          return;
         }
+        if (OPERATION_CALLS.has(method)) {
+          const operation = node.arguments[1];
+          if (
+            operation !== undefined &&
+            (ts.isStringLiteral(operation) || ts.isNoSubstitutionTemplateLiteral(operation))
+          ) {
+            operations.add(operation.text);
+          } else {
+            problems.push(
+              `${where(node)}: ${node.expression.getText()} must name its operationId as a literal, so the dashboard's uses can be derived`,
+            );
+          }
+          for (const arg of node.arguments) visit(arg);
+          return;
+        }
+      }
+      // fleet.state.get(...) / .put(...): the host's shared state, which a
+      // registration does not list.
+      if (
+        ts.isCallExpression(node) &&
+        ts.isPropertyAccessExpression(node.expression) &&
+        STATE_CALLS.has(node.expression.name.text) &&
+        ts.isPropertyAccessExpression(node.expression.expression) &&
+        node.expression.expression.name.text === "state" &&
+        ts.isIdentifier(node.expression.expression.expression) &&
+        clients.has(node.expression.expression.expression.text)
+      ) {
         for (const arg of node.arguments) visit(arg);
         return;
       }
@@ -101,7 +138,7 @@ export function dashboardUses(files: readonly { path: string; source: string }[]
         const declaring = ts.isImportSpecifier(parent) || (ts.isVariableDeclaration(parent) && parent.name === node);
         if (!declaring) {
           problems.push(
-            `${where(node)}: ${node.text} is used other than by calling its query or watch, so the build cannot see what it reads`,
+            `${where(node)}: ${node.text} is used other than by calling its query, watch, call, live or state.get/put, so the build cannot see what it reaches`,
           );
         }
       }
@@ -111,5 +148,5 @@ export function dashboardUses(files: readonly { path: string; source: string }[]
   }
   return problems.length > 0
     ? { status: "error", error: problems }
-    : { status: "ok", value: { kinds: [...kinds].sort() } };
+    : { status: "ok", value: { kinds: [...kinds].sort(), operations: [...operations].sort() } };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-dev-kit",
-  "version": "0.2.96",
+  "version": "0.2.98",
   "type": "module",
   "exports": {
     "./create-product": "./create-product/create-product.ts",