@ankhorage/contracts 25.1.0 → 26.0.0

package/src/appManifest/bindings.ts

@@ -14,29 +14,14 @@ export function isComponentDataBindingRegistry(value: unknown): boolean {
   );
 }
 
-/*** Validate literal, operation and path-based binding sources. */
-export function isBindingValueSource(value: unknown): boolean {
-  return (
-    isRecord(value) &&
-    typeof value.kind === 'string' &&
-    ['context', 'event', 'literal', 'operation', 'state'].includes(value.kind) &&
-    (value.kind === 'literal'
-      ? isManifestValue(value.value)
-      : value.kind === 'operation'
-        ? isBindingOperationRef(value.operation) && isOptionalString(value.path)
-        : typeof value.path === 'string')
-  );
+/*** Validate a readable capability reference or a recursive binding expression. */
+export function isBindingExpression(value: unknown): boolean {
+  return isBindingCapabilityReference(value) || isBindingExpressionNode(value);
 }
 
-/*** Validate a screen operation loader and its optional input mapping. */
+/*** Validate a screen loader as one portable capability invocation. */
 export function isScreenDataLoaderDefinition(value: unknown): boolean {
-  return (
-    isRecord(value) &&
-    value.kind === 'operation' &&
-    isOptionalString(value.id) &&
-    isBindingOperationRef(value.operation) &&
-    (value.input === undefined || isBindingInputMap(value.input))
-  );
+  return isBindingInvocation(value);
 }
 
 /*** Validate component identity and its property and event bindings. */
@@ -55,104 +40,93 @@ function isComponentDataBinding(value: unknown): boolean {
   );
 }
 
-/*** Validate a property binding with optional transforms and fallback behavior. */
+/*** Validate a property expression and its lifecycle-specific render behavior. */
 function isPropBinding(value: unknown): boolean {
   return (
     isRecord(value) &&
-    isBindingValueSource(value.source) &&
-    (value.fallback === undefined || isBindingFallback(value.fallback)) &&
+    isBindingExpression(value.value) &&
     (value.loading === undefined || isBindingLifecycleBehavior(value.loading)) &&
     (value.error === undefined || isBindingLifecycleBehavior(value.error)) &&
-    (value.empty === undefined || isBindingLifecycleBehavior(value.empty)) &&
-    isOptionalBindingTransforms(value.transforms)
+    (value.empty === undefined || isBindingLifecycleBehavior(value.empty))
   );
 }
 
-/*** Validate an event binding and its declared target. */
+/*** Validate an event binding and its one canonical invocation target. */
 function isEventBinding(value: unknown): boolean {
   return (
     isRecord(value) &&
-    isEventBindingTarget(value.target) &&
-    (value.input === undefined || isBindingInputMap(value.input)) &&
+    isBindingInvocation(value.target) &&
     (value.when === undefined || isBindingCondition(value.when))
   );
 }
 
-/*** Validate the selected operation or action event target. */
-function isEventBindingTarget(value: unknown): boolean {
+/*** Validate a serializable capability invocation and optional result slot. */
+function isBindingInvocation(value: unknown): boolean {
   return (
-    isRecord(value) &&
-    ((value.kind === 'action' && typeof value.type === 'string') ||
-      (value.kind === 'operation' && isBindingOperationRef(value.operation)))
+    isBindingCapabilityReference(value) &&
+    (value.input === undefined || isBindingInputMap(value.input))
   );
 }
 
-/*** Validate a binding condition and its source value. */
-function isBindingCondition(value: unknown): boolean {
+/*** Validate a capability identity with optional output path or cached-result slot. */
+function isBindingCapabilityReference(value: unknown): value is Record<string, unknown> {
   return (
     isRecord(value) &&
-    isBindingValueSource(value.source) &&
-    ['eq', 'exists', 'neq', 'notExists'].includes(String(value.operator)) &&
-    (value.value === undefined || isManifestValue(value.value))
+    typeof value.capability === 'string' &&
+    value.capability.includes('.') &&
+    isOptionalString(value.path) &&
+    isOptionalString(value.result)
   );
 }
 
-/*** Validate API and operation identities with an optional endpoint reference. */
-function isBindingOperationRef(value: unknown): boolean {
+/*** Validate array, fallback, literal, object and transform expression forms. */
+function isBindingExpressionNode(value: unknown): boolean {
   return (
     isRecord(value) &&
-    typeof value.apiId === 'string' &&
-    typeof value.operationId === 'string' &&
-    isOptionalString(value.endpointId)
+    ((value.kind === 'array' &&
+      Array.isArray(value.items) &&
+      value.items.every(isBindingExpression)) ||
+      (value.kind === 'fallback' &&
+        isBindingExpression(value.value) &&
+        isBindingExpression(value.fallback)) ||
+      (value.kind === 'literal' && isManifestValue(value.value)) ||
+      (value.kind === 'object' && isBindingInputMap(value.fields)) ||
+      (value.kind === 'transform' &&
+        isBindingExpression(value.value) &&
+        isBindingTransforms(value.transforms)))
   );
 }
 
-/*** Validate authored binding fallback values. */
-function isBindingFallback(value: unknown): boolean {
+/*** Validate a condition expressed through the same recursive binding vocabulary. */
+function isBindingCondition(value: unknown): boolean {
   return (
     isRecord(value) &&
-    (value.value === undefined || isManifestValue(value.value)) &&
-    (value.source === undefined || isBindingValueSource(value.source))
+    isBindingExpression(value.source) &&
+    ['eq', 'exists', 'neq', 'notExists'].includes(String(value.operator)) &&
+    (value.value === undefined || isBindingExpression(value.value))
   );
 }
 
-/*** Validate loading, empty and error binding behavior. */
+/*** Validate a lifecycle state and its optional bound display expression. */
 function isBindingLifecycleBehavior(value: unknown): boolean {
   return (
     isRecord(value) &&
     typeof value.state === 'string' &&
     ['empty', 'error', 'loading'].includes(value.state) &&
-    (value.fallback === undefined || isBindingFallback(value.fallback)) &&
+    (value.value === undefined || isBindingExpression(value.value)) &&
     isOptionalString(value.message)
   );
 }
 
-/*** Validate optional ordered binding transformations. */
-function isOptionalBindingTransforms(value: unknown): boolean {
-  return (
-    value === undefined ||
-    (Array.isArray(value) &&
-      value.every((transform) => ['lowercase', 'trim', 'uppercase'].includes(String(transform))))
-  );
-}
-
-/*** Validate every value in an operation input mapping. */
+/*** Validate every recursively authored invocation input expression. */
 function isBindingInputMap(value: unknown): boolean {
-  return isRecord(value) && Object.values(value).every(isBindingInputValue);
+  return isRecord(value) && Object.values(value).every(isBindingExpression);
 }
 
-/*** Validate recursive array, object, literal and source operation inputs. */
-function isBindingInputValue(value: unknown): boolean {
+/*** Validate ordered expression transforms. */
+function isBindingTransforms(value: unknown): boolean {
   return (
-    isRecord(value) &&
-    typeof value.kind === 'string' &&
-    ((value.kind === 'array' &&
-      Array.isArray(value.items) &&
-      value.items.every(isBindingInputValue)) ||
-      (value.kind === 'literal' && isManifestValue(value.value)) ||
-      (value.kind === 'object' && isBindingInputMap(value.fields)) ||
-      (value.kind === 'source' &&
-        isBindingValueSource(value.source) &&
-        isOptionalBindingTransforms(value.transforms)))
+    Array.isArray(value) &&
+    value.every((transform) => ['lowercase', 'trim', 'uppercase'].includes(String(transform)))
   );
 }

package/src/appManifest/screens.ts

@@ -6,7 +6,7 @@ import { isSerializableSet } from '../collections';
 import { isMediaAssetReference } from '../media';
 import { ANKHORAGE_CAPABILITY_NAMES, ANKHORAGE_PERMISSION_NAMES } from '../requirements';
 import { APP_CATEGORIES, type ThemeRegistry } from '../types';
-import { isBindingValueSource, isScreenDataLoaderDefinition } from './bindings';
+import { isBindingExpression, isScreenDataLoaderDefinition } from './bindings';
 
 export { isAppNavigatorManifest } from './navigator';
 
@@ -101,7 +101,7 @@ function isUiNode(value: unknown): boolean {
 function isUiNodeRepeatSpec(value: unknown): boolean {
   return (
     isRecord(value) &&
-    isBindingValueSource(value.source) &&
+    isBindingExpression(value.source) &&
     isOptionalString(value.itemAlias) &&
     isOptionalString(value.keyPath) &&
     (value.empty === undefined || (Array.isArray(value.empty) && value.empty.every(isUiNode)))

package/src/appManifest.test.ts

@@ -110,15 +110,14 @@ function createManifest(): Record<string, unknown> {
             {
               id: 'title',
               type: 'Text',
-              repeat: { source: { kind: 'state', path: 'items' }, itemAlias: 'item' },
+              repeat: { source: { capability: 'state.items' }, itemAlias: 'item' },
             },
           ],
         },
         dataLoaders: [
           {
-            kind: 'operation',
-            id: 'load-products',
-            operation: { apiId: 'nutrition', endpointId: 'products', operationId: 'products.list' },
+            capability: 'api.nutrition.productsList',
+            result: 'products',
           },
         ],
         requires: {
@@ -138,9 +137,9 @@ function createManifest(): Record<string, unknown> {
     dataBindings: {
       title: {
         componentId: 'title',
-        props: { text: { source: { kind: 'state', path: 'title' } } },
+        props: { text: { value: { capability: 'state.title' } } },
         events: {
-          press: [{ target: { kind: 'action', type: 'console' } }],
+          press: [{ target: { capability: 'console.log' } }],
         },
       },
     },
@@ -291,11 +290,11 @@ describe('AppManifest runtime parsing', () => {
     expect(isAppManifest(manifest)).toBe(false);
   });
 
-  it('rejects invalid data-binding source kinds', () => {
+  it('rejects invalid data-binding expression shapes', () => {
     const manifest = createManifest();
     const bindings = manifest.dataBindings as Record<string, Record<string, unknown>>;
     const props = bindings.title?.props as Record<string, Record<string, unknown>>;
-    props.text = { source: { kind: 'provider-specific', path: 'title' } };
+    props.text = { value: { kind: 'provider-specific', path: 'title' } };
 
     expect(isAppManifest(manifest)).toBe(false);
   });