Merge pull request #102 from thefrontside/update-effection

Author: dagda1

.changes/effection-preview-6.md

@@ -0,0 +1,6 @@
+---
+"@simulacrum/client": minor
+"@simulacrum/server": minor
+"@simulacrum/ui": minor
+---
+upgrade to effection@2.0.0-beta.6

package-lock.json

@@ -29,20 +29,20 @@
   },
   "homepage": "https://github.com/thefrontside/simulacrum#readme",
   "dependencies": {
-    "@effection/process": "^2.0.0-beta.3",
+    "@effection/process": "^2.0.0-beta.6",
     "@simulacrum/server": "0.2.0",
     "@types/faker": "^5.1.7",
     "assert-ts": "^0.3.2",
     "base64-url": "^2.3.3",
     "cookie-session": "^1.4.0",
-    "effection": "^2.0.0-beta.3",
+    "effection": "^2.0.0-beta.6",
     "html-entities": "^2.3.2",
     "jsesc": "^3.0.2",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@effection/atom": "^2.0.0-beta.3",
-    "@effection/mocha": "^2.0.0-beta.3",
+    "@effection/atom": "^2.0.0-beta.6",
+    "@effection/mocha": "^2.0.0-beta.6",
     "@frontside/eslint-config": "^2.0.0",
     "@frontside/tsconfig": "^1.2.0",
     "@frontside/typescript": "^1.1.1",

packages/auth0/package.json

@@ -10,7 +10,7 @@ export function createTestServer(options: ServerOptions): Resource<Client> {
       let server: Server = yield createSimulationServer(options);
       let { port } = server.address;
       let client = createClient(`http://localhost:${port}`);
-      scope.spawn(function*() {
+      scope.run(function*() {
         try {
           yield;
         } finally {

packages/auth0/test/helpers.ts

@@ -7,11 +7,11 @@ main(function* (scope: Task) {
 
   let watcher = watch(['../server/src/**/*.ts', './src/**/*.ts'], { ignoreInitial: true, ignored: 'dist' });
   try {
-    let process: Task = scope.spawn(buildAndRun);
+    let process: Task = scope.run(buildAndRun);
 
     yield on(watcher, 'all').forEach(() => {
       process.halt();
-      process = scope.spawn(function*() {
+      process = scope.run(function*() {
         yield sleep(10);
         console.log('rebuilding.....');
         yield buildAndRun;

packages/auth0/watch.ts

@@ -12,7 +12,7 @@
     "test": "echo client is used to test server"
   },
   "dependencies": {
-    "effection": "^2.0.0-beta.3",
+    "effection": "^2.0.0-beta.6",
     "graphql-ws": "^4.2.3",
     "isomorphic-ws": "^4.0.1"
   },

packages/client/package.json

@@ -72,11 +72,11 @@ export function createClient(serverURL: string): Client {
     return {
       run(scope: Task) {
         let { send, close, stream } = createChannel<Result<T>>();
-        let { future, resolve } = createFuture<void>();
-        scope.spawn(function*() {
+        let { future, produce } = createFuture<void>();
+        scope.run(function*() {
           let unsubscribe = ws.subscribe<Result<T>>(payload, {
             next: send,
-            complete: () => resolve({ state: "completed", value: undefined }),
+            complete: () => produce({ state: "completed", value: undefined }),
             error: () => null
           });
           try {
@@ -92,7 +92,7 @@ export function createClient(serverURL: string): Client {
   }
 
   async function query<T>(field: string, payload: SubscribePayload): Promise<T> {
-    return scope.spawn(function*(child) {
+    return scope.run(function*(child) {
       yield sleep(10);
       let subscription = subscribe<Record<string, T>>(payload).run(child);
       let result: Result<Record<string, T>> = yield subscription.expect();
@@ -135,15 +135,15 @@ mutation DestroySimulation($id: String!) {
       variables: { id }
     }),
     state<T = unknown>() {
-      let child = scope.spawn();
+      let child = scope.run();
 
       let subscription = subscribe<T>({
           query: `subscription { state }`
       }).run(child);
 
       let iterator = {
         next() {
-          return child.spawn(function*() {
+          return child.run(function*() {
             let next: IteratorResult<Result<{ state: T }>> = yield subscription.next();
             if (next.done) {
               return { done: true };

packages/client/src/index.ts

@@ -27,13 +27,13 @@
   },
   "homepage": "https://github.com/thefrontside/simulacrum#readme",
   "dependencies": {
-    "@effection/atom": "^2.0.0-beta.3",
-    "@effection/process": "^2.0.0-beta.3",
+    "@effection/atom": "^2.0.0-beta.6",
+    "@effection/process": "^2.0.0-beta.6",
     "@simulacrum/ui": "0.0.2",
     "@types/faker": "^5.1.7",
     "assert-ts": "^0.3.2",
     "cors": "^2.8.5",
-    "effection": "^2.0.0-beta.3",
+    "effection": "^2.0.0-beta.6",
     "express": "^4.17.1",
     "express-graphql": "^0.12.0",
     "faker": "^5.5.0",
@@ -45,7 +45,7 @@
     "ws": "^7.4.4"
   },
   "devDependencies": {
-    "@effection/mocha": "^2.0.0-beta.3",
+    "@effection/mocha": "^2.0.0-beta.6",
     "@frontside/eslint-config": "^2.0.0",
     "@frontside/tsconfig": "^1.2.0",
     "@frontside/typescript": "^1.1.1",

packages/server/package.json

@@ -21,7 +21,7 @@ export function map<A>(slice: Slice<Record<string, A>>, effect: Effect<A>): Oper
           // see comment above
           if (value) {
             if (!effects.has(key)) {
-              effects.set(key, scope.spawn(effect(slice.slice(key))));
+              effects.set(key, scope.run(effect(slice.slice(key))));
             }
             keep.add(key);
           }

packages/server/src/effect.ts

@@ -27,7 +27,7 @@ export const createSimulation: Resolver<CreateSimulationParameters, SimulationSt
     let simulation = atom.slice("simulations").slice(id);
     simulation.set({ id, status: 'new', simulator, options, services: [], scenarios: {}, store: {} });
 
-    return scope.spawn(simulation.filter(({ status }) => status !== 'new').expect());
+    return scope.run(simulation.filter(({ status }) => status !== 'new').expect());
   }
 };
 
@@ -59,7 +59,7 @@ export const given: Resolver<GivenParameters, ScenarioState> = {
     let scenario = simulation.slice('scenarios').slice(id);
     scenario.set({ id, status: 'new', name: scenarioName, params });
 
-    return scope.spawn(scenario.filter(({ status }) => status !== 'new').expect());
+    return scope.run(scenario.filter(({ status }) => status !== 'new').expect());
   }
 };
 
@@ -70,7 +70,7 @@ interface StateParameters {
 export const state: Subscriber<StateParameters, ServerState> = {
   subscribe(_args, { scope, atom }) {
     let queue = createQueue<ServerState>();
-    scope.spawn(atom.forEach(queue.push));
+    scope.run(atom.forEach(queue.push));
     return {
       [Symbol.asyncIterator]: () => ({
         async next(): Promise<IteratorResult<ServerState>> {

packages/server/src/schema/resolvers.ts

@@ -31,7 +31,7 @@ export function simulation(simulators: Record<string, Simulator>): Effect<Simula
           app.use(function(req, res, next) {
             assert(middlewareHandlerIsOperation(handler), 'invalid middleware function');
 
-            scope.spawn(handler(req, res))
+            scope.run(handler(req, res))
             .then(next)
             .catch(next);
           });
@@ -41,7 +41,7 @@ export function simulation(simulators: Record<string, Simulator>): Effect<Simula
 
         for (let handler of service.app.handlers) {
           app[handler.method](handler.path, (request, response) => {
-            scope.spawn(function*() {
+            scope.run(function*() {
               try {
                 yield handler.handler(request, response);
               } catch(err) {

packages/server/src/simulation.ts

@@ -79,8 +79,8 @@ export function createWebSocket(ws: WS): Resource<WebSocket> {
         close: (code, reason) => ws.close(code, reason),
         onMessage(cb) {
           // spawn a task to dispatch each message asynchronously.
-          scope.spawn(on<WS.MessageEvent>(ws, 'message').forEach(message => {
-            scope.spawn(cb(message.data.toString()));
+          scope.run(on<WS.MessageEvent>(ws, 'message').forEach(message => {
+            scope.run(cb(message.data.toString()));
           }));
         }
       };