Deno support

Author: lpil

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "deno.enable": true,
+  "deno.lint": false,
+}

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.4.0 - 2023-01-08
+
+- 
+- The `status` function has been removed.
+
 ## v0.4.0 - 2023-01-02
 
 - The error type now contains more detail.

gleam.toml

@@ -9,9 +9,23 @@ links = [
   { title = "Sponsor", href = "https://github.com/sponsors/lpil" },
 ]
 
+[javascript]
+runtime = "deno"
+
+[javascript.deno]
+allow_read = [
+  "gleam.toml",
+  "test",
+  "build",
+  "tmp",
+]
+allow_write = [
+  "tmp",
+]
+
 [dependencies]
 gleam_stdlib = "~> 0.25"
 esqlite = "~> 0.8"
 
 [dev-dependencies]
-gleeunit = "~> 0.7"
+gleeunit = "~> 0.8"

manifest.toml

@@ -4,10 +4,10 @@
 packages = [
   { name = "esqlite", version = "0.8.5", build_tools = ["rebar3"], requirements = [], otp_app = "esqlite", source = "hex", outer_checksum = "75F0DCAB190A09842B1D9305765C026D8AA2ED7C98EFF272DFB529CAC99B0742" },
   { name = "gleam_stdlib", version = "0.25.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "AD0F89928E0B919C8F8EDF640484633B28DBF88630A9E6AE504617A3E3E5B9A2" },
-  { name = "gleeunit", version = "0.8.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "A1170754BF54F5DD6E9EF392FB1DC612528B007CCBE41B52F0C5453254708490" },
+  { name = "gleeunit", version = "0.9.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "37F8904B6844A99A2C041E56B2E08D464AC2529E68EB0A3FA4AD93745E0A3A59" },
 ]
 
 [requirements]
 esqlite = "~> 0.8"
 gleam_stdlib = "~> 0.25"
-gleeunit = "~> 0.7"
+gleeunit = "~> 0.8"

src/sqlight.gleam

@@ -13,18 +13,6 @@ pub type Stats {
   Stats(used: Int, highwater: Int)
 }
 
-pub type StatusInfo {
-  StatusInfo(
-    memory_used: Stats,
-    pagecache_used: Stats,
-    pagecache_overflow: Stats,
-    malloc_size: Stats,
-    parser_stack: Stats,
-    pagecache_size: Stats,
-    malloc_count: Stats,
-  )
-}
-
 pub type Error {
   SqlightError(
     code: ErrorCode,
@@ -125,8 +113,6 @@ pub type ErrorCode {
   IoerrRdlock
 }
 
-external type Charlist
-
 /// Convert an `Error` to an error code int.
 ///
 /// See the SQLite documentation for the full list of error codes.
@@ -309,19 +295,21 @@ pub fn error_code_from_int(code: Int) -> ErrorCode {
   }
 }
 
-external type NilResult
-
-external fn open_(Charlist) -> Result(Connection, Int) =
-  "esqlite3" "open"
+if erlang {
+  external fn open_(String) -> Result(Connection, Error) =
+    "sqlight_ffi" "open"
 
-external fn normalise_result(NilResult) -> Result(Nil, Int) =
-  "sqlight_ffi" "normalise_result"
+  external fn close_(Connection) -> Result(Nil, Error) =
+    "sqlight_ffi" "close"
+}
 
-external fn string_to_charlist(String) -> Charlist =
-  "unicode" "characters_to_list"
+if javascript {
+  external fn open_(String) -> Result(Connection, Error) =
+    "./sqlight_ffi.js" "open"
 
-external fn close_(Connection) -> NilResult =
-  "esqlite3" "close"
+  external fn close_(Connection) -> Result(Nil, Error) =
+    "./sqlight_ffi.js" "close"
+}
 
 /// Open a connection to a SQLite database.
 ///
@@ -350,12 +338,7 @@ external fn close_(Connection) -> NilResult =
 /// ```
 ///
 pub fn open(path: String) -> Result(Connection, Error) {
-  path
-  |> string_to_charlist
-  |> open_
-  |> result.map_error(fn(i) {
-    SqlightError(code: error_code_from_int(i), message: "", offset: -1)
-  })
+  open_(path)
 }
 
 /// Close a connection to a SQLite database.
@@ -365,10 +348,7 @@ pub fn open(path: String) -> Result(Connection, Error) {
 /// information: <https://www.sqlite.org/c3ref/close.html>.
 ///
 pub fn close(connection: Connection) -> Result(Nil, Error) {
-  connection
-  |> close_
-  |> normalise_result
-  |> result.map_error(construct_error(connection, _))
+  close_(connection)
 }
 
 /// Open a connection to a SQLite database and execute a function with it, then
@@ -395,14 +375,8 @@ pub fn with_connection(path: String, f: fn(Connection) -> a) -> a {
   value
 }
 
-/// Get all internal status information for SQLite.
-///
-pub external fn status() -> StatusInfo =
-  "sqlight_ffi" "status"
-
 pub fn exec(sql: String, on connection: Connection) -> Result(Nil, Error) {
-  run_exec(connection, sql)
-  |> result.map_error(construct_error(connection, _))
+  exec_(sql, connection)
 }
 
 pub fn query(
@@ -411,11 +385,7 @@ pub fn query(
   with arguments: List(Value),
   expecting decoder: Decoder(t),
 ) -> Result(List(t), Error) {
-  use rows <-
-    result.then(
-      run_query(connection, sql, arguments)
-      |> result.map_error(construct_error(connection, _)),
-    )
+  use rows <- result.then(run_query(connection, sql, arguments))
   use rows <-
     result.then(
       list.try_map(over: rows, with: decoder)
@@ -424,39 +394,81 @@ pub fn query(
   Ok(rows)
 }
 
-external fn run_query(
-  Connection,
-  String,
-  List(Value),
-) -> Result(List(Dynamic), Int) =
-  "sqlight_ffi" "query"
+if erlang {
+  external fn run_query(
+    Connection,
+    String,
+    List(Value),
+  ) -> Result(List(Dynamic), Error) =
+    "sqlight_ffi" "query"
+}
+
+if javascript {
+  external fn run_query(
+    Connection,
+    String,
+    List(Value),
+  ) -> Result(List(Dynamic), Error) =
+    "./sqlight_ffi.js" "query"
+}
+
+if erlang {
+  external fn coerce_value(a) -> Value =
+    "sqlight_ffi" "coerce_value"
+}
 
-external fn run_exec(Connection, String) -> Result(Nil, Int) =
-  "sqlight_ffi" "exec"
+if javascript {
+  external fn coerce_value(a) -> Value =
+    "./sqlight_ffi.js" "coerce_value"
+}
+
+if erlang {
+  external fn exec_(String, Connection) -> Result(Nil, Error) =
+    "sqlight_ffi" "exec"
+}
+
+if javascript {
+  external fn exec_(String, Connection) -> Result(Nil, Error) =
+    "./sqlight_ffi.js" "exec"
+}
 
 /// Convert a Gleam `Int` to an SQLite int, to be used an argument to a
 /// query.
 ///
-pub external fn int(Int) -> Value =
-  "sqlight_ffi" "coerce_value"
+pub fn int(value: Int) -> Value {
+  coerce_value(value)
+}
 
 /// Convert a Gleam `Float` to an SQLite float, to be used an argument to a
 /// query.
 ///
-pub external fn float(Float) -> Value =
-  "sqlight_ffi" "coerce_value"
+pub fn float(value: Float) -> Value {
+  coerce_value(value)
+}
 
 /// Convert a Gleam `String` to an SQLite text, to be used an argument to a
 /// query.
 ///
-pub external fn text(String) -> Value =
-  "sqlight_ffi" "coerce_value"
+pub fn text(value: String) -> Value {
+  coerce_value(value)
+}
 
 /// Convert a Gleam `BitString` to an SQLite blob, to be used an argument to a
 /// query.
 ///
-pub external fn blob(BitString) -> Value =
-  "sqlight_ffi" "coerce_value"
+pub fn blob(value: BitString) -> Value {
+  coerce_blob(value)
+}
+
+if erlang {
+  external fn coerce_blob(BitString) -> Value =
+    "sqlight_ffi" "coerce_value"
+}
+
+if javascript {
+  external fn coerce_blob(BitString) -> Value =
+    "./sqlight_ffi.js" "coerce_blob"
+}
 
 /// Convert a Gleam `Bool` to an SQLite int, to be used an argument to a
 /// query.
@@ -473,10 +485,19 @@ pub fn bool(value: Bool) -> Value {
   })
 }
 
-/// Construct an SQLite null, to be used an argument to a query.
-///
-pub external fn null() -> Value =
-  "sqlight_ffi" "null"
+if erlang {
+  /// Construct an SQLite null, to be used an argument to a query.
+  ///
+  pub external fn null() -> Value =
+    "sqlight_ffi" "null"
+}
+
+if javascript {
+  /// Construct an SQLite null, to be used an argument to a query.
+  ///
+  pub external fn null() -> Value =
+    "./sqlight_ffi.js" "null_"
+}
 
 pub fn decode_bool(value: Dynamic) -> Result(Bool, List(dynamic.DecodeError)) {
   case dynamic.int(value) {
@@ -486,20 +507,6 @@ pub fn decode_bool(value: Dynamic) -> Result(Bool, List(dynamic.DecodeError)) {
   }
 }
 
-/// Return a description of the last occurred error.
-///
-external fn error_info(Connection) -> #(String, Int) =
-  "sqlight_ffi" "error_info"
-
-fn construct_error(connection: Connection, error_code: Int) -> Error {
-  let #(message, offset) = error_info(connection)
-  SqlightError(
-    code: error_code_from_int(error_code),
-    message: message,
-    offset: offset,
-  )
-}
-
 fn decode_error(errors: List(dynamic.DecodeError)) -> Error {
   assert [dynamic.DecodeError(expected, actual, path), ..] = errors
   let path = string.join(path, ".")

src/sqlight_ffi.erl

@@ -1,28 +1,36 @@
 -module(sqlight_ffi).
 
 -export([
-    normalise_result/1, status/0, query/3, exec/2, coerce_value/1, null/0,
-    error_info/1
+    status/0, query/3, exec/2, coerce_value/1, null/0, open/1, close/1
 ]).
 
+open(Name) ->
+    case esqlite3:open(unicode:characters_to_list(Name)) of
+        {ok, Connection} -> {ok, Connection};
+        {error, Code} -> 
+            Code1 = sqlight:error_code_from_int(Code),
+            {error, {sqlight_error, Code1, <<>>, -1}}
+    end.
+
+close(Connection) ->
+    case esqlite3:close(Connection) of
+        ok -> {ok, nil};
+        {error, Code} -> to_error(Connection, Code)
+    end.
+
 query(Sql, Connection, Arguments) ->
     case esqlite3:q(Sql, Connection, Arguments) of
-        {error, Code} when is_integer(Code) -> {error, Code};
+        {error, Code} -> 
+            to_error(Connection, Code);
         Rows -> {ok, lists:map(fun erlang:list_to_tuple/1, Rows)}
     end.
 
 exec(Sql, Connection) ->
-    case esqlite3:exec(Sql, Connection) of
-        {error, Code} when is_integer(Code) -> {error, Code};
+    case esqlite3:exec(Connection, Sql) of
+        {error, Code} -> to_error(Connection, Code);
         ok -> {ok, nil}
     end.
 
-normalise_result(Result) ->
-    case Result of
-        ok -> {ok, nil};
-        {error, Code} when is_integer(Code) -> {error, Code}
-    end.
-
 stats(#{used := Used, highwater := Highwater}) ->
     {stats, Used, Highwater}.
 
@@ -49,6 +57,9 @@ status() ->
 coerce_value(X) -> X.
 null() -> undefined.
 
-error_info(Connection) ->
+to_error(Connection = {esqlite3, _}, Code) when is_integer(Code) ->
     #{errmsg := Message, error_offset := Offset} = esqlite3:error_info(Connection),
-    {Message, Offset}.
+    Error = {sqlight_error, sqlight:error_code_from_int(Code), Message, Offset},
+    {error, Error};
+to_error(Connection, Code) ->
+    erlang:throw({fail, Connection, Code}).