functionalscript 0.10.3 → 0.11.1

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

@@ -1,26 +1,27 @@
 import { empty, isVec, uint, vec8 } from "../../bit_vec/module.f.js";
-import { map } from "../module.f.js";
 import { run } from "../mock/module.f.js";
+import { pure } from "../module.f.js";
 import { fetch, mkdir, readdir, readFile, writeFile } from "./module.f.js";
 import { emptyState, virtual } from "./virtual/module.f.js";
 export default {
     map: () => {
-        let e = map(readFile('hello'))(([k, v]) => {
+        let e = readFile('hello').step(([k, v]) => {
             if (k === 'error') {
                 throw v;
             }
-            return uint(v) * 2n;
+            return pure(uint(v) * 2n);
         });
         //
         while (true) {
-            if (e.length === 1) {
-                const result = e[0];
+            const { value } = e;
+            if (value.length === 1) {
+                const [result] = value;
                 if (result !== 0x2an) {
                     throw result;
                 }
                 return;
             }
-            const [cmd, p, cont] = e;
+            const [cmd, p, cont] = value;
             if (cmd !== 'readFile') {
                 throw cmd;
             }
@@ -31,8 +32,7 @@ export default {
         }
     },
     fetch: () => {
-        const v = run(virtual);
-        const [_, [t, result]] = v({
+        const [_, [t, result]] = virtual({
             ...emptyState,
             internet: {
                 'https://example.com/data': vec8(0x2an),
@@ -50,8 +50,7 @@ export default {
     },
     mkdir: {
         one: () => {
-            const v = run(virtual);
-            const [state, [t, result]] = v(emptyState)(mkdir('a'));
+            const [state, [t, result]] = virtual(emptyState)(mkdir('a'));
             if (t === 'error') {
                 throw result;
             }
@@ -61,7 +60,7 @@ export default {
             }
         },
         rec: () => {
-            const [state, [t, result]] = run(virtual)(emptyState)(mkdir('tmp/cache', { recursive: true }));
+            const [state, [t, result]] = virtual(emptyState)(mkdir('tmp/cache', { recursive: true }));
             if (t !== 'ok') {
                 throw result;
             }
@@ -75,7 +74,7 @@ export default {
             }
         },
         nonRec: () => {
-            const [state, [t, result]] = run(virtual)(emptyState)(mkdir('tmp/cache'));
+            const [state, [t, result]] = virtual(emptyState)(mkdir('tmp/cache'));
             if (t !== 'error') {
                 throw result;
             }
@@ -86,14 +85,13 @@ export default {
     },
     readFile: {
         one: () => {
-            const v = run(virtual);
             const initial = {
                 ...emptyState,
                 root: {
                     hello: vec8(0x2an),
                 },
             };
-            const [state, [t, result]] = v(initial)(readFile('hello'));
+            const [state, [t, result]] = virtual(initial)(readFile('hello'));
             if (t === 'error') {
                 throw result;
             }
@@ -108,7 +106,7 @@ export default {
             }
         },
         nested: () => {
-            const [_, [tag, result]] = run(virtual)({
+            const [_, [tag, result]] = virtual({
                 ...emptyState,
                 root: { tmp: { cache: vec8(0x15n) } }
             })(readFile('tmp/cache'));
@@ -120,13 +118,13 @@ export default {
             }
         },
         noSuchFile: () => {
-            const [_, [t, result]] = run(virtual)(emptyState)(readFile('hello'));
+            const [_, [t, result]] = virtual(emptyState)(readFile('hello'));
             if (t !== 'error') {
                 throw result;
             }
         },
         nestedPath: () => {
-            const [_, [t, result]] = run(virtual)(emptyState)(readFile('tmp/cache'));
+            const [_, [t, result]] = virtual(emptyState)(readFile('tmp/cache'));
             if (t !== 'error') {
                 throw result;
             }
@@ -137,7 +135,7 @@ export default {
     },
     readdir: {
         one: () => {
-            const [_, [t, result]] = run(virtual)({
+            const [_, [t, result]] = virtual({
                 ...emptyState,
                 root: {
                     file: vec8(0x2an),
@@ -159,7 +157,7 @@ export default {
             }
         },
         nonRecursive: () => {
-            const [_, [t, result]] = run(virtual)({
+            const [_, [t, result]] = virtual({
                 ...emptyState,
                 root: {
                     file: vec8(0x2an),
@@ -184,7 +182,7 @@ export default {
             }
         },
         nested: () => {
-            const [_, [t, result]] = run(virtual)({
+            const [_, [t, result]] = virtual({
                 ...emptyState,
                 root: { tmp: { cache: vec8(0x15n) } }
             })(readdir('tmp', { recursive: true }));
@@ -203,7 +201,7 @@ export default {
             }
         },
         noSuchDir: () => {
-            const [_, [t, result]] = run(virtual)(emptyState)(readdir('tmp', { recursive: true }));
+            const [_, [t, result]] = virtual(emptyState)(readdir('tmp', { recursive: true }));
             if (t !== 'error') {
                 throw result;
             }
@@ -214,7 +212,7 @@ export default {
     },
     writeFile: {
         one: () => {
-            const [state, [t, result]] = run(virtual)(emptyState)(writeFile('hello', vec8(0x2an)));
+            const [state, [t, result]] = virtual(emptyState)(writeFile('hello', vec8(0x2an)));
             if (t !== 'ok') {
                 throw result;
             }
@@ -227,7 +225,7 @@ export default {
             }
         },
         overwrite: () => {
-            const [state, [t, result]] = run(virtual)({
+            const [state, [t, result]] = virtual({
                 ...emptyState,
                 root: {
                     hello: vec8(0x15n),
@@ -245,7 +243,7 @@ export default {
             }
         },
         nestedPath: () => {
-            const [state, [t, result]] = run(virtual)(emptyState)(writeFile('tmp/cache', vec8(0x2an)));
+            const [state, [t, result]] = virtual(emptyState)(writeFile('tmp/cache', vec8(0x2an)));
             if (t !== 'error') {
                 throw result;
             }
@@ -257,7 +255,7 @@ export default {
             }
         },
         directory: () => {
-            const [state, [t, result]] = run(virtual)({
+            const [state, [t, result]] = virtual({
                 ...emptyState,
                 root: {
                     tmp: {},

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

@@ -1,16 +1,16 @@
 import { type Vec } from "../../../bit_vec/module.f.ts";
-import type { MemOperationMap } from "../../mock/module.f.ts";
-import type { NodeOperations } from "../module.f.ts";
-export type VirtualDir = {
-    readonly [name in string]?: VirtualDir | Vec;
+import { type RunInstance } from "../../mock/module.f.ts";
+import type { NodeOp } from "../module.f.ts";
+export type Dir = {
+    readonly [name in string]?: Dir | Vec;
 };
-export type VirtualState = {
+export type State = {
     stdout: string;
     stderr: string;
-    root: VirtualDir;
+    root: Dir;
     internet: {
         readonly [url: string]: Vec;
     };
 };
-export declare const emptyState: VirtualState;
-export declare const virtual: MemOperationMap<NodeOperations, VirtualState>;
+export declare const emptyState: State;
+export declare const virtual: RunInstance<NodeOp, State>;

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

@@ -6,6 +6,8 @@
 import { parse } from "../../../../path/module.f.js";
 import { isVec } from "../../../bit_vec/module.f.js";
 import { error, ok } from "../../../result/module.f.js";
+import { run } from "../../mock/module.f.js";
+import { pure } from "../../module.f.js";
 export const emptyState = {
     stdout: '',
     stderr: '',
@@ -30,7 +32,6 @@ const operation = (op) => {
         return [{ ...state, root }, result];
     };
 };
-// TODO: we can have a better implementation with some code shared with `operation`.
 const readOperation = (op) => operation((dir, path) => [dir, op(dir, path)]);
 const okVoid = ok(undefined);
 const mkdir = (recursive) => operation((dir, path) => {
@@ -94,7 +95,16 @@ const readdir = (base, recursive) => readOperation((dir, path) => {
     return ok(f(base, dir));
 });
 const console = (name) => (state, payload) => [{ ...state, [name]: `${state[name]}${payload}\n` }, undefined];
-export const virtual = {
+const map = {
+    all: (state, a) => {
+        let e = [];
+        for (const i of a) {
+            const [ns, ei] = virtual(state)(i);
+            state = ns;
+            e = [...e, ei];
+        }
+        return [state, e];
+    },
     error: console('stderr'),
     log: console('stdout'),
     fetch: (state, url) => {
@@ -106,3 +116,4 @@ export const virtual = {
     readdir: (state, [path, { recursive }]) => readdir(path, recursive === true)(state, path),
     writeFile: (state, [path, payload]) => writeFile(payload)(state, path),
 };
+export const virtual = run(map);

package/website/module.f.d.ts

@@ -1,2 +1,4 @@
-declare const _default: () => import("../types/effects/module.f.ts").Pure<number>;
+import { type NodeOp } from '../types/effects/node/module.f.ts';
+import { type Effect } from '../types/effects/module.f.ts';
+declare const _default: () => Effect<NodeOp, number>;
 export default _default;

package/website/module.f.js

@@ -6,12 +6,11 @@
 import { htmlToString } from "../html/module.f.js";
 import { writeFile } from "../types/effects/node/module.f.js";
 import { utf8 } from "../text/module.f.js";
-import { fluent, pure } from "../types/effects/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 program = fluent
+const program = begin
     .step(() => writeFile('index.html', utf8(htmlToString(html))))
-    .step(() => pure(0))
-    .effect;
+    .step(() => pure(0));
 export default () => program;

package/ci/module.d.ts

@@ -1 +0,0 @@
-export {};

package/ci/module.js

@@ -1,3 +0,0 @@
-import run from "../io/module.js";
-import app from "./module.f.js";
-run(app);

package/dev/index/module.d.ts

@@ -1 +0,0 @@
-export {};

package/dev/index/module.js

@@ -1,3 +0,0 @@
-import { index } from "../module.f.js";
-import { legacyRun } from "../../io/module.js";
-legacyRun(index);

package/website/module.d.ts

@@ -1 +0,0 @@
-export {};

package/website/module.js

@@ -1,3 +0,0 @@
-import run from "../io/module.js";
-import app from "./module.f.js";
-run(app);