Merge pull request #12 from fink-lang/upgrade

Upgrade

Author: kollhof

package-lock.json

@@ -28,10 +28,10 @@
     "release": "semantic-release"
   },
   "devDependencies": {
-    "@fink/cli": "^6.0.0",
-    "@fink/jest": "^5.0.0",
+    "@fink/cli": "^6.1.0",
+    "@fink/jest": "^5.1.0",
     "@fink/larix": "^12.0.0",
-    "@fink/loxia": "^12.0.0",
+    "@fink/loxia": "^12.0.2",
     "commitizen": "^4.0.5",
     "cz-conventional-changelog": "^3.1.0",
     "jest-cli": "^26.1.0",
@@ -44,6 +44,6 @@
     }
   },
   "dependencies": {
-    "@fink/js-interop": "^1.0.0"
+    "@fink/js-interop": "^1.1.0"
   }
 }

package.json

@@ -1,5 +1,6 @@
 {max_int} = import './num'
 {new} = import '@fink/js-interop/reflect'
+{Symbol, Set} = import '@fink/js-interop/globals'
 
 # TODO add:
 # partition

src/iter.fnk

@@ -1,3 +1,5 @@
+{JSON} = import '@fink/js-interop/globals'
+
 json_to_obj = JSON.parse
 
 obj_to_json = JSON.stringify

src/json.fnk

@@ -1,4 +1,5 @@
 
+{Math} = import '@fink/js-interop/globals'
 
 
 Pi = Math.PI

src/math.fnk

@@ -1,4 +1,5 @@
 {describe, it, expect, to_equal} = import '@fink/jest'
+{Math} = import '@fink/js-interop/globals'
 
 {π, clamp} = import './math'
 

src/math.test.fnk

@@ -1,3 +1,7 @@
+{parseFloat, parseInt, Number, isNaN, isFinite} = import '@fink/js-interop/globals'
+{is_instance, get_type} = import '@fink/js-interop/reflect'
+
+
 # TODO: should that live in str?
 parse_float = fn str: parseFloat str
 
@@ -19,3 +23,10 @@ is_not_a_num = isNaN
 is_finite = isFinite
 
 base_n = fn num, radix: num.toString radix
+
+
+is_num = fn num:
+  match num:
+    'number' == get_type ?: true
+    is_instance ?, Number: true
+    else: false

src/num.fnk

@@ -1,6 +1,8 @@
 {describe, it, expect, to_equal} = import '@fink/jest'
+{new} = import '@fink/js-interop/reflect'
+{Number} = import '@fink/js-interop/globals'
 
-{parse_int, parse_float, base_n} = import './num'
+{parse_int, parse_float, base_n, is_num} = import './num'
 
 
 describe 'numbers', fn:
@@ -38,3 +40,20 @@ describe 'numbers', fn:
       base_n 1234, 36
       to_equal
         'ya'
+
+
+
+describe 'is_num', fn:
+  it 'is a number', fn:
+    expect
+      is_num 1234
+      to_equal true
+
+    expect
+      is_num new Number, 1234
+      to_equal true
+
+  it 'is not a number', fn:
+    expect
+      is_num '1234'
+      to_equal false

src/num.test.fnk

@@ -1,3 +1,5 @@
+{Object} = import '@fink/js-interop/globals'
+
 
 obj_keys = Object.keys
 

src/obj.fnk

@@ -1,9 +1,10 @@
 {new} = import '@fink/js-interop/reflect'
+{RegExp} = import '@fink/js-interop/globals'
+
 {raw} = import './str'
 
 
 regex = fn pattern, flags='':
-  # TODO: should @fink/js-interop provide the regexp function?
   new RegExp, pattern, 'u${flags}'
 
 

src/regex.fnk

@@ -1,3 +1,5 @@
+{Error} = import '@fink/js-interop/globals'
+
 
 stack_trace = fn func=stack_trace:
   err = {}

src/stack-trace.fnk

@@ -1,4 +1,6 @@
 {new} = import '@fink/js-interop/reflect'
+{is_instance, get_type} = import '@fink/js-interop/reflect'
+{String, TextEncoder, TextDecoder} = import '@fink/js-interop/globals'
 
 
 from_char_codes = String.fromCharCode
@@ -25,6 +27,7 @@ trim = fn str: str.trim _
 trim_start = fn str: str.trimStart _
 trim_end = fn str: str.trimEnd _
 
+
 # TODO should this be handled by '...' * 3 in loxia?
 repeat = fn str, num: str.repeat num
 
@@ -41,4 +44,11 @@ encode = fn text, encoding:
 
 decode = fn bytes, encoding:
   encoder = new TextDecoder, encoding
-  encoder.decode bytes
+  encoder.decode bytes
+
+
+is_str = fn str:
+  match str:
+    'string' == get_type ?: true
+    is_instance ?, String: true
+    else: false

src/str.fnk

@@ -1,21 +1,24 @@
 {describe, it, expect, to_equal} = import '@fink/jest'
+{new} = import '@fink/js-interop/reflect'
+{Uint8Array, String} = import '@fink/js-interop/globals'
+
 
 {
   from_char_codes, from_code_points, char_code, code_point
 
   ends_with, starts_with
 
-  matches, match_all, find_index, split, replace
-
   slice
 
   pad_start, pad_end, trim, trim_start, trim_end
 
   repeat, lower_case, upper_case
 
-  raw, rx
+  raw
 
   encode, decode
+
+  is_str
 } = import './str'
 
 
@@ -130,3 +133,19 @@ describe 'codecs', fn:
       to_equal 'foobar'
 
 
+
+describe 'is_str', fn:
+  it 'is a string', fn:
+    expect
+      is_str 'foobar'
+      to_equal true
+
+    expect
+      is_str new String, 1234
+      to_equal true
+
+  it 'is not a string', fn:
+    expect
+      is_str 1234
+      to_equal false
+