@lsdsoftware/utils 1.0.4 → 1.0.5

package/dist/abortable.test.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    abortable1(): Promise<void>;
+    abortable2(): Promise<void>;
+    abortable3(): Promise<void>;
+};
+export default _default;

package/dist/abortable.test.js

@@ -0,0 +1,71 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const abortable_1 = require("./abortable");
+const assert = require("assert");
+function task(checkpoint, output) {
+    return __awaiter(this, void 0, void 0, function* () {
+        output.push(1);
+        yield new Promise(f => setTimeout(f, 100));
+        checkpoint();
+        output.push(2);
+        yield new Promise(f => setTimeout(f, 100));
+        checkpoint();
+        output.push(3);
+        yield new Promise(f => setTimeout(f, 100));
+    });
+}
+exports.default = {
+    abortable1() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [abort, abortPromise, checkpoint] = (0, abortable_1.makeAbortable)();
+            const timer = setTimeout(() => abort("Canceled"), 10000);
+            const output = [];
+            yield Promise.race([
+                abortPromise,
+                task(checkpoint, output)
+                    .finally(() => clearTimeout(timer))
+            ]);
+            assert(output.length == 3 &&
+                output[0] == 1 &&
+                output[1] == 2 &&
+                output[2] == 3);
+        });
+    },
+    abortable2() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [abort, abortPromise, checkpoint] = (0, abortable_1.makeAbortable)();
+            setTimeout(() => abort("Canceled"), 150);
+            const output = [];
+            yield Promise.race([
+                abortPromise.catch(err => Promise.reject(err + " by promise")),
+                task(checkpoint, output)
+            ]).then(() => assert(false), err => assert(err == "Canceled by promise"));
+            assert(output.length == 2 &&
+                output[0] == 1 &&
+                output[1] == 2);
+        });
+    },
+    abortable3() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [abort, abortPromise, checkpoint] = (0, abortable_1.makeAbortable)();
+            setTimeout(() => abort("Canceled"), 150);
+            const output = [];
+            yield Promise.race([
+                abortPromise.catch(err => new Promise(f => "Never")),
+                task(checkpoint, output)
+            ]).then(() => assert(false), err => assert(err == "Canceled"));
+            assert(output.length == 2 &&
+                output[0] == 1 &&
+                output[1] == 2);
+        });
+    },
+};

package/dist/index.test.js

@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const line_reader_test_1 = require("./line-reader.test");
-run(Object.assign({}, line_reader_test_1.default))
+const semaphore_test_1 = require("./semaphore.test");
+const abortable_test_1 = require("./abortable.test");
+run(Object.assign(Object.assign(Object.assign({}, line_reader_test_1.default), semaphore_test_1.default), abortable_test_1.default))
     .catch(console.error);
 function run(tests) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/line-reader.test.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
-    lineSplitStream1(): Promise<void>;
-    lineSplitStream2(): Promise<void>;
-    lineSplitStream3(): Promise<void>;
+    lineReader1(): Promise<void>;
+    lineReader2(): Promise<void>;
+    lineReader3(): Promise<void>;
 };
 export default _default;

package/dist/line-reader.test.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const line_reader_1 = require("./line-reader");
 const assert = require("assert");
 exports.default = {
-    lineSplitStream1() {
+    lineReader1() {
         return __awaiter(this, void 0, void 0, function* () {
             const lines = [];
             const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));
@@ -23,7 +23,7 @@ exports.default = {
                 lines[2] == "And this is a line as well");
         });
     },
-    lineSplitStream2() {
+    lineReader2() {
         return __awaiter(this, void 0, void 0, function* () {
             const lines = [];
             const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));
@@ -33,7 +33,7 @@ exports.default = {
                 lines[1] == "This is a line");
         });
     },
-    lineSplitStream3() {
+    lineReader3() {
         return __awaiter(this, void 0, void 0, function* () {
             const lines = [];
             const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));

package/dist/semaphore.js

@@ -19,8 +19,8 @@ function makeSemaphore(count) {
                     count--;
                 else
                     yield new Promise(f => waiters.push(f));
-                checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint();
                 try {
+                    checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint();
                     return yield task();
                 }
                 finally {

package/dist/semaphore.test.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    semaphore1(): Promise<void>;
+    semaphore2(): Promise<void>;
+    semaphore3(): Promise<void>;
+};
+export default _default;

package/dist/semaphore.test.js

@@ -0,0 +1,84 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const semaphore_1 = require("./semaphore");
+const assert = require("assert");
+exports.default = {
+    semaphore1() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sema = (0, semaphore_1.makeSemaphore)(1);
+            const output = [];
+            yield Promise.all([
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(1);
+                    yield new Promise(f => setTimeout(f, 100));
+                    output.push(2);
+                })),
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(3);
+                    yield new Promise(f => setTimeout(f, 50));
+                    output.push(4);
+                }))
+            ]);
+            assert(output.length == 4 &&
+                output[0] == 1 &&
+                output[1] == 2 &&
+                output[2] == 3 &&
+                output[3] == 4);
+        });
+    },
+    semaphore2() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sema = (0, semaphore_1.makeSemaphore)(2);
+            const output = [];
+            yield Promise.all([
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(1);
+                    yield new Promise(f => setTimeout(f, 100));
+                    output.push(2);
+                })),
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(3);
+                    yield new Promise(f => setTimeout(f, 50));
+                    output.push(4);
+                }))
+            ]);
+            assert(output.length == 4 &&
+                output[0] == 1 &&
+                output[1] == 3 &&
+                output[2] == 4 &&
+                output[3] == 2);
+        });
+    },
+    semaphore3() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sema = (0, semaphore_1.makeSemaphore)(1);
+            const output = [];
+            yield Promise.all([
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(1);
+                    yield new Promise(f => setTimeout(f, 100));
+                    output.push(2);
+                }), () => {
+                    throw new Error("Canceled");
+                }).then(() => assert(false), err => assert(err.message == "Canceled")),
+                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
+                    output.push(3);
+                    yield new Promise(f => setTimeout(f, 50));
+                    output.push(4);
+                }))
+            ]);
+            assert(output.length == 2 &&
+                output[0] == 3 &&
+                output[1] == 4);
+        });
+    },
+};

package/dist/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function mockTimer(): {
+    sleep(duration: number): Promise<void>;
+    run(): void;
+};

package/dist/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mockTimer = void 0;
+function mockTimer() {
+    const queue = [];
+    return {
+        sleep(duration) {
+            return new Promise(f => queue.push({ callback: f, duration }));
+        },
+        run() {
+            queue.sort((a, b) => a.duration - b.duration);
+            for (const { callback } of queue)
+                callback();
+        }
+    };
+}
+exports.mockTimer = mockTimer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsdsoftware/utils",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Useful JavaScript utilities",
   "main": "dist/index.js",
   "files": [