functionalscript 0.10.2 → 0.10.3

package/cas/module.f.js

@@ -6,7 +6,7 @@
 import { computeSync, sha256 } from "../crypto/sha2/module.f.js";
 import { parse } from "../path/module.f.js";
 import { cBase32ToVec, vecToCBase32 } from "../types/cbase32/module.f.js";
-import { fluent } from "../types/effects/module.f.js";
+import { fluent, pure } from "../types/effects/module.f.js";
 import { error, log, mkdir, readdir, readFile, writeFile } from "../types/effects/node/module.f.js";
 import { toOption } from "../types/nullable/module.f.js";
 import { unwrap } from "../types/result/module.f.js";
@@ -22,7 +22,7 @@ const toPath = (key) => {
 export const fileKvStore = (path) => ({
     read: (key) => fluent
         .step(() => readFile(toPath(key)))
-        .map(([status, data]) => status === 'error' ? undefined : data)
+        .step(([status, data]) => pure(status === 'error' ? undefined : data))
         .effect,
     write: (key, value) => {
         const p = toPath(key);
@@ -32,14 +32,16 @@ export const fileKvStore = (path) => ({
         return fluent
             .step(() => mkdir(dir, { recursive: true }))
             .step(() => writeFile(`${path}/${p}`, value))
-            .map(() => undefined)
+            .step(() => pure(undefined))
             .effect;
     },
     list: () => 
     // TODO: remove unwrap
     fluent
         .step(() => readdir('.cas', { recursive: true }))
-        .map(r => unwrap(r).flatMap(({ name, parentPath, isFile }) => toOption(isFile ? cBase32ToVec(parentPath.substring(prefix.length).replaceAll('/', '') + name) : null)))
+        .step(r => pure(unwrap(r).flatMap(({ name, parentPath, isFile }) => toOption(isFile
+        ? cBase32ToVec(parentPath.substring(prefix.length).replaceAll('/', '') + name)
+        : null))))
         .effect,
 });
 export const cas = (sha2) => {
@@ -50,7 +52,7 @@ export const cas = (sha2) => {
             const hash = compute([value]);
             return fluent
                 .step(() => write(hash, value))
-                .map(() => hash)
+                .step(() => pure(hash))
                 .effect;
         },
         list,
@@ -58,7 +60,7 @@ export const cas = (sha2) => {
 };
 const e = (s) => fluent
     .step(() => error(s))
-    .map(() => 1)
+    .step(() => pure(1))
     .effect;
 export const main = (args) => {
     const c = cas(sha256)(fileKvStore('.'));
@@ -73,7 +75,7 @@ export const main = (args) => {
                 .step(() => readFile(path))
                 .step(v => c.write(unwrap(v)))
                 .step(hash => log(vecToCBase32(hash)))
-                .map(() => 0)
+                .step(() => pure(0))
                 .effect;
         }
         case 'get': {
@@ -92,7 +94,7 @@ export const main = (args) => {
                     ? e(`no such hash: ${hashCBase32}`)
                     : fluent
                         .step(() => writeFile(path, v))
-                        .map(() => 0)
+                        .step(() => pure(0))
                         .effect;
                 return result;
             })
@@ -113,7 +115,7 @@ export const main = (args) => {
                 }
                 return i;
             })
-                .map(() => 0)
+                .step(() => pure(0))
                 .effect;
         }
         case undefined: {

package/ci/module.f.d.ts

@@ -1,4 +1,4 @@
 import { type NodeEffect } from '../types/effects/node/module.f.ts';
 export declare const effect: NodeEffect<number>;
-declare const _default: () => import("../types/effects/module.f.ts").Pure<number> | import("../types/effects/module.f.ts").One<import("../types/effects/node/module.f.ts").NodeOperations, number, "writeFile">;
+declare const _default: () => import("../types/effects/module.f.ts").Pure<number>;
 export default _default;

package/ci/module.f.js

@@ -4,7 +4,7 @@
  * @module
  */
 import { utf8 } from "../text/module.f.js";
-import { map } from "../types/effects/module.f.js";
+import { fluent, pure } from "../types/effects/module.f.js";
 import { writeFile } from "../types/effects/node/module.f.js";
 const os = ['ubuntu', 'macos', 'windows'];
 const architecture = ['intel', 'arm'];
@@ -177,5 +177,8 @@ const gha = {
     on: { pull_request: {} },
     jobs,
 };
-export const effect = map(writeFile('.github/workflows/ci.yml', utf8(JSON.stringify(gha, null, '  '))))(() => 0);
+export const effect = fluent
+    .step(() => writeFile('.github/workflows/ci.yml', utf8(JSON.stringify(gha, null, '  '))))
+    .step(() => pure(0))
+    .effect;
 export default () => effect;

package/dev/module.f.js

@@ -5,11 +5,11 @@
  */
 import { fromIo } from "../io/module.f.js";
 import { updateVersion } from "./version/module.f.js";
-import { decodeUtf8, encodeUtf8 } from "../types/uint8array/module.f.js";
+import { encodeUtf8 } from "../types/uint8array/module.f.js";
 import { readFile } from "../types/effects/node/module.f.js";
 import { utf8ToString } from "../text/module.f.js";
 import { unwrap } from "../types/result/module.f.js";
-import { map, step } from "../types/effects/module.f.js";
+import { fluent, pure } from "../types/effects/module.f.js";
 export const todo = () => { throw 'not implemented'; };
 const cmp = ([a], [b]) => a < b ? -1 : a > b ? 1 : 0;
 export const env = ({ process: { env } }) => a => {
@@ -58,7 +58,11 @@ export const loadModuleMap = async (io) => {
     return Object.fromEntries(map.toSorted(cmp));
 };
 const denoJson = './deno.json';
-const index2 = step(updateVersion)(() => map(readFile(denoJson))(v => JSON.parse(utf8ToString(unwrap(v)))));
+const index2 = fluent
+    .step(() => updateVersion)
+    .step(() => readFile(denoJson))
+    .step(v => pure(JSON.parse(utf8ToString(unwrap(v)))))
+    .effect;
 export const index = async (io) => {
     const runner = fromIo(io);
     const jsr_json = await runner(index2);

package/dev/version/module.f.js

@@ -4,12 +4,15 @@
  * @module
  */
 import { utf8, utf8ToString } from "../../text/module.f.js";
-import { all, fluent, map, step } from "../../types/effects/module.f.js";
+import { all, fluent, pure, step } from "../../types/effects/module.f.js";
 import { readFile, writeFile } from "../../types/effects/node/module.f.js";
 import { unwrap } from "../../types/result/module.f.js";
 const { stringify, parse } = JSON;
 const jsonFile = (jsonFile) => `${jsonFile}.json`;
-const readJson = (name) => map(readFile(jsonFile(name)))(v => parse(utf8ToString(unwrap(v))));
+const readJson = (name) => fluent
+    .step(() => readFile(jsonFile(name)))
+    .step(v => pure(parse(utf8ToString(unwrap(v)))))
+    .effect;
 const writeVersion = (version) => (name) => step(readJson(name))(json => writeFile(jsonFile(name), utf8(stringify({
     ...json,
     version,
@@ -20,5 +23,5 @@ export const updateVersion = fluent
     const w = writeVersion(p.version);
     return all([w('package'), w('deno')]);
 })
-    .map(() => 0)
+    .step(() => pure(0))
     .effect;

package/package.json

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

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

@@ -22,7 +22,6 @@ export declare const map: <O extends Operations, T>(e: Effect<O, T>) => <R>(f: (
 export type Fluent<O extends Operations, T> = {
     readonly effect: Effect<O, T>;
     readonly step: <O1 extends Operations, R>(f: (_: T) => Effect<O1, R>) => Fluent<O | O1, R>;
-    readonly map: <R>(f: (_: T) => R) => Fluent<O, R>;
 };
 export declare const fluent: Fluent<{}, void>;
 export declare const all: <O extends Operations, T>(set: readonly Effect<O, T>[]) => Effect<O, readonly T[]>;

package/types/effects/module.f.js

@@ -13,7 +13,6 @@ export const map = (e) => (f) => step(e)(x => pure(f(x)));
 const wrap = (effect) => ({
     effect,
     step: x => wrap(step(effect)(x)),
-    map: x => wrap(map(effect)(x)),
 });
 export const fluent = wrap(pure(undefined));
 const empty = pure([]);

package/website/module.f.js

@@ -6,12 +6,12 @@
 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 } from "../types/effects/module.f.js";
+import { fluent, pure } from "../types/effects/module.f.js";
 const html = ['body',
     ['a', { href: 'https://github.com/functionalscript/functionalscript' }, 'GitHub Repository']
 ];
 const program = fluent
     .step(() => writeFile('index.html', utf8(htmlToString(html))))
-    .map(() => 0)
+    .step(() => pure(0))
     .effect;
 export default () => program;