chore: prepare v1.2.19

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-csv-stream",
-  "version": "v1.2.16",
+  "version": "v1.2.19",
   "dependencies": {
     "csv-parse": "^5.5.5",
     "csv-stringify": "^6.4.6"

spago.lock

@@ -16,7 +16,6 @@ workspace:
         - foreign: ">=7.0.0 <8.0.0"
         - foreign-object: ">=4.1.0 <5.0.0"
         - integers: ">=6.0.0 <7.0.0"
-        - js-timers
         - lists: ">=7.0.0 <8.0.0"
         - maybe: ">=6.0.0 <7.0.0"
         - newtype: ">=5.0.0 <6.0.0"
@@ -35,7 +34,6 @@ workspace:
         - tailrec: ">=6.1.0 <7.0.0"
         - transformers: ">=6.0.0 <7.0.0"
         - typelevel-prelude: ">=7.0.0 <8.0.0"
-        - unlift: ">=1.0.1 <2.0.0"
         - unsafe-coerce: ">=6.0.0 <7.0.0"
       test_dependencies:
         - console
@@ -44,7 +42,6 @@ workspace:
         - arraybuffer-types
         - arrays
         - bifunctors
-        - catenable-lists
         - console
         - const
         - contravariant
@@ -63,8 +60,6 @@ workspace:
         - foreign
         - foreign-object
         - formatters
-        - free
-        - freet
         - functions
         - functors
         - gen
@@ -72,11 +67,9 @@ workspace:
         - integers
         - invariant
         - js-date
-        - js-timers
         - lazy
         - lists
         - maybe
-        - monad-control
         - newtype
         - node-buffer
         - node-event-emitter
@@ -106,7 +99,6 @@ workspace:
         - typelevel-prelude
         - unfoldable
         - unicode
-        - unlift
         - unsafe-coerce
   extra_packages: {}
 packages:
@@ -166,18 +158,6 @@ packages:
       - newtype
       - prelude
       - tuples
-  catenable-lists:
-    type: registry
-    version: 7.0.0
-    integrity: sha256-76vYENhwF4BWTBsjeLuErCH2jqVT4M3R1HX+4RwSftA=
-    dependencies:
-      - control
-      - foldable-traversable
-      - lists
-      - maybe
-      - prelude
-      - tuples
-      - unfoldable
   console:
     type: registry
     version: 6.1.0
@@ -371,40 +351,6 @@ packages:
       - parsing
       - prelude
       - transformers
-  free:
-    type: registry
-    version: 7.1.0
-    integrity: sha256-JAumgEsGSzJCNLD8AaFvuX7CpqS5yruCngi6yI7+V5k=
-    dependencies:
-      - catenable-lists
-      - control
-      - distributive
-      - either
-      - exists
-      - foldable-traversable
-      - invariant
-      - lazy
-      - maybe
-      - prelude
-      - tailrec
-      - transformers
-      - tuples
-      - unsafe-coerce
-  freet:
-    type: registry
-    version: 7.0.0
-    integrity: sha256-zkL6wU4ZPq8xz1kGFxoliWqyhBksepMJTyA68VEBaJo=
-    dependencies:
-      - aff
-      - bifunctors
-      - effect
-      - either
-      - exists
-      - free
-      - prelude
-      - tailrec
-      - transformers
-      - tuples
   functions:
     type: registry
     version: 6.0.0
@@ -479,12 +425,6 @@ packages:
       - foreign
       - integers
       - now
-  js-timers:
-    type: registry
-    version: 6.1.0
-    integrity: sha256-znHWLSSOYw15P5DTcsAdal2lf7nGA2yayLdOZ2t5r7o=
-    dependencies:
-      - effect
   lazy:
     type: registry
     version: 6.0.0
@@ -520,15 +460,6 @@ packages:
       - invariant
       - newtype
       - prelude
-  monad-control:
-    type: registry
-    version: 5.0.0
-    integrity: sha256-bgfDW30wbIm70NR1Tvvh9P+VFQMDh1wK2sSJXCj/dZc=
-    dependencies:
-      - aff
-      - freet
-      - identity
-      - lists
   newtype:
     type: registry
     version: 5.0.0
@@ -852,23 +783,6 @@ packages:
       - foldable-traversable
       - maybe
       - strings
-  unlift:
-    type: registry
-    version: 1.0.1
-    integrity: sha256-nbBCVV0fZz/3UHKoW11dcTwBYmQOIgK31ht2BN47RPw=
-    dependencies:
-      - aff
-      - effect
-      - either
-      - freet
-      - identity
-      - lists
-      - maybe
-      - monad-control
-      - prelude
-      - st
-      - transformers
-      - tuples
   unsafe-coerce:
     type: registry
     version: 6.0.0

spago.yaml

@@ -1,7 +1,7 @@
 package:
   name: csv-stream
   publish:
-    version: '1.2.16'
+    version: '1.2.19'
     license: 'GPL-3.0-or-later'
     location:
       githubOwner: 'cakekindel'
@@ -10,7 +10,6 @@ package:
     strict: true
     pedanticPackages: true
   dependencies:
-    - js-timers
     - aff: ">=7.1.0 <8.0.0"
     - arrays: ">=7.3.0 <8.0.0"
     - bifunctors: ">=6.0.0 <7.0.0"
@@ -42,7 +41,6 @@ package:
     - tailrec: ">=6.1.0 <7.0.0"
     - transformers: ">=6.0.0 <7.0.0"
     - typelevel-prelude: ">=7.0.0 <8.0.0"
-    - unlift: ">=1.0.1 <2.0.0"
     - unsafe-coerce: ">=6.0.0 <7.0.0"
   test:
     main: Test.Main

src/Node.Stream.CSV.Parse.purs

@@ -7,7 +7,10 @@ import Control.Monad.Error.Class (liftEither, liftMaybe)
 import Control.Monad.Except (runExcept)
 import Control.Monad.Except.Trans (catchError)
 import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT)
+import Control.Monad.Rec.Class (untilJust)
 import Control.Monad.ST.Class (liftST)
+import Control.Monad.ST.Global as ST
+import Control.Monad.ST.Ref as STRef
 import Control.Monad.Trans.Class (lift)
 import Data.Array as Array
 import Data.Array.ST as Array.ST
@@ -18,14 +21,14 @@ import Data.Filterable (filter)
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), isNothing)
+import Data.Newtype (wrap)
 import Data.Nullable (Nullable)
 import Data.Nullable as Nullable
 import Effect (Effect)
-import Effect.Aff (Canceler(..), makeAff)
+import Effect.Aff (Canceler(..), delay, launchAff_, makeAff)
 import Effect.Aff.Class (class MonadAff, liftAff)
 import Effect.Class (liftEffect)
 import Effect.Exception (error)
-import Effect.Timer (setTimeout)
 import Effect.Uncurried (mkEffectFn1)
 import Foreign (Foreign, unsafeToForeign)
 import Foreign.Object (Object)
@@ -122,17 +125,24 @@ foreach stream cb = do
         pure $ Canceler $ const $ liftEffect stop
 
   liftAff $ makeAff \res -> do
+    count <- ST.toEffect $ STRef.new 0
     removeDataListener <- flip (Event.on dataH) stream \row ->
       void
-        $ setTimeout 0
         $ flip catchError (res <<< Left)
         $ do
+            void $ ST.toEffect $ STRef.modify (_ + 1) count
             cols <- liftMaybe (error "unreachable") =<< getOrInitColumnsMap stream
             record <- liftEither $ lmap (error <<< show) $ runExcept $ readCSVRecord @r @rl cols row
             flip catchError (liftEffect <<< res <<< Left) (cb record)
+            void $ ST.toEffect $ STRef.modify (_ - 1) count
 
-    removeEndListener <- flip (Event.once Stream.endH) stream (res $ Right unit)
     removeErrorListener <- flip (Event.once Stream.errorH) stream (res <<< Left)
+    removeEndListener <- flip (Event.once Stream.endH) stream $ launchAff_ do
+      untilJust do
+        delay $ wrap 10.0
+        ct <- liftEffect $ ST.toEffect $ STRef.read count
+        pure $ if ct <= 1 then Just unit else Nothing
+      liftEffect $ res $ Right unit
 
     pure $ Canceler $ const $ liftEffect do
       removeDataListener