syndicate-lang
/
syndicate-js
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Upgrade preserves to 0.992.4

This commit is contained in:
Tony Garnock-Jones 2023-12-17 08:27:09 +01:00
parent 062046c2b7
commit 83c81f894a
9 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/example-simple-chat/package.json
View File

@ -16,13 +16,13 @@
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>", "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"license": "GPL-3.0+", "license": "GPL-3.0+",
"dependencies": { "dependencies": {
"@preserves/core": "0.992", "@preserves/core": "0.992.4",
"@syndicate-lang/core": "*", "@syndicate-lang/core": "*",
"@syndicate-lang/html": "*", "@syndicate-lang/html": "*",
"@syndicate-lang/ws-relay": "*" "@syndicate-lang/ws-relay": "*"
}, },
"devDependencies": { "devDependencies": {
"@preserves/schema-cli": "0.992", "@preserves/schema-cli": "0.992.4",
"@syndicate-lang/ts-plugin": "*", "@syndicate-lang/ts-plugin": "*",
"@syndicate-lang/tsc": "*", "@syndicate-lang/tsc": "*",
"rollup": "^2.60", "rollup": "^2.60",

2
package.json
View File

@ -6,7 +6,7 @@
"packages/*/examples/*/" "packages/*/examples/*/"
], ],
"devDependencies": { "devDependencies": {
"@preserves/core": "*", "@preserves/core": "0.992.4",
"@rollup/plugin-node-resolve": "^13.0", "@rollup/plugin-node-resolve": "^13.0",
"@types/jest": "^27.0", "@types/jest": "^27.0",
"@types/node": "^14", "@types/node": "^14",

6
packages/core/package.json
View File

@ -29,11 +29,11 @@
"types": "lib/index.d.ts", "types": "lib/index.d.ts",
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>", "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"devDependencies": { "devDependencies": {
"@preserves/core": "0.992", "@preserves/core": "0.992.4",
"@preserves/schema-cli": "0.992" "@preserves/schema-cli": "0.992.4"
}, },
"peerDependencies": { "peerDependencies": {
"@preserves/core": "0.992" "@preserves/core": "0.992.4"
}, },
"dependencies": { "dependencies": {
"salty-crypto": "0.3.1" "salty-crypto": "0.3.1"

12
packages/core/src/runtime/pattern.ts
View File

@ -1,7 +1,7 @@
/// SPDX-License-Identifier: GPL-3.0-or-later /// SPDX-License-Identifier: GPL-3.0-or-later
/// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com> /// SPDX-FileCopyrightText: Copyright © 2016-2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
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 { AnyValue, Ref } from './actor.js';
import * as P from '../gen/dataspacePatterns.js'; import * as P from '../gen/dataspacePatterns.js';
@ -168,9 +168,13 @@ export function withoutCaptures(p: P.Pattern): P.Pattern {
})); }));
case 'arr': case 'arr':
return P.Pattern.DCompound(P.DCompound.arr(p.value.items.map(walk))); return P.Pattern.DCompound(P.DCompound.arr(p.value.items.map(walk)));
case 'dict': case 'dict': {
return P.Pattern.DCompound(P.DCompound.dict(p.value.entries.mapEntries( const newDict = new KeyedDictionary<Value<Ref>, P.Pattern<Ref>, Ref>();
e => [e[0], walk(e[1])]))); for (const [k, v] of p.value.entries) {
newDict.set(k, walk(v));
}
return P.Pattern.DCompound(P.DCompound.dict(newDict));
}
} }
} }
} }

4
packages/create/template/package.json
View File

@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"license": "GPL-3.0+", "license": "GPL-3.0+",
"devDependencies": { "devDependencies": {
"@preserves/schema-cli": "0.992", "@preserves/schema-cli": "0.992.4",
"@syndicate-lang/ts-plugin": "*", "@syndicate-lang/ts-plugin": "*",
"@syndicate-lang/tsc": "*", "@syndicate-lang/tsc": "*",
"rollup": "^2.60", "rollup": "^2.60",
@ -12,7 +12,7 @@
"typescript-language-server": "^3.0" "typescript-language-server": "^3.0"
}, },
"dependencies": { "dependencies": {
"@preserves/core": "0.992", "@preserves/core": "0.992.4",
"@syndicate-lang/core": "*", "@syndicate-lang/core": "*",
"@syndicate-lang/html": "*", "@syndicate-lang/html": "*",
"@syndicate-lang/ws-relay": "*" "@syndicate-lang/ws-relay": "*"

4
packages/fs/package.json
View File

@ -27,7 +27,7 @@
"syndicate-fs": "./bin/syndicate-fs.js" "syndicate-fs": "./bin/syndicate-fs.js"
}, },
"peerDependencies": { "peerDependencies": {
"@preserves/core": "0.992" "@preserves/core": "0.992.4"
}, },
"dependencies": { "dependencies": {
"@syndicate-lang/core": "^0.22.0", "@syndicate-lang/core": "^0.22.0",
@ -35,7 +35,7 @@
"chokidar": "^3.5.3" "chokidar": "^3.5.3"
}, },
"devDependencies": { "devDependencies": {
"@preserves/schema-cli": "0.992", "@preserves/schema-cli": "0.992.4",
"@syndicate-lang/ts-plugin": "^0.23.0", "@syndicate-lang/ts-plugin": "^0.23.0",
"@syndicate-lang/tsc": "^0.23.0" "@syndicate-lang/tsc": "^0.23.0"
} }

2
packages/ws-relay/package.json
View File

@ -25,7 +25,7 @@
"types": "lib/index.d.ts", "types": "lib/index.d.ts",
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>", "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"peerDependencies": { "peerDependencies": {
"@preserves/core": "0.992" "@preserves/core": "0.992.4"
}, },
"dependencies": { "dependencies": {
"@syndicate-lang/core": "^0.22.0", "@syndicate-lang/core": "^0.22.0",

26
packages/ws-relay/src/index.ts
View File

@ -415,16 +415,16 @@ export function unpackStandardRoute<R>(route: E.StandardRoute<R>): G.Route<R> {
const { transports, key, service, sig, oid } = route; const { transports, key, service, sig, oid } = route;
const protocol = { _variant: "absent" } satisfies N.NoiseProtocol; const protocol = N.NoiseProtocol.absent<R>();
const preSharedKeys = { _variant: "absent" } satisfies N.NoisePreSharedKeys; const preSharedKeys = N.NoisePreSharedKeys.absent<R>();
const caveats: S.CaveatsField<R> = route.caveats.length const caveats = route.caveats.length
? { _variant: "present", caveats: route.caveats } ? S.CaveatsField.present<R>(route.caveats)
: { _variant: "absent" }; : S.CaveatsField.absent<R>();
return G.Route({ return G.Route({
transports: transports.map(t => { transports: transports.map(t => {
switch (t._variant) { switch (t._variant) {
case 'wsUrl': return T.fromWebSocket({ url: t.value }); case 'wsUrl': return T.fromWebSocket(T.WebSocket(t.value));
default: { default: {
const x = stringify(E.fromStandardTransport(t)); const x = stringify(E.fromStandardTransport(t));
throw new Error(`Unsupported transport: ${x}`); throw new Error(`Unsupported transport: ${x}`);
@ -432,10 +432,14 @@ export function unpackStandardRoute<R>(route: E.StandardRoute<R>): G.Route<R> {
} }
}), }),
pathSteps: [ pathSteps: [
{ stepType: N.$noise, G.PathStep({
detail: N.fromNoiseSpec({ service, key, protocol, preSharedKeys }) }, stepType: N.$noise,
{ stepType: S.$ref, detail: N.fromNoiseSpec(N.NoiseSpec({ service, key, protocol, preSharedKeys })),
detail: S.fromParameters({ oid, sig, caveats }) }, }),
G.PathStep({
stepType: S.$ref,
detail: S.fromParameters(S.Parameters({ oid, sig, caveats })),
}),
], ],
}); });
} }
@ -460,7 +464,7 @@ export function contactRemote(
) => void, ) => void,
ds = Dataspace.global, 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 { at ds {
during G.ResolvePath({ during G.ResolvePath({
"route": routeValue, "route": routeValue,

30
yarn.lock
View File

@ -1403,30 +1403,30 @@
dependencies: dependencies:
"@octokit/openapi-types" "^12.11.0" "@octokit/openapi-types" "^12.11.0"
"@preserves/core@*", "@preserves/core@0.992", "@preserves/core@^0.992.3": "@preserves/core@0.992.4", "@preserves/core@^0.992.4":
version "0.992.3" version "0.992.4"
resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.992.3.tgz#776a43db71c95cc4d1c276ebe85aef39587a6f4c" resolved "https://registry.yarnpkg.com/@preserves/core/-/core-0.992.4.tgz#a3b187596cca3b68bd92f26167285b5732d47d85"
integrity sha512-thDNEIAvD1j4OZqAItXEdKSR/wklKp/lCY2Lxdmj8oLRM82jaTzvlvkQwUIK08zcV3QVBaIed/UeG4J1W4Jlrw== integrity sha512-rz9LMiT08JSe7OrWuuejXrp5it9+usI9JadyBzySK5BlKt+tEkijm6GPWqcdzV2mWmd3rgfYS3heM2tJjpUNcA==
"@preserves/schema-cli@0.992": "@preserves/schema-cli@0.992.4":
version "0.992.3" version "0.992.4"
resolved "https://registry.yarnpkg.com/@preserves/schema-cli/-/schema-cli-0.992.3.tgz#d786f8017220083bf2a6c074a90f5ef084cece64" resolved "https://registry.yarnpkg.com/@preserves/schema-cli/-/schema-cli-0.992.4.tgz#54a826cbe6885436dcabfa674b0a18c0b96b328b"
integrity sha512-GpMQZnr3Ynrhtg0SqHHJiITu9t/g7WVryNlUFjCPmCOfjgtIFjAmworTndwm52vFbpoSOBugo8rY6wq4Oc6VHg== integrity sha512-0Zjnw3tE8aKzh+Y4ssDLYuJSynlkC4QgoTbfQ81Fg7RsGur8jmz5rrzvWX3SQmPGLkP81TKT8w5BmKi9uoZdXA==
dependencies: dependencies:
"@preserves/core" "^0.992.3" "@preserves/core" "^0.992.4"
"@preserves/schema" "^0.992.3" "@preserves/schema" "^0.992.4"
chalk "^4.1" chalk "^4.1"
chokidar "^3.5" chokidar "^3.5"
commander "^7.2" commander "^7.2"
glob "^7.1" glob "^7.1"
minimatch "^3.0" minimatch "^3.0"
"@preserves/schema@^0.992.3": "@preserves/schema@^0.992.4":
version "0.992.3" version "0.992.4"
resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.992.3.tgz#1e7fcc882638b1dd11fd4344ed5c27dadb9d0cc2" resolved "https://registry.yarnpkg.com/@preserves/schema/-/schema-0.992.4.tgz#0f9eb188cca70336b551d32a9bf5d9593c2eb13a"
integrity sha512-TM/Y0GuRDxoViNAwccMFBT19vp3woH4rnfDBuwL9RJ7KCVMAX9eyhJjL81wsX1i7bo4pFpJPQz6bV/NtgPB0Tg== integrity sha512-MTOYhhq20QDF12BL49Bzd1ln9Uup6LulwZkSyy5urNJPOpE+TYnuYZikcIxXVO14KwGq1iXu5rfXCstobuPdDg==
dependencies: dependencies:
"@preserves/core" "^0.992.3" "@preserves/core" "^0.992.4"
"@rollup/plugin-node-resolve@^13.0": "@rollup/plugin-node-resolve@^13.0":
version "13.3.0" version "13.3.0"