@takodotid/circuit 0.36.0 → 0.37.0

package/dist/chunks/{index-2r4bbhac.js → index-k38bby43.js}

@@ -160,7 +160,8 @@ class Topology {
         const farPort = far?.ports?.[link.port];
         const linksBack = farPort?.link?.device === device.name && farPort.link.port === portName;
         const to = far ? Topology.deviceId(far.name) : graph.node(`missing:${link.device}`, "outside", link.device, ["named by a link, and not in the network"]);
-        const cableLine = `${here} to ${there}`;
+        const through = link.through ? `, through ${link.through}` : "";
+        const cableLine = `${here} to ${there}${through}`;
         const lag = port.lag;
         const farLag = farPort?.lag;
         const bundleKey = `${device.name} ${lag}|${link.device} ${farLag}`;
@@ -168,7 +169,7 @@ class Topology {
         if (bundle) {
           bundle.members++;
           bundle.cable.detail.push(cableLine);
-          bundle.cable.label = `${lag} to ${farLag}, ${bundle.members} cables`;
+          bundle.cable.label = `${lag} to ${farLag}, ${bundle.members} cables${through}`;
           continue;
         }
         const isBundle = Boolean(lag && farLag && linksBack);
@@ -176,7 +177,7 @@ class Topology {
           layer: "l1",
           from: Topology.deviceId(device.name),
           to,
-          label: isBundle ? `${lag} to ${farLag}` : `${portName} to ${link.port}`,
+          label: `${isBundle ? `${lag} to ${farLag}` : `${portName} to ${link.port}`}${through}`,
           detail: [cableLine],
           ...linksBack ? {} : { oneSided: true }
         });
@@ -950,6 +951,7 @@ class StudioModel {
           ...port.lag ? { lag: port.lag } : {},
           ...farPort?.lag ? { farLag: farPort.lag } : {},
           ...port.description ? { description: port.description } : {},
+          ...link.through ? { through: link.through } : {},
           vlans: vlansOf(device, portName),
           ...linksBack ? {} : { oneSided: true }
         });

package/dist/chunks/{server-gzsf5me5.js → server-ggertnce.js}

@@ -1,6 +1,6 @@
 import {
   StudioModel
-} from "./index-2r4bbhac.js";
+} from "./index-k38bby43.js";
 
 // src/studio/server.ts
 import { execFile as execFile2, spawn } from "node:child_process";

package/dist/cli/index.js

@@ -8,7 +8,7 @@ import {
   Topology,
   AddressSpace,
   StudioModel
-} from "../chunks/index-2r4bbhac.js";
+} from "../chunks/index-k38bby43.js";
 import {
   Address2
 } from "../chunks/index-n7w3tg5y.js";
@@ -3732,6 +3732,8 @@ class Cabling {
           }
           continue;
         }
+        if (link.through)
+          continue;
         const far = devices.find((candidate) => candidate.name === link.device);
         if (!far || !Cabling.runsOn(far, link.port))
           continue;
@@ -10694,6 +10696,10 @@ class CrossChecks {
           report(`${link.device} ${link.port} does not link back to it`);
           continue;
         }
+        if (link.through !== farPort.link?.through) {
+          const say = (through) => through ? `through ${through}` : "direct";
+          report(`${say(link.through)} here, and ${say(farPort.link?.through)} on ${link.device} ${link.port}`);
+        }
         const near = CrossChecks.carrierOf(device, portName, port);
         const away = CrossChecks.carrierOf(far, link.port, farPort);
         const inLag = near.name !== portName;
@@ -12280,7 +12286,7 @@ Renamed. Run circuit validate, then circuit apply ${to}: the device keeps its ol
     const port = Number(flags.port);
     if (!Number.isInteger(port) || port < 1 || port > 65535)
       Cli.fail("--port takes a number from 1 to 65535");
-    const { StudioServer } = await import("../chunks/server-gzsf5me5.js");
+    const { StudioServer } = await import("../chunks/server-ggertnce.js");
     const host = flags.host;
     const allowHosts = (flags.allowHost ?? "").split(",").filter(Boolean);
     if (!StudioServer.isLoopback(host) && !allowHosts.length) {

package/dist/types/core/address-space.d.ts

@@ -1,4 +1,4 @@
-import type { Device } from "../schema";
+import type { Device } from "../schema/index.js";
 /** One address or range in a segment, and what holds it. */
 export type Use = {
     /** An address, or `first-last` for a range. */

package/dist/types/core/address.d.ts

@@ -1,4 +1,4 @@
-import type { Family, IP, IPv4, Prefix } from "../schema";
+import type { Family, IP, IPv4, Prefix } from "../schema/index.js";
 /** Address helpers, for checks of your own. */
 export declare class Address {
     /** IPv4 space another network cannot reach: this host, private, shared, loopback, link-local and documentation, after RFC 6890. */

package/dist/types/core/cabling.d.ts

@@ -1,5 +1,5 @@
-import type { Device } from "../schema";
-import type { Finding } from "./define";
+import type { Device } from "../schema/index.js";
+import type { Finding } from "./define.js";
 /** A device one of our ports sees at the far end of its cable, over LLDP. */
 export type Neighbor = {
     /** Our port, by Circuit's name, such as `10g-1`. */
@@ -28,7 +28,7 @@ export declare class Cabling {
     /**
      * Warnings where LLDP and `link` disagree, from each device's own view: a cable in another port than `link` names, a cable `link` names that LLDP does not see, and another of our devices on a port without `link`.
      *
-     * Only ports where both ends run LLDP, by the config, are compared, and only on devices whose neighbors were read. LLDP can be off at the far end, so each is a warning.
+     * Only ports where both ends run LLDP, by the config, are compared, and only on devices whose neighbors were read. A link `through` a carrier is not compared. LLDP can be off at the far end, so each is a warning.
      */
     static compare(devices: readonly Device[], neighbors: ReadonlyMap<string, readonly Neighbor[]>): Finding[];
     /** A system name is the device's name, alone or with a domain after it. */

package/dist/types/core/cross-checks.d.ts

@@ -1,5 +1,5 @@
-import type { Device } from "../schema";
-import type { Finding } from "./define";
+import type { Device } from "../schema/index.js";
+import type { Finding } from "./define.js";
 export declare class CrossChecks {
     /** Every rule across devices. */
     static run(devices: readonly Device[]): Finding[];
@@ -15,7 +15,7 @@ export declare class CrossChecks {
     private static plainAddresses;
     /** Why the two ends of a cable cannot reach each other by address, or undefined when they can. */
     private static addressDisagreement;
-    /** A link names a device and port that exist, the far end links back, and both ends carry the same VLANs the same way, with the same MTU, speed and addresses. */
+    /** A link names a device and port that exist, the far end links back through the same carrier, and both ends carry the same VLANs the same way, with the same MTU, speed and addresses. */
     private static checkLinks;
     /** No address is held by two devices in one VRF. Two loopbacks may hold one on purpose, for anycast, so that is a warning. */
     private static checkAddresses;

package/dist/types/core/define.d.ts

@@ -1,5 +1,5 @@
-import type { ModelName, PlatformName, PortName } from "../platforms/catalog";
-import type { Device, Secret } from "../schema";
+import type { ModelName, PlatformName, PortName } from "../platforms/catalog.js";
+import type { Device, Secret } from "../schema/index.js";
 /** A value resolved by name when a device is applied, from the environment or `.env` beside the config, and through 1Password when that value is an `op://` reference. Never the value itself. */
 export declare const secret: (name: string) => Secret;
 /** A value read from a file when a device is applied, such as a private key in PEM. The path is relative to the config file; keep the file out of git. */

package/dist/types/core/secrets.d.ts

@@ -1,5 +1,5 @@
-import type { Network } from "./define";
-import type { Console, Device, IP, Secret } from "../schema";
+import type { Network } from "./define.js";
+import type { Console, Device, IP, Secret } from "../schema/index.js";
 /** How a device is logged in to: its management address and SSH port, its connection user and that user's password, and its console. */
 export type DeviceLogin = {
     /** Absent for a device reached only through its console. */

package/dist/types/core/topology.d.ts

@@ -1,5 +1,5 @@
-import type { Device, Routed } from "../schema";
-import type { Finding } from "./define";
+import type { Device, Routed } from "../schema/index.js";
+import type { Finding } from "./define.js";
 /** One view of the network. Every edge belongs to one. */
 export type Layer = "l1" | "l2" | "l3" | "bgp" | "ospf" | "tunnels";
 /** One of our devices, a segment several of them share, or something outside the network. */

package/dist/types/core/validator.d.ts

@@ -1,4 +1,4 @@
-import type { Finding, Network } from "./define";
+import type { Finding, Network } from "./define.js";
 export declare class Validator {
     static run(network: Network): Finding[];
     private static checkDevice;

package/dist/types/helpers/bgp.d.ts

@@ -1,5 +1,5 @@
-import type { Community } from "../core/define";
-import type { Device, PolicyRule, Prefix, StandardCommunity } from "../schema";
+import type { Community } from "../core/define.js";
+import type { Device, PolicyRule, Prefix, StandardCommunity } from "../schema/index.js";
 /** The prefix lengths a BGP import accepts. */
 export type SanityLengths = {
     /** Shortest and longest IPv4 prefix accepted. /8 to /24 when absent. */
@@ -63,8 +63,8 @@ export declare class Bgp {
     /** Each BGP neighbor's own policies and role, or its group's. */
     static neighborPolicies(device: Device): {
         name: string;
-        address: import("..").IP;
-        role: import("..").BgpRole | undefined;
+        address: import("../index.js").IP;
+        role: import("../index.js").BgpRole | undefined;
         import: string | undefined;
         export: string | undefined;
     }[];

package/dist/types/helpers/checks.d.ts

@@ -1,4 +1,4 @@
-import type { Check } from "../core/define";
+import type { Check } from "../core/define.js";
 /** Where traffic from outside, before anything filters it, may go. Every VLAN not listed as untrusted is trusted, so a VLAN added later is protected without being listed. */
 export type TrustBoundary = {
     /** VLANs carrying traffic straight from outside: transits, exchanges, an ISP handoff. */

package/dist/types/helpers/exchange.d.ts

@@ -1,6 +1,6 @@
-import type { Check } from "../core/define";
-import type { Ethertype, IP, Port, Prefix } from "../schema";
-import { type RouteServer } from "./route-server";
+import type { Check } from "../core/define.js";
+import type { Ethertype, IP, Port, Prefix } from "../schema/index.js";
+import { type RouteServer } from "./route-server.js";
 /** A member of an internet exchange: a network with a port on the fabric and an address on the peering LAN. */
 export type ExchangeMember = {
     /** Lowercase, and never reused. */

package/dist/types/helpers/filters.d.ts

@@ -1,4 +1,4 @@
-import type { AclRule, FilterRule, Prefix } from "../schema";
+import type { AclRule, FilterRule, Prefix } from "../schema/index.js";
 /** What `Filters.antiAmplification` leaves alone. */
 export type AntiAmplificationOptions = {
     /** Prefixes inside the destinations whose UDP fragments pass: for a host that receives UDP too large for one packet, such as SIP or some VPNs. Every fragment after the first is dropped when absent. */

package/dist/types/helpers/index.d.ts

@@ -1,10 +1,10 @@
-export { Bgp } from "./bgp";
-export type { CommunityScheme, SanityLengths } from "./bgp";
-export { Checks } from "./checks";
-export type { TrustBoundary } from "./checks";
-export { Exchange } from "./exchange";
-export type { ExchangeMember, InternetExchange } from "./exchange";
-export { Filters } from "./filters";
-export { RouteServerConfig } from "./route-server";
-export type { RouteServer } from "./route-server";
-export type { AntiAmplificationOptions } from "./filters";
+export { Bgp } from "./bgp.js";
+export type { CommunityScheme, SanityLengths } from "./bgp.js";
+export { Checks } from "./checks.js";
+export type { TrustBoundary } from "./checks.js";
+export { Exchange } from "./exchange.js";
+export type { ExchangeMember, InternetExchange } from "./exchange.js";
+export { Filters } from "./filters.js";
+export { RouteServerConfig } from "./route-server.js";
+export type { RouteServer } from "./route-server.js";
+export type { AntiAmplificationOptions } from "./filters.js";

package/dist/types/helpers/route-server.d.ts

@@ -1,5 +1,5 @@
-import type { Family, IPv4, IPv6, Prefix } from "../schema";
-import type { ExchangeMember } from "./exchange";
+import type { Family, IPv4, IPv6, Prefix } from "../schema/index.js";
+import type { ExchangeMember } from "./exchange.js";
 /** A route server on an exchange's peering LAN: a server running BIRD 2 or OpenBGPD that passes every member's routes to every other member. */
 export type RouteServer = {
     /** Its name, such as `rs1`, written at the top of its config. */

package/dist/types/index.d.ts

@@ -1,8 +1,10 @@
-export { defineDevice, defineNetwork, secret, secretFile } from "./core/define";
-export { Utils } from "./core/utils";
-export type { Check, Community, Finding, NetBoxDevice, Network } from "./core/define";
-export type * from "./schema";
+export { defineDevice, defineNetwork, secret, secretFile } from "./core/define.js";
+export { Utils } from "./core/utils.js";
+export type { Check, Community, Finding, NetBoxDevice, Network } from "./core/define.js";
+export type * from "./schema/index.js";
+/** The platforms, their models and each model's ports, for types of your own: `PortName<"junos", "QFX5100-48S-6Q">` is each port of that model, such as `"10g-1"` or `"40g-6"`. */
+export type { ModelName, PlatformName, PortName } from "./platforms/catalog.js";
 /** Address helpers, for checks of your own. */
-export { Address } from "./core/address";
+export { Address } from "./core/address.js";
 /** Secrets, for tools of your own: a secret's value, text with every secret hidden, and how Circuit logs in to a device. */
-export { Secrets } from "./core/secrets";
+export { Secrets } from "./core/secrets.js";

package/dist/types/integrations/librenms.d.ts

@@ -1,5 +1,5 @@
-import type { Network } from "../core/define";
-import type { Device } from "../schema";
+import type { Network } from "../core/define.js";
+import type { Device } from "../schema/index.js";
 /** A device LibreNMS monitors whose settings differ from its config. */
 export type LibreNmsChange = {
     device: Device;

package/dist/types/integrations/netbox.d.ts

@@ -1,4 +1,4 @@
-import type { Network } from "../core/define";
+import type { Network } from "../core/define.js";
 /** Each kind of object Circuit writes, in the order they are made: each refers only to kinds before it, or waits for the next pass. */
 export type NetBoxKind = "tag" | "site" | "manufacturer" | "platform" | "device-type" | "role" | "vrf" | "vlan" | "device" | "interface" | "prefix" | "ip-range" | "ip" | "cable";
 /** One object to make, change or delete. */

package/dist/types/integrations/peeringdb.d.ts

@@ -1,4 +1,4 @@
-import type { Network } from "../core/define";
+import type { Network } from "../core/define.js";
 /** A change to send. `id` is set when the record exists and is updated in place. */
 export type PeeringDbChange = {
     summary: string;

package/dist/types/integrations/prometheus.d.ts

@@ -1,5 +1,5 @@
-import type { Network } from "../core/define";
-import type { Device } from "../schema";
+import type { Network } from "../core/define.js";
+import type { Device } from "../schema/index.js";
 export type PrometheusTarget = {
     targets: string[];
     labels: Record<string, string>;

package/dist/types/integrations/registries.d.ts

@@ -1,5 +1,5 @@
-import type { Family } from "../schema";
-import type { Registry } from "../schema/policy";
+import type { Family } from "../schema/index.js";
+import type { Registry } from "../schema/policy.js";
 export declare class Registries {
     /** The prefixes of one family a registry gives for a query. */
     static prefixes(name: Registry, query: string, family: Family): Promise<string[]>;

package/dist/types/platforms/bgp-wait.d.ts

@@ -1,4 +1,4 @@
-import type { BgpSession } from "./platform";
+import type { BgpSession } from "./platform.js";
 /** How long to wait, and how often to read again, both in seconds. */
 export type WaitLimits = {
     seconds: number;

package/dist/types/platforms/derive.d.ts

@@ -1,4 +1,4 @@
-import type { Device } from "../schema";
+import type { Device } from "../schema/index.js";
 /** A feature a platform renders once proved on one of its devices. */
 export type ProvedFeature = "bfd-timers" | "static-route-bfd" | "multihop-bfd" | "alarm-severity" | "mac-limit" | "ethertype-filter";
 export declare class Derive {

package/dist/types/platforms/fortios/firewall.d.ts

@@ -1,5 +1,5 @@
-import type { AclRule, Device, Family, FilterMatch, FilterRule, NatRule, Ports, Protocol } from "../../schema";
-import { FortiOsBlock } from "./tree";
+import type { AclRule, Device, Family, FilterMatch, FilterRule, NatRule, Ports, Protocol } from "../../schema/index.js";
+import { FortiOsBlock } from "./tree.js";
 export declare class FortiOsFirewall {
     /** IP protocol numbers, for a protocol the platform names only by number. */
     static readonly PROTOCOL_NUMBER: Record<Protocol, number>;

package/dist/types/platforms/fortios/index.d.ts

@@ -1,7 +1,7 @@
-import type { Neighbor } from "../../core/cabling";
-import type { Device, Family } from "../../schema";
-import { type ConsoleDialect } from "../../transport/console";
-import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform";
+import type { Neighbor } from "../../core/cabling.js";
+import type { Device, Family } from "../../schema/index.js";
+import { type ConsoleDialect } from "../../transport/console.js";
+import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform.js";
 /** What a session reads and writes: an SSH shell, or anything else that streams the CLI. */
 export type Channel = {
     write(data: string): unknown;

package/dist/types/platforms/fortios/names.d.ts

@@ -1,4 +1,4 @@
-import type { Device, Family } from "../../schema";
+import type { Device, Family } from "../../schema/index.js";
 type Addressed = {
     addresses?: readonly (string | {
         address: string;

package/dist/types/platforms/fortios/plan.d.ts

@@ -1,4 +1,4 @@
-import type { ApplyOptions, Plan } from "../platform";
+import type { ApplyOptions, Plan } from "../platform.js";
 export declare class FortiOsPlan {
     /** Objects every FortiGate running 6.2 is shipped with, which policies and profiles of the factory name. */
     private static readonly FACTORY_ADDRESSES;

package/dist/types/platforms/fortios/render.d.ts

@@ -1,4 +1,4 @@
-import type { Device, Helper, Severity } from "../../schema";
+import type { Device, Helper, Severity } from "../../schema/index.js";
 export type Section = (typeof FortiOsRender.SECTIONS)[number];
 export declare class FortiOsRender {
     /** Where the pre-login banner's text is kept. */

package/dist/types/platforms/fortios/routing.d.ts

@@ -1,5 +1,5 @@
-import type { Device, Family, Neighbor, NeighborSettings, PolicyRule } from "../../schema";
-import { FortiOsBlock } from "./tree";
+import type { Device, Family, Neighbor, NeighborSettings, PolicyRule } from "../../schema/index.js";
+import { FortiOsBlock } from "./tree.js";
 type AnyRule = PolicyRule<string, string>;
 type AnyNeighbor = Neighbor<string, string>;
 /** The lengths a prefix list's rule takes within its prefix. */

package/dist/types/platforms/index.d.ts

@@ -1,4 +1,4 @@
-import type { Platform } from "./platform";
+import type { Platform } from "./platform.js";
 /** Every platform the framework can render and apply, by name. */
 export declare class Platforms {
     private static readonly BY_NAME;

package/dist/types/platforms/junos/bgp.d.ts

@@ -1,5 +1,5 @@
-import type { Device, Neighbor, NeighborSettings } from "../../schema";
-import { type JunosStatements } from "./render";
+import type { Device, Neighbor, NeighborSettings } from "../../schema/index.js";
+import { type JunosStatements } from "./render.js";
 type AnyNeighbor = Neighbor<string, string>;
 /** BGP sessions, the policies they use, prefix sets and RPKI servers, added to one device's statements. */
 export declare class JunosBgp {

package/dist/types/platforms/junos/index.d.ts

@@ -1,7 +1,7 @@
-import type { Neighbor } from "../../core/cabling";
-import type { Device, Family } from "../../schema";
-import { type ConsoleDialect } from "../../transport/console";
-import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform";
+import type { Neighbor } from "../../core/cabling.js";
+import type { Device, Family } from "../../schema/index.js";
+import { type ConsoleDialect } from "../../transport/console.js";
+import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform.js";
 /** How a commit that could cut access is guarded: it rolls back after `minutes` unless `prove` shows access survived. */
 export type Guard = {
     minutes: number;

package/dist/types/platforms/junos/render.d.ts

@@ -1,4 +1,4 @@
-import type { Device, Interface, Port, Vrrp } from "../../schema";
+import type { Device, Interface, Port, Vrrp } from "../../schema/index.js";
 type AnyPort = Port<string, string, string, string>;
 type AnyInterface = Interface<string, string>;
 type LagInterface = Extract<AnyInterface, {

package/dist/types/platforms/line-diff.d.ts

@@ -1,4 +1,4 @@
-import type { Plan } from "./platform";
+import type { Plan } from "./platform.js";
 export type Dialect = {
     /** A line at the margin that opens a block, for platforms that do not indent a block's lines. */
     block: RegExp;

package/dist/types/platforms/platform.d.ts

@@ -1,8 +1,8 @@
-import type { Neighbor } from "../core/cabling";
-import type { Device, Family } from "../schema";
-import type { ConsoleDialect } from "../transport/console";
-import type { WaitLimits } from "./bgp-wait";
-import type { PlatformName } from "./catalog";
+import type { Neighbor } from "../core/cabling.js";
+import type { Device, Family } from "../schema/index.js";
+import type { ConsoleDialect } from "../transport/console.js";
+import type { WaitLimits } from "./bgp-wait.js";
+import type { PlatformName } from "./catalog.js";
 /** One part of a plan: what a reviewer reads, and what is sent. */
 export type Step = {
     title: string;

package/dist/types/platforms/raisecom-ros/index.d.ts

@@ -1,8 +1,8 @@
 import type { ClientChannel } from "ssh2";
-import type { Neighbor } from "../../core/cabling";
-import type { Device } from "../../schema";
-import { type ConsoleDialect } from "../../transport/console";
-import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform";
+import type { Neighbor } from "../../core/cabling.js";
+import type { Device } from "../../schema/index.js";
+import { type ConsoleDialect } from "../../transport/console.js";
+import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform.js";
 /** A session, and how to prove access in a fresh login: a new SSH session, or logging out and in again on the console. */
 export type Session = {
     channel: ClientChannel;

package/dist/types/platforms/raisecom-ros/render.d.ts

@@ -1,4 +1,4 @@
-import type { Device, SnmpUser } from "../../schema";
+import type { Device, SnmpUser } from "../../schema/index.js";
 /** The configuration a Raisecom ROS device should run. */
 export declare class RaisecomRosRender {
     /** The access-list that guards every management service. */

package/dist/types/platforms/routeros/index.d.ts

@@ -1,7 +1,7 @@
-import type { Neighbor } from "../../core/cabling";
-import type { Device, Family } from "../../schema";
-import { type ConsoleDialect } from "../../transport/console";
-import { type ApplyOptions, type BgpLogLine, type BgpSession, type HealthCheck, type HealthOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, type SwitchRules, Platform } from "../platform";
+import type { Neighbor } from "../../core/cabling.js";
+import type { Device, Family } from "../../schema/index.js";
+import { type ConsoleDialect } from "../../transport/console.js";
+import { type ApplyOptions, type BgpLogLine, type BgpSession, type HealthCheck, type HealthOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, type SwitchRules, Platform } from "../platform.js";
 export declare class RouterOs extends Platform {
     /** How the RouterOS console asks for a login. The flags after the user turn off colours and terminal detection, without which the console redraws every line. */
     static readonly CONSOLE: ConsoleDialect;

package/dist/types/platforms/routeros/plan.d.ts

@@ -1,4 +1,4 @@
-import type { ApplyOptions, Plan } from "../platform";
+import type { ApplyOptions, Plan } from "../platform.js";
 export declare class RouterOsPlan {
     private readonly sendSecrets;
     /** A plan line the apply handles itself: upload a certificate and its key, and import them. */

package/dist/types/platforms/routeros/render.d.ts

@@ -1,4 +1,4 @@
-import type { AclRule, Device, Ethertype, Interface, Port } from "../../schema";
+import type { AclRule, Device, Ethertype, Interface, Port } from "../../schema/index.js";
 /** A property value as a command takes it. `undefined` and `false` leave the property out. */
 export type Value = string | number | undefined | false;
 export type AnyPort = Port<string, string, string, string>;

package/dist/types/platforms/vrp/index.d.ts

@@ -1,7 +1,7 @@
-import type { Neighbor } from "../../core/cabling";
-import type { Device } from "../../schema";
-import { type ConsoleDialect } from "../../transport/console";
-import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform";
+import type { Neighbor } from "../../core/cabling.js";
+import type { Device } from "../../schema/index.js";
+import { type ConsoleDialect } from "../../transport/console.js";
+import { type ApplyOptions, type OsSupport, type Plan, type ReadOptions, type ReadSession, Platform } from "../platform.js";
 export declare class Vrp extends Platform {
     /** How the console asks for a login: the same question to change the password, always answered no, a system view left with `return`, and the line's banner after a logout or a refused password answered with Enter. Not yet proved on a device. */
     static readonly CONSOLE: ConsoleDialect;

package/dist/types/platforms/vrp/render.d.ts

@@ -1,4 +1,4 @@
-import type { Device } from "../../schema";
+import type { Device } from "../../schema/index.js";
 /** Builds the configuration as blocks: a header line, its indented lines, then `#`. */
 export declare class VrpRender {
     private readonly device;

package/dist/types/schema/device.d.ts

@@ -1,9 +1,9 @@
-import type { IP, Secret } from "./common";
-import type { AclRule, Firewall } from "./firewall";
-import type { Interface, Port, Vlan } from "./interfaces";
-import type { PrefixSet, RoutePolicy } from "./policy";
-import type { Routing } from "./routing";
-import type { Certificate, DhcpRelay, DhcpServer, FlowExport, Management, System, User } from "./system";
+import type { IP, Secret } from "./common.js";
+import type { AclRule, Firewall } from "./firewall.js";
+import type { Interface, Port, Vlan } from "./interfaces.js";
+import type { PrefixSet, RoutePolicy } from "./policy.js";
+import type { Routing } from "./routing.js";
+import type { Certificate, DhcpRelay, DhcpServer, FlowExport, Management, System, User } from "./system.js";
 /** How the framework reaches the device. */
 export type Connection<U extends string> = {
     /** Management address. Absent for a device reached only through its console, `console`. */

package/dist/types/schema/firewall.d.ts

@@ -1,4 +1,4 @@
-import type { Family, IP, Prefix, Rate } from "./common";
+import type { Family, IP, Prefix, Rate } from "./common.js";
 /** An IP protocol. `icmp` means ICMPv6 in an IPv6 rule. */
 export type Protocol = "tcp" | "udp" | "icmp" | "gre" | "esp" | "ah" | "ospf" | "vrrp";
 /** The state connection tracking assigns a packet. */

package/dist/types/schema/index.d.ts

@@ -1,8 +1,8 @@
-export type * from "./common";
-export type * from "./device";
-export type * from "./firewall";
-export type * from "./interfaces";
-export type * from "./policy";
-export type * from "./routing";
-export type * from "./system";
-export type * from "./time-zones";
+export type * from "./common.js";
+export type * from "./device.js";
+export type * from "./firewall.js";
+export type * from "./interfaces.js";
+export type * from "./policy.js";
+export type * from "./routing.js";
+export type * from "./system.js";
+export type * from "./time-zones.js";

package/dist/types/schema/interfaces.d.ts

@@ -1,4 +1,4 @@
-import type { InterfaceAddress, IP, MacAddress, Prefix, Secret } from "./common";
+import type { InterfaceAddress, IP, MacAddress, Prefix, Secret } from "./common.js";
 /** A VLAN. Its key in `vlans` is its name. */
 export type Vlan = {
     /** The VLAN's number on the wire, 1 to 4094. */
@@ -90,6 +90,10 @@ export type Link = {
     device: string;
     /** The port on that device. */
     port: string;
+    /**
+     * What is between the two ends when the cable is not direct, such as a carrier's local loop or L2 transport: `"Carrier A local loop"`. LLDP then sees the carrier's switches, not the far end, so `validate` does not compare LLDP on this port. Both ends name the same carrier.
+     */
+    through?: string;
 };
 /** A physical port. Ports a device does not declare are shut down. */
 export type Port<V extends string, A extends string, L extends string, F extends string> = Routed<F> & Switched<V> & {

package/dist/types/schema/policy.d.ts

@@ -1,4 +1,4 @@
-import type { Family, IP, Prefix } from "./common";
+import type { Family, IP, Prefix } from "./common.js";
 /** A standard BGP community, `asn:value`, for example `64500:100`. Each part is 0 to 65535. */
 export type StandardCommunity = `${number}:${number}`;
 /** A large BGP community, `asn:function:parameter`, for example `64500:1:6939`. Each part is 0 to 4294967295. */

package/dist/types/schema/routing.d.ts

@@ -1,4 +1,4 @@
-import type { Family, IP, Prefix, Secret } from "./common";
+import type { Family, IP, Prefix, Secret } from "./common.js";
 /** A route the device has without learning it. */
 export type StaticRoute<I extends string, F extends string> = {
     /** Destination. */

package/dist/types/schema/system.d.ts

@@ -1,5 +1,5 @@
-import type { IP, MacAddress, Prefix, Secret, Severity } from "./common";
-import type { TimeZone } from "./time-zones";
+import type { IP, MacAddress, Prefix, Secret, Severity } from "./common.js";
+import type { TimeZone } from "./time-zones.js";
 /** A software release track, as RouterOS names them. `long-term` changes least; `development` is the newest and least tested. */
 export type ReleaseChannel = "long-term" | "stable" | "testing" | "development";
 /** How bad an alarm is, most severe first, as ITU-T X.733 ranks them. */

package/dist/types/transport/console.d.ts

@@ -1,5 +1,5 @@
 import { type ClientChannel } from "ssh2";
-import type { Console, Device } from "../schema";
+import type { Console, Device } from "../schema/index.js";
 /** An open console: the stream to the device's CLI, and how to let it go. `close` waits for the console to go quiet, then lets the port go. */
 export type ConsoleSession = {
     channel: ClientChannel;

package/dist/types/transport/ssh.d.ts

@@ -1,5 +1,5 @@
 import { Client, type ClientChannel } from "ssh2";
-import type { Device } from "../schema";
+import type { Device } from "../schema/index.js";
 export type Login = {
     host: string;
     port?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@takodotid/circuit",
-    "version": "0.36.0",
+    "version": "0.37.0",
     "description": "Declarative, vendor-neutral network configuration: describe each device in TypeScript, and Circuit makes the device match. Alpha.",
     "keywords": [
         "network",
@@ -89,7 +89,7 @@
         "release": "bun scripts/release.ts",
         "prepare": "husky || true",
         "prepack": "bun run build",
-        "check": "bun run typecheck && bun run test && bun run format:check && bun run docs:build && bun run build && node dist/cli/index.js validate --config templates/single-site/circuit.config.ts && node dist/cli/index.js validate --config templates/edge-router/circuit.config.ts && node dist/cli/index.js validate --config templates/colocation/circuit.config.ts",
+        "check": "bun run typecheck && bun run test && bun run format:check && bun run docs:build && bun run build && bunx tsc -p test/package && node dist/cli/index.js validate --config templates/single-site/circuit.config.ts && node dist/cli/index.js validate --config templates/edge-router/circuit.config.ts && node dist/cli/index.js validate --config templates/colocation/circuit.config.ts",
         "agents:setup": "npx -y skills experimental_install"
     },
     "dependencies": {

package/src/core/cabling.ts

@@ -67,7 +67,7 @@ export class Cabling {
     /**
      * Warnings where LLDP and `link` disagree, from each device's own view: a cable in another port than `link` names, a cable `link` names that LLDP does not see, and another of our devices on a port without `link`.
      *
-     * Only ports where both ends run LLDP, by the config, are compared, and only on devices whose neighbors were read. LLDP can be off at the far end, so each is a warning.
+     * Only ports where both ends run LLDP, by the config, are compared, and only on devices whose neighbors were read. A link `through` a carrier is not compared. LLDP can be off at the far end, so each is a warning.
      */
     static compare(devices: readonly Device[], neighbors: ReadonlyMap<string, readonly Neighbor[]>): Finding[] {
         const findings: Finding[] = [];
@@ -97,6 +97,9 @@ export class Cabling {
                     continue;
                 }
 
+                // Through a carrier, LLDP sees the carrier's switches, not the far end.
+                if (link.through) continue;
+
                 const far = devices.find((candidate) => candidate.name === link.device);
                 if (!far || !Cabling.runsOn(far, link.port)) continue;
 

package/src/core/cross-checks.ts

@@ -97,7 +97,7 @@ export class CrossChecks {
         return undefined;
     }
 
-    /** A link names a device and port that exist, the far end links back, and both ends carry the same VLANs the same way, with the same MTU, speed and addresses. */
+    /** A link names a device and port that exist, the far end links back through the same carrier, and both ends carry the same VLANs the same way, with the same MTU, speed and addresses. */
     private static checkLinks(devices: readonly Device[]): Finding[] {
         const findings: Finding[] = [];
         const byName = new Map(devices.map((device) => [device.name, device]));
@@ -132,6 +132,11 @@ export class CrossChecks {
                     continue;
                 }
 
+                if (link.through !== farPort.link?.through) {
+                    const say = (through: string | undefined) => (through ? `through ${through}` : "direct");
+                    report(`${say(link.through)} here, and ${say(farPort.link?.through)} on ${link.device} ${link.port}`);
+                }
+
                 const near = CrossChecks.carrierOf(device, portName, port);
                 const away = CrossChecks.carrierOf(far, link.port, farPort);
 

package/src/core/topology.ts

@@ -203,7 +203,8 @@ export class Topology {
                     ? Topology.deviceId(far.name)
                     : graph.node(`missing:${link.device}`, "outside", link.device, ["named by a link, and not in the network"]);
 
-                const cableLine = `${here} to ${there}`;
+                const through = link.through ? `, through ${link.through}` : "";
+                const cableLine = `${here} to ${there}${through}`;
 
                 // A LAG's member cables to one LAG on the far side are one edge.
                 const lag = port.lag;
@@ -214,7 +215,7 @@ export class Topology {
                 if (bundle) {
                     bundle.members++;
                     bundle.cable.detail.push(cableLine);
-                    bundle.cable.label = `${lag} to ${farLag}, ${bundle.members} cables`;
+                    bundle.cable.label = `${lag} to ${farLag}, ${bundle.members} cables${through}`;
                     continue;
                 }
 
@@ -224,7 +225,7 @@ export class Topology {
                     layer: "l1",
                     from: Topology.deviceId(device.name),
                     to,
-                    label: isBundle ? `${lag} to ${farLag}` : `${portName} to ${link.port}`,
+                    label: `${isBundle ? `${lag} to ${farLag}` : `${portName} to ${link.port}`}${through}`,
                     detail: [cableLine],
                     ...(linksBack ? {} : { oneSided: true as const }),
                 });

package/src/index.ts

@@ -3,6 +3,9 @@ export { Utils } from "./core/utils";
 export type { Check, Community, Finding, NetBoxDevice, Network } from "./core/define";
 export type * from "./schema";
 
+/** The platforms, their models and each model's ports, for types of your own: `PortName<"junos", "QFX5100-48S-6Q">` is each port of that model, such as `"10g-1"` or `"40g-6"`. */
+export type { ModelName, PlatformName, PortName } from "./platforms/catalog";
+
 /** Address helpers, for checks of your own. */
 export { Address } from "./core/address";
 

package/src/schema/interfaces.ts

@@ -92,6 +92,10 @@ export type Link = {
     device: string;
     /** The port on that device. */
     port: string;
+    /**
+     * What is between the two ends when the cable is not direct, such as a carrier's local loop or L2 transport: `"Carrier A local loop"`. LLDP then sees the carrier's switches, not the far end, so `validate` does not compare LLDP on this port. Both ends name the same carrier.
+     */
+    through?: string;
 };
 
 /** A physical port. Ports a device does not declare are shut down. */

package/src/studio/data.ts

@@ -37,6 +37,8 @@ export type Cable = {
     lag?: string;
     farLag?: string;
     description?: string;
+    /** What is between the two ends, such as a carrier's local loop. */
+    through?: string;
     /** VLANs carried, as `name (id)`, from the port or its LAG. */
     vlans: string[];
     /** The far end does not name this cable back. */
@@ -227,6 +229,7 @@ export class StudioModel {
                     ...(port.lag ? { lag: port.lag } : {}),
                     ...(farPort?.lag ? { farLag: farPort.lag } : {}),
                     ...(port.description ? { description: port.description } : {}),
+                    ...(link.through ? { through: link.through } : {}),
                     vlans: vlansOf(device, portName),
                     ...(linksBack ? {} : { oneSided: true as const }),
                 });

package/src/studio/public/tables.js

@@ -1021,19 +1021,33 @@ export class Tables {
 
     /** @param {HTMLElement} container */
     static #cablesView(container) {
+        // A carrier column only when a cable runs through one.
+        const carried = Tables.#data.cables.some((cable) => cable.through);
+
         container.append(
             Tables.heading("Cables", "h2"),
             Tables.empty("Every cable a port's link names, once, from the end that names it first."),
             Tables.#data.cables.length
                 ? Tables.of({
                       csv: "cables",
-                      head: ["Device", "Port", "Far device", "Far port", "LAG", "VLANs", "Description", ""].map((label) => ({ label })),
+                      head: [
+                          "Device",
+                          "Port",
+                          "Far device",
+                          "Far port",
+                          ...(carried ? ["Through"] : []),
+                          "LAG",
+                          "VLANs",
+                          "Description",
+                          "",
+                      ].map((label) => ({ label })),
                       rows: Tables.#data.cables.map((cable) => ({
                           cells: [
                               Tables.deviceLink(cable.device),
                               cable.port,
                               Tables.deviceLink(cable.farDevice),
                               cable.farPort,
+                              ...(carried ? [cable.through ?? ""] : []),
                               [cable.lag, cable.farLag].filter(Boolean).join(" to "),
                               cable.vlans.join(", "),
                               cable.description ?? "",