proschi 0.3.0 → 0.5.0

package/grammar/proschi.tmLanguage.json

@@ -187,6 +187,18 @@
         {
           "include": "#comment"
         },
+        {
+          "comment": "`x200` (fan-out) and `~2MB` (payload size) at the start of a step label, in either order.",
+          "match": "\\G\\s*(x\\d+|~\\d+(?:\\.\\d+)?[KMGT]?B)(?=\\s|$)(?:\\s+(x\\d+|~\\d+(?:\\.\\d+)?[KMGT]?B)(?=\\s|$))?",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.label-prefix.proschi"
+            },
+            "2": {
+              "name": "constant.numeric.label-prefix.proschi"
+            }
+          }
+        },
         {
           "include": "#payload"
         },
@@ -384,12 +396,12 @@
     },
     "section-keyword": {
       "name": "keyword.other.proschi",
-      "match": "\\b(?:traffic|requirements|capacity|entity|decision|test|mix|durable|volatile|survive|because|rejected|calls|before|never|every|responds|writes|responding|handles|failure|path|replicas|any|in|scenario|latency|availability|cost|no|from|to|has|of|node|key|index|unique|optional|p50|p90|p95|p99|p999)\\b"
+      "match": "\\b(?:traffic|requirements|capacity|entity|decision|test|mix|durable|volatile|survive|because|rejected|calls|before|after|never|every|waits|for|starts|at|or|responds|writes|reads|responding|handles|failure|path|replicas|any|strong|eventual|store|in|scenario|latency|availability|cost|shards|consistency|bandwidth|egress|no|from|to|has|of|node|key|index|unique|optional|p50|p90|p95|p99|p999)\\b"
     },
     "quantity": {
-      "comment": "A number with an optional fraction, magnitude and unit, attached or one space away: 120, 2.5, 50ms, 100k rps, 99.9%, 4xx.",
+      "comment": "A number with an optional fraction, magnitude and unit, attached or one space away: 120, 2.5, 50ms, 100k rps, 99.9%, 4xx, 500 MB/s, 0.05 usd/GB.",
       "name": "constant.numeric.proschi",
-      "match": "\\b\\d+(?:\\.\\d+)?(?:[A-Za-z]+(?:/[A-Za-z]+)?|%)?(?: (?:rps|rpm|rpd|ms|s|usd/month)\\b| %)?"
+      "match": "\\b\\d+(?:\\.\\d+)?(?:[A-Za-z]+(?:/[A-Za-z]+)?|%)?(?: (?:rps|rpm|rpd|ms|s|usd/month|usd/GB|MB/s|GB/s)\\b| %)?"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proschi",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Command-line checker and language server for Proschi architecture diagrams",
   "license": "MIT",
   "repository": {

package/schema/proschi-diagram.schema.json

@@ -593,6 +593,23 @@
         "responseLoc": {
           "$ref": "#/$defs/loc",
           "description": "The `-->` line that answered the request."
+        },
+        "multiplier": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "`x200` at the start of the label: the step happens this many times per request (fan-out). Absent means 1."
+        },
+        "sizeBytes": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "`~2MB` at the start of the label: payload size in bytes (decimal units)."
+        },
+        "access": {
+          "enum": [
+            "read",
+            "write"
+          ],
+          "description": "From the HTTP method, or the first word of the label (INSERT, SET, PUBLISH, … write); every request step has one."
         }
       },
       "required": [
@@ -608,12 +625,13 @@
         "executionType",
         "isParallel",
         "isConditional",
+        "access",
         "loc"
       ],
       "additionalProperties": false
     },
     "selector": {
-      "description": "A node id, an exact tech stack, or every node of a kind (`any cache`).",
+      "description": "A node id, an exact tech stack, every node of a kind (`any cache`), every data store of a consistency (`any strong store`), or a union (`X or Y`).",
       "oneOf": [
         {
           "type": "object",
@@ -646,6 +664,10 @@
               "enum": [
                 "client",
                 "edge",
+                "cdn",
+                "loadbalancer",
+                "gateway",
+                "dns",
                 "service",
                 "function",
                 "cache",
@@ -663,6 +685,37 @@
             "kind"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "consistency": {
+              "enum": [
+                "strong",
+                "eventual"
+              ]
+            }
+          },
+          "required": [
+            "consistency"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "anyOf": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/selector"
+              },
+              "minItems": 2
+            }
+          },
+          "required": [
+            "anyOf"
+          ],
+          "additionalProperties": false
         }
       ]
     },
@@ -732,6 +785,10 @@
               "type": "string",
               "description": "Left out: every use case with traffic."
             },
+            "scenario": {
+              "type": "string",
+              "description": "`scenario \"S\"`: the latency of one scenario of the use case."
+            },
             "maxMs": {
               "type": "number"
             },
@@ -867,6 +924,35 @@
           "type": "boolean",
           "description": "`durable` (true) or `volatile` (false)."
         },
+        "readRps": {
+          "type": "number",
+          "description": "`reads`: read requests per second per replica."
+        },
+        "writeRps": {
+          "type": "number",
+          "description": "`writes`: write requests per second per replica."
+        },
+        "shards": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "Write capacity of single-primary stores scales with shards."
+        },
+        "consistency": {
+          "enum": [
+            "strong",
+            "eventual"
+          ]
+        },
+        "bandwidthMBps": {
+          "type": "number",
+          "exclusiveMinimum": 0,
+          "description": "`bandwidth`: megabytes per second per replica."
+        },
+        "egressUsdPerGb": {
+          "type": "number",
+          "minimum": 0,
+          "description": "`egress`: price of data leaving the node, in USD per GB."
+        },
         "loc": {
           "$ref": "#/$defs/loc"
         }
@@ -1214,6 +1300,122 @@
             "loc"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "const": "neverWaits"
+            },
+            "useCase": {
+              "type": "string"
+            },
+            "scenario": {
+              "type": "string"
+            },
+            "target": {
+              "$ref": "#/$defs/selector"
+            },
+            "loc": {
+              "$ref": "#/$defs/loc"
+            }
+          },
+          "required": [
+            "kind",
+            "useCase",
+            "target",
+            "loc"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "const": "after"
+            },
+            "useCase": {
+              "type": "string"
+            },
+            "scenario": {
+              "type": "string"
+            },
+            "target": {
+              "$ref": "#/$defs/selector"
+            },
+            "after": {
+              "$ref": "#/$defs/selector"
+            },
+            "loc": {
+              "$ref": "#/$defs/loc"
+            }
+          },
+          "required": [
+            "kind",
+            "useCase",
+            "target",
+            "after",
+            "loc"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "const": "senderCalls"
+            },
+            "useCase": {
+              "type": "string"
+            },
+            "from": {
+              "$ref": "#/$defs/selector"
+            },
+            "to": {
+              "$ref": "#/$defs/selector"
+            },
+            "quantifier": {
+              "enum": [
+                "some",
+                "never"
+              ]
+            },
+            "loc": {
+              "$ref": "#/$defs/loc"
+            }
+          },
+          "required": [
+            "kind",
+            "from",
+            "to",
+            "quantifier",
+            "loc"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "const": "startsAt"
+            },
+            "useCase": {
+              "type": "string"
+            },
+            "target": {
+              "$ref": "#/$defs/selector"
+            },
+            "loc": {
+              "$ref": "#/$defs/loc"
+            }
+          },
+          "required": [
+            "kind",
+            "useCase",
+            "target",
+            "loc"
+          ],
+          "additionalProperties": false
         }
       ]
     }