functionalscript 0.0.156 → 0.0.157

package/index.js

@@ -1,9 +1,5 @@
-"use strict";
-
 const lib = require('./lib')
 
-const todo = () => lib.panic('not implemented')
-
 /** @type {<F>(c: string, found: (before: string, after: string) => F, notFound: (c: string, source: string) => F) => (source: string) => F} */
 const splitOne = (c, found, notFound) => source => {
     const i = source.indexOf(c)

package/iterable/test.js

@@ -3,30 +3,30 @@ const lib = require('../lib')
 
 {
     const r = i.sum([120, 300, 42])
-    lib.panic_if('reduce')(r !== 462)
+    if (r !== 462) { throw 'error' }
 }
 
 {
-    lib.panic_if('first sum')(i.sum([1, 2]) !== 3)
-    lib.panic_if('second sum')(i.sum([1, 2]) !== 3)
+    if (i.sum([1, 2]) !== 3) { throw 'error' }
+    if (i.sum([1, 2]) !== 3) { throw 'error' }
 }
 
 {
     const x = Array.from(i.map(a => a ** 2)([1, 2, 3]))
-    lib.panic_if('map')(x.length !== 3)
-    lib.panic_if('map[0]')(x[0] !== 1)
-    lib.panic_if('map[1]')(x[1] !== 4)
-    lib.panic_if('map[2]')(x[2] !== 9)
+    if (x.length !== 3) { throw 'error' }
+    if (x[0] !== 1) { throw 'error' }
+    if (x[1] !== 4) { throw 'error' }
+    if (x[2] !== 9) { throw 'error' }
 }
 
 {
-    lib.panic_if('join')(i.join('/')([]) !== '')
-    lib.panic_if('join')(i.join('/')(['a']) !== 'a')
-    lib.panic_if('join')(i.join('/')(['a', 'b']) !== 'a/b')
+    if (i.join('/')([]) !== '') { throw 'error' }
+    if (i.join('/')(['a']) !== 'a') { throw 'error' }
+    if (i.join('/')(['a', 'b']) !== 'a/b') { throw 'error'}
 }
 
 {
-    lib.panic_if('find')(i.find(x => x === 'c')(['a', 'b', 'c']) !== 'c') 
+    if (i.find(x => x === 'c')(['a', 'b', 'c']) !== 'c') { throw 'error' }
 }
 
 {
@@ -37,5 +37,5 @@ const lib = require('../lib')
         (i.map(x => file(x())))
         (i.find(x => x !== undefined))
         ([() => p, () => `${p}.js`, () => `${p}/index.js`])
-    lib.panic_if('map.find')(x('index.js') !== 'x')
+    if (x('index.js') !== 'x') { throw 'error' }
 }

package/lib/index.js

@@ -23,18 +23,6 @@
 /**
  * @template T
  * @typedef {[T]|Continue<T>} Continuation
- */ 
-
-/** @type {(_: string) => never} */
-const panic = message => { throw message }
-
-/**
- * @template T
- * @template R
- * @typedef {{
- *  merge: (_: R) => (_: T) => R
- *  init: R
- * }} Reduce
  */
 
 /** @type {<I, X>(_: (_: I) => X) => <O>(_: (_: X) => O) => (_: I) => O} */
@@ -77,22 +65,7 @@ const chain = value => ({
 
 module.exports = {
 
-    panic,
-
-    todo: () => panic('not implemented'),
-
-    /** @type {(_: string) => (_: boolean) => void} */
-    panic_if: message => condition => condition ? panic(message) : undefined,
-
-    /** @type {<T>(_: Continuation<T>) => T} */
-    trampoline: continuation => {
-        while (true) {
-            if (typeof continuation !== 'function') {
-                return continuation[0]
-            }
-            continuation = continuation()
-        }
-    },
+    todo: () => { throw 'not implemented' },
 
     pipe,
 

package/map/test.js

@@ -42,14 +42,13 @@ const lib = require('../lib')
 
 {
     const m = empty.set('x')(12).set('y')(44)
-    lib.panic_if('map.get(\'x\')')(m.get('x') !== 12)
-    lib.panic_if('map.get(\'y\')')(m.get('y') !== 44)
-    lib.panic_if('map.get(\'a\')')(m.get('a') !== undefined)
+    if (m.get('x') !== 12) { throw 'error' }
+    if (m.get('y') !== 44) { throw 'error' }
+    if (m.get('a') !== undefined) { throw 'error' }
     const entries = Array.from(m.entries())
-    lib.panic_if('map.entries()')(entries.length !== 2)
+    if (entries.length !== 2) { throw 'error' }
 }
 
-
 {
     /** @type {import('.').Map<number>} */
     let m = empty

package/module-manager/test.js

@@ -5,13 +5,16 @@ const lib = require('../lib')
 require('./node/test')
 
 /** @type {<T>(_: T | undefined) => T} */
-const cast = x => x === undefined ? lib.panic('x') : x
+const cast = x => {
+    if (x === undefined) { throw 'x' } 
+    return x
+}
 
-lib.panic_if('isRelative')(i.isRelative('a/b/c'.split('/')))
-lib.panic_if('!isRelative')(!i.isRelative('./a/b/c'.split('/')))
-lib.panic_if('pathNorm')(cast(i.pathNorm('a/../b'.split('/'))).join('/') !== 'b')
-lib.panic_if('pathNorm')(cast(i.pathNorm('a/../b/../c'.split('/'))).join('/') !== 'c')
-lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('/') !== 'b/d')
+if (i.isRelative('a/b/c'.split('/'))) { throw 'error '}
+if (!i.isRelative('./a/b/c'.split('/'))) { throw 'error ' }
+if (cast(i.pathNorm('a/../b'.split('/'))).join('/') !== 'b') { throw 'error ' }
+if (cast(i.pathNorm('a/../b/../c'.split('/'))).join('/') !== 'c') { throw 'error ' }
+if (cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('/') !== 'b/d') { throw 'error ' }
 
 {
     /** @type {i.Package} */
@@ -35,7 +38,8 @@ lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('
                 'index.js': 'b/c ./index.js',
                 'x/index.js': 'b/c ./x/index.js',
             }
-            return ['.js', '', 'undefined.js'].includes(path) ? lib.panic('.js') : f[path]
+            if (['.js', '', 'undefined.js'].includes(path)) { throw '.js' }
+            return f[path]
         },
         id: ['c']
     }
@@ -59,7 +63,8 @@ lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('
                 'a/index.js': './a/index.js',
                 'a/index.js.js': './a/index.js.js',
             }
-            return ['.js', '', 'undefined.js'].includes(path) ? lib.panic('.js') : f[path] 
+            if (['.js', '', 'undefined.js'].includes(path)) { throw '.js' }
+            return  f[path] 
         },
         id: ['']
     }
@@ -72,8 +77,8 @@ lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('
     }
     {        
         const g = i.getModule({pack, local: []})
-        lib.panic_if('getModule')(g('') !== undefined)
-        lib.panic_if('getModule')(g('..') !== undefined)
+        if (g('') !== undefined) { throw 'error' }
+        if (g('..') !== undefined) { throw 'error' }
         expect(g('.'))({ fileName: 'index.js', location: { pack, local: []}, source: './index.js'})
         expect(g('./index'))({ fileName: 'index.js', location: { pack, local: []}, source: './index.js'})
         expect(g('./index.js'))({ fileName: 'index.js', location: { pack, local: []}, source: './index.js'})
@@ -81,10 +86,10 @@ lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('
         expect(g('./a'))({ fileName: 'index.js', location: { pack, local: ['a']}, source: './a/index.js'})
         expect(g('./a/index'))({ fileName: 'index.js', location: { pack, local: ['a']}, source: './a/index.js'})
         expect(g('./a/index.js'))({ fileName: 'index.js.js', location: { pack, local: ['a']}, source: './a/index.js'})
-        lib.panic_if('getModule')(g('./x') !== undefined)
+        if (g('./x') !== undefined) { throw 'error' }
         expect(g('a'))({ fileName: 'index.js', location: { pack: a, local: []}, source: 'a ./index.js'})
         expect(g('a/index'))({ fileName: 'index.js', location: { pack: a, local: []}, source: 'a ./index.js'})
-        lib.panic_if('getModule')(g('b') !== undefined)
+        if (g('b') !== undefined) { throw 'error' }
         expect(g('b/c'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})
         expect(g('b/c/index'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})
         expect(g('b/c/index.js'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})
@@ -93,21 +98,21 @@ lib.panic_if('pathNorm')(cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('
     }
     {
         const g = i.getModule({pack, local: ['index']})
-        lib.panic_if('getModule')(g('') !== undefined)
+        if (g('') !== undefined) { throw 'error' }
         expect(g('..'))({ fileName: 'index.js', location: { pack, local: []}, source: './index.js'})
         expect(g('.'))({ fileName: 'index.js', location: { pack, local: ['index']}, source: './index/index.js'})
         expect(g('./index'))({ fileName: 'index.js', location: { pack, local: ['index']}, source: './index/index.js'})
         expect(g('./index.js'))({ fileName: 'index.js', location: { pack, local: ['index']}, source: './index/index.js'})
-        lib.panic_if('getModule')(g('./index/') !== undefined)
-        lib.panic_if('getModule')(g('./a') !== undefined)
+        if (g('./index/') !== undefined) { throw 'error' }
+        if (g('./a') !== undefined) { throw 'error' }
         expect(g('../a'))({ fileName: 'index.js', location: { pack, local: ['a']}, source: './a/index.js'})
         expect(g('../a/index'))({ fileName: 'index.js', location: { pack, local: ['a']}, source: './a/index.js'})
         expect(g('../a/index.js'))({ fileName: 'index.js', location: { pack, local: ['a']}, source: './a/index.js'})
         expect(g('../a/index.js.js'))({ fileName: 'index.js.js', location: { pack, local: ['a']}, source: './a/index.js.js'})
-        lib.panic_if('getModule')(g('./x') !== undefined)
+        if (g('./x') !== undefined) { throw 'error' }
         expect(g('a'))({ fileName: 'index.js', location: { pack: a, local: []}, source: 'a ./index.js'})
         expect(g('a/index'))({ fileName: 'index.js', location: { pack: a, local: []}, source: 'a ./index.js'})
-        lib.panic_if('getModule')(g('b') !== undefined)
+        if (g('b') !== undefined) { throw 'error' }
         expect(g('b/c'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})
         expect(g('b/c/index'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})
         expect(g('b/c/index.js'))({ fileName: 'index.js', location: { pack: c, local: []}, source: 'b/c ./index.js'})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.156",
+  "version": "0.0.157",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -6,10 +6,10 @@ require('./module-manager/test')
 require('./lib/test')
 
 /** @type {() => never} */
-const assert = () => lib.panic('assert')
+const assert = () => { throw 'assert' }
 
 /** @type {(_: boolean) => void} */
-const assert_if = c => lib.panic_if('assert_if')(c)
+const assert_if = c => { if (c) { throw 'assert_if' } }
 
 {
     i.parseModuleUrl('')(