@squawk/flightplan 0.7.0 → 0.8.1

package/README.md

@@ -120,8 +120,8 @@ Each element has a `type` discriminant and a `raw` field with the original token
 | Type            | Description                               | Key fields                                                  |
 | --------------- | ----------------------------------------- | ----------------------------------------------------------- |
 | `airport`       | Resolved airport (ICAO or FAA ID)         | `airport`                                                   |
-| `sid`           | Standard Instrument Departure             | `procedure`, `legs`                                         |
-| `star`          | Standard Terminal Arrival Route           | `procedure`, `legs`                                         |
+| `sid`           | Standard Instrument Departure             | `procedure`, `legs`, `transition`                           |
+| `star`          | Standard Terminal Arrival Route           | `procedure`, `legs`, `transition`                           |
 | `airway`        | Airway segment between entry and exit fix | `airway`, `entryFix`, `exitFix`, `waypoints`, `gaps`        |
 | `direct`        | DCT (direct) indicator                    | -                                                           |
 | `waypoint`      | Resolved fix or navaid                    | `fix` and/or `navaid`, `lat`, `lon`                         |
@@ -152,8 +152,24 @@ is not defined and is not valid as filed.
 When a token matches an airway designation and both a previous waypoint
 and a next token (exit fix) are available, the resolver expands the airway
 between those fixes. The exit fix token is consumed as part of the airway
-element. If expansion fails, the airway token falls through to other
-resolution strategies.
+element. If expansion fails, the airway token is marked `unresolved` and the
+exit fix token is parsed on its own.
+
+### Procedure handling
+
+A token that names a SID or STAR is expanded through the procedure provider.
+The dotted `PROCEDURE.TRANSITION` form (`DEEZZ6.CANDR`) merges the named
+transition into the expansion. Without a dotted transition, the resolver looks
+at the adjacent fix - the token after a SID, or the waypoint before a STAR -
+and merges that transition when the procedure publishes one by that name,
+which is how routes are usually filed (`KJFK DEEZZ6 CANDR`). Otherwise the
+common route alone is expanded. The `sid` or `star` element records the merged
+transition in `transition`.
+
+A procedure that cannot be expanded is marked `unresolved`: either the dotted
+transition is not one of its transitions, or the procedure has no common route
+(some SIDs and STARs are published as transitions only) and no adjacent fix
+names one of its transitions.
 
 ### Identifier ambiguity
 

package/dist/resolver.d.ts

@@ -92,6 +92,8 @@ export interface SidRouteElement {
     raw: string;
     /** Resolved procedure record. */
     procedure: Procedure;
+    /** Name of the transition merged into `legs`: the one named in a dotted token (`DEEZZ6.CANDR`), or the fix following the SID when it names one of the procedure's transitions. Absent when only the common route was expanded. */
+    transition?: string;
     /** Ordered legs for the procedure expansion. */
     legs: ProcedureLeg[];
 }
@@ -105,6 +107,8 @@ export interface StarRouteElement {
     raw: string;
     /** Resolved procedure record. */
     procedure: Procedure;
+    /** Name of the transition merged into `legs`: the one named in a dotted token (`AALLE4.BBOTL`), or the waypoint preceding the STAR when it names one of the procedure's transitions. Absent when only the common route was expanded. */
+    transition?: string;
     /** Ordered legs for the procedure expansion. */
     legs: ProcedureLeg[];
 }

package/dist/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}

package/dist/resolver.js

@@ -105,17 +105,26 @@ function tryAirport(token, airports) {
  * the most recent airport is the best available hint).
  *
  * Accepts both the bare CIFP identifier (e.g. `DEEZZ6`) and the dotted
- * identifier-with-transition form (e.g. `DEEZZ6.CANDR`). When a
- * transition is supplied it is forwarded to the procedure resolver so
- * that the transition's legs are merged into the expansion.
+ * identifier-with-transition form (e.g. `DEEZZ6.CANDR`). A dotted
+ * transition is forwarded to the procedure resolver so that the
+ * transition's legs are merged into the expansion. Without one, the
+ * adjacent fix is tried as the transition name: the token after a SID
+ * or the waypoint before a STAR, which is how routes are usually filed
+ * (`KJFK DEEZZ6 CANDR`). When neither names a transition the common
+ * route alone is expanded.
+ *
+ * Returns `undefined` when the token is not a known SID or STAR. Returns
+ * an `unresolved` element when the procedure is known but cannot be
+ * expanded: the dotted transition is not one of its transitions, or it
+ * has no common route and no adjacent fix names a transition.
  */
-function tryProcedure(token, procedures, airportContext) {
+function tryProcedure(token, procedures, airportContext, previousWaypoint, nextToken) {
     if (!procedures) {
         return undefined;
     }
     const dotIndex = token.indexOf('.');
     const identifier = dotIndex >= 0 ? token.slice(0, dotIndex) : token;
-    const transitionName = dotIndex >= 0 ? token.slice(dotIndex + 1) : undefined;
+    const dottedTransition = dotIndex >= 0 ? token.slice(dotIndex + 1) : undefined;
     if (identifier.length === 0) {
         return undefined;
     }
@@ -135,13 +144,34 @@ function tryProcedure(token, procedures, airportContext) {
         return undefined;
     }
     const airportForExpansion = proc.airports[0];
-    const legs = airportForExpansion === undefined
-        ? []
-        : (procedures.expand(airportForExpansion, identifier, transitionName)?.legs ?? []);
-    if (proc.type === 'SID') {
-        return { type: 'sid', raw: token, procedure: proc, legs };
+    if (airportForExpansion === undefined) {
+        return { type: 'unresolved', raw: token };
+    }
+    const adjacentFix = proc.type === 'SID' ? nextToken : previousWaypoint;
+    const transitionName = dottedTransition ?? inferTransitionName(proc, adjacentFix);
+    const expansion = procedures.expand(airportForExpansion, identifier, transitionName);
+    if (expansion === undefined) {
+        return { type: 'unresolved', raw: token };
+    }
+    const element = proc.type === 'SID'
+        ? { type: 'sid', raw: token, procedure: proc, legs: expansion.legs }
+        : { type: 'star', raw: token, procedure: proc, legs: expansion.legs };
+    if (transitionName !== undefined) {
+        element.transition = transitionName;
+    }
+    return element;
+}
+/**
+ * Returns the procedure's transition whose name matches the adjacent fix
+ * token, in the procedure's own spelling, or `undefined` when there is
+ * no adjacent fix or no transition by that name.
+ */
+function inferTransitionName(procedure, adjacentFix) {
+    if (adjacentFix === undefined) {
+        return undefined;
     }
-    return { type: 'star', raw: token, procedure: proc, legs };
+    const upper = adjacentFix.toUpperCase();
+    return procedure.transitions.find((t) => t.name.toUpperCase() === upper)?.name;
 }
 /**
  * Attempts to resolve a token as a fix waypoint. When an anchor is supplied and
@@ -312,20 +342,26 @@ export function createFlightplanResolver(options) {
                     i++;
                     continue;
                 }
-                // Try procedure (SID/STAR)
-                const procElement = tryProcedure(token, procedures, lastAirportIdent);
+                // Try procedure (SID/STAR). The fix after a SID or before a STAR may
+                // name the transition when the token itself does not.
+                const procElement = tryProcedure(token, procedures, lastAirportIdent, lastWaypointIdent, tokens[i + 1]?.toUpperCase());
                 if (procElement) {
                     elements.push(procElement);
-                    // Update last waypoint to the last fix in the procedure expansion
-                    // that actually terminates at a fix (some leg types have no fix).
-                    for (let j = procElement.legs.length - 1; j >= 0; j--) {
-                        const leg = procElement.legs[j];
-                        if (leg?.fixIdentifier !== undefined) {
-                            lastWaypointIdent = leg.fixIdentifier;
-                            if (leg.lat !== undefined && leg.lon !== undefined) {
-                                lastPosition = { lat: leg.lat, lon: leg.lon };
+                    if (procElement.type === 'unresolved') {
+                        lastWaypointIdent = undefined;
+                    }
+                    else {
+                        // Update last waypoint to the last fix in the procedure expansion
+                        // that actually terminates at a fix (some leg types have no fix).
+                        for (let j = procElement.legs.length - 1; j >= 0; j--) {
+                            const leg = procElement.legs[j];
+                            if (leg?.fixIdentifier !== undefined) {
+                                lastWaypointIdent = leg.fixIdentifier;
+                                if (leg.lat !== undefined && leg.lon !== undefined) {
+                                    lastPosition = { lat: leg.lat, lon: leg.lon };
+                                }
+                                break;
                             }
-                            break;
                         }
                     }
                     i++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squawk/flightplan",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "type": "module",
   "description": "Flight plan route string parsing and resolution using composed navigation resolvers",
   "author": "Neil Cochran",
@@ -43,21 +43,21 @@
   },
   "dependencies": {
     "@squawk/flight-math": "^0.5.9",
-    "@squawk/geo": "^0.5.1",
-    "@squawk/types": "^0.11.0",
+    "@squawk/geo": "^0.5.3",
+    "@squawk/types": "^0.13.0",
     "@types/geojson": "^7946.0.16"
   },
   "devDependencies": {
-    "@squawk/airport-data": "^0.8.3",
-    "@squawk/airports": "^0.7.4",
-    "@squawk/airway-data": "^0.6.4",
-    "@squawk/airways": "^0.6.0",
-    "@squawk/fix-data": "^0.7.3",
-    "@squawk/fixes": "^0.5.4",
-    "@squawk/navaid-data": "^0.7.3",
-    "@squawk/navaids": "^0.6.4",
-    "@squawk/procedure-data": "^0.8.3",
-    "@squawk/procedures": "^0.7.3",
+    "@squawk/airport-data": "^0.8.5",
+    "@squawk/airports": "^0.7.6",
+    "@squawk/airway-data": "^0.6.6",
+    "@squawk/airways": "^0.6.2",
+    "@squawk/fix-data": "^0.7.5",
+    "@squawk/fixes": "^0.5.6",
+    "@squawk/navaid-data": "^0.7.5",
+    "@squawk/navaids": "^0.6.6",
+    "@squawk/procedure-data": "^0.9.1",
+    "@squawk/procedures": "^0.8.1",
     "@types/node": "^26.6.4"
   },
   "keywords": [