functionalscript 0.3.7 → 0.3.9

package/types/sorted_set/test.f.js

@@ -1,26 +1,21 @@
-import * as _ from "./module.f.js";
-import * as compare from "../function/compare/module.f.js";
-const { unsafeCmp } = compare;
+import { has, intersect, union } from "./module.f.js";
+import { unsafeCmp } from "../function/compare/module.f.js";
 import * as json from "../../json/module.f.js";
-import * as object from "../object/module.f.js";
-const { sort } = object;
-import * as list from "../list/module.f.js";
-const { toArray, countdown, length } = list;
-import * as Map from "../map/module.f.js";
-import * as f from "../function/module.f.js";
-const { flip } = f;
+import { sort } from "../object/module.f.js";
+import { toArray, countdown, length } from "../list/module.f.js";
+import { flip } from "../function/module.f.js";
 const stringify = a => json.stringify(sort)(a);
 const reverseCmp = flip(unsafeCmp);
 export default {
     union: [
         () => {
-            const result = stringify(toArray(_.union(unsafeCmp)([2, 3, 4])([1, 3, 5])));
+            const result = stringify(toArray(union(unsafeCmp)([2, 3, 4])([1, 3, 5])));
             if (result !== '[1,2,3,4,5]') {
                 throw result;
             }
         },
         () => {
-            const result = stringify(toArray(_.union(unsafeCmp)([1, 2, 3])([])));
+            const result = stringify(toArray(union(unsafeCmp)([1, 2, 3])([])));
             if (result !== '[1,2,3]') {
                 throw result;
             }
@@ -28,7 +23,7 @@ export default {
         () => {
             const n = 10_000;
             const sortedSet = toArray(countdown(n));
-            const result = _.union(reverseCmp)(sortedSet)(sortedSet);
+            const result = union(reverseCmp)(sortedSet)(sortedSet);
             const len = length(result);
             if (len != n) {
                 throw result;
@@ -37,13 +32,13 @@ export default {
     ],
     intersect: [
         () => {
-            const result = stringify(toArray(_.intersect(unsafeCmp)([2, 3, 4])([1, 3, 5])));
+            const result = stringify(toArray(intersect(unsafeCmp)([2, 3, 4])([1, 3, 5])));
             if (result !== '[3]') {
                 throw result;
             }
         },
         () => {
-            const result = stringify(toArray(_.intersect(unsafeCmp)([1, 2, 3])([])));
+            const result = stringify(toArray(intersect(unsafeCmp)([1, 2, 3])([])));
             if (result !== '[]') {
                 throw result;
             }
@@ -51,25 +46,25 @@ export default {
     ],
     has: [
         () => {
-            const result = _.has(unsafeCmp)(0)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            const result = has(unsafeCmp)(0)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
             if (!result) {
                 throw result;
             }
         },
         () => {
-            const result = _.has(unsafeCmp)(3)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            const result = has(unsafeCmp)(3)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
             if (result) {
                 throw result;
             }
         },
         () => {
-            const result = _.has(unsafeCmp)(77)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            const result = has(unsafeCmp)(77)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
             if (result) {
                 throw result;
             }
         },
         () => {
-            const result = _.has(unsafeCmp)(80)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            const result = has(unsafeCmp)(80)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90]);
             if (!result) {
                 throw result;
             }

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

@@ -1,6 +1,6 @@
-import * as list from '../list/module.f.ts';
-import * as compare from '../function/compare/module.f.ts';
-export declare const join: (_: string) => (input: list.List<string>) => string;
-export declare const concat: (input: list.List<string>) => string;
+import { type List } from '../list/module.f.ts';
+import { type Sign } from '../function/compare/module.f.ts';
+export declare const join: (_: string) => (input: List<string>) => string;
+export declare const concat: (input: List<string>) => string;
 export declare const repeat: (n: string) => (v: number) => string;
-export declare const cmp: (a: string) => (b: string) => compare.Sign;
+export declare const cmp: (a: string) => (b: string) => Sign;

package/types/string/module.f.js

@@ -1,8 +1,6 @@
-import * as list from "../list/module.f.js";
-const { reduce: listReduce, repeat: listRepeat } = list;
+import { reduce as listReduce, repeat as listRepeat } from "../list/module.f.js";
 import { compose } from "../function/module.f.js";
-import * as compare from "../function/compare/module.f.js";
-const { unsafeCmp } = compare;
+import { unsafeCmp } from "../function/compare/module.f.js";
 import { join as joinOp, concat as concatOp } from "../function/operator/module.f.js";
 const reduce = o => listReduce(o)('');
 export const join = compose(joinOp)(reduce);

package/types/string/test.f.js

@@ -1,7 +1,5 @@
-import * as _ from "./module.f.js";
-const { join, concat, repeat, cmp } = _;
-import * as list from "../list/module.f.js";
-const { repeat: repeatList } = list;
+import { join, concat, repeat, cmp } from "./module.f.js";
+import { repeat as repeatList } from "../list/module.f.js";
 export default {
     join: {
         0: () => {

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

@@ -1,8 +1,8 @@
-import * as BtreeTypes from '../btree/types/module.f.ts';
+import type { Tree } from '../btree/types/module.f.ts';
 import { type List } from '../list/module.f.ts';
 export declare const values: (s: StringSet) => List<string>;
 export declare const empty: null;
-export type StringSet = BtreeTypes.Tree<string>;
+export type StringSet = Tree<string>;
 export declare const contains: (value: string) => (set: StringSet) => boolean;
 export declare const set: (value: string) => (s: StringSet) => StringSet;
 export declare const fromValues: (input: List<string>) => StringSet;

package/types/string_set/module.f.js

@@ -1,16 +1,10 @@
-import * as BtreeTypes from "../btree/types/module.f.js";
 import * as btree from "../btree/module.f.js";
-import * as btf from "../btree/find/module.f.js";
-const { find, isFound } = btf;
-import * as btr from "../btree/remove/module.f.js";
-const { remove: btreeRemove } = btr;
-import * as bts from "../btree/set/module.f.js";
-const { set: btreeSet } = bts;
-import * as string from "../string/module.f.js";
-const { cmp } = string;
+import { find, isFound } from "../btree/find/module.f.js";
+import { remove as btreeRemove } from "../btree/remove/module.f.js";
+import { set as btreeSet } from "../btree/set/module.f.js";
+import { cmp } from "../string/module.f.js";
 import { fold } from "../list/module.f.js";
-import * as f from "../function/module.f.js";
-const { compose } = f;
+import { compose } from "../function/module.f.js";
 export const values = btree.values;
 export const empty = btree.empty;
 export const contains = value => {

package/types/string_set/test.f.js

@@ -1,63 +1,63 @@
-import * as _ from "./module.f.js";
+import { contains, remove, set } from "./module.f.js";
 export default {
     contains: () => {
-        const r = _.set('hello')(null);
-        if (!_.contains('hello')(r)) {
+        const r = set('hello')(null);
+        if (!contains('hello')(r)) {
             throw r;
         }
-        if (_.contains('hello1')(r)) {
+        if (contains('hello1')(r)) {
             throw r;
         }
     },
     remove: () => {
-        let r = _.set('hello')(null);
-        r = _.set('world')(r);
-        r = _.set('HELLO')(r);
-        r = _.set('WORLD!')(r);
-        if (!_.contains('hello')(r)) {
+        let r = set('hello')(null);
+        r = set('world')(r);
+        r = set('HELLO')(r);
+        r = set('WORLD!')(r);
+        if (!contains('hello')(r)) {
             throw r;
         }
-        if (_.contains('hello1')(r)) {
+        if (contains('hello1')(r)) {
             throw r;
         }
-        if (!_.contains('HELLO')(r)) {
+        if (!contains('HELLO')(r)) {
             throw r;
         }
-        if (_.contains('WORLD')(r)) {
+        if (contains('WORLD')(r)) {
             throw r;
         }
-        if (!_.contains('world')(r)) {
+        if (!contains('world')(r)) {
             throw r;
         }
-        if (_.contains('world!')(r)) {
+        if (contains('world!')(r)) {
             throw r;
         }
-        if (!_.contains('WORLD!')(r)) {
+        if (!contains('WORLD!')(r)) {
             throw r;
         }
         //
-        r = _.remove('hello')(r);
-        if (_.contains('hello')(r)) {
+        r = remove('hello')(r);
+        if (contains('hello')(r)) {
             throw r;
         }
-        if (!_.contains('world')(r)) {
+        if (!contains('world')(r)) {
             throw r;
         }
-        r = _.remove('world')(r);
-        if (_.contains('world')(r)) {
+        r = remove('world')(r);
+        if (contains('world')(r)) {
             throw r;
         }
-        if (!_.contains('HELLO')(r)) {
+        if (!contains('HELLO')(r)) {
             throw r;
         }
-        r = _.remove('HELLO')(r);
-        if (_.contains('HELLO')(r)) {
+        r = remove('HELLO')(r);
+        if (contains('HELLO')(r)) {
             throw r;
         }
-        if (!_.contains('WORLD!')(r)) {
+        if (!contains('WORLD!')(r)) {
             throw r;
         }
-        r = _.remove('WORLD!')(r);
+        r = remove('WORLD!')(r);
         if (r !== null) {
             throw r;
         }