Implement new methods to manipulate buffers

library/Buffer.js

@@ -1,8 +1,7 @@
-import { factorizeType } from "https://deno.land/x/[email protected]/library/factories.js";
-import { $$type } from "https://deno.land/x/[email protected]/library/Symbols.js";
-import Task from "https://deno.land/x/[email protected]/library/Task.js";
-
-export const Buffer = factorizeType("Buffer", [ "raw" ]);
+import { curry } from "https://x.nest.land/[email protected]/source/index.js";
+import { factorizeType } from "https://deno.land/x/[email protected]/library/factories.js";
+import { $$type } from "https://deno.land/x/[email protected]/library/Symbols.js";
+import Task from "https://deno.land/x/[email protected]/library/Task.js";
 
 /**
  * The `Buffer` is the most basic type; it only has one attribute which is a typed array named "raw".
@@ -22,6 +21,8 @@ export const Buffer = factorizeType("Buffer", [ "raw" ]);
  * ```
  */
 
+export const Buffer = factorizeType("Buffer", [ "raw" ]);
+
 Buffer.prototype.ap = Buffer.prototype["fantasy-land/ap"] = function (container) {
 
   return Buffer.of(container.raw(this.raw));
@@ -92,4 +93,6 @@ Buffer.prototype.map = Buffer.prototype["fantasy-land/map"] = function (unaryFun
 
 Buffer.of = Buffer.prototype.of = Buffer.prototype["fantasy-land/of"] = buffer => Buffer(buffer);
 
+export const factorizeBuffer = curry(Buffer);
+
 export default Buffer;

library/Buffer_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import Buffer from "./Buffer.js";
 

library/Directory.js

@@ -1,7 +1,7 @@
-import { factorizeType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js";
+import { factorizeType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js";
 
-import { $$type } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$type } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 /**
  * The `Directory` type represents a directory on the file system. It is the only type with the same shape as `URL`.

library/Directory_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import Directory from "./Directory.js";
 

library/File.js

@@ -1,7 +1,7 @@
-import { factorizeType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js";
+import { factorizeType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js";
 
-import { $$type } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$type } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 /**
  * The `File` type extends the `Resource` type. It represents a file with a path.

library/FileSystemCollection.js

@@ -1,6 +1,6 @@
-import { factorizeType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
+import { factorizeType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
 
-import { $$value } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$value } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 /**
  * The `FileSystemCollection` is represents a collection of `Location`, namely of `Directory` and `File`. This of it

library/FileSystemCollection_test.js

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import FileSystemCollection from "./FileSystemCollection.js";
 import File from "./File.js";

library/File_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import File from "./File.js";
 

library/Request.js

@@ -1,6 +1,6 @@
 import { curry } from "https://x.nest.land/[email protected]/source/index.js";
 
-import { factorizeType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
+import { factorizeType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
 
 /**
  * The `Request` represent a HTTP request.

library/Request_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.65.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import Request from "./Request.js";
 

library/Resource.js

@@ -1,7 +1,8 @@
-import { factorizeType } from "https://deno.land/x/[email protected]/library/factories.js";
-import Task from "https://deno.land/x/[email protected]/library/Task.js";
+import { curry } from "https://x.nest.land/[email protected]/source/index.js";
+import { factorizeType } from "https://deno.land/x/[email protected]/library/factories.js";
+import Task from "https://deno.land/x/[email protected]/library/Task.js";
 
-import { $$type } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$type } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 /**
  * The `Resource` type extends the `Buffer` type. It represents a system resource with a handle, eg: STDOUT, STDIN or a
@@ -103,4 +104,6 @@ Resource.prototype.map = Resource.prototype["fantasy-land/map"] = function (unar
 
 Resource.of = Resource.prototype.of = Resource.prototype["fantasy-land/of"] = raw => Resource(raw, 0);
 
+export const factorizeResource = curry(Resource);
+
 export default Resource;

library/Resource_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import Resource from "./Resource.js";
 

library/Response.js

@@ -1,6 +1,6 @@
 import { curry } from "https://x.nest.land/[email protected]/source/index.js";
 
-import { factorizeSumType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
+import { factorizeSumType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
 
 /**
  * The `Response` represent a HTTP response.

library/Response_test.js

@@ -1,4 +1,4 @@
-import { assert, assertEquals } from "https://deno.land/std@0.65.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 
 import Response from "./Response.js";
 

library/URL.js

@@ -1,7 +1,7 @@
-import { factorizeType } from "https://deno.land/x/functional@v1.0.0/library/factories.js";
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js";
+import { factorizeType } from "https://deno.land/x/functional@v1.2.1/library/factories.js";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js";
 
-import { $$type } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$type } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 /**
  * The `URL` type represents an URL; either of a location on the file system or on a remote server.

library/browser_safe.js

@@ -1,6 +1,6 @@
 import { apply, lift } from "https://x.nest.land/[email protected]/source/index.js";
 
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js";
 
 import Request from "./Request.js";
 import Response from "./Response.js";

library/browser_safe_test.js

@@ -1,9 +1,9 @@
-import { assert } from "https://deno.land/std@0.70.0/testing/asserts.ts";
-import { serve } from "https://deno.land/std@0.74.0/http/server.ts";
+import { assert } from "https://deno.land/std@0.79.0/testing/asserts.ts";
+import { serve } from "https://deno.land/std@0.79.0/http/server.ts";
 import { fetch } from "./browser_safe.js";
 
-import Either from "https://deno.land/x/functional@v1.0.0/library/Either.js";
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js";
+import Either from "https://deno.land/x/functional@v1.2.1/library/Either.js";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js";
 import Request from "./Request.js";
 
 const startAsyncIterator = async (state, server, callback) => {

library/fs.js

@@ -4,15 +4,15 @@ import {
   ensureSymlink as _ensureSymlink,
   exists as _exists,
   move as _move
-} from "https://deno.land/std@0.70.0/fs/mod.ts";
-import { curry } from "https://x.nest.land/[email protected]/source/index.js";
-import Either from "https://deno.land/x/functional@v1.0.0/library/Either.js"
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js"
+} from "https://deno.land/std@0.79.0/fs/mod.ts";
+import { compose, curry } from "https://x.nest.land/[email protected]/source/index.js";
+import Either from "https://deno.land/x/functional@v1.2.1/library/Either.js"
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js"
 import Buffer from "./Buffer.js";
 import Directory from "./Directory.js";
 import File from "./File.js";
 import Resource from "./Resource.js";
-import { coerceAsReader, coerceAsWriter } from "./utilities.js";
+import { coerceAsReader, coerceAsWriter, factorizeUint8Array } from "./utilities.js";
 
 // chdir :: Directory a -> Task e Directory a
 export const chdir = directory => Directory.isOrThrow(directory)
@@ -32,10 +32,10 @@ export const chown = curry(
       .map(_ => File(file.path, file.raw, file.rid))
 );
 
-// close :: File a -> Task e File a
-export const close = file => File.isOrThrow(file)
-  && Task.wrap(_ => Deno.close(file.rid) || Promise.resolve(undefined))
-    .map(_ => File(file.path, file.raw, file.rid));
+// close :: Resource a -> Task e Resource a
+export const close = resource => Resource.isOrThrow(resource)
+  && Task.wrap(_ => Deno.close(resource.rid) || Promise.resolve(undefined))
+    .map(_ => resource.constructor.from({ ...resource }));
 
 // copy :: Options -> Buffer a -> Buffer b -> Task e Buffer a
 export const copy = curry(
@@ -75,18 +75,18 @@ export const ensureSymlink = directory => Directory.isOrThrow(directory)
   && Task.wrap(_ => _ensureSymlink(directory.path))
   .map(_ => Directory(directory.path));
 
-// exists :: Location a -> Task null Location a
-export const exists = location => {
-  if (!Directory.is(location) && !File.is(location)) {
-    throw new Error(`Expected a Directory or a File but got a "${typeof location}"`);
+// exists :: URL a -> Task null URL a
+export const exists = url => {
+  if (!Directory.is(url) && !File.is(url)) {
+    throw new Error(`Expected a Directory or a File but got a "${typeof url}"`);
   }
 
-  return Task.wrap(_ => _exists(location.path))
+  return Task.wrap(_ => _exists(url.path))
     .map(
       fileExists => {
         if (!fileExists) return Either.Left(null);
 
-        return location.constructor.from({ ...location });
+        return url.constructor.from({ ...url });
       }
     )
 };
@@ -98,11 +98,11 @@ export const mkdir = curry(
       .map(_ => Directory(directory.path))
 );
 
-// move :: Options -> String -> Location a -> Task e Location b
+// move :: Options -> String -> URL a -> Task e URL b
 export const move = curry(
-  (options, destinationPath, location) => location.hasOwnProperty("path")
-    && Task.wrap(_ => _move(location.path, destinationPath))
-    .map(_ => location.constructor.from({ ...location, path: destinationPath }))
+  (options, destinationPath, url) => url.hasOwnProperty("path")
+    && Task.wrap(_ => _move(url.path, destinationPath))
+    .map(_ => url.constructor.from({ ...url, path: destinationPath }))
 );
 
 // open :: Options -> File a -> Task e File a
@@ -121,6 +121,34 @@ export const read = resource => {
       .map(_ => resource.constructor.from({ ...resource, raw: _buffer }))
 };
 
+// readLine :: Resource a -> Task e Resource a
+export const readLine = resource => Task.wrap(async _ => {
+  let _accumulatorBuffer = new Uint8Array(1024);
+  let index = 0;
+  let _buffer = new Uint8Array(1);
+  let reachedCL = false;
+
+  while (await Deno.read(resource.rid, _buffer)) {
+    _accumulatorBuffer[index++] = _buffer[0];
+    if (reachedCL && _buffer[0] === 10) break;
+    reachedCL = _buffer[0] === 13;
+    _buffer = new Uint8Array(1);
+  }
+
+  return resource.constructor.from({ ...resource, raw: _accumulatorBuffer.slice(0, index) });
+});
+
+// readNBytes :: Number -> Resource a -> Task e Resource a
+export const readNBytes = curry(
+  compose(
+    read,
+    (n, resource) => resource.constructor.from({ ...resource, raw: factorizeUint8Array(n) })
+  )
+);
+
+// readOneByte :: Resource a -> Task e Resource a
+export const readOneByte = readNBytes(1);
+
 // readAll :: Resource a -> Task e Resource a
 export const readAll = resource => Resource.isOrThrow(resource)
   && Task.wrap(_ => Deno.readAll(coerceAsReader(resource)))
@@ -131,18 +159,18 @@ export const readFile = file => File.isOrThrow(file)
   && Task.wrap(_ => Deno.readFile(file.path))
     .map(_buffer => File(file.path, _buffer, file.rid));
 
-// remove :: Options -> Location a -> Task e Location a
+// remove :: Options -> URL a -> Task e URL a
 export const remove = curry(
-  (options, location) => location.hasOwnProperty("path")
-    && Task.wrap(_ => Deno.remove(location.path, options))
-      .map(_ => location.constructor.from({ ...location }))
+  (options, url) => url.hasOwnProperty("path")
+    && Task.wrap(_ => Deno.remove(url.path, options))
+      .map(_ => url.constructor.from({ ...url }))
 );
 
-// rename :: String -> Location a -> Task e Location b
+// rename :: String -> URL a -> Task e URL b
 export const rename = curry(
-  (destinationPath, location) => location.hasOwnProperty("path")
-    && Task.wrap(_ => Deno.rename(location.path, destinationPath))
-      .map(_ => location.constructor.from({ ...location, path: destinationPath }))
+  (destinationPath, url) => url.hasOwnProperty("path")
+    && Task.wrap(_ => Deno.rename(url.path, destinationPath))
+      .map(_ => url.constructor.from({ ...url, path: destinationPath }))
 );
 
 // write :: Resource a -> Task e Resource a
@@ -164,3 +192,4 @@ export const writeFile = curry(
     && Task.wrap(_ => Deno.writeFile(file.path, file.raw, options))
       .map(_ => file.constructor.from({ ...file }))
 );
+

library/fs_test.js

@@ -12,13 +12,13 @@ import {
   replace,
   trim
 } from "https://x.nest.land/[email protected]/source/index.js";
-import { assert, assertEquals } from "https://deno.land/std@0.70.0/testing/asserts.ts";
+import { assert, assertEquals } from "https://deno.land/std@0.79.0/testing/asserts.ts";
 import {
   emptyDir as _emptyDir,
   ensureDir as _ensureDir
-} from "https://deno.land/std@0.70.0/fs/mod.ts";
-import Either from "https://deno.land/x/functional@v1.0.0/library/Either.js"
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task.js"
+} from "https://deno.land/std@0.79.0/fs/mod.ts";
+import Either from "https://deno.land/x/functional@v1.2.1/library/Either.js"
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task.js"
 import {
   chdir,
   chmod,
@@ -37,6 +37,7 @@ import {
   read,
   readAll,
   readFile,
+  readNBytes,
   remove,
   rename,
   write,
@@ -47,7 +48,7 @@ import Buffer from "./Buffer.js";
 import Directory from "./Directory.js";
 import File from "./File.js";
 
-import { $$value } from "https://deno.land/x/functional@v1.0.0/library/Symbols.js";
+import { $$value } from "https://deno.land/x/functional@v1.2.1/library/Symbols.js";
 
 Deno.test(
   "Integration: chdir",
@@ -515,6 +516,32 @@ Deno.test(
   }
 );
 
+Deno.test(
+  "Integration: readNBytes",
+  async () => {
+    await _ensureDir(`${Deno.cwd()}/dump`);
+    await Deno.writeTextFile(`${Deno.cwd()}/dump/hoge`, "ABCDE");
+    const _file = await Deno.open(`${Deno.cwd()}/dump/hoge`, { read: true, write: true });
+
+    const containerA = readNBytes(5, File(`${Deno.cwd()}/dump/hoge`, new Uint8Array([]), _file.rid));
+    const promise = containerA.run();
+
+    assert(Task.is(containerA));
+    assert(promise instanceof Promise);
+
+    const containerB = await promise;
+
+    assert(Either.Right.is(containerB));
+    assertEquals(
+      containerB.toString(),
+      `Either.Right(File("${Deno.cwd()}/dump/hoge", 65,66,67,68,69, ${_file.rid}))`
+    );
+
+    await Deno.remove(`${Deno.cwd()}/dump/hoge`);
+    Deno.close(_file.rid);
+  }
+);
+
 Deno.test(
   "Integration: readFile",
   async () => {

library/network.js

@@ -1,5 +1,5 @@
 import { Connection } from "./Resource.js";
-import Task from "https://deno.land/x/functional@v1.0.0/library/Task";
+import Task from "https://deno.land/x/functional@v1.2.1/library/Task";
 
 // connect :: Connection a -> Task e Connection a
 export const connect = connection => Connection.isOrThrow(connection)