From 4a05bbad73299c94eccb573e2e623633ff1f7b8f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Mon, 15 Apr 2024 10:26:27 +0200 Subject: [PATCH] Rename Dataspace.global to Dataspace.local --- packages/core/src/runtime/dataspace.ts | 15 +++++++-------- packages/html/src/index.ts | 2 +- packages/html2/src/index.ts | 2 +- packages/loader/src/index.ts | 2 +- packages/timer/src/index.ts | 2 +- packages/ws-relay/src/index.ts | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/core/src/runtime/dataspace.ts b/packages/core/src/runtime/dataspace.ts index 1d32b0b..c177acd 100644 --- a/packages/core/src/runtime/dataspace.ts +++ b/packages/core/src/runtime/dataspace.ts @@ -46,17 +46,16 @@ export class DataspaceObserver implements IndexObserver { } export class Dataspace implements Partial { - private static _global: Ref | undefined = void 0; + private static _local: Ref | undefined = void 0; - static get global(): Ref { - if (Dataspace._global === void 0) { + static get local(): Ref { + if (Dataspace._local === void 0) { Dataspace.boot(ds => { - Turn.activeFacet.actor.name = Symbol.for('Dataspace.global'); - // Cast to any because `global` is otherwise readonly (!) - Dataspace._global = ds; + Turn.activeFacet.actor.name = Symbol.for('Dataspace.local'); + Dataspace._local = ds; }); } - return Dataspace._global!; + return Dataspace._local!; } // Alias for syndicatec code generator to use, plus hook for fallback use outside a Turn @@ -73,7 +72,7 @@ export class Dataspace implements Partial { if (Turn.active) { return Turn.active._spawn(bootProc); } else { - return Actor.boot(bootProc, void 0, Dataspace.global.relay.actor.space); + return Actor.boot(bootProc, void 0, Dataspace.local.relay.actor.space); } } diff --git a/packages/html/src/index.ts b/packages/html/src/index.ts index 07d3b03..33d1f94 100644 --- a/packages/html/src/index.ts +++ b/packages/html/src/index.ts @@ -11,7 +11,7 @@ export type UIFragmentRecord = ReturnType; import { HtmlFragments } from "./html"; export * from "./html"; -export function boot(ds = Dataspace.global) { +export function boot(ds = Dataspace.local) { spawnGlobalEventFactory(ds); spawnWindowEventFactory(ds); spawnUIFragmentFactory(ds); diff --git a/packages/html2/src/index.ts b/packages/html2/src/index.ts index 5a746b8..c2b0539 100644 --- a/packages/html2/src/index.ts +++ b/packages/html2/src/index.ts @@ -8,7 +8,7 @@ export { HtmlTemplater, template, HtmlFragment } from "./html"; export assertion type LocationHash(hash: string); export type LocationHash = ReturnType; -export function boot(ds = Dataspace.global) { +export function boot(ds = Dataspace.local) { spawnLocationHashTracker(ds); } diff --git a/packages/loader/src/index.ts b/packages/loader/src/index.ts index 632b0ce..2394e96 100644 --- a/packages/loader/src/index.ts +++ b/packages/loader/src/index.ts @@ -7,7 +7,7 @@ import Pos = Syntax.Pos; import * as Syndicate from '@syndicate-lang/core'; Object.defineProperty(globalThis, 'currentSyndicateTarget', { - value: Syndicate.Dataspace.global, + value: Syndicate.Dataspace.local, writable: false, }); diff --git a/packages/timer/src/index.ts b/packages/timer/src/index.ts index 70c1628..2691f61 100644 --- a/packages/timer/src/index.ts +++ b/packages/timer/src/index.ts @@ -20,7 +20,7 @@ export function sleep(ds: Ref, seconds: number, cb: () => void): void { } } -export function boot(ds = Dataspace.global) { +export function boot(ds = Dataspace.local) { spawn named 'timer/PeriodicTick' { at ds { during Observe({ diff --git a/packages/ws-relay/src/index.ts b/packages/ws-relay/src/index.ts index 8779a5e..cc3cb80 100644 --- a/packages/ws-relay/src/index.ts +++ b/packages/ws-relay/src/index.ts @@ -39,7 +39,7 @@ type TransportState = { peer: Ref, }; -export function boot(ds = Dataspace.global, debug: boolean = false, WebSocketConstructor?: typeof WebSocket) { +export function boot(ds = Dataspace.local, debug: boolean = false, WebSocketConstructor?: typeof WebSocket) { spawn named 'transportConnector' { at ds { during Observe({ "pattern": :pattern G.TransportConnection({ @@ -470,7 +470,7 @@ export function contactRemote( controlObject: Ref, transportAddr: AnyValue, ) => void, - ds = Dataspace.global, + ds = Dataspace.local, ) { const routeValue = 'pathSteps' in route ? G.fromRoute(G.Route(route)) : route; at ds {