aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/library
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/source/library/lux/data/text/buffer.lux28
-rw-r--r--stdlib/source/library/lux/ffi.js.lux57
-rw-r--r--stdlib/source/library/lux/world/file.lux195
3 files changed, 188 insertions, 92 deletions
diff --git a/stdlib/source/library/lux/data/text/buffer.lux b/stdlib/source/library/lux/data/text/buffer.lux
index 5766d25ef..166f87a3b 100644
--- a/stdlib/source/library/lux/data/text/buffer.lux
+++ b/stdlib/source/library/lux/data/text/buffer.lux
@@ -1,8 +1,8 @@
(.module:
[library
[lux #*
- [ffi (#+ import:)]
["@" target]
+ ["." ffi (#+ import:)]
[control
["." function]]
[data
@@ -36,6 +36,10 @@
(toString [] java/lang/String)]))]
(`` (for {@.old (as_is <jvm>)
@.jvm (as_is <jvm>)
+ @.js (as_is (import: (JS_Array a)
+ ["#::."
+ (push [a] a)
+ (join [Text] Text)]))
@.lua (as_is (import: (table/concat [(array.Array Text) Text] Text))
##https://www.lua.org/manual/5.3/manual.html#pdf-table.concat
(import: (table/insert [(array.Array Text) Text] #? Nothing))
@@ -46,6 +50,7 @@
(`` (abstract: #export Buffer
(for {@.old [Nat (-> java/lang/StringBuilder java/lang/StringBuilder)]
@.jvm [Nat (-> java/lang/StringBuilder java/lang/StringBuilder)]
+ @.js [Nat (-> (JS_Array Text) (JS_Array Text))]
@.lua [Nat (-> (array.Array Text) (array.Array Text))]}
## default
(Row Text))
@@ -57,6 +62,7 @@
(:abstraction (with_expansions [<jvm> [0 function.identity]]
(for {@.old <jvm>
@.jvm <jvm>
+ @.js [0 function.identity]
@.lua [0 function.identity]}
## default
row.empty))))
@@ -74,14 +80,22 @@
(|>> transform (append! chunk))]))]
(for {@.old <jvm>
@.jvm <jvm>
+ @.js (let [[capacity transform] (:representation buffer)
+ append! (: (-> (JS_Array Text) (JS_Array Text))
+ (function (_ array)
+ (exec
+ (JS_Array::push [chunk] array)
+ array)))]
+ (:abstraction [(n.+ (//.size chunk) capacity)
+ (|>> transform append!)]))
@.lua (let [[capacity transform] (:representation buffer)
- append! (: (-> Text (array.Array Text) (array.Array Text))
- (function (_ chunk array)
+ append! (: (-> (array.Array Text) (array.Array Text))
+ (function (_ array)
(exec
(table/insert [array chunk])
array)))]
(:abstraction [(n.+ (//.size chunk) capacity)
- (|>> transform (append! chunk))]))}
+ (|>> transform append!)]))}
## default
(|> buffer :representation (row.add chunk) :abstraction))))
@@ -90,6 +104,7 @@
(with_expansions [<jvm> (|>> :representation product.left)]
(for {@.old <jvm>
@.jvm <jvm>
+ @.js <jvm>
@.lua <jvm>}
## default
(|>> :representation
@@ -105,6 +120,11 @@
java/lang/StringBuilder::toString))]
(for {@.old <jvm>
@.jvm <jvm>
+ @.js (let [[capacity transform] (:representation buffer)]
+ (|> (array.new 0)
+ (:as (JS_Array Text))
+ transform
+ (JS_Array::join [""])))
@.lua (let [[capacity transform] (:representation buffer)]
(table/concat [(transform (array.new 0)) ""]))}
## default
diff --git a/stdlib/source/library/lux/ffi.js.lux b/stdlib/source/library/lux/ffi.js.lux
index aae11fc1d..8d092aa02 100644
--- a/stdlib/source/library/lux/ffi.js.lux
+++ b/stdlib/source/library/lux/ffi.js.lux
@@ -6,7 +6,7 @@
[monad (#+ do)]]
[control
["." io]
- ["<>" parser
+ ["<>" parser ("#\." monad)
["<.>" code (#+ Parser)]]]
[data
["." product]
@@ -149,6 +149,14 @@
("js object null")))
input))
+(def: #export (null _)
+ (-> Any Nothing)
+ (:assume ("js object null")))
+
+(def: #export null?
+ (-> Any Bit)
+ (|>> "js object null?"))
+
(def: (without_null g!temp [nullable? outputT] output)
(-> Code Nullable Code Code)
(if nullable?
@@ -161,13 +169,23 @@
(~ g!temp)
(.error! "Null is an invalid value."))))))
+(type: Class_Declaration
+ [Text (List Text)])
+
(type: Import
- (#Class [Text Text (List Member)])
+ (#Class [Class_Declaration Text (List Member)])
(#Function Static_Method))
+(def: class_declaration
+ (Parser Class_Declaration)
+ (<>.either (<>.and <code>.local_identifier
+ (<>\wrap (list)))
+ (<code>.form (<>.and <code>.local_identifier
+ (<>.some <code>.local_identifier)))))
+
(def: import
(Parser Import)
- (<>.or (<>.and <code>.local_identifier
+ (<>.or (<>.and ..class_declaration
(<>.default ["" (list)]
(<code>.tuple (<>.and <code>.text
(<>.some member)))))
@@ -217,17 +235,19 @@
(syntax: #export (import: {import ..import})
(with_gensyms [g!temp]
(case import
- (#Class [class format members])
+ (#Class [[class_name class_parameters] format members])
(with_gensyms [g!object]
(let [qualify (: (-> Text Code)
(function (_ member_name)
(|> format
- (text.replace_all "#" class)
+ (text.replace_all "#" class_name)
(text.replace_all "." member_name)
code.local_identifier)))
- g!type (code.local_identifier class)
- real_class (text.replace_all "/" "." class)]
- (wrap (list& (` (type: (~ g!type)
+ class_parameters (list\map code.local_identifier class_parameters)
+ declaration (` ((~ (code.local_identifier class_name))
+ (~+ class_parameters)))
+ real_class (text.replace_all "/" "." class_name)]
+ (wrap (list& (` (type: (~ declaration)
(..Object (primitive (~ (code.text real_class))))))
(list\map (function (_ member)
(case member
@@ -235,8 +255,9 @@
(let [g!inputs (input_variables inputsT)]
(` (def: ((~ (qualify "new"))
[(~+ (list\map product.right g!inputs))])
- (-> [(~+ (list\map nullable_type inputsT))]
- (~ g!type))
+ (All [(~+ class_parameters)]
+ (-> [(~+ (list\map nullable_type inputsT))]
+ (~ declaration)))
(:assume
("js object new"
("js constant" (~ (code.text real_class)))
@@ -250,8 +271,9 @@
("js constant" (~ (code.text (%.format real_class "." field))))))))))
(` (def: ((~ (qualify field))
(~ g!object))
- (-> (~ g!type)
- (~ (nullable_type fieldT)))
+ (All [(~+ class_parameters)]
+ (-> (~ declaration)
+ (~ (nullable_type fieldT))))
(:assume
(~ (without_null g!temp fieldT (` ("js object get" (~ (code.text field)) (~ g!object)))))))))
@@ -271,11 +293,12 @@
(` (def: ((~ (qualify (maybe.default method alias)))
[(~+ (list\map product.right g!inputs))]
(~ g!object))
- (-> [(~+ (list\map nullable_type inputsT))]
- (~ g!type)
- (~ (|> (nullable_type outputT)
- (try_type try?)
- (io_type io?))))
+ (All [(~+ class_parameters)]
+ (-> [(~+ (list\map nullable_type inputsT))]
+ (~ declaration)
+ (~ (|> (nullable_type outputT)
+ (try_type try?)
+ (io_type io?)))))
(:assume
(~ (<| (with_io io?)
(with_try try?)
diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux
index 3a7b4463d..d59faa1c1 100644
--- a/stdlib/source/library/lux/world/file.lux
+++ b/stdlib/source/library/lux/world/file.lux
@@ -307,8 +307,8 @@
["#::."
(size ffi.Number)
(mtimeMs ffi.Number)
- (isFile [] #io #try ffi.Boolean)
- (isDirectory [] #io #try ffi.Boolean)])
+ (isFile [] ffi.Boolean)
+ (isDirectory [] ffi.Boolean)])
(ffi.import: FsConstants
["#::."
@@ -316,21 +316,51 @@
(R_OK ffi.Number)
(W_OK ffi.Number)
(X_OK ffi.Number)])
+
+ (ffi.import: Error
+ ["#::."
+ (toString [] ffi.String)])
+
+ (template: (with_promise <write> <type> <body>)
+ (template.with_locals [<read>]
+ (let [[<read> <write>] (: [(Promise <type>) (promise.Resolver <type>)]
+ (promise.promise []))]
+ (exec
+ <body>
+ <read>))))
(ffi.import: Fs
["#::."
(constants FsConstants)
- (readFileSync [ffi.String] #io #try Binary)
- (appendFileSync [ffi.String Buffer] #io #try Any)
- (writeFileSync [ffi.String Buffer] #io #try Any)
- (statSync [ffi.String] #io #try Stats)
- (accessSync [ffi.String ffi.Number] #io #try Any)
- (renameSync [ffi.String ffi.String] #io #try Any)
- (utimesSync [ffi.String ffi.Number ffi.Number] #io #try Any)
- (unlinkSync [ffi.String] #io #try Any)
- (readdirSync [ffi.String] #io #try (Array ffi.String))
- (mkdirSync [ffi.String] #io #try Any)
- (rmdirSync [ffi.String] #io #try Any)])
+ (readFile [ffi.String ffi.Function] Any)
+ (appendFile [ffi.String Buffer ffi.Function] Any)
+ (writeFile [ffi.String Buffer ffi.Function] Any)
+ (stat [ffi.String ffi.Function] Any)
+ (access [ffi.String ffi.Number ffi.Function] Any)
+ (rename [ffi.String ffi.String ffi.Function] Any)
+ (utimes [ffi.String ffi.Number ffi.Number ffi.Function] Any)
+ (readdir [ffi.String ffi.Function] Any)
+ (mkdir [ffi.String ffi.Function] Any)
+ (unlink [ffi.String ffi.Function] Any)
+ (rmdir [ffi.String ffi.Function] Any)])
+
+ (def: (any_callback write!)
+ (-> (promise.Resolver (Try Any)) ffi.Function)
+ (<| (ffi.closure [error])
+ io.run
+ write!
+ (if (ffi.null? error)
+ (#try.Success [])
+ (#try.Failure (Error::toString [] (:as Error error))))))
+
+ (def: (value_callback write!)
+ (All [a] (-> (promise.Resolver (Try a)) ffi.Function))
+ (<| (ffi.closure [error datum])
+ io.run
+ write!
+ (if (ffi.null? error)
+ (#try.Success (:assume datum))
+ (#try.Failure (Error::toString [] (:as Error error))))))
(ffi.import: JsPath
["#::."
@@ -372,51 +402,57 @@
"/"))
(`` (implementation: #export default
- (System IO)
+ (System Promise)
(def: separator
..js_separator)
(~~ (template [<name> <method>]
[(def: (<name> path)
- (do {! io.monad}
- [?stats (Fs::statSync [path] (..node_fs []))]
- (case ?stats
- (#try.Success stats)
- (|> stats
- (<method> [])
- (\ ! map (|>> (try.default false))))
-
- (#try.Failure _)
- (wrap false))))]
+ (do promise.monad
+ [?stats (with_promise write! (Try Stats)
+ (Fs::stat [path (..value_callback write!)]
+ (..node_fs [])))]
+ (wrap (case ?stats
+ (#try.Success stats)
+ (<method> [] stats)
+
+ (#try.Failure _)
+ false))))]
[file? Stats::isFile]
[directory? Stats::isDirectory]
))
(def: (make_directory path)
- (let [node_fs (..node_fs [])]
- (do io.monad
- [outcome (Fs::accessSync [path (|> node_fs Fs::constants FsConstants::F_OK)] node_fs)]
- (case outcome
- (#try.Success _)
- (wrap (exception.throw ..cannot_make_directory [path]))
-
- (#try.Failure _)
- (Fs::mkdirSync [path] node_fs)))))
+ (do promise.monad
+ [#let [node_fs (..node_fs [])]
+ outcome (with_promise write! (Try Any)
+ (Fs::access [path
+ (|> node_fs Fs::constants FsConstants::F_OK)
+ (..any_callback write!)]
+ node_fs))]
+ (case outcome
+ (#try.Success _)
+ (wrap (exception.throw ..cannot_make_directory [path]))
+
+ (#try.Failure _)
+ (with_promise write! (Try Any)
+ (Fs::mkdir [path (..any_callback write!)] node_fs)))))
(~~ (template [<name> <method>]
[(def: (<name> path)
- (do {! (try.with io.monad)}
+ (do {! (try.with promise.monad)}
[#let [node_fs (..node_fs [])]
- subs (Fs::readdirSync [path] node_fs)]
+ subs (with_promise write! (Try (Array ffi.String))
+ (Fs::readdir [path (..value_callback write!)] node_fs))]
(|> subs
array.to_list
(list\map (|>> (format path ..js_separator)))
(monad.map ! (function (_ sub)
- (do !
- [stats (Fs::statSync [sub] node_fs)]
- (\ ! map (|>> [sub]) (<method> [] stats)))))
+ (\ ! map (|>> (<method> []) [sub])
+ (with_promise write! (Try Stats)
+ (Fs::stat [sub (..value_callback write!)] node_fs)))))
(\ ! map (|>> (list.filter product.right)
(list\map product.left))))))]
@@ -425,58 +461,75 @@
))
(def: (file_size path)
- (let [! (try.with io.monad)]
- (|> (..node_fs [])
- (Fs::statSync [path])
- (\ ! map (|>> Stats::size
- f.nat)))))
+ (do (try.with promise.monad)
+ [stats (with_promise write! (Try Stats)
+ (Fs::stat [path (..value_callback write!)]
+ (..node_fs [])))]
+ (wrap (|> stats
+ Stats::size
+ f.nat))))
(def: (last_modified path)
- (let [! (try.with io.monad)]
- (|> (..node_fs [])
- (Fs::statSync [path])
- (\ ! map (|>> Stats::mtimeMs
- f.int
- duration.from_millis
- instant.absolute)))))
+ (do (try.with promise.monad)
+ [stats (with_promise write! (Try Stats)
+ (Fs::stat [path (..value_callback write!)]
+ (..node_fs [])))]
+ (wrap (|> stats
+ Stats::mtimeMs
+ f.int
+ duration.from_millis
+ instant.absolute))))
(def: (can_execute? path)
(let [node_fs (..node_fs [])]
- (|> node_fs
- (Fs::accessSync [path (|> node_fs Fs::constants FsConstants::X_OK)])
- (io\map (|>> (case> (#try.Success _)
- true
-
- (#try.Failure _)
- false)
- #try.Success)))))
+ (\ promise.monad map
+ (|>> (case> (#try.Success _)
+ true
+
+ (#try.Failure _)
+ false)
+ #try.Success)
+ (with_promise write! (Try Any)
+ (Fs::access [path
+ (|> node_fs Fs::constants FsConstants::X_OK)
+ (..any_callback write!)]
+ node_fs)))))
(def: (read path)
- (Fs::readFileSync [path] (..node_fs [])))
+ (with_promise write! (Try Binary)
+ (Fs::readFile [path (..value_callback write!)]
+ (..node_fs []))))
(def: (delete path)
- (do {! (try.with io.monad)}
+ (do (try.with promise.monad)
[#let [node_fs (..node_fs [])]
- stats (Fs::statSync [path] node_fs)
- verdict (Stats::isFile [] stats)]
- (if verdict
- (Fs::unlinkSync [path] node_fs)
- (Fs::rmdirSync [path] node_fs))))
+ stats (with_promise write! (Try Stats)
+ (Fs::stat [path (..value_callback write!)] node_fs))]
+ (with_promise write! (Try Any)
+ (if (Stats::isFile [] stats)
+ (Fs::unlink [path (..any_callback write!)] node_fs)
+ (Fs::rmdir [path (..any_callback write!)] node_fs)))))
(def: (modify time_stamp path)
- (let [when (|> time_stamp instant.relative duration.to_millis i.frac)]
- (Fs::utimesSync [path when when] (..node_fs []))))
+ (with_promise write! (Try Any)
+ (let [when (|> time_stamp instant.relative duration.to_millis i.frac)]
+ (Fs::utimes [path when when (..any_callback write!)]
+ (..node_fs [])))))
(~~ (template [<name> <method>]
[(def: (<name> data path)
- (<method> [path (Buffer::from data)] (..node_fs [])))]
+ (with_promise write! (Try Any)
+ (<method> [path (Buffer::from data) (..any_callback write!)]
+ (..node_fs []))))]
- [write Fs::writeFileSync]
- [append Fs::appendFileSync]
+ [write Fs::writeFile]
+ [append Fs::appendFile]
))
(def: (move destination origin)
- (Fs::renameSync [origin destination] (..node_fs [])))
+ (with_promise write! (Try Any)
+ (Fs::rename [origin destination (..any_callback write!)]
+ (..node_fs []))))
)))
@.python
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:40:48 +0000