@pikku/inspector 0.12.42 → 0.12.44

package/src/utils/serialize-inspector-state.ts

@@ -112,14 +112,6 @@ export interface SerializableInspectorState {
           : never,
       ]
     >
-    routePermissions: Array<
-      [
-        string,
-        InspectorState['http']['routePermissions'] extends Map<string, infer V>
-          ? V
-          : never,
-      ]
-    >
   }
   channels: {
     files: string[]
@@ -154,6 +146,8 @@ export interface SerializableInspectorState {
     internalFiles: Array<[string, { path: string; exportedName: string }]>
     exposedMeta: InspectorState['rpc']['exposedMeta']
     exposedFiles: Array<[string, { path: string; exportedName: string }]>
+    remoteMeta: InspectorState['rpc']['remoteMeta']
+    remoteFiles: Array<[string, { path: string; exportedName: string }]>
     invokedFunctions: string[]
     invokedFunctionsByFile?: Array<[string, string[]]>
     usedAddons: string[]
@@ -163,6 +157,10 @@ export interface SerializableInspectorState {
         {
           package: string
           rpcEndpoint?: string
+          remote?: boolean
+          hasAuth?: boolean
+          authCredentialId?: string
+          authSecretId?: string
           secretOverrides?: Record<string, string>
           variableOverrides?: Record<string, string>
           credentialOverrides?: Record<string, string>
@@ -203,6 +201,10 @@ export interface SerializableInspectorState {
     definitions: InspectorState['credentials']['definitions']
     files: string[]
   }
+  scopes: {
+    definitions: InspectorState['scopes']['definitions']
+    files: string[]
+  }
   variables: {
     definitions: InspectorState['variables']['definitions']
     files: string[]
@@ -244,17 +246,6 @@ export interface SerializableInspectorState {
   permissions: {
     definitions: InspectorState['permissions']['definitions']
     instances: InspectorState['permissions']['instances']
-    tagPermissions: Array<
-      [
-        string,
-        InspectorState['permissions']['tagPermissions'] extends Map<
-          string,
-          infer V
-        >
-          ? V
-          : never,
-      ]
-    >
   }
   serviceAggregation: {
     requiredServices: string[]
@@ -344,7 +335,6 @@ export function serializeInspectorState(
       meta: state.http.meta,
       files: Array.from(state.http.files),
       routeMiddleware: Array.from(state.http.routeMiddleware.entries()),
-      routePermissions: Array.from(state.http.routePermissions.entries()),
     },
     channels: {
       files: Array.from(state.channels.files),
@@ -379,6 +369,8 @@ export function serializeInspectorState(
       internalFiles: Array.from(state.rpc.internalFiles.entries()),
       exposedMeta: state.rpc.exposedMeta,
       exposedFiles: Array.from(state.rpc.exposedFiles.entries()),
+      remoteMeta: state.rpc.remoteMeta,
+      remoteFiles: Array.from(state.rpc.remoteFiles.entries()),
       invokedFunctions: Array.from(state.rpc.invokedFunctions),
       invokedFunctionsByFile: Array.from(
         (
@@ -423,6 +415,10 @@ export function serializeInspectorState(
       definitions: state.credentials.definitions,
       files: Array.from(state.credentials.files),
     },
+    scopes: {
+      definitions: state.scopes.definitions,
+      files: Array.from(state.scopes.files),
+    },
     variables: {
       definitions: state.variables.definitions,
       files: Array.from(state.variables.files),
@@ -446,7 +442,6 @@ export function serializeInspectorState(
     permissions: {
       definitions: state.permissions.definitions,
       instances: state.permissions.instances,
-      tagPermissions: Array.from(state.permissions.tagPermissions.entries()),
     },
     serviceAggregation: {
       requiredServices: Array.from(state.serviceAggregation.requiredServices),
@@ -536,7 +531,6 @@ export function deserializeInspectorState(
       meta: data.http.meta,
       files: new Set(data.http.files),
       routeMiddleware: new Map(data.http.routeMiddleware),
-      routePermissions: new Map(data.http.routePermissions),
     },
     channels: {
       files: new Set(data.channels.files),
@@ -571,6 +565,8 @@ export function deserializeInspectorState(
       internalFiles: new Map(data.rpc.internalFiles),
       exposedMeta: data.rpc.exposedMeta,
       exposedFiles: new Map(data.rpc.exposedFiles),
+      remoteMeta: data.rpc.remoteMeta ?? {},
+      remoteFiles: new Map(data.rpc.remoteFiles ?? []),
       invokedFunctions: new Set(data.rpc.invokedFunctions),
       invokedFunctionsByFile: new Map(
         (data.rpc.invokedFunctionsByFile || []).map(
@@ -613,6 +609,10 @@ export function deserializeInspectorState(
       definitions: data.credentials?.definitions || [],
       files: new Set(data.credentials?.files || []),
     },
+    scopes: {
+      definitions: data.scopes?.definitions || [],
+      files: new Set(data.scopes?.files || []),
+    },
     variables: {
       definitions: data.variables?.definitions || [],
       files: new Set(data.variables?.files || []),
@@ -634,7 +634,6 @@ export function deserializeInspectorState(
     permissions: {
       definitions: data.permissions.definitions,
       instances: data.permissions.instances || {},
-      tagPermissions: new Map(data.permissions.tagPermissions),
     },
     serviceAggregation: {
       requiredServices: new Set(data.serviceAggregation.requiredServices),
@@ -654,8 +653,6 @@ export function deserializeInspectorState(
     },
     permissionsGroupsMeta: data.permissionsGroupsMeta || {
       definitions: {},
-      httpGroups: {},
-      tagGroups: {},
     },
     requiredSchemas: new Set(data.requiredSchemas || []),
     openAPISpec: data.openAPISpec || null,

package/src/utils/serialize-permissions-groups-meta.ts

@@ -1,35 +1,7 @@
 import type { InspectorState } from '../types.js'
 
 export const serializePermissionsGroupsMeta = (state: InspectorState) => {
-  const httpGroups: Record<string, any> = {}
-  for (const [pattern, meta] of state.http.routePermissions.entries()) {
-    httpGroups[pattern] = {
-      exportName: meta.exportName,
-      sourceFile: meta.sourceFile,
-      position: meta.position,
-      services: meta.services,
-      count: meta.count,
-      instanceIds: meta.instanceIds,
-      isFactory: meta.isFactory,
-    }
-  }
-
-  const tagGroups: Record<string, any> = {}
-  for (const [tag, meta] of state.permissions.tagPermissions.entries()) {
-    tagGroups[tag] = {
-      exportName: meta.exportName,
-      sourceFile: meta.sourceFile,
-      position: meta.position,
-      services: meta.services,
-      count: meta.count,
-      instanceIds: meta.instanceIds,
-      isFactory: meta.isFactory,
-    }
-  }
-
   return {
     definitions: state.permissions.definitions,
-    httpGroups,
-    tagGroups,
   }
 }

package/src/utils/workflow/derive-workflow-plan.test.ts

@@ -84,7 +84,11 @@ describe('deriveWorkflowPlan', () => {
       } as WorkflowStepMeta,
     ])
     assert.equal(plan.deterministic, false)
-    assert.equal(plan.plannedSteps, undefined, 'loop count is runtime-dependent')
+    assert.equal(
+      plan.plannedSteps,
+      undefined,
+      'loop count is runtime-dependent'
+    )
   })
 
   test('a fanout nested inside a branch still suppresses the plan', () => {
@@ -133,8 +137,42 @@ describe('deriveWorkflowPlan', () => {
       { stepName: 'build' },
       { stepName: '__workflow_suspend:building', displayName: 'Building' },
       { stepName: 'publish' },
-      { stepName: '__workflow_suspend:awaiting_approval', displayName: 'Awaiting approval' },
-      { stepName: '__workflow_suspend:building-image', displayName: 'Building image' },
+      {
+        stepName: '__workflow_suspend:awaiting_approval',
+        displayName: 'Awaiting approval',
+      },
+      {
+        stepName: '__workflow_suspend:building-image',
+        displayName: 'Building image',
+      },
+    ])
+  })
+
+  test('approval steps appear in the plan with __workflow_approval: key and sentence-case displayName', () => {
+    const plan = deriveWorkflowPlan([
+      rpc('build'),
+      { type: 'approval', reason: 'awaiting_approval' } as WorkflowStepMeta,
+      rpc('publish'),
+    ])
+    assert.equal(plan.deterministic, true)
+    assert.deepEqual(plan.plannedSteps, [
+      { stepName: 'build' },
+      {
+        stepName: '__workflow_approval:awaiting_approval',
+        displayName: 'Awaiting approval',
+      },
+      { stepName: 'publish' },
+    ])
+  })
+
+  test('an approval is namespaced apart from a suspend sharing its reason', () => {
+    const plan = deriveWorkflowPlan([
+      { type: 'suspend', reason: 'sign_off' } as WorkflowStepMeta,
+      { type: 'approval', reason: 'sign_off' } as WorkflowStepMeta,
     ])
+    assert.deepEqual(
+      plan.plannedSteps.map((s) => s.stepName),
+      ['__workflow_suspend:sign_off', '__workflow_approval:sign_off']
+    )
   })
 })

package/src/utils/workflow/derive-workflow-plan.ts

@@ -63,9 +63,7 @@ function containsConditional(steps: WorkflowStepMeta[]): boolean {
  * e.g. "awaiting_approval" → "Awaiting approval", "building-image" → "Building image"
  */
 function reasonToLabel(reason: string): string {
-  return reason
-    .replace(/[-_]/g, ' ')
-    .replace(/^(.)/, (c) => c.toUpperCase())
+  return reason.replace(/[-_]/g, ' ').replace(/^(.)/, (c) => c.toUpperCase())
 }
 
 /** Flatten named steps (rpc/inline/sleep/parallel children) in source order. */
@@ -88,13 +86,22 @@ function collectNamedSteps(steps: WorkflowStepMeta[]): WorkflowPlannedStep[] {
           displayName: reasonToLabel(step.reason),
         })
         break
+      case 'approval':
+        // Same as suspend, but namespaced `__workflow_approval:` to match the
+        // runtime's separate step key.
+        planned.push({
+          stepName: `__workflow_approval:${step.reason}`,
+          displayName: reasonToLabel(step.reason),
+        })
+        break
       case 'parallel':
         for (const child of step.children) {
           planned.push({ stepName: child.stepName })
         }
         break
       case 'branch':
-        for (const b of step.branches) planned.push(...collectNamedSteps(b.steps))
+        for (const b of step.branches)
+          planned.push(...collectNamedSteps(b.steps))
         if (step.elseSteps) planned.push(...collectNamedSteps(step.elseSteps))
         break
       case 'switch':