From b6473eee6d447b6aa1699e0549db95837bc0dd0f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 2 Mar 2021 13:53:33 +0100 Subject: [PATCH] Clean up repo layout --- i0.ts => experiments/i0.ts | 0 i2.ts => experiments/i2.ts | 0 interfaces.ts => experiments/interfaces.ts | 0 .../interfaces_test.ts | 0 package.json | 5 +++++ actor.ts => src/actor.ts | 0 bag.ts => src/bag.ts | 0 box-protocol.ts => src/box-protocol.ts | 0 box.ts => src/box.ts | 0 client.ts => src/client.ts | 0 dataspace.ts => src/dataspace.ts | 0 main.ts => src/main.ts | 14 ++++++++------ protocol.ts => src/protocol.ts | 0 relay.ts => src/relay.ts | 0 wload.ts => src/wload.ts | 0 t.ts | 7 ------- tsconfig.json | 11 +++++------ 17 files changed, 18 insertions(+), 19 deletions(-) rename i0.ts => experiments/i0.ts (100%) rename i2.ts => experiments/i2.ts (100%) rename interfaces.ts => experiments/interfaces.ts (100%) rename interfaces_test.ts => experiments/interfaces_test.ts (100%) rename actor.ts => src/actor.ts (100%) rename bag.ts => src/bag.ts (100%) rename box-protocol.ts => src/box-protocol.ts (100%) rename box.ts => src/box.ts (100%) rename client.ts => src/client.ts (100%) rename dataspace.ts => src/dataspace.ts (100%) rename main.ts => src/main.ts (85%) rename protocol.ts => src/protocol.ts (100%) rename relay.ts => src/relay.ts (100%) rename wload.ts => src/wload.ts (100%) delete mode 100644 t.ts diff --git a/i0.ts b/experiments/i0.ts similarity index 100% rename from i0.ts rename to experiments/i0.ts diff --git a/i2.ts b/experiments/i2.ts similarity index 100% rename from i2.ts rename to experiments/i2.ts diff --git a/interfaces.ts b/experiments/interfaces.ts similarity index 100% rename from interfaces.ts rename to experiments/interfaces.ts diff --git a/interfaces_test.ts b/experiments/interfaces_test.ts similarity index 100% rename from interfaces_test.ts rename to experiments/interfaces_test.ts diff --git a/package.json b/package.json index be8b853..2e33807 100644 --- a/package.json +++ b/package.json @@ -5,5 +5,10 @@ }, "dependencies": { "preserves": "^0.6.0" + }, + "scripts": { + "compile": "npx tsc", + "compile:watch": "npx tsc -w", + "clean": "rm -rf lib" } } diff --git a/actor.ts b/src/actor.ts similarity index 100% rename from actor.ts rename to src/actor.ts diff --git a/bag.ts b/src/bag.ts similarity index 100% rename from bag.ts rename to src/bag.ts diff --git a/box-protocol.ts b/src/box-protocol.ts similarity index 100% rename from box-protocol.ts rename to src/box-protocol.ts diff --git a/box.ts b/src/box.ts similarity index 100% rename from box.ts rename to src/box.ts diff --git a/client.ts b/src/client.ts similarity index 100% rename from client.ts rename to src/client.ts diff --git a/dataspace.ts b/src/dataspace.ts similarity index 100% rename from dataspace.ts rename to src/dataspace.ts diff --git a/main.ts b/src/main.ts similarity index 85% rename from main.ts rename to src/main.ts index a2cf9c5..39d5a79 100644 --- a/main.ts +++ b/src/main.ts @@ -4,12 +4,13 @@ import { Dataspace, Observe } from './dataspace.js'; import { Worker } from 'worker_threads'; import { Relay, spawnRelay } from './relay.js'; import { BoxState, SetBox } from './box-protocol.js'; +import path from 'path'; const Instance = Record.makeConstructor<{moduleName: string, arg: Assertion}>()( Symbol.for('Instance'), ['moduleName', 'arg']); function spawnWorker(t: Turn, moduleName: string, arg: Assertion) { - const w = new Worker('./wload.js'); + const w = new Worker(path.join(__dirname, 'wload.js')); spawnRelay(t, { packetWriter: bs => w.postMessage(bs), setup(t: Turn, r: Relay) { @@ -60,11 +61,12 @@ Turn.for(new Actor(), async (t: Turn) => { [0, Lit(BoxState.constructorInfo.label)]])))); - // spawnModule(t, './box.js', [ds, 500000, 25000]); - spawnWorker(t, './box.js', [ds_for_box, 50000, 2500]); - - // spawnModule(t, './client.js', ds_for_client); - spawnWorker(t, './client.js', ds_for_client); + const boxpath = path.join(__dirname, 'box.js'); + const clientpath = path.join(__dirname, 'client.js'); + spawnModule(t, boxpath, [ds, 500000, 25000]); + // spawnWorker(t, boxpath, [ds_for_box, 50000, 2500]); + spawnModule(t, clientpath, ds_for_client); + // spawnWorker(t, clientpath, ds_for_client); }); diff --git a/protocol.ts b/src/protocol.ts similarity index 100% rename from protocol.ts rename to src/protocol.ts diff --git a/relay.ts b/src/relay.ts similarity index 100% rename from relay.ts rename to src/relay.ts diff --git a/wload.ts b/src/wload.ts similarity index 100% rename from wload.ts rename to src/wload.ts diff --git a/t.ts b/t.ts deleted file mode 100644 index ab163ca..0000000 --- a/t.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Assertion, Turn } from './actor'; - -console.log('hi') - -export default function (_t: Turn, arg: Assertion) { - console.log('in exported main', arg); -} diff --git a/tsconfig.json b/tsconfig.json index cfb0543..3d3ecc6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,16 +3,15 @@ "target": "es2017", "lib": ["es2017", "dom"], "declaration": true, - "baseUrl": ".", - "rootDir": ".", - "outDir": ".", - "declarationDir": ".", + "baseUrl": "./src", + "rootDir": "./src", + "outDir": "./lib", + "declarationDir": "./lib", "esModuleInterop": true, "moduleResolution": "node", "module": "commonjs", "sourceMap": true, "strict": true }, - "include": ["**/*.ts"], - "exclude": [] + "include": ["src/**/*.ts"] }