.dir-locals.el

@@ -0,0 +1,22 @@
+((typescript-mode
+  . ((eval
+      . (progn
+          ;; For TIDE:
+           (setq tide-tsserver-executable
+                   (concat
+                    (let ((d (dir-locals-find-file ".")))
+                      (if (stringp d) d (car d)))
+                    "node_modules/typescript/lib/tsserver.js"))
+           ;; For LSP:
+           (require 'lsp-javascript)
+           (let ((node-modules (concat
+                                (let ((d (dir-locals-find-file ".")))
+                                  (if (stringp d) d (car d)))
+                                "node_modules/")))
+             (lsp-dependency 'typescript-language-server
+                             `(:system ,(concat node-modules
+                                                "typescript-language-server/lib/cli.js")))
+             (lsp-dependency 'typescript
+                             `(:system ,(concat node-modules
+                                                "typescript/lib/tsserver.js")))))
+      ))))

Makefile

@@ -24,17 +24,8 @@ all:
 watch:
 	inotifytest make -j$$(nproc) all
 
-PROTOCOLS_BRANCH=main
 pull-protocols:
 	git subtree pull -P packages/core/protocols \
 		-m 'Merge latest changes from the syndicate-protocols repository' \
 		git@git.syndicate-lang.org:syndicate-lang/syndicate-protocols \
-		$(PROTOCOLS_BRANCH)
-push-protocols:
-	git subtree push -P packages/core/protocols \
-		git@git.syndicate-lang.org:syndicate-lang/syndicate-protocols \
-		$(PROTOCOLS_BRANCH)
-
-fixcopyright:
-	-fixcopyright.rkt --preset-typescript --file-pattern 'packages/**.ts' GPL-3.0-or-later
-	-fixcopyright.rkt --preset-javascript --file-pattern 'packages/**.js' GPL-3.0-or-later
+		main

Makefile.generic-package

@@ -0,0 +1,8 @@
+all:
+	yarn install
+
+clean:
+	rm -rf lib dist .nyc_output coverage tsconfig.tsbuildinfo
+
+veryclean: clean
+	rm -rf node_modules package-lock.json

README.md

@@ -11,8 +11,23 @@ The `main` branch is where active development happens:
 
     git clone -b main https://git.syndicate-lang.org/syndicate-lang/syndicate-js
 
+An earlier TypeScript+JavaScript implementation from early 2021 (the
+primary difference to `main` being a lack of object-capability
+support) can be found on the `typescript1` branch:
+
+    git clone -b typescript1 https://git.syndicate-lang.org/syndicate-lang/syndicate-js
+
+Finally, the `babel-based` branch is from 2018, and is an
+implementation for JavaScript only. It extends babel with new syntax
+and new plugins, (rather than implementing its own error-tolerant
+parser, like `typescript1` and `main`):
+
+    git clone -b babel-based https://git.syndicate-lang.org/syndicate-lang/syndicate-js
+
 ## Building
 
+*These instructions are for the `main` branch.*
+
 This project uses [`yarn`](https://yarnpkg.com/), not `npm`.
 
 The repository is a monorepo, using
@@ -124,19 +139,19 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 <!-- then a file `src/index.js`: -->
 
 <!-- ```javascript -->
-<!-- const { LaterThan } = activate require("@syndicate-lang/driver-timer"); -->
+<!-- const { TimeLaterThan } = activate require("@syndicate-lang/driver-timer"); -->
 
 <!-- spawn named 'ticker' { -->
 <!--   field this.counter = 0; -->
-<!--   field this.deadline = +(new Date()) / 1000.0; -->
+<!--   field this.deadline = +(new Date()); -->
 
 <!--   on start { console.log('ticker starting'); } -->
 <!--   on stop  { console.log('ticker stopping'); } -->
 
-<!--   on asserted LaterThan(this.deadline) { -->
+<!--   on asserted TimeLaterThan(this.deadline) { -->
 <!--     this.counter++; -->
 <!--     console.log('tick', new Date(), this.counter); -->
-<!--     this.deadline += 1; -->
+<!--     this.deadline += 1000; -->
 <!--   } -->
 
 <!--   stop on (this.counter == 5); -->
@@ -161,18 +176,3 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 <!--     tick 2018-11-05T14:23:31.707Z 5 -->
 <!--     ticker stopping -->
 
-## Older versions
-
-An earlier TypeScript+JavaScript implementation from early 2021 (the
-primary difference to `main` being a lack of object-capability
-support) can be found on the `typescript1` branch:
-
-    git clone -b typescript1 https://git.syndicate-lang.org/syndicate-lang/syndicate-js
-
-Finally, the `babel-based` branch is from 2018, and is an
-implementation for JavaScript only. It extends babel with new syntax
-and new plugins (rather than implementing its own error-tolerant
-parser, like `typescript1` and `main`):
-
-    git clone -b babel-based https://git.syndicate-lang.org/syndicate-lang/syndicate-js
-

TODO.md

@@ -22,7 +22,7 @@
 
  - [DONE] `during/spawn`
  - [DONE] `during`
- - [DONE] `let { LaterThan } = activate require("@syndicate-lang/driver-timer");`
+ - [DONE] `let { TimeLaterThan } = activate require("@syndicate-lang/driver-timer");`
  - [DONE] `react`
  - [DONE] `spawn*` or similar - looks like `spawn on start { ... }` will do the trick
  - [DONE] activation

examples/example-simple-chat/index.html

@@ -15,8 +15,11 @@
     <section>
       <form id="nym_form" name="nym_form">
 	<fieldset>
-	  <label class="control-label" for="route">Dataspace address:</label>
-	  <input type="text" id="route" name="route" value="">
+	  <label class="control-label" for="wsurl">Server:</label>
+	  <input type="text" id="wsurl" name="wsurl" value="">
+
+	  <label class="control-label" for="servercap">Capability:</label>
+	  <input type="text" id="servercap" name="servercap" value='<ref "syndicate" [] #[pkgN9TBmEd3Q04grVG4Zdw==]>'>
 
 	  <label class="control-label" for="nym">Nym:</label>
 	  <input type="text" id="nym" name="nym" value="">

examples/example-simple-chat/package.json

@@ -16,17 +16,17 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
     "@syndicate-lang/core": "*",
     "@syndicate-lang/html": "*",
     "@syndicate-lang/ws-relay": "*"
   },
   "devDependencies": {
-    "@preserves/schema-cli": ">=0.995.201",
+    "@preserves/core": ">=0.19",
+    "@preserves/schema": ">=0.20",
     "@syndicate-lang/ts-plugin": "*",
     "@syndicate-lang/tsc": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/example-simple-chat/server-config/standard-dataspace.pr

@@ -1,9 +1,2 @@
 let ?ds = dataspace
-
-# Connect using <route [<ws "...">] <ref {oid: "syndicate" sig: #[acowDB2/oI+6aSEC3YIxGg]}>
-<bind <ref {oid: "syndicate" key: #x""}> $ds #f>
-
-# Connect using <route [<ws "...">] <noise { service: "syndicate", key: #x"21f6cd4e11e7e37711d6b3084ff18cded8fc8abf293aa47d43e8bb86dda65516" }>>
-let ?sk = #x"7626eb6c0ee79cb928a0c3f6e29621e9119da6735859f1425956a49fd937e586"
-let ?pk = #x"21f6cd4e11e7e37711d6b3084ff18cded8fc8abf293aa47d43e8bb86dda65516"
-<bind <noise { service: "syndicate", key: $pk, secretKey: $sk }> $ds #f>
+<bind "syndicate" #x"" $ds>

examples/example-simple-chat/src/index.ts

@@ -1,18 +1,18 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
 /// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { fromJS, Bytes, Dataspace, Ref, AnyValue, Reader, Schemas, stringify } from "@syndicate-lang/core";
+import { Dataspace, Ref, Sturdy, AnyValue, Reader, Schemas, Embedded } from "@syndicate-lang/core";
 import { boot as bootHtml, Anchor, template as html, HtmlFragments, GlobalEvent, UIAttribute, UIChangeableProperty } from "@syndicate-lang/html";
 import { boot as bootWakeDetector, WakeEvent } from "./wake-detector";
-import { boot as bootWsRelay, contactRemote } from "@syndicate-lang/ws-relay";
+import { boot as bootWsRelay, ForceRelayDisconnect, RelayAddress, Resolved } from "@syndicate-lang/ws-relay";
 import { Present, Says } from './gen/simpleChatProtocol';
-import G = Schemas.gatekeeper;
-import N = Schemas.noise;
+
+const Transport = Schemas.transportAddress;
 
 export function main() {
     document.getElementById('chat_form')!.onsubmit = e => { e.preventDefault(); return false; };
     document.getElementById('nym_form')!.onsubmit = e => { e.preventDefault(); return false; };
-    setDataspaceAddress();
+    setWsurl();
     setUsernameIfUnset();
     document.getElementById('chat_input')!.focus();
 
@@ -30,94 +30,69 @@ function bootChat(ds: Ref) {
             field nym: string = '';
             on asserted UIChangeableProperty('#nym', 'value', $v: string) => nym.value = v;
 
-            during UIChangeableProperty('#route', 'value', $routeText: string) => {
-                let route: G.Route<Ref> | null = null;
-                try {
-                    route = G.asRoute(new Reader<Ref>(routeText).next());
-                } catch (e) {
-                    console.error(e);
+            during UIChangeableProperty('#wsurl', 'value', $wsurl: string) =>
+                during UIChangeableProperty('#servercap', 'value', $servercapText: string) => {
+                    let servercap: AnyValue | null = null;
+                    try {
+                        const a = new Reader<Ref>(servercapText).next();
+                        Sturdy.asSturdyRef(a); // throws if invalid
+                        servercap = a;
+                    } catch (e) {
+                        console.error(e);
+                    }
+                    assert UIAttribute('#servercap', 'class', 'invalid') when (!servercap);
+                    if (wsurl && servercap) {
+                        contactRemote(wsurl, servercap);
+                    }
                 }
-                assert UIAttribute('#route', 'class', 'invalid') when (!route);
-                if (route) {
-                    console.log('contactRemote', route);
-                    contactRemote(route, (remoteDs, control, addr) => {
-                        on message WakeEvent() => at control {
-                            send message G.ForceDisconnect();
-                        }
-    
-                        outputState('connected', 'connected to ' + stringify(addr));
-                        on stop outputState('disconnected', 'disconnected from ' + stringify(addr));
-    
-                        on message GlobalEvent('#send_chat', 'click', _) => {
-                            const inp = document.getElementById("chat_input") as HTMLInputElement;
-                            var utterance = inp.value;
-                            inp.value = '';
-                            if (utterance) {
-                                at remoteDs {
-                                    send message Says({ who: nym.value, what: utterance });
-                                }
+
+            function contactRemote(wsurl: string, servercap: AnyValue) {
+                during Resolved({
+                    "addr": RelayAddress(Transport.WebSocket(wsurl)),
+                    "sturdyref": servercap,
+                    "resolved": $remoteDs_e: Embedded,
+                }) => {
+                    const remoteDs = remoteDs_e.embeddedValue;
+
+                    on message WakeEvent() =>
+                        send message ForceRelayDisconnect(RelayAddress(Transport.WebSocket(wsurl)));
+
+                    outputState('connected', 'connected to ' + wsurl);
+                    on stop outputState('disconnected', 'disconnected from ' + wsurl);
+
+                    on message GlobalEvent('#send_chat', 'click', _) => {
+                        const inp = document.getElementById("chat_input") as HTMLInputElement;
+                        var utterance = inp.value;
+                        inp.value = '';
+                        if (utterance) {
+                            at remoteDs {
+                                send message Says({ who: nym.value, what: utterance });
                             }
                         }
-    
-                        at remoteDs {
-                            assert Present(nym.value);
-    
-                            const ui = new Anchor();
-                            during Present($who: string) => at ds {
-                                assert ui.context(who).html('#nymlist', html`<li>${who}</li>`);
-                            }
-    
-                            on message Says({ "who": $who: string, "what": $what: string }) => {
-                                outputUtterance(who, what);
-                            }
+                    }
+
+                    at remoteDs {
+                        assert Present(nym.value);
+
+                        const ui = new Anchor();
+                        during Present($who: string) => at ds {
+                            assert ui.context(who).html('#nymlist', html`<li>${who}</li>`);
                         }
-                    }, ds);
+
+                        on message Says({ "who": $who: string, "what": $what: string }) => {
+                            outputUtterance(who, what);
+                        }
+                    }
                 }
             }
         }
     }
 }
 
-function setDataspaceAddress() {
-    const route = document.getElementById('route')! as HTMLInputElement;
-    if (route.value === '') {
-        const isSecure = (document.location.protocol ?? '').toLowerCase().endsWith('s:');
-        const localWs = isSecure ? 'wss' : 'ws';
-        const wsurls = [
-            `wss://generic-dataspace.demo.leastfixedpoint.com/`,
-            `${localWs}://${document.location.hostname}:9001/`,
-        ];
-        const transports: AnyValue[] =
-            wsurls.map(u => fromJS(Schemas.transportAddress.WebSocket(u)));
-
-        route.value = stringify(G.Route<Ref>({
-            "transports": transports,
-            "pathSteps": [G.PathStep({
-                "stepType": N.$noise,
-                "detail": fromJS(N.NoiseSpec({
-                    "service": "syndicate",
-                    "key": Bytes.fromHex("21f6cd4e11e7e37711d6b3084ff18cded8fc8abf293aa47d43e8bb86dda65516"),
-                    "protocol": N.NoiseProtocol.absent(),
-                    "preSharedKeys": N.NoisePreSharedKeys.absent(),
-                })),
-            })],
-        }));
-
-        // To use a sturdyref instead:
-        //
-        // route.value = stringify(G.Route<Ref>({
-        //     "transports": transports,
-        //     "pathSteps": [G.PathStep({
-        //         "stepType": Sturdy.$ref,
-        //         "detail": fromJS(Sturdy.Parameters({
-        //             "oid": "syndicate",
-        //             "sig": Bytes.fromHex('69ca300c1dbfa08fba692102dd82311a'),
-        //             "caveats": Sturdy.CaveatsField.absent(),
-        //         })),
-        //     })],
-        // }));
-        //
-        // ... and of course you can chain these things, depending on server setup.
+function setWsurl() {
+    const wsurl = document.getElementById('wsurl')! as HTMLInputElement;
+    if (wsurl.value === '') {
+        wsurl.value = `ws://${document.location.hostname}:9001/`;
     }
 }
 

examples/example-simple-chat/style.css

@@ -100,10 +100,6 @@ div.state_connected {
     font-size: smaller;
 }
 
-#route.invalid {
+#servercap.invalid {
     background: red;
 }
-
-#route {
-    min-width: 30em;
-}

examples/example-simple-chat/yarn.lock

@@ -2,31 +2,25 @@
 # yarn lockfile v1
 
 
-"@preserves/core@^0.995.200", "@preserves/core@^0.995.206":
-  version "0.995.206"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.206.tgz#f13507aa39dbc8cbd5d10ac18d107c06e92bf519"
-  integrity sha512-Uc4SSSXHQG6xYER9cCc0bkbLYM8fGVbO4kXw3DI8BaQjeUFPOX3yYNYPAvRNzmaF4MuMOZY+jSJpjJ9o5g6A0w==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema-cli@>=0.995.201":
-  version "0.995.206"
-  resolved "https://registry.yarnpkg.com/@preserves/schema-cli/-/schema-cli-0.995.206.tgz#709c96d938dce3bf5b132a3da1304ca3c84bbe2e"
-  integrity sha512-870rwjKtQHA8huwt8MpMImnKC2cBHKYzcJi4811k5RuYs/HdbT9B81NMSiSn+Hq19/v9fEBicwwEmao3oM7hJw==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.206"
-    "@preserves/schema" "^0.995.206"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
     chalk "^4.1"
     chokidar "^3.5"
     commander "^7.2"
     glob "^7.1"
     minimatch "^3.0"
 
-"@preserves/schema@^0.995.206":
-  version "0.995.206"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.206.tgz#8e35a7db5363374f6794009d394510871f86746e"
-  integrity sha512-JmXGxSqsNSEzZNpvOYPupSZhffvMIvgnUmKE+Yt5oiPiD/8H52EbKRrqBUQuVpvI4hvwgThWAtNIg3+q42vI2w==
-  dependencies:
-    "@preserves/core" "^0.995.206"
-
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
@@ -36,55 +30,76 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.22.3.tgz#05430d2e807aec547d910211ae8580e7d7f32401"
-  integrity sha512-x8zys6Y5NGto72muWVQakE+sPVcweaFLARNg4MWvQj3ZmBv49osvEHxvsyr1fIW610HLbi33zInUGF7KDH8dUQ==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.35.0":
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.35.0.tgz#6eadbea6acfc412092c8bb833a23a42de6adb73e"
-  integrity sha512-Wz//RcbxdaQBGI2BYq2DaY35m8R9FM+Ae7eyFXRRANtO6ifSh6iLSz/XtE4ziyqaerO3rrG8+/7xId3/MviZzw==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "^0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/html@*":
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.36.0.tgz#e2c59eda24c8678cf05b9f11192a78b050ccbd7d"
-  integrity sha512-DYxkJSomAmD4tt8RPv4hI9k/IBFrGzEjSJP0LtT/259Jo9KAphEN/T+K+0v4Bxhqk6Mho86q+2M04MFG64uWnA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.11.1.tgz#e0890281da75aceb902a23711cb6417be9b1082c"
+  integrity sha512-zVXN3zubpx1ldUcdji5ptYgTZJ8wbpWvxr1eDcsbNLLMzqRvWPiNGXxwXjNCXqVGa4za2yacEp1zhFusFZYGKg==
   dependencies:
-    "@syndicate-lang/core" "^0.35.0"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/ts-plugin@*":
-  version "0.37.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.37.0.tgz#7764a9f94e8cf54d3d3c43e49b0928f851b2f6b3"
-  integrity sha512-rp9QmBrGbs6ABPAmgZkmWumkk5URVHF8Q62/va9lm457QPWce3JoYoDi2/qSzcMdYUM/JjBxK0vhYsdw3GemkA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.11.1.tgz#579303412e6e9d75835b6761a19911c86f462707"
+  integrity sha512-1b6cHhb4s46m4H9MvaSohKAL+NKfUDfawZlS157ZEH7guCPcx/M7RLi0DR/t8hhJSAWzneH3PM0GMZ+vTUR9jA==
   dependencies:
-    "@syndicate-lang/compiler" "^0.22.3"
-    "@syndicate-lang/core" "^0.35.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/tsc@*":
-  version "0.37.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.37.0.tgz#30ef6704c37ceb10d23cc688fbd2a2436a593cd4"
-  integrity sha512-54wUyu392eIa9n4K8CV6qxz+GcRUmrmBZW+hU+pMcApKkIYyiXmg09MrOXrLYcVtHowYVWRXb7d8Cpui3vaGCQ==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.11.1.tgz#4c07f0f90ce51b593c199c79a01dd5d65765bd22"
+  integrity sha512-pJCK4GdY4/TYKk87xWvkRPnvQTri64otbODnYvuFLdBGDPMOSHuuTeyRBjQwH1GqMBqi1Xqgq/YU9SH2FjvkGw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.22.3"
-    "@syndicate-lang/core" "^0.35.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
 "@syndicate-lang/ws-relay@*":
-  version "0.37.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/ws-relay/-/ws-relay-0.37.1.tgz#196982bd91c7ebe1e5bdb049d23a04d92475f668"
-  integrity sha512-DZLFYSeAzxuBtcA9ER2+o78KGKiHr7/ofP/YTtlNfwTGdIJ0xbxAsXVSzYwSvtlHNk1ZcriZOOHFf1ZWpnjMiA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/ws-relay/-/ws-relay-0.11.1.tgz#9faa7e297cbadc09bbb2eef425d7ef661b30b7f0"
+  integrity sha512-OGDnlFJjPDAwesTPLl7LbYowPVoRoL0zaQSQ3+bZnaPm2feiiJIUqTu12emu+Wi76H04cHY12hYnCi/sBsfzmg==
   dependencies:
-    "@syndicate-lang/core" "^0.35.0"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -98,9 +113,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     color-convert "^2.0.1"
 
 anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -116,9 +131,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 binary-extensions@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
-  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -129,11 +144,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
-    fill-range "^7.1.1"
+    fill-range "^7.0.1"
 
 chalk@^4.1:
   version "4.1.2"
@@ -144,9 +159,9 @@ chalk@^4.1:
     supports-color "^7.1.0"
 
 chokidar@^3.5:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -187,12 +202,12 @@ commander@^7.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -200,31 +215,31 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
@@ -239,14 +254,14 @@ glob-parent@~5.1.2:
     is-glob "^4.0.1"
 
 glob@^7.1, glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -258,7 +273,7 @@ has-flag@^4.0.0:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -278,7 +293,7 @@ is-binary-path@~2.1.0:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -297,10 +312,10 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-minimatch@^3.0, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -312,14 +327,14 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
@@ -336,7 +351,7 @@ readdirp@~3.6.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -347,17 +362,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -396,10 +406,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -413,7 +423,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/how-to-use-loader/README.md

@@ -1,13 +0,0 @@
-# How to use @syndicate-lang/loader
-
-Running a module:
-
-```shell
-node -r @syndicate-lang/loader index.js
-```
-
-Running a standalone script:
-
-```shell
-./standalone.js
-```

examples/how-to-use-loader/box.js

@@ -1,19 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const { BoxState, SetBox, N } = require('./protocol.js');
-
-function boot() {
-  spawn named 'box' {
-    field boxValue = 0;
-
-    assert BoxState(boxValue.value);
-    on message SetBox($v) => boxValue.value = v;
-
-    stop on (boxValue.value === N) {
-      console.log('terminated box root facet');
-    }
-  }
-}
-
-exports.boot = boot;

examples/how-to-use-loader/client.js

@@ -1,16 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const { BoxState, SetBox } = require('./protocol.js');
-
-function boot(doneCallback) {
-  spawn named 'client' {
-    on asserted BoxState($v) => send message SetBox(v + 1);
-    on retracted BoxState(_) => {
-      console.log('box gone');
-      doneCallback();
-    }
-  }
-}
-
-exports.boot = boot;

examples/how-to-use-loader/index.js

@@ -1,10 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const { N } = require('./protocol.js');
-const Box = require('./box.js');
-const Client = require('./client.js');
-
-console.time('box-and-client-' + N.toString());
-Box.boot();
-Client.boot(() => console.timeEnd('box-and-client-' + N.toString()));

examples/how-to-use-loader/protocol.js

@@ -1,11 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-assertion type BoxState(value);
-message type SetBox(newValue);
-
-const N = 100000;
-
-exports.BoxState = BoxState;
-exports.SetBox = SetBox;
-exports.N = N;

examples/how-to-use-loader/run.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec node -r @syndicate-lang/loader index.js

examples/how-to-use-loader/standalone.js

@@ -1,28 +0,0 @@
-#!/usr/bin/env -S node -r @syndicate-lang/loader
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-assertion type BoxState(value);
-message type SetBox(newValue);
-
-const N = 100000;
-
-spawn named 'box' {
-  field boxValue = 0;
-
-  assert BoxState(boxValue.value);
-  on message SetBox($v) => boxValue.value = v;
-
-  stop on (boxValue.value === N) {
-    console.log('terminated box root facet');
-  }
-}
-
-console.time('box-and-client-' + N.toString());
-spawn named 'client' {
-  on asserted BoxState($v) => send message SetBox(v + 1);
-  on retracted BoxState(_) => {
-    console.log('box gone');
-    console.timeEnd('box-and-client-' + N.toString())
-  }
-}

examples/how-to-use-syndicate-ts-plugin/index.html

@@ -7,4 +7,7 @@
   <h1>Look in the JavaScript console for output.</h1>
   <main id="main">
   </main>
+  <script>
+    Syndicate.bootModule(Main.__SYNDICATE__bootProc);
+  </script>
 </html>

examples/how-to-use-syndicate-ts-plugin/package.json

@@ -12,8 +12,6 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
     "@syndicate-lang/core": "*"
   },
   "devDependencies": {
@@ -22,6 +20,6 @@
     "@syndicate-lang/tsc": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/how-to-use-syndicate-ts-plugin/yarn.lock

@@ -2,17 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200", "@preserves/core@^0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema@0.995.201":
-  version "0.995.201"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.201.tgz#827ad539afb0fdf68ba885ee3ff43db0fd473aa5"
-  integrity sha512-0SuhwOEAfxtrAeOTZ8V1yNEcHHHEbfUmoFawrF+vzTQFNZRz/X3LF1FM6wOiJlHtb7tBr4B+rHXX8jfNrqrdkA==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.200"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -23,43 +30,44 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/syndicatec@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.34.0.tgz#f3b88507b633552fe1f41f24def5121c0cafeaeb"
-  integrity sha512-h3MPifJdXZTS3JVcvRG8GXMJMPBH4RYmJ3B7c2sjM826Pf6O8zT47Vuv1y2WyD9PS8BiSCI01uOR0W5AVJJT5w==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.11.1.tgz#97caa8fae553a081f46afbd55ec0fd9498cb535d"
+  integrity sha512-WEjBnClmartgzL8kG2UPD6bbJBY+yudhUwrzVsKlgbzt5Tsar61CI5w3IRD81crsbp2cJhPdOSz7m5xHwj5jyw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
 "@syndicate-lang/ts-plugin@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.34.0.tgz#df92f9044eeba528c80c41c5c9df49ee28902411"
-  integrity sha512-OCO6Hm0euz2hZk6tYTrJQNEM8iDBeQ/dgpW2a/UP52XSP6fYj0OvUVfn+35ZkIL64S+zDsJjL/6XFN05UZyRGA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.11.1.tgz#579303412e6e9d75835b6761a19911c86f462707"
+  integrity sha512-1b6cHhb4s46m4H9MvaSohKAL+NKfUDfawZlS157ZEH7guCPcx/M7RLi0DR/t8hhJSAWzneH3PM0GMZ+vTUR9jA==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/tsc@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.34.0.tgz#1056fba7f639bbf436d0c2ecd2717edc4c1e612a"
-  integrity sha512-Ufj3xsdXMbMCavWsEkX/pFyXRpNIWRW+LFew1icD14DoSLqyBcoUEvskolOSgkSzC53tDjbd4/LXDVofIjIyUA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.11.1.tgz#4c07f0f90ce51b593c199c79a01dd5d65765bd22"
+  integrity sha512-pJCK4GdY4/TYKk87xWvkRPnvQTri64otbODnYvuFLdBGDPMOSHuuTeyRBjQwH1GqMBqi1Xqgq/YU9SH2FjvkGw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -68,18 +76,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -90,6 +124,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -98,6 +137,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -119,15 +188,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -135,46 +209,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -184,39 +277,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -227,17 +356,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -262,10 +386,24 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -279,7 +417,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/how-to-use-syndicate-tsc/package.json

@@ -12,14 +12,12 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
     "@syndicate-lang/core": "*"
   },
   "devDependencies": {
     "@syndicate-lang/tsc": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/how-to-use-syndicate-tsc/yarn.lock

@@ -2,17 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200", "@preserves/core@^0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema@0.995.201":
-  version "0.995.201"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.201.tgz#827ad539afb0fdf68ba885ee3ff43db0fd473aa5"
-  integrity sha512-0SuhwOEAfxtrAeOTZ8V1yNEcHHHEbfUmoFawrF+vzTQFNZRz/X3LF1FM6wOiJlHtb7tBr4B+rHXX8jfNrqrdkA==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.200"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -23,25 +30,26 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/tsc@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.34.0.tgz#1056fba7f639bbf436d0c2ecd2717edc4c1e612a"
-  integrity sha512-Ufj3xsdXMbMCavWsEkX/pFyXRpNIWRW+LFew1icD14DoSLqyBcoUEvskolOSgkSzC53tDjbd4/LXDVofIjIyUA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.11.1.tgz#4c07f0f90ce51b593c199c79a01dd5d65765bd22"
+  integrity sha512-pJCK4GdY4/TYKk87xWvkRPnvQTri64otbODnYvuFLdBGDPMOSHuuTeyRBjQwH1GqMBqi1Xqgq/YU9SH2FjvkGw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -50,18 +58,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -72,6 +106,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -80,6 +119,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -101,15 +170,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -117,46 +191,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -166,39 +259,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -209,17 +338,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -244,10 +368,24 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -261,7 +399,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/how-to-use-syndicatec-javascript/index.html

@@ -7,4 +7,7 @@
   <h1>Look in the JavaScript console for output.</h1>
   <main id="main">
   </main>
+  <script>
+    Main.boot();
+  </script>
 </html>

examples/how-to-use-syndicatec-javascript/package.json

@@ -12,7 +12,6 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
     "@syndicate-lang/core": "*"
   },
   "devDependencies": {

examples/how-to-use-syndicatec-javascript/src/index.js

@@ -4,10 +4,12 @@
 import { N } from './protocol.js';
 import * as Box from './box.js';
 import * as Client from './client.js';
-import { Dataspace } from '@syndicate-lang/core';
+import { Actor, Dataspace, Turn } from '@syndicate-lang/core';
 
 console.time('box-and-client-' + N.toString());
-Dataspace.boot(ds => {
+Actor.boot(() => {
+  Turn.activeFacet.preventInertCheck();
+  const ds = create new Dataspace();
   Box.boot(ds);
   Client.boot(ds, () => console.timeEnd('box-and-client-' + N.toString()));
 });

examples/how-to-use-syndicatec-javascript/yarn.lock

@@ -2,10 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
+
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
+  dependencies:
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -16,25 +30,26 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/syndicatec@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.34.0.tgz#f3b88507b633552fe1f41f24def5121c0cafeaeb"
-  integrity sha512-h3MPifJdXZTS3JVcvRG8GXMJMPBH4RYmJ3B7c2sjM826Pf6O8zT47Vuv1y2WyD9PS8BiSCI01uOR0W5AVJJT5w==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.11.1.tgz#97caa8fae553a081f46afbd55ec0fd9498cb535d"
+  integrity sha512-WEjBnClmartgzL8kG2UPD6bbJBY+yudhUwrzVsKlgbzt5Tsar61CI5w3IRD81crsbp2cJhPdOSz7m5xHwj5jyw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -43,18 +58,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -65,6 +106,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -73,6 +119,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -94,15 +170,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -110,46 +191,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -159,39 +259,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -202,17 +338,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -237,6 +368,20 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -249,7 +394,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/how-to-use-syndicatec-typescript/package.json

@@ -12,14 +12,12 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
     "@syndicate-lang/core": "*"
   },
   "devDependencies": {
     "@syndicate-lang/syndicatec": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/how-to-use-syndicatec-typescript/yarn.lock

@@ -2,17 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200", "@preserves/core@^0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema@0.995.201":
-  version "0.995.201"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.201.tgz#827ad539afb0fdf68ba885ee3ff43db0fd473aa5"
-  integrity sha512-0SuhwOEAfxtrAeOTZ8V1yNEcHHHEbfUmoFawrF+vzTQFNZRz/X3LF1FM6wOiJlHtb7tBr4B+rHXX8jfNrqrdkA==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.200"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -23,25 +30,26 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/syndicatec@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.34.0.tgz#f3b88507b633552fe1f41f24def5121c0cafeaeb"
-  integrity sha512-h3MPifJdXZTS3JVcvRG8GXMJMPBH4RYmJ3B7c2sjM826Pf6O8zT47Vuv1y2WyD9PS8BiSCI01uOR0W5AVJJT5w==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/syndicatec/-/syndicatec-0.11.1.tgz#97caa8fae553a081f46afbd55ec0fd9498cb535d"
+  integrity sha512-WEjBnClmartgzL8kG2UPD6bbJBY+yudhUwrzVsKlgbzt5Tsar61CI5w3IRD81crsbp2cJhPdOSz7m5xHwj5jyw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -50,18 +58,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -72,6 +106,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -80,6 +119,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -101,15 +170,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -117,46 +191,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -166,39 +259,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -209,17 +338,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -244,10 +368,24 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -261,7 +399,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/standalone-service/example.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env -S node -r @syndicate-lang/loader
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const { stringify } = require('@syndicate-lang/core');
-const { service } = require('@syndicate-lang/service');
-
-service(args => {
-    console.log('+', stringify(args));
-    on stop { console.log('-', stringify(args)); }
-});

examples/standalone-service/server-config.pr

@@ -1,9 +0,0 @@
-<require-service <daemon example>>
-<daemon example {
-  argv: "./example.js"
-  protocol: application/syndicate
-}>
-? <service-object <daemon example> ?cap> [
-  $cap += =here-is-your-configuration!
-  $cap += =here-is-another-configuration!
-]

examples/syndicate-html-example-flappy-bird/index.html

@@ -3,7 +3,6 @@
   <meta charset=utf-8>
   <meta name="viewport" content="width=device-width, initial-scale=0.67, maximum-scale=0.67, user-scalable=no">
   <link href="css/style.css" rel="stylesheet" type="text/css">
-  <script src="node_modules/@preserves/core/dist/preserves.js"></script>
   <script src="node_modules/@syndicate-lang/core/dist/syndicate.js"></script>
   <script src="node_modules/@syndicate-lang/html/dist/syndicate-html.js"></script>
   <script src="node_modules/@syndicate-lang/timer/dist/syndicate-timer.js"></script>

examples/syndicate-html-example-flappy-bird/package.json

@@ -12,8 +12,6 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
     "@syndicate-lang/core": "*",
     "@syndicate-lang/html": "*",
     "@syndicate-lang/timer": "*"
@@ -23,6 +21,6 @@
     "@syndicate-lang/tsc": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/syndicate-html-example-flappy-bird/src/index.ts

@@ -1,7 +1,7 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
 /// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Turn, Dataspace, Double, floatValue, Ref, Facet } from '@syndicate-lang/core';
+import { Record, Dataspace, Double, floatValue, Ref, stringify } from '@syndicate-lang/core';
 import { boot as bootHtml, WindowEvent, template, Anchor } from '@syndicate-lang/html';
 import { boot as bootTimer, PeriodicTick } from '@syndicate-lang/timer';
 
@@ -86,7 +86,9 @@ function spawnGame(mainDs: Ref) {
 
                 on (ypos.value > BOARD_HEIGHT - FLAPPY_HEIGHT) {
                     ypos.value = BOARD_HEIGHT - FLAPPY_HEIGHT;
-                    assert GameOver();
+                    react {
+                        assert GameOver();
+                    }
                 }
             }
 
@@ -107,12 +109,12 @@ function spawnGame(mainDs: Ref) {
                     on message WindowEvent('+keypress', $_e) => yvel.value = -10;
                     on message WindowEvent('+click', $_e) => yvel.value = -10;
 
-                    const seconds_per_tick = 1 / 60;
-                    const seconds_per_tick_d = Double(seconds_per_tick);
-                    on message PeriodicTick(seconds_per_tick_d) => {
-                        xpos.value += 150 * seconds_per_tick;
+                    const ms_per_tick = 1000.0 / 60;
+                    const ms_per_tick_d = Double(ms_per_tick);
+                    on message PeriodicTick(ms_per_tick_d) => {
+                        xpos.value += 0.15 * ms_per_tick;
                         ypos.value = (ypos.value + yvel.value);
-                        yvel.value += seconds_per_tick * 50;
+                        yvel.value += ms_per_tick * 0.05;
                     }
                 }
             }
@@ -139,14 +141,14 @@ function spawnGame(mainDs: Ref) {
                     react {
                         const pipeNumber = nextPipe.value++;
                         spawn linked named ['pipe', pipeNumber] {
-                            runPipe(pipeNumber, Turn.activeFacet);
+                            runPipe(pipeNumber);
                         }
                     }
                 }
             }
         }
 
-        function runPipe(i: number, mainPipeFacet: Facet) {
+        function runPipe(i: number) {
             const xlocation = (i + 1) * 324;
 
             let ui = new Anchor();
@@ -157,17 +159,21 @@ function spawnGame(mainDs: Ref) {
                 + PILLAR_HEAD_HEIGHT * 3;
             const lowerHeight = FIELD_HEIGHT - upperHeight - PILLAR_GAP;
 
-            stop mainPipeFacet on (xpos.value < -(PILLAR_WIDTH + FLAPPY_XPOS));
+            stop on (xpos.value < -(PILLAR_WIDTH + FLAPPY_XPOS));
 
             at gameDs {
-                once (xpos.value <= 0) send message IncreaseScore();
+                react {
+                    stop on (xpos.value <= 0) send message IncreaseScore();
+                }
 
                 on asserted Position($flappyXpos, _) =>
                     xpos.value = xlocation - floatValue(flappyXpos);
 
                 on asserted Position($xpos, $ypos) => {
                     if (touchingPillar(floatValue(xpos), floatValue(ypos))) {
-                        assert GameOver();
+                        react {
+                            assert GameOver();
+                        }
                     }
                 }
             }

examples/syndicate-html-example-flappy-bird/yarn.lock

@@ -2,17 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200", "@preserves/core@^0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema@0.995.201":
-  version "0.995.201"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.201.tgz#827ad539afb0fdf68ba885ee3ff43db0fd473aa5"
-  integrity sha512-0SuhwOEAfxtrAeOTZ8V1yNEcHHHEbfUmoFawrF+vzTQFNZRz/X3LF1FM6wOiJlHtb7tBr4B+rHXX8jfNrqrdkA==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.200"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -23,47 +30,48 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/html@*":
-  version "0.33.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.33.0.tgz#c53e6bf8a52b17c3747f4270713a8c9234f984af"
-  integrity sha512-xhN6NZOgLxlAQOyWG0JAgtyF1e1yQvrpNh5RBAPnucFYC024yo1ggZ08+KiaulhsoIKvRbBE6FU6p9dDm4/tpQ==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.11.1.tgz#e0890281da75aceb902a23711cb6417be9b1082c"
+  integrity sha512-zVXN3zubpx1ldUcdji5ptYgTZJ8wbpWvxr1eDcsbNLLMzqRvWPiNGXxwXjNCXqVGa4za2yacEp1zhFusFZYGKg==
   dependencies:
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/timer@*":
-  version "0.33.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/timer/-/timer-0.33.0.tgz#cdb38ebe777332ec58a5b0b9483db809275a61de"
-  integrity sha512-cBon+nk8zvNeU4zC6tg7nhgJnmrRoXHYE140UK3gscNFcg1LZ1d7q9WxfVTzFtRocRBslv6pworSwCDn3Go7TQ==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/timer/-/timer-0.11.1.tgz#728d82d6f6b643cb6d9b589644b3ec40572f1d13"
+  integrity sha512-jIm9vcNaJ02yVOFFTJ/qjwWWNSh5BOBqlitaHwyf8Ha5XvAB5WzqlYOCTFT/RvK2SBkPwXtitE2kxkuAc/Y8JQ==
   dependencies:
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/ts-plugin@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.34.0.tgz#df92f9044eeba528c80c41c5c9df49ee28902411"
-  integrity sha512-OCO6Hm0euz2hZk6tYTrJQNEM8iDBeQ/dgpW2a/UP52XSP6fYj0OvUVfn+35ZkIL64S+zDsJjL/6XFN05UZyRGA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.11.1.tgz#579303412e6e9d75835b6761a19911c86f462707"
+  integrity sha512-1b6cHhb4s46m4H9MvaSohKAL+NKfUDfawZlS157ZEH7guCPcx/M7RLi0DR/t8hhJSAWzneH3PM0GMZ+vTUR9jA==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/tsc@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.34.0.tgz#1056fba7f639bbf436d0c2ecd2717edc4c1e612a"
-  integrity sha512-Ufj3xsdXMbMCavWsEkX/pFyXRpNIWRW+LFew1icD14DoSLqyBcoUEvskolOSgkSzC53tDjbd4/LXDVofIjIyUA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.11.1.tgz#4c07f0f90ce51b593c199c79a01dd5d65765bd22"
+  integrity sha512-pJCK4GdY4/TYKk87xWvkRPnvQTri64otbODnYvuFLdBGDPMOSHuuTeyRBjQwH1GqMBqi1Xqgq/YU9SH2FjvkGw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -72,18 +80,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -94,6 +128,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -102,6 +141,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -123,15 +192,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -139,46 +213,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -188,39 +281,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -231,17 +360,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -266,10 +390,24 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -283,7 +421,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

examples/syndicate-html-example-table/index.html

@@ -3,7 +3,6 @@
   <head>
     <title>Syndicate: Table Example</title>
     <meta charset="utf-8">
-    <script src="node_modules/@preserves/core/dist/preserves.js"></script>
     <script src="node_modules/@syndicate-lang/core/dist/syndicate.js"></script>
     <script src="node_modules/@syndicate-lang/html/dist/syndicate-html.js"></script>
   </head>

examples/syndicate-html-example-table/package.json

@@ -14,8 +14,6 @@
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "license": "GPL-3.0+",
   "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
     "@syndicate-lang/core": "*",
     "@syndicate-lang/html": "*"
   },
@@ -24,6 +22,6 @@
     "@syndicate-lang/tsc": "*",
     "rollup": "^2.60",
     "rollup-plugin-sourcemaps": "^0.6",
-    "typescript": "^4.9"
+    "typescript": "^4.5"
   }
 }

examples/syndicate-html-example-table/src/index.ts

@@ -1,7 +1,7 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
 /// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Dataspace, Value, Ref } from '@syndicate-lang/core';
+import { Dataspace, Embedded, Value, Ref } from '@syndicate-lang/core';
 import { boot as bootHtml, UIEvent, GlobalEvent, HtmlFragments, template, Anchor } from '@syndicate-lang/html';
 
 assertion type Person(id, firstName, lastName, address, age);
@@ -42,7 +42,7 @@ Dataspace.boot(ds => {
 
         spawn named 'controller' {
             on message GlobalEvent('table#the-table th', 'click', $e) => {
-                const event = (e as Ref).target.data as Event;
+                const event = (e as Embedded<Ref>).embeddedValue.target.data as Event;
                 send message SetSortColumn(JSON.parse((event.target as HTMLElement).dataset.column!));
             }
         }

examples/syndicate-html-example-table/yarn.lock

@@ -2,17 +2,24 @@
 # yarn lockfile v1
 
 
-"@preserves/core@0.995.200", "@preserves/core@^0.995.200":
-  version "0.995.200"
-  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.995.200.tgz#65575cf8f9320e73b5d37fa9ac9d6881a33fd3a6"
-  integrity sha512-htZ2x+hltUpKoPsviWSuelzZW96po9zVSsN0RZEih60FahNX0R2LCqFJ6v5lyATuQ9oHALVi0w8w4rtf8oiAJw==
+"@preserves/core@>=0.19", "@preserves/core@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.19.0.tgz#7105a50beeb5d9531515547ca197a2c122c84935"
+  integrity sha512-Evsv3PGI51cJlTOr/6v52fTV6cjU11Pq6ogXBIPzfwmlMZ6kB5mx7EweFVwAf0dy5yCgBkq7ILSTCk4ZoV+x1g==
 
-"@preserves/schema@0.995.201":
-  version "0.995.201"
-  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.995.201.tgz#827ad539afb0fdf68ba885ee3ff43db0fd473aa5"
-  integrity sha512-0SuhwOEAfxtrAeOTZ8V1yNEcHHHEbfUmoFawrF+vzTQFNZRz/X3LF1FM6wOiJlHtb7tBr4B+rHXX8jfNrqrdkA==
+"@preserves/schema@>=0.20":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.20.0.tgz#e1dcb498655114fef06678ff6298b953d127f919"
+  integrity sha512-TmNCKJwYSN7qksa0wRWfSkchuNIfGUBJLkZp5hBX/6uqtY1RWGa9Q4nICaNuljw+pKaCFlWqpG0ebP5cmJMCGw==
   dependencies:
-    "@preserves/core" "^0.995.200"
+    "@preserves/core" "^0.19.0"
+    "@types/glob" "^7.1"
+    "@types/minimatch" "^3.0"
+    chalk "^4.1"
+    chokidar "^3.5"
+    commander "^7.2"
+    glob "^7.1"
+    minimatch "^3.0"
 
 "@rollup/pluginutils@^3.0.9":
   version "3.1.0"
@@ -23,40 +30,41 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@syndicate-lang/compiler@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.21.1.tgz#b6316bac14d053c313b3442be68f532a60c47cb3"
-  integrity sha512-daaYh1i0XmoHt6eTtO4gWblfVKMjp9trwxqR62wUSONY3gtJ5Bn4hG3dMgfoMz2NvOWbJHaGz/95J0jRubITxA==
+"@syndicate-lang/compiler@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/compiler/-/compiler-0.10.3.tgz#bf2bddea6195eb1b3160c973b93f4c24fc561645"
+  integrity sha512-Dc2b6SzpPQuT6zcvm+ncEfHWoFtky0Vb+M/2TJRp4WV/HpFhStZ4/7yqSmF2kcwEKmNO5doZaet295L4xEhG9w==
 
-"@syndicate-lang/core@*", "@syndicate-lang/core@^0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.32.0.tgz#0efbbff176cac2969c2b6ba70a19965add3a2c61"
-  integrity sha512-ERVXk0W1xLaKvUa79Ek74YvqfBU543cUTb2GJvp76TP5k1jA97q9GzhddicS/s8lqu8SUC1+IXmKiJk0NX2TWQ==
+"@syndicate-lang/core@*", "@syndicate-lang/core@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/core/-/core-0.11.1.tgz#32d0191822cb4c126549a3f0067bb1d166f39eb5"
+  integrity sha512-3ofAypJ18ddSOtdGyXycDy4BAW/zMaOUEwndp/ADjmxIRDW6ja4GA5TZ0vIQjPfH7brSQhhECivt7aLf5HLzfw==
   dependencies:
-    salty-crypto "0.3.1"
+    "@preserves/core" ">=0.19"
+    "@preserves/schema" ">=0.20"
 
 "@syndicate-lang/html@*":
-  version "0.33.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.33.0.tgz#c53e6bf8a52b17c3747f4270713a8c9234f984af"
-  integrity sha512-xhN6NZOgLxlAQOyWG0JAgtyF1e1yQvrpNh5RBAPnucFYC024yo1ggZ08+KiaulhsoIKvRbBE6FU6p9dDm4/tpQ==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/html/-/html-0.11.1.tgz#e0890281da75aceb902a23711cb6417be9b1082c"
+  integrity sha512-zVXN3zubpx1ldUcdji5ptYgTZJ8wbpWvxr1eDcsbNLLMzqRvWPiNGXxwXjNCXqVGa4za2yacEp1zhFusFZYGKg==
   dependencies:
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/ts-plugin@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.34.0.tgz#df92f9044eeba528c80c41c5c9df49ee28902411"
-  integrity sha512-OCO6Hm0euz2hZk6tYTrJQNEM8iDBeQ/dgpW2a/UP52XSP6fYj0OvUVfn+35ZkIL64S+zDsJjL/6XFN05UZyRGA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/ts-plugin/-/ts-plugin-0.11.1.tgz#579303412e6e9d75835b6761a19911c86f462707"
+  integrity sha512-1b6cHhb4s46m4H9MvaSohKAL+NKfUDfawZlS157ZEH7guCPcx/M7RLi0DR/t8hhJSAWzneH3PM0GMZ+vTUR9jA==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
 
 "@syndicate-lang/tsc@*":
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.34.0.tgz#1056fba7f639bbf436d0c2ecd2717edc4c1e612a"
-  integrity sha512-Ufj3xsdXMbMCavWsEkX/pFyXRpNIWRW+LFew1icD14DoSLqyBcoUEvskolOSgkSzC53tDjbd4/LXDVofIjIyUA==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@syndicate-lang/tsc/-/tsc-0.11.1.tgz#4c07f0f90ce51b593c199c79a01dd5d65765bd22"
+  integrity sha512-pJCK4GdY4/TYKk87xWvkRPnvQTri64otbODnYvuFLdBGDPMOSHuuTeyRBjQwH1GqMBqi1Xqgq/YU9SH2FjvkGw==
   dependencies:
-    "@syndicate-lang/compiler" "^0.21.1"
-    "@syndicate-lang/core" "^0.32.0"
+    "@syndicate-lang/compiler" "^0.10.3"
+    "@syndicate-lang/core" "^0.11.1"
     glob "^7.1.6"
     yargs "^16.2.0"
 
@@ -65,18 +73,44 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/minimatch@*", "@types/minimatch@^3.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
+"@types/node@*":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
+  integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -87,6 +121,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -95,6 +134,36 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+chalk@^4.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -116,15 +185,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@^7.2:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -132,46 +206,65 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -181,39 +274,75 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+minimatch@^3.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 rollup-plugin-sourcemaps@^0.6:
   version "0.6.3"
@@ -224,17 +353,12 @@ rollup-plugin-sourcemaps@^0.6:
     source-map-resolve "^0.6.0"
 
 rollup@^2.60:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb"
+  integrity sha512-L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g==
   optionalDependencies:
     fsevents "~2.3.2"
 
-salty-crypto@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/salty-crypto/-/salty-crypto-0.3.1.tgz#1242cd948d8152aff104d0945980996b1602ba0e"
-  integrity sha512-dCbF8/UzMV8oXPmMCHWzSp7u8G6NA+pHbaFBVqVgLVBiyxuwVn9iPbyt9WXT0EoXfL9sKt7U1mV+bgsGw5cV7A==
-
 source-map-resolve@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
@@ -259,10 +383,24 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-typescript@^4.9:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+typescript@^4.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -276,7 +414,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 y18n@^5.0.5:
   version "5.0.8"

fixcopyright.rkt

@@ -0,0 +1,147 @@
+#!/usr/bin/env racket
+#lang racket
+;;; SPDX-License-Identifier: LGPL-3.0-or-later
+;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+
+(require file/glob)
+(require racket/date)
+
+(define ((re p) i) (regexp-match p i))
+(define ((re? p) i) (regexp-match? p i))
+(define ((s p ins) i) (regexp-replace p i ins))
+
+(define this-year (number->string (date-year (current-date))))
+
+(define (get-git-config key)
+  (string-trim (with-output-to-string
+                 (lambda () (system* "/usr/bin/env" "git" "config" "--get" key)))))
+
+(define (is-tracked? f)
+  (call-with-output-file "/dev/null" #:exists 'append
+    (lambda (sink)
+      (parameterize ((current-error-port sink)
+                     (current-output-port sink))
+        (system* "/usr/bin/env" "git" "ls-files" "--error-unmatch" f)))))
+
+(define user-name (get-git-config "user.name"))
+(define user-email (get-git-config "user.email"))
+
+(define user (format "~a <~a>" user-name user-email))
+
+(define (make-copyright who low [hi #f])
+  (if (and hi (not (string=? low hi)))
+      (format "Copyright © ~a-~a ~a" low hi who)
+      (format "Copyright © ~a ~a" low who)))
+
+(define total-file-count 0)
+(define total-changed-files 0)
+(define dry-run? #f)
+(define modify-untracked? #f)
+
+(define (fix-files #:file-type-name file-type-name
+                   #:file-pattern file-pattern
+                   #:front-matter-re [front-matter-re #f]
+                   #:leading-comment-re leading-comment-re
+                   #:comment-prefix comment-prefix
+                   #:file-filter [file-filter (lambda (x) #t)])
+  (define matched-files (filter file-filter (glob file-pattern)))
+  (define file-count (length matched-files))
+  (define changed-files 0)
+  (for [(file-number (in-naturals))
+        (f (in-list matched-files))]
+    (printf "~a [~a/~a] ~a ..." file-type-name file-number file-count f)
+    (flush-output)
+    (define all-lines (file->lines f))
+    (define-values (front-matter head tail)
+      (let*-values (((lines) all-lines)
+                    ((front-matter lines) (if front-matter-re
+                                              (splitf-at lines (re? front-matter-re))
+                                              (values '() lines)))
+                    ((head tail) (splitf-at lines (re? leading-comment-re))))
+        (values front-matter head tail)))
+    (let* ((head (map (s leading-comment-re "") head))
+           (head (map (lambda (l)
+                        (match (regexp-match "^([^:]+): (.*)$" l)
+                          [(list _ k v) (list k v)]
+                          [#f (list #f l)]))
+                      head))
+           (head (if (assoc "SPDX-FileCopyrightText" head)
+                     head
+                     (cons (list "SPDX-FileCopyrightText" (make-copyright user this-year)) head)))
+           (head (if (assoc "SPDX-License-Identifier" head)
+                     head
+                     (cons (list "SPDX-License-Identifier" "GPL-3.0-or-later") head)))
+           (head (map (lambda (l)
+                        (match l
+                          [(list "SPDX-FileCopyrightText"
+                                 (and (regexp (regexp-quote user-name))
+                                      (regexp #px"(\\d{4})-\\d{4}" (list _ low))))
+                           (list "SPDX-FileCopyrightText"
+                                 (make-copyright user low this-year))]
+                          [(list "SPDX-FileCopyrightText"
+                                 (and (regexp (regexp-quote user-name))
+                                      (regexp #px"\\d{4}" (list low))))
+                           (list "SPDX-FileCopyrightText"
+                                 (make-copyright user low this-year))]
+                          [_ l]))
+                      head))
+           (head (map (lambda (l)
+                        (if (string=? (cadr l) "")
+                            (string-trim comment-prefix)
+                            (string-append comment-prefix
+                                           (match l
+                                             [(list #f v) v]
+                                             [(list k v) (format "~a: ~a" k v)]))))
+                      head))
+           (new-lines `(,@front-matter
+                        ,@head
+                        ""
+                        ,@(dropf tail (lambda (l) (string=? (string-trim l) "")))))
+           (would-change-if-written? (not (equal? all-lines new-lines)))
+           (write-needed? (and would-change-if-written? (or modify-untracked? (is-tracked? f)))))
+      (when (and write-needed? (not dry-run?))
+        (call-with-atomic-output-file
+         f
+         (lambda (port _tmp-path)
+           (for [(l front-matter)] (displayln l port))
+           (for [(l head)] (displayln l port))
+           (newline port)
+           (for [(l (dropf tail (lambda (l) (string=? (string-trim l) ""))))] (displayln l port)))))
+      (if write-needed?
+          (begin (set! changed-files (+ changed-files 1))
+                 (printf "\e[41mchanged\e[0m\n"))
+          (printf "\r\e[K"))))
+  (when (positive? changed-files)
+    (printf "~a [~a total files, ~a changed]\n" file-type-name file-count changed-files))
+  (set! total-file-count (+ total-file-count file-count))
+  (set! total-changed-files (+ total-changed-files changed-files)))
+
+(command-line #:once-each
+              [("-n" "--dry-run") "Do not write back changes to files"
+               (set! dry-run? #t)]
+              [("--modify-untracked") "Modify files not tracked by git as well as those that are"
+               (set! modify-untracked? #t)])
+
+(void (fix-files #:file-type-name "TypeScript"
+                 #:file-pattern "packages/**.ts"
+                 #:front-matter-re #px"^#"
+                 #:leading-comment-re #px"^//+ *"
+                 #:comment-prefix "/// "))
+(void (fix-files #:file-type-name "JavaScript"
+                 #:file-pattern "packages/**.js"
+                 #:front-matter-re #px"^#"
+                 #:leading-comment-re #px"^//+ *"
+                 #:comment-prefix "/// "))
+
+(printf "fixcopyright: ~a files examined, ~a ~a\n"
+        total-file-count
+        total-changed-files
+        (if dry-run?
+            (if (zero? total-changed-files)
+                "changes are needed"
+                "files need to be updated")
+            (if (zero? total-changed-files)
+                "changes were needed"
+                "files were updated")))
+
+(exit (if (positive? total-changed-files) 1 0))

git-hooks/pre-commit

@@ -3,5 +3,4 @@
 set -e
 exec 1>&2
 
-fixcopyright.rkt -n --preset-typescript --file-pattern 'packages/**.ts' --ignore '**/node_modules/**' GPL-3.0-or-later
-fixcopyright.rkt -n --preset-javascript --file-pattern 'packages/**.js' --ignore '**/node_modules/**' GPL-3.0-or-later
+# No checks yet!

package.json

@@ -6,7 +6,6 @@
     "packages/*/examples/*/"
   ],
   "devDependencies": {
-    "@preserves/core": "^0.995.201",
     "@rollup/plugin-node-resolve": "^13.0",
     "@types/jest": "^27.0",
     "@types/node": "^14",
@@ -19,7 +18,7 @@
     "ts-jest": "^27.0",
     "ts-node": "^10.4",
     "ts-node-dev": "^1.1",
-    "typescript": "^4.9",
-    "typescript-language-server": "^3.0"
+    "typescript": "^4.5",
+    "typescript-language-server": "^0.8"
   }
 }

packages/browser-stdenv/.gitignore

@@ -1,3 +0,0 @@
-index.js
-index.min.js
-*.js.map

packages/browser-stdenv/boot.js

@@ -1,21 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2023-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const SyndicateBrowserStdenv = {
-  autoboot: true,
-  autoboot_options: {
-    SyndicateWsRelay: {
-      debug: false,
-    },
-  },
-  boot() {
-    SyndicateHtml2.boot();
-    SyndicateWsRelay.boot(void 0, this.autoboot_options.SyndicateWsRelay.debug);
-  }
-};
-
-window.addEventListener('DOMContentLoaded', () => {
-  if (SyndicateBrowserStdenv.autoboot) {
-    SyndicateBrowserStdenv.boot();
-  }
-});

packages/browser-stdenv/build-aggregate.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd "$(dirname "$0")"
-
-M=../../node_modules
-
-cat \
-    $M/@preserves/core/dist/preserves.js \
-    $M/@preserves/schema/dist/preserves-schema.js \
-    $M/@preserves/schema/dist/preserves-schema-browser.js \
-    $M/@syndicate-lang/core/dist/syndicate.js \
-    $M/@syndicate-lang/html2/dist/syndicate-html2.js \
-    $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.js \
-    $M/@syndicate-lang/compiler/dist/syndicate-compiler.js \
-    $M/@syndicate-lang/compiler/dist/syndicate-browser-compiler.js \
-    boot.js \
-    > index.js
-
-cp \
-    $M/@syndicate-lang/core/dist/syndicate.js.map \
-    $M/@syndicate-lang/html2/dist/syndicate-html2.js.map \
-    $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.js.map \
-    $M/@syndicate-lang/compiler/dist/syndicate-compiler.js.map \
-    .
-
-cat \
-    $M/@preserves/core/dist/preserves.min.js \
-    $M/@preserves/schema/dist/preserves-schema.min.js \
-    $M/@preserves/schema/dist/preserves-schema-browser.js \
-    $M/@syndicate-lang/core/dist/syndicate.min.js \
-    $M/@syndicate-lang/html2/dist/syndicate-html2.min.js \
-    $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.min.js \
-    $M/@syndicate-lang/compiler/dist/syndicate-compiler.min.js \
-    $M/@syndicate-lang/compiler/dist/syndicate-browser-compiler.js \
-    boot.js \
-    > index.min.js
-
-cp \
-    $M/@syndicate-lang/core/dist/syndicate.min.js.map \
-    $M/@syndicate-lang/html2/dist/syndicate-html2.min.js.map \
-    $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.min.js.map \
-    $M/@syndicate-lang/compiler/dist/syndicate-compiler.min.js.map \
-    .
-
-echo $(date) $(pwd) 'build complete.'

packages/browser-stdenv/examples/counter.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<script src="../index.js"></script>
-<script type="syndicate">
-  spawn named 'clicker' {
-    field counter = 0;
-    const b = new SyndicateHtml2.Widget(t => t`<button>clicks: ${counter.value}</button>`)
-          .setParent('body')
-          .on('click', () => counter.value++);
-  }
-</script>

packages/browser-stdenv/package.json

@@ -1,30 +0,0 @@
-{
-  "name": "@syndicate-lang/browser-stdenv",
-  "version": "0.36.2",
-  "description": "Aggregated Syndicate and Preserves scripts for in-browser use",
-  "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/main/packages/browser-stdenv",
-  "license": "GPL-3.0+",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.syndicate-lang.org/syndicate-lang/syndicate-js"
-  },
-  "main": "index.min.js",
-  "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
-  "scripts": {
-    "prepare": "./build-aggregate.sh",
-    "prepare:watch": "cd ..; exec inotifytest browser-stdenv/build-aggregate.sh",
-    "clean": "rm -rf index.js index.min.js *.js.map",
-    "veryclean": "yarn run clean && rm -rf node_modules"
-  },
-  "dependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema": "^0.995.201",
-    "@syndicate-lang/compiler": "^0.22.3",
-    "@syndicate-lang/core": "^0.35.0",
-    "@syndicate-lang/html2": "^0.36.1",
-    "@syndicate-lang/ws-relay": "^0.37.1"
-  }
-}

packages/compiler/Makefile

@@ -0,0 +1 @@
+../../Makefile.generic-package

packages/compiler/jest.config.ts

@@ -1,7 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-export default {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-};

packages/compiler/package.json

@@ -1,30 +1,19 @@
 {
   "name": "@syndicate-lang/compiler",
-  "version": "0.22.3",
+  "version": "0.11.1",
   "description": "Syndicate/JS compiler library",
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/main/packages/compiler",
   "license": "GPL-3.0+",
   "publishConfig": {
     "access": "public"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://git.syndicate-lang.org/syndicate-lang/syndicate-js"
-  },
+  "repository": "github:syndicate-lang/syndicate-js",
   "scripts": {
-    "prepare": "yarn compile && yarn rollup && cp syndicate-browser-compiler.js dist/",
+    "prepare": "yarn compile && yarn rollup",
     "compile": "../../node_modules/.bin/tsc",
     "compile:watch": "../../node_modules/.bin/tsc -w",
     "rollup": "../../node_modules/.bin/rollup -c",
-    "rollup:watch": "../../node_modules/.bin/rollup -c -w",
-    "clean": "rm -rf lib dist",
-    "veryclean": "yarn run clean && rm -rf node_modules",
-    "test": "../../node_modules/.bin/jest",
-    "test:watch": "yarn test --watch"
-  },
-  "devDependencies": {
-    "@types/js-beautify": "1.14",
-    "js-beautify": "1.15"
+    "rollup:watch": "../../node_modules/.bin/rollup -c -w"
   },
   "main": "dist/syndicate-compiler.js",
   "module": "lib/index.js",

packages/compiler/rollup.config.js

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import { SyndicateRollup } from '../../rollup.js';
 const r = new SyndicateRollup('syndicate-compiler', { globalName: 'SyndicateCompiler' });

packages/compiler/src/compiler/codegen.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import {
     isToken, isTokenType, replace, commaJoin, startPos, fixPos, joinItems,
@@ -7,7 +7,7 @@ import {
 
     Items, Pattern, Templates, Substitution, TokenType,
     SourceMap, CodeWriter, TemplateFunction, Token, SpanIndex, match, TokenBase, getRange, Pos,
-} from '../syntax/index';
+} from '../syntax/index.js';
 import {
     SyndicateParser, SyndicateTypedParser,
     Identifier,
@@ -17,8 +17,7 @@ import {
 
     compilePattern,
     SpawnStatement,
-    FacetToStop,
-} from './grammar';
+} from './grammar.js';
 
 export function stripShebang(items: Items): Items {
     if ((items.length > 0) &&
@@ -29,7 +28,7 @@ export function stripShebang(items: Items): Items {
     return items;
 }
 
-export type ModuleType = 'es6' | 'require' | 'global' | 'none';
+export type ModuleType ='es6' | 'require' | 'global';
 
 export type ErrorSink = (message: string, start: Pos | undefined, end: Pos | undefined) => void;
 
@@ -38,6 +37,7 @@ export interface CompileOptions {
     name?: string,
     runtime?: string,
     module?: ModuleType,
+    global?: string,
     typescript?: boolean,
     emitError: ErrorSink,
 }
@@ -117,43 +117,16 @@ function binderTypeGuard(t: TemplateFunction): (binder: Binder, index: number) =
 export function expand(tree: Items, ctx: ExpansionContext): Items {
     const macro = new Templates(undefined, { extraDelimiters: ':' });
 
-    function terminalWrap(
-        t: TemplateFunction,
-        facetToStop: FacetToStop | 'none' | 'once-wrapper',
-        body: Statement,
-    ): Statement {
-        if (facetToStop === 'none') {
-            return walk(body);
+    function terminalWrap(t: TemplateFunction, isTerminal: boolean, body: Statement): Statement {
+        if (isTerminal) {
+            return t`__SYNDICATE__.Turn.active._stop(__SYNDICATE__.Turn.activeFacet, () => {${body}})`
         } else {
-            const toStop =
-                facetToStop === 'default' ? 'currentSyndicateFacet' :
-                facetToStop === 'once-wrapper' ? '__once_facet' :
-                walk(facetToStop);
-            const resetCurrentSyndicateFacet =
-                facetToStop === 'once-wrapper' ? [] :
-                t`const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;`;
-            return t`__SYNDICATE__.Turn.active._stop(${toStop}, () => {${resetCurrentSyndicateFacet}${walk(body)}})`;
-        }
-    }
-
-    function facetWrap(
-        t: TemplateFunction,
-        facetName: Identifier | 'default' | 'once-wrapper',
-        items: Items,
-    ): Items {
-        if (facetName === 'once-wrapper') {
-            return t`__SYNDICATE__.Turn.active.facet(() => {const __once_facet = __SYNDICATE__.Turn.activeFacet; ${items}});`;
-        } else {
-            const defaultLabel = t`const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet; `;
-            const customLabel = facetName === 'default'
-                ? []
-                : t`const ${facetName.text} = currentSyndicateFacet; `;
-            return t`__SYNDICATE__.Turn.active.facet(() => {${defaultLabel}${customLabel}${items}});`;
+            return body;
         }
     }
 
     function x<T>(p: Pattern<T>, f: (v: T, t: TemplateFunction) => Items) {
-        tree = replace(tree, null, p, (v, start) => f(v, macro.template(fixPos(start))));
+        tree = replace(tree, p, (v, start) => f(v, macro.template(fixPos(start))));
     }
 
     function xf<T extends TurnAction>(p: Pattern<T>, f: (v: T, t: TemplateFunction) => Items) {
@@ -168,7 +141,7 @@ export function expand(tree: Items, ctx: ExpansionContext): Items {
     // following transformations matters.
 
     xf(ctx.parser.duringStatement, (s, t) => {
-        let spawn = match(ctx.parser.spawn, s.body, null, null);
+        let spawn = match(ctx.parser.spawn, s.body, null);
         if (spawn !== null) {
             if (spawn.linkedToken !== null) {
                 ctx.emitError(`during ... spawn doesn't need "linked", it's always linked`,
@@ -179,7 +152,7 @@ export function expand(tree: Items, ctx: ExpansionContext): Items {
 
         let body = (spawn === null)
             ? walk(s.body)
-            : expandSpawn(spawn, t, t` __SYNDICATE__.Turn.activeFacet.preventInertCheck();`);
+            : expandSpawn(spawn, t, t`__SYNDICATE__.Turn.activeFacet.preventInertCheck();`);
 
         const sa = compilePattern(s.pattern);
         const assertion = t`__SYNDICATE__.Observe({
@@ -194,10 +167,10 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
             ))
         })`;
         if (s.test === void 0) {
-            return t`assertDataflow(() => ({ target: currentSyndicateTarget(), assertion: ${assertion} }));`;
+            return t`assertDataflow(() => ({ target: currentSyndicateTarget, assertion: ${assertion} }));`;
         } else {
             return t`assertDataflow(() => (${walk(s.test)})
-                   ? ({ target: currentSyndicateTarget(), assertion: ${assertion} })
+                   ? ({ target: currentSyndicateTarget, assertion: ${assertion} })
                    : ({ target: void 0, assertion: void 0 }));`;
         }
     });
@@ -209,9 +182,8 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
             ? t`, new __SYNDICATE__.Set([${commaJoin(s.initialAssertions.map(walk))}])`
             : ``;
         */
-        const f = t` const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;`;
-        const n = spawn.name === void 0 ? '' : t` currentSyndicateFacet.actor.name = ${walk(spawn.name)};`;
-        return t`__SYNDICATE__.Dataspace._spawn${spawn.linkedToken ? 'Link': ''}(() => {${f}${n}${inject}${walk(spawn.body)}});`;
+        const n = spawn.name === void 0 ? '' : t` __SYNDICATE__.Turn.activeFacet.actor.name = ${walk(spawn.name)};`;
+        return t`__SYNDICATE__.Turn.active._spawn${spawn.linkedToken ? 'Link': ''}(() => {${n} ${inject} ${walk(spawn.body)} });`;
     }
 
     x(ctx.parser.spawn, expandSpawn);
@@ -222,7 +194,7 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
     });
 
     x(ctx.parser.atStatement, (s, t) => {
-        return t`(((${ctx.argDecl(t, 'currentSyndicateTarget', '() => __SYNDICATE__.Ref')}) => {${walk(s.body)}})(() => (${walk(s.target)})));`;
+        return t`(((${ctx.argDecl(t, 'currentSyndicateTarget', '__SYNDICATE__.Ref')}) => {${walk(s.body)}})(${walk(s.target)}));`;
     });
 
     x(ctx.parser.createExpression, (s, t) => {
@@ -232,17 +204,17 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
     xf(ctx.parser.assertionEndpointStatement, (s, t) => {
         if (s.isDynamic) {
             if (s.test === void 0) {
-                return t`assertDataflow(() => ({ target: currentSyndicateTarget(), assertion: ${walk(s.template)} }));`;
+                return t`assertDataflow(() => ({ target: currentSyndicateTarget, assertion: ${walk(s.template)} }));`;
             } else {
                 return t`assertDataflow(() => (${walk(s.test)})
-                       ? ({ target: currentSyndicateTarget(), assertion: ${walk(s.template)} })
+                       ? ({ target: currentSyndicateTarget, assertion: ${walk(s.template)} })
                        : ({ target: void 0, assertion: void 0 }));`;
             }
         } else {
             if (s.test === void 0) {
-                return t`assert(currentSyndicateTarget(), ${walk(s.template)});`;
+                return t`assert(currentSyndicateTarget, ${walk(s.template)});`;
             } else {
-                return t`replace(currentSyndicateTarget(), void 0, (${walk(s.test)}) ? (${walk(s.template)}) : void 0);`;
+                return t`replace(currentSyndicateTarget, void 0, (${walk(s.test)}) ? (${walk(s.template)}) : void 0);`;
             }
         }
     });
@@ -251,10 +223,8 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
         t`_dataflow(() => {${walk(s.body)}});`);
 
     x(ctx.parser.eventHandlerEndpointStatement, (s, t) => {
-        const wrap = s.once ? (i: Items) => facetWrap(t, 'once-wrapper', i) : (i: Items) => i;
-
         if (s.triggerType === 'dataflow') {
-            return wrap(t`__SYNDICATE__.Turn.active._dataflow(() => { if (${walk(s.predicate)}) { ${terminalWrap(t, s.facetToStop, s.body)} } });`);
+            return t`__SYNDICATE__.Turn.active._dataflow(() => { if (${walk(s.predicate)}) { ${terminalWrap(t, s.terminal, walk(s.body))} } });`;
         }
 
         if (s.triggerType === 'stop') {
@@ -272,19 +242,19 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
             case 'asserted':
                 entity = t`{
                     assert: (${ctx.argDecl(t, '__vs', '__SYNDICATE__.AnyValue')}, ${ctx.argDecl(t, '__handle', '__SYNDICATE__.Handle')}) => {
-                        ${guardBody(terminalWrap(t, s.facetToStop, s.body))}
+                        ${guardBody(terminalWrap(t, s.terminal, walk(s.body)))}
                     }
                 }`;
                 break;
             case 'retracted':
                 entity = t`__SYNDICATE__.assertionObserver((${ctx.argDecl(t, '__vs', '__SYNDICATE__.AnyValue')}) => {
-                    ${guardBody(t`return () => { ${terminalWrap(t, s.facetToStop, s.body)} };`)}
+                    ${guardBody(t`return () => { ${terminalWrap(t, s.terminal, walk(s.body))} };`)}
                 })`;
                 break;
             case 'message':
                 entity = t`{
                     message: (${ctx.argDecl(t, '__vs', '__SYNDICATE__.AnyValue')}) => {
-                        ${guardBody(terminalWrap(t, s.facetToStop, s.body))}
+                        ${guardBody(terminalWrap(t, s.terminal, walk(s.body)))}
                     }
                 }`;
                 break;
@@ -296,19 +266,12 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
         })`;
 
         if (s.isDynamic) {
-            if (s.test === void 0) {
-                return wrap(t`__SYNDICATE__.Turn.active.assertDataflow(() => ({ target: currentSyndicateTarget(), assertion: ${assertion} }));`);
-            } else {
-                return wrap(t`__SYNDICATE__.Turn.active.assertDataflow(() => (${walk(s.test)})
-                            ? ({ target: currentSyndicateTarget(), assertion: ${assertion} })
-                            : ({ target: void 0, assertion: void 0 }));`);
-            }
+            return t`__SYNDICATE__.Turn.active.assertDataflow(() => ({
+                target: currentSyndicateTarget,
+                assertion: ${assertion},
+            }));`;
         } else {
-            if (s.test === void 0) {
-                return wrap(t`__SYNDICATE__.Turn.active.replace(currentSyndicateTarget(), void 0, ${assertion});`);
-            } else {
-                return wrap(t`__SYNDICATE__.Turn.active.replace(currentSyndicateTarget(), void 0, (${walk(s.test)}) ? ${assertion} : void 0);`);
-            }
+            return t`__SYNDICATE__.Turn.active.replace(currentSyndicateTarget, void 0, ${assertion});`;
         }
     });
 
@@ -322,13 +285,14 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
         return t`const ${[s.label]} = __SYNDICATE__.Record.makeConstructor${fs}()(${maybeWalk(s.wireName) ?? l}, ${fns});`;
     });
 
-    xf(ctx.parser.messageSendStatement, (s, t) => t`message(currentSyndicateTarget(), ${walk(s.expr)});`);
+    xf(ctx.parser.messageSendStatement, (s, t) => t`message(currentSyndicateTarget, ${walk(s.expr)});`);
 
-    x(ctx.parser.reactStatement, (s, t) => facetWrap(t, s.label ?? 'default', s.body));
+    xf(ctx.parser.reactStatement, (s, t) => {
+        return t`facet(() => {${s.body}});`;
+    });
 
-    x(ctx.parser.stopStatement, (s, t) => t`${terminalWrap(t, s.facetToStop, s.body)};`);
-
-    xf(ctx.parser.syncStatement, (s, t) => t`_sync(${walk(s.peerToSyncWith)}, __SYNDICATE__.Turn.ref({ message() {${walk(s.body)}} }));`);
+    x(ctx.parser.stopStatement, (s, t) =>
+        t`__SYNDICATE__.Turn.active._stop(__SYNDICATE__.Turn.activeFacet, () => {${walk(s.body)}});`)
 
     return tree;
 }
@@ -367,12 +331,6 @@ export function compile(options: CompileOptions): CompilerOutput {
             case 'global':
                 tree = ts`const __SYNDICATE__ = ${runtime};\n${tree}`;
                 break;
-            case 'none':
-                break;
-            default:
-                ((_: never) => {
-                    throw new Error(`Unsupported ModuleType: ${moduleType}`);
-                })(moduleType);
         }
     }
 

packages/compiler/src/compiler/grammar.ts

@@ -1,17 +1,16 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import {
-    Token, Items, TokenBase, TokenType, Pos,
+    Token, Items,
     Pattern,
     foldItems, match, anonymousTemplate as template, commaJoin,
-    advancePos,
 
-    scope, bind, seq, seqTuple, alt, upTo, atom, atomString, group,
+    scope, bind, seq, alt, upTo, atom, atomString, group,
     repeat, option, withoutSpace, map, mapm, rest, discard,
-    value, succeed, fail, separatedOrTerminatedBy, not,
-} from '../syntax/index';
-import * as Matcher from '../syntax/matcher';
+    value, succeed, fail, separatedOrTerminatedBy, not, TokenBase
+} from '../syntax/index.js';
+import * as Matcher from '../syntax/matcher.js';
 
 //---------------------------------------------------------------------------
 // AST types
@@ -51,19 +50,8 @@ export interface StatementTurnAction extends TurnAction {
     body: Statement;
 }
 
-export type FacetToStop = 'default' | Expr;
-
-export interface StopStatement extends StatementTurnAction {
-    facetToStop: FacetToStop;
-}
-
-export interface SyncStatement extends StatementTurnAction {
-    peerToSyncWith: Expr;
-}
-
 export interface GenericEventEndpointStatement extends StatementTurnAction {
-    facetToStop: FacetToStop | 'none' | 'once-wrapper';
-    once: boolean;
+    terminal: boolean;
     isDynamic: boolean;
 }
 
@@ -79,7 +67,6 @@ export interface PseudoEventEndpointStatement extends GenericEventEndpointStatem
 export interface AssertionEventEndpointStatement extends GenericEventEndpointStatement {
     triggerType: 'asserted' | 'retracted' | 'message';
     pattern: ValuePattern;
-    test?: Expr,
 }
 
 export type EventHandlerEndpointStatement =
@@ -102,7 +89,6 @@ export interface DuringStatement extends FacetSetupAction {
 }
 
 export interface ReactStatement extends FacetSetupAction {
-    label: Identifier | null;
 }
 
 export interface AtStatement {
@@ -187,37 +173,16 @@ export class SyndicateParser {
         return group('{', map(rest, items => (acc?.push(... items), items)));
     }
 
-    readonly statementBoundary = alt<any>(
-        atom(';'),
-        Matcher.newline,
-        seq(Matcher.end, i => {
-            if (i.context === null || i.context === '{') return discard(i);
-            // ^ toplevel, or inside braces, so presumably statement context
-            return fail(i); // otherwise, parens or brackets presumably, so not statement context
-        }),
-    );
+    readonly statementBoundary = alt<any>(atom(';'), Matcher.newline);
     readonly exprBoundary = alt<any>(atom(';'), atom(','), group('{', discard), Matcher.end);
 
     readonly identifier: Pattern<Identifier> = atom();
-    binder(... _extraStops: Pattern<any>[]): Pattern<Binder> { return scope(o => bind(o, 'id', this.identifier)); }
-    readonly defaultBinder = this.binder();
+    get binder(): Pattern<Binder> { return scope(o => bind(o, 'id', this.identifier)); }
 
     expr(... extraStops: Pattern<any>[]): Pattern<Expr> {
         return withoutSpace(upTo(alt(this.exprBoundary, ... extraStops)));
     }
 
-    expr1(... extraStops: Pattern<any>[]): Pattern<Expr> {
-        return mapm(this.expr(... extraStops), e => e.length ? succeed(e) : fail);
-    }
-
-    propertyNameExpr(): Pattern<Expr> {
-        const dq = template`"`;
-        return alt<Expr>(
-            map(atom(), name => [... dq, name, ... dq]),
-            map(atom(void 0, { tokenType: TokenType.STRING }), str => [str]),
-            group('[', this.expr()));
-    }
-
     readonly type: (... extraStops: Pattern<any>[]) => Pattern<Type> = this.expr;
 
     statement(acc: Items): Pattern<any> {
@@ -255,7 +220,7 @@ export class SyndicateParser {
                            map(scope(
                                (l: { b: Binder, init: Expr }) =>
                                    seq(kw('let'),
-                                       bind(l, 'b', this.defaultBinder),
+                                       bind(l, 'b', this.binder),
                                        atom('='),
                                        bind(l, 'init', this.headerExpr))),
                                l => {
@@ -269,7 +234,7 @@ export class SyndicateParser {
     readonly fieldDeclarationStatement: Pattern<FieldDeclarationStatement> =
         this.turnAction(o => {
             return seq(atom('field'),
-                       bind(o, 'field', this.defaultBinder),
+                       bind(o, 'field', this.binder),
                        option(seq(atom('='), bind(o, 'init', this.expr()))),
                        this.statementBoundary);
         });
@@ -297,44 +262,32 @@ export class SyndicateParser {
 
     mandatoryIfNotTerminal(o: GenericEventEndpointStatement, p: Pattern<any>): Pattern<any> {
         return i => {
-            return (o.facetToStop !== 'none') ? option(p)(i) : p(i);
+            return (o.terminal) ? option(p)(i) : p(i);
         };
     }
 
     // Principal: Turn
     readonly eventHandlerEndpointStatement: Pattern<EventHandlerEndpointStatement> =
         this.turnAction(o => {
-            o.facetToStop = 'none';
-            o.once = false;
+            o.terminal = false;
             o.isDynamic = true;
             o.body = [];
-            return seq(alt(seq(option(seq(atom('stop'),
-                                          map(option(this.expr1(atom('on'))), es => {
-                                              o.facetToStop = es.length ? es[0] : 'default';
-                                          }))),
-                               atom('on')),
-                           map(atom('once'), _ => {
-                               o.once = true;
-                               o.facetToStop = 'once-wrapper';
-                           })),
+            return seq(option(map(atom('stop'), _ => o.terminal = true)),
+                       atom('on'),
                        alt<any>(seq(map(group('(', bind(o as DataflowEndpointStatement, 'predicate',
                                                         this.expr())),
                                         _ => o.triggerType = 'dataflow'),
                                     this.mandatoryIfNotTerminal(o, this.statement(o.body))),
                                 mapm(seq(bind(o, 'triggerType', atomString('stop')),
                                          option(this.statement(o.body))),
-                                     v => ((o.facetToStop !== 'none') || o.once) ? fail : succeed(v)),
+                                     v => o.terminal ? fail : succeed(v)),
                                 seq(bind(o, 'triggerType',
                                          alt(atomString('asserted'),
                                              atomString('retracted'),
                                              atomString('message'))),
                                     option(map(kw('snapshot'), _ => o.isDynamic = false)),
                                     bind(o as AssertionEventEndpointStatement, 'pattern',
-                                         this.valuePattern(1, atom('=>'),
-                                                           seq(atom('when'), group('(', discard)))),
-                                    option(seq(atom('when'), group(
-                                        '(', bind(o as AssertionEventEndpointStatement, 'test',
-                                                  this.expr())))),
+                                         this.valuePattern(1, atom('=>'))),
                                     this.mandatoryIfNotTerminal(
                                         o, seq(atom('=>'), this.statement(o.body))))));
         });
@@ -344,7 +297,7 @@ export class SyndicateParser {
         scope(o => seq(bind(o, 'expectedUse', alt(atomString('message'), atomString('assertion'))),
                        atom('type'),
                        bind(o, 'label', this.identifier),
-                       group('(', bind(o, 'fields', repeat(this.defaultBinder, { separator: atom(',') }))),
+                       group('(', bind(o, 'fields', repeat(this.binder, { separator: atom(',') }))),
                        option(seq(atom('='),
                                   bind(o, 'wireName', withoutSpace(upTo(this.statementBoundary))))),
                        this.statementBoundary));
@@ -371,32 +324,12 @@ export class SyndicateParser {
     // Principal: Turn
     readonly reactStatement: Pattern<ReactStatement> =
         this.turnAction(o => {
-            o.label = null;
             o.body = [];
-            return seq(option(map(seqTuple(this.identifier, atom(':')),
-                                  ([i, _colon]) => o.label = i)),
-                       atom('react'),
-                       this.block(o.body));
+            return seq(atom('react'), this.block(o.body));
         });
 
     // Principal: Turn
-    readonly stopStatement: Pattern<StopStatement> =
-        this.turnAction(o => {
-            o.facetToStop = 'default';
-            o.body = [];
-            return seq(atom('stop'),
-                       option(map(this.expr1(), e => o.facetToStop = e)),
-                       alt(this.block(o.body), this.statementBoundary));
-        });
-
-    // Principal: Turn
-    readonly syncStatement: Pattern<SyncStatement> =
-        this.turnAction(o => {
-            o.body = [];
-            return seq(atom('sync'),
-                       map(this.expr1(), e => o.peerToSyncWith = e),
-                       this.block(o.body));
-        });
+    readonly stopStatement = this.blockTurnAction(atom('stop'));
 
     // Principal: none
     readonly atStatement: Pattern<AtStatement> =
@@ -427,22 +360,12 @@ export class SyndicateParser {
     // {expr: expr, ...} - constant
     // other - constant
 
-    pCaptureBinder = (b: Pattern<Binder>): Pattern<Binder> =>
-        mapm(b, i => {
-            if (i.id.text.startsWith('$')) {
-                const adjustedStart: Pos = { ... i.id.start };
-                advancePos(adjustedStart, ' ');
-                const adjustedId: Token = {
-                    ... i.id,
-                    start: adjustedStart,
-                    text: i.id.text.slice(1),
-                };
-                return succeed({ id: adjustedId, type: i.type });
-            } else {
-                return fail;
-            }
+    readonly pCaptureBinder: Pattern<Binder> =
+        mapm(this.binder, i => {
+            return i.id.text.startsWith('$')
+                ? succeed({ id: { ... i.id, text: i.id.text.slice(1) }, type: i.type })
+                : fail;
         });
-    readonly pCaptureDefaultBinder = this.pCaptureBinder(this.defaultBinder);
 
     readonly pDiscard: Pattern<void> =
         mapm(this.identifier, i => i.text === '_' ? succeed(void 0) : fail);
@@ -470,7 +393,7 @@ export class SyndicateParser {
 
     hasCapturesOrDiscards(e: Expr): boolean {
         return foldItems(e,
-                         t => match(alt<any>(this.pCaptureDefaultBinder, this.pDiscard), [t], null, '(') !== null,
+                         t => match(alt<any>(this.pCaptureBinder, this.pDiscard), [t], null) !== null,
                          (_g, b, _k) => b,
                          bs => bs.some(b => b));
     }
@@ -495,7 +418,7 @@ export class SyndicateParser {
                                    value<[Expr, ValuePattern]>(e => {
                                        e.value = [] as any;
                                        return seq(
-                                           bind(e.value, '0', this.propertyNameExpr()),
+                                           bind(e.value, '0', this.expr(atom(':'))),
                                            atom(':'),
                                            bind(e.value, '1', this.valuePattern(level)));
                                    }),
@@ -518,6 +441,11 @@ export class SyndicateParser {
 
     valuePattern(level: number, ... extraStops: Pattern<any>[]): Pattern<ValuePattern> {
         return withoutSpace(alt<ValuePattern>(
+            scope<PCapture>(o => {
+                o.type = 'PCapture';
+                o.inner = { type: 'PDiscard' };
+                return bind(o, 'binder', this.pCaptureBinder);
+            }),
             scope(o => map(this.pDiscard, _ => o.type = 'PDiscard')),
             this.pArray(level),
             this.pDict(level),
@@ -533,7 +461,7 @@ export class SyndicateParser {
                     //     });
                     // } else
                     if (this.hasCapturesOrDiscards(o.ctor)) {
-                        const r = match(this.pCaptureDefaultBinder, o.ctor, null, '(');
+                        const r = match(this.pCaptureBinder, o.ctor, null);
                         if (r !== null && o.arguments.length === 1) {
                             return succeed({
                                 type: 'PCapture',
@@ -547,21 +475,16 @@ export class SyndicateParser {
                         return succeed(o);
                     }
                 }),
-            scope<PCapture>(o => {
-                o.type = 'PCapture';
-                o.inner = { type: 'PDiscard' };
-                return bind(o, 'binder', this.pCaptureBinder(this.binder(... extraStops)));
-            }),
             map(this.expr(... extraStops), e => ({ type: 'PConstant', value: e }))
         ));
     }
 }
 
 export class SyndicateTypedParser extends SyndicateParser {
-    binder(... extraStops: Pattern<any>[]): Pattern<Binder> {
+    get binder(): Pattern<Binder> {
         return scope(o => seq(bind(o, 'id', this.identifier),
                               option(seq(atom(':'),
-                                         bind(o, 'type', this.type(atom('='), ... extraStops))))));
+                                         bind(o, 'type', this.type(atom('=')))))));
     }
 }
 
@@ -580,7 +503,7 @@ export function compilePattern(pattern: ValuePattern): StaticAnalysis {
                 return template`(__SYNDICATE__.QuasiValue.bind(${walk(pattern.inner)}))`;
             }
             case 'PConstant':
-                return template`(__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(${pattern.value})))`;
+                return template`(__SYNDICATE__.QuasiValue.lit(${pattern.value}))`;
             case 'PConstructor': {
                 const pieces = [template`${pattern.ctor}`, ... pattern.arguments.map(walk)];
                 return template`(__SYNDICATE__.QuasiValue.ctor(${commaJoin(pieces)}))`;

packages/compiler/src/compiler/index.ts

@@ -1,6 +1,6 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-export * as Grammar from './grammar';
-export * as Codegen from './codegen';
-export { compile, CompileOptions } from './codegen';
+export * as Grammar from './grammar.js';
+export * as Codegen from './codegen.js';
+export { compile, CompileOptions } from './codegen.js';

packages/compiler/src/index.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-export * as Syntax from './syntax/index';
-export * from './compiler/index';
+export * as Syntax from './syntax/index.js';
+export * from './compiler/index.js';

packages/compiler/src/syntax/codewriter.ts

@@ -1,10 +1,10 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Token, TokenType, Item, Items, isGroup } from './tokens';
-import { Pos, startPos, advancePos } from './position';
-import { vlqEncode } from './vlq';
-import { SpanInfo } from './span';
+import { Token, TokenType, Item, Items, isGroup } from './tokens.js';
+import { Pos, startPos, advancePos } from './position.js';
+import { vlqEncode } from './vlq.js';
+import { SpanInfo } from './span.js';
 
 export interface SourceMap {
     version: 3;

packages/compiler/src/syntax/index.ts

@@ -1,13 +1,13 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-export * from './codewriter';
-export * from './list';
-export * from './matcher';
-export * from './position';
-export * from './reader';
-export * from './scanner';
-export * from './span';
-export * from './template';
-export * from './tokens';
-export * from './vlq';
+export * from './codewriter.js';
+export * from './list.js';
+export * from './matcher.js';
+export * from './position.js';
+export * from './reader.js';
+export * from './scanner.js';
+export * from './span.js';
+export * from './template.js';
+export * from './tokens.js';
+export * from './vlq.js';

packages/compiler/src/syntax/list.ts

@@ -1,27 +1,26 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-export interface List<T, C> extends Iterable<T> {
+export interface List<T> extends Iterable<T> {
     item: T | null;
-    next: List<T, C> | null;
-    context: C;
+    next: List<T> | null;
 
     toArray(): Array<T>;
 }
 
-export function atEnd<T, C>(xs: List<T, C>): xs is (List<T, C> & { item: null, next: null }) {
+export function atEnd<T>(xs: List<T>): xs is (List<T> & { item: null, next: null }) {
     return xs.item === null;
 }
 
-export function notAtEnd<T, C>(xs: List<T, C>): xs is (List<T, C> & { item: T, next: List<T, C> }) {
+export function notAtEnd<T>(xs: List<T>): xs is (List<T> & { item: T, next: List<T> }) {
     return xs.item !== null;
 }
 
-export class ArrayList<T, C> implements List<T, C> {
+export class ArrayList<T> implements List<T> {
     readonly items: Array<T>;
     readonly index: number = 0;
 
-    constructor(items: Array<T>, public context: C, index = 0) {
+    constructor(items: Array<T>, index = 0) {
         this.items = items;
         this.index = index;
     }
@@ -30,9 +29,9 @@ export class ArrayList<T, C> implements List<T, C> {
         return this.items[this.index] ?? null;
     }
 
-    get next(): List<T, C> | null {
+    get next(): List<T> | null {
         if (this.index >= this.items.length) return null;
-        return new ArrayList(this.items, this.context, this.index + 1);
+        return new ArrayList(this.items, this.index + 1);
     }
 
     toArray(): Array<T> {
@@ -40,7 +39,7 @@ export class ArrayList<T, C> implements List<T, C> {
     }
 
     [Symbol.iterator](): Iterator<T> {
-        let i: List<T, C> = this;
+        let i: List<T> = this;
         return {
             next(): IteratorResult<T> {
                 if (notAtEnd(i)) {

packages/compiler/src/syntax/matcher.ts

@@ -1,38 +1,34 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import {
     Token, TokenType, Items, Item,
     isGroup, isToken, isSpace, isTokenType,
-} from './tokens';
-import { Pos, startPos } from './position';
-import { List, ArrayList, atEnd, notAtEnd } from './list';
+} from './tokens.js';
+import { Pos, startPos } from './position.js';
+import { List, ArrayList, atEnd, notAtEnd } from './list.js';
 
 //---------------------------------------------------------------------------
 // Patterns over Item
 
-export type ItemContext = string /* the opener of the containing group, if any */ | null;
-export type ItemList = List<Item, ItemContext>;
-export type PatternResult<T> = [T, ItemList] | null;
-export type Pattern<T> = (i: ItemList) => PatternResult<T>;
+export type PatternResult<T> = [T, List<Item>] | null;
+export type Pattern<T> = (i: List<Item>) => PatternResult<T>;
 
-export type PatternTypeArg<P> = P extends Pattern<infer T> ? T : never;
-
-export function match<T,F>(p: Pattern<T>, items: Items, failure: F, context: ItemContext): T | F {
-    const r = p(new ArrayList(items, context));
+export function match<T,F>(p: Pattern<T>, items: Items, failure: F): T | F {
+    const r = p(new ArrayList(items));
     if (r === null) return failure;
     if (notAtEnd(skipSpace(r[1]))) return failure;
     return r[0];
 }
 
-export const noItems = (c: ItemContext) => new ArrayList([], c);
+export const noItems = new ArrayList<Item>([]);
 
 export const fail: Pattern<never> = _i => null;
 export function succeed<T>(t: T): Pattern<T> { return i => [t, i]; }
 
-export const discard: Pattern<void> = i => [void 0, noItems(i.context)];
-export const rest: Pattern<Items> = i => [i.toArray(), noItems(i.context)];
-export const end: Pattern<void> = i => atEnd(skipSpace(i)) ? [void 0, noItems(i.context)] : null;
+export const discard: Pattern<void> = _i => [void 0, noItems];
+export const rest: Pattern<Items> = i => [i.toArray(), noItems];
+export const end: Pattern<void> = i => atEnd(skipSpace(i)) ? [void 0, noItems] : null;
 export const pos: Pattern<Pos> = i => notAtEnd(i) ? [i.item.start, i] : null;
 
 export const newline: Pattern<Item> = i => {
@@ -41,12 +37,12 @@ export const newline: Pattern<Item> = i => {
     return [i.item, i.next];
 };
 
-export function skipSpace(i: ItemList): ItemList {
+export function skipSpace(i: List<Item>): List<Item> {
     while (notAtEnd(i) && isSpace(i.item)) i = i.next;
     return i;
 }
 
-export function collectSpace(i: ItemList, acc: Array<Item>): ItemList {
+export function collectSpace(i: List<Item>, acc: Array<Item>): List<Item> {
     while (notAtEnd(i) && isSpace(i.item)) {
         acc.push(i.item);
         i = i.next;
@@ -82,22 +78,6 @@ export function seq(... patterns: Pattern<any>[]): Pattern<any> {
     };
 }
 
-export function seqTuple<Patterns extends [...Pattern<any>[]]>(
-    ... patterns: Patterns
-): Pattern<{ [I in keyof Patterns]: PatternTypeArg<Patterns[I]> } & { length: Patterns['length'] }>
-{
-    return i => {
-        const rs = [];
-        for (const p of patterns) {
-            const r = p(i);
-            if (r === null) return null;
-            rs.push(r[0]);
-            i = r[1];
-        }
-        return [rs as unknown as PatternTypeArg<ReturnType<typeof seqTuple<Patterns>>>, i];
-    };
-}
-
 export function alt<T>(... alts: Pattern<T>[]): Pattern<T> {
     return i => {
         for (const a of alts) {
@@ -135,7 +115,7 @@ export function bind<T, K extends keyof T>(target: T, key: K, pattern: Pattern<T
     };
 }
 
-export function exec(thunk: (i: ItemList) => void): Pattern<void> {
+export function exec(thunk: (i: List<Item>) => void): Pattern<void> {
     return i => {
         thunk(i);
         return [void 0, i];
@@ -176,7 +156,7 @@ export function group<T>(opener: string, items: Pattern<T>, options: GroupOption
         if (!notAtEnd(i)) return null;
         if (!isGroup(i.item)) return null;
         if (i.item.open.text !== opener) return null;
-        const r = items(new ArrayList(i.item.items, opener));
+        const r = items(new ArrayList(i.item.items));
         if (r === null) return null;
         if (!atEnd(r[1])) return null;
         return [r[0], (options.advance ?? true) ? i.next : i];
@@ -223,7 +203,7 @@ export function upTo(p: Pattern<any>): Pattern<Items> {
 export function separatedBy<T>(itemPattern: Pattern<T>, separator: Pattern<any>): Pattern<T[]> {
     return i => {
         const acc: T[] = [];
-        if (end(i) !== null) return [acc, noItems(i.context)];
+        if (end(i) !== null) return [acc, noItems];
         while (true) {
             {
                 const r = itemPattern(i);
@@ -234,7 +214,7 @@ export function separatedBy<T>(itemPattern: Pattern<T>, separator: Pattern<any>)
             {
                 const r = separator(i);
                 if (r === null) {
-                    if (end(i) !== null) return [acc, noItems(i.context)];
+                    if (end(i) !== null) return [acc, noItems];
                     return null;
                 }
                 i = r[1];
@@ -249,7 +229,7 @@ export function separatedOrTerminatedBy<T>(
 ): Pattern<T[]> {
     return i => {
         const acc: T[] = [];
-        if (end(i) !== null) return [acc, noItems(i.context)];
+        if (end(i) !== null) return [acc, noItems];
         while (true) {
             {
                 const r = itemPattern(i);
@@ -260,11 +240,11 @@ export function separatedOrTerminatedBy<T>(
             {
                 const r = separator(i);
                 if (r === null) {
-                    if (end(i) !== null) return [acc, noItems(i.context)];
+                    if (end(i) !== null) return [acc, noItems];
                     return null;
                 } else {
                     i = r[1];
-                    if (end(i) !== null) return [acc, noItems(i.context)];
+                    if (end(i) !== null) return [acc, noItems];
                 }
             }
         }
@@ -310,13 +290,12 @@ export function option<T>(p: Pattern<T>): Pattern<T[]> {
 
 export function replace<T>(
     items: Items,
-    outerContext: ItemContext,
     p: Pattern<T>,
     f: (t: T, start: Pos, end: Pos) => Items,
-    end: Pos = items.length > 0 ? items[items.length - 1].end : startPos(null),
-) : Items {
-    const walkItems = (items: Items, end: Pos, context: ItemContext): Items => {
-        let i: ItemList = new ArrayList(items, context);
+    end: Pos = items.length > 0 ? items[items.length - 1].end : startPos(null)) : Items
+{
+    const walkItems = (items: Items, end: Pos): Items => {
+        let i: List<Item> = new ArrayList(items);
         const acc: Items = [];
         while (notAtEnd(i = collectSpace(i, acc))) {
             const r = p(i);
@@ -330,14 +309,11 @@ export function replace<T>(
                 acc.push(i.item);
                 i = i.next;
             } else {
-                acc.push({
-                    ... i.item,
-                    items: walkItems(i.item.items, i.item.end, i.item.open.text),
-                });
+                acc.push({ ... i.item, items: walkItems(i.item.items, i.item.end) });
                 i = i.next;
             }
         }
         return acc;
     };
-    return walkItems(items, end, outerContext);
+    return walkItems(items, end);
 }

packages/compiler/src/syntax/position.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export interface Pos {
     line: number;

packages/compiler/src/syntax/reader.ts

@@ -1,9 +1,9 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { TokenType, Token, Group, GroupInProgress, Item, Items, finishGroup } from './tokens';
-import { Pos, startPos } from './position';
-import { Scanner, StringScanner } from './scanner';
+import { TokenType, Token, Group, GroupInProgress, Item, Items, finishGroup } from './tokens.js';
+import { Pos, startPos } from './position.js';
+import { Scanner, StringScanner } from './scanner.js';
 
 function matchingParen(c: string): string | null {
     switch (c) {
@@ -134,10 +134,23 @@ export class LaxReader implements IterableIterator<Item> {
                     case TokenType.SPACE:
                     case TokenType.NEWLINE:
                     case TokenType.ATOM:
-                        this.drop();
                         if (g === null) {
+                            this.drop();
                             return t;
                         }
+                        if (t.text === ';') {
+                            while ('(['.indexOf(g.open.text) >= 0) {
+                                this.stack.pop();
+                                const outer = this.stackTop();
+                                if (outer === null) {
+                                    // do not drop the semicolon here
+                                    return finishGroup(g, t.start);
+                                }
+                                outer.items.push(finishGroup(g, t.start));
+                                g = outer;
+                            }
+                        }
+                        this.drop();
                         g.items.push(t);
                         break;
 

packages/compiler/src/syntax/scanner.ts

@@ -1,8 +1,8 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { TokenType, Token, Item, GroupInProgress } from './tokens';
-import { Pos, advancePos } from './position';
+import { TokenType, Token, Item, GroupInProgress } from './tokens.js';
+import { Pos, advancePos } from './position.js';
 
 export abstract class Scanner implements IterableIterator<Token> {
     readonly pos: Pos;

packages/compiler/src/syntax/span.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export class SpanResult<T> {
     readonly searchTarget: number;

packages/compiler/src/syntax/template.ts

@@ -1,10 +1,10 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Items } from './tokens';
-import { Pos, startPos } from './position';
-import { laxRead, LaxReadOptions } from './reader';
-import * as M from './matcher';
+import { Items } from './tokens.js';
+import { Pos, startPos } from './position.js';
+import { laxRead, LaxReadOptions } from './reader.js';
+import * as M from './matcher.js';
 
 const substPat = M.scope((o: { pos: Pos }) =>
     M.seq(M.atom('$'),
@@ -29,7 +29,7 @@ export class Templates {
         this.readOptions = readOptions;
     }
 
-    template(start0: Pos | string = this.defaultPos, context: M.ItemContext = null): TemplateFunction {
+    template(start0: Pos | string = this.defaultPos): TemplateFunction {
         const start = (typeof start0 === 'string') ? startPos(start0) : start0;
         return (consts, ... vars) => {
             const sourcePieces = [consts[0]];
@@ -53,7 +53,6 @@ export class Templates {
                                                  (this.readOptions.extraDelimiters ?? '') + '$',
                                                synthetic: true,
                                              }),
-                             context,
                              substPat,
                              sub => toItems(this.readOptions, vars[i++], sub.pos));
         };

packages/compiler/src/syntax/tokens.ts

@@ -1,7 +1,7 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Pos } from './position';
+import { Pos } from './position.js';
 
 export enum TokenType {
     SPACE,

packages/compiler/src/syntax/vlq.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 const inverse_alphabet =

packages/compiler/syndicate-browser-compiler.js

@@ -1,47 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2023-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-const __SYNDICATE__ = Syndicate;
-const currentSyndicateTarget = () => Syndicate.Dataspace.local;
-
-(() => {
-  async function translateScripts() {
-    if (SchemaReady) await SchemaReady;
-
-    const syndicateScripts =
-          Array.from(document.getElementsByTagName('script'))
-          .filter(s => (s.type === 'text/javascript+syndicate' ||
-                        s.type === 'syndicate' ||
-                        s.type === 'module+syndicate'));
-
-    for (const script of syndicateScripts) {
-      const isModule = script.type === 'module+syndicate';
-
-      const sourceUrl = script.src || script.getAttribute('data-src') || false;
-      const sourceCode = sourceUrl ? await (await fetch(sourceUrl)).text() : script.innerHTML;
-
-      const compilationResult = SyndicateCompiler.compile({
-        name: sourceUrl || script.id || 'anonymous-script-tag',
-        source: sourceCode,
-        module: isModule ? 'es6' : 'none',
-        runtime: isModule ? void 0 : 'Syndicate',
-        emitError: console.error,
-      });
-
-      const sourceMap = { ... compilationResult.map };
-      sourceMap.sourcesContent = [sourceCode];
-      const formattedSourceMap = '\n//# sourceMappingURL=data:application/json;base64,' +
-            Syndicate.Bytes.from(JSON.stringify(sourceMap)).toBase64();
-      const finalOutput = compilationResult.text + formattedSourceMap;
-
-      // console.log(finalOutput);
-
-      const replacement = document.createElement('script');
-      replacement.text = finalOutput;
-      if (isModule) replacement.type = 'module';
-      script.parentNode.replaceChild(replacement, script);
-    }
-  }
-
-  window.addEventListener('DOMContentLoaded', translateScripts);
-})();

packages/compiler/test/compiler.test.ts

@@ -1,291 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-import { compile, CompileOptions, Syntax } from '../src/index';
-import Pos = Syntax.Pos;
-import './test-utils';
-import { js as format } from 'js-beautify';
-
-type Error = { message: string, start: Pos | undefined, end: Pos | undefined };
-
-function translate(source: string, options: Partial<CompileOptions> = {}): { code: string, errors: Error[] } {
-    const errors: Error[] = [];
-    const result = compile({
-        ... options,
-        module: 'none',
-        source,
-        emitError: (message, start, end) => errors.push({ message, start, end }),
-    });
-    return { code: result.text, errors };
-}
-
-function translateNoErrors(source: string, options?: Partial<CompileOptions>): string {
-    const o = translate(source, options);
-    expect(o.errors.length).toBe(0);
-    return o.code;
-}
-
-function expectCodeEqual(input: string, output: string, options?: Partial<CompileOptions>) {
-    expect(format(translateNoErrors(input, options))).toBe(format(output));
-}
-
-describe('react', () => {
-
-    it('without label', () => expectCodeEqual(`react { a; b; c; }`, `
-__SYNDICATE__.Turn.active.facet(() => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  a; b; c;
-});`));
-
-    it('with label', () => expectCodeEqual(`someLabel: react { a; b; c; }`, `
-__SYNDICATE__.Turn.active.facet(() => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  const someLabel = currentSyndicateFacet;
-  a; b; c;
-});`));
-
-});
-
-describe('sync', () => {
-    it('empty body', () => expectCodeEqual(`sync p {}`, `
-__SYNDICATE__.Turn.active._sync(p, __SYNDICATE__.Turn.ref({
-    message() {}
-}));`));
-
-    it('nonempty body', () => expectCodeEqual(`sync p {q(); r();}`, `
-__SYNDICATE__.Turn.active._sync(p, __SYNDICATE__.Turn.ref({
-    message() {
-        q();
-        r();
-    }
-}));`));
-});
-
-describe('at', () => {
-    it('produces a closure for currentSyndicateTarget', () => {
-        expectCodeEqual(`at someField.value { foo(); }`,
-                        `(((currentSyndicateTarget) => {
-                           foo();
-                         })(() => (someField.value)));`);
-        expectCodeEqual(`at someField.value { foo(); }`,
-                        `(((currentSyndicateTarget: () => __SYNDICATE__.Ref) => {
-                           foo();
-                         })(() => (someField.value)));`,
-                        { typescript: true });
-    });
-});
-
-describe('spawn', () => {
-
-    it('without name', () => expectCodeEqual(`spawn { a; b; c; }`, `
-__SYNDICATE__.Dataspace._spawn(() => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  a; b; c;
-});`));
-
-    it('with name', () => expectCodeEqual(`spawn named 'foo' { a; b; c; }`, `
-__SYNDICATE__.Dataspace._spawn(() => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  currentSyndicateFacet.actor.name = 'foo';
-  a; b; c;
-});`));
-
-    // At present, the expr() parser accepts *empty input*. TODO: something better.
-    it('with missing name (known incorrect parsing and codegen)', () =>
-        expectCodeEqual(`spawn named { a; b; c; }`, `
-__SYNDICATE__.Dataspace._spawn(() => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  currentSyndicateFacet.actor.name = ;
-  a; b; c;
-});`));
-
-});
-
-describe('stop', () => {
-
-    it('non-statement', () => expectCodeEqual(`(stop)`, `(stop)`));
-    it('toplevel end-delimited statement', () => expectCodeEqual(`stop`, `
-__SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-});`));
-    it('nested end-delimited statement', () => expectCodeEqual(`{ stop }`, `
-{
-  __SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-    const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  });
-}`));
-
-    it('without facet, without body', () => expectCodeEqual(`stop;`, `
-__SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-});`));
-
-    it('without facet, empty body', () => expectCodeEqual(`stop {}`, `
-__SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-});`));
-
-    it('without facet, non-empty body', () => expectCodeEqual(`stop { a; b; }`, `
-__SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  a; b;
-});`));
-
-    it('with facet, without body', () => expectCodeEqual(`stop x.y;`, `
-__SYNDICATE__.Turn.active._stop(x.y, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-});`));
-
-    it('with facet, empty body', () => expectCodeEqual(`stop x.y {}`, `
-__SYNDICATE__.Turn.active._stop(x.y, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-});`));
-
-    it('with facet, non-empty body', () => expectCodeEqual(`stop x.y { a; b; }`, `
-__SYNDICATE__.Turn.active._stop(x.y, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  a; b;
-});`));
-
-    it('nested stop, no labels', () => expectCodeEqual(`stop { stop; }`, `
-__SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-  const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  __SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-    const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-  });
-});`));
-
-});
-
-describe('during', () => {
-
-    it('stop in body', () => expectCodeEqual(`during P => { a; stop; b; }`, `
-__SYNDICATE__.Turn.active.assertDataflow(() => ({
-    target: currentSyndicateTarget(),
-    assertion: __SYNDICATE__.Observe({
-        pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(P)))),
-        observer: __SYNDICATE__.Turn.ref(__SYNDICATE__.assertionFacetObserver(
-            (__vs) => {
-                if (Array.isArray(__vs)) {
-
-                    a;
-                    __SYNDICATE__.Turn.active._stop(currentSyndicateFacet, () => {
-                        const currentSyndicateFacet = __SYNDICATE__.Turn.activeFacet;
-                    });
-                    b;
-                }
-            }
-        ))
-    })
-}));`));
-
-    it('capture with type at top', () => expectCodeEqual(`during $v: T => { ok() }`, `
-__SYNDICATE__.Turn.active.assertDataflow(() => ({
-    target: currentSyndicateTarget(),
-    assertion: __SYNDICATE__.Observe({
-        pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.bind((__SYNDICATE__.QuasiValue._)))),
-        observer: __SYNDICATE__.Turn.ref(__SYNDICATE__.assertionFacetObserver(
-            (__vs: __SYNDICATE__.AnyValue) => {
-                if (Array.isArray(__vs)) {
-                    const __v_0 = T.__from_preserve__(__vs[0]);
-                    if (__v_0 === void 0) return;
-                    const v = __v_0;
-                    ok()
-                }
-            }
-        ))
-    })
-}));
-`, { typescript: true }));
-
-});
-
-describe('once', () => {
-    it('basics with block', () => expectCodeEqual(`once asserted P => { a; b; }`, `
-__SYNDICATE__.Turn.active.facet(() => {
-    const __once_facet = __SYNDICATE__.Turn.activeFacet;
-    __SYNDICATE__.Turn.active.assertDataflow(() => ({
-        target: currentSyndicateTarget(),
-        assertion: __SYNDICATE__.Observe({
-            pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(P)))),
-            observer: __SYNDICATE__.Turn.ref({
-                assert: (__vs, __handle) => {
-                    if (Array.isArray(__vs)) {
-
-                        __SYNDICATE__.Turn.active._stop(__once_facet, () => { a; b; })
-                    }
-                }
-            }),
-        })
-    }));
-});`));
-
-    it('basics with statement', () => expectCodeEqual(`once asserted P => x;`, `
-__SYNDICATE__.Turn.active.facet(() => {
-    const __once_facet = __SYNDICATE__.Turn.activeFacet;
-    __SYNDICATE__.Turn.active.assertDataflow(() => ({
-        target: currentSyndicateTarget(),
-        assertion: __SYNDICATE__.Observe({
-            pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(P)))),
-            observer: __SYNDICATE__.Turn.ref({
-                assert: (__vs, __handle) => {
-                    if (Array.isArray(__vs)) {
-
-                        __SYNDICATE__.Turn.active._stop(__once_facet, () => {x;})
-                    }
-                }
-            }),
-        })
-    }));
-});`));
-
-});
-
-describe('on', () => {
-    it('message with guard', () => expectCodeEqual(`
-        on message S.Focus(entity) when (isLast.value) => {
-            text.node.focus();
-        }`, `__SYNDICATE__.Turn.active.assertDataflow(() => (isLast.value) ?
-                ({
-                    target: currentSyndicateTarget(),
-                    assertion: __SYNDICATE__.Observe({
-                        pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.ctor(S.Focus, (__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(entity)))))),
-                        observer: __SYNDICATE__.Turn.ref({
-                            message: (__vs) => {
-                                if (Array.isArray(__vs)) {
-
-
-                                    text.node.focus();
-
-                                }
-                            }
-                        }),
-                    })
-                }) :
-                ({
-                    target: void 0,
-                    assertion: void 0
-                }));`));
-
-    it('asserted with guard', () => expectCodeEqual(`on asserted P when (someTest) => x;`, `
-__SYNDICATE__.Turn.active.assertDataflow(() => (someTest) ?
-({
-    target: currentSyndicateTarget(),
-    assertion: __SYNDICATE__.Observe({
-        pattern: __SYNDICATE__.QuasiValue.finish((__SYNDICATE__.QuasiValue.lit(__SYNDICATE__.fromJS(P)))),
-        observer: __SYNDICATE__.Turn.ref({
-            assert: (__vs, __handle) => {
-                if (Array.isArray(__vs)) {
-
-                    x;
-                }
-            }
-        }),
-    })
-}) :
-({
-    target: void 0,
-    assertion: void 0
-}));`));
-
-});

packages/compiler/test/grammar.test.ts

@@ -1,30 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-import { Grammar, Syntax } from '../src/index';
-import './test-utils';
-
-describe('statement boundary', () => {
-    function stmt(input: string): [string, string] | null {
-        const parser = new Grammar.SyndicateParser();
-        const tree = Syntax.laxRead(input);
-        const items: Syntax.Items = [];
-        const r = parser.statement(items)(new Syntax.ArrayList(tree, '{'));
-        if (r === null) return null;
-        return [Syntax.itemText(items), Syntax.itemText(r[1].toArray())];
-    }
-
-    it('should include semicolon', () => {
-        expect(stmt('i am a statement ; ')).toEqual(['i am a statement;', ' ']);
-    });
-
-    it('should include newline', () => {
-        expect(stmt('i am a statement \n ')).toEqual(['i am a statement\n', ' ']);
-    });
-
-    it('should include closing brace on the same line', () => {
-        // Note that `" remainder is in outer group"` is discarded by `laxRead`.
-        expect(stmt('i am a statement } remainder is in outer group'))
-            .toEqual(['i am a statement', '']);
-    });
-});

packages/compiler/test/test-utils.ts

@@ -1,38 +0,0 @@
-/// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-
-import { is, preserves } from '@preserves/core';
-
-declare global {
-    namespace jest {
-        interface Matchers<R> {
-            is(expected: any): R;
-            toThrowFilter(f: (e: Error) => boolean): R;
-        }
-    }
-}
-
-expect.extend({
-    is(actual, expected) {
-        return is(actual, expected)
-            ? { message: () => preserves`expected ${actual} not to be Preserves.is to ${expected}`,
-                pass: true }
-            : { message: () => preserves`expected ${actual} to be Preserves.is to ${expected}`,
-                pass: false };
-    },
-
-    toThrowFilter(thunk, f) {
-        try {
-            thunk();
-            return { message: () => preserves`expected an exception`, pass: false };
-        } catch (e) {
-            if (f(e)) {
-                return { message: () => preserves`expected an exception not matching the filter`,
-                         pass: true };
-            } else {
-                return { message: () => preserves`expected an exception matching the filter: ${(e as any)?.constructor?.name}`,
-                         pass: false };
-            }
-        }
-    }
-});

packages/core/Makefile

@@ -0,0 +1 @@
+../../Makefile.generic-package

packages/core/examples/box-and-client.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import {
   Pattern as P,

packages/core/examples/box-and-client.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S npx ts-node -O '{"module": "commonjs"}'
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import {
     Pattern as P,

packages/core/jest.config.ts

@@ -1,5 +1,7 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+
+import 'preserves';
 
 export default {
   preset: 'ts-jest',

packages/core/local-protocols/schemas/queuedTasks.prs

@@ -1,14 +0,0 @@
-version 1 .
-embeddedType EntityRef.Cap .
-
-ActionDescription =
-/ @spawnActor <spawn-actor @detail OptionalAny @initialAssertions #{protocol.Handle}>
-/ @stopActor <stop-actor @error OptionalAny>
-/ @inertCheck <inert-check>
-/ <assert @target #:any @crossSpace bool @handle protocol.Handle @assertion any>
-/ <retract @target #:any @crossSpace bool @handle protocol.Handle>
-/ <message @target #:any @assertion any>
-/ <sync @target #:any @callback #:any>
-.
-
-OptionalAny = <none> / <some @value any> .

packages/core/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@syndicate-lang/core",
-  "version": "0.35.0",
+  "version": "0.11.1",
   "description": "Syndicate/JS for browser and node.js",
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/main/packages/core",
   "license": "GPL-3.0+",
   "publishConfig": {
     "access": "public"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://git.syndicate-lang.org/syndicate-lang/syndicate-js"
-  },
+  "repository": "github:syndicate-lang/syndicate-js",
   "scripts": {
     "prepare": "yarn regenerate && yarn compile && yarn rollup",
     "regenerate": "rm -rf ./src/gen && preserves-schema-ts --module EntityRef=./src/runtime/actor.ts --output ./src/gen './protocols/schemas' './local-protocols/schemas'",
@@ -20,22 +17,14 @@
     "rollup": "../../node_modules/.bin/rollup -c",
     "rollup:watch": "../../node_modules/.bin/rollup -c -w",
     "test": "../../node_modules/.bin/jest",
-    "cover": "../../node_modules/.bin/nyc --reporter=html ../../node_modules/.bin/jest",
-    "clean": "rm -rf lib dist ./src/gen",
-    "veryclean": "yarn run clean && rm -rf node_modules"
+    "cover": "../../node_modules/.bin/nyc --reporter=html ../../node_modules/.bin/jest"
   },
   "main": "dist/syndicate.js",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
-  "devDependencies": {
-    "@preserves/core": "^0.995.200",
-    "@preserves/schema-cli": "^0.995.201"
-  },
-  "peerDependencies": {
-    "@preserves/core": ">=0.995.200"
-  },
   "dependencies": {
-    "salty-crypto": "^0.3.1"
+    "@preserves/core": ">=0.19",
+    "@preserves/schema": ">=0.20"
   }
 }

packages/core/protocols/schema-bundle.bin

@@ -1,44 +1,24 @@
-´³bundle·µ³rpc„´³schema·³version°

³definitions·³Answer´³rec´³lit³
a„´³tupleµ´³named³request³any„´³named³response³any„„„„³Result´³orµµ±ok´³rec´³lit³ok„´³tupleµ´³named³value³any„„„„„µ±error´³rec´³lit³error„´³tupleµ´³named³error³any„„„„„„„³Question´³rec´³lit³
q„´³tupleµ´³named³request³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³tcp„´³schema·³version°

³definitions·³TcpLocal´³rec´³lit³	tcp-local„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³	TcpRemote´³rec´³lit³
-tcp-remote„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³TcpPeerInfo´³rec´³lit³tcp-peer„´³tupleµ´³named³handle´³embedded³any„„´³named³local´³refµ„³TcpLocal„„´³named³remote´³refµ„³	TcpRemote„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³http„´³schema·³version°

³definitions·³Chunk´³orµµ±string´³atom³String„„µ±bytes´³atom³
-ByteString„„„„³Headers´³dictof´³atom³Symbol„´³atom³String„„³MimeType´³atom³Symbol„³
-QueryValue´³orµµ±string´³atom³String„„µ±file´³rec´³lit³file„´³tupleµ´³named³filename´³atom³String„„´³named³headers´³refµ„³Headers„„´³named³body´³atom³
-ByteString„„„„„„„„³HostPattern´³orµµ±host´³atom³String„„µ±any´³lit€„„„„³HttpBinding´³rec´³lit³	http-bind„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„´³named³handler´³embedded´³refµ„³HttpRequest„„„„„„³HttpContext´³rec´³lit³request„´³tupleµ´³named³req´³refµ„³HttpRequest„„´³named³res´³embedded´³refµ„³HttpResponse„„„„„„³HttpRequest´³rec´³lit³http-request„´³tupleµ´³named³sequenceNumber´³atom³
SignedInteger„„´³named³host´³refµ„³RequestHost„„´³named³port´³atom³
SignedInteger„„´³named³method´³atom³Symbol„„´³named³path´³seqof´³atom³String„„„´³named³headers´³refµ„³Headers„„´³named³query´³dictof´³atom³Symbol„´³seqof´³refµ„³
-QueryValue„„„„´³named³body´³refµ„³RequestBody„„„„„³HttpService´³rec´³lit³http-service„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„„„„³PathPattern´³seqof´³refµ„³PathPatternElement„„³RequestBody´³orµµ±absent´³lit€„„µ±present´³atom³
-ByteString„„„„³RequestHost´³orµµ±absent´³lit€„„µ±present´³atom³String„„„„³HttpListener´³rec´³lit³
http-listener„´³tupleµ´³named³port´³atom³
SignedInteger„„„„„³HttpResponse´³orµµ±status´³rec´³lit³status„´³tupleµ´³named³code´³atom³
SignedInteger„„´³named³message´³atom³String„„„„„„µ±header´³rec´³lit³header„´³tupleµ´³named³name´³atom³Symbol„„´³named³value´³atom³String„„„„„„µ±chunk´³rec´³lit³chunk„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„µ±done´³rec´³lit³done„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„„„³
MethodPattern´³orµµ±any´³lit€„„µ±specific´³atom³Symbol„„„„³PathPatternElement´³orµµ±label´³atom³String„„µ±wildcard´³lit³
_„„µ±rest´³lit³...„„„„„³embeddedType€„„µ³noise„´³schema·³version°

³definitions·³Packet´³orµµ±complete´³atom³
-ByteString„„µ±
-fragmented´³seqof´³atom³
-ByteString„„„„„³	Initiator´³rec´³lit³	initiator„´³tupleµ´³named³initiatorSession´³embedded´³refµ„³Packet„„„„„„³	NoiseSpec´³andµ´³dict·³key´³named³key´³atom³
-ByteString„„³service´³named³service´³refµ„³ServiceSelector„„„„´³named³protocol´³refµ„³
NoiseProtocol„„´³named³
preSharedKeys´³refµ„³NoisePreSharedKeys„„„„³SessionItem´³orµµ±	Initiator´³refµ„³	Initiator„„µ±Packet´³refµ„³Packet„„„„³
NoiseProtocol´³orµµ±present´³dict·³protocol´³named³protocol´³atom³String„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
NoiseStepType´³lit³noise„³SecretKeyField´³orµµ±present´³dict·³	secretKey´³named³	secretKey´³atom³
-ByteString„„„„„µ±invalid´³dict·³	secretKey´³named³	secretKey³any„„„„µ±absent´³dict·„„„„„³DefaultProtocol´³lit±!Noise_NK_25519_ChaChaPoly_BLAKE2s„³NoiseStepDetail´³refµ„³ServiceSelector„³ServiceSelector³any³NoiseServiceSpec´³andµ´³named³base´³refµ„³	NoiseSpec„„´³named³	secretKey´³refµ„³SecretKeyField„„„„³NoisePreSharedKeys´³orµµ±present´³dict·³
preSharedKeys´³named³
preSharedKeys´³seqof´³atom³
-ByteString„„„„„„µ±invalid´³dict·³
preSharedKeys´³named³
preSharedKeys³any„„„„µ±absent´³dict·„„„„„³NoisePathStepDetail´³refµ„³	NoiseSpec„³NoiseDescriptionDetail´³refµ„³NoiseServiceSpec„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³timer„´³schema·³version°

³definitions·³SetTimer´³rec´³lit³	set-timer„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„´³named³kind´³refµ„³	TimerKind„„„„„³	LaterThan´³rec´³lit³
-later-than„´³tupleµ´³named³seconds´³atom³Double„„„„„³	TimerKind´³orµµ±relative´³lit³relative„„µ±absolute´³lit³absolute„„µ±clear´³lit³clear„„„„³TimerExpired´³rec´³lit³
timer-expired„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„„„„„³embeddedType€„„µ³trace„´³schema·³version°

³definitions·³Oid³any³Name´³orµµ±	anonymous´³rec´³lit³	anonymous„´³tupleµ„„„„µ±named´³rec´³lit³named„´³tupleµ´³named³name³any„„„„„„„³Target´³rec´³lit³entity„´³tupleµ´³named³actor´³refµ„³ActorId„„´³named³facet´³refµ„³FacetId„„´³named³oid´³refµ„³Oid„„„„„³TaskId³any³TurnId³any³ActorId³any³FacetId³any³	TurnCause´³orµµ±turn´³rec´³lit³	caused-by„´³tupleµ´³named³id´³refµ„³TurnId„„„„„„µ±cleanup´³rec´³lit³cleanup„´³tupleµ„„„„µ±linkedTaskRelease´³rec´³lit³linked-task-release„´³tupleµ´³named³id´³refµ„³TaskId„„´³named³reason´³refµ„³LinkedTaskReleaseReason„„„„„„µ±periodicActivation´³rec´³lit³periodic-activation„´³tupleµ´³named³period´³atom³Double„„„„„„µ±delay´³rec´³lit³delay„´³tupleµ´³named³causingTurn´³refµ„³TurnId„„´³named³amount´³atom³Double„„„„„„µ±external´³rec´³lit³external„´³tupleµ´³named³description³any„„„„„„„³	TurnEvent´³orµµ±assert´³rec´³lit³assert„´³tupleµ´³named³	assertion´³refµ„³AssertionDescription„„´³named³handle´³refµ³protocol„³Handle„„„„„„µ±retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ³protocol„³Handle„„„„„„µ±message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³AssertionDescription„„„„„„µ±sync´³rec´³lit³sync„´³tupleµ´³named³peer´³refµ„³Target„„„„„„µ±	breakLink´³rec´³lit³
+´³bundle·µ³tcp„´³schema·³version‘³definitions·³TcpLocal´³rec´³lit³	tcp-local„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³	TcpRemote´³rec´³lit³
+tcp-remote„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³TcpPeerInfo´³rec´³lit³tcp-peer„´³tupleµ´³named³handle´³embedded³any„„´³named³local´³refµ„³TcpLocal„„´³named³remote´³refµ„³	TcpRemote„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³timer„´³schema·³version‘³definitions·³SetTimer´³rec´³lit³	set-timer„´³tupleµ´³named³label³any„´³named³msecs´³atom³Double„„´³named³kind´³refµ„³	TimerKind„„„„„³	LaterThan´³rec´³lit³
+later-than„´³tupleµ´³named³msecs´³atom³Double„„„„„³	TimerKind´³orµµ±relative´³lit³relative„„µ±absolute´³lit³absolute„„µ±clear´³lit³clear„„„„³TimerExpired´³rec´³lit³
timer-expired„´³tupleµ´³named³label³any„´³named³msecs´³atom³Double„„„„„„³embeddedType€„„µ³trace„´³schema·³version‘³definitions·³Oid³any³Name´³orµµ±	anonymous´³rec´³lit³	anonymous„´³tupleµ„„„„µ±named´³rec´³lit³named„´³tupleµ´³named³name³any„„„„„„„³Target´³rec´³lit³entity„´³tupleµ´³named³actor´³refµ„³ActorId„„´³named³facet´³refµ„³FacetId„„´³named³oid´³refµ„³Oid„„„„„³TaskId³any³TurnId³any³ActorId³any³FacetId³any³	TurnCause´³orµµ±turn´³rec´³lit³	caused-by„´³tupleµ´³named³id´³refµ„³TurnId„„„„„„µ±cleanup´³rec´³lit³cleanup„´³tupleµ„„„„µ±linkedTaskRelease´³rec´³lit³linked-task-release„´³tupleµ´³named³id´³refµ„³TaskId„„´³named³reason´³refµ„³LinkedTaskReleaseReason„„„„„„µ±periodicActivation´³rec´³lit³periodic-activation„´³tupleµ´³named³period´³atom³Double„„„„„„µ±delay´³rec´³lit³delay„´³tupleµ´³named³causingTurn´³refµ„³TurnId„„´³named³amount´³atom³Double„„„„„„µ±external´³rec´³lit³external„´³tupleµ´³named³description³any„„„„„„„³	TurnEvent´³orµµ±assert´³rec´³lit³assert„´³tupleµ´³named³	assertion´³refµ„³AssertionDescription„„´³named³handle´³refµ³protocol„³Handle„„„„„„µ±retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ³protocol„³Handle„„„„„„µ±message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³AssertionDescription„„„„„„µ±sync´³rec´³lit³sync„´³tupleµ´³named³peer´³refµ„³Target„„„„„„µ±	breakLink´³rec´³lit³
 break-link„´³tupleµ´³named³source´³refµ„³ActorId„„´³named³handle´³refµ³protocol„³Handle„„„„„„„„³
 ExitStatus´³orµµ±ok´³lit³ok„„µ±Error´³refµ³protocol„³Error„„„„³
 TraceEntry´³rec´³lit³trace„´³tupleµ´³named³	timestamp´³atom³Double„„´³named³actor´³refµ„³ActorId„„´³named³item´³refµ„³ActorActivation„„„„„³ActorActivation´³orµµ±start´³rec´³lit³start„´³tupleµ´³named³	actorName´³refµ„³Name„„„„„„µ±turn´³refµ„³TurnDescription„„µ±stop´³rec´³lit³stop„´³tupleµ´³named³status´³refµ„³
 ExitStatus„„„„„„„„³FacetStopReason´³orµµ±explicitAction´³lit³explicit-action„„µ±inert´³lit³inert„„µ±parentStopping´³lit³parent-stopping„„µ±
actorStopping´³lit³actor-stopping„„„„³TurnDescription´³rec´³lit³turn„´³tupleµ´³named³id´³refµ„³TurnId„„´³named³cause´³refµ„³	TurnCause„„´³named³actions´³seqof´³refµ„³ActionDescription„„„„„„³ActionDescription´³orµµ±dequeue´³rec´³lit³dequeue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueue´³rec´³lit³enqueue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±dequeueInternal´³rec´³lit³dequeue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueueInternal´³rec´³lit³enqueue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±spawn´³rec´³lit³spawn„´³tupleµ´³named³link´³atom³Boolean„„´³named³id´³refµ„³ActorId„„„„„„µ±link´³rec´³lit³link„´³tupleµ´³named³parentActor´³refµ„³ActorId„„´³named³
childToParent´³refµ³protocol„³Handle„„´³named³
 childActor´³refµ„³ActorId„„´³named³
parentToChild´³refµ³protocol„³Handle„„„„„„µ±
 facetStart´³rec´³lit³facet-start„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„„„„„µ±	facetStop´³rec´³lit³
-facet-stop„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„´³named³reason´³refµ„³FacetStopReason„„„„„„µ±linkedTaskStart´³rec´³lit³linked-task-start„´³tupleµ´³named³taskName´³refµ„³Name„„´³named³id´³refµ„³TaskId„„„„„„„„³TargetedTurnEvent´³rec´³lit³event„´³tupleµ´³named³target´³refµ„³Target„„´³named³detail´³refµ„³	TurnEvent„„„„„³AssertionDescription´³orµµ±value´³rec´³lit³value„´³tupleµ´³named³value³any„„„„„µ±opaque´³rec´³lit³opaque„´³tupleµ´³named³description³any„„„„„„„³LinkedTaskReleaseReason´³orµµ±	cancelled´³lit³	cancelled„„µ±normal´³lit³normal„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³stdenv„´³schema·³version°

³definitions·³
StandardRoute´³orµµ±standard´³tuplePrefixµ´³named³
-transports´³seqof´³refµ„³StandardTransport„„„´³named³key´³atom³
-ByteString„„´³named³service³any„´³named³sig´³atom³
-ByteString„„´³named³oid³any„„´³named³caveats´³seqof´³refµ³sturdy„³Caveat„„„„„µ±general´³refµ³
-gatekeeper„³Route„„„„³StandardTransport´³orµµ±wsUrl´³atom³String„„µ±other³any„„„„³embeddedType€„„µ³stream„´³schema·³version°

³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
+facet-stop„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„´³named³reason´³refµ„³FacetStopReason„„„„„„µ±linkedTaskStart´³rec´³lit³linked-task-start„´³tupleµ´³named³taskName´³refµ„³Name„„´³named³id´³refµ„³TaskId„„„„„„„„³TargetedTurnEvent´³rec´³lit³event„´³tupleµ´³named³target´³refµ„³Target„„´³named³detail´³refµ„³	TurnEvent„„„„„³AssertionDescription´³orµµ±value´³rec´³lit³value„´³tupleµ´³named³value³any„„„„„µ±opaque´³rec´³lit³opaque„´³tupleµ´³named³description³any„„„„„„„³LinkedTaskReleaseReason´³orµµ±	cancelled´³lit³	cancelled„„µ±normal´³lit³normal„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³stream„´³schema·³version‘³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
 controller´³embedded´³refµ„³Source„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±data´³rec´³lit³data„´³tupleµ´³named³payload³any„´³named³mode´³refµ„³Mode„„„„„„µ±eof´³rec´³lit³eof„´³tupleµ„„„„„„³Source´³orµµ±sink´³rec´³lit³sink„´³tupleµ´³named³
-controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ±	unbounded´³lit³	unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³sturdy„´³schema·³version°

³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
+controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ±	unbounded´³lit³	unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³sturdy„´³schema·³version‘³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Float´³lit³Float„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
 ByteString´³lit³
-ByteString„„µ±Symbol´³lit³Symbol„„„„³PBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Caveat´³orµµ±Rewrite´³refµ„³Rewrite„„µ±Alts´³refµ„³Alts„„µ±Reject´³refµ„³Reject„„µ±unknown³any„„„³Reject´³rec´³lit³reject„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Pattern´³orµµ±PDiscard´³refµ„³PDiscard„„µ±PAtom´³refµ„³PAtom„„µ±	PEmbedded´³refµ„³	PEmbedded„„µ±PBind´³refµ„³PBind„„µ±PAnd´³refµ„³PAnd„„µ±PNot´³refµ„³PNot„„µ±Lit´³refµ„³Lit„„µ±	PCompound´³refµ„³	PCompound„„„„³Rewrite´³rec´³lit³rewrite„´³tupleµ´³named³pattern´³refµ„³Pattern„„´³named³template´³refµ„³Template„„„„„³WireRef´³orµµ±mine´³tupleµ´³lit°„´³named³oid´³refµ„³Oid„„„„„µ±yours´³tuplePrefixµ´³lit°

„´³named³oid´³refµ„³Oid„„„´³named³attenuation´³seqof´³refµ„³Caveat„„„„„„„³PDiscard´³rec´³lit³
_„´³tupleµ„„„³Template´³orµµ±
+ByteString„„µ±Symbol´³lit³Symbol„„„„³PBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Caveat´³orµµ±Rewrite´³refµ„³Rewrite„„µ±Alts´³refµ„³Alts„„„„³Pattern´³orµµ±PDiscard´³refµ„³PDiscard„„µ±PAtom´³refµ„³PAtom„„µ±	PEmbedded´³refµ„³	PEmbedded„„µ±PBind´³refµ„³PBind„„µ±PAnd´³refµ„³PAnd„„µ±PNot´³refµ„³PNot„„µ±Lit´³refµ„³Lit„„µ±	PCompound´³refµ„³	PCompound„„„„³Rewrite´³rec´³lit³rewrite„´³tupleµ´³named³pattern´³refµ„³Pattern„„´³named³template´³refµ„³Template„„„„„³WireRef´³orµµ±mine´³tupleµ´³lit<69>„´³named³oid´³refµ„³Oid„„„„„µ±yours´³tuplePrefixµ´³lit‘„´³named³oid´³refµ„³Oid„„„´³named³attenuation´³seqof´³refµ„³Caveat„„„„„„„³PDiscard´³rec´³lit³
_„´³tupleµ„„„³Template´³orµµ±
 TAttenuate´³refµ„³
-TAttenuate„„µ±TRef´³refµ„³TRef„„µ±Lit´³refµ„³Lit„„µ±	TCompound´³refµ„³	TCompound„„„„³	PCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Pattern„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Pattern„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„³	PEmbedded´³lit³Embedded„³	SturdyRef´³rec´³lit³ref„´³tupleµ´³named³
-parameters´³refµ„³
-Parameters„„„„„³	TCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Template„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Template„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Template„„„„„„„„„³
-Parameters´³andµ´³dict·³oid´³named³oid³any„³sig´³named³sig´³atom³
-ByteString„„„„´³named³caveats´³refµ„³CaveatsField„„„„³
-TAttenuate´³rec´³lit³	attenuate„´³tupleµ´³named³template´³refµ„³Template„„´³named³attenuation´³seqof´³refµ„³Caveat„„„„„„³CaveatsField´³orµµ±present´³dict·³caveats´³named³caveats´³seqof´³refµ„³Caveat„„„„„„µ±invalid´³dict·³caveats´³named³caveats³any„„„„µ±absent´³dict·„„„„„³SturdyStepType´³lit³ref„³SturdyStepDetail´³refµ„³
-Parameters„³SturdyPathStepDetail´³refµ„³
-Parameters„³SturdyDescriptionDetail´³dict·³key´³named³key´³atom³
-ByteString„„³oid´³named³oid³any„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³worker„´³schema·³version°

³definitions·³Instance´³rec´³lit³Instance„´³tupleµ´³named³name´³atom³String„„´³named³argument³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³service„´³schema·³version°

³definitions·³State´³orµµ±started´³lit³started„„µ±ready´³lit³ready„„µ±failed´³lit³failed„„µ±complete´³lit³complete„„µ±userDefined³any„„„³
+TAttenuate„„µ±TRef´³refµ„³TRef„„µ±Lit´³refµ„³Lit„„µ±	TCompound´³refµ„³	TCompound„„„„³	PCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Pattern„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Pattern„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„³	PEmbedded´³lit³Embedded„³	SturdyRef´³rec´³lit³ref„´³tupleµ´³named³oid³any„´³named³caveatChain´³seqof´³refµ„³Attenuation„„„´³named³sig´³atom³
+ByteString„„„„„³	TCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Template„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Template„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Template„„„„„„„„„³
+TAttenuate´³rec´³lit³	attenuate„´³tupleµ´³named³template´³refµ„³Template„„´³named³attenuation´³refµ„³Attenuation„„„„„³Attenuation´³seqof´³refµ„³Caveat„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³worker„´³schema·³version‘³definitions·³Instance´³rec´³lit³Instance„´³tupleµ´³named³name´³atom³String„„´³named³argument³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³service„´³schema·³version‘³definitions·³State´³orµµ±started´³lit³started„„µ±ready´³lit³ready„„µ±failed´³lit³failed„„µ±complete´³lit³complete„„„„³
 RunService´³rec´³lit³run-service„´³tupleµ´³named³serviceName³any„„„„³ServiceState´³rec´³lit³
service-state„´³tupleµ´³named³serviceName³any„´³named³state´³refµ„³State„„„„„³
ServiceObject´³rec´³lit³service-object„´³tupleµ´³named³serviceName³any„´³named³object³any„„„„³RequireService´³rec´³lit³require-service„´³tupleµ´³named³serviceName³any„„„„³RestartService´³rec´³lit³restart-service„´³tupleµ´³named³serviceName³any„„„„³ServiceDependency´³rec´³lit³
-depends-on„´³tupleµ´³named³depender³any„´³named³dependee´³refµ„³ServiceState„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³protocol„´³schema·³version°

³definitions·³Nop´³lit€„³Oid´³atom³
SignedInteger„³Sync´³rec´³lit³
S„´³tupleµ´³named³peer´³embedded´³lit<69>„„„„„„³Turn´³seqof´³refµ„³	TurnEvent„„³Error´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„´³named³detail³any„„„„³Event´³orµµ±Assert´³refµ„³Assert„„µ±Retract´³refµ„³Retract„„µ±Message´³refµ„³Message„„µ±Sync´³refµ„³Sync„„„„³Assert´³rec´³lit³
A„´³tupleµ´³named³	assertion´³refµ„³	Assertion„„´³named³handle´³refµ„³Handle„„„„„³Handle´³atom³
SignedInteger„³Packet´³orµµ±Turn´³refµ„³Turn„„µ±Error´³refµ„³Error„„µ±	Extension´³refµ„³	Extension„„µ±Nop´³refµ„³Nop„„„„³Message´³rec´³lit³
M„´³tupleµ´³named³body´³refµ„³	Assertion„„„„„³Retract´³rec´³lit³
R„´³tupleµ´³named³handle´³refµ„³Handle„„„„„³	Assertion³any³	Extension´³rec´³named³label³any„´³named³fields´³seqof³any„„„³	TurnEvent´³tupleµ´³named³oid´³refµ„³Oid„„´³named³event´³refµ„³Event„„„„„³embeddedType€„„µ³	dataspace„´³schema·³version°

³definitions·³Observe´³rec´³lit³Observe„´³tupleµ´³named³pattern´³refµ³dataspacePatterns„³Pattern„„´³named³observer´³embedded³any„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³
-gatekeeper„´³schema·³version°

³definitions·³Bind´³rec´³lit³bind„´³tupleµ´³named³description´³refµ„³Description„„´³named³target´³embedded³any„„´³named³observer´³refµ„³BindObserver„„„„„³Step´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³Bound´³orµµ±bound´³rec´³lit³bound„´³tupleµ´³named³pathStep´³refµ„³PathStep„„„„„„µ±Rejected´³refµ„³Rejected„„„„³Route´³rec´³lit³route„´³tuplePrefixµ´³named³
-transports´³seqof³any„„„´³named³	pathSteps´³seqof´³refµ„³PathStep„„„„„³Resolve´³rec´³lit³resolve„´³tupleµ´³named³step´³refµ„³Step„„´³named³observer´³embedded´³refµ„³Resolved„„„„„„³PathStep´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³Rejected´³rec´³lit³rejected„´³tupleµ´³named³detail³any„„„„³Resolved´³orµµ±accepted´³rec´³lit³accepted„´³tupleµ´³named³responderSession´³embedded³any„„„„„„µ±Rejected´³refµ„³Rejected„„„„³Description´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³ResolvePath´³rec´³lit³resolve-path„´³tupleµ´³named³route´³refµ„³Route„„„„„³BindObserver´³orµµ±present´³embedded´³refµ„³Bound„„„µ±absent´³lit€„„„„³ResolvedPath´³rec´³lit³
resolved-path„´³tupleµ´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³responderSession´³embedded³any„„„„„³ForceDisconnect´³rec´³lit³force-disconnect„´³tupleµ„„„³ResolvePathStep´³rec´³lit³resolve-path-step„´³tupleµ´³named³origin´³embedded´³refµ„³Resolve„„„´³named³pathStep´³refµ„³PathStep„„„„„³ConnectTransport´³rec´³lit³connect-transport„´³tupleµ´³named³addr³any„„„„³ResolvedPathStep´³embedded³any„³TransportControl´³refµ„³ForceDisconnect„³ConnectedTransport´³rec´³lit³connected-transport„´³tupleµ´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³responderSession´³embedded³any„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³transportAddress„´³schema·³version°

³definitions·³Tcp´³rec´³lit³tcp„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³Unix´³rec´³lit³unix„´³tupleµ´³named³path´³atom³String„„„„„³Stdio´³rec´³lit³stdio„´³tupleµ„„„³	WebSocket´³rec´³lit³ws„´³tupleµ´³named³url´³atom³String„„„„„„³embeddedType€„„µ³dataspacePatterns„´³schema·³version°

³definitions·³AnyAtom´³orµµ±bool´³atom³Boolean„„µ±double´³atom³Double„„µ±int´³atom³
SignedInteger„„µ±string´³atom³String„„µ±bytes´³atom³
-ByteString„„µ±symbol´³atom³Symbol„„µ±embedded´³embedded³any„„„„³Pattern´³orµµ±discard´³rec´³lit³
_„´³tupleµ„„„„µ±bind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„„µ±lit´³rec´³lit³lit„´³tupleµ´³named³value´³refµ„³AnyAtom„„„„„„µ±group´³rec´³lit³group„´³tupleµ´³named³type´³refµ„³	GroupType„„´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„³	GroupType´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„„„„„µ±arr´³rec´³lit³arr„´³tupleµ„„„„µ±dict´³rec´³lit³dict„´³tupleµ„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„
+depends-on„´³tupleµ´³named³depender³any„´³named³dependee´³refµ„³ServiceState„„„„„³SystemLayerService´³rec´³lit³system-layer-service„´³tupleµ´³named³serviceName³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³protocol„´³schema·³version‘³definitions·³Oid´³atom³
SignedInteger„³Sync´³rec´³lit³sync„´³tupleµ´³named³peer´³embedded´³lit<69>„„„„„„³Turn´³seqof´³refµ„³	TurnEvent„„³Error´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„´³named³detail³any„„„„³Event´³orµµ±Assert´³refµ„³Assert„„µ±Retract´³refµ„³Retract„„µ±Message´³refµ„³Message„„µ±Sync´³refµ„³Sync„„„„³Assert´³rec´³lit³assert„´³tupleµ´³named³	assertion´³refµ„³	Assertion„„´³named³handle´³refµ„³Handle„„„„„³Handle´³atom³
SignedInteger„³Packet´³orµµ±Turn´³refµ„³Turn„„µ±Error´³refµ„³Error„„µ±	Extension´³refµ„³	Extension„„„„³Message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³	Assertion„„„„„³Retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ„³Handle„„„„„³	Assertion³any³	Extension´³rec´³named³label³any„´³named³fields´³seqof³any„„„³	TurnEvent´³tupleµ´³named³oid´³refµ„³Oid„„´³named³event´³refµ„³Event„„„„„³embeddedType€„„µ³	dataspace„´³schema·³version‘³definitions·³Observe´³rec´³lit³Observe„´³tupleµ´³named³pattern´³refµ³dataspacePatterns„³Pattern„„´³named³observer´³embedded³any„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³
+gatekeeper„´³schema·³version‘³definitions·³Bind´³rec´³lit³bind„´³tupleµ´³named³oid³any„´³named³key´³atom³
+ByteString„„´³named³target´³embedded³any„„„„„³Resolve´³rec´³lit³resolve„´³tupleµ´³named³	sturdyref´³refµ³sturdy„³	SturdyRef„„´³named³observer´³embedded´³embedded³any„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³racketEvent„´³schema·³version‘³definitions·³RacketEvent´³rec´³lit³racket-event„´³tupleµ´³named³source´³embedded³any„„´³named³event´³embedded³any„„„„„„³embeddedType€„„µ³transportAddress„´³schema·³version‘³definitions·³Tcp´³rec´³lit³tcp„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³Unix´³rec´³lit³unix„´³tupleµ´³named³path´³atom³String„„„„„³Stdio´³rec´³lit³stdio„´³tupleµ„„„³	WebSocket´³rec´³lit³ws„´³tupleµ´³named³url´³atom³String„„„„„„³embeddedType€„„µ³dataspacePatterns„´³schema·³version‘³definitions·³DLit´³rec´³lit³lit„´³tupleµ´³named³value´³refµ„³AnyAtom„„„„„³DBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³AnyAtom´³orµµ±bool´³atom³Boolean„„µ±float´³atom³Float„„µ±double´³atom³Double„„µ±int´³atom³
SignedInteger„„µ±string´³atom³String„„µ±bytes´³atom³
+ByteString„„µ±symbol´³atom³Symbol„„µ±embedded´³embedded³any„„„„³Pattern´³orµµ±DDiscard´³refµ„³DDiscard„„µ±DBind´³refµ„³DBind„„µ±DLit´³refµ„³DLit„„µ±	DCompound´³refµ„³	DCompound„„„„³DDiscard´³rec´³lit³
_„´³tupleµ„„„³	DCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Pattern„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Pattern„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³secureChatProtocol„´³schema·³version‘³definitions·³Join´³rec´³lit³
+joinedUser„´³tupleµ´³named³uid´³refµ„³UserId„„´³named³handle´³embedded´³refµ„³Session„„„„„„³Says´³rec´³lit³says„´³tupleµ´³named³who´³refµ„³UserId„„´³named³what´³atom³String„„„„„³UserId´³atom³
SignedInteger„³Session´³orµµ±observeUsers´³rec´³lit³Observe„´³tupleµ´³lit³user„´³named³observer´³embedded´³refµ„³UserInfo„„„„„„„µ±
observeSpeech´³rec´³lit³Observe„´³tupleµ´³lit³says„´³named³observer´³embedded´³refµ„³Says„„„„„„„µ±	NickClaim´³refµ„³	NickClaim„„µ±Says´³refµ„³Says„„„„³UserInfo´³rec´³lit³user„´³tupleµ´³named³uid´³refµ„³UserId„„´³named³name´³atom³String„„„„„³	NickClaim´³rec´³lit³	claimNick„´³tupleµ´³named³uid´³refµ„³UserId„„´³named³name´³atom³String„„´³named³
k´³embedded´³refµ„³NickClaimResponse„„„„„„³NickConflict´³rec´³lit³nickConflict„´³tupleµ„„„³NickClaimResponse´³orµµ±true´³lit<69>„„µ±NickConflict´³refµ„³NickConflict„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³simpleChatProtocol„´³schema·³version‘³definitions·³Says´³rec´³lit³Says„´³tupleµ´³named³who´³atom³String„„´³named³what´³atom³String„„„„„³Present´³rec´³lit³Present„´³tupleµ´³named³username´³atom³String„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„

packages/core/protocols/schemas/dataspace.prs

@@ -1,4 +1,4 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-Observe = <Observe @pattern dataspacePatterns.Pattern @observer #:any>.
+Observe = <Observe @pattern dataspacePatterns.Pattern @observer #!any>.

packages/core/protocols/schemas/dataspacePatterns.prs

@@ -1,30 +1,23 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# Dataspace patterns: *almost* a sublanguage of attenuation patterns.
-#
-# One key difference is that Dataspace patterns are extensible, in that
-# they ignore fields not mentioned in group patterns.
+; Dataspace patterns: a sublanguage of attenuation patterns.
+Pattern = DDiscard / DBind / DLit / DCompound .
 
-Pattern =
-    / @discard <_>
-    / <bind @pattern Pattern>
-    / <lit @value AnyAtom>
-    / <group @type GroupType @entries { any: Pattern ...:... }>
-.
-
-GroupType =
-    / <rec @label any>
-    / <arr>
-    / <dict>
-.
+DDiscard = <_>.
+DBind = <bind @pattern Pattern>.
+DLit = <lit @value AnyAtom>.
+DCompound = <rec @label any @fields [Pattern ...]>
+          / <arr @items [Pattern ...]>
+          / <dict @entries { any: Pattern ...:... }> .
 
 AnyAtom =
     / @bool bool
+    / @float float
     / @double double
     / @int int
     / @string string
     / @bytes bytes
     / @symbol symbol
-    / @embedded #:any
+    / @embedded #!any
 .

packages/core/protocols/schemas/gatekeeper.prs

@@ -1,96 +1,5 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# ---------------------------------------------------------------------------
-# Protocol at *gatekeeper* entities
-
-# Assertion. Gatekeeper will attempt to resolve `step`, responding with a `Resolved` to
-# `observer`.
-Resolve = <resolve @step Step @observer #:Resolved> .
-Resolved = <accepted @responderSession #:any> / Rejected .
-Step = <<rec> @stepType symbol [@detail any]> .
-
-# ---------------------------------------------------------------------------
-# Protocol at dataspaces *associated* with gatekeeper entities
-
-# ## Handling `Resolve` requests
-#
-# When the gatekeeper entity receives a `Resolve` assertion (call it R1), it
-#
-#  1. asserts a `Resolve` (call it R2) into its associated dataspace that
-#     is the same as R1 except it has a different `observer`; and
-#
-#  2. observes a `Bind` with `description` matching the `step` of R1/R2
-#     according to `stepType` (e.g. treatment of SturdyStepType is not the
-#     same as treatment of NoiseStepType).
-#
-# Normally, an appropriate `Bind` is expected to exist. If the gatekeeper
-# sees the `Bind` first, it takes the `target` from it and does whatever
-# `stepType` mandates before replying to R1's observer.
-#
-# However, if a `Resolved` is asserted to R2's observer before a `Bind`
-# appears, that resolution is relayed on to R1's observer directly, be it
-# positive or negative, and the gatekeeper stops waiting for a `Bind`.
-#
-# This way, entities can keep an eye out for `Resolve` requests that will
-# never complete, and answer `Rejected` to them even when no matching
-# `Bind` exists. Entities could also use `Resolve` requests to synthesize a
-# `Bind` in a "just-in-time" fashion.
-#
-# ## General treatment of `Bind` assertions
-#
-# When the gatekeeper sees a `Bind`, independently of any potential
-# `Resolve` requests, it computes an appropriate PathStep from
-# `description` pointing at `target`, and responds with a `Bound` to
-# `observer` (if supplied).
-#
-Bind = <bind @description Description @target #:any @observer BindObserver> .
-Description = <<rec> @stepType symbol [@detail any]> .
-BindObserver = @present #:Bound / @absent #f .
-Bound = <bound @pathStep PathStep> / Rejected .
-
-# ---------------------------------------------------------------------------
-# Protocol at client-side dataspaces, for resolution utilities
-
-# The client-side operates using `rpc.Question`s and `rpc.Answer`s.
-
-# Assert `rpc.Question` with `ResolvePath` to request resolution of `Route`. The resolution
-# utility will continuously try to satisfy the request, following `route.pathSteps` starting
-# from one of the `route.transports`, ultimately asserting `rpc.Answer` with an `rpc.Result` in
-# response. If the process completes successfully, the `rpc.Result.ok` will carry a
-# `ResolvedPath`.
-ResolvePath = <resolve-path @route Route> .
-ResolvedPath = <resolved-path @addr any @control #:TransportControl @responderSession #:any> .
-
-# Assertions. As `ResolvePath`/`ResolvedPath`, but just for an initial transport link setup.
-ConnectTransport = <connect-transport @addr any> .
-ConnectedTransport = <connected-transport @addr any @control #:TransportControl @responderSession #:any> .
-
-# Assertions. Like `ResolvePath`/`ResolvedPath`, but for incremental resolution along a route.
-ResolvePathStep = <resolve-path-step @origin #:Resolve @pathStep PathStep> .
-ResolvedPathStep = #:any .
-PathStep = <<rec> @stepType symbol [@detail any]> .
-
-# A `Route` describes a network path that can be followed to reach some target entity.
-#
-# It starts with a set of zero or more possible non-Syndicate `transports`. These could be
-# `transportAddress.Tcp` values or similar. They are just suggestions; it's quite possible the
-# endpoint is reachable by some means not listed. The network outside Syndicate is, after all,
-# pretty diverse! In particular, *zero* `transports` may be provided, in which case some
-# out-of-band means has to be used to make that first connection.
-#
-# The `transports` give instructions for contacting the first entity in the `Route` path. Often
-# this will be a `gatekeeper`, or a `noise` protocol endpoint, or both. Occasionally, it may
-# even be the desired target entity. Subsequent `pathSteps` describe how to proceed from the
-# initial entity to the target.
-#
-# (`transports` should by rights be a set, not a sequence, but that opens up a Can Of Worms
-# regarding dataspace patterns including literal sets that I can't deal with right now.)
-Route = <route @transports [any ...] @pathSteps PathStep ...> .
-
-TransportControl = ForceDisconnect .
-ForceDisconnect = <force-disconnect> .
-
-# ---------------------------------------------------------------------------
-
-Rejected = <rejected @detail any> .
+Resolve = <resolve @sturdyref sturdy.SturdyRef @observer #!#!any>.
+Bind = <bind @oid any @key bytes @target #!any>.

packages/core/protocols/schemas/http.prs

@@ -1,62 +0,0 @@
-version 1 .
-
-# Assertion in driver DS
-# Causes creation of server and route
-HttpBinding = <http-bind @host HostPattern @port int @method MethodPattern @path PathPattern @handler #:HttpRequest> .
-
-# Assertion in driver DS
-# Describes active server and route
-HttpService = <http-service @host HostPattern @port int @method MethodPattern @path PathPattern> .
-
-# Assertion in driver DS
-# Describes active listener
-HttpListener = <http-listener @port int> .
-
-HostPattern = @host string / @any #f .
-PathPattern = [PathPatternElement ...] .
-PathPatternElement = @label string / @wildcard =_ / @rest =... .
-
-MethodPattern = @any #f / @specific @"Lowercase" symbol .
-
-# Assertion in driver DS
-HttpRequest = <http-request
-               @sequenceNumber int
-               @host RequestHost
-               @port int
-               @method @"Lowercase" symbol
-               @path [string ...]
-               @headers Headers
-               @query {symbol: [QueryValue ...] ...:...}
-               @body RequestBody> .
-
-Headers = {@"Lowercase" symbol: string ...:...} .
-QueryValue = @string string / <file @filename string @headers Headers @body bytes> .
-RequestBody = @absent #f / @present bytes .
-RequestHost = @absent #f / @present string .
-
-# Assertion to handler entity
-HttpContext = <request @req HttpRequest @res #:HttpResponse> .
-
-# HttpResponse protocol. Delivered to the `res` ref in `HttpContext`.
-#
-#     (status | header)* . chunk* . done
-#
-# Done triggers completion of the response and retraction of the frame by the peer. If the
-# HttpBinding responsible for the request is withdrawn mid-way through a response (i.e. when
-# chunked transfer is used and at least one chunk has been sent) the request is abruptly
-# closed; if it is withdrawn at any other moment in the lifetime of the request, a 500 Internal
-# Server Error is send to the client.
-#
-@<TODO "trailers?">
-HttpResponse =
-# Messages.
-/ <status @code int @message string>
-/ <header @name symbol @value string>
-/ <chunk @chunk Chunk>
-/ <done @chunk Chunk>
-.
-
-Chunk = @string string / @bytes bytes .
-
-# e.g. text/plain, text/html, application/json
-MimeType = symbol .

packages/core/protocols/schemas/noise.prs

@@ -1,83 +0,0 @@
-version 1 .
-embeddedType EntityRef.Cap .
-
-# https://noiseprotocol.org/
-
-# ---------------------------------------------------------------------------
-# Binding and connection
-
-NoiseStepType = =noise .
-
-# In a gatekeeper.Step, use ServiceSelector as detail.
-NoiseStepDetail = ServiceSelector .
-
-# In a gatekeeper.PathStep, use a NoiseSpec as detail.
-NoisePathStepDetail = NoiseSpec .
-
-# In a gatekeeper.Description, use a NoiseServiceSpec as detail.
-NoiseDescriptionDetail = NoiseServiceSpec .
-
-# ---------------------------------------------------------------------------
-# Specification of target and bind addresses
-
-ServiceSelector = any .
-
-NoiseSpec = {
-  # The `serviceSelector` to use in a `NoiseStep` for `gatekeeper.Resolve`.
-  service: ServiceSelector,
-  # The responder's static public key. If not required (uncommon!), supply the empty ByteString.
-  key: bytes,
-}
-& @protocol NoiseProtocol
-& @preSharedKeys NoisePreSharedKeys
-.
-
-NoiseServiceSpec = @base NoiseSpec & @secretKey SecretKeyField .
-SecretKeyField = @present { secretKey: bytes } / @invalid { secretKey: any } / @absent {} .
-
-# If absent, a default of DefaultProtocol is used. Most services will speak the default.
-NoiseProtocol = @present { protocol: string } / @invalid { protocol: any } / @absent {} .
-DefaultProtocol = "Noise_NK_25519_ChaChaPoly_BLAKE2s" .
-
-# If present, Noise pre-shared-keys (PSKs) are drawn from the sequence as required; if the
-# sequence is exhausted or not supplied, an all-zeros key is used each time a PSK is needed.
-NoisePreSharedKeys = @present { preSharedKeys: [bytes ...] } / @invalid { preSharedKeys: any } / @absent {} .
-
-# ---------------------------------------------------------------------------
-# Handshaking and running a session
-
-# 1. initiator asserts <resolve <noise ServiceSelector> #:A> at Gatekeeper
-# 2. gatekeeper asserts <accepted #:B> at #:A
-# 3. initiator asserts <initiator #:C> at #:B and then sends `Packet`s to #:B
-# 4. responder sends `Packet`s to #:C
-#
-# Sessions begin with introduction of initiator (#:C) and responder (#:B) to each other, and
-# then proceed by sending `Packet`s (from #:C) to #:B and (from #:B) to #:C according to
-# the Noise protocol definition. Each `Packet` represents a complete logical unit of
-# communication; for example, a complete Turn when layering the Syndicate protocol over Noise.
-# Note well the restriction on Noise messages: no individual complete packet or packet fragment
-# may exceed 65535 bytes (N.B. not 65536!). When `fragmented`, each portion of a `Packet` is a
-# complete Noise "transport message"; when `complete`, the whole thing is likewise a complete
-# "transport message".
-#
-# Retraction of the `Initiator` ends the session from the initiator-side; retraction of the
-# `<accepted ...>` assertion ends the session from the responder-side.
-
-SessionItem = Initiator / Packet .
-# Assertion
-Initiator = <initiator @initiatorSession #:Packet> .
-# Message
-Packet = @complete bytes / @fragmented [bytes ...] .
-
-# When layering Syndicate protocol over noise,
-#
-#  - the canonical encoding of the serviceSelector is the prologue
-#  - protocol.Packets MUST be encoded using the machine-oriented Preserves syntax
-#  - zero or more Turns are permitted per noise.Packet
-#  - each Turn must fit inside a single noise.Packet (fragment if needed)
-#  - payloads inside a noise.Packet may be padded at the end with byte 0x80 (128), which
-#    encodes `#f` in the machine-oriented Preserves syntax.
-#
-# In summary, each noise.Packet, once (reassembled and) decrypted, will be a sequence of zero
-# or more machine-encoded protocol.Packets, followed by zero or more 0x80 bytes.
-.

packages/core/protocols/schemas/protocol.prs

@@ -1,9 +1,8 @@
 version 1 .
 
-Packet = Turn / Error / Extension / Nop .
+Packet = Turn / Error / Extension .
 
 Extension = <<rec> @label any @fields [any ...]> .
-Nop = #f .
 
 Error = <error @message string @detail any>.
 
@@ -14,7 +13,7 @@ Oid       = int .
 Turn      = [TurnEvent ...].
 TurnEvent = [@oid Oid @event Event].
 
-Assert  = <A @assertion Assertion @handle Handle>.
-Retract = <R @handle Handle>.
-Message = <M @body Assertion>.
-Sync    = <S @peer #:#t>.
+Assert = <assert @assertion Assertion @handle Handle>.
+Retract = <retract @handle Handle>.
+Message = <message @body Assertion>.
+Sync = <sync @peer #!#t>.

packages/core/protocols/schemas/racketEvent.prs

@@ -0,0 +1,3 @@
+version 1 .
+
+RacketEvent = <racket-event @source #!any @event #!any>.

packages/core/protocols/schemas/rpc.prs

@@ -1,11 +0,0 @@
-version 1 .
-embeddedType EntityRef.Cap .
-
-# Assertion. Establishes a frame for a request.
-Question = <q @request any> .
-
-# Assertion or message. Responds to a question.
-Answer = <a @request any @response any> .
-
-# Value. Captures a common "ok-or-error" pattern as seen in e.g. Rust.
-Result = <ok @value any> / <error @error any> .

packages/core/protocols/schemas/secureChatProtocol.prs

@@ -0,0 +1,21 @@
+version 1 .
+embeddedType EntityRef.Cap .
+
+UserId = int .
+
+Join = <joinedUser @uid UserId @handle #!Session>.
+
+Session = @observeUsers <Observe =user @observer #!UserInfo>
+        / @observeSpeech <Observe =says @observer #!Says>
+        / NickClaim
+        / Says
+.
+
+NickClaim = <claimNick @uid UserId @name string @k #!NickClaimResponse>.
+NickClaimResponse = #t / NickConflict .
+
+UserInfo = <user @uid UserId @name string>.
+
+Says = <says @who UserId @what string>.
+
+NickConflict = <nickConflict>.

packages/core/protocols/schemas/service.prs

@@ -1,51 +1,54 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# Asserts that a service should begin (and stay) running after waiting
-# for its dependencies and considering reverse-dependencies, blocks,
-# and so on.
+; Asserts that a service should begin (and stay) running after waiting
+; for its dependencies and considering reverse-dependencies, blocks,
+; and so on.
 RequireService = <require-service @serviceName any>.
 
-# Asserts that a service should begin (and stay) running RIGHT NOW,
-# without considering its dependencies.
+; Asserts that a service should begin (and stay) running RIGHT NOW,
+; without considering its dependencies.
 RunService = <run-service @serviceName any>.
 
-# Asserts one or more current states of service `serviceName`. The
-# overall state of the service is the union of asserted `state`s.
-#
-# Only a few combinations make sense:
-#  - `started`
-#  - `started` + `ready`
-#  - `failed`
-#  - `complete`
-#
+; Asserts one or more current states of service `serviceName`. The
+; overall state of the service is the union of asserted `state`s.
+;
+; Only a few combinations make sense:
+;  - `started`
+;  - `started` + `ready`
+;  - `failed`
+;  - `complete`
+;
 ServiceState = <service-state @serviceName any @state State>.
 
-# A running service publishes zero or more of these. The details of
-# the object vary by service.
-#
+; A running service publishes zero or more of these. The details of
+; the object vary by service.
+;
 ServiceObject = <service-object @serviceName any @object any>.
 
-# Possible service states.
+; Possible service states.
 State =
-/ # The service has begun its startup routine, and may or may not be
-  # ready to take requests from other parties.
+/ ; The service has begun its startup routine, and may or may not be
+  ; ready to take requests from other parties.
   =started
-/ # The service is ready to take requests from other parties.
-  # (This state is special in that it is asserted *in addition* to `started`.)
+/ ; The service is ready to take requests from other parties.
+  ; (This state is special in that it is asserted *in addition* to `started`.)
   =ready
-/ # The service has failed.
+/ ; The service has failed.
   =failed
-/ # The service has completed execution.
+/ ; The service has completed execution.
   =complete
-/ # Extension or user-defined state
-  @userDefined any
 .
 
-# Asserts that, when `depender` is `require-service`d, it should not be started until
-# `dependee` has been asserted, and also that `dependee`'s `serviceName` should be
-# `require-service`d.
+; Asserts that, when `depender` is `require-service`d, it should not
+; be started until `dependee` has been asserted.
 ServiceDependency = <depends-on @depender any @dependee ServiceState>.
 
-# Message. Triggers a service restart.
+; Asserts that the service is a "system layer" service. If *not*
+; specified for a service X, where X is not `<milestone Y>` for some
+; Y, the system acts as if `<depends-on X <service-state <milestone
+; system-layer> ready>>` were asserted.
+SystemLayerService = <system-layer-service @serviceName any>.
+
+; Message. Triggers a service restart.
 RestartService = <restart-service @serviceName any>.

packages/core/protocols/schemas/simpleChatProtocol.prs

@@ -0,0 +1,5 @@
+version 1 .
+embeddedType EntityRef.Cap .
+
+Present = <Present @username string>.
+Says = <Says @who string @what string>.

packages/core/protocols/schemas/stdenv.prs

@@ -1,31 +0,0 @@
-version 1 .
-
-# A "standard" route is
-#
-# - a collection of websocket urls, for transport.
-# - a noise tunnel, for server authentication, confidentiality and integrity.
-# - a macaroon, for authorization.
-#
-# Making these choices allows a compact representation. Encoding a binary-syntax representation
-# of a standard route using base64 produces a somewhat-convenient blob of text representing
-# access to a network object that users can cut and paste.
-#
-# A `stdenv.StandardRoute.standard` can be rewritten to a `gatekeeper.Route` like this (with
-# `$caveats`, if any, added as appropriate):
-#
-#     <route $transports <noise { service: $service key: $key }> <ref { sig: $sig oid: $oid }>>
-#
-StandardRoute =
-/ @standard [@transports [StandardTransport ...]
-             @key bytes
-             @service any
-             @sig bytes
-             @oid any
-             @caveats sturdy.Caveat ...]
-/ @general gatekeeper.Route
-.
-
-StandardTransport =
-/ @wsUrl string
-/ @other any
-.

packages/core/protocols/schemas/stream.prs

@@ -1,38 +1,38 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# Assertion:
-StreamConnection = <stream-connection @source #:Source @sink #:Sink @spec any>.
+; Assertion:
+StreamConnection = <stream-connection @source #!Source @sink #!Sink @spec any>.
 
-# Assertions:
+; Assertions:
 StreamListenerReady = <stream-listener-ready @spec any>.
 StreamListenerError = <stream-listener-error @spec any @message string>.
 
-# Assertion:
+; Assertion:
 StreamError = <error @message string>.
 
 Source =
-  # Assertions:
-  / <sink @controller #:Sink>
+  ; Assertions:
+  / <sink @controller #!Sink>
   / StreamError
 
-  # Messages:
+  ; Messages:
   / <credit @amount CreditAmount @mode Mode>
 .
 
 Sink =
-  # Assertions:
-  / <source @controller #:Source>
+  ; Assertions:
+  / <source @controller #!Source>
   / StreamError
 
-  # Messages:
+  ; Messages:
   / <data @payload any @mode Mode>
   / <eof>
 .
 
-# Value:
+; Value:
 CreditAmount = @count int / @unbounded =unbounded .
 
-# Value:
+; Value:
 Mode = =bytes / @lines LineMode / <packet @size int> / <object @description any>.
 LineMode = =lf / =crlf .

packages/core/protocols/schemas/sturdy.prs

@@ -1,57 +1,30 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# ---------------------------------------------------------------------------
-# Binding and connection
+; Each Attenuation is a stage. The sequence of Attenuations is run RIGHT-TO-LEFT.
+; That is, the newest Attenuations are at the right.
+SturdyRef = <ref @oid any @caveatChain [Attenuation ...] @sig bytes>.
 
-SturdyStepType = =ref .
+; An individual Attenuation is run RIGHT-TO-LEFT.
+; That is, the newest Caveats are at the right.
+Attenuation = [Caveat ...].
 
-# In a gatekeeper.Step or gatekeeper.PathStep, use Parameters as detail.
-SturdyStepDetail = Parameters .
-SturdyPathStepDetail = Parameters .
-
-# In a gatekeeper.Description, use the following detail.
-SturdyDescriptionDetail = {
-  oid: any,
-  key: bytes,
-} .
-
-# ---------------------------------------------------------------------------
-# Macaroons
-
-# The sequence of Caveats is run RIGHT-TO-LEFT.
-# That is, the newest Caveats are at the right.
-#
-# Let f(k,d) = HMAC-BLAKE2s-256(k,d)[0..16),
-#     e = canonical machine-oriented serialization of some preserves value, and
-#     k = the original secret key for the ref.
-#
-# The `sig` is then f(f(f(f(k, e(oid)), ...), e(Caveat)), ...).
-#
-SturdyRef = <ref @parameters Parameters> .
-Parameters = {
-  oid: any,
-  sig: bytes,
-} & @caveats CaveatsField .
-CaveatsField = @present { caveats: [Caveat ...] } / @invalid { caveats: any } / @absent {} .
-
-# embodies 1st-party caveats over assertion structure, but nothing else
-# can add 3rd-party caveats and richer predicates later
-Caveat = Rewrite / Alts / Reject / @unknown any .
-Rewrite = <rewrite @pattern Pattern @template Template> .
-Reject = <reject @pattern Pattern> .
+; embodies 1st-party caveats over assertion structure, but nothing else
+; can add 3rd-party caveats and richer predicates later
+Caveat = Rewrite / Alts .
+Rewrite = <rewrite @pattern Pattern @template Template>.
 Alts = <or @alternatives [Rewrite ...]>.
 
 Oid = int .
 WireRef = @mine [0 @oid Oid] / @yours [1 @oid Oid @attenuation Caveat ...].
 
-# ---------------------------------------------------------------------------
+;---------------------------------------------------------------------------
 
 Lit = <lit @value any>.
 
 Pattern = PDiscard / PAtom / PEmbedded / PBind / PAnd / PNot / Lit / PCompound .
 PDiscard = <_>.
-PAtom = =Boolean / =Double / =SignedInteger / =String / =ByteString / =Symbol .
+PAtom = =Boolean / =Float / =Double / =SignedInteger / =String / =ByteString / =Symbol .
 PEmbedded = =Embedded .
 PBind = <bind @pattern Pattern>.
 PAnd = <and @patterns [Pattern ...]>.
@@ -62,7 +35,7 @@ PCompound =
     / @dict <dict @entries { any: Pattern ...:... }> .
 
 Template = TAttenuate / TRef / Lit / TCompound .
-TAttenuate = <attenuate @template Template @attenuation [Caveat ...]>.
+TAttenuate = <attenuate @template Template @attenuation Attenuation>.
 TRef = <ref @binding int>.
 TCompound =
     / @rec <rec @label any @fields [Template ...]>

packages/core/protocols/schemas/tcp.prs

@@ -4,4 +4,4 @@ embeddedType EntityRef.Cap .
 TcpRemote = <tcp-remote @host string @port int>.
 TcpLocal = <tcp-local @host string @port int>.
 
-TcpPeerInfo = <tcp-peer @handle #:any @local TcpLocal @remote TcpRemote>.
+TcpPeerInfo = <tcp-peer @handle #!any @local TcpLocal @remote TcpRemote>.

packages/core/protocols/schemas/timer.prs

@@ -1,7 +1,7 @@
 version 1 .
 
-SetTimer = <set-timer @label any @seconds double @kind TimerKind>.
-TimerExpired = <timer-expired @label any @seconds double>.
+SetTimer = <set-timer @label any @msecs double @kind TimerKind>.
+TimerExpired = <timer-expired @label any @msecs double>.
 TimerKind = =relative / =absolute / =clear .
 
-LaterThan = <later-than @seconds double>.
+LaterThan = <later-than @msecs double>.

packages/core/protocols/schemas/trace.prs

@@ -25,10 +25,10 @@ TurnId = any .
 
 ExitStatus = =ok / protocol.Error .
 
-# Trace information associated with a turn.
+; Trace information associated with a turn.
 TurnDescription = <turn @id TurnId @cause TurnCause @actions [ActionDescription ...]> .
 
-# The cause of a turn.
+; The cause of a turn.
 TurnCause =
 / @turn <caused-by @id TurnId>
 / <cleanup>
@@ -40,27 +40,27 @@ TurnCause =
 
 LinkedTaskReleaseReason = =cancelled / =normal .
 
-# An actual event carried within a turn.
+; An actual event carried within a turn.
 TurnEvent =
 / <assert @assertion AssertionDescription @handle protocol.Handle>
 / <retract @handle protocol.Handle>
 / <message @body AssertionDescription>
 / <sync @peer Target>
-/ # A souped-up, disguised, special-purpose `retract` event.
+/ ; A souped-up, disguised, special-purpose `retract` event.
   @breakLink <break-link @source ActorId @handle protocol.Handle>
 .
 
 TargetedTurnEvent = <event @target Target @detail TurnEvent> .
 
-# An action taken during a turn.
+; An action taken during a turn.
 ActionDescription =
-/ # The active party is processing a new `event` for `target` from the received Turn.
+/ ; The active party is processing a new `event` for `target` from the received Turn.
   <dequeue @event TargetedTurnEvent>
-/ # The active party has queued a new `event` to be processed later by `target`.
+/ ; The active party has queued a new `event` to be processed later by `target`.
   <enqueue @event TargetedTurnEvent>
-/ # The active party is processing an internally-queued event for one of its own entities.
+/ ; The active party is processing an internally-queued event for one of its own entities.
   @dequeueInternal <dequeue-internal @event TargetedTurnEvent>
-/ # The active party has scheduled an internally-queued event for one of its own entities.
+/ ; The active party has scheduled an internally-queued event for one of its own entities.
   @enqueueInternal <enqueue-internal @event TargetedTurnEvent>
 / <spawn @link bool @id ActorId>
 / <link
@@ -73,9 +73,9 @@ ActionDescription =
 / @linkedTaskStart <linked-task-start @taskName Name @id TaskId>
 .
 
-# An assertion or the body of a message: either a Preserves value, or
-# some opaque system-internal value, represented according to the
-# system concerned.
+; An assertion or the body of a message: either a Preserves value, or
+; some opaque system-internal value, represented according to the
+; system concerned.
 AssertionDescription =
 / <value @value any>
 / <opaque @description any>
@@ -90,7 +90,7 @@ FacetStopReason =
 
 Target = <entity @actor ActorId @facet FacetId @oid Oid> .
 
-# For the future: consider including information about `protocol`-level `Turn`s etc sent to
-# peers over e.g. Websockets or TCP/IP, allowing cross-correlation of traces from different
-# processes and implementations with each other to form a large overall picture.
+; For the future: consider including information about `protocol`-level `Turn`s etc sent to
+; peers over e.g. Websockets or TCP/IP, allowing cross-correlation of traces from different
+; processes and implementations with each other to form a large overall picture.
 .

packages/core/rollup.config.js

@@ -1,20 +1,17 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 import { SyndicateRollup } from '../../rollup.js';
 const r = new SyndicateRollup('syndicate', { globalName: 'Syndicate' });
 export default [
   r.config('lib/index.js', r.umd, {
-    external: ['@preserves/core', 'crypto'],
     output: {
       globals: {
         'crypto': 'crypto',
-        '@preserves/core': 'Preserves',
       },
     },
   }),
   r.config('lib/index.js', r.es6, {
-    external: ['@preserves/core'],
     resolve: {
       moduleDirectories: ['stubs', 'node_modules'],
     },

packages/core/src/index.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export * from '@preserves/core';
 
@@ -10,22 +10,17 @@ export * as DataspacePatterns from './gen/dataspacePatterns.js';
 export * from './runtime/actor.js';
 export * from './runtime/bag.js';
 export * as Dataflow from './runtime/dataflow.js';
-export { Field } from './runtime/dataflow.js';
 export * from './runtime/dataspace.js';
 export * as Pattern from './runtime/pattern.js';
 export * as QuasiValue from './runtime/quasivalue.js';
 export * from './runtime/randomid.js';
 export * as Rewrite from './runtime/rewrite.js';
-export * from './runtime/rpc.js';
-export * as Rpc from './runtime/rpc.js';
 export * as Skeleton from './runtime/skeleton.js';
-export * from './runtime/space.js';
 export * from './runtime/supervise.js';
+export * as Task from './runtime/task.js';
 
-export * as SaltyCrypto from 'salty-crypto';
 export * as Cryptography from './transport/cryptography.js';
 export * as WireProtocol from './transport/protocol.js';
-export * as Membrane from './transport/membrane.js';
 export * as Relay from './transport/relay.js';
 export * as Sturdy from './transport/sturdy.js';
 

packages/core/src/runtime/actor.ts

@@ -1,13 +1,10 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { IdentitySet, Value, embeddedId, is, fromJS, stringify, KeyedSet, Tuple, Embeddable, IsEmbedded } from '@preserves/core';
+import { IdentitySet, Value, embeddedId, is, fromJS } from '@preserves/core';
 import { Cell, Field, Graph } from './dataflow.js';
-import { Caveat, runRewrites } from './rewrite.js';
-import { ActorSpace } from './space.js';
-import { ActionDescription, StructuredTask, TaskAction } from './task.js';
-import { randomId } from './randomid.js';
-import * as Q from '../gen/queuedTasks.js';
+import { Attenuation, runRewrites } from './rewrite.js';
+import { queueTask } from './task.js';
 
 export type AnyValue = Value<Ref>;
 
@@ -21,13 +18,8 @@ export type Assertion = Value<Ref>;
 export type Handle = number;
 export type ExitReason = null | { ok: true } | { ok: false, err: unknown };
 export type LocalAction = () => void;
-export type DetailedAction<T = AnyValue> = LocalAction & { detail: T };
 
-export type Assertable =
-    | Assertion
-    | { __as_preserve__: <T extends Embeddable>() => Value<T> }
-    | { __as_preserve__: () => Assertion }
-;
+export type Assertable = Assertion | { __as_preserve__: <T>() => Value<T> } | { __as_preserve__: () => Assertion };
 
 export interface Entity {
     assert(assertion: Assertion, handle: Handle): void;
@@ -39,14 +31,18 @@ export interface Entity {
 
 export type Cap = Ref;
 
-export class Ref {
-    get [IsEmbedded](): true { return true; }
-
+export interface Ref {
     readonly relay: Facet;
     readonly target: Partial<Entity>;
-    readonly attenuation?: Caveat[];
+    readonly attenuation?: Attenuation;
+}
 
-    constructor(relay: Facet, target: Partial<Entity>, attenuation?: Caveat[]) {
+export class RefImpl implements Ref {
+    readonly relay: Facet;
+    readonly target: Partial<Entity>;
+    readonly attenuation?: Attenuation;
+
+    constructor(relay: Facet, target: Partial<Entity>, attenuation?: Attenuation) {
         this.relay = relay;
         this.target = target;
         this.attenuation = attenuation;
@@ -64,10 +60,6 @@ export class Ref {
         if ('sync' in this.target) sig = sig + 'S';
         return `⌜${this.relay.idChain()}<${sig}>${entityRepr}⌝`;
     }
-
-    static __from_preserve__(v: AnyValue): undefined | Ref {
-        return typeof v === 'object' && IsEmbedded in v && 'relay' in v ? v : void 0;
-    }
 }
 
 //---------------------------------------------------------------------------
@@ -80,10 +72,7 @@ export function toRef(_v: any): Ref | undefined {
     return isRef(_v) ? _v : void 0;
 }
 
-export function assertionFrom(a: Assertable): Assertion;
-export function assertionFrom(a: Assertable | undefined): Assertion | undefined;
-export function assertionFrom(a: Assertable | undefined): Assertion | undefined {
-    if (a === void 0) return void 0;
+export function assertionFrom(a: Assertable): Assertion {
     if (typeof a === 'object' && '__as_preserve__' in a) {
         return fromJS(a);
     } else {
@@ -91,7 +80,7 @@ export function assertionFrom(a: Assertable | undefined): Assertion | undefined
     }
 }
 
-type OutboundAssertion = { handle: Handle, peer: Ref, crossSpace: Assertion | null, established: boolean };
+type OutboundAssertion = { handle: Handle, peer: Ref, established: boolean };
 type OutboundMap = Map<Handle, OutboundAssertion>;
 
 let nextActorId = 0;
@@ -101,33 +90,25 @@ export type DataflowGraph = Graph<DataflowBlock, Cell>;
 export type DataflowBlock = () => void;
 
 export class Actor {
-    name: AnyValue = Symbol.for('A-' + randomId(16));
-    readonly space: ActorSpace;
+    readonly id = nextActorId++;
+    name: AnyValue = this.id;
     readonly root: Facet;
     _dataflowGraph: DataflowGraph | null = null;
     exitReason: ExitReason = null;
     readonly exitHooks: Array<LocalAction> = [];
 
-    static boot(
-        bootProc: LocalAction,
-        initialAssertions: OutboundMap = new Map(),
-        space = new ActorSpace(),
-    ): Actor {
-        const newActor = new Actor(space, initialAssertions);
+    static boot(bootProc: LocalAction, initialAssertions: OutboundMap = new Map()): Actor {
+        const newActor = new Actor(initialAssertions);
         newActor._boot(bootProc);
         return newActor;
     }
 
-    static __unsafeNew(space: ActorSpace, initialAssertions: OutboundMap = new Map()) {
-        return new Actor(space, initialAssertions);
+    static __unsafeNew(initialAssertions: OutboundMap = new Map()) {
+        return new Actor(initialAssertions);
     }
 
-    private constructor(space: ActorSpace, initialAssertions: OutboundMap = new Map()) {
-        this.space = space;
+    private constructor(initialAssertions: OutboundMap = new Map()) {
         this.root = new Facet(this, null, initialAssertions);
-        if (!space.register(this)) {
-            this._terminateWith({ ok: false, err: 'Spawned into shutdown ActorSpace' });
-        }
     }
 
     _boot(bootProc: LocalAction) {
@@ -137,19 +118,13 @@ export class Actor {
     get dataflowGraph(): DataflowGraph {
         if (this._dataflowGraph === null) {
             this._dataflowGraph =
-                new Graph((b: DataflowBlock) => '' + embeddedId(b),
-                          Cell.canonicalizer,
-                          g => Array.from(g.values()));
+                new Graph((b: DataflowBlock) => '' + embeddedId(b), Cell.canonicalizer);
         }
         return this._dataflowGraph;
     }
 
-    atExit(a: LocalAction): () => void {
+    atExit(a: LocalAction): void {
         this.exitHooks.push(a);
-        return () => {
-            const i = this.exitHooks.indexOf(a);
-            if (i !== -1) this.exitHooks.splice(i, 1);
-        };
     }
 
     _terminateWith(reason: Exclude<ExitReason, null>) {
@@ -158,15 +133,8 @@ export class Actor {
         if (!reason.ok) {
             console.error(`${this} crashed:`, reason.err);
         }
-        this.exitHooks.forEach(hook => {
-            try {
-                hook();
-            } catch (e) {
-                console.error(`${this} exit hook ${hook} failed:`, e);
-            }
-        });
+        this.exitHooks.forEach(hook => hook());
         this.root._terminate(reason.ok);
-        this.space.deregister(this);
     }
 
     repairDataflowGraph() {
@@ -175,7 +143,7 @@ export class Actor {
     }
 
     toString(): string {
-        return `Actor(${stringify(this.name)})`;
+        return `Actor(${this.name.asPreservesText()})`;
     }
 }
 
@@ -197,10 +165,6 @@ export class Facet {
         this.outbound = initialAssertions;
     }
 
-    wrap<T extends Tuple<any>>(f: (... args: T) => void): (... args: T) => void {
-        return (... args) => this.turn(() => f(... args));
-    }
-
     turn(a: LocalAction) {
         Turn.for(this, a);
     }
@@ -232,12 +196,7 @@ export class Facet {
 
     _halfLink(other: Facet): void {
         const h = nextHandle++;
-        const e = {
-            handle: h,
-            peer: new Ref(other, new StopOnRetract()),
-            crossSpace: null,
-            established: true,
-        };
+        const e = { handle: h, peer: { relay: other, target: new StopOnRetract() }, established: true };
         this.outbound.set(h, e);
     }
 
@@ -269,18 +228,12 @@ export class Facet {
         });
     }
 
-    idChainValues(): AnyValue[] {
-        let pieces = [];
-        for (let f: Facet | null = this; f !== null; f = f.parent) {
-            pieces.push(f.id);
-        }
-        pieces.push(this.actor.name);
-        pieces.reverse();
-        return pieces;
-    }
-
     idChain(): string {
-        return this.idChainValues().map(v => stringify(v)).join(':');
+        let facetIds = [];
+        for (let f: Facet | null = this; f !== null; f = f.parent) {
+            facetIds.push(f.id);
+        }
+        return facetIds.reverse().join(':') + ':' + this.actor.name.asPreservesText();
     }
 
     toString(): string {
@@ -288,39 +241,10 @@ export class Facet {
     }
 }
 
-export function suspend(asyncFn: (resume: <T>(v: T) => T) => void) {
-    // TODO: consider how this should/could interact with preventInertCheck
-
-    const facet = Turn.activeFacet;
-
-    const resume = <T>(v: T) => {
-        if (!facet.actor.space.isRunning()) {
-            throw new Error('Cannot resume into inactive actor space'); // TODO
-        }
-        const t = Turn.___new(facet);
-        queueMicrotask(() => {
-            try {
-                facet.actor.repairDataflowGraph();
-                t.deliver();
-            } catch (err) {
-                Turn.for(facet.actor.root, () => facet.actor._terminateWith({ ok: false, err }));
-            }
-            if (Turn.active === t) Turn.active = void 0 as unknown as Turn;
-        });
-        Turn.active = t;
-        return v;
-    };
-
-    return asyncFn(resume);
-}
-
-export const STOP_ON_RETRACT = Symbol('stop-on-retract'); // NB. NOT A GLOBAL SYMBOL
-
 export class StopOnRetract implements Partial<Entity> {
     retract(_handle: Handle): void {
-        Turn.active.stop(Turn.activeFacet);
+        Turn.active.stop();
     }
-    data = STOP_ON_RETRACT;
 }
 
 export function _sync_impl(e: Partial<Entity>, peer: Ref): void {
@@ -343,20 +267,13 @@ export class Turn {
 
     readonly id = nextTurnId++;
     _activeFacet: Facet;
-    queues: Map<Actor, StructuredTask<TaskAction>[]> | null;
+    queues: Map<Actor, LocalAction[]> | null;
 
     static for(facet: Facet, f: LocalAction, zombieTurn = false): void {
         if (!zombieTurn) {
             if (facet.actor.exitReason !== null) return;
             if (!facet.isLive) return;
         }
-        if (!facet.actor.space.isRunning()) {
-            facet.actor.space.queueTask({
-                perform() { Turn.for(facet, f, zombieTurn); },
-                describe() { return { type: 'externalTurn' } },
-            });
-            return;
-        }
         const t = new Turn(facet);
         try {
             const saved = Turn.active;
@@ -373,11 +290,7 @@ export class Turn {
         }
     }
 
-    static ___new(facet: Facet): Turn {
-        return new Turn(facet);
-    }
-
-    private constructor(facet: Facet, queues = new Map<Actor, StructuredTask<TaskAction>[]>()) {
+    private constructor(facet: Facet, queues = new Map<Actor, LocalAction[]>()) {
         this._activeFacet = facet;
         this.queues = queues;
     }
@@ -394,7 +307,7 @@ export class Turn {
     }
 
     ref<T extends Partial<Entity>>(e: T): Ref {
-        return new Ref(this.activeFacet, e);
+        return new RefImpl(this.activeFacet, e);
     }
 
     facet(bootProc: LocalAction): Facet {
@@ -404,48 +317,34 @@ export class Turn {
     }
 
     // Alias for syndicatec code generator to use
-    _stop(facet: Facet, continuation?: LocalAction) {
+    _stop(facet: Facet = this.activeFacet, continuation?: LocalAction) {
         this.stop(facet, continuation);
     }
 
-    stop(facet: Facet, continuation?: LocalAction) {
-        if (facet.actor !== Turn.activeFacet.actor) {
-            throw new Error("Attempt to terminate a facet in a different actor");
-        }
+    stop(facet: Facet = this.activeFacet, continuation?: LocalAction) {
         if (continuation) facet.onStop(continuation);
         facet._terminate(true);
     }
 
     // Alias for syndicatec code generator to use
-    _spawn(bootProc: LocalAction | DetailedAction, initialAssertions = new IdentitySet<Handle>()): Actor {
+    _spawn(bootProc: LocalAction, initialAssertions = new IdentitySet<Handle>()): Actor {
         return this.spawn(bootProc, initialAssertions);
     }
 
-    spawn(bootProc: LocalAction | DetailedAction, initialAssertions = new IdentitySet<Handle>()): Actor {
+    spawn(bootProc: LocalAction, initialAssertions = new IdentitySet<Handle>()): Actor {
         return this.__spawn(bootProc, initialAssertions);
     }
 
-    __spawn(bootProc: LocalAction | DetailedAction, initialAssertions = new IdentitySet<Handle>()): Actor {
+    __spawn(bootProc: LocalAction, initialAssertions = new IdentitySet<Handle>()): Actor {
         const newOutbound: OutboundMap = new Map();
         initialAssertions.forEach(key => newOutbound.set(key, this.activeFacet.outbound.get(key)!));
         // ^ we trust initialAssertions, so can use `!` safely
 
-        const newActor = Actor.__unsafeNew(this.activeFacet.actor.space, newOutbound);
-        const detail: Q.OptionalAny<Ref> = 'detail' in bootProc ? Q.OptionalAny.some(bootProc.detail) : Q.OptionalAny.none();
-        const spawningFacet = this.activeFacet;
-        this.enqueue(spawningFacet,
-                     () => {
-                         initialAssertions.forEach(key => spawningFacet.outbound.delete(key));
-                         newActor.space.queueTask({
-                             perform() { newActor._boot(bootProc); },
-                             describe() { return { type: 'bootActor', detail }; },
-                         });
-                     },
-                     () => {
-                         const a = new KeyedSet<Ref, number>();
-                         initialAssertions.forEach(h => a.add(h));
-                         return Q.ActionDescription.spawnActor({ detail, initialAssertions: a });
-                     });
+        const newActor = Actor.__unsafeNew(newOutbound);
+        this.enqueue(this.activeFacet, () => {
+            initialAssertions.forEach(key => this.activeFacet.outbound.delete(key));
+            queueTask(() => newActor._boot(bootProc));
+        });
         return newActor;
     }
 
@@ -463,21 +362,14 @@ export class Turn {
     }
 
     stopActor(): void {
-        this.enqueue(this.activeFacet.actor.root,
-                     () => this.activeFacet.actor._terminateWith({ ok: true }),
-                     () => Q.ActionDescription.stopActor(Q.OptionalAny.none()));
+        this.enqueue(this.activeFacet.actor.root, () => this.activeFacet.actor._terminateWith({ ok: true }));
     }
 
     crash(err: Error): void {
-        this.enqueue(this.activeFacet.actor.root,
-                     () => this.activeFacet.actor._terminateWith({ ok: false, err }),
-                     () => Q.ActionDescription.stopActor(Q.OptionalAny.some<Ref>({
-                         message: err.message,
-                         stack: err.stack ? err.stack : false,
-                     })));
+        this.enqueue(this.activeFacet.actor.root, () => this.activeFacet.actor._terminateWith({ ok: false, err }));
     }
 
-    field<V>(initial: V, name?: string): Field<V> {
+    field<V extends Value<T>, T = Ref>(initial: V, name?: string): Field<V, T> {
         return new Field(this.activeFacet.actor.dataflowGraph, initial, name);
     }
 
@@ -503,7 +395,6 @@ export class Turn {
         let assertion: Assertable | undefined = void 0;
         this.dataflow(() => {
             let {target: nextTarget, assertion: nextAssertion} = assertionFunction();
-            nextAssertion = assertionFrom(nextAssertion);
             if (target !== nextTarget || !is(assertion, nextAssertion)) {
                 target = nextTarget;
                 assertion = nextAssertion;
@@ -522,23 +413,12 @@ export class Turn {
         const assertion = assertionFrom(assertable);
         const a = runRewrites(ref.attenuation, assertion);
         if (a !== null) {
-            const crossSpace = this.activeFacet.actor.space !== ref.relay.actor.space;
-            const e = { handle: h, peer: ref, crossSpace: crossSpace ? a : null, established: false };
+            const e = { handle: h, peer: ref, established: false };
             this.activeFacet.outbound.set(h, e);
-            this.enqueue(ref.relay,
-                         () => {
-                             e.established = true;
-                             if (crossSpace) {
-                                 ref.relay.actor.space.registerInbound(h, ref, a);
-                             }
-                             ref.target.assert?.(a, h);
-                         },
-                         () => Q.ActionDescription.assert({
-                             target: ref,
-                             crossSpace,
-                             handle: h,
-                             assertion: a,
-                         }));
+            this.enqueue(ref.relay, () => {
+                e.established = true;
+                ref.target.assert?.(a, h);
+            });
         }
     }
 
@@ -560,19 +440,12 @@ export class Turn {
 
     _retract(e: OutboundAssertion): void {
         this.activeFacet.outbound.delete(e.handle);
-        this.enqueue(e.peer.relay,
-                     () => {
-                         if (e.established) {
-                             e.established = false;
-                             if (e.crossSpace) e.peer.relay.actor.space.deregisterInbound(e.handle);
-                             e.peer.target.retract?.(e.handle);
-                         }
-                     },
-                     () => Q.ActionDescription.retract({
-                         target: e.peer,
-                         crossSpace: e.crossSpace !== null,
-                         handle: e.handle,
-                     }));
+        this.enqueue(e.peer.relay, () => {
+            if (e.established) {
+                e.established = false;
+                e.peer.target.retract?.(e.handle);
+            }
+        });
     }
 
     sync(ref: Ref): Promise<void> {
@@ -580,25 +453,13 @@ export class Turn {
     }
 
     _sync(ref: Ref, peer: Ref): void {
-        this.enqueue(ref.relay,
-                     () => _sync_impl(ref.target, peer),
-                     () => Q.ActionDescription.sync({
-                         target: ref,
-                         callback: peer,
-                     }));
+        this.enqueue(ref.relay, () => _sync_impl(ref.target, peer));
     }
 
     message(ref: Ref, assertable: Assertable): void {
         const assertion = assertionFrom(assertable);
         const a = runRewrites(ref.attenuation, assertion);
-        if (a !== null) {
-            this.enqueue(ref.relay,
-                         () => ref.target.message?.(assertion),
-                         () => Q.ActionDescription.message({
-                             target: ref,
-                             assertion,
-                         }));
-        }
+        if (a !== null) this.enqueue(ref.relay, () => ref.target.message?.(assertion));
     }
 
     every(periodMilliseconds: number, a: LocalAction): any {
@@ -625,23 +486,17 @@ export class Turn {
         }, delayMilliseconds);
     }
 
-    enqueue(relay: Facet, a0: LocalAction, detail: () => ActionDescription): void {
+    enqueue(relay: Facet, a0: LocalAction): void {
         if (this.queues === null) {
             throw new Error("Attempt to reuse a committed Turn");
         }
-        const a: StructuredTask<TaskAction> = {
-            perform() { relay.isLive && Turn.active._inFacet(relay, a0); },
-            describe() { return { targetFacet: relay, action: detail() }; },
-        };
+        const a: LocalAction = () => Turn.active._inFacet(relay, a0);
         this.queues.get(relay.actor)?.push(a) ?? this.queues.set(relay.actor, [a]);
     }
 
     deliver() {
         this.queues!.forEach((q, actor) =>
-            actor.space.queueTask({
-                perform() { Turn.for(actor.root, () => q.forEach(f => f.perform())); },
-                describe() { return { type: 'turn', tasks: q.map(f => f.describe()) }; },
-            }));
+            queueTask(() => Turn.for(actor.root, () => q.forEach(f => f()))));
         this.queues = null;
     }
 }
@@ -650,12 +505,10 @@ function stopIfInertAfter(a: LocalAction): LocalAction {
     return () => {
         const facet = Turn.activeFacet;
         a();
-        Turn.active.enqueue(facet,
-                            () => {
-                                if ((facet.parent && !facet.parent.isLive) || facet.isInert()) {
-                                    Turn.active.stop(facet);
-                                }
-                            },
-                            Q.ActionDescription.inertCheck);
+        Turn.active.enqueue(facet, () => {
+            if ((facet.parent && !facet.parent.isLive) || facet.isInert()) {
+                Turn.active.stop(facet);
+            }
+        });
     };
 }

packages/core/src/runtime/bag.ts

@@ -1,9 +1,9 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 // Bags and Deltas (which are Bags where item-counts can be negative).
 
-import { Value, KeyedDictionary, KeyedSet, Embeddable } from '@preserves/core';
+import { Value, Set, Dictionary, KeyedDictionary, KeyedSet } from '@preserves/core';
 
 export enum ChangeDescription {
     PRESENT_TO_ABSENT = -1,
@@ -12,10 +12,10 @@ export enum ChangeDescription {
     PRESENT_TO_PRESENT = 2,
 }
 
-export class Bag<T extends Embeddable, V extends Value<T> = Value<T>> {
-    _items: KeyedDictionary<T, V, number>;
+export class Bag<T, V extends Value<T> = Value<T>> {
+    _items: KeyedDictionary<V, number, T>;
 
-    constructor(s?: KeyedSet<T, V>) {
+    constructor(s?: KeyedSet<V, T>) {
         this._items = new KeyedDictionary();
         if (s) s.forEach((v) => this._items.set(v, 1));
     }
@@ -68,7 +68,7 @@ export class Bag<T extends Embeddable, V extends Value<T> = Value<T>> {
         this._items.forEach((c, v) => f(c, v));
     }
 
-    snapshot(): KeyedDictionary<T, V, number> {
+    snapshot(): KeyedDictionary<V, number, T> {
         return this._items.clone();
     }
 

packages/core/src/runtime/dataflow.ts

@@ -1,31 +1,32 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 // Property-based "dataflow"
 
-import { FlexSet, FlexMap, Canonicalizer, is } from '@preserves/core';
-import * as MapSet from './mapset';
+import { FlexSet, FlexMap, Canonicalizer, Value, is } from '@preserves/core';
+import { Ref } from './actor.js';
+import * as MapSet from './mapset.js';
 
 export interface ObservingGraph<ObjectId> {
     recordObservation(objectId: ObjectId): void;
     recordDamage(objectId: ObjectId): void;
-    suppressCycleWarning(objectId: ObjectId): void;
 }
 
 export class Graph<SubjectId, ObjectId> implements ObservingGraph<ObjectId> {
     readonly edgesForward: FlexMap<ObjectId, FlexSet<SubjectId>>;
     readonly edgesReverse: FlexMap<SubjectId, FlexSet<ObjectId>>;
+    readonly subjectIdCanonicalizer: Canonicalizer<SubjectId>;
+    readonly objectIdCanonicalizer: Canonicalizer<ObjectId>;
     damagedNodes: FlexSet<ObjectId>;
     currentSubjectId: SubjectId | undefined;
-    cyclicWarningSuppressed: FlexSet<ObjectId> | undefined;
 
-    constructor(
-        public readonly subjectIdCanonicalizer: Canonicalizer<SubjectId>,
-        public readonly objectIdCanonicalizer: Canonicalizer<ObjectId>,
-        public formatCycle: (group: FlexSet<ObjectId>) => any = g => g,
-    ) {
+    constructor(subjectIdCanonicalizer: Canonicalizer<SubjectId>,
+                objectIdCanonicalizer: Canonicalizer<ObjectId>)
+    {
         this.edgesForward = new FlexMap(objectIdCanonicalizer);
         this.edgesReverse = new FlexMap(subjectIdCanonicalizer);
+        this.subjectIdCanonicalizer = subjectIdCanonicalizer;
+        this.objectIdCanonicalizer = objectIdCanonicalizer;
         this.damagedNodes = new FlexSet(objectIdCanonicalizer);
     }
 
@@ -66,28 +67,15 @@ export class Graph<SubjectId, ObjectId> implements ObservingGraph<ObjectId> {
         return Array.from(subjects);
     }
 
-    suppressCycleWarning(objectId: ObjectId): void {
-        if (this.cyclicWarningSuppressed === void 0) {
-            this.cyclicWarningSuppressed = new FlexSet(this.objectIdCanonicalizer);
-        }
-        this.cyclicWarningSuppressed.add(objectId);
-    }
-
     repairDamage(repairNode: (subjectId: SubjectId) => void) {
         let repairedThisRound = new FlexSet(this.objectIdCanonicalizer);
-        let suppressed = new FlexSet(this.objectIdCanonicalizer);
         while (true) {
-            if (this.cyclicWarningSuppressed !== void 0) {
-                suppressed = suppressed.union(this.cyclicWarningSuppressed);
-                this.cyclicWarningSuppressed = void 0;
-            }
-
             let workSet = this.damagedNodes;
             this.damagedNodes = new FlexSet(this.objectIdCanonicalizer);
 
-            const alreadyDamaged = workSet.intersect(repairedThisRound).subtract(suppressed);
+            const alreadyDamaged = workSet.intersect(repairedThisRound);
             if (alreadyDamaged.size > 0) {
-                console.warn('Cyclic dependencies involving', this.formatCycle(alreadyDamaged));
+                console.warn('Cyclic dependencies involving', alreadyDamaged);
             }
 
             workSet = workSet.subtract(repairedThisRound);
@@ -95,14 +83,10 @@ export class Graph<SubjectId, ObjectId> implements ObservingGraph<ObjectId> {
 
             if (workSet.size === 0) break;
 
-            const updatedSubjects = new FlexSet(this.subjectIdCanonicalizer);
             workSet.forEach(objectId => {
                 this.observersOf(objectId).forEach((subjectId: SubjectId) => {
-                    if (!updatedSubjects.has(subjectId)) {
-                        updatedSubjects.add(subjectId);
-                        this.forgetSubject(subjectId);
-                        this.withSubject(subjectId, () => repairNode(subjectId));
-                    }
+                    this.forgetSubject(subjectId);
+                    this.withSubject(subjectId, () => repairNode(subjectId));
                 });
             });
         }
@@ -123,22 +107,14 @@ export abstract class Cell {
         this.__value = initial;
     }
 
-    suppressCycleWarning() {
-        this.graph.suppressCycleWarning(this);
-    }
-
     observe(): unknown {
         this.graph.recordObservation(this);
         return this.__value;
     }
 
-    changed() {
-        this.graph.recordDamage(this);
-    }
-
     update(newValue: unknown) {
         if (!this.valuesEqual(this.__value, newValue)) {
-            this.changed();
+            this.graph.recordDamage(this);
             this.__value = newValue;
         }
     }
@@ -166,7 +142,7 @@ export abstract class TypedCell<V> extends Cell {
     abstract valuesEqual(v1: V, v2: V): boolean;
 }
 
-export class Field<V> extends TypedCell<V> {
+export class Field<V extends Value<T>, T = Ref> extends TypedCell<V> {
     readonly name: string | undefined;
 
     constructor(graph: ObservingGraph<Cell>, initial: V, name?: string) {

packages/core/src/runtime/dataspace.ts

@@ -1,9 +1,9 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later
-/// SPDX-FileCopyrightText: Copyright © 2016-2024 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { IdentityMap, KeyedDictionary, stringify, strip } from '@preserves/core';
-import { Index, IndexObserver } from './skeleton.js';
-import { Actor, AnyValue, Assertion, DetailedAction, Entity, Facet, Handle, LocalAction, Ref, Turn } from './actor.js';
+import { IdentityMap } from '@preserves/core';
+import { Index } from './skeleton.js';
+import { Actor, Assertion, Entity, Facet, Handle, LocalAction, Ref, Turn } from './actor.js';
 import { Observe, toObserve } from '../gen/dataspace.js';
 import * as P from '../gen/dataspacePatterns.js';
 
@@ -15,86 +15,22 @@ export type DataspaceOptions = {
     dumpIndex?: boolean,
 };
 
-export class DataspaceObserver implements IndexObserver<Turn> {
-    readonly captureMap = new KeyedDictionary<Ref, Array<AnyValue>, Handle>();
-
-    constructor(
-        public readonly target: Ref,
-    ) {}
-
-    onAssert(captures: Assertion[], t: Turn) {
-        this.captureMap.set(captures, t.assert(this.target, captures));
-    }
-
-    onRetract(vs: Assertion[], t: Turn) {
-        t.retract(this.captureMap.get(vs));
-        this.captureMap.delete(vs);
-    }
-
-    onMessage(vs: Assertion[], t: Turn) {
-        t.message(this.target, vs);
-    }
-
-    onRemoval(t: Turn) {
-        this.captureMap.forEach((handle, _captures) => t.retract(handle));
-    }
-
-    dump(): string {
-        return Array.from(this.captureMap.entries()).map((handle, values) =>
-            `captured ${stringify(values)} handle ${handle}`).join('\n');
-    }
-}
-
 export class Dataspace implements Partial<Entity> {
-    private static _local: Ref | undefined = void 0;
-
-    static get local(): Ref {
-        if (Dataspace._local === void 0) {
-            Dataspace.boot(ds => {
-                Turn.activeFacet.actor.name = Symbol.for('Dataspace.local');
-                Dataspace._local = ds;
-            });
-        }
-        return Dataspace._local!;
-    }
-
-    // Alias for syndicatec code generator to use, plus hook for fallback use outside a Turn
-    static _spawnLink(bootProc: LocalAction | DetailedAction): Actor | null {
-        if (Turn.active) {
-            return Turn.active._spawnLink(bootProc);
-        } else {
-            throw new Error("Cannot spawnLink outside an active Turn");
-        }
-    }
-
-    // Alias for syndicatec code generator to use, plus hook for fallback use outside a Turn
-    static _spawn(bootProc: LocalAction | DetailedAction): Actor {
-        if (Turn.active) {
-            return Turn.active._spawn(bootProc);
-        } else {
-            return Actor.boot(bootProc, void 0, Dataspace.local.relay.actor.space);
-        }
-    }
-
     readonly options: DataspaceOptions;
     readonly index = new Index();
     readonly handleMap = new IdentityMap<Handle, Assertion>();
-    readonly observerMap = new KeyedDictionary<Ref, Observe, DataspaceObserver>();
-    readonly data = this;
 
     constructor(options?: DataspaceOptions) {
         this.options = options ?? {};
     }
 
     assert(v: Assertion, handle: Handle): void {
-        const is_new = this.index.addAssertion(v, Turn.active);
+        const is_new = this.index.addAssertion(v);
         this.options.tracer?.('+', v, this, is_new);
         if (is_new) {
-            const o = toObserve(strip(v));
+            const o = toObserve(v);
             if (o !== void 0) {
-                const io = new DataspaceObserver(o.observer);
-                this.observerMap.set(o, io);
-                this.index.addObserver(o.pattern, io, Turn.active);
+                this.index.addObserver(o.pattern, o.observer);
             }
             if (this.options.dumpIndex ?? false) this.index.dump();
         }
@@ -104,17 +40,12 @@ export class Dataspace implements Partial<Entity> {
     retract(handle: Handle): void {
         const v = this.handleMap.get(handle);
         if (v === void 0) return;
-        this.handleMap.delete(handle);
-        const is_last = this.index.removeAssertion(v, Turn.active);
+        const is_last = this.index.removeAssertion(v);
         this.options.tracer?.('-', v, this, is_last);
         if (is_last) {
-            const o = toObserve(strip(v));
+            const o = toObserve(v);
             if (o !== void 0) {
-                const io = this.observerMap.get(o);
-                if (io !== void 0) {
-                    this.index.removeObserver(o.pattern, io, Turn.active);
-                    this.observerMap.delete(o);
-                }
+                this.index.removeObserver(o.pattern, o.observer);
             }
             if (this.options.dumpIndex ?? false) this.index.dump();
         }
@@ -122,7 +53,7 @@ export class Dataspace implements Partial<Entity> {
 
     message(v: Assertion): void {
         this.options.tracer?.('!', v, this, true);
-        this.index.deliverMessage(v, Turn.active);
+        this.index.deliverMessage(v);
     }
 
     static boot(bootProc: (ds: Ref) => void, options?: DataspaceOptions): Actor {