@voxgig/sdkgen 4.7.0 → 4.8.1

package/project/.sdk/src/cmp/lua/TestDirect_lua.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive, envName, envToken,
   serverVarEnv,
-  serverVariables
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 import { formatLuaValue } from './utility_lua'
@@ -99,7 +100,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -107,7 +108,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -124,7 +125,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   // Required query params with spec-provided examples — needed in live mode.

package/project/.sdk/src/cmp/perl/TestDirect_perl.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive, envName, envToken,
   serverVarEnv,
-  serverVariables
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 import { perlStringLiteral } from './utility_perl'
@@ -109,12 +110,12 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Only path params that actually appear in the URL template drive direct-
   // test path-param setup and URL-substitution asserts (see TestDirect_rb).
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -131,7 +132,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   // Required query params with spec-provided examples - needed in live mode.

package/project/.sdk/src/cmp/php/Config_php.ts

@@ -29,7 +29,6 @@ import {
 
 
 import {
-  clean,
   formatPhpArray,
 } from './utility_php'
 
@@ -239,12 +238,7 @@ ${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers,
     Content(`                ],
             ],
             "entity" => ${formatPhpArray(
-      Object.values(entity).reduce((a: any, n: any) => (a[n.name] = clean({
-        fields: n.fields,
-        name: n.name,
-        op: n.op,
-        relations: n.relations,
-      }, true), a), {}), 3)},
+configDef.entity, 3)},
         ];
 `)
     }

package/project/.sdk/src/cmp/php/TestDirect_php.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive, envName, envToken,
   serverVarEnv,
-  serverVariables
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 import { formatPhpValue } from './utility_php'
@@ -99,7 +100,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -107,7 +108,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -124,7 +125,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   // Required query params with spec-provided examples — needed in live mode.

package/project/.sdk/src/cmp/py/Config_py.ts

@@ -28,7 +28,6 @@ import {
 
 
 import {
-  clean,
   formatPyDict,
 } from './utility_py'
 
@@ -180,12 +179,7 @@ ${serverBlock}${authBlock}            "headers": ${formatPyDict(headers, 3)},
     Content(`            },
         },
         "entity": ${formatPyDict(
-      Object.values(entity).reduce((a: any, n: any) => (a[n.name] = clean({
-        fields: n.fields,
-        name: n.name,
-        op: n.op,
-        relations: n.relations,
-      }, true), a), {}), 2)},
+configDef.entity, 2)},
     }
 `)
   })

package/project/.sdk/src/cmp/py/TestDirect_py.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive,
   serverVarEnv,
-  serverVariables, envName, envToken
+  serverVariables, envName, envToken,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -98,7 +99,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -106,7 +107,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -123,7 +124,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   // Required query params with spec-provided examples — needed in live mode

package/project/.sdk/src/cmp/rb/Config_rb.ts

@@ -29,7 +29,6 @@ import {
 
 
 import {
-  clean,
   formatRubyHash,
 } from './utility_rb'
 
@@ -165,12 +164,7 @@ ${serverBlock}${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
     Content(`        },
       },
       "entity" => ${formatRubyHash(
-      Object.values(entity).reduce((a: any, n: any) => (a[n.name] = clean({
-        fields: n.fields,
-        name: n.name,
-        op: n.op,
-        relations: n.relations,
-      }, true), a), {}), 3)},
+configDef.entity, 3)},
     }
   end
 `)

package/project/.sdk/src/cmp/rb/TestDirect_rb.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive, envName, envToken,
   serverVarEnv,
-  serverVariables
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 import { formatRubyValue } from './utility_rb'
@@ -99,7 +100,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -107,7 +108,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -124,7 +125,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   // Required query params with spec-provided examples — needed in live mode.

package/project/.sdk/src/cmp/rust/TestDirect_rust.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive, envName, envToken,
   serverVarEnv,
-  serverVariables
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -104,12 +105,12 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // Load point info.
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Only path params that actually appear in the URL template drive the
   // direct-test path-param setup and URL-substitution asserts.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -127,7 +128,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // List point info.
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`

package/project/.sdk/src/cmp/scala/Config_scala.ts

@@ -7,6 +7,7 @@ import {
   isAuthActive,
   resolveAuthPrefix,
   targetFeatures,
+  configDefinition,
 } from '@voxgig/sdkgen'
 
 
@@ -36,6 +37,7 @@ const Config = cmp(async function Config(props: any) {
   const scalapackage = scalaPackage(model)
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
+  const { def: configDef } = configDefinition(model, target.name)
   // Gated by the applicability tags, so this target never imports or
   // registers a feature it has no source for. One rule, one place:
   // helpers/applicability.
@@ -68,13 +70,13 @@ const Config = cmp(async function Config(props: any) {
   options.headers = headers
   options.entity = optionsEntity
 
-  const entityConfig = Object.values(entity).reduce((a: any, n: any) => (
-    a[n.name] = cleanModel({
-      fields: n.fields,
-      name: n.name,
-      op: n.op,
-      relations: n.relations,
-    }, true), a), {})
+  // configDefinition's `def.entity` verbatim, NOT rebuilt here. This reduce
+  // was one of fourteen copies of that function's entityDefs loop, and when
+  // configDefinition started reconstructing a point's `parts` from apidef's
+  // segment vector (its ADR-003), only the copies that read `configDef` got
+  // it — this target's literal config emitted paths with no parts at all
+  // while its data config had them. One rule, one place.
+  const entityConfig = configDef.entity
 
   const config = {
     main: { name: model.const.Name },

package/project/.sdk/src/cmp/scala/TestDirect_scala.ts

@@ -11,6 +11,7 @@ import {
   File,
   cmp,
   snakify,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -79,13 +80,13 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // Load point info.
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint
-    ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param)
+    ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param)
     : ''
   const allLoadParams = loadPoint?.args?.params || []
   // Only path params that actually appear in the URL template drive the
   // direct-test path-param setup and URL-substitution asserts.
   const _pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -104,7 +105,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // List point info.
   const listPoint = listOp?.points?.[0]
   const listPath = listPoint
-    ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param)
+    ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param)
     : ''
   const listParams = listPoint?.args?.params || []
 

package/project/.sdk/src/cmp/seneca-provider/Extras_seneca-provider.ts

@@ -2,6 +2,7 @@ import {
   cmp, each,
   File, Content, Folder,
   jsKey, jsProp,
+  pointSegments,
 } from '@voxgig/sdkgen'
 
 
@@ -22,7 +23,8 @@ import {
 function loadHasKey(ent: any): boolean {
   const point = (ent.op && ent.op.load && ent.op.load.points || [])[0]
   if (null == point) return false
-  const hasPathParam = (point.parts || []).some((p: string) => p.startsWith('{'))
+  // apidef states which segments are variables (its ADR-003) — no brace test.
+  const hasPathParam = pointSegments(point).some((seg: any) => null != seg.var)
   const hasQueryParam = (point.args && point.args.query || [])
     .some((q: any) => false !== q.reqd)
   return hasPathParam || hasQueryParam

package/project/.sdk/src/cmp/seneca-provider/Main_seneca-provider.ts

@@ -7,6 +7,7 @@ import {
   authorInfo, contributorList, isAuthActive, isHttpBasicAuth, jsKey, jsProp,
   SdkGenError,
   PUBLISHER, PUBLISHER_URL,
+  pointSegments,
 } from '@voxgig/sdkgen'
 
 import {
@@ -102,11 +103,14 @@ function recordKey(ent: any): string {
     const canonical = op.points.filter((pt: any) =>
       null == (pt && pt.select && pt.select['$action']))
     const point = ownPoint(0 < canonical.length ? canonical : op.points)
-    const parts: string[] = (point && point.parts) || []
-    const lastParam = [...parts].reverse().find((p: string) => p.startsWith('{'))
-
-    if (null != lastParam) {
-      return lastParam.slice(1, -1)
+    // The LAST variable segment names the record's key. apidef states which
+    // segments are variables (its ADR-003), so this reads the name off the
+    // vector rather than finding a `{` and slicing the braces back off.
+    const vars = pointSegments(point)
+      .filter((seg: any) => null != seg.var)
+
+    if (0 < vars.length) {
+      return String(vars[vars.length - 1].var)
     }
 
     // No path param at all (e.g. GET /scan/async/result?trace_id=...): the

package/project/.sdk/src/cmp/ts/Config_ts.ts

@@ -8,7 +8,6 @@ import {
   Fragment,
   Line,
   cmp,
-  clean,
   configDefinition,
   configReprSetting,
   each,
@@ -170,13 +169,13 @@ const Config = cmp(async function Config(props: any) {
 `)
         }),
 
-        "'ENTITYMAP'": formatJson(Object.values(entity)
-          .reduce((a: any, n: any) => (a[n.name] = clean({
-            fields: n.fields,
-            name: n.name,
-            op: n.op,
-            relations: n.relations,
-          }, true), a), {}), { margin: 2 }).trim(),
+        // configDefinition's `def.entity` verbatim, NOT rebuilt here. This
+        // reduce was a second copy of that function's entityDefs loop, and
+        // when configDefinition started reconstructing a point's `parts`
+        // from apidef's segment vector (its ADR-003), only the data
+        // representation got it — the literal one emitted empty paths. The
+        // config-repr equivalence test caught it, which is what it is for.
+        "'ENTITYMAP'": formatJson(configDef.entity, { margin: 2 }).trim(),
       }
     })
   })

package/project/.sdk/src/cmp/ts/TestDirect_ts.ts

@@ -22,7 +22,8 @@ import {
   isHttpBasicAuth,
   jsProp,
   jsOptProp, envName, envToken, liveStrict,
-  jsKey
+  jsKey,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -295,7 +296,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   }
 
   const allLoadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(loadPoint.parts || [], allLoadParams, loadPoint.rename?.param)
+  const loadPath = normalizePathParams(pointParts(loadPoint), allLoadParams, loadPoint.rename?.param)
 
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -303,7 +304,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       pathPlaceholders.add(part.slice(1, -1))
     }
@@ -337,7 +338,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   const listOp = entity.op?.list
   const listPoint = listOp?.points?.[0]
   const listParams = listPoint?.args?.params || []
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param) : ''
   const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
@@ -530,7 +531,7 @@ function generateDirectList(model: Model, entity: ModelEntity, strict: boolean)
   }
 
   const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param)
+  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param)
 
   // Required query params with spec-provided examples — needed to satisfy
   // the API contract in live mode (see generateDirectLoad for rationale).

package/project/sdkgen-package.json

@@ -3,7 +3,7 @@
     "package": 1
   },
   "name": "@voxgig/sdkgen",
-  "version": "4.7.0",
+  "version": "4.8.1",
   "provides": {
     "target": [
       "c",

package/src/helpers/opShape.ts

@@ -29,6 +29,8 @@
 import { each, names } from 'jostraca'
 import { KIT, getModelPath } from '@voxgig/apidef'
 
+import { pointSegments, pointTerminalParam, pointPathKey } from './pointPath'
+
 
 // THE entity collection for a model — resolved once, with a stable identity.
 //
@@ -217,25 +219,19 @@ function entityPath(entity: any): string {
 // no point's `select.exist` matches. It cannot be shared with them — a
 // template ships standalone, outside this package — so it is written twice on
 // purpose, and both sides must move together.
-function terminalParam(point: any): boolean {
-  const parts: any[] = (point && point.parts) || []
-  const last = 0 < parts.length ? parts[parts.length - 1] : ''
-  return 'string' === typeof last && last.startsWith('{')
-}
-
-
 function ownPoint(points: any[]): any {
   let best = points[0]
 
   for (const pt of points) {
-    if (null == pt || null == pt.parts || null == best || null == best.parts) {
+    if (null == pt || null == pt.segments || null == best || null == best.segments) {
       continue
     }
 
-    const ptterm = terminalParam(pt)
-    const bestterm = terminalParam(best)
+    const ptterm = pointTerminalParam(pt)
+    const bestterm = pointTerminalParam(best)
 
-    if (ptterm !== bestterm ? ptterm : pt.parts.length < best.parts.length) {
+    if (ptterm !== bestterm ?
+      ptterm : pointSegments(pt).length < pointSegments(best).length) {
       best = pt
     }
   }
@@ -248,10 +244,9 @@ function ownPoint(points: any[]): any {
 // selectors on one endpoint (the same path, chosen by different query
 // params), not cross-references to different resources.
 function samePath(points: any[]): boolean {
-  const first = ((points[0] && points[0].parts) || []).join('/')
+  const first = pointPathKey(points[0])
 
-  return points.every((pt: any) =>
-    first === ((pt && pt.parts) || []).join('/'))
+  return points.every((pt: any) => first === pointPathKey(pt))
 }