@takodotid/circuit 0.23.0 → 0.25.0

package/README.md

@@ -10,9 +10,9 @@ Documentation: [circuit.tako.id](https://circuit.tako.id)
 ## What it does
 
 - **One file per device.** VLANs, ports, addresses, routing, firewall, users and services, written in TypeScript. Your editor checks every name you refer to as you type.
-- **The same words for every vendor.** MikroTik RouterOS 7, Huawei VRP and Raisecom ROS each get their own commands. What a device cannot do is an error before anything is sent.
+- **The same words for every vendor.** MikroTik RouterOS 7, Huawei VRP, Raisecom ROS and Juniper Junos each get their own commands. What a device cannot do is an error before anything is sent.
 - **The file is the whole truth.** A port, user or service the file does not mention is removed or turned off, so nothing set by hand lingers.
-- **See every change first.** `diff` shows it offline, `apply` plans it against the live device, and nothing is sent without `--confirm`. On RouterOS, a change undoes itself if Circuit cannot log in again afterwards.
+- **See every change first.** `diff` shows it offline, `apply` plans it against the live device, and nothing is sent without `--confirm`. On RouterOS and Junos, a change undoes itself if Circuit cannot log in again afterwards.
 - **History in git.** Each device's last snapshot is kept in `.circuit/state/`, so the repository's history is the network's history.
 - **Rules of your own.** Checks run on every change, and presets give ready-made filters, BGP policies and checks.
 - **Secrets stay out of the repository.** They come from `.env` or 1Password, and never appear in a plan or a snapshot.
@@ -25,6 +25,15 @@ Documentation: [circuit.tako.id](https://circuit.tako.id)
     <img src="docs/public/screenshots/studio-light.png" alt="Studio's VLAN graph with devices that differ from their snapshots marked by orange dashed borders, beside the layer details and legend.">
 </picture>
 
+## Circuit Academy
+
+New to networking? [Circuit Academy](https://circuit.tako.id/academy/) teaches it from the very start, in lessons you try in the browser rather than only read: packets, addresses, switches and routers first, then VLANs, DHCP, NAT and firewalls written down in Circuit, up to BGP and an edge router of your own. A certification is coming.
+
+<picture>
+    <source media="(prefers-color-scheme: dark)" srcset="docs/public/screenshots/academy-dark.png">
+    <img src="docs/public/screenshots/academy-light.png" alt="A Circuit Academy lesson on switches: a frame from a laptop to a printer has just been flooded out of every port, and the switch has learned which port the laptop is behind.">
+</picture>
+
 ## Start
 
 You need [Node.js](https://nodejs.org) 20.12 or newer, or [Bun](https://bun.sh). Then:
@@ -35,7 +44,7 @@ npx @takodotid/circuit new        # or: pnpm dlx @takodotid/circuit new, bunx @t
 
 It asks which kind of network you have, creates a project with example devices, and installs Circuit. [Getting started](https://circuit.tako.id/guide/getting-started) walks through the first run.
 
-Circuit supports MikroTik RouterOS 7, Huawei VRP and Raisecom ROS. Releases are on the [releases page](https://github.com/takodotid/circuit/releases), on npm and on GitHub Packages.
+Circuit supports MikroTik RouterOS 7, Huawei VRP, Raisecom ROS and Juniper Junos. Releases are on the [releases page](https://github.com/takodotid/circuit/releases), on npm and on GitHub Packages.
 
 ## Working on Circuit
 

package/dist/chunks/{index-n4zpd25n.js → index-wm9ypkjq.js}

@@ -12,8 +12,16 @@ import {
   host2
 } from "./index-v8zgr7wm.js";
 
-// src/adapters/devices/raisecom-ros/models.ts
+// src/adapters/devices/junos/models.ts
 var models = {
+  "QFX5100-48S-6Q": {
+    ports: { "40g": 6, "10g": 48, "1g": 2 },
+    spelling: { "40g": "et-0/0/{n+47}", "10g": "xe-0/0/{n-1}", "1g": "em{n-1}" }
+  }
+};
+
+// src/adapters/devices/raisecom-ros/models.ts
+var models2 = {
   "RAX721-C-6C48": {
     ports: { "100g": 6, "25g": 24, "10g": 24 },
     spelling: { "100g": "hundredgige 1/1/{n}", "25g": "twenty-fivegige 1/2/{n}", "10g": "tengigabitethernet 1/3/{n}" }
@@ -21,7 +29,7 @@ var models = {
 };
 
 // src/adapters/devices/routeros/models.ts
-var models2 = {
+var models3 = {
   "CCR2216-1G-12XS-2XQ": {
     ports: { "100g": 2, "25g": 12, "1g": 1 },
     spelling: { "100g": "qsfp28-{n}-1", "25g": "sfp28-{n}", "1g": "ether{n}" }
@@ -29,12 +37,12 @@ var models2 = {
 };
 
 // src/adapters/devices/vrp/models.ts
-var models3 = {
+var models4 = {
   "CE6855-48S6Q-HI": { ports: { "10g": 48, "40g": 6 }, spelling: { "10g": "10GE1/0/{n}", "40g": "40GE1/0/{n}" } }
 };
 
 // src/adapters/devices/catalog.ts
-var catalog = { routeros: models2, vrp: models3, "raisecom-ros": models };
+var catalog = { routeros: models3, vrp: models4, "raisecom-ros": models2, junos: models };
 function portsOf(platform, model) {
   const spec = catalog[platform]?.[model];
   if (!spec)
@@ -47,7 +55,7 @@ function spell(platform, model, port) {
   const template = parts && spec?.spelling[parts[1]];
   if (!template)
     throw new Error(`${model} has no port ${port}`);
-  return template.replace("{n}", parts[2]);
+  return template.replace(/\{n([+-]\d+)?\}/, (_, shift) => String(Number(parts[2]) + Number(shift ?? 0)));
 }
 
 // src/core/graph.ts
@@ -92,7 +100,7 @@ function holdersOf(devices) {
     if (!isCidr2(address))
       return [];
     const peer = typeof entry === "string" ? undefined : entry.peer;
-    return [{ device, name, address, peer, vrrp: settings.vrrp ?? [] }];
+    return [{ device, name, address, peer, vrrp: settings.vrrp ?? [], vrf: settings.vrf }];
   })));
 }
 function describeDevice(device) {

package/dist/chunks/{server-ckdy25w2.js → server-n2q4tzy4.js}

@@ -1,6 +1,6 @@
 import {
   packageRoot
-} from "./index-n4zpd25n.js";
+} from "./index-wm9ypkjq.js";
 
 // src/studio/server.ts
 import { execFile as execFile2, spawn } from "node:child_process";