functionalscript 0.11.4 → 0.11.6

package/io/module.f.js

@@ -53,14 +53,16 @@ export const fromIo = ({ console: { error, log }, fs: { promises: { mkdir, readF
             .map(v => ({ name: v.name, parentPath: normalize(v.parentPath), isFile: v.isFile() }))),
         writeFile: ([path, data]) => tc(() => writeFile(path, fromVec(data))),
         createServer: async (requestListener) => {
+            const erl = requestListener;
             const nodeRl = async (req, res) => {
+                const reqBody = await collect(req);
                 const { method, url, headers } = req;
-                const { status, headers: outHeaders, body: outBody } = requestListener({
+                const { status, headers: outHeaders, body: outBody } = await result(erl({
                     method,
                     url,
                     headers,
-                    body: listToVec(await collect(req))
-                });
+                    body: listToVec(reqBody)
+                }));
                 res
                     .writeHead(status, outHeaders)
                     .end(fromVec(outBody));
@@ -72,6 +74,7 @@ export const fromIo = ({ console: { error, log }, fs: { promises: { mkdir, readF
             const s = asBase(server);
             s.listen(port);
         },
+        forever: () => new Promise(() => { })
     });
     return result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.11.4",
+  "version": "0.11.6",
   "type": "module",
   "files": [
     "**/*.js",

package/types/effects/node/module.f.d.ts

@@ -62,13 +62,15 @@ export type ServerResponse = {
     readonly headers: Headers;
     readonly body: Vec;
 };
-export type RequestListener = (_: IncomingMessage) => ServerResponse;
-export type CreateServer = ['createServer', (_: RequestListener) => Server];
-export declare const createServer: Func<CreateServer>;
+export type RequestListener<O extends Operation> = (_: IncomingMessage) => Effect<O, ServerResponse>;
+export type CreateServer = ['createServer', (_: RequestListener<Operation>) => Server];
+export declare const createServer: <O extends Operation>(listener: RequestListener<O>) => Effect<O | CreateServer, Server>;
 export type Listen = ['listen', (_: readonly [Server, number]) => void];
 export declare const listen: RestFunc<Listen>;
 export type Http = CreateServer | Listen;
-export type NodeOp = All | Fetch | Console | Fs | Http;
+export type Forever = ['forever', () => never];
+export declare const forever: Func<Forever>;
+export type NodeOp = All | Fetch | Console | Fs | Http | Forever;
 export type NodeEffect<T> = Effect<NodeOp, T>;
 export type NodeOperationMap = ToAsyncOperationMap<NodeOp>;
 export type NodeProgram = (argv: readonly string[]) => Effect<NodeOp, number>;

package/types/effects/node/module.f.js

@@ -1,4 +1,5 @@
 import { doRest, do_ } from "../module.f.js";
+const doAll = do_('all');
 /**
  * To run the operation `O` should be known by the runner/engine.
  * This is the reason why we merge `O` with `All` in the resulted `Effect`.
@@ -6,7 +7,7 @@ import { doRest, do_ } from "../module.f.js";
  * @param a
  * @returns
  */
-export const all = (...a) => do_('all')(a);
+export const all = (...a) => doAll(a);
 export const both = (a) => (b) => all(a, b);
 export const fetch = do_('fetch');
 export const mkdir = doRest('mkdir');
@@ -17,3 +18,4 @@ export const error = do_('error');
 export const log = do_('log');
 export const createServer = do_('createServer');
 export const listen = doRest('listen');
+export const forever = do_('forever');

package/types/effects/node/virtual/module.f.js

@@ -117,5 +117,6 @@ const map = {
     writeFile: (state, [path, payload]) => writeFile(payload)(state, path),
     createServer: todo,
     listen: todo,
+    forever: todo,
 };
 export const virtual = run(map);

package/website/module.f.js

@@ -7,10 +7,13 @@ import { htmlToString } from "../html/module.f.js";
 import { writeFile } from "../types/effects/node/module.f.js";
 import { utf8 } from "../text/module.f.js";
 import { begin, pure } from "../types/effects/module.f.js";
-const html = ['body',
-    ['a', { href: 'https://github.com/functionalscript/functionalscript' }, 'GitHub Repository']
-];
+const html = utf8(htmlToString(['body',
+    ['a',
+        { href: 'https://github.com/functionalscript/functionalscript' },
+        'GitHub Repository'
+    ]
+]));
 const program = begin
-    .step(() => writeFile('index.html', utf8(htmlToString(html))))
+    .step(() => writeFile('index.html', html))
     .step(() => pure(0));
 export default () => program;