@ontrails/trails 1.0.0-beta.39 → 1.0.0-beta.41

package/src/trails/wayfind.ts

@@ -5,12 +5,12 @@ import {
   wayfinderResolverSchema,
   wayfinderSourceModeSchema,
   wayfinderViewSchema,
-} from '@ontrails/wayfinder';
+} from '@ontrails/topography';
 import type {
   WayfinderInclude,
   WayfinderResolver,
   WayfinderView,
-} from '@ontrails/wayfinder';
+} from '@ontrails/topography';
 import { z } from 'zod';
 
 const wayfindInputSchema = z
@@ -19,7 +19,6 @@ const wayfindInputSchema = z
       .string()
       .optional()
       .describe('Filter graph facts delivered through an adapter package'),
-    contours: z.boolean().default(false).describe('Resolve contour facts'),
     contract: z
       .boolean()
       .default(false)
@@ -39,6 +38,7 @@ const wayfindInputSchema = z
       .boolean()
       .default(false)
       .describe('Render the describe view for the selected target'),
+    entities: z.boolean().default(false).describe('Resolve entity facts'),
     errors: z.boolean().default(false).describe('Resolve trail error facts'),
     impact: z
       .boolean()
@@ -141,7 +141,7 @@ const wayfindInputSchema = z
       input.deps ||
       input.impact ||
       (input.adapter === undefined &&
-        !input.contours &&
+        !input.entities &&
         !input.errors &&
         !input.trailheads &&
         input.intent === undefined &&
@@ -173,7 +173,7 @@ const wayfindInputSchema = z
         !input.impact &&
         input.include.length === 0 &&
         input.adapter === undefined &&
-        !input.contours &&
+        !input.entities &&
         !input.errors &&
         !input.trailheads &&
         input.intent === undefined &&
@@ -234,7 +234,7 @@ const liveModuleInput = (
 
 const hasLiveTypedFilter = (input: WayfindInput): boolean =>
   input.adapter !== undefined ||
-  input.contours ||
+  input.entities ||
   input.errors ||
   input.trailheads ||
   input.intent !== undefined ||
@@ -249,14 +249,14 @@ const populationFilters = (
   readonly intent?: WayfindInput['intent'];
   readonly kind?:
     | readonly (
-        | 'contour'
+        | 'entity'
         | 'trailhead'
         | 'resource'
         | 'signal'
         | 'surface'
         | 'trail'
       )[]
-    | 'contour'
+    | 'entity'
     | 'trailhead'
     | 'resource'
     | 'signal'
@@ -267,7 +267,7 @@ const populationFilters = (
   readonly surface?: readonly string[] | string | undefined;
 } => {
   const kinds = [
-    ...(input.contours ? ['contour' as const] : []),
+    ...(input.entities ? ['entity' as const] : []),
     ...(input.trailheads ? ['trailhead' as const] : []),
     ...(input.resources ? ['resource' as const] : []),
     ...(input.signals ? ['signal' as const] : []),
@@ -719,9 +719,9 @@ const viewPopulation = async (
       view: 'list' as const,
     };
   }
-  if (input.contours) {
+  if (input.entities) {
     return {
-      result: ctx.compose('wayfind.contours', {
+      result: ctx.compose('wayfind.entities', {
         filters,
         limit: input.limit,
         ...sourceInput(input),
@@ -791,41 +791,6 @@ const viewPopulation = async (
 
 export const wayfindTrail = trail('wayfind.navigate', {
   args: ['target'],
-  blaze: async (input, ctx) => {
-    if (input.source === 'live') {
-      const dispatched = await viewLiveSource(input, ctx);
-      if (dispatched !== undefined) {
-        return envelopeFor(
-          await dispatched.result,
-          input,
-          ctx,
-          dispatched.view
-        );
-      }
-    }
-    if (input.overlay !== undefined) {
-      return envelopeFor(
-        await ctx.compose('wayfind.overlay', {
-          namespace: input.overlay,
-          ...sourceInput(input),
-        }),
-        input,
-        ctx,
-        'list'
-      );
-    }
-    const dispatched =
-      (await viewRelation(input, ctx)) ??
-      (await (input.target === undefined
-        ? viewPopulation(input, ctx)
-        : viewTarget(input, ctx)));
-    if (dispatched === undefined) {
-      return Result.err(
-        new ValidationError('Provide a Wayfinder target or population filter.')
-      );
-    }
-    return envelopeFor(await dispatched.result, input, ctx, dispatched.view);
-  },
   cli: {
     path: 'wayfind',
   },
@@ -834,7 +799,7 @@ export const wayfindTrail = trail('wayfind.navigate', {
     'survey',
     'wayfind.adapters',
     'wayfind.contract',
-    'wayfind.contours',
+    'wayfind.entities',
     'wayfind.describe',
     'wayfind.errors',
     'wayfind.examples',
@@ -878,8 +843,8 @@ export const wayfindTrail = trail('wayfind.navigate', {
       name: 'List resource facts',
     },
     {
-      input: { contours: true },
-      name: 'List contour facts',
+      input: { entities: true },
+      name: 'List entity facts',
     },
     {
       input: { signals: true },
@@ -926,6 +891,41 @@ export const wayfindTrail = trail('wayfind.navigate', {
       name: 'List read trails',
     },
   ],
+  implementation: async (input, ctx) => {
+    if (input.source === 'live') {
+      const dispatched = await viewLiveSource(input, ctx);
+      if (dispatched !== undefined) {
+        return envelopeFor(
+          await dispatched.result,
+          input,
+          ctx,
+          dispatched.view
+        );
+      }
+    }
+    if (input.overlay !== undefined) {
+      return envelopeFor(
+        await ctx.compose('wayfind.overlay', {
+          namespace: input.overlay,
+          ...sourceInput(input),
+        }),
+        input,
+        ctx,
+        'list'
+      );
+    }
+    const dispatched =
+      (await viewRelation(input, ctx)) ??
+      (await (input.target === undefined
+        ? viewPopulation(input, ctx)
+        : viewTarget(input, ctx)));
+    if (dispatched === undefined) {
+      return Result.err(
+        new ValidationError('Provide a Wayfinder target or population filter.')
+      );
+    }
+    return envelopeFor(await dispatched.result, input, ctx, dispatched.view);
+  },
   input: wayfindInputSchema,
   intent: 'read',
   output: wayfindOutputSchema,
@@ -963,14 +963,6 @@ const selectorSourceInput = (
 
 export const wayfindPatternTrail = trail('wayfind.pattern', {
   args: ['selector'],
-  blaze: (input, ctx) =>
-    ctx.compose('wayfind.navigate', {
-      limit: input.limit,
-      resolver: 'pattern',
-      target: input.selector,
-      view: 'list',
-      ...selectorSourceInput(input),
-    }),
   cli: {
     path: 'wayfind pattern',
   },
@@ -982,6 +974,14 @@ export const wayfindPatternTrail = trail('wayfind.pattern', {
       name: 'Find Wayfinder trails',
     },
   ],
+  implementation: (input, ctx) =>
+    ctx.compose('wayfind.navigate', {
+      limit: input.limit,
+      resolver: 'pattern',
+      target: input.selector,
+      view: 'list',
+      ...selectorSourceInput(input),
+    }),
   input: wayfindPatternInputSchema,
   intent: 'read',
   meta: {
@@ -993,14 +993,6 @@ export const wayfindPatternTrail = trail('wayfind.pattern', {
 
 export const wayfindQueryTrail = trail('wayfind.query', {
   args: ['selector'],
-  blaze: (input, ctx) =>
-    ctx.compose('wayfind.navigate', {
-      limit: input.limit,
-      resolver: 'query',
-      target: input.selector,
-      view: 'list',
-      ...selectorSourceInput(input),
-    }),
   cli: {
     path: 'wayfind query',
   },
@@ -1012,6 +1004,14 @@ export const wayfindQueryTrail = trail('wayfind.query', {
       name: 'Find release drift facts',
     },
   ],
+  implementation: (input, ctx) =>
+    ctx.compose('wayfind.navigate', {
+      limit: input.limit,
+      resolver: 'query',
+      target: input.selector,
+      view: 'list',
+      ...selectorSourceInput(input),
+    }),
   input: wayfindQueryInputSchema,
   intent: 'read',
   meta: {
@@ -1023,15 +1023,6 @@ export const wayfindQueryTrail = trail('wayfind.query', {
 
 export const wayfindFileTrail = trail('wayfind.file', {
   args: ['selector'],
-  blaze: (input, ctx) =>
-    ctx.compose('wayfind.navigate', {
-      limit: input.limit,
-      outline: input.outline,
-      resolver: 'file',
-      target: input.selector,
-      view: 'outline',
-      ...selectorSourceInput(input),
-    }),
   cli: {
     path: 'wayfind file',
   },
@@ -1043,6 +1034,15 @@ export const wayfindFileTrail = trail('wayfind.file', {
       name: 'Outline the Trails app module',
     },
   ],
+  implementation: (input, ctx) =>
+    ctx.compose('wayfind.navigate', {
+      limit: input.limit,
+      outline: input.outline,
+      resolver: 'file',
+      target: input.selector,
+      view: 'outline',
+      ...selectorSourceInput(input),
+    }),
   input: wayfindFileInputSchema,
   intent: 'read',
   meta: {