@highstate/backend-api 0.28.0 → 0.29.0

package/dist/highstate.manifest.json

@@ -1,5 +1,5 @@
 {
   "sourceHashes": {
-    "./dist/index.js": 4288203316
+    "./dist/index.js": 85375231
   }
 }

package/dist/index.js

@@ -235,7 +235,6 @@ function toInstance(instance) {
     ])),
     injectionInputs: (instance.injectionInputs ?? []).map((value) => ({ hubId: value.hubId })),
     position: instance.position ?? undefined,
-    resolvedInputs: toInstanceReferenceMap(instance.resolvedInputs),
     parentId: instance.parentId,
     outputs: toInstanceReferenceMap(instance.outputs),
     resolvedOutputs: toInstanceReferenceMap(instance.resolvedOutputs)
@@ -336,7 +335,6 @@ function toHubPatch(hub, paths) {
 }
 function toInstanceState(state) {
   const model = state.model ? instanceModelSchema.parse(state.model) : undefined;
-  const resolvedInputs = state.resolvedInputs ? fromUnknownInstanceReferenceMap(state.resolvedInputs) : undefined;
   return create2(InstanceStateSchema, {
     id: state.id,
     instanceId: state.instanceId,
@@ -357,7 +355,6 @@ function toInstanceState(state) {
       currentResourceCount: state.lastOperationState.currentResourceCount ?? undefined,
       totalResourceCount: state.lastOperationState.totalResourceCount ?? undefined,
       model: toInstance(instanceModelSchema.parse(state.lastOperationState.model)),
-      resolvedInputs: toInstanceReferenceMap(fromUnknownInstanceReferenceMap(state.lastOperationState.resolvedInputs)),
       startedAt: toNullableTimestamp(state.lastOperationState.startedAt),
       finishedAt: toNullableTimestamp(state.lastOperationState.finishedAt)
     } : undefined,
@@ -369,8 +366,7 @@ function toInstanceState(state) {
     currentResourceCount: state.currentResourceCount ?? undefined,
     hasResourceHooks: state.hasResourceHooks,
     statusFields: state.statusFields ? fromJson(ValueSchema, jsonValueSchema.parse(state.statusFields)) : undefined,
-    model: model ? toInstance(model) : undefined,
-    resolvedInputs: toInstanceReferenceMap(resolvedInputs)
+    model: model ? toInstance(model) : undefined
   });
 }
 function toInstanceCustomStatus(status) {
@@ -446,22 +442,28 @@ function toLibrary(library) {
   });
 }
 function toComponent(component) {
-  return create2(ComponentSchema, {
-    type: component.type,
-    kind: toComponentKind(component.kind),
-    arguments: Object.fromEntries(Object.entries(component.args).map(([name, argument]) => [
-      name,
-      {
-        schema: jsonObjectSchema.parse(argument.schema),
-        required: argument.required,
-        meta: argument.meta
-      }
-    ])),
-    inputs: Object.fromEntries(Object.entries(component.inputs).map(([name, port]) => [name, toComponentPort(port)])),
-    outputs: Object.fromEntries(Object.entries(component.outputs).map(([name, port]) => [name, toComponentPort(port)])),
-    meta: component.meta,
-    definitionHash: component.definitionHash
-  });
+  try {
+    return create2(ComponentSchema, {
+      type: component.type,
+      kind: toComponentKind(component.kind),
+      arguments: Object.fromEntries(Object.entries(component.args).map(([name, argument]) => [
+        name,
+        {
+          schema: jsonObjectSchema.parse(argument.schema),
+          required: argument.required,
+          meta: argument.meta
+        }
+      ])),
+      inputs: Object.fromEntries(Object.entries(component.inputs).map(([name, port]) => [name, toComponentPort(port)])),
+      outputs: Object.fromEntries(Object.entries(component.outputs).map(([name, port]) => [name, toComponentPort(port)])),
+      meta: component.meta,
+      definitionHash: component.definitionHash
+    });
+  } catch (error) {
+    throw new Error(`Failed to convert component "${component.type}" to an API message`, {
+      cause: error
+    });
+  }
 }
 function toEntity(entity) {
   return create2(EntitySchema, {
@@ -470,7 +472,6 @@ function toEntity(entity) {
     directExtensions: entity.directExtensions ?? [],
     inclusions: entity.inclusions ?? [],
     directInclusions: entity.directInclusions ?? [],
-    schema: jsonObjectSchema.parse(entity.schema),
     meta: entity.meta,
     definitionHash: entity.definitionHash
   });
@@ -504,9 +505,6 @@ function toInstanceReferenceMap(values) {
 function fromInstanceReferenceMap(values) {
   return Object.fromEntries(Object.entries(values).map(([key, list]) => [key, list.values.map(fromInstanceReference)]));
 }
-function fromUnknownInstanceReferenceMap(value) {
-  return instanceModelSchema.shape.inputs.unwrap().parse(value);
-}
 function fromInstanceReference(value) {
   return instanceInputSchema.parse({
     instanceId: value.instanceId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend-api",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "type": "module",
   "files": [
     "dist",

package/src/shared/conversion.ts

@@ -113,7 +113,6 @@ export function toInstance(instance: InstanceModel): Instance {
     ),
     injectionInputs: (instance.injectionInputs ?? []).map(value => ({ hubId: value.hubId })),
     position: instance.position ?? undefined,
-    resolvedInputs: toInstanceReferenceMap(instance.resolvedInputs),
     parentId: instance.parentId,
     outputs: toInstanceReferenceMap(instance.outputs),
     resolvedOutputs: toInstanceReferenceMap(instance.resolvedOutputs),
@@ -234,9 +233,6 @@ export function toHubPatch(hub: Hub, paths: readonly string[]): HubModelPatch {
 
 export function toInstanceState(state: BackendInstanceState): InstanceState {
   const model = state.model ? instanceModelSchema.parse(state.model) : undefined
-  const resolvedInputs = state.resolvedInputs
-    ? fromUnknownInstanceReferenceMap(state.resolvedInputs)
-    : undefined
 
   return create(InstanceStateSchema, {
     id: state.id,
@@ -263,9 +259,6 @@ export function toInstanceState(state: BackendInstanceState): InstanceState {
           currentResourceCount: state.lastOperationState.currentResourceCount ?? undefined,
           totalResourceCount: state.lastOperationState.totalResourceCount ?? undefined,
           model: toInstance(instanceModelSchema.parse(state.lastOperationState.model)),
-          resolvedInputs: toInstanceReferenceMap(
-            fromUnknownInstanceReferenceMap(state.lastOperationState.resolvedInputs),
-          ),
           startedAt: toNullableTimestamp(state.lastOperationState.startedAt),
           finishedAt: toNullableTimestamp(state.lastOperationState.finishedAt),
         }
@@ -281,7 +274,6 @@ export function toInstanceState(state: BackendInstanceState): InstanceState {
       ? fromJson(ValueSchema, jsonValueSchema.parse(state.statusFields))
       : undefined,
     model: model ? toInstance(model) : undefined,
-    resolvedInputs: toInstanceReferenceMap(resolvedInputs),
   })
 }
 
@@ -378,28 +370,34 @@ export function toLibrary(library: {
 }
 
 export function toComponent(component: ComponentModel): Component {
-  return create(ComponentSchema, {
-    type: component.type,
-    kind: toComponentKind(component.kind),
-    arguments: Object.fromEntries(
-      Object.entries(component.args).map(([name, argument]) => [
-        name,
-        {
-          schema: jsonObjectSchema.parse(argument.schema),
-          required: argument.required,
-          meta: argument.meta,
-        },
-      ]),
-    ),
-    inputs: Object.fromEntries(
-      Object.entries(component.inputs).map(([name, port]) => [name, toComponentPort(port)]),
-    ),
-    outputs: Object.fromEntries(
-      Object.entries(component.outputs).map(([name, port]) => [name, toComponentPort(port)]),
-    ),
-    meta: component.meta,
-    definitionHash: component.definitionHash,
-  })
+  try {
+    return create(ComponentSchema, {
+      type: component.type,
+      kind: toComponentKind(component.kind),
+      arguments: Object.fromEntries(
+        Object.entries(component.args).map(([name, argument]) => [
+          name,
+          {
+            schema: jsonObjectSchema.parse(argument.schema),
+            required: argument.required,
+            meta: argument.meta,
+          },
+        ]),
+      ),
+      inputs: Object.fromEntries(
+        Object.entries(component.inputs).map(([name, port]) => [name, toComponentPort(port)]),
+      ),
+      outputs: Object.fromEntries(
+        Object.entries(component.outputs).map(([name, port]) => [name, toComponentPort(port)]),
+      ),
+      meta: component.meta,
+      definitionHash: component.definitionHash,
+    })
+  } catch (error) {
+    throw new Error(`Failed to convert component "${component.type}" to an API message`, {
+      cause: error,
+    })
+  }
 }
 
 export function toEntity(entity: EntityModel): Entity {
@@ -409,7 +407,6 @@ export function toEntity(entity: EntityModel): Entity {
     directExtensions: entity.directExtensions ?? [],
     inclusions: entity.inclusions ?? [],
     directInclusions: entity.directInclusions ?? [],
-    schema: jsonObjectSchema.parse(entity.schema),
     meta: entity.meta,
     definitionHash: entity.definitionHash,
   })
@@ -456,10 +453,6 @@ function fromInstanceReferenceMap(
   )
 }
 
-function fromUnknownInstanceReferenceMap(value: unknown): NonNullable<InstanceModel["inputs"]> {
-  return instanceModelSchema.shape.inputs.unwrap().parse(value)
-}
-
 function fromInstanceReference(value: Instance["inputs"][string]["values"][number]) {
   return instanceInputSchema.parse({
     instanceId: value.instanceId,

package/src/shared/error-handling.test.ts

@@ -3,6 +3,7 @@ import { BadRequestSchema, ErrorInfoSchema } from "@highstate/api/v1"
 import {
   BackendError,
   BackendErrorCategory,
+  InvalidOperationPlanError,
   InvalidPageSizeError,
   PermissionDeniedError,
 } from "@highstate/backend/shared"
@@ -35,6 +36,28 @@ describe("createErrorHandlingInterceptor", () => {
     }
   })
 
+  it("exposes operation planning validation errors", async () => {
+    const logger = { error: vi.fn() }
+    const interceptor = createErrorHandlingInterceptor({ logger } as never)
+    const handler = interceptor(async () => {
+      throw new InvalidOperationPlanError(
+        "Operation options are invalid: ghost options are supported only for updates",
+      )
+    })
+
+    const result = (await handler({
+      method: { name: "PlanOperation" },
+      header: new Headers(),
+    } as never).catch(error => error as ConnectError)) as ConnectError
+
+    expect(result.code).toBe(Code.InvalidArgument)
+    expect(result.rawMessage).toBe(
+      "Operation options are invalid: ghost options are supported only for updates",
+    )
+    expect(result.findDetails(ErrorInfoSchema)[0]?.reason).toBe("OPERATION_PLAN_INVALID")
+    expect(logger.error).not.toHaveBeenCalled()
+  })
+
   it("sanitizes and logs unexpected errors once", async () => {
     const logger = { error: vi.fn() }
     const interceptor = createErrorHandlingInterceptor({ logger } as never)