Merge pull request #24 from fink-lang/upgrade

Upgrade

Author: kollhof

package-lock.json

@@ -46,8 +46,8 @@
     "@babel/preset-env": "^7.12.1",
     "@fink/cli": "^8.0.0",
     "@fink/jest": "^7.0.0",
-    "@fink/larix": "^15.2.0",
-    "@fink/loxia": "^19.0.0",
+    "@fink/larix": "^18.0.0",
+    "@fink/loxia": "^21.1.0",
     "@fink/require-hook": "^6.0.1",
     "commitizen": "^4.0.5",
     "cz-conventional-changelog": "^3.1.0",

package.json

@@ -23,7 +23,7 @@ sleep = fn ms:
 
 
 
-is_async = fn obj:
-  match obj:
+is_async = fn value:
+  match value:
     {then: is_fn ?}: true
     else: false

src/async.fnk

@@ -1,4 +1,5 @@
 {get_type} = import '@fink/js-interop/reflect.fnk'
 
 
-is_fn = fn obj: 'function' == get_type obj
+is_fn = fn value:
+  'function' == get_type value

src/fn.fnk

@@ -21,6 +21,16 @@ sort = _sort_
 
 
 
+flatten = map items:
+  ...items
+
+
+
+chain = fn ...iterables: fn iterable:
+  flatten [iterable, ...iterables]
+
+
+
 drop = fn num_items:
   filter , idx=0:
     [idx >= num_items, idx + 1]
@@ -143,16 +153,6 @@ cycle = unfold items:
 
 
 
-flatten = map items:
-  ...items
-
-
-
-chain = fn ...iterables: fn iterable:
-  flatten [iterable, ...iterables]
-
-
-
 unique = filter item, known=[]:
   [not item in known, [...known, item]]
 

src/iter.fnk

@@ -602,7 +602,7 @@ describe 'performance', fn:
         zip ?, count 1000
         map [item, cntr]: {cntr, item}
         filter {cntr}: cntr % 2 == 0
-        fold _, c=0: c+1
+        fold _, c=0: c + 1
 
     t2 = fn:
       pipe range 100:

src/iter.test.fnk

@@ -8,13 +8,13 @@ describe 'json', fn:
     expect
       json_to_obj
         '{"foo": [134, "bar"], "spam": [true, false]}'
-      to_equal dict:
+      to_equal rec:
         foo: [134, 'bar']
         spam: [true, false]
 
   it 'serializes', fn:
     expect
-      obj_to_json dict:
+      obj_to_json rec:
         foo: [134, 'bar']
         spam: [true, false]
       to_equal

src/json.test.fnk

@@ -0,0 +1,17 @@
+{Object} = import '@fink/js-interop/globals.fnk'
+
+
+rec_keys = Object.keys
+
+rec_values = Object.values
+
+# TODO: remove in favour of [...kvs] = iter {}
+rec_key_values = Object.entries
+
+key_values_to_rec = Object.fromEntries
+
+
+is_rec = fn value:
+  match value:
+    {constructor: Object}: true
+    else: false

src/obj.fnk

@@ -0,0 +1,78 @@
+{describe, it, expect, to_equal} = import '@fink/jest/test.fnk'
+{null, undefined} = import '@fink/js-interop/nullish.fnk'
+
+{
+  rec_keys, rec_values, rec_key_values, key_values_to_rec, is_rec
+} = import './rec.fnk'
+
+
+describe 'records', fn:
+  it 'gets keys', fn:
+    expect
+      rec_keys {foo: 1, 'bar spam': 2}
+      to_equal
+        ['foo', 'bar spam']
+
+
+  it 'gets values', fn:
+    expect
+      rec_values {foo: 1, 'bar spam': 2}
+      to_equal
+        [1, 2]
+
+
+  it 'gets key, values', fn:
+    expect
+      rec_key_values {foo: 1, 'bar spam': 2}
+      to_equal list:
+        ['foo', 1]
+        ['bar spam', 2]
+
+
+  it 'creates record from key, values', fn:
+    expect
+      key_values_to_rec list:
+        ['foo', 1]
+        ['bar spam', 2]
+      to_equal
+        {foo: 1, 'bar spam': 2}
+
+
+  it 'asserts value is_rec', fn:
+    expect
+      is_rec {}
+      to_equal true
+
+    expect
+      is_rec 0
+      to_equal false
+
+    expect
+      is_rec 1.2345
+      to_equal false
+
+    expect
+      is_rec false
+      to_equal false
+
+    expect
+      is_rec true
+      to_equal false
+
+    expect
+      is_rec 'foo'
+      to_equal false
+
+    expect
+      is_rec []
+      to_equal false
+
+    expect
+      is_rec null
+      to_equal false
+
+    expect
+      is_rec undefined
+      to_equal false
+
+

src/obj.test.fnk

@@ -1,4 +1,4 @@
-{new} = import '@fink/js-interop/reflect.fnk'
+{new, is_instance} = import '@fink/js-interop/reflect.fnk'
 {RegExp} = import '@fink/js-interop/globals.fnk'
 
 {raw} = import './str.fnk'
@@ -8,6 +8,16 @@ regex = fn pattern, flags='':
   new RegExp, pattern, 'u${flags}'
 
 
+
+rx_to_str = fn value:
+  value.source
+
+
+
+is_rx = fn value:
+  is_instance value, RegExp
+
+
 ---
 Create a regex for the given raw string.
 
@@ -31,7 +41,13 @@ rx = fn strings, ...exprs:
         replace_all ?, ingorables, ''
         replace_all ?, esc, '$1$3'
 
-  regex raw {raw: parts}, ...exprs
+
+  regex raw {raw: parts}, ... exprs | map expr:
+    match expr:
+      is_rx ?:
+        expr.source
+      else:
+        expr
 
 
 match_all = fn str, rx:
@@ -56,3 +72,6 @@ replace_all = fn str, rx, replacement:
 
 
 matches = fn str, rx: rx.test str
+
+
+

src/rec.fnk

@@ -1,9 +1,9 @@
 {describe, it, expect, to_equal} = import '@fink/jest/test.fnk'
 
-{matches, match_all, find_index, split, replace_all, replace, rx, regex} = import './regex.fnk'
+{matches, match_all, find_index, split, replace_all, replace, rx, is_rx, rx_to_str} = import './regex.fnk'
 
 
-describe 'regex', fn:
+describe rx, fn:
   it 'matches single', fn:
     expect
       matches 'foobar', rx'.+oo.+'
@@ -52,7 +52,7 @@ describe 'regex', fn:
 
 
 
-describe 'string templates', fn:
+describe 'rx expressions', fn:
   it 'creates a regex', fn:
     expect
       rx'\(.+?\)(foo{${1},${4}})'
@@ -71,16 +71,35 @@ describe 'string templates', fn:
 
   it 'handles escaping', fn:
     expect
-      rx'
+      rx_to_str rx'
         \'\"`
         foo \# bar
         \${2}
         \\*
       '
-      to_equal regex '\'"`foo # bar\\\${2}\\\\*'
+      to_equal '\'"`foo # bar\\\${2}\\\\*'
 
 
   it 'handles spaces', fn:
     expect
-      rx'[ ]{3}'
-      to_equal regex '[ ]{3}'
+      rx_to_str rx'[ ]{3}'
+      to_equal '[ ]{3}'
+
+
+  it 'handles nesting', fn:
+    expect
+      rx_to_str rx'^.+?${ rx'foo.+' }$'
+      to_equal '^.+?foo.+$'
+
+
+
+describe is_rx, fn:
+  it 'asserts if value is regex', fn:
+    expect
+      is_rx rx'foo'
+      to_equal true
+
+    expect
+      is_rx '/foo/'
+      to_equal false
+