functionalscript 0.1.608 → 0.2.0

package/types/range_map/test.f.mjs

@@ -1,79 +1,79 @@
-import _, * as T from './module.f.mjs'
-import compare from '../function/compare/module.f.mjs'
+import * as _ from './module.f.mjs'
+import * as compare from '../function/compare/module.f.mjs'
 const { unsafeCmp } = compare
-import json, * as Json from '../../json/module.f.mjs'
-import object from '../object/module.f.mjs'
+import * as json from '../../json/module.f.mjs'
+import * as object from '../object/module.f.mjs'
 const { sort } = object
-import sortedSet, * as SortedSet from '../sorted_set/module.f.mjs'
-import list from '../list/module.f.mjs'
-import operator from '../function/operator/module.f.mjs'
+import * as sortedSet from '../sorted_set/module.f.mjs'
+import * as list from '../list/module.f.mjs'
+import * as operator from '../function/operator/module.f.mjs'
 
-/** @type {(a: readonly Json.Unknown[]) => string} */
+/** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = json.stringify(sort)
 
-/** @type {T.Operators<SortedSet.SortedSet<string>>} */
+/** @type {_.Operators<sortedSet.SortedSet<string>>} */
 const op = { union: sortedSet.union(unsafeCmp), equal: list.equal(operator.strictEqual) }
 
 export default {
     merge: [
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['b'], 2]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = null
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a"],1],[["b"],2]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = null
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['a'], 1], [['b'], 2]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a"],1],[["b"],2]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['b'], 2]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['a'], 1], [['b'], 2]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a"],1],[["b"],2]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['c'], 3]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['b'], 2], [['d'], 4]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a","b"],1],[["b","c"],2],[["c","d"],3],[["d"],4]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['d'], 4]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['b'], 2], [['c'], 3]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a","b"],1],[["b","d"],2],[["c","d"],3],[["d"],4]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['b'], 2]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['b'], 1], [['a'], 2]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
             if (result !== '[[["a","b"],2]]') { throw result }
         },
         () => {
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const a = [[['a'], 1], [['b'], 2], [['a'], 3]]
-            /** @type {T.RangeMap<SortedSet.SortedSet<string>>} */
+            /** @type {_.RangeMap<sortedSet.SortedSet<string>>} */
             const b = [[['a'], 5]]
             const merged = _.merge(op)(a)(b)
             const result = stringify(list.toArray(merged))
@@ -81,54 +81,54 @@ export default {
         }
     ],
     get: () => {
-        /** @type {SortedSet.SortedSet<string>} */
+        /** @type {sortedSet.SortedSet<string>} */
         const sortedSetEmpty = []
         const get = _.get(sortedSetEmpty)
         return [
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(5)(rm))
                 if (result !== '["a"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(10)(rm))
                 if (result !== '["a"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(15)(rm))
                 if (result !== '["b"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(20)(rm))
                 if (result !== '["b"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(25)(rm))
                 if (result !== '["c"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(30)(rm))
                 if (result !== '["c"]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = [[['a'], 10], [['b'], 20], [['c'], 30]]
                 const result = stringify(get(35)(rm))
                 if (result !== '[]') { throw result }
             },
             () => {
-                /** @type {T.RangeMapArray<SortedSet.SortedSet<string>>} */
+                /** @type {_.RangeMapArray<sortedSet.SortedSet<string>>} */
                 const rm = []
                 const result = stringify(get(10)(rm))
                 if (result !== '[]') { throw result }

package/types/result/module.d.mts

@@ -2,6 +2,6 @@ declare namespace _default {
     export { tryCatch };
 }
 export default _default;
-/** @type {<T>(f: () => T) => Result.Result<T, unknown>} */
-declare const tryCatch: <T>(f: () => T) => Result.Result<T, unknown>;
-import * as Result from './module.f.mjs';
+/** @type {<T>(f: () => T) => result.Result<T, unknown>} */
+declare const tryCatch: <T>(f: () => T) => result.Result<T, unknown>;
+import * as result from './module.f.mjs';

package/types/result/module.f.d.mts

@@ -1,12 +1,3 @@
-declare namespace _default {
-    export { ok };
-    export { error };
-    export { unwrap };
-}
-export default _default;
-export type Ok<T> = readonly ["ok", T];
-export type Error<E> = readonly ["error", E];
-export type Result<T, E> = Ok<T> | Error<E>;
 /**
  * @template T
  * @typedef {readonly['ok', T]} Ok
@@ -21,8 +12,11 @@ export type Result<T, E> = Ok<T> | Error<E>;
  * @typedef {Ok<T>|Error<E>} Result
  */
 /** @type {<T>(value: T) => Ok<T>} */
-declare const ok: <T>(value: T) => Ok<T>;
+export const ok: <T>(value: T) => Ok<T>;
 /** @type {<E>(e: E) => Error<E>} */
-declare const error: <E>(e: E) => Error<E>;
+export const error: <E>(e: E) => Error<E>;
 /** @type {<T, E>(r: Result<T, E>) => T} */
-declare const unwrap: <T, E>(r: Result<T, E>) => T;
+export const unwrap: <T, E>(r: Result<T, E>) => T;
+export type Ok<T> = readonly ["ok", T];
+export type Error<E> = readonly ["error", E];
+export type Result<T, E> = Ok<T> | Error<E>;

package/types/result/module.f.mjs

@@ -16,22 +16,13 @@
  */
 
 /** @type {<T>(value: T) => Ok<T>} */
-const ok = value => ['ok', value]
+export const ok = value => ['ok', value]
 
 /** @type {<E>(e: E) => Error<E>} */
-const error = e => ['error', e]
+export const error = e => ['error', e]
 
 /** @type {<T, E>(r: Result<T, E>) => T} */
-const unwrap = ([kind, v]) => {
+export const unwrap = ([kind, v]) => {
     if (kind === 'error') { throw v }
     return v
 }
-
-export default {
-    /** @readonly */
-    ok,
-    /** @readonly */
-    error,
-    /** @readonly */
-    unwrap,
-}

package/types/result/module.mjs

@@ -1,7 +1,7 @@
-import result, * as Result from './module.f.mjs'
+import * as result from './module.f.mjs'
 const { ok, error } = result
 
-/** @type {<T>(f: () => T) => Result.Result<T, unknown>} */
+/** @type {<T>(f: () => T) => result.Result<T, unknown>} */
 const tryCatch = f => {
     // Side effect: `try catch` is not allowed in FunctionalScript.
     try {

package/types/sorted_list/module.f.d.mts

@@ -1,28 +1,6 @@
-declare namespace _default {
-    export { merge };
-    export { genericMerge };
-    export { find };
-}
-export default _default;
-export type SortedList<T> = List.List<T>;
-export type SortedArray<T> = readonly T[];
-export type Cmp<T> = (a: T) => (b: T) => compare.Sign;
-export type ReduceOp<T, S> = (state: S) => (a: T) => (b: T) => readonly [option.Nullable<T>, compare.Sign, S];
-export type TailReduce<T, S> = (state: S) => (tail: List.List<T>) => List.List<T>;
-export type MergeReduce<T, S> = {
-    readonly reduceOp: ReduceOp<T, S>;
-    readonly tailReduce: TailReduce<T, S>;
-};
-export type CmpReduceOp<T> = ReduceOp<T, null>;
-/**
- * @template T
- * @typedef {ReduceOp<T, null>} CmpReduceOp
- */
-/** @type {<T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>} */
-declare const merge: <T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>;
 /**
  * @template T
- * @typedef {List.List<T>} SortedList
+ * @typedef {list.List<T>} SortedList
  */
 /**
  * @template T
@@ -40,7 +18,7 @@ declare const merge: <T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>
 /**
  * @template T
  * @template S
- * @typedef {(state: S) => (tail: List.List<T>) => List.List<T>} TailReduce
+ * @typedef {(state: S) => (tail: list.List<T>) => list.List<T>} TailReduce
  */
 /**
  * @template T
@@ -50,10 +28,26 @@ declare const merge: <T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>
  *  readonly tailReduce: TailReduce<T,S>
   * }} MergeReduce
  */
-/** @type {<T,S>(reduce: MergeReduce<T,S>) => (state: S) => (a: List.List<T>) => (b: List.List<T>) => List.List<T>} */
-declare const genericMerge: <T, S>(reduce: MergeReduce<T, S>) => (state: S) => (a: List.List<T>) => (b: List.List<T>) => List.List<T>;
+/** @type {<T,S>(reduce: MergeReduce<T,S>) => (state: S) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>} */
+export const genericMerge: <T, S>(reduce: MergeReduce<T, S>) => (state: S) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>;
+/**
+ * @template T
+ * @typedef {ReduceOp<T, null>} CmpReduceOp
+ */
+/** @type {<T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>} */
+export const merge: <T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>;
 /** @type {<T>(cmp: Cmp<T>) => (value: T) => (array: SortedArray<T>) =>  T|null} */
-declare const find: <T>(cmp: Cmp<T>) => (value: T) => (array: SortedArray<T>) => T | null;
-import * as List from '../list/module.f.mjs';
+export const find: <T>(cmp: Cmp<T>) => (value: T) => (array: SortedArray<T>) => T | null;
+export type SortedList<T> = list.List<T>;
+export type SortedArray<T> = readonly T[];
+export type Cmp<T> = (a: T) => (b: T) => compare.Sign;
+export type ReduceOp<T, S> = (state: S) => (a: T) => (b: T) => readonly [option.Nullable<T>, compare.Sign, S];
+export type TailReduce<T, S> = (state: S) => (tail: list.List<T>) => list.List<T>;
+export type MergeReduce<T, S> = {
+    readonly reduceOp: ReduceOp<T, S>;
+    readonly tailReduce: TailReduce<T, S>;
+};
+export type CmpReduceOp<T> = ReduceOp<T, null>;
+import * as list from '../list/module.f.mjs';
 import * as compare from '../function/compare/module.f.mjs';
 import * as option from '../nullable/module.f.mjs';

package/types/sorted_list/module.f.mjs

@@ -1,14 +1,14 @@
 // @ts-self-types="./module.f.d.mts"
 import * as compare from '../function/compare/module.f.mjs'
-import list, * as List from '../list/module.f.mjs'
+import * as list from '../list/module.f.mjs'
 import * as option from '../nullable/module.f.mjs'
 const { next } = list
-import f from '../function/module.f.mjs'
+import * as f from '../function/module.f.mjs'
 const { identity } = f
 
 /**
  * @template T
- * @typedef {List.List<T>} SortedList
+ * @typedef {list.List<T>} SortedList
  */
 
 /**
@@ -30,7 +30,7 @@ const { identity } = f
 /**
  * @template T
  * @template S
- * @typedef {(state: S) => (tail: List.List<T>) => List.List<T>} TailReduce
+ * @typedef {(state: S) => (tail: list.List<T>) => list.List<T>} TailReduce
  */
 
 /**
@@ -42,12 +42,12 @@ const { identity } = f
   * }} MergeReduce
  */
 
-/** @type {<T,S>(reduce: MergeReduce<T,S>) => (state: S) => (a: List.List<T>) => (b: List.List<T>) => List.List<T>} */
-const genericMerge = ({ reduceOp, tailReduce }) => {
+/** @type {<T,S>(reduce: MergeReduce<T,S>) => (state: S) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>} */
+export const genericMerge = ({ reduceOp, tailReduce }) => {
     /** @typedef {typeof reduceOp extends ReduceOp<infer T, infer S> ? [T, S] : never} TS */
     /** @typedef {TS[0]} T */
     /** @typedef {TS[1]} S */
-    /** @type {(state: S) => (a: List.List<T>) => (b: List.List<T>) => List.List<T>} */
+    /** @type {(state: S) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>} */
     const f = state => a => b => () => {
         const aResult = next(a)
         if (aResult === null) { return tailReduce(state)(b) }
@@ -68,7 +68,7 @@ const genericMerge = ({ reduceOp, tailReduce }) => {
  */
 
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>} */
-const merge = cmp => {
+export const merge = cmp => {
     /** @typedef {typeof cmp extends Cmp<infer T> ? T : never} T*/
     /** @type {TailReduce<T, null>} */
     const tailReduce = mergeTail
@@ -81,11 +81,11 @@ const cmpReduce = cmp => () => a => b => {
     return [sign === 1 ? b : a, sign, null]
 }
 
-/** @type {() => <T>(tail: List.List<T>) => List.List<T>} */
+/** @type {() => <T>(tail: list.List<T>) => list.List<T>} */
 const mergeTail = () => identity
 
 /** @type {<T>(cmp: Cmp<T>) => (value: T) => (array: SortedArray<T>) =>  T|null} */
-const find = cmp => value => array => {
+export const find = cmp => value => array => {
     let b = 0
     let e = array.length - 1
     while (true) {
@@ -105,12 +105,3 @@ const find = cmp => value => array => {
         }
     }
 }
-
-export default {
-    /** @readonly */
-    merge,
-    /** @readonly */
-    genericMerge,
-    /** @readonly */
-    find
-}

package/types/sorted_list/test.f.mjs

@@ -1,16 +1,16 @@
-import _ from './module.f.mjs'
-import compare from '../function/compare/module.f.mjs'
+import * as _ from './module.f.mjs'
+import * as compare from '../function/compare/module.f.mjs'
 const { unsafeCmp } = compare
-import json, * as Json from '../../json/module.f.mjs'
-import object from '../object/module.f.mjs'
+import * as json from '../../json/module.f.mjs'
+import * as object from '../object/module.f.mjs'
 const { sort } = object
-import list from '../list/module.f.mjs'
+import * as list from '../list/module.f.mjs'
 const { toArray, countdown, length } = list
 import * as Map from '../map/module.f.mjs'
-import f from '../function/module.f.mjs'
+import * as f from '../function/module.f.mjs'
 const { flip } = f
 
-/** @type {(a: readonly Json.Unknown[]) => string} */
+/** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = json.stringify(sort)
 
 /** @type {<T>(a: T) => (b: T) => Map.Sign} */

package/types/sorted_set/module.f.d.mts

@@ -1,12 +1,3 @@
-declare namespace _default {
-    export { union };
-    export { intersect };
-    export { has };
-}
-export default _default;
-export type SortedSet<T> = readonly T[];
-export type Cmp<T> = (a: T) => (b: T) => Compare.Sign;
-export type Byte = number;
 /**
  * @template T
  * @typedef {readonly T[]} SortedSet
@@ -17,9 +8,12 @@ export type Byte = number;
  */
 /** @typedef {number} Byte */
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
-declare const union: <T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>;
+export const union: <T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>;
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
-declare const intersect: <T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>;
+export const intersect: <T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>;
 /** @type {<T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean} */
-declare const has: <T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean;
+export const has: <T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean;
+export type SortedSet<T> = readonly T[];
+export type Cmp<T> = (a: T) => (b: T) => Compare.Sign;
+export type Byte = number;
 import * as Compare from '../function/compare/module.f.mjs';

package/types/sorted_set/module.f.mjs

@@ -1,8 +1,8 @@
 // @ts-self-types="./module.f.d.mts"
 import * as Compare from '../function/compare/module.f.mjs'
-import list from "../list/module.f.mjs"
+import * as list from "../list/module.f.mjs"
 const { toArray } = list
-import sortedList, * as SortedList from '../sorted_list/module.f.mjs'
+import * as sortedList from '../sorted_list/module.f.mjs'
 const { merge, genericMerge, find } = sortedList
 
 /**
@@ -18,30 +18,21 @@ const { merge, genericMerge, find } = sortedList
 /** @typedef {number} Byte */
 
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
-const union = cmp => a => b => toArray(merge(cmp)(a)(b))
+export const union = cmp => a => b => toArray(merge(cmp)(a)(b))
 
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
-const intersect = cmp => a => b => toArray(intersectMerge(cmp)(a)(b))
+export const intersect = cmp => a => b => toArray(intersectMerge(cmp)(a)(b))
 
 const tailReduce = () => () => null
 
-/** @type {<T>(cmp: Cmp<T>) => (a: SortedList.SortedList<T>) => (b: SortedList.SortedList<T>) => SortedList.SortedList<T>} */
+/** @type {<T>(cmp: Cmp<T>) => (a: sortedList.SortedList<T>) => (b: sortedList.SortedList<T>) => sortedList.SortedList<T>} */
 const intersectMerge = cmp => genericMerge({ reduceOp: intersectReduce(cmp), tailReduce })(null)
 
-/** @type {<T,S>(cmp: Cmp<T>) => SortedList.ReduceOp<T,S>} */
+/** @type {<T,S>(cmp: Cmp<T>) => sortedList.ReduceOp<T,S>} */
 const intersectReduce = cmp => state => a => b => {
     const sign = cmp(a)(b)
     return [sign === 0 ? a : null, sign, state]
 }
 
 /** @type {<T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean} */
-const has = cmp => value => set => find(cmp)(value)(set) === value
-
-export default {
-    /** @readonly */
-    union,
-    /** @readonly */
-    intersect,
-    /** @readonly */
-    has
-}
+export const has = cmp => value => set => find(cmp)(value)(set) === value

package/types/sorted_set/test.f.mjs

@@ -1,16 +1,16 @@
-import _ from './module.f.mjs'
-import compare from '../function/compare/module.f.mjs'
+import * as _ from './module.f.mjs'
+import * as compare from '../function/compare/module.f.mjs'
 const { unsafeCmp } = compare
-import json, * as Json from '../../json/module.f.mjs'
-import object from '../object/module.f.mjs'
+import * as json from '../../json/module.f.mjs'
+import * as object from '../object/module.f.mjs'
 const { sort } = object
-import list from '../list/module.f.mjs'
+import * as list from '../list/module.f.mjs'
 const { toArray, countdown, length } = list
 import * as Map from '../map/module.f.mjs'
-import f from '../function/module.f.mjs'
+import * as f from '../function/module.f.mjs'
 const { flip } = f
 
-/** @type {(a: readonly Json.Unknown[]) => string} */
+/** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)
 
 /** @type {<T>(a: T) => (b: T) => Map.Sign} */

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

@@ -1,15 +1,9 @@
-declare namespace _default {
-    export { join };
-    export { concat };
-    export { repeat };
-    export { cmp };
-}
-export default _default;
-declare const join: import("../function/module.f.mjs").Func<string, (input: List.List<string>) => string>;
-declare const concat: (input: List.List<string>) => string;
+export const join: f.Func<string, (input: list.List<string>) => string>;
+export const concat: (input: list.List<string>) => string;
 /** @type {(n: string) => (v: number) => string} */
-declare const repeat: (n: string) => (v: number) => string;
-/** @type {(a: string) => (b: string) => Compare.Sign} */
-declare const cmp: (a: string) => (b: string) => Compare.Sign;
-import * as List from '../list/module.f.mjs';
-import * as Compare from '../function/compare/module.f.mjs';
+export const repeat: (n: string) => (v: number) => string;
+/** @type {(a: string) => (b: string) => compare.Sign} */
+export const cmp: (a: string) => (b: string) => compare.Sign;
+import * as list from '../list/module.f.mjs';
+import * as f from '../function/module.f.mjs';
+import * as compare from '../function/compare/module.f.mjs';

package/types/string/module.f.mjs

@@ -1,33 +1,22 @@
 // @ts-self-types="./module.f.d.mts"
-import list, * as List from '../list/module.f.mjs'
+import * as list from '../list/module.f.mjs'
 const { reduce: listReduce, repeat: listRepeat } = list
-import f from '../function/module.f.mjs'
+import * as f from '../function/module.f.mjs'
 const { compose } = f
-import compare, * as Compare from '../function/compare/module.f.mjs'
+import * as compare from '../function/compare/module.f.mjs'
 const { unsafeCmp } = compare
-import op, * as Op from '../function/operator/module.f.mjs'
+import * as op from '../function/operator/module.f.mjs'
 const { join: joinOp, concat: concatOp } = op
 
-/** @type {(o: Op.Reduce<string>) => (input: List.List<string>) => string} */
+/** @type {(o: op.Reduce<string>) => (input: list.List<string>) => string} */
 const reduce = o => listReduce(o)('')
 
-const join = compose(joinOp)(reduce)
+export const join = compose(joinOp)(reduce)
 
-const concat = reduce(concatOp)
+export const concat = reduce(concatOp)
 
 /** @type {(n: string) => (v: number) => string} */
-const repeat = v => compose(listRepeat(v))(concat)
+export const repeat = v => compose(listRepeat(v))(concat)
 
-/** @type {(a: string) => (b: string) => Compare.Sign} */
-const cmp = unsafeCmp
-
-export default {
-    /** @readonly */
-    join,
-    /** @readonly */
-    concat,
-    /** @readonly */
-    repeat,
-    /** @readonly */
-    cmp,
-}
+/** @type {(a: string) => (b: string) => compare.Sign} */
+export const cmp = unsafeCmp

package/types/string/test.f.mjs

@@ -1,6 +1,6 @@
-import _ from './module.f.mjs'
+import * as _ from './module.f.mjs'
 const { join, concat, repeat, cmp } = _
-import list from '../list/module.f.mjs'
+import * as list from '../list/module.f.mjs'
 const { repeat: repeatList } = list
 
 export default {

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

@@ -1,21 +1,13 @@
-declare namespace _default {
-    export { empty };
-    export { contains };
-    export { set };
-    export { values };
-    export { fromValues };
-    export { remove };
-}
-export default _default;
-export type StringSet = BtreeTypes.Tree<string>;
-declare const empty: null;
+export const values: <T>(tree: BtreeTypes.Tree<T>) => list.List<T>;
+export const empty: null;
 /** @typedef {BtreeTypes.Tree<string>} StringSet */
 /** @type {(value: string) => (set: StringSet) => boolean} */
-declare const contains: (value: string) => (set: StringSet) => boolean;
+export const contains: (value: string) => (set: StringSet) => boolean;
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-declare const set: (value: string) => (s: StringSet) => StringSet;
-declare const values: <T>(tree: BtreeTypes.Tree<T>) => import("../list/module.f.mjs").List<T>;
-declare const fromValues: (input: import("../list/module.f.mjs").List<string>) => StringSet;
+export const set: (value: string) => (s: StringSet) => StringSet;
+export const fromValues: (input: list.List<string>) => StringSet;
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-declare const remove: (value: string) => (s: StringSet) => StringSet;
+export const remove: (value: string) => (s: StringSet) => StringSet;
+export type StringSet = BtreeTypes.Tree<string>;
 import * as BtreeTypes from '../btree/types/module.f.mjs';
+import * as list from '../list/module.f.mjs';