From 83c81f894a9b2bd5b87c46f86085675871e13eef Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sun, 17 Dec 2023 08:27:09 +0100 Subject: [PATCH] Upgrade preserves to 0.992.4 --- examples/example-simple-chat/package.json | 4 +-- package.json | 2 +- packages/core/package.json | 6 ++--- packages/core/src/runtime/pattern.ts | 12 ++++++--- packages/create/template/package.json | 4 +-- packages/fs/package.json | 4 +-- packages/ws-relay/package.json | 2 +- packages/ws-relay/src/index.ts | 26 +++++++++++--------- yarn.lock | 30 +++++++++++------------ 9 files changed, 49 insertions(+), 41 deletions(-) diff --git a/examples/example-simple-chat/package.json b/examples/example-simple-chat/package.json index 7a06f53..ce6147e 100644 --- a/examples/example-simple-chat/package.json +++ b/examples/example-simple-chat/package.json @@ -16,13 +16,13 @@ "author": "Tony Garnock-Jones ", "license": "GPL-3.0+", "dependencies": { - "@preserves/core": "0.992", + "@preserves/core": "0.992.4", "@syndicate-lang/core": "*", "@syndicate-lang/html": "*", "@syndicate-lang/ws-relay": "*" }, "devDependencies": { - "@preserves/schema-cli": "0.992", + "@preserves/schema-cli": "0.992.4", "@syndicate-lang/ts-plugin": "*", "@syndicate-lang/tsc": "*", "rollup": "^2.60", diff --git a/package.json b/package.json index 1947396..77011cd 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "packages/*/examples/*/" ], "devDependencies": { - "@preserves/core": "*", + "@preserves/core": "0.992.4", "@rollup/plugin-node-resolve": "^13.0", "@types/jest": "^27.0", "@types/node": "^14", diff --git a/packages/core/package.json b/packages/core/package.json index 215d84f..8aa19de 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,11 +29,11 @@ "types": "lib/index.d.ts", "author": "Tony Garnock-Jones ", "devDependencies": { - "@preserves/core": "0.992", - "@preserves/schema-cli": "0.992" + "@preserves/core": "0.992.4", + "@preserves/schema-cli": "0.992.4" }, "peerDependencies": { - "@preserves/core": "0.992" + "@preserves/core": "0.992.4" }, "dependencies": { "salty-crypto": "0.3.1" diff --git a/packages/core/src/runtime/pattern.ts b/packages/core/src/runtime/pattern.ts index 69bbdad..c22aeb2 100644 --- a/packages/core/src/runtime/pattern.ts +++ b/packages/core/src/runtime/pattern.ts @@ -1,7 +1,7 @@ /// SPDX-License-Identifier: GPL-3.0-or-later /// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones -import { canonicalString, Dictionary, is, Record, RecordConstructorInfo, Value } from '@preserves/core'; +import { canonicalString, KeyedDictionary, Dictionary, is, Record, RecordConstructorInfo, Value, CompoundKey, _iterMap } from '@preserves/core'; import { AnyValue, Ref } from './actor.js'; import * as P from '../gen/dataspacePatterns.js'; @@ -168,9 +168,13 @@ export function withoutCaptures(p: P.Pattern): P.Pattern { })); case 'arr': return P.Pattern.DCompound(P.DCompound.arr(p.value.items.map(walk))); - case 'dict': - return P.Pattern.DCompound(P.DCompound.dict(p.value.entries.mapEntries( - e => [e[0], walk(e[1])]))); + case 'dict': { + const newDict = new KeyedDictionary, P.Pattern, Ref>(); + for (const [k, v] of p.value.entries) { + newDict.set(k, walk(v)); + } + return P.Pattern.DCompound(P.DCompound.dict(newDict)); + } } } } diff --git a/packages/create/template/package.json b/packages/create/template/package.json index 17a40bd..e3292e6 100644 --- a/packages/create/template/package.json +++ b/packages/create/template/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "license": "GPL-3.0+", "devDependencies": { - "@preserves/schema-cli": "0.992", + "@preserves/schema-cli": "0.992.4", "@syndicate-lang/ts-plugin": "*", "@syndicate-lang/tsc": "*", "rollup": "^2.60", @@ -12,7 +12,7 @@ "typescript-language-server": "^3.0" }, "dependencies": { - "@preserves/core": "0.992", + "@preserves/core": "0.992.4", "@syndicate-lang/core": "*", "@syndicate-lang/html": "*", "@syndicate-lang/ws-relay": "*" diff --git a/packages/fs/package.json b/packages/fs/package.json index 34e18a1..6b70f28 100644 --- a/packages/fs/package.json +++ b/packages/fs/package.json @@ -27,7 +27,7 @@ "syndicate-fs": "./bin/syndicate-fs.js" }, "peerDependencies": { - "@preserves/core": "0.992" + "@preserves/core": "0.992.4" }, "dependencies": { "@syndicate-lang/core": "^0.22.0", @@ -35,7 +35,7 @@ "chokidar": "^3.5.3" }, "devDependencies": { - "@preserves/schema-cli": "0.992", + "@preserves/schema-cli": "0.992.4", "@syndicate-lang/ts-plugin": "^0.23.0", "@syndicate-lang/tsc": "^0.23.0" } diff --git a/packages/ws-relay/package.json b/packages/ws-relay/package.json index 84b075e..bcffe86 100644 --- a/packages/ws-relay/package.json +++ b/packages/ws-relay/package.json @@ -25,7 +25,7 @@ "types": "lib/index.d.ts", "author": "Tony Garnock-Jones ", "peerDependencies": { - "@preserves/core": "0.992" + "@preserves/core": "0.992.4" }, "dependencies": { "@syndicate-lang/core": "^0.22.0", diff --git a/packages/ws-relay/src/index.ts b/packages/ws-relay/src/index.ts index 3d838a0..878b3c3 100644 --- a/packages/ws-relay/src/index.ts +++ b/packages/ws-relay/src/index.ts @@ -415,16 +415,16 @@ export function unpackStandardRoute(route: E.StandardRoute): G.Route { const { transports, key, service, sig, oid } = route; - const protocol = { _variant: "absent" } satisfies N.NoiseProtocol; - const preSharedKeys = { _variant: "absent" } satisfies N.NoisePreSharedKeys; - const caveats: S.CaveatsField = route.caveats.length - ? { _variant: "present", caveats: route.caveats } - : { _variant: "absent" }; + const protocol = N.NoiseProtocol.absent(); + const preSharedKeys = N.NoisePreSharedKeys.absent(); + const caveats = route.caveats.length + ? S.CaveatsField.present(route.caveats) + : S.CaveatsField.absent(); return G.Route({ transports: transports.map(t => { switch (t._variant) { - case 'wsUrl': return T.fromWebSocket({ url: t.value }); + case 'wsUrl': return T.fromWebSocket(T.WebSocket(t.value)); default: { const x = stringify(E.fromStandardTransport(t)); throw new Error(`Unsupported transport: ${x}`); @@ -432,10 +432,14 @@ export function unpackStandardRoute(route: E.StandardRoute): G.Route { } }), pathSteps: [ - { stepType: N.$noise, - detail: N.fromNoiseSpec({ service, key, protocol, preSharedKeys }) }, - { stepType: S.$ref, - detail: S.fromParameters({ oid, sig, caveats }) }, + G.PathStep({ + stepType: N.$noise, + detail: N.fromNoiseSpec(N.NoiseSpec({ service, key, protocol, preSharedKeys })), + }), + G.PathStep({ + stepType: S.$ref, + detail: S.fromParameters(S.Parameters({ oid, sig, caveats })), + }), ], }); } @@ -460,7 +464,7 @@ export function contactRemote( ) => void, ds = Dataspace.global, ) { - const routeValue = Record.isRecord(route) ? route : G.fromRoute(route); + const routeValue = Record.isRecord(route) ? route : G.fromRoute(G.Route(route)); at ds { during G.ResolvePath({ "route": routeValue, diff --git a/yarn.lock b/yarn.lock index d0f186b..a7fba03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1403,30 +1403,30 @@ dependencies: "@octokit/openapi-types" "^12.11.0" -"@preserves/core@*", "@preserves/core@0.992", "@preserves/core@^0.992.3": - version "0.992.3" - resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.992.3.tgz#776a43db71c95cc4d1c276ebe85aef39587a6f4c" - integrity sha512-thDNEIAvD1j4OZqAItXEdKSR/wklKp/lCY2Lxdmj8oLRM82jaTzvlvkQwUIK08zcV3QVBaIed/UeG4J1W4Jlrw== +"@preserves/core@0.992.4", "@preserves/core@^0.992.4": + version "0.992.4" + resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.992.4.tgz#a3b187596cca3b68bd92f26167285b5732d47d85" + integrity sha512-rz9LMiT08JSe7OrWuuejXrp5it9+usI9JadyBzySK5BlKt+tEkijm6GPWqcdzV2mWmd3rgfYS3heM2tJjpUNcA== -"@preserves/schema-cli@0.992": - version "0.992.3" - resolved "https://registry.yarnpkg.com/@preserves/schema-cli/-/schema-cli-0.992.3.tgz#d786f8017220083bf2a6c074a90f5ef084cece64" - integrity sha512-GpMQZnr3Ynrhtg0SqHHJiITu9t/g7WVryNlUFjCPmCOfjgtIFjAmworTndwm52vFbpoSOBugo8rY6wq4Oc6VHg== +"@preserves/schema-cli@0.992.4": + version "0.992.4" + resolved "https://registry.yarnpkg.com/@preserves/schema-cli/-/schema-cli-0.992.4.tgz#54a826cbe6885436dcabfa674b0a18c0b96b328b" + integrity sha512-0Zjnw3tE8aKzh+Y4ssDLYuJSynlkC4QgoTbfQ81Fg7RsGur8jmz5rrzvWX3SQmPGLkP81TKT8w5BmKi9uoZdXA== dependencies: - "@preserves/core" "^0.992.3" - "@preserves/schema" "^0.992.3" + "@preserves/core" "^0.992.4" + "@preserves/schema" "^0.992.4" chalk "^4.1" chokidar "^3.5" commander "^7.2" glob "^7.1" minimatch "^3.0" -"@preserves/schema@^0.992.3": - version "0.992.3" - resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.992.3.tgz#1e7fcc882638b1dd11fd4344ed5c27dadb9d0cc2" - integrity sha512-TM/Y0GuRDxoViNAwccMFBT19vp3woH4rnfDBuwL9RJ7KCVMAX9eyhJjL81wsX1i7bo4pFpJPQz6bV/NtgPB0Tg== +"@preserves/schema@^0.992.4": + version "0.992.4" + resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.992.4.tgz#0f9eb188cca70336b551d32a9bf5d9593c2eb13a" + integrity sha512-MTOYhhq20QDF12BL49Bzd1ln9Uup6LulwZkSyy5urNJPOpE+TYnuYZikcIxXVO14KwGq1iXu5rfXCstobuPdDg== dependencies: - "@preserves/core" "^0.992.3" + "@preserves/core" "^0.992.4" "@rollup/plugin-node-resolve@^13.0": version "13.3.0"