git.iko.soy/purescript-indexed-DB
on ef6b649 help sign in
29 files changed+1856−1776
since splitsnapshots
unifiedsplit
.gitignore−2 bower.json+44 deploy.sh+6 index.js−4 karma.browserstack.conf.js+91 karma.conf.js+25 package.json+37−10 packages.dhall−105 spago.dhall−42 src/Database/IndexedDB/Core.js+6−6 src/Database/IndexedDB/Core.purs+74−21 src/Database/IndexedDB/IDBCursor.js+10−10 src/Database/IndexedDB/IDBCursor.purs+85−75 src/Database/IndexedDB/IDBDatabase.js+11−11 src/Database/IndexedDB/IDBDatabase.purs+98−73 src/Database/IndexedDB/IDBFactory.js+2−2 src/Database/IndexedDB/IDBFactory.purs+33−22 src/Database/IndexedDB/IDBIndex.js+12−12 src/Database/IndexedDB/IDBIndex.purs+96−78 src/Database/IndexedDB/IDBKey/Internal.js+3−3 src/Database/IndexedDB/IDBKey/Internal.purs+106−90 src/Database/IndexedDB/IDBKeyRange.js+9−9 src/Database/IndexedDB/IDBKeyRange.purs+42−30 src/Database/IndexedDB/IDBObjectStore.js+12−12 src/Database/IndexedDB/IDBObjectStore.purs+76−58 src/Database/IndexedDB/IDBTransaction.js+9−9 src/Database/IndexedDB/IDBTransaction.purs+59−40 test/Main.purs+910−971 yarn.lock−81
.gitignore−2
@@ -77,5 +77,3 @@ releases
7777.purs*
7878.psa*
7979dist
80−.spago
81−test.js
bower.jsonnew file+44
@@ -0,0 +1,44 @@
1+{
2+ "name": "purescript-indexeddb",
3+ "description": "An API wrapper around IndexedDB",
4+ "version": "4.0.0",
5+ "authors": [
6+ "Matthias Benkort <matthias.benkort@gmail.com>"
7+ ],
8+ "ignore": [
9+ "**/.*",
10+ "node_modules",
11+ "bower_components",
12+ "output",
13+ "test",
14+ "dist",
15+ "releases",
16+ "package.json",
17+ "karma.conf.js",
18+ "karma.browserstack.conf.js",
19+ "deploy.sh"
20+ ],
21+ "license": "MIT",
22+ "homepage": "https://github.com/truqu/purescript-indexedDB",
23+ "repository": {
24+ "type": "git",
25+ "url": "git://github.com/truqu/purescript-indexedDB.git"
26+ },
27+ "dependencies": {
28+ "purescript-aff": "^4.0.2",
29+ "purescript-datetime": "^3.2.0",
30+ "purescript-eff": "^3.1.0",
31+ "purescript-exceptions": "^3.0.0",
32+ "purescript-foreign": "^4.0.1",
33+ "purescript-maybe": "^3.0.0",
34+ "purescript-nullable": "^3.0.0",
35+ "purescript-prelude": "^3.1.0",
36+ "purescript-read": "^1.0.0"
37+ },
38+ "devDependencies": {
39+ "purescript-now": "^3.0.0",
40+ "purescript-psci-support": "^3.0.0",
41+ "purescript-spec": "^2.0.0",
42+ "purescript-spec-mocha": "^2.0.0"
43+ }
44+}
deploy.shnew file+6
@@ -0,0 +1,6 @@
1+#!/bin/sh
2+
3+git stash save
4+git clean -df
5+yes | pulp publish --no-push
6+git stash pop
index.jsdeleted−4
@@ -1,4 +0,0 @@
1−import "fake-indexeddb/auto";
2−import * as Main from './output/Test.Main/index.js';
3−
4−Main.main();
karma.browserstack.conf.jsnew file+91
@@ -0,0 +1,91 @@
1+module.exports = (config) => {
2+ config.set({
3+ browsers: [
4+ 'FirefoxMAC',
5+ 'ChromeMAC',
6+ // 'SafariMAC',
7+ 'OperaMAC',
8+
9+ 'FirefoxWIN',
10+ 'ChromeWIN',
11+ 'OperaWIN',
12+ ],
13+ files: [
14+ 'dist/karma/index.js',
15+ ],
16+ frameworks: [
17+ 'mocha',
18+ ],
19+ plugins: [
20+ 'karma-browserstack-launcher',
21+ 'karma-mocha',
22+ ],
23+ reporters: [
24+ 'dots',
25+ 'BrowserStack',
26+ ],
27+ singleRun: true,
28+ client: {
29+ mocha: {
30+ timeout: 10000,
31+ },
32+ },
33+ browserStack: {
34+ username: process.env.BROWSERSTACK_USERNAME,
35+ accessKey: process.env.BROWSERSTACK_ACCESSKEY,
36+ timeout: 1500,
37+ captureTimeout: 500,
38+ },
39+ customLaunchers: {
40+ FirefoxMAC: {
41+ base: 'BrowserStack',
42+ browser: 'Firefox',
43+ browser_version: '51',
44+ os: 'OS X',
45+ os_version: 'Sierra',
46+ },
47+ ChromeMAC: {
48+ base: 'BrowserStack',
49+ browser: 'Chrome',
50+ browser_version: '58',
51+ os: 'OS X',
52+ os_version: 'Sierra',
53+ },
54+ SafariMAC: {
55+ base: 'BrowserStack',
56+ browser: 'Safari',
57+ browser_version: '10.1',
58+ os: 'OS X',
59+ os_version: 'Sierra',
60+ },
61+ OperaMAC: {
62+ base: 'BrowserStack',
63+ browser: 'Opera',
64+ browser_version: '46',
65+ os: 'OS X',
66+ os_version: 'Sierra',
67+ },
68+ FirefoxWIN: {
69+ base: 'BrowserStack',
70+ browser: 'Firefox',
71+ browser_version: '51',
72+ os: 'WINDOWS',
73+ os_version: '10',
74+ },
75+ ChromeWIN: {
76+ base: 'BrowserStack',
77+ browser: 'Chrome',
78+ browser_version: '58',
79+ os: 'WINDOWS',
80+ os_version: '10',
81+ },
82+ OperaWIN: {
83+ base: 'BrowserStack',
84+ browser: 'Opera',
85+ browser_version: '46',
86+ os: 'WINDOWS',
87+ os_version: '10',
88+ },
89+ },
90+ });
91+};
karma.conf.jsnew file+25
@@ -0,0 +1,25 @@
1+module.exports = config => {
2+ config.set({
3+ autoWatch: true,
4+ singleRun: true,
5+ browsers: ["Chrome", "Firefox"],
6+ files: [
7+ "dist/karma/index.js",
8+ ],
9+ frameworks: [
10+ "mocha",
11+ ],
12+ plugins: [
13+ "karma-chrome-launcher",
14+ "karma-firefox-launcher",
15+ "karma-spec-reporter",
16+ "karma-mocha",
17+ ],
18+ reporters: ["spec"],
19+ client: {
20+ mocha: {
21+ timeout: 10000
22+ }
23+ }
24+ });
25+};
package.json+37−10
@@ -1,15 +1,42 @@
11{
2− "name": "purescript-indexed-DB",
3− "version": "1.0.0",
4− "main": "index.js",
5− "repository": "https://github.com/ilyakooo0/purescript-indexed-DB.git",
6− "author": "iko <mail@iko.soy>",
7− "license": "MIT",
2+ "name": "purescript-indexeddb",
3+ "version": "3.0.0",
4+ "description": "A wrapper around the IndexedDB API",
85 "scripts": {
9− "test": "spago build && node index.js"
6+ "prepare:release": "mkdir -p releases/github && cp -r README.md LICENSE src bower.json releases/github",
7+ "test:build": "mkdir -p dist/karma && pulp browserify -j 4 --main \"Test.Main\" -I test --to dist/karma/index.js",
8+ "test:run": "karma start karma.conf.js",
9+ "test:run:browserstack": "karma start karma.browserstack.conf.js",
10+ "test:browserstack": "npm run test:build && npm run test:run:browserstack",
11+ "test": "npm run test:build && npm run test:run",
12+ "start": "find . -type f -regex '.*\\(src\\|test\\).*' ! -regex '.*bower_components.*\\|.*node_modules.*|.*\\.sw.*' | entr -s 'npm run test -s'"
13+ },
14+ "dependencies": {},
15+ "devDependencies": {
16+ "bower": "1.8.0",
17+ "eslint": "3.19.0",
18+ "eslint-config-airbnb": "15.0.1",
19+ "eslint-plugin-import": "2.5.0",
20+ "eslint-plugin-jsx-a11y": "5.0.3",
21+ "eslint-plugin-react": "7.1.0",
22+ "karma": "1.7.0",
23+ "karma-browserstack-launcher": "1.3.0",
24+ "karma-chrome-launcher": "2.1.1",
25+ "karma-firefox-launcher": "1.0.1",
26+ "karma-mocha": "1.3.0",
27+ "karma-spec-reporter": "0.0.31",
28+ "mocha": "3.4.2",
29+ "pulp": "11.0.0",
30+ "purescript": "0.11.5"
1031 },
11− "dependencies": {
12− "fake-indexeddb": "^4.0.1"
32+ "repository": {
33+ "type": "git",
34+ "url": "git+https://github.com/Truqu/purescript-indexeddb.git"
35+ },
36+ "author": "Matthias Benkort <matthias.benkort@truqu.com>",
37+ "license": "MIT",
38+ "bugs": {
39+ "url": "https://github.com/Truqu/purescript-indexeddb/issues"
1340 },
14− "type": "module"
41+ "homepage": "https://github.com/Truqu/purescript-indexeddb#readme"
1542}
packages.dhalldeleted−105
@@ -1,105 +0,0 @@
1−{-
2−Welcome to your new Dhall package-set!
3−
4−Below are instructions for how to edit this file for most use
5−cases, so that you don't need to know Dhall to use it.
6−
7−## Use Cases
8−
9−Most will want to do one or both of these options:
10−1. Override/Patch a package's dependency
11−2. Add a package not already in the default package set
12−
13−This file will continue to work whether you use one or both options.
14−Instructions for each option are explained below.
15−
16−### Overriding/Patching a package
17−
18−Purpose:
19−- Change a package's dependency to a newer/older release than the
20− default package set's release
21−- Use your own modified version of some dependency that may
22− include new API, changed API, removed API by
23− using your custom git repo of the library rather than
24− the package set's repo
25−
26−Syntax:
27−where `entityName` is one of the following:
28−- dependencies
29−- repo
30−- version
31−-------------------------------
32−let upstream = --
33−in upstream
34− with packageName.entityName = "new value"
35−-------------------------------
36−
37−Example:
38−-------------------------------
39−let upstream = --
40−in upstream
41− with halogen.version = "master"
42− with halogen.repo = "https://example.com/path/to/git/repo.git"
43−
44− with halogen-vdom.version = "v4.0.0"
45− with halogen-vdom.dependencies = [ "extra-dependency" ] # halogen-vdom.dependencies
46−-------------------------------
47−
48−### Additions
49−
50−Purpose:
51−- Add packages that aren't already included in the default package set
52−
53−Syntax:
54−where `<version>` is:
55−- a tag (i.e. "v4.0.0")
56−- a branch (i.e. "master")
57−- commit hash (i.e. "701f3e44aafb1a6459281714858fadf2c4c2a977")
58−-------------------------------
59−let upstream = --
60−in upstream
61− with new-package-name =
62− { dependencies =
63− [ "dependency1"
64− , "dependency2"
65− ]
66− , repo =
67− "https://example.com/path/to/git/repo.git"
68− , version =
69− "<version>"
70− }
71−-------------------------------
72−
73−Example:
74−-------------------------------
75−let upstream = --
76−in upstream
77− with benchotron =
78− { dependencies =
79− [ "arrays"
80− , "exists"
81− , "profunctor"
82− , "strings"
83− , "quickcheck"
84− , "lcg"
85− , "transformers"
86− , "foldable-traversable"
87− , "exceptions"
88− , "node-fs"
89− , "node-buffer"
90− , "node-readline"
91− , "datetime"
92− , "now"
93− ]
94− , repo =
95− "https://github.com/hdgarrood/purescript-benchotron.git"
96− , version =
97− "v7.0.0"
98− }
99−-------------------------------
100−-}
101−
102−let upstream =
103− https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20221124/packages.dhall
104− sha256:792255bbd8e2141468d967325f3e78246cb7e500bf3ab6d76d5b22dffbb09d49
105−in upstream
spago.dhalldeleted−42
@@ -1,42 +0,0 @@
1−{-
2−Welcome to a Spago project!
3−You can edit this file as you like.
4−
5−Need help? See the following resources:
6−- Spago documentation: https://github.com/purescript/spago
7−- Dhall language tour: https://docs.dhall-lang.org/tutorials/Language-Tour.html
8−
9−When creating a new Spago project, you can use
10−`spago init --no-comments` or `spago init -C`
11−to generate this file without the comments in this block.
12−-}
13−{ name = "indexed-db"
14−, dependencies =
15− [ "aff"
16− , "arrays"
17− , "avar"
18− , "console"
19− , "control"
20− , "datetime"
21− , "effect"
22− , "either"
23− , "enums"
24− , "exceptions"
25− , "foldable-traversable"
26− , "foreign"
27− , "functions"
28− , "identity"
29− , "lists"
30− , "maybe"
31− , "nonempty"
32− , "now"
33− , "nullable"
34− , "prelude"
35− , "read"
36− , "spec"
37− , "transformers"
38− , "tuples"
39− ]
40−, packages = ./packages.dhall
41−, sources = [ "src/**/*.purs", "test/**/*.purs" ]
42−}
src/Database/IndexedDB/Core.js+6−6
@@ -3,7 +3,7 @@ const toArray = function toArray(xs) {
33};
44
55
6−export function _showCursor(cursor) {
6+exports._showCursor = function _showCursor(cursor) {
77 return '(IDBCursor ' +
88 '{ direction: ' + cursor.direction +
99 ', key: ' + cursor.key +
@@ -11,7 +11,7 @@ export function _showCursor(cursor) {
1111 ' })';
1212};
1313
14−export function _showDatabase(db) {
14+exports._showDatabase = function _showDatabase(db) {
1515 return '(IDBDatabase ' +
1616 '{ name: ' + db.name +
1717 ', objectStoreNames: [' + toArray(db.objectStoreNames).join(', ') + ']' +
@@ -19,7 +19,7 @@ export function _showDatabase(db) {
1919 ' })';
2020};
2121
22−export function _showIndex(index) {
22+exports._showIndex = function _showIndex(index) {
2323 return '(IDBIndex ' +
2424 '{ name: ' + index.name +
2525 ', keyPath: ' + index.keyPath +
@@ -28,7 +28,7 @@ export function _showIndex(index) {
2828 ' })';
2929};
3030
31−export function _showKeyRange(range) {
31+exports._showKeyRange = function _showKeyRange(range) {
3232 return '(IDBKeyRange ' +
3333 '{ lower: ' + range.lower +
3434 ', upper: ' + range.upper +
@@ -37,7 +37,7 @@ export function _showKeyRange(range) {
3737 ' })';
3838};
3939
40−export function _showObjectStore(store) {
40+exports._showObjectStore = function _showObjectStore(store) {
4141 return '(IDBObjectStore ' +
4242 '{ autoIncrement: ' + store.autoIncrement +
4343 ', indexNames: [' + toArray(store.indexNames).join(', ') + ']' +
@@ -46,7 +46,7 @@ export function _showObjectStore(store) {
4646 ' })';
4747};
4848
49−export function _showTransaction(tx) {
49+exports._showTransaction = function _showTransaction(tx) {
5050 return '(IDBTransaction ' +
5151 '{ error: ' + tx.error +
5252 ', mode: ' + tx.mode +
src/Database/IndexedDB/Core.purs+74−21
@@ -2,11 +2,10 @@
22-- | those types.
33module Database.IndexedDB.Core
44 -- * Effects
5− (
6− -- IDB
5+ ( IDB
76
8− -- * Types
9− Database
7+ -- * Types
8+ , Database
109 , Index
1110 , KeyCursor
1211 , KeyRange
@@ -31,13 +30,23 @@ module Database.IndexedDB.Core
3130 , module Database.IndexedDB.IDBKey
3231 ) where
3332
34−import Prelude (class Show)
33+import Prelude (class Show)
3534
36−import Data.Maybe (Maybe(..))
37−import Data.String.Read (class Read)
35+import Control.Monad.Eff (kind Effect)
36+import Data.Maybe (Maybe(..))
37+import Data.String.Read (class Read)
3838
3939import Database.IndexedDB.IDBKey
4040
41+
42+--------------------
43+-- Effects
44+--
45+
46+-- | IDB Effects, manifestation that something happened with the IndexedDB
47+foreign import data IDB :: Effect
48+
49+
4150--------------------
4251-- TYPES
4352--
@@ -46,28 +55,35 @@ import Database.IndexedDB.IDBKey
4655-- | stores which hold the data stored in the database.
4756foreign import data Database :: Type
4857
58+
4959-- | An index allows looking up records in an object store using properties of the values
5060-- | in the object stores records.
5161foreign import data Index :: Type
5262
63+
5364-- | A key range is a continuous interval over some data type used for keys.
5465foreign import data KeyRange :: Type
5566
67+
5668-- | A cursor is used to iterate over a range of records in an index or an object store
5769-- | in a specific direction. A KeyCursor doesn't hold any value.
5870foreign import data KeyCursor :: Type
5971
72+
6073-- | A Transaction is used to interact with the data in a database.
6174-- | Whenever data is read or written to the database it is done by using a transaction.
6275foreign import data Transaction :: Type
6376
77+
6478-- | An object store is the primary storage mechanism for storing data in a database.
6579foreign import data ObjectStore :: Type
6680
81+
6782-- | A cursor is used to iterate over a range of records in an index or an object store
6883-- | in a specific direction. A ValueCursor also holds the value corresponding to matching key.
6984foreign import data ValueCursor :: Type
7085
86+
7187-- | A cursor has a direction that determines whether it moves in monotonically
7288-- | increasing or decreasing order of the record keys when iterated, and if it
7389-- | skips duplicated values when iterating indexes.
@@ -79,6 +95,7 @@ data CursorDirection
7995 | Prev
8096 | PrevUnique
8197
98+
8299-- | If the source of a cursor is an object store, the effective object store of
83100-- | the cursor is that object store and the effective key of the cursor is the
84101-- | cursor’s position. If the source of a cursor is an index, the effective object
@@ -88,6 +105,7 @@ data CursorSource
88105 = ObjectStore ObjectStore
89106 | Index Index
90107
108+
91109-- | A key path is a list of strings that defines how to extract a key from a value.
92110-- | A valid key path is one of:
93111-- |
@@ -97,13 +115,15 @@ data CursorSource
97115-- | - A non-empty list containing only strings conforming to the above requirements.
98116type KeyPath = Array String
99117
118+
100119-- | A transaction has a mode that determines which types of interactions can be performed
101120-- | upon that transaction. The mode is set when the transaction is created and remains
102121-- | fixed for the life of the transaction.
103122data TransactionMode
104− = ReadOnly -- ^ The transaction is only allowed to read data.
105− | ReadWrite -- ^ The transaction is allowed to read, modify and delete data from existing object stores
106− | VersionChange -- ^ The transaction is allowed to read, modify and delete data from existing object stores, and can also create and remove object stores and indexes.
123+ = ReadOnly -- ^ The transaction is only allowed to read data.
124+ | ReadWrite -- ^ The transaction is allowed to read, modify and delete data from existing object stores
125+ | VersionChange -- ^ The transaction is allowed to read, modify and delete data from existing object stores, and can also create and remove object stores and indexes.
126+
107127
108128--------------------
109129-- Classes
@@ -113,104 +133,132 @@ data TransactionMode
113133-- | specific attributes (see KeyCursor or CursorWithValue).
114134class (IDBCursor cursor) <= IDBConcreteCursor cursor
115135
136+
116137-- | Cursor objects implement the IDBCursor interface.
117138-- | There is only ever one IDBCursor instance representing a given cursor.
118139-- | There is no limit on how many cursors can be used at the same time.
119140class IDBCursor cursor
120141
142+
121143-- | The IDBDatabase interface represents a connection to a database.
122144class IDBDatabase db
123145
146+
124147-- | The IDBIndex interface represents an index handle.
125148-- | Any of these methods throw an "TransactionInactiveError" DOMException
126149-- | if called when the transaction is not active.
127150class IDBIndex index
128151
152+
129153-- | The IDBKeyRange interface represents a key range.
130154class IDBKeyRange range
131155
156+
132157-- | The IDBtransaction interface.
133158class IDBTransaction tx
134159
160+
135161-- | The IDBObjectStore interface represents an object store handle.
136162class IDBObjectStore store
137163
164+
138165--------------------
139166-- INSTANCES
140167--
141168
142169instance idbCursorKeyCursor :: IDBCursor KeyCursor
143170
171+
144172instance idbCursorValueCursor :: IDBCursor ValueCursor
145173
174+
146175instance idbConcreteCursorKeyCursor :: IDBConcreteCursor KeyCursor
147176
177+
148178instance idbConcreteCursorValueCursor :: IDBConcreteCursor ValueCursor
149179
180+
150181instance idbDatabaseDatabase :: IDBDatabase Database
151182
183+
152184instance idbIndexIndex :: IDBIndex Index
153185
186+
154187instance idbIndexObjectStore :: IDBIndex ObjectStore
155188
189+
156190instance idbKeyRangeKeyRange :: IDBKeyRange KeyRange
157191
192+
158193instance idbObjectStoreObjectStore :: IDBObjectStore ObjectStore
159194
195+
160196instance idbTransactionTransaction :: IDBTransaction Transaction
161197
198+
162199instance showKeyCursor :: Show KeyCursor where
163200 show = _showCursor
164201
202+
165203instance showValueCursor :: Show ValueCursor where
166204 show = _showCursor
167205
206+
168207instance showIndex :: Show Index where
169208 show = _showIndex
170209
210+
171211instance showKeyRange :: Show KeyRange where
172212 show = _showKeyRange
173213
214+
174215instance showObjectStore :: Show ObjectStore where
175216 show = _showObjectStore
176217
218+
177219instance showTransaction :: Show Transaction where
178220 show = _showTransaction
179221
222+
180223instance showDatabase :: Show Database where
181224 show = _showDatabase
182225
226+
183227instance showCursorDirection :: Show CursorDirection where
184228 show x =
185229 case x of
186− Next -> "next"
230+ Next -> "next"
187231 NextUnique -> "nextunique"
188− Prev -> "prev"
232+ Prev -> "prev"
189233 PrevUnique -> "prevunique"
190234
235+
191236instance showTransactionMode :: Show TransactionMode where
192237 show x =
193238 case x of
194− ReadOnly -> "readonly"
195− ReadWrite -> "readwrite"
239+ ReadOnly -> "readonly"
240+ ReadWrite -> "readwrite"
196241 VersionChange -> "versionchange"
197242
243+
198244instance readCursorDirection :: Read CursorDirection where
199245 read s =
200246 case s of
201− "next" -> Just Next
247+ "next" -> Just Next
202248 "nextunique" -> Just NextUnique
203− "prev" -> Just Prev
249+ "prev" -> Just Prev
204250 "prevunique" -> Just PrevUnique
205− _ -> Nothing
251+ _ -> Nothing
252+
206253
207254instance readTransactionMode :: Read TransactionMode where
208255 read s =
209256 case s of
210− "readonly" -> Just ReadOnly
211− "readwrite" -> Just ReadWrite
257+ "readonly" -> Just ReadOnly
258+ "readwrite" -> Just ReadWrite
212259 "versionchange" -> Just VersionChange
213− _ -> Nothing
260+ _ -> Nothing
261+
214262
215263--------------------
216264-- FFI
@@ -218,25 +266,30 @@ instance readTransactionMode :: Read TransactionMode where
218266
219267foreign import _showCursor
220268 :: forall cursor
221− . cursor
269+ . cursor
222270 -> String
223271
272+
224273foreign import _showDatabase
225274 :: Database
226275 -> String
227276
277+
228278foreign import _showIndex
229279 :: Index
230280 -> String
231281
282+
232283foreign import _showKeyRange
233284 :: KeyRange
234285 -> String
235286
287+
236288foreign import _showObjectStore
237289 :: ObjectStore
238290 -> String
239291
292+
240293foreign import _showTransaction
241294 :: Transaction
242295 -> String
src/Database/IndexedDB/IDBCursor.js+10−10
@@ -10,7 +10,7 @@ const successHandler = function successHandler(cb) {
1010 };
1111};
1212
13−export function _advance(cursor, count) {
13+exports._advance = function _advance(cursor, count) {
1414 return function aff(error, success) {
1515 try {
1616 cursor.advance(count);
@@ -25,7 +25,7 @@ export function _advance(cursor, count) {
2525 };
2626};
2727
28−export function _continue(cursor, key) {
28+exports._continue = function _continue(cursor, key) {
2929 return function aff(error, success) {
3030 try {
3131 cursor.continue(key || undefined);
@@ -40,7 +40,7 @@ export function _continue(cursor, key) {
4040 };
4141};
4242
43−export function _continuePrimaryKey(cursor, key, primaryKey) {
43+exports._continuePrimaryKey = function _continuePrimaryKey(cursor, key, primaryKey) {
4444 return function aff(error, success) {
4545 try {
4646 cursor.continuePrimaryKey(key, primaryKey);
@@ -55,7 +55,7 @@ export function _continuePrimaryKey(cursor, key, primaryKey) {
5555 };
5656};
5757
58−export function _delete(cursor) {
58+exports._delete = function _delete(cursor) {
5959 return function aff(error, success) {
6060 try {
6161 const request = cursor.delete();
@@ -71,11 +71,11 @@ export function _delete(cursor) {
7171 };
7272};
7373
74−export function _direction(fromString, cursor) {
74+exports._direction = function _direction(fromString, cursor) {
7575 return fromString(cursor.direction);
7676};
7777
78−export function _key(cursor) {
78+exports._key = function _key(cursor) {
7979 return function aff(error, success) {
8080 try {
8181 success(cursor.key);
@@ -89,7 +89,7 @@ export function _key(cursor) {
8989 };
9090};
9191
92−export function _primaryKey(cursor) {
92+exports._primaryKey = function _primaryKey(cursor) {
9393 return function aff(error, success) {
9494 try {
9595 success(cursor.primaryKey);
@@ -103,7 +103,7 @@ export function _primaryKey(cursor) {
103103 };
104104};
105105
106−export function _source(IDBObjectStore, IDBIndex, cursor) {
106+exports._source = function _source(IDBObjectStore, IDBIndex, cursor) {
107107 switch (cursor.source.constructor.name) {
108108 case 'IDBIndex':
109109 return IDBIndex(cursor.source);
@@ -123,7 +123,7 @@ export function _source(IDBObjectStore, IDBIndex, cursor) {
123123 }
124124};
125125
126−export function _update(cursor, value) {
126+exports._update = function _update(cursor, value) {
127127 return function aff(error, success) {
128128 try {
129129 const request = cursor.update(value);
@@ -139,6 +139,6 @@ export function _update(cursor, value) {
139139 };
140140};
141141
142−export function _value(cursor) {
142+exports._value = function _value(cursor) {
143143 return cursor.value;
144144};
src/Database/IndexedDB/IDBCursor.purs+85−75
@@ -16,18 +16,20 @@ module Database.IndexedDB.IDBCursor
1616 , value
1717 ) where
1818
19−import Database.IndexedDB.Core
19+import Prelude (Unit, ($), (>>>), (<<<), map)
20+
21+import Control.Monad.Aff (Aff)
22+import Control.Monad.Aff.Compat (fromEffFnAff, EffFnAff)
23+import Data.Foreign (Foreign, toForeign, unsafeFromForeign)
24+import Data.Function.Uncurried as Fn
25+import Data.Function.Uncurried (Fn2, Fn3)
26+import Data.Maybe (Maybe)
27+import Data.Nullable (Nullable, toNullable)
28+import Data.String.Read (read)
2029
21−import Data.Function.Uncurried (Fn2, Fn3)
22−import Data.Function.Uncurried as Fn
23−import Data.Maybe (Maybe)
24−import Data.Nullable (Nullable, toNullable)
25−import Data.String.Read (read)
30+import Database.IndexedDB.Core
2631import Database.IndexedDB.IDBKey.Internal (class IDBKey, Key, toKey, unsafeFromKey)
27−import Effect.Aff (Aff)
28−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
29−import Foreign (Foreign, unsafeFromForeign, unsafeToForeign)
30−import Prelude (Unit, ($), (>>>), (<<<), map)
32+
3133
3234--------------------
3335-- INTERFACES
@@ -35,58 +37,56 @@ import Prelude (Unit, ($), (>>>), (<<<), map)
3537
3638-- | Advances the cursor through the next count records in range.
3739advance
38− :: forall cursor
39− . (IDBCursor cursor)
40− => cursor
41− -> Int
42− -> Aff Unit
40+ :: forall e cursor. (IDBCursor cursor)
41+ => cursor
42+ -> Int
43+ -> Aff (idb :: IDB | e) Unit
4344advance c =
44− fromEffectFnAff <<< Fn.runFn2 _advance c
45+ fromEffFnAff <<< Fn.runFn2 _advance c
46+
4547
4648-- | Advances the cursor to the next record in range matching or after key.
4749continue
48− :: forall k cursor
49− . (IDBKey k)
50− => (IDBCursor cursor)
51− => cursor
52− -> Maybe k
53− -> Aff Unit
50+ :: forall e k cursor. (IDBKey k) => (IDBCursor cursor)
51+ => cursor
52+ -> Maybe k
53+ -> Aff (idb :: IDB | e) Unit
5454continue c mk =
55− fromEffectFnAff $ Fn.runFn2 _continue c (toNullable $ map (toKey >>> unsafeFromKey) mk)
55+ fromEffFnAff $ Fn.runFn2 _continue c (toNullable $ map (toKey >>> unsafeFromKey) mk)
56+
5657
5758-- | Advances the cursor to the next record in range matching or after key and primaryKey. Throws an "InvalidAccessError" DOMException if the source is not an index.
5859continuePrimaryKey
59− :: forall k cursor
60− . (IDBKey k)
61− => (IDBCursor cursor)
62− => cursor
63− -> k
64− -> k
65− -> Aff Unit
60+ :: forall e k cursor. (IDBKey k) => (IDBCursor cursor)
61+ => cursor
62+ -> k
63+ -> k
64+ -> Aff (idb :: IDB | e) Unit
6665continuePrimaryKey c k1 k2 =
67− fromEffectFnAff $ Fn.runFn3 _continuePrimaryKey c (unsafeFromKey $ toKey k1) (unsafeFromKey $ toKey k2)
66+ fromEffFnAff $ Fn.runFn3 _continuePrimaryKey c (unsafeFromKey $ toKey k1) (unsafeFromKey $ toKey k2)
67+
6868
6969-- | Delete the record pointed at by the cursor with a new value.
7070delete
71− :: forall cursor
72− . (IDBCursor cursor)
73− => cursor
74− -> Aff Unit
71+ :: forall e cursor. (IDBCursor cursor)
72+ => cursor
73+ -> Aff (idb :: IDB | e) Unit
7574delete =
76− fromEffectFnAff <<< _delete
75+ fromEffFnAff <<< _delete
76+
7777
7878-- | Update the record pointed at by the cursor with a new value.
7979-- |
8080-- | Throws a "DataError" DOMException if the effective object store uses
8181-- | in-line keys and the key would have changed.
8282update
83− :: forall val cursor
84− . (IDBCursor cursor)
85− => cursor
86− -> val
87− -> Aff Key
83+ :: forall val e cursor. (IDBCursor cursor)
84+ => cursor
85+ -> val
86+ -> Aff (idb :: IDB | e) Key
8887update c =
89− map toKey <<< fromEffectFnAff <<< Fn.runFn2 _update c <<< unsafeToForeign
88+ map toKey <<< fromEffFnAff <<< Fn.runFn2 _update c <<< toForeign
89+
9090
9191--------------------
9292-- ATTRIBUTES
@@ -94,93 +94,103 @@ update c =
9494
9595-- | Returns the direction (Next|NextUnique|Prev|PrevUnique) of the cursor.
9696direction
97− :: forall cursor
98− . (IDBConcreteCursor cursor)
97+ :: forall cursor. (IDBConcreteCursor cursor)
9998 => cursor
10099 -> CursorDirection
101100direction =
102101 Fn.runFn2 _direction (read >>> toNullable)
103102
103+
104104-- | Returns the key of the cursor. Throws a "InvalidStateError" DOMException
105105-- | if the cursor is advancing or is finished.
106106key
107− :: forall cursor
108− . (IDBConcreteCursor cursor)
107+ :: forall e cursor. (IDBConcreteCursor cursor)
109108 => cursor
110− -> Aff Key
109+ -> Aff (idb :: IDB | e) Key
111110key =
112− map toKey <<< fromEffectFnAff <<< _key
111+ map toKey <<< fromEffFnAff <<< _key
112+
113113
114114-- | Returns the effective key of the cursor. Throws a "InvalidStateError" DOMException
115115-- | if the cursor is advancing or is finished.
116116primaryKey
117− :: forall cursor
118− . (IDBConcreteCursor cursor)
117+ :: forall e cursor. (IDBConcreteCursor cursor)
119118 => cursor
120− -> Aff Key
119+ -> Aff (idb :: IDB | e) Key
121120primaryKey =
122− map toKey <<< fromEffectFnAff <<< _primaryKey
121+ map toKey <<< fromEffFnAff <<< _primaryKey
122+
123123
124124-- | Returns the IDBObjectStore or IDBIndex the cursor was opened from.
125125source
126− :: forall cursor
127− . (IDBConcreteCursor cursor)
126+ :: forall cursor. (IDBConcreteCursor cursor)
128127 => cursor
129128 -> CursorSource
130129source =
131130 Fn.runFn3 _source ObjectStore Index
132131
132+
133133value
134134 :: forall val
135− . ValueCursor
135+ . ValueCursor
136136 -> val
137137value =
138138 _value >>> unsafeFromForeign
139139
140+
140141--------------------
141142-- FFI
142143--
143144
144145foreign import _advance
145− :: forall cursor
146− . Fn2 cursor Int (EffectFnAff Unit)
146+ :: forall cursor e
147+ . Fn2 cursor Int (EffFnAff (idb :: IDB | e) Unit)
148+
147149
148150foreign import _continue
149− :: forall cursor
150− . Fn2 cursor (Nullable Foreign) (EffectFnAff Unit)
151+ :: forall cursor e
152+ . Fn2 cursor (Nullable Foreign) (EffFnAff (idb :: IDB | e) Unit)
153+
151154
152155foreign import _continuePrimaryKey
153− :: forall cursor
154− . Fn3 cursor Foreign Foreign (EffectFnAff Unit)
156+ :: forall cursor e
157+ . Fn3 cursor Foreign Foreign (EffFnAff (idb :: IDB | e) Unit)
158+
155159
156160foreign import _delete
157− :: forall cursor
158− . cursor
159− -> (EffectFnAff Unit)
161+ :: forall cursor e
162+ . cursor
163+ -> (EffFnAff (idb :: IDB | e) Unit)
164+
160165
161166foreign import _direction
162167 :: forall cursor
163− . Fn2 (String -> Nullable CursorDirection) cursor CursorDirection
168+ . Fn2 (String -> Nullable CursorDirection) cursor CursorDirection
169+
164170
165171foreign import _key
166− :: forall cursor
167− . cursor
168− -> EffectFnAff Key
172+ :: forall cursor e
173+ . cursor
174+ -> EffFnAff (idb :: IDB | e) Key
175+
169176
170177foreign import _primaryKey
171− :: forall cursor
172− . cursor
173− -> EffectFnAff Key
178+ :: forall cursor e
179+ . cursor
180+ -> EffFnAff (idb :: IDB | e) Key
181+
174182
175183foreign import _source
176184 :: forall cursor
177− . Fn3 (ObjectStore -> CursorSource) (Index -> CursorSource) cursor CursorSource
185+ . Fn3 (ObjectStore -> CursorSource) (Index -> CursorSource) cursor CursorSource
186+
178187
179188foreign import _update
180− :: forall cursor
181− . Fn2 cursor Foreign (EffectFnAff Foreign)
189+ :: forall cursor e
190+ . Fn2 cursor Foreign (EffFnAff (idb :: IDB | e) Foreign)
191+
182192
183193foreign import _value
184194 :: forall cursor val
185− . cursor
195+ . cursor
186196 -> val
src/Database/IndexedDB/IDBDatabase.js+11−11
@@ -3,7 +3,7 @@ const toArray = function toArray(xs) {
33};
44
55
6−export function _close(db) {
6+exports._close = function _close(db) {
77 return function aff(error, success) {
88 try {
99 db.close();
@@ -18,7 +18,7 @@ export function _close(db) {
1818 };
1919};
2020
21−export function _createObjectStore(db, name, opts) {
21+exports._createObjectStore = function _createObjectStore(db, name, opts) {
2222 return function aff(error, success) {
2323 var keyPath;
2424
@@ -52,7 +52,7 @@ export function _createObjectStore(db, name, opts) {
5252 };
5353};
5454
55−export function _deleteObjectStore(db, name) {
55+exports._deleteObjectStore = function _deleteObjectStore(db, name) {
5656 return function aff(error, success) {
5757 try {
5858 db.deleteObjectStore(name);
@@ -67,15 +67,15 @@ export function _deleteObjectStore(db, name) {
6767 };
6868};
6969
70−export function _name(db) {
70+exports._name = function _name(db) {
7171 return db.name;
7272};
7373
74−export function _objectStoreNames(db) {
74+exports._objectStoreNames = function _objectStoreNames(db) {
7575 return toArray(db.objectStoreNames);
7676};
7777
78−export function _onAbort(db, f) {
78+exports._onAbort = function _onAbort(db, f) {
7979 return function aff(error, success) {
8080 db.onabort = function onabort() {
8181 f();
@@ -88,7 +88,7 @@ export function _onAbort(db, f) {
8888 };
8989};
9090
91−export function _onClose(db, f) {
91+exports._onClose = function _onClose(db, f) {
9292 return function aff(error, success) {
9393 db.onclose = function onclose() {
9494 f();
@@ -101,7 +101,7 @@ export function _onClose(db, f) {
101101 };
102102};
103103
104−export function _onError(db, f) {
104+exports._onError = function _onError(db, f) {
105105 return function aff(error, success) {
106106 db.onerror = function onerror(e) {
107107 f(e.target.error)();
@@ -114,7 +114,7 @@ export function _onError(db, f) {
114114 };
115115};
116116
117−export function _onVersionChange(db, f) {
117+exports._onVersionChange = function _onVersionChange(db, f) {
118118 return function aff(error, success) {
119119 db.onversionchange = function onversionchange(e) {
120120 f({ oldVersion: e.oldVersion, newVersion: e.newVersion })();
@@ -127,7 +127,7 @@ export function _onVersionChange(db, f) {
127127 };
128128};
129129
130−export function _transaction(db, stores, mode) {
130+exports._transaction = function _transaction(db, stores, mode) {
131131 return function aff(error, success) {
132132 var transaction;
133133 try {
@@ -144,6 +144,6 @@ export function _transaction(db, stores, mode) {
144144 };
145145};
146146
147−export function _version(db) {
147+exports._version = function _version(db) {
148148 return db.version;
149149};
src/Database/IndexedDB/IDBDatabase.purs+98−73
@@ -24,15 +24,17 @@ module Database.IndexedDB.IDBDatabase
2424 , onVersionChange
2525 ) where
2626
27+import Prelude (Unit, show, (<<<), ($))
28+
29+import Control.Monad.Aff (Aff)
30+import Control.Monad.Aff.Compat (fromEffFnAff, EffFnAff)
31+import Control.Monad.Eff (Eff)
32+import Control.Monad.Eff.Exception (Error)
33+import Data.Function.Uncurried as Fn
34+import Data.Function.Uncurried (Fn2, Fn3)
35+
2736import Database.IndexedDB.Core
2837
29−import Data.Function.Uncurried (Fn2, Fn3)
30−import Data.Function.Uncurried as Fn
31−import Effect (Effect)
32−import Effect.Aff (Aff)
33−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
34−import Effect.Exception (Error)
35−import Prelude (Unit, show, (<<<), ($))
3638
3739--------------------
3840-- TYPES
@@ -41,67 +43,70 @@ import Prelude (Unit, show, (<<<), ($))
4143-- | Type alias for StoreName
4244type StoreName = String
4345
46+
4447-- | Options provided when creating an object store.
4548type ObjectStoreParameters =
46− { keyPath :: KeyPath
49+ { keyPath :: KeyPath
4750 , autoIncrement :: Boolean
4851 }
4952
53+
5054defaultParameters :: ObjectStoreParameters
5155defaultParameters =
52− { keyPath: []
53− , autoIncrement: false
56+ { keyPath : []
57+ , autoIncrement : false
5458 }
5559
60+
5661--------------------
5762-- INTERFACE
5863--
5964
6065-- | Closes the connection once all running transactions have finished.
6166close
62− :: forall db
63− . (IDBDatabase db)
67+ :: forall e db. (IDBDatabase db)
6468 => db
65− -> Aff Unit
69+ -> Aff (idb :: IDB | e) Unit
6670close =
67− fromEffectFnAff <<< _close
71+ fromEffFnAff <<< _close
72+
6873
6974-- | Creates a new object store with the given name and options and returns a new IDBObjectStore.
7075-- |
7176-- | Throws a "InvalidStateError" DOMException if not called within an upgrade transaction
7277createObjectStore
73− :: forall db
74− . (IDBDatabase db)
78+ :: forall e db. (IDBDatabase db)
7579 => db
7680 -> StoreName
7781 -> ObjectStoreParameters
78− -> Aff ObjectStore
82+ -> Aff (idb :: IDB | e) ObjectStore
7983createObjectStore db name' opts =
80− fromEffectFnAff $ Fn.runFn3 _createObjectStore db name' opts
84+ fromEffFnAff $ Fn.runFn3 _createObjectStore db name' opts
85+
8186
8287-- | Deletes the object store with the given name.
8388-- |
8489-- | Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
8590deleteObjectStore
86− :: forall db
87− . (IDBDatabase db)
91+ :: forall e db. (IDBDatabase db)
8892 => db
8993 -> StoreName
90− -> Aff ObjectStore
94+ -> Aff (idb :: IDB | e) ObjectStore
9195deleteObjectStore db name' =
92− fromEffectFnAff $ Fn.runFn2 _deleteObjectStore db name'
96+ fromEffFnAff $ Fn.runFn2 _deleteObjectStore db name'
97+
9398
9499-- | Returns a new transaction with the given mode (ReadOnly|ReadWrite)
95100-- | and scope which in the form of an array of object store names.
96101transaction
97− :: forall db
98− . (IDBDatabase db)
102+ :: forall e db. (IDBDatabase db)
99103 => db
100104 -> Array StoreName
101105 -> TransactionMode
102− -> Aff Transaction
106+ -> Aff (idb :: IDB | e) Transaction
103107transaction db stores mode' =
104− fromEffectFnAff $ Fn.runFn3 _transaction db stores (show mode')
108+ fromEffFnAff $ Fn.runFn3 _transaction db stores (show mode')
109+
105110
106111--------------------
107112-- ATTRIBUTES
@@ -109,107 +114,127 @@ transaction db stores mode' =
109114
110115-- | Returns the name of the database.
111116name
112− :: Database
113− -> String
117+ :: Database
118+ -> String
114119name =
115120 _name
116121
122+
117123-- | Returns a list of the names of object stores in the database.
118124objectStoreNames
119− :: Database
120− -> Array String
125+ :: Database
126+ -> Array String
121127objectStoreNames =
122128 _objectStoreNames
123129
130+
124131-- | Returns the version of the database.
125132version
126− :: Database
127− -> Int
133+ :: Database
134+ -> Int
128135version =
129136 _version
130137
138+
131139--------------------
132140-- EVENT HANDLERS
133141--
134142-- | Event handler for the `abort` event.
135143onAbort
136− :: Database
137− -> Effect Unit
138− -> Aff Unit
144+ :: forall e e'
145+ . Database
146+ -> Eff ( | e') Unit
147+ -> Aff (idb :: IDB | e) Unit
139148onAbort db f =
140− fromEffectFnAff $ Fn.runFn2 _onAbort db f
149+ fromEffFnAff $ Fn.runFn2 _onAbort db f
150+
141151
142152-- | Event handler for the `close` event.
143153onClose
144− :: Database
145− -> Effect Unit
146− -> Aff Unit
154+ :: forall e e'
155+ . Database
156+ -> Eff ( | e') Unit
157+ -> Aff (idb :: IDB | e) Unit
147158onClose db f =
148− fromEffectFnAff $ Fn.runFn2 _onClose db f
159+ fromEffFnAff $ Fn.runFn2 _onClose db f
160+
149161
150162-- | Event handler for the `error` event.
151163onError
152− :: Database
153− -> (Error -> Effect Unit)
154− -> Aff Unit
164+ :: forall e e'
165+ . Database
166+ -> (Error -> Eff ( | e') Unit)
167+ -> Aff (idb :: IDB | e) Unit
155168onError db f =
156− fromEffectFnAff $ Fn.runFn2 _onError db f
169+ fromEffFnAff $ Fn.runFn2 _onError db f
170+
157171
158172-- | Event handler for the `versionchange` event.
159173onVersionChange
160− :: Database
161− -> ( { oldVersion :: Int, newVersion :: Int }
162− -> Effect Unit
163− )
164− -> Aff Unit
174+ :: forall e e'
175+ . Database
176+ -> ({ oldVersion :: Int, newVersion :: Int }
177+ -> Eff ( | e') Unit)
178+ -> Aff (idb :: IDB | e) Unit
165179onVersionChange db f =
166− fromEffectFnAff $ Fn.runFn2 _onVersionChange db f
180+ fromEffFnAff $ Fn.runFn2 _onVersionChange db f
181+
167182
168183--------------------
169184-- FFI
170185--
171186
172187foreign import _close
173− :: forall db
174− . db
175− -> EffectFnAff Unit
188+ :: forall db e
189+ . db
190+ -> EffFnAff (idb :: IDB | e) Unit
191+
176192
177193foreign import _createObjectStore
178− :: forall db
179− . Fn3 db String { keyPath :: Array String, autoIncrement :: Boolean } (EffectFnAff ObjectStore)
194+ :: forall db e
195+ . Fn3 db String { keyPath :: Array String, autoIncrement :: Boolean } (EffFnAff (idb :: IDB | e) ObjectStore)
196+
180197
181198foreign import _deleteObjectStore
182− :: forall db
183− . Fn2 db String (EffectFnAff ObjectStore)
199+ :: forall db e
200+ . Fn2 db String (EffFnAff (idb :: IDB | e) ObjectStore)
201+
184202
185203foreign import _name
186− :: Database
187− -> String
204+ :: Database
205+ -> String
206+
188207
189208foreign import _objectStoreNames
190− :: Database
191− -> Array String
209+ :: Database
210+ -> Array String
211+
192212
193213foreign import _onAbort
194− :: forall db
195− . Fn2 db (Effect Unit) (EffectFnAff Unit)
214+ :: forall db e e'
215+ . Fn2 db (Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
216+
196217
197218foreign import _onClose
198− :: forall db
199− . Fn2 db (Effect Unit) (EffectFnAff Unit)
219+ :: forall db e e'
220+ . Fn2 db (Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
221+
200222
201223foreign import _onError
202− :: forall db
203− . Fn2 db (Error -> Effect Unit) (EffectFnAff Unit)
224+ :: forall db e e'
225+ . Fn2 db (Error -> Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
226+
204227
205228foreign import _onVersionChange
206− :: forall db
207− . Fn2 db ({ oldVersion :: Int, newVersion :: Int } -> Effect Unit) (EffectFnAff Unit)
229+ :: forall db e e'
230+ . Fn2 db ({ oldVersion :: Int, newVersion :: Int } -> Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
231+
208232
209233foreign import _transaction
210− :: forall db
211− . Fn3 db (Array String) String (EffectFnAff Transaction)
234+ :: forall db e
235+ . Fn3 db (Array String) String (EffFnAff (idb :: IDB | e) Transaction)
236+
212237
213238foreign import _version
214− :: Database
215− -> Int
239+ :: Database
240+ -> Int
src/Database/IndexedDB/IDBFactory.js+2−2
@@ -18,7 +18,7 @@ const noOp3 = function noOp3() {
1818 return noOp2;
1919};
2020
21−export function _deleteDatabase(name) {
21+exports._deleteDatabase = function _deleteDatabase(name) {
2222 return function aff(error, success) {
2323 try {
2424 const request = indexedDB.deleteDatabase(name);
@@ -38,7 +38,7 @@ export function _deleteDatabase(name) {
3838 };
3939};
4040
41−export function _open(fromMaybe, name, mver, req) {
41+exports._open = function _open(fromMaybe, name, mver, req) {
4242 const ver = fromMaybe(undefined)(mver);
4343
4444 return function aff(error, success) {
src/Database/IndexedDB/IDBFactory.purs+33−22
@@ -12,32 +12,37 @@ module Database.IndexedDB.IDBFactory
1212 , open
1313 ) where
1414
15+import Prelude (Unit, ($), (<<<))
16+
17+import Control.Monad.Aff (Aff)
18+import Control.Monad.Aff.Compat (fromEffFnAff, EffFnAff)
19+import Control.Monad.Eff (Eff)
20+import Data.Function.Uncurried as Fn
21+import Data.Function.Uncurried (Fn4)
22+import Data.Maybe (Maybe, fromMaybe)
23+
1524import Database.IndexedDB.Core
1625
17−import Data.Function.Uncurried (Fn4)
18−import Data.Function.Uncurried as Fn
19−import Data.Maybe (Maybe, fromMaybe)
20−import Effect (Effect)
21−import Effect.Aff (Aff)
22−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
23−import Prelude (Unit, ($), (<<<))
2426
2527--------------------
2628-- TYPES
2729--
2830
2931-- Type alias for binding listeners to an initial open action.
30−type Callbacks =
31− { onBlocked :: Maybe (Effect Unit)
32− , onUpgradeNeeded :: Maybe (Database -> Transaction -> { oldVersion :: Int } -> Effect Unit)
32+type Callbacks e =
33+ { onBlocked :: Maybe (Eff (| e) Unit)
34+ , onUpgradeNeeded :: Maybe (Database -> Transaction -> { oldVersion :: Int } -> Eff (| e) Unit)
3335 }
3436
37+
3538-- | Type alias for DatabaseName.
3639type DatabaseName = String
3740
41+
3842-- | Type alias for Version.
3943type Version = Int
4044
45+
4146--------------------
4247-- INTERFACE
4348--
@@ -46,10 +51,12 @@ type Version = Int
4651-- | and there are open connections that don’t close in response to a
4752-- | `versionchange` event, the request will be blocked until all they close.
4853deleteDatabase
49− :: DatabaseName
50− -> Aff Int
54+ :: forall e
55+ . DatabaseName
56+ -> Aff (idb :: IDB | e) Int
5157deleteDatabase =
52− fromEffectFnAff <<< _deleteDatabase
58+ fromEffFnAff <<< _deleteDatabase
59+
5360
5461-- | Attempts to open a connection to the named database with the specified version.
5562-- | If the database already exists with a lower version and there are open connections
@@ -60,20 +67,24 @@ deleteDatabase =
6067-- | When the version isn't provided (`Nothing`), attempts to open a connection to the
6168-- | named database with the current version, or 1 if it does not already exist.
6269open
63− :: DatabaseName
64− -> Maybe Version
65− -> Callbacks
66− -> Aff Database
70+ :: forall e e'
71+ . DatabaseName
72+ -> Maybe Version
73+ -> Callbacks e'
74+ -> Aff (idb :: IDB | e) Database
6775open name mver req =
68− fromEffectFnAff $ Fn.runFn4 _open fromMaybe name mver req
76+ fromEffFnAff $ Fn.runFn4 _open fromMaybe name mver req
77+
6978
7079--------------------
7180-- FFI
7281--
7382foreign import _deleteDatabase
74− :: String
75− -> EffectFnAff Int
83+ :: forall e
84+ . String
85+ -> EffFnAff (idb :: IDB | e) Int
86+
7687
7788foreign import _open
78− :: forall a
79− . Fn4 (a -> Maybe a -> a) String (Maybe Int) (Callbacks) (EffectFnAff Database)
89+ :: forall a e e'
90+ . Fn4 (a -> Maybe a -> a) String (Maybe Int) (Callbacks e') (EffFnAff (idb :: IDB | e) Database)
src/Database/IndexedDB/IDBIndex.js+12−12
@@ -11,7 +11,7 @@ const successHandler = function successHandler(cb) {
1111};
1212
1313
14−export function _keyPath(index) {
14+exports._keyPath = function _keyPath(index) {
1515 const path = index.keyPath;
1616
1717 if (Array.isArray(path)) {
@@ -25,23 +25,23 @@ export function _keyPath(index) {
2525 return [];
2626};
2727
28−export function _multiEntry(index) {
28+exports._multiEntry = function _multiEntry(index) {
2929 return index.multiEntry;
3030};
3131
32−export function _name(index) {
32+exports._name = function _name(index) {
3333 return index.name;
3434};
3535
36−export function _objectStore(index) {
36+exports._objectStore = function _objectStore(index) {
3737 return index.obectStore;
3838};
3939
40−export function _unique(index) {
40+exports._unique = function _unique(index) {
4141 return index.unique;
4242};
4343
44−export function _count(index, query) {
44+exports._count = function _count(index, query) {
4545 return function aff(error, success) {
4646 try {
4747 const request = index.count(query);
@@ -57,7 +57,7 @@ export function _count(index, query) {
5757 };
5858};
5959
60−export function _get(index, range) {
60+exports._get = function _get(index, range) {
6161 return function aff(error, success) {
6262 try {
6363 const request = index.get(range);
@@ -79,7 +79,7 @@ export function _get(index, range) {
7979 *
8080 * However, it may be doable to convert the result to some key / value structure with values of
8181 * different types.
82−export function _getAll(index, query, count) {
82+exports._getAll = function _getAll(index, query, count) {
8383 return function aff(error, success) {
8484 const request = index.getAll(query, count);
8585 request.onsuccess = successHandler(success);
@@ -88,7 +88,7 @@ export function _getAll(index, query, count) {
8888};
8989*/
9090
91−export function _getAllKeys(index, range, count) {
91+exports._getAllKeys = function _getAllKeys(index, range, count) {
9292 return function aff(error, success) {
9393 try {
9494 const request = index.getAllKeys(range, count || undefined);
@@ -104,7 +104,7 @@ export function _getAllKeys(index, range, count) {
104104 };
105105};
106106
107−export function _getKey(index, range) {
107+exports._getKey = function _getKey(index, range) {
108108 return function aff(error, success) {
109109 try {
110110 const request = index.getKey(range);
@@ -120,7 +120,7 @@ export function _getKey(index, range) {
120120 };
121121};
122122
123−export function _openCursor(index, query, dir, cb) {
123+exports._openCursor = function _openCursor(index, query, dir, cb) {
124124 return function aff(error, success) {
125125 try {
126126 const request = index.openCursor(query, dir);
@@ -145,7 +145,7 @@ export function _openCursor(index, query, dir, cb) {
145145 };
146146};
147147
148−export function _openKeyCursor(index, query, dir, cb) {
148+exports._openKeyCursor = function _openKeyCursor(index, query, dir, cb) {
149149 return function aff(error, success) {
150150 try {
151151 const request = index.openKeyCursor(query, dir);
src/Database/IndexedDB/IDBIndex.purs+96−78
@@ -20,187 +20,205 @@ module Database.IndexedDB.IDBIndex
2020 , unique
2121 ) where
2222
23−import Database.IndexedDB.Core
23+import Prelude (Unit, map, show, (<$>), (>>>), ($))
24+
25+import Control.Monad.Aff (Aff)
26+import Control.Monad.Aff.Compat (EffFnAff, fromEffFnAff)
27+import Control.Monad.Eff (Eff)
28+import Control.Monad.Eff.Exception (Error)
29+import Data.Foreign (Foreign, unsafeFromForeign)
30+import Data.Function.Uncurried as Fn
31+import Data.Function.Uncurried (Fn2, Fn3, Fn4)
32+import Data.Maybe (Maybe)
33+import Data.Nullable (Nullable, toMaybe, toNullable)
2434
25−import Data.Function.Uncurried (Fn2, Fn3, Fn4)
26−import Data.Function.Uncurried as Fn
27−import Data.Maybe (Maybe)
28−import Data.Nullable (Nullable, toMaybe, toNullable)
35+import Database.IndexedDB.Core
2936import Database.IndexedDB.IDBKey.Internal (Key, toKey)
30−import Effect (Effect)
31−import Effect.Aff (Aff)
32−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
33−import Effect.Exception (Error)
34−import Foreign (Foreign, unsafeFromForeign)
35−import Prelude (Unit, map, show, ($), (>>>))
37+
3638
3739--------------------
3840-- TYPES
3941--
4042
4143-- | Callbacks to manipulate a cursor from an Open*Cursor call
42−type Callbacks cursor =
43− { onSuccess :: cursor -> Effect Unit
44− , onError :: Error -> Effect Unit
45− , onComplete :: Effect Unit
44+type Callbacks cursor e =
45+ { onSuccess :: cursor -> Eff ( | e) Unit
46+ , onError :: Error -> Eff ( | e) Unit
47+ , onComplete :: Eff ( | e) Unit
4648 }
4749
50+
4851--------------------
4952-- INTERFACES
5053--
5154
5255-- | Retrieves the number of records matching the key range in query.
5356count
54− :: forall index
55− . (IDBIndex index)
56− => index
57+ :: forall e index. (IDBIndex index)
58+ => index
5759 -> Maybe KeyRange
58− -> Aff Int
60+ -> Aff (idb :: IDB | e) Int
5961count index range =
60− fromEffectFnAff $ Fn.runFn2 _count index (toNullable range)
62+ fromEffFnAff $ Fn.runFn2 _count index (toNullable range)
63+
6164
6265-- | Retrieves the value of the first record matching the given key range in query.
6366-- |
6467-- | NOTE
6568-- | The coercion from `a` to any type is unsafe and might throw a runtime error if incorrect.
6669get
67− :: forall a index
68− . (IDBIndex index)
70+ :: forall a e index. (IDBIndex index)
6971 => index
7072 -> KeyRange
71− -> Aff (Maybe a)
73+ -> Aff (idb :: IDB | e) (Maybe a)
7274get index range =
73− map (toMaybe >>> map unsafeFromForeign) $ fromEffectFnAff $ Fn.runFn2 _get index range
75+ map (toMaybe >>> map unsafeFromForeign) $ fromEffFnAff $ Fn.runFn2 _get index range
76+
7477
7578-- | Retrieves the keys of records matching the given key range in query
7679-- | (up to the number given if given).
7780getAllKeys
78− :: forall index
79− . (IDBIndex index)
81+ :: forall e index. (IDBIndex index)
8082 => index
8183 -> Maybe KeyRange
8284 -> Maybe Int
83− -> Aff (Array Key)
85+ -> Aff (idb :: IDB | e) (Array Key)
8486getAllKeys index range n =
85− map (map toKey) $ fromEffectFnAff $ Fn.runFn3 _getAllKeys index (toNullable range) (toNullable n)
87+ map (map toKey) $ fromEffFnAff $ Fn.runFn3 _getAllKeys index (toNullable range) (toNullable n)
88+
8689
8790-- | Retrieves the key of the first record matching the given key or key range in query.
8891getKey
89− :: forall index
90− . (IDBIndex index)
92+ :: forall e index. (IDBIndex index)
9193 => index
9294 -> KeyRange
93− -> Aff (Maybe Key)
95+ -> Aff (idb :: IDB | e) (Maybe Key)
9496getKey index range =
95− map (toMaybe >>> map toKey) $ fromEffectFnAff $ Fn.runFn2 _getKey index range
97+ map (toMaybe >>> map toKey) $ fromEffFnAff $ Fn.runFn2 _getKey index range
98+
9699
97100-- | Opens a ValueCursor over the records matching query, ordered by direction.
98101-- | If query is `Nothing`, all records in index are matched.
99102openCursor
100− :: forall index
101− . (IDBIndex index)
102− => index
103+ :: forall e e' index. (IDBIndex index)
104+ => index
103105 -> Maybe KeyRange
104106 -> CursorDirection
105− -> Callbacks ValueCursor
106− -> Aff Unit
107+ -> Callbacks ValueCursor e'
108+ -> Aff (idb :: IDB | e) Unit
107109openCursor index range dir cb =
108− fromEffectFnAff $ Fn.runFn4 _openCursor index (toNullable range) (show dir) cb
110+ fromEffFnAff $ Fn.runFn4 _openCursor index (toNullable range) (show dir) cb
111+
109112
110113-- | Opens a KeyCursor over the records matching query, ordered by direction.
111114-- | If query is `Nothing`, all records in index are matched.
112115openKeyCursor
113− :: forall index
114− . (IDBIndex index)
115− => index
116− -> Maybe KeyRange
117− -> CursorDirection
118− -> Callbacks KeyCursor
119− -> Aff Unit
116+ :: forall e e' index. (IDBIndex index)
117+ => index
118+ -> Maybe KeyRange
119+ -> CursorDirection
120+ -> Callbacks KeyCursor e'
121+ -> Aff (idb :: IDB | e) Unit
120122openKeyCursor index range dir cb =
121− fromEffectFnAff $ Fn.runFn4 _openKeyCursor index (toNullable range) (show dir) cb
123+ fromEffFnAff $ Fn.runFn4 _openKeyCursor index (toNullable range) (show dir) cb
124+
122125
123126--------------------
124127-- ATTRIBUTES
125128--
126129-- | Returns the key path of the index.
127130keyPath
128− :: Index
129− -> KeyPath
131+ :: Index
132+ -> KeyPath
130133keyPath =
131134 _keyPath
132135
136+
133137-- | Returns true if the index's multiEntry flag is set.
134138multiEntry
135− :: Index
136− -> Boolean
139+ :: Index
140+ -> Boolean
137141multiEntry =
138142 _multiEntry
139143
144+
140145-- | Returns the name of the index.
141146name
142− :: Index
143− -> String
147+ :: Index
148+ -> String
144149name =
145150 _name
146151
152+
147153-- | Returns the IDBObjectStore the index belongs to.
148154objectStore
149− :: Index
150− -> ObjectStore
155+ :: Index
156+ -> ObjectStore
151157objectStore =
152158 _objectStore
153159
160+
154161-- | Returns true if the index's unique flag is set.
155162unique
156− :: Index
157− -> Boolean
163+ :: Index
164+ -> Boolean
158165unique =
159166 _unique
160167
168+
161169--------------------
162170-- FFI
163171--
164172foreign import _keyPath
165− :: Index
166− -> Array String
173+ :: Index
174+ -> Array String
175+
167176
168177foreign import _multiEntry
169− :: Index
170− -> Boolean
178+ :: Index
179+ -> Boolean
180+
171181
172182foreign import _name
173− :: Index
174− -> String
183+ :: Index
184+ -> String
185+
175186
176187foreign import _objectStore
177− :: Index
178− -> ObjectStore
188+ :: Index
189+ -> ObjectStore
190+
179191
180192foreign import _unique
181− :: Index
182− -> Boolean
193+ :: Index
194+ -> Boolean
195+
183196
184197foreign import _count
185− :: forall index
186− . Fn2 index (Nullable KeyRange) (EffectFnAff Int)
198+ :: forall index e
199+ . Fn2 index (Nullable KeyRange) (EffFnAff (idb :: IDB | e) Int)
200+
187201
188202foreign import _get
189− :: forall index
190− . Fn2 index KeyRange (EffectFnAff (Nullable Foreign))
203+ :: forall index e
204+ . Fn2 index KeyRange (EffFnAff (idb :: IDB | e) (Nullable Foreign))
205+
191206
192207foreign import _getAllKeys
193− :: forall index
194− . Fn3 index (Nullable KeyRange) (Nullable Int) (EffectFnAff (Array Foreign))
208+ :: forall index e
209+ . Fn3 index (Nullable KeyRange) (Nullable Int) (EffFnAff (idb :: IDB | e) (Array Foreign))
210+
195211
196212foreign import _getKey
197− :: forall index
198− . Fn2 index KeyRange (EffectFnAff (Nullable Foreign))
213+ :: forall index e
214+ . Fn2 index KeyRange (EffFnAff (idb :: IDB | e) (Nullable Foreign))
215+
199216
200217foreign import _openCursor
201− :: forall index
202− . Fn4 index (Nullable KeyRange) String (Callbacks ValueCursor) (EffectFnAff Unit)
218+ :: forall index e e'
219+ . Fn4 index (Nullable KeyRange) String (Callbacks ValueCursor e') (EffFnAff (idb :: IDB | e) Unit)
220+
203221
204222foreign import _openKeyCursor
205− :: forall index
206− . Fn4 index (Nullable KeyRange) String (Callbacks KeyCursor) (EffectFnAff Unit)
223+ :: forall index e e'
224+ . Fn4 index (Nullable KeyRange) String (Callbacks KeyCursor e') (EffFnAff (idb :: IDB | e) Unit)
src/Database/IndexedDB/IDBKey/Internal.js+3−3
@@ -1,8 +1,8 @@
1−export function _dateTimeToForeign(y, m, d, h, mi, s, ms) {
1+exports._dateTimeToForeign = function _dateTimeToForeign(y, m, d, h, mi, s, ms) {
22 return new Date(y, m, d, h, mi, s, ms);
33};
44
5−export function _readDateTime(parse, right, left, date) {
5+exports._readDateTime = function _readDateTime(parse, right, left, date) {
66 if (Object.getPrototypeOf(date) !== Date.prototype) {
77 return left(typeof date);
88 }
@@ -24,7 +24,7 @@ export function _readDateTime(parse, right, left, date) {
2424 return right(mdate);
2525};
2626
27−export function _unsafeReadDateTime(parse, date) {
27+exports._unsafeReadDateTime = function _unsafeReadDateTime(parse, date) {
2828 const y = date.getFullYear();
2929 const m = date.getMonth() + 1;
3030 const d = date.getDate();
src/Database/IndexedDB/IDBKey/Internal.purs+106−90
@@ -3,36 +3,35 @@
33-- | NOTE: Binary keys aren't supported yet.
44module Database.IndexedDB.IDBKey.Internal
55 ( Key
6− , class IDBKey
7− , toKey
8− , fromKey
9− , unsafeFromKey
6+ , class IDBKey, toKey , fromKey , unsafeFromKey
107 , none
118 ) where
129
1310import Prelude
1411
15−import Control.Alt ((<|>))
16−import Control.Monad.Except (ExceptT(..), runExceptT)
17−import Data.Date as Date
18−import Data.DateTime (DateTime(..), Time(..))
19−import Data.Either (Either(..), either, isRight)
20−import Data.Enum (fromEnum, toEnum)
21−import Foreign as Foreign
22−import Foreign (Foreign, F)
23−import Data.Function.Uncurried as Fn
12+import Control.Alt ((<|>))
13+import Control.Monad.Except (ExceptT(..), runExceptT)
14+import Data.Date as Date
15+import Data.DateTime (DateTime(..), Time(..))
16+import Data.Either (Either(..), either, isRight)
17+import Data.Enum (fromEnum, toEnum)
18+import Data.Foreign as Foreign
19+import Data.Foreign (Foreign, F)
20+import Data.Function.Uncurried as Fn
2421import Data.Function.Uncurried (Fn2, Fn4, Fn7)
25−import Data.Identity (Identity(..))
26−import Data.List.NonEmpty (NonEmptyList(..))
27−import Data.List.Types (List(..))
28−import Data.Maybe (Maybe(..))
29−import Data.NonEmpty (NonEmpty(..))
30−import Data.Nullable (Nullable, toNullable)
31−import Data.Time as Time
32−import Data.Traversable (traverse)
22+import Data.Identity (Identity(..))
23+import Data.List.NonEmpty (NonEmptyList(..))
24+import Data.List.Types (List(..))
25+import Data.Maybe (Maybe(..))
26+import Data.NonEmpty (NonEmpty(..))
27+import Data.Nullable (Nullable, toNullable)
28+import Data.Time as Time
29+import Data.Traversable (traverse)
30+
3331
3432newtype Key = Key Foreign
3533
34+
3635--------------------
3736-- INTERFACES
3837--
@@ -40,90 +39,100 @@ newtype Key = Key Foreign
4039-- | to a known type (e.g if you only strings as keys, or perfectly knows the
4140-- | type of a given key).
4241class IDBKey a where
43− toKey :: a -> Key
44− fromKey :: Key -> F a
42+ toKey :: a -> Key
43+ fromKey :: Key -> F a
4544 unsafeFromKey :: Key -> a
4645
46+
4747none :: Maybe Key
4848none =
4949 Nothing
5050
51+
5152--------------------
5253-- INSTANCES
5354--
5455instance eqKey :: Eq Key where
5556 eq a b = (runExceptT >>> runIdentity >>> isRight) $
56− eq <$> ((fromKey a) :: F Int) <*> fromKey b
57− <|>
58− eq <$> ((fromKey a) :: F Number) <*> fromKey b
59− <|>
60− eq <$> ((fromKey a) :: F String) <*> fromKey b
61− <|>
62− eq <$> ((fromKey a) :: F DateTime) <*> fromKey b
63− <|>
64− eq <$> ((fromKey a) :: F (Array Key)) <*> fromKey b
57+ eq <$> ((fromKey a) :: F Int) <*> fromKey b
58+ <|>
59+ eq <$> ((fromKey a) :: F Number) <*> fromKey b
60+ <|>
61+ eq <$> ((fromKey a) :: F String) <*> fromKey b
62+ <|>
63+ eq <$> ((fromKey a) :: F DateTime) <*> fromKey b
64+ <|>
65+ eq <$> ((fromKey a) :: F (Array Key)) <*> fromKey b
6566 where
66− runIdentity :: forall a. Identity a -> a
67− runIdentity (Identity x) = x
67+ runIdentity :: forall a. Identity a -> a
68+ runIdentity (Identity x) = x
69+
6870
6971instance ordKey :: Ord Key where
70− compare a b = (runExceptT >>> runIdentity >>> either (const LT) identity) $
71− compare <$> ((fromKey a) :: F Int) <*> fromKey b
72− <|>
73− compare <$> ((fromKey a) :: F Number) <*> fromKey b
74− <|>
75− compare <$> ((fromKey a) :: F String) <*> fromKey b
76− <|>
77− compare <$> ((fromKey a) :: F DateTime) <*> fromKey b
78− <|>
79− compare <$> ((fromKey a) :: F (Array Key)) <*> fromKey b
72+ compare a b = (runExceptT >>> runIdentity >>> either (const LT) id) $
73+ compare <$> ((fromKey a) :: F Int) <*> fromKey b
74+ <|>
75+ compare <$> ((fromKey a) :: F Number) <*> fromKey b
76+ <|>
77+ compare <$> ((fromKey a) :: F String) <*> fromKey b
78+ <|>
79+ compare <$> ((fromKey a) :: F DateTime) <*> fromKey b
80+ <|>
81+ compare <$> ((fromKey a) :: F (Array Key)) <*> fromKey b
8082 where
81− runIdentity :: forall a. Identity a -> a
82− runIdentity (Identity x) = x
83+ runIdentity :: forall a. Identity a -> a
84+ runIdentity (Identity x) = x
85+
8386
8487instance showKey :: Show Key where
8588 show a = (runExceptT >>> format) $
86− (show <$> (fromKey a :: F Int))
87− <|>
88− (show <$> (fromKey a :: F Number))
89− <|>
90− (show <$> (fromKey a :: F String))
91− <|>
92− (show <$> (fromKey a :: F DateTime))
93− <|>
94− (show <$> (fromKey a :: F (Array Key)))
89+ (show <$> (fromKey a :: F Int))
90+ <|>
91+ (show <$> (fromKey a :: F Number))
92+ <|>
93+ (show <$> (fromKey a :: F String))
94+ <|>
95+ (show <$> (fromKey a :: F DateTime))
96+ <|>
97+ (show <$> (fromKey a :: F (Array Key)))
9598 where
96− format :: forall a. Identity (Either a String) -> String
97− format (Identity x) =
98− either (const "(Key)") (\s -> "(Key " <> s <> ")") x
99+ format :: forall a. Identity (Either a String) -> String
100+ format (Identity x) =
101+ either (const "(Key)") (\s -> "(Key " <> s <> ")") x
102+
99103
100104instance idbKeyKey :: IDBKey Key where
101− toKey = identity
102− fromKey = pure
103− unsafeFromKey = identity
105+ toKey = id
106+ fromKey = pure
107+ unsafeFromKey = id
108+
104109
105110instance idbKeyForeign :: IDBKey Foreign where
106− toKey = Key
107− fromKey (Key f) = pure f
111+ toKey = Key
112+ fromKey (Key f) = pure f
108113 unsafeFromKey (Key f) = f
109114
115+
110116instance idbKeyInt :: IDBKey Int where
111− toKey = Foreign.unsafeToForeign >>> Key
112− fromKey (Key f) = Foreign.readInt f
117+ toKey = Foreign.toForeign >>> Key
118+ fromKey (Key f) = Foreign.readInt f
113119 unsafeFromKey (Key f) = Foreign.unsafeFromForeign f
114120
121+
115122instance idbKeyNumber :: IDBKey Number where
116− toKey = Foreign.unsafeToForeign >>> Key
117− fromKey (Key f) = Foreign.readNumber f
123+ toKey = Foreign.toForeign >>> Key
124+ fromKey (Key f) = Foreign.readNumber f
118125 unsafeFromKey (Key f) = Foreign.unsafeFromForeign f
119126
127+
120128instance idbKeyString :: IDBKey String where
121− toKey = Foreign.unsafeToForeign >>> Key
122− fromKey (Key f) = Foreign.readString f
129+ toKey = Foreign.toForeign >>> Key
130+ fromKey (Key f) = Foreign.readString f
123131 unsafeFromKey (Key f) = Foreign.unsafeFromForeign f
124132
133+
125134instance idbKeyDate :: IDBKey DateTime where
126− toKey (DateTime d t) = Key $ Fn.runFn7 _dateTimeToForeign
135+ toKey (DateTime d t) = Key $ Fn.runFn7 _dateTimeToForeign
127136 (fromEnum $ Date.year d)
128137 (fromEnum $ Date.month d)
129138 (fromEnum $ Date.day d)
@@ -131,51 +140,58 @@ instance idbKeyDate :: IDBKey DateTime where
131140 (fromEnum $ Time.minute t)
132141 (fromEnum $ Time.second t)
133142 (fromEnum $ Time.millisecond t)
134− fromKey (Key f) = Fn.runFn4 _readDateTime dateTime dateTimeF dateTimeE f
143+ fromKey (Key f) = Fn.runFn4 _readDateTime dateTime dateTimeF dateTimeE f
135144 unsafeFromKey (Key f) = Fn.runFn2 _unsafeReadDateTime dateTime f
136145
146+
137147instance idbKeyArray :: IDBKey a => IDBKey (Array a) where
138− toKey = Foreign.unsafeToForeign >>> Key
139− fromKey (Key f) = Foreign.readArray f >>= traverse (Key >>> fromKey)
148+ toKey = Foreign.toForeign >>> Key
149+ fromKey (Key f) = Foreign.readArray f >>= traverse (Key >>> fromKey)
140150 unsafeFromKey (Key f) = map unsafeFromKey (Foreign.unsafeFromForeign f)
141151
152+
142153-- FFI constructor to build a DateTime from years, months, days, hours, minutes, seconds and millis
143154dateTime
144− :: Int -- ^ years
145− -> Int -- ^ months
146− -> Int -- ^ days
147− -> Int -- ^ hours
148− -> Int -- ^ minutes
149− -> Int -- ^ seconds
150− -> Int -- ^ milliseconds
151− -> Nullable DateTime
155+ :: Int -- ^ years
156+ -> Int -- ^ months
157+ -> Int -- ^ days
158+ -> Int -- ^ hours
159+ -> Int -- ^ minutes
160+ -> Int -- ^ seconds
161+ -> Int -- ^ milliseconds
162+ -> Nullable DateTime
152163dateTime y m d h mi s ms =
153164 toNullable $ DateTime
154− <$> (Date.canonicalDate <$> toEnum y <*> toEnum m <*> toEnum d)
155− <*> (Time <$> toEnum h <*> toEnum mi <*> toEnum s <*> toEnum ms)
165+ <$> (Date.canonicalDate <$> toEnum y <*> toEnum m <*> toEnum d)
166+ <*> (Time <$> toEnum h <*> toEnum mi <*> toEnum s <*> toEnum ms)
167+
156168
157169-- FFI constructor to convert a JS `Date` into a successful `F DateTime`
158170dateTimeF
159− :: DateTime
160− -> F DateTime
171+ :: DateTime
172+ -> F DateTime
161173dateTimeF =
162174 Right >>> Identity >>> ExceptT
163175
176+
164177-- FFI constructor to convert a string into an errored `F DateTime`
165178dateTimeE
166− :: String
167− -> F DateTime
179+ :: String
180+ -> F DateTime
168181dateTimeE =
169182 Foreign.TypeMismatch "Date" >>> flip NonEmpty Nil >>> NonEmptyList >>> Left >>> Identity >>> ExceptT
170183
184+
171185--------------------
172186-- FFI
173187--
174188foreign import _dateTimeToForeign
175− :: Fn7 Int Int Int Int Int Int Int Foreign
189+ :: Fn7 Int Int Int Int Int Int Int Foreign
190+
176191
177192foreign import _readDateTime
178− :: Fn4 (Int -> Int -> Int -> Int -> Int -> Int -> Int -> Nullable DateTime) (DateTime -> F DateTime) (String -> F DateTime) Foreign (F DateTime)
193+ :: Fn4 (Int -> Int -> Int -> Int -> Int -> Int -> Int -> Nullable DateTime) (DateTime -> F DateTime) (String -> F DateTime) Foreign (F DateTime)
194+
179195
180196foreign import _unsafeReadDateTime
181− :: Fn2 (Int -> Int -> Int -> Int -> Int -> Int -> Int -> Nullable DateTime) Foreign DateTime
197+ :: Fn2 (Int -> Int -> Int -> Int -> Int -> Int -> Int -> Nullable DateTime) Foreign DateTime
src/Database/IndexedDB/IDBKeyRange.js+9−9
@@ -1,4 +1,4 @@
1−export function _bound(lower, upper, lowerOpen, upperOpen) {
1+exports._bound = function _bound(lower, upper, lowerOpen, upperOpen) {
22 try {
33 return IDBKeyRange.bound(lower, upper, lowerOpen, upperOpen);
44 } catch (e) {
@@ -6,34 +6,34 @@ export function _bound(lower, upper, lowerOpen, upperOpen) {
66 }
77};
88
9−export function _includes(range, key) {
9+exports._includes = function _includes(range, key) {
1010 return range.includes(key);
1111};
1212
13−export function _lower(range) {
13+exports._lower = function _lower(range) {
1414 return range.lower;
1515};
1616
17−export function _lowerBound(lower, open) {
17+exports._lowerBound = function _lowerBound(lower, open) {
1818 return IDBKeyRange.lowerBound(lower, open);
1919};
2020
21−export function _lowerOpen(range) {
21+exports._lowerOpen = function _lowerOpen(range) {
2222 return range.lowerOpen;
2323};
2424
25−export function _only(key) {
25+exports._only = function _only(key) {
2626 return IDBKeyRange.only(key);
2727};
2828
29−export function _upper(range) {
29+exports._upper = function _upper(range) {
3030 return range.upper;
3131};
3232
33−export function _upperBound(upper, open) {
33+exports._upperBound = function _upperBound(upper, open) {
3434 return IDBKeyRange.upperBound(upper, open);
3535};
3636
37−export function _upperOpen(range) {
37+exports._upperOpen = function _upperOpen(range) {
3838 return range.upperOpen;
3939};
src/Database/IndexedDB/IDBKeyRange.purs+42−30
@@ -19,17 +19,18 @@ module Database.IndexedDB.IDBKeyRange
1919 , upperOpen
2020 ) where
2121
22−import Prelude (($), (>>>), map)
22+import Prelude (($), (>>>), map)
2323
24−import Foreign (Foreign)
25−import Data.Function.Uncurried as Fn
26−import Data.Function.Uncurried (Fn2, Fn4)
27−import Data.Maybe (Maybe)
28−import Data.Nullable (Nullable, toMaybe)
24+import Data.Foreign (Foreign)
25+import Data.Function.Uncurried as Fn
26+import Data.Function.Uncurried (Fn2, Fn4)
27+import Data.Maybe (Maybe)
28+import Data.Nullable (Nullable, toMaybe)
2929
30−import Database.IndexedDB.Core (class IDBKeyRange, KeyRange)
30+import Database.IndexedDB.Core (class IDBKeyRange, KeyRange)
3131import Database.IndexedDB.IDBKey.Internal (class IDBKey, Key, toKey, unsafeFromKey)
3232
33+
3334--------------------
3435-- TYPES
3536--
@@ -37,54 +38,55 @@ import Database.IndexedDB.IDBKey.Internal (class IDBKey, Key, toKey, unsafeFromK
3738-- | Type alias for open
3839type Open = Boolean
3940
41+
4042--------------------
4143-- CONSTRUCTORS
4244--
4345
4446-- | Returns a new IDBKeyRange spanning only key.
4547only
46− :: forall a
47− . (IDBKey a)
48− => a
49− -> KeyRange
48+ :: forall a. (IDBKey a)
49+ => a
50+ -> KeyRange
5051only key =
5152 _only (unsafeFromKey $ toKey key)
5253
54+
5355-- | Returns a new IDBKeyRange starting at key with no upper bound.
5456-- | If `Open` is `true`, key is not included in the range.
5557lowerBound
56− :: forall a
57− . (IDBKey a)
58− => a
59− -> Open
60− -> KeyRange
58+ :: forall a. (IDBKey a)
59+ => a
60+ -> Open
61+ -> KeyRange
6162lowerBound key open =
6263 Fn.runFn2 _lowerBound (unsafeFromKey $ toKey key) open
6364
65+
6466-- | Returns a new IDBKeyRange with no lower bound and ending at key.
6567-- | If `Open` is `true`, key is not included in the range.
6668upperBound
67− :: forall a
68− . (IDBKey a)
69− => a
70− -> Open
71− -> KeyRange
69+ :: forall a. (IDBKey a)
70+ => a
71+ -> Open
72+ -> KeyRange
7273upperBound key open =
7374 Fn.runFn2 _upperBound (unsafeFromKey $ toKey key) open
7475
76+
7577-- | Returns a new IDBKeyRange spanning from `lower` to `upper`.
7678-- | If `lowerOpen` is `true`, `lower` is not included in the range.
7779-- | If `upperOpen` is `true`, `upper` is not included in the range.
7880-- |
7981-- | It throws a `DataError` if the bound is invalid.
8082bound
81− :: forall key
82− . (IDBKey key)
83− => { lower :: key, upper :: key, lowerOpen :: Boolean, upperOpen :: Boolean }
84− -> Maybe KeyRange
83+ :: forall key. (IDBKey key)
84+ => { lower :: key, upper :: key, lowerOpen :: Boolean, upperOpen :: Boolean }
85+ -> Maybe KeyRange
8586bound { lower: key1, upper: key2, lowerOpen: open1, upperOpen: open2 } =
8687 toMaybe
87− $ Fn.runFn4 _bound (unsafeFromKey $ toKey key1) (unsafeFromKey $ toKey key2) open1 open2
88+ $ Fn.runFn4 _bound (unsafeFromKey $ toKey key1) (unsafeFromKey $ toKey key2) open1 open2
89+
8890
8991--------------------
9092-- INTERFACE
@@ -92,15 +94,14 @@ bound { lower: key1, upper: key2, lowerOpen: open1, upperOpen: open2 } =
9294
9395-- | Returns true if key is included in the range, and false otherwise.
9496includes
95− :: forall key range
96− . (IDBKey key)
97− => (IDBKeyRange range)
97+ :: forall key range. (IDBKey key) => (IDBKeyRange range)
9898 => range
9999 -> key
100100 -> Boolean
101101includes range =
102102 toKey >>> unsafeFromKey >>> Fn.runFn2 _includes range
103103
104+
104105--------------------
105106-- ATTRIBUTES
106107--
@@ -111,6 +112,7 @@ lower
111112lower =
112113 _lower >>> toMaybe >>> map toKey
113114
115+
114116-- | Returns upper bound if any.
115117upper
116118 :: KeyRange
@@ -118,6 +120,7 @@ upper
118120upper =
119121 _upper >>> toMaybe >>> map toKey
120122
123+
121124-- | Returns true if the lower open flag is set, false otherwise.
122125lowerOpen
123126 :: KeyRange
@@ -125,6 +128,7 @@ lowerOpen
125128lowerOpen =
126129 _lowerOpen
127130
131+
128132-- | Returns true if the upper open flag is set, false otherwise.
129133upperOpen
130134 :: KeyRange
@@ -132,6 +136,7 @@ upperOpen
132136upperOpen =
133137 _upperOpen
134138
139+
135140--------------------
136141-- FFI
137142--
@@ -143,28 +148,35 @@ foreign import _only
143148foreign import _lowerBound
144149 :: Fn2 Foreign Boolean KeyRange
145150
151+
146152foreign import _upperBound
147153 :: Fn2 Foreign Boolean KeyRange
148154
155+
149156foreign import _bound
150157 :: Fn4 Foreign Foreign Boolean Boolean (Nullable KeyRange)
151158
159+
152160foreign import _includes
153161 :: forall range
154− . Fn2 range Foreign Boolean
162+ . Fn2 range Foreign Boolean
163+
155164
156165foreign import _lower
157166 :: KeyRange
158167 -> Nullable Foreign
159168
169+
160170foreign import _upper
161171 :: KeyRange
162172 -> Nullable Foreign
163173
174+
164175foreign import _lowerOpen
165176 :: KeyRange
166177 -> Boolean
167178
179+
168180foreign import _upperOpen
169181 :: KeyRange
170182 -> Boolean
src/Database/IndexedDB/IDBObjectStore.js+12−12
@@ -15,7 +15,7 @@ const toArray = function toArray(xs) {
1515};
1616
1717
18−export function _add(store, value, key) {
18+exports._add = function _add(store, value, key) {
1919 return function aff(error, success) {
2020 try {
2121 const request = store.add(value, key || undefined);
@@ -31,11 +31,11 @@ export function _add(store, value, key) {
3131 };
3232};
3333
34−export function _autoIncrement(store) {
34+exports._autoIncrement = function _autoIncrement(store) {
3535 return store.autoIncrement;
3636};
3737
38−export function _clear(store) {
38+exports._clear = function _clear(store) {
3939 return function aff(error, success) {
4040 try {
4141 const request = store.clear();
@@ -51,7 +51,7 @@ export function _clear(store) {
5151 };
5252};
5353
54−export function _createIndex(store, name, path, params) {
54+exports._createIndex = function _createIndex(store, name, path, params) {
5555 return function aff(error, success) {
5656 var keyPath;
5757
@@ -81,7 +81,7 @@ export function _createIndex(store, name, path, params) {
8181 };
8282};
8383
84−export function _deleteIndex(store, name) {
84+exports._deleteIndex = function _deleteIndex(store, name) {
8585 return function aff(error, success) {
8686 try {
8787 store.deleteIndex(name);
@@ -96,7 +96,7 @@ export function _deleteIndex(store, name) {
9696 };
9797};
9898
99−export function _delete(store, query) {
99+exports._delete = function _delete(store, query) {
100100 return function aff(error, success) {
101101 try {
102102 const request = store.delete(query);
@@ -112,7 +112,7 @@ export function _delete(store, query) {
112112 };
113113};
114114
115−export function _index(store, name) {
115+exports._index = function _index(store, name) {
116116 return function aff(error, success) {
117117 try {
118118 const index = store.index(name);
@@ -127,11 +127,11 @@ export function _index(store, name) {
127127 };
128128};
129129
130−export function _indexNames(store) {
130+exports._indexNames = function _indexNames(store) {
131131 return toArray(store.indexNames);
132132};
133133
134−export function _keyPath(store) {
134+exports._keyPath = function _keyPath(store) {
135135 const path = store.keyPath;
136136
137137 if (Array.isArray(path)) {
@@ -145,11 +145,11 @@ export function _keyPath(store) {
145145 return [];
146146};
147147
148−export function _name(store) {
148+exports._name = function _name(store) {
149149 return store.name;
150150};
151151
152−export function _put(store, value, key) {
152+exports._put = function _put(store, value, key) {
153153 return function aff(error, success) {
154154 try {
155155 const request = store.put(value, key || undefined);
@@ -165,6 +165,6 @@ export function _put(store, value, key) {
165165 };
166166};
167167
168−export function _transaction(store) {
168+exports._transaction = function _transaction(store) {
169169 return store.transaction;
170170};
src/Database/IndexedDB/IDBObjectStore.purs+76−58
@@ -25,18 +25,19 @@ module Database.IndexedDB.IDBObjectStore
2525 , module Database.IndexedDB.IDBIndex
2626 ) where
2727
28−import Database.IndexedDB.Core
28+import Prelude (Unit, map, ($), (<$>), (>>>), (<<<))
29+
30+import Control.Monad.Aff (Aff)
31+import Control.Monad.Aff.Compat (EffFnAff, fromEffFnAff)
32+import Data.Foreign (Foreign)
33+import Data.Function.Uncurried as Fn
34+import Data.Function.Uncurried (Fn2, Fn3, Fn4)
35+import Data.Maybe (Maybe)
36+import Data.Nullable (Nullable, toNullable)
2937
30−import Data.Function.Uncurried (Fn2, Fn3, Fn4)
31−import Data.Function.Uncurried as Fn
32−import Data.Maybe (Maybe)
33−import Data.Nullable (Nullable, toNullable)
34−import Database.IndexedDB.IDBIndex (count, get, getAllKeys, getKey, openCursor, openKeyCursor)
38+import Database.IndexedDB.Core
39+import Database.IndexedDB.IDBIndex (count, get, getAllKeys, getKey, openCursor, openKeyCursor)
3540import Database.IndexedDB.IDBKey.Internal (class IDBKey, Key, unsafeFromKey, toKey)
36−import Effect.Aff (Aff)
37−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
38−import Foreign (Foreign)
39−import Prelude (Unit, map, ($), (<$>), (>>>), (<<<))
4041
4142--------------------
4243-- TYPES
@@ -45,6 +46,7 @@ import Prelude (Unit, map, ($), (<$>), (>>>), (<<<))
4546-- | Type alias for IndexName
4647type IndexName = String
4748
49+
4850-- | Flags to set on the index.
4951-- |
5052-- | An index has a `unique` flag. When this flag is set, the index enforces that no
@@ -59,16 +61,18 @@ type IndexName = String
5961-- | If the `multiEntry` flag is true, then the one record is added to the index for each
6062-- | of the subkeys.
6163type IndexParameters =
62− { unique :: Boolean
64+ { unique :: Boolean
6365 , multiEntry :: Boolean
6466 }
6567
68+
6669defaultParameters :: IndexParameters
6770defaultParameters =
68− { unique: false
69− , multiEntry: false
71+ { unique : false
72+ , multiEntry : false
7073 }
7174
75+
7276--------------------
7377-- INTERFACES
7478--
@@ -81,24 +85,23 @@ defaultParameters =
8185-- | If add() is used, and if a record with the key already exists the request will fail,
8286-- | with a "ConstraintError" DOMException.
8387add
84− :: forall key val store
85− . (IDBKey key)
86− => (IDBObjectStore store)
88+ :: forall e key val store. (IDBKey key) => (IDBObjectStore store)
8789 => store
8890 -> val
8991 -> Maybe key
90− -> Aff Key
92+ -> Aff (idb :: IDB | e) Key
9193add store value key =
92− map toKey $ fromEffectFnAff $ Fn.runFn3 _add store value (toNullable $ (toKey >>> unsafeFromKey) <$> key)
94+ map toKey $ fromEffFnAff $ Fn.runFn3 _add store value (toNullable $ (toKey >>> unsafeFromKey) <$> key)
95+
9396
9497-- | Deletes all records in store.
9598clear
96− :: forall store
97− . (IDBObjectStore store)
99+ :: forall e store. (IDBObjectStore store)
98100 => store
99− -> Aff Unit
101+ -> Aff (idb :: IDB | e) Unit
100102clear =
101− fromEffectFnAff <<< _clear
103+ fromEffFnAff <<< _clear
104+
102105
103106-- | Creates a new index in store with the given name, keyPath and options and
104107-- | returns a new IDBIndex. If the keyPath and options define constraints that
@@ -107,47 +110,47 @@ clear =
107110-- |
108111-- | Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
109112createIndex
110− :: forall store
111− . (IDBObjectStore store)
113+ :: forall e store. (IDBObjectStore store)
112114 => store
113115 -> IndexName
114116 -> KeyPath
115117 -> IndexParameters
116− -> Aff Index
118+ -> Aff (idb :: IDB | e) Index
117119createIndex store name' path params =
118− fromEffectFnAff $ Fn.runFn4 _createIndex store name' path params
120+ fromEffFnAff $ Fn.runFn4 _createIndex store name' path params
121+
119122
120123-- | Deletes records in store with the given key or in the given key range in query.
121124delete
122− :: forall store
123− . (IDBObjectStore store)
125+ :: forall e store. (IDBObjectStore store)
124126 => store
125127 -> KeyRange
126− -> Aff Unit
128+ -> Aff (idb :: IDB | e) Unit
127129delete store range =
128− fromEffectFnAff $ Fn.runFn2 _delete store range
130+ fromEffFnAff $ Fn.runFn2 _delete store range
131+
129132
130133-- | Deletes the index in store with the given name.
131134-- |
132135-- | Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
133136deleteIndex
134− :: forall store
135− . (IDBObjectStore store)
137+ :: forall e store. (IDBObjectStore store)
136138 => store
137139 -> IndexName
138− -> Aff Unit
140+ -> Aff (idb :: IDB | e) Unit
139141deleteIndex store name' =
140− fromEffectFnAff $ Fn.runFn2 _deleteIndex store name'
142+ fromEffFnAff $ Fn.runFn2 _deleteIndex store name'
143+
141144
142145-- | Returns an IDBIndex for the index named name in store.
143146index
144− :: forall store
145− . (IDBObjectStore store)
147+ :: forall e store. (IDBObjectStore store)
146148 => store
147149 -> IndexName
148− -> Aff Index
150+ -> Aff (idb :: IDB | e) Index
149151index store name' =
150− fromEffectFnAff $ Fn.runFn2 _index store name'
152+ fromEffFnAff $ Fn.runFn2 _index store name'
153+
151154
152155-- | Adds or updates a record in store with the given value and key.
153156-- |
@@ -156,15 +159,14 @@ index store name' =
156159-- |
157160-- | If put() is used, any existing record with the key will be replaced.
158161put
159− :: forall val key store
160− . (IDBKey key)
161− => (IDBObjectStore store)
162+ :: forall e val key store. (IDBKey key) => (IDBObjectStore store)
162163 => store
163164 -> val
164165 -> Maybe key
165− -> Aff Key
166+ -> Aff (idb :: IDB | e) Key
166167put store value key =
167− map toKey $ fromEffectFnAff $ Fn.runFn3 _put store value (toNullable $ (toKey >>> unsafeFromKey) <$> key)
168+ map toKey $ fromEffFnAff $ Fn.runFn3 _put store value (toNullable $ (toKey >>> unsafeFromKey) <$> key)
169+
168170
169171--------------------
170172-- ATTRIBUTES
@@ -176,6 +178,7 @@ autoIncrement
176178autoIncrement =
177179 _autoIncrement
178180
181+
179182--| Returns a list of the names of indexes in the store.
180183indexNames
181184 :: ObjectStore
@@ -183,6 +186,7 @@ indexNames
183186indexNames =
184187 _indexNames
185188
189+
186190-- | Returns the key path of the store, or empty array if none
187191keyPath
188192 :: ObjectStore
@@ -190,6 +194,7 @@ keyPath
190194keyPath =
191195 _keyPath
192196
197+
193198-- | Returns the name of the store.
194199name
195200 :: ObjectStore
@@ -197,6 +202,7 @@ name
197202name =
198203 _name
199204
205+
200206-- | Returns the associated transaction.
201207transaction
202208 :: ObjectStore
@@ -204,53 +210,65 @@ transaction
204210transaction =
205211 _transaction
206212
213+
207214--------------------
208215-- FFI
209216--
210217foreign import _add
211− :: forall val store
212− . Fn3 store val (Nullable Foreign) (EffectFnAff Foreign)
218+ :: forall e val store
219+ . Fn3 store val (Nullable Foreign) (EffFnAff (idb :: IDB | e) Foreign)
220+
213221
214222foreign import _autoIncrement
215223 :: ObjectStore
216224 -> Boolean
217225
226+
218227foreign import _clear
219− :: forall store
220− . store
221− -> EffectFnAff Unit
228+ :: forall e store
229+ . store
230+ -> EffFnAff (idb :: IDB | e) Unit
231+
222232
223233foreign import _createIndex
224− :: forall store
225− . Fn4 store String (Array String) { unique :: Boolean, multiEntry :: Boolean } (EffectFnAff Index)
234+ :: forall e store
235+ . Fn4 store String (Array String) { unique :: Boolean, multiEntry :: Boolean } (EffFnAff (idb :: IDB | e) Index)
236+
226237
227238foreign import _delete
228− :: forall store
229− . Fn2 store KeyRange (EffectFnAff Unit)
239+ :: forall e store
240+ . Fn2 store KeyRange (EffFnAff (idb :: IDB | e) Unit)
241+
230242
231243foreign import _deleteIndex
232− :: forall store
233− . Fn2 store String (EffectFnAff Unit)
244+ :: forall e store
245+ . Fn2 store String (EffFnAff (idb :: IDB | e) Unit)
246+
234247
235248foreign import _index
236− :: forall store
237− . Fn2 store String (EffectFnAff Index)
249+ :: forall e store
250+ . Fn2 store String (EffFnAff (idb :: IDB | e) Index)
251+
238252
239253foreign import _indexNames
240254 :: ObjectStore
241255 -> Array String
242256
257+
243258foreign import _keyPath
244259 :: ObjectStore
245260 -> Array String
246261
262+
247263foreign import _name
248264 :: ObjectStore
249265 -> String
250266
267+
251268foreign import _put
252− :: forall val store
253− . Fn3 store val (Nullable Foreign) (EffectFnAff Foreign)
269+ :: forall e val store
270+ . Fn3 store val (Nullable Foreign) (EffFnAff (idb :: IDB | e) Foreign)
271+
254272
255273foreign import _transaction
256274 :: ObjectStore
src/Database/IndexedDB/IDBTransaction.js+9−9
@@ -1,4 +1,4 @@
1−export function _abort(tx) {
1+exports._abort = function _abort(tx) {
22 return function aff(error, success) {
33 try {
44 tx.abort();
@@ -13,17 +13,17 @@ export function _abort(tx) {
1313 };
1414};
1515
16−export function _db(tx) {
16+exports._db = function _db(tx) {
1717 return tx.db;
1818};
1919
20−export function _error(tx) {
20+exports._error = function _error(tx) {
2121 return tx.error == null
2222 ? null
2323 : tx.error;
2424};
2525
26−export function _mode(ReadOnly, ReadWrite, VersionChange, tx) {
26+exports._mode = function _mode(ReadOnly, ReadWrite, VersionChange, tx) {
2727 if (tx.mode === 'readwrite') {
2828 return ReadWrite;
2929 } else if (tx.mode === 'versionchange') {
@@ -33,7 +33,7 @@ export function _mode(ReadOnly, ReadWrite, VersionChange, tx) {
3333 return ReadOnly;
3434};
3535
36−export function _objectStore(tx, name) {
36+exports._objectStore = function _objectStore(tx, name) {
3737 return function aff(error, success) {
3838 try {
3939 const store = tx.objectStore(name);
@@ -48,11 +48,11 @@ export function _objectStore(tx, name) {
4848 };
4949};
5050
51−export function _objectStoreNames(tx) {
51+exports._objectStoreNames = function _objectStoreNames(tx) {
5252 return tx.objectStoreNames;
5353};
5454
55−export function _onAbort(tx, f) {
55+exports._onAbort = function _onAbort(tx, f) {
5656 return function aff(error, success) {
5757 tx.onabort = function onabort() {
5858 f();
@@ -65,7 +65,7 @@ export function _onAbort(tx, f) {
6565 };
6666};
6767
68−export function _onComplete(tx, f) {
68+exports._onComplete = function _onComplete(tx, f) {
6969 return function aff(error, success) {
7070 tx.oncomplete = function oncomplete() {
7171 f();
@@ -78,7 +78,7 @@ export function _onComplete(tx, f) {
7878 };
7979};
8080
81−export function _onError(tx, f) {
81+exports._onError = function _onError(tx, f) {
8282 return function aff(error, success) {
8383 tx.onerror = function onerror(e) {
8484 f(e.target.error)();
src/Database/IndexedDB/IDBTransaction.purs+59−40
@@ -14,17 +14,19 @@ module Database.IndexedDB.IDBTransaction
1414 , onError
1515 ) where
1616
17+import Prelude (Unit, ($), (<<<), (>>>))
18+
19+import Control.Monad.Aff (Aff)
20+import Control.Monad.Aff.Compat (EffFnAff, fromEffFnAff)
21+import Control.Monad.Eff (Eff)
22+import Control.Monad.Eff.Exception (Error)
23+import Data.Function.Uncurried as Fn
24+import Data.Function.Uncurried (Fn2, Fn4)
25+import Data.Maybe (Maybe)
26+import Data.Nullable (Nullable, toMaybe)
27+
1728import Database.IndexedDB.Core
1829
19−import Data.Function.Uncurried (Fn2, Fn4)
20−import Data.Function.Uncurried as Fn
21−import Data.Maybe (Maybe)
22−import Data.Nullable (Nullable, toMaybe)
23−import Effect (Effect)
24−import Effect.Aff (Aff)
25−import Effect.Aff.Compat (EffectFnAff, fromEffectFnAff)
26−import Effect.Exception (Error)
27−import Prelude (Unit, ($), (<<<), (>>>))
2830
2931--------------------
3032-- INTERFACES
@@ -33,22 +35,21 @@ import Prelude (Unit, ($), (<<<), (>>>))
3335-- | Aborts the transaction. All pending requests will fail with a "AbortError"
3436-- | DOMException and all changes made to the database will be reverted.
3537abort
36− :: forall tx
37− . (IDBTransaction tx)
38+ :: forall e tx. (IDBTransaction tx)
3839 => tx
39− -> Aff Unit
40+ -> Aff (idb :: IDB | e) Unit
4041abort =
41− fromEffectFnAff <<< _abort
42+ fromEffFnAff <<< _abort
4243
4344-- | Returns an IDBObjectStore in the transaction's scope.
4445objectStore
45− :: forall tx
46− . (IDBTransaction tx)
46+ :: forall e tx. (IDBTransaction tx)
4747 => tx
4848 -> String
49− -> Aff ObjectStore
49+ -> Aff (idb :: IDB | e) ObjectStore
5050objectStore tx name =
51− fromEffectFnAff $ Fn.runFn2 _objectStore tx name
51+ fromEffFnAff $ Fn.runFn2 _objectStore tx name
52+
5253
5354--------------------
5455-- ATTRIBUTES
@@ -61,6 +62,7 @@ db
6162db =
6263 _db
6364
65+
6466-- | If the transaction was aborted, returns the error (a DOMException) providing the reason.
6567error
6668 :: Transaction
@@ -68,6 +70,7 @@ error
6870error =
6971 _error >>> toMaybe
7072
73+
7174-- | Returns the mode the transaction was created with (`ReadOnly|ReadWrite`)
7275-- | , or `VersionChange` for an upgrade transaction.
7376mode
@@ -76,6 +79,7 @@ mode
7679mode =
7780 Fn.runFn4 _mode ReadOnly ReadWrite VersionChange
7881
82+
7983-- | Returns a list of the names of object stores in the transaction’s scope.
8084-- | For an upgrade transaction this is all object stores in the database.
8185objectStoreNames
@@ -84,70 +88,85 @@ objectStoreNames
8488objectStoreNames =
8589 _objectStoreNames
8690
91+
8792--------------------
8893-- EVENT HANDLERS
8994--
9095
9196-- | Event handler for the `abort` event.
9297onAbort
93− :: Transaction
94− -> Effect Unit
95− -> Aff Unit
98+ :: forall e e'
99+ . Transaction
100+ -> Eff ( | e') Unit
101+ -> Aff (idb :: IDB | e) Unit
96102onAbort db' f =
97− fromEffectFnAff $ Fn.runFn2 _onAbort db' f
103+ fromEffFnAff $ Fn.runFn2 _onAbort db' f
104+
98105
99106-- | Event handler for the `complete` event.
100107onComplete
101− :: Transaction
102− -> Effect Unit
103− -> Aff Unit
108+ :: forall e e'
109+ . Transaction
110+ -> Eff ( | e') Unit
111+ -> Aff (idb :: IDB | e) Unit
104112onComplete db' f =
105− fromEffectFnAff $ Fn.runFn2 _onComplete db' f
113+ fromEffFnAff $ Fn.runFn2 _onComplete db' f
114+
106115
107116-- | Event handler for the `error` event.
108117onError
109− :: Transaction
110− -> (Error -> Effect Unit)
111− -> Aff Unit
118+ :: forall e e'
119+ . Transaction
120+ -> (Error -> Eff ( | e') Unit)
121+ -> Aff (idb :: IDB | e) Unit
112122onError db' f =
113− fromEffectFnAff $ Fn.runFn2 _onError db' f
123+ fromEffFnAff $ Fn.runFn2 _onError db' f
124+
114125
115126--------------------
116127-- FFI
117128--
118129
119130foreign import _abort
120− :: forall tx
121− . tx
122− -> EffectFnAff Unit
131+ :: forall tx e
132+ . tx
133+ -> EffFnAff (idb :: IDB | e) Unit
134+
123135
124136foreign import _db
125137 :: Transaction
126138 -> Database
127139
140+
128141foreign import _error
129142 :: Transaction
130143 -> (Nullable Error)
131144
145+
132146foreign import _mode
133147 :: Fn4 TransactionMode TransactionMode TransactionMode Transaction TransactionMode
134148
149+
135150foreign import _objectStoreNames
136151 :: Transaction
137152 -> Array String
138153
154+
139155foreign import _objectStore
140− :: forall tx
141− . Fn2 tx String (EffectFnAff ObjectStore)
156+ :: forall tx e
157+ . Fn2 tx String (EffFnAff (idb :: IDB | e) ObjectStore)
158+
142159
143160foreign import _onAbort
144− :: forall tx
145− . Fn2 tx (Effect Unit) (EffectFnAff Unit)
161+ :: forall tx e e'
162+ . Fn2 tx (Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
163+
146164
147165foreign import _onComplete
148− :: forall tx
149− . Fn2 tx (Effect Unit) (EffectFnAff Unit)
166+ :: forall tx e e'
167+ . Fn2 tx (Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
168+
150169
151170foreign import _onError
152− :: forall tx
153− . Fn2 tx (Error -> Effect Unit) (EffectFnAff Unit)
171+ :: forall tx e e'
172+ . Fn2 tx (Error -> Eff ( | e') Unit) (EffFnAff (idb :: IDB | e) Unit)
test/Main.purs+910−971
@@ -2,1060 +2,1004 @@ module Test.Main where
22
33import Prelude
44
5−import Data.Array (head, drop)
6−import Data.Date as Date
7−import Data.DateTime (DateTime(..), Time(..))
8−import Data.DateTime.Instant (toDateTime)
9−import Data.Either (Either(..))
10−import Data.Enum (toEnum)
11−import Data.Maybe (Maybe(..), isNothing, maybe)
12−import Data.Time.Duration (Milliseconds(..))
13−import Data.Traversable (traverse)
14−import Data.Tuple (Tuple(..), uncurry)
15−import Database.IndexedDB.Core (CursorDirection(..), Database, Index, ObjectStore, Transaction, TransactionMode(..))
16−import Database.IndexedDB.IDBCursor as IDBCursor
17−import Database.IndexedDB.IDBDatabase as IDBDatabase
18−import Database.IndexedDB.IDBFactory as IDBFactory
19−import Database.IndexedDB.IDBIndex as IDBIndex
20−import Database.IndexedDB.IDBKey (Key, none, toKey)
21−import Database.IndexedDB.IDBKeyRange as IDBKeyRange
22−import Database.IndexedDB.IDBObjectStore as IDBObjectStore
23−import Database.IndexedDB.IDBTransaction as IDBTransaction
24−import Effect (Effect)
25−import Effect.Aff (Aff, attempt, delay, forkAff, launchAff, launchAff_)
26−import Effect.Aff.AVar (AVar)
27−import Effect.Aff.AVar as AVar
28−import Effect.Class (liftEffect)
29−import Effect.Console (log)
30−import Effect.Exception (name)
31−import Effect.Now (now)
32−import Test.Spec (describe, it)
33−import Test.Spec.Assertions (shouldEqual, fail)
34−import Test.Spec.Reporter (consoleReporter)
35−import Test.Spec.Runner (runSpec)
5+import Control.Monad.Aff (Aff, launchAff, launchAff_, forkAff, delay, attempt)
6+import Control.Monad.Aff.AVar (AVAR, AVar, makeVar, makeEmptyVar, readVar, putVar, takeVar)
7+import Control.Monad.Aff.Console (log)
8+import Control.Monad.Eff (Eff)
9+import Control.Monad.Eff.Class (liftEff)
10+import Control.Monad.Eff.Exception (EXCEPTION, name)
11+import Control.Monad.Eff.Now (NOW, now)
12+import Data.Date as Date
13+import Data.DateTime as DateTime
14+import Data.DateTime (DateTime(..), Time(..))
15+import Data.DateTime.Instant (toDateTime)
16+import Data.Either (Either(..))
17+import Data.Enum (toEnum)
18+import Data.Maybe (Maybe(..), isNothing, maybe)
19+import Data.Array (head, drop)
20+import Data.Time.Duration (Milliseconds(..))
21+import Data.Traversable (traverse)
22+import Data.Tuple (Tuple(..), uncurry)
23+import Test.Spec (describe, describeOnly, it)
24+import Test.Spec.Assertions (shouldEqual, fail)
25+import Test.Spec.Mocha (MOCHA, runMocha)
26+
27+import Database.IndexedDB.Core
28+import Database.IndexedDB.IDBKey
29+import Database.IndexedDB.IDBCursor as IDBCursor
30+import Database.IndexedDB.IDBDatabase as IDBDatabase
31+import Database.IndexedDB.IDBFactory as IDBFactory
32+import Database.IndexedDB.IDBIndex as IDBIndex
33+import Database.IndexedDB.IDBKeyRange as IDBKeyRange
34+import Database.IndexedDB.IDBObjectStore as IDBObjectStore
35+import Database.IndexedDB.IDBTransaction as IDBTransaction
36+
3637
3738infixr 7 Tuple as :+:
3839
39−launchAff' :: forall a. Aff a -> Effect Unit
40+launchAff' :: forall a e. Aff e a -> Eff e Unit
4041launchAff' =
41− launchAff_ <<< void
42−
43−modifyAVar :: forall a. (a -> a) -> AVar a -> Aff Unit
44−modifyAVar fn v = do
45− val <- AVar.take v
46− AVar.put (fn val) v
47−
48−main :: Effect Unit
49−main = do
50− launchAff_ $ runSpec [ consoleReporter ] $ do
51− describe "IDBFactory" do
52− let
42+ launchAff_
43+
44+
45+modifyVar :: forall eff a. (a -> a) -> AVar a -> Aff (avar :: AVAR | eff) Unit
46+modifyVar fn v = do
47+ val <- takeVar v
48+ putVar (fn val) v
49+
50+
51+-- main :: forall eff. Eff (now :: NOW, mocha :: MOCHA, idb :: IDB, exception :: EXCEPTION, avar :: AVAR | eff) Unit
52+main = runMocha do
53+ describe "IDBFactory" do
54+ let
5355 tearDown name version db = do
5456 IDBDatabase.close db
5557 version' <- IDBFactory.deleteDatabase name
56− liftEffect $ log $ show version'
5758 version' `shouldEqual` version
5859
59− it "open default" do
60− let
61− name = "db-default"
60+ it "open default" do
61+ let name = "db-default"
6262 version = 1
63− db <- IDBFactory.open name Nothing
64− { onUpgradeNeeded: Nothing
65− , onBlocked: Nothing
66− }
67− IDBDatabase.name db `shouldEqual` name
68− tearDown name version db
63+ db <- IDBFactory.open name Nothing
64+ { onUpgradeNeeded : Nothing
65+ , onBlocked : Nothing
66+ }
67+ IDBDatabase.name db `shouldEqual` name
68+ tearDown name version db
6969
70− it "open specific version" do
71− let
72− name = "db-specific"
73− version = 14
74− db <- IDBFactory.open name (Just version)
75− { onUpgradeNeeded: Nothing
76− , onBlocked: Nothing
77− }
78− IDBDatabase.name db `shouldEqual` name
79− tearDown name version db
8070
81− it "open specific version -> close -> open latest" do
82− let
83− name = "db-latest"
71+ it "open specific version" do
72+ let name = "db-specific"
8473 version = 14
85− db01 <- IDBFactory.open name (Just version)
86− { onUpgradeNeeded: Nothing
87− , onBlocked: Nothing
88− }
89− IDBDatabase.name db01 `shouldEqual` name
90− IDBDatabase.close db01
91− db02 <- IDBFactory.open name Nothing
92− { onUpgradeNeeded: Nothing
93− , onBlocked: Nothing
94− }
95− tearDown name version db02
74+ db <- IDBFactory.open name (Just version)
75+ { onUpgradeNeeded : Nothing
76+ , onBlocked : Nothing
77+ }
78+ IDBDatabase.name db `shouldEqual` name
79+ tearDown name version db
9680
97− it "open + onUpgradeNeed" do
98− let
99− name = "db-upgrade-needed"
81+
82+ it "open specific version -> close -> open latest" do
83+ let name = "db-latest"
84+ version = 14
85+ db01 <- IDBFactory.open name (Just version)
86+ { onUpgradeNeeded : Nothing
87+ , onBlocked : Nothing
88+ }
89+ IDBDatabase.name db01 `shouldEqual` name
90+ IDBDatabase.close db01
91+ db02 <- IDBFactory.open name Nothing
92+ { onUpgradeNeeded : Nothing
93+ , onBlocked : Nothing
94+ }
95+ tearDown name version db02
96+
97+ it "open + onUpgradeNeed" do
98+ let name = "db-upgrade-needed"
10099 version = 1
101100 callback (Tuple varName varVersion) db _ { oldVersion } = do
102− _ <- launchAff $ modifyAVar (const $ IDBDatabase.name db) varName
103− _ <- launchAff $ modifyAVar (const $ oldVersion) varVersion
101+ _ <- launchAff $ modifyVar (const $ IDBDatabase.name db) varName
102+ _ <- launchAff $ modifyVar (const $ oldVersion) varVersion
104103 pure unit
105− varName <- AVar.new "-"
106− varVersion <- AVar.new (-1)
107− db <- IDBFactory.open name Nothing
108− { onUpgradeNeeded: Just (callback (Tuple varName varVersion))
109− , onBlocked: Nothing
110− }
111− name' <- AVar.read varName
112− version' <- AVar.read varVersion
113− name' `shouldEqual` name
114− version' `shouldEqual` 0
115− tearDown name version db
116−
117− it "open + onBlocked" do
118− let
119− name = "db-blocked"
104+ varName <- makeVar "-"
105+ varVersion <- makeVar (-1)
106+ db <- IDBFactory.open name Nothing
107+ { onUpgradeNeeded : Just (callback (Tuple varName varVersion))
108+ , onBlocked : Nothing
109+ }
110+ name' <- readVar varName
111+ version' <- readVar varVersion
112+ name' `shouldEqual` name
113+ version' `shouldEqual` 0
114+ tearDown name version db
115+
116+ it "open + onBlocked" do
117+ let name = "db-blocked"
120118 version = 14
121119 callback var = do
122− _ <- launchAff $ modifyAVar (const $ "db-blocked") var
120+ _ <- launchAff $ modifyVar (const $ "db-blocked") var
123121 pure unit
124122
125− var <- AVar.new "-"
126− db01 <- IDBFactory.open name Nothing
127− { onUpgradeNeeded: Nothing
128− , onBlocked: Nothing
129− }
130− _ <- forkAff do
131− delay (Milliseconds 100.0)
132− IDBDatabase.close db01
123+ var <- makeVar "-"
124+ db01 <- IDBFactory.open name Nothing
125+ { onUpgradeNeeded : Nothing
126+ , onBlocked : Nothing
127+ }
128+ _ <- forkAff do
129+ delay (Milliseconds 100.0)
130+ IDBDatabase.close db01
133131
134− db02 <- IDBFactory.open name (Just version)
135− { onUpgradeNeeded: Nothing
136− , onBlocked: Just (callback var)
137− }
138− name' <- AVar.read var
139− name' `shouldEqual` name
140− tearDown name version db02
141−
142− describe "IDBKeyRange" do
143− it "only(int)" do
144− let
145− key = 14
132+ db02 <- IDBFactory.open name (Just version)
133+ { onUpgradeNeeded : Nothing
134+ , onBlocked : Just (callback var)
135+ }
136+ name' <- readVar var
137+ name' `shouldEqual` name
138+ tearDown name version db02
139+
140+ describe "IDBKeyRange" do
141+ it "only(int)" do
142+ let key = 14
146143 range = IDBKeyRange.only key
147− IDBKeyRange.includes range (toKey key) `shouldEqual` true
144+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
148145
149− it "only(string)" do
150− let
151− key = "patate"
146+ it "only(string)" do
147+ let key = "patate"
152148 range = IDBKeyRange.only key
153− IDBKeyRange.includes range (toKey key) `shouldEqual` true
149+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
154150
155− it "only(float)" do
156− let
157− key = 14.42
151+ it "only(float)" do
152+ let key = 14.42
158153 range = IDBKeyRange.only key
159− IDBKeyRange.includes range (toKey key) `shouldEqual` true
154+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
160155
161− it "only(date)" do
162− let
163− mkey = DateTime
156+ it "only(date)" do
157+ let mkey = DateTime
164158 <$> (Date.canonicalDate <$> toEnum 2017 <*> toEnum 6 <*> toEnum 23)
165159 <*> (Time <$> toEnum 17 <*> toEnum 59 <*> toEnum 34 <*> toEnum 42)
166160
167− case mkey of
168− Nothing ->
169− fail "unable to create datetime"
170− Just key -> do
171− let range = IDBKeyRange.only key
172− IDBKeyRange.includes range (toKey key) `shouldEqual` true
161+ case mkey of
162+ Nothing ->
163+ fail "unable to create datetime"
164+ Just key -> do
165+ let range = IDBKeyRange.only key
166+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
173167
174− it "only([int])" do
175− let
176− key = [ 14, 42 ]
168+ it "only([int])" do
169+ let key = [14, 42]
177170 range = IDBKeyRange.only key
178− IDBKeyRange.includes range (toKey key) `shouldEqual` true
171+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
179172
180− it "only([string])" do
181− let
182− key = [ "patate", "autruche" ]
173+ it "only([string])" do
174+ let key = ["patate", "autruche"]
183175 range = IDBKeyRange.only key
184− IDBKeyRange.includes range (toKey key) `shouldEqual` true
176+ IDBKeyRange.includes range (toKey key) `shouldEqual` true
185177
186− it "lowerBound(14, open)" do
187− let
188− key = 14
189− open = true
178+ it "lowerBound(14, open)" do
179+ let key = 14
180+ open = true
190181 range = IDBKeyRange.lowerBound key open
191− IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` true
192− IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
193− IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` false
194−
195− it "lowerBound(14, close)" do
196− let
197− key = 14
198− open = false
182+ IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` true
183+ IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
184+ IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` false
185+
186+ it "lowerBound(14, close)" do
187+ let key = 14
188+ open = false
199189 range = IDBKeyRange.lowerBound key open
200− IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` true
201− IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
202− IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` false
203−
204− it "upperBound(14, open)" do
205− let
206− key = 14
207− open = true
190+ IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` true
191+ IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
192+ IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` false
193+
194+ it "upperBound(14, open)" do
195+ let key = 14
196+ open = true
208197 range = IDBKeyRange.upperBound key open
209− IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` false
210− IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
211− IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` true
212−
213− it "upperBound(14, close)" do
214− let
215− key = 14
216− open = false
198+ IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` false
199+ IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
200+ IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` true
201+
202+ it "upperBound(14, close)" do
203+ let key = 14
204+ open = false
217205 range = IDBKeyRange.upperBound key open
218− IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` false
219− IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
220− IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` true
221−
222− it "bound(42, 14, open, open) => Nothing" do
223− let
224− lower = 42
225− upper = 14
206+ IDBKeyRange.includes range (toKey (key + 1)) `shouldEqual` false
207+ IDBKeyRange.includes range (toKey key) `shouldEqual` (not open)
208+ IDBKeyRange.includes range (toKey (key - 1)) `shouldEqual` true
209+
210+ it "bound(42, 14, open, open) => Nothing" do
211+ let lower = 42
212+ upper = 14
226213 lowerOpen = true
227214 upperOpen = true
228− mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
229− isNothing mrange `shouldEqual` true
215+ mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
216+ isNothing mrange `shouldEqual` true
230217
231− it "bound(14, 42, open, open)" do
232− let
233− lower = 14
234− upper = 42
218+ it "bound(14, 42, open, open)" do
219+ let lower = 14
220+ upper = 42
235221 lowerOpen = true
236222 upperOpen = true
237− mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
238− case mrange of
239− Nothing ->
240− fail "invalid range provided"
241− Just range -> do
242− IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
243− IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
244− IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
245− IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
246− IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
247− IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
248−
249− it "bound(14, 42, open, close)" do
250− let
251− lower = 14
252− upper = 42
223+ mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
224+ case mrange of
225+ Nothing ->
226+ fail "invalid range provided"
227+ Just range -> do
228+ IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
229+ IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
230+ IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
231+ IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
232+ IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
233+ IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
234+
235+ it "bound(14, 42, open, close)" do
236+ let lower = 14
237+ upper = 42
253238 lowerOpen = true
254239 upperOpen = false
255− mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
256− case mrange of
257− Nothing ->
258− fail "invalid range provided"
259− Just range -> do
260− IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
261− IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
262− IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
263− IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
264− IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
265− IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
266−
267− it "bound(14, 42, close, open)" do
268− let
269− lower = 14
270− upper = 42
240+ mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
241+ case mrange of
242+ Nothing ->
243+ fail "invalid range provided"
244+ Just range -> do
245+ IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
246+ IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
247+ IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
248+ IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
249+ IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
250+ IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
251+
252+ it "bound(14, 42, close, open)" do
253+ let lower = 14
254+ upper = 42
271255 lowerOpen = false
272256 upperOpen = true
273− mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
274− case mrange of
275− Nothing ->
276− fail "invalid range provided"
277− Just range -> do
278− IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
279− IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
280− IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
281− IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
282− IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
283− IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
284−
285− it "bound(14, 42, close, close)" do
286− let
287− lower = 14
288− upper = 42
257+ mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
258+ case mrange of
259+ Nothing ->
260+ fail "invalid range provided"
261+ Just range -> do
262+ IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
263+ IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
264+ IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
265+ IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
266+ IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
267+ IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
268+
269+ it "bound(14, 42, close, close)" do
270+ let lower = 14
271+ upper = 42
289272 lowerOpen = false
290273 upperOpen = false
291− mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
292− case mrange of
293− Nothing ->
294− fail "invalid range provided"
295− Just range -> do
296− IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
297− IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
298− IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
299− IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
300− IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
301− IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
302−
303− it "can access attributes of a range" do
304− let range = IDBKeyRange.lowerBound 14 false
305− IDBKeyRange.lower range `shouldEqual` (Just $ toKey 14)
306− IDBKeyRange.upper range `shouldEqual` none
307− IDBKeyRange.lowerOpen range `shouldEqual` false
308− IDBKeyRange.upperOpen range `shouldEqual` true
309−
310− describe "IDBDatabase" do
311− let
274+ mrange = IDBKeyRange.bound { lower, upper, lowerOpen, upperOpen }
275+ case mrange of
276+ Nothing ->
277+ fail "invalid range provided"
278+ Just range -> do
279+ IDBKeyRange.includes range (toKey (lower + 1)) `shouldEqual` true
280+ IDBKeyRange.includes range (toKey (upper - 1)) `shouldEqual` true
281+ IDBKeyRange.includes range (toKey (lower - 1)) `shouldEqual` false
282+ IDBKeyRange.includes range (toKey (upper + 1)) `shouldEqual` false
283+ IDBKeyRange.includes range (toKey lower) `shouldEqual` (not lowerOpen)
284+ IDBKeyRange.includes range (toKey upper) `shouldEqual` (not upperOpen)
285+
286+ it "can access attributes of a range" do
287+ let range = IDBKeyRange.lowerBound 14 false
288+ IDBKeyRange.lower range `shouldEqual` (Just $ toKey 14)
289+ IDBKeyRange.upper range `shouldEqual` none
290+ IDBKeyRange.lowerOpen range `shouldEqual` false
291+ IDBKeyRange.upperOpen range `shouldEqual` true
292+
293+ describe "IDBDatabase" do
294+ let
312295 tearDown db = do
313296 IDBDatabase.close db
314297 _ <- IDBFactory.deleteDatabase (IDBDatabase.name db)
315298 pure unit
316299
317300 setup storeParams = do
318− let
319− onUpgradeNeeded var db _ _ = launchAff' do
320− store <- IDBDatabase.createObjectStore db "store" storeParams
321− _ <- AVar.put { db, store } var
322− pure unit
323−
324− var <- AVar.empty
325− _ <- IDBFactory.open "db" Nothing
326− { onUpgradeNeeded: Just (onUpgradeNeeded var)
327− , onBlocked: Nothing
301+ let onUpgradeNeeded var db _ _ = launchAff' do
302+ store <- IDBDatabase.createObjectStore db "store" storeParams
303+ _ <- putVar { db, store } var
304+ pure unit
305+
306+ var <- makeEmptyVar
307+ db <- IDBFactory.open "db" Nothing
308+ { onUpgradeNeeded : Just (onUpgradeNeeded var)
309+ , onBlocked : Nothing
328310 }
329311
330− AVar.take var
331−
332− it "createObjectStore (keyPath: [], autoIncrement: true)" do
333− { db, store } <- setup { keyPath: [], autoIncrement: true }
334− IDBObjectStore.name store `shouldEqual` "store"
335− IDBObjectStore.keyPath store `shouldEqual` []
336− IDBObjectStore.autoIncrement store `shouldEqual` true
337− IDBObjectStore.indexNames store `shouldEqual` []
338− tearDown db
339−
340− it "createObjectStore (keyPath: [\"patate\"], autoIncrement: true)" do
341− { db, store } <- setup { keyPath: [ "patate" ], autoIncrement: true }
342− IDBObjectStore.name store `shouldEqual` "store"
343− IDBObjectStore.keyPath store `shouldEqual` [ "patate" ]
344− IDBObjectStore.autoIncrement store `shouldEqual` true
345− IDBObjectStore.indexNames store `shouldEqual` []
346− tearDown db
347−
348− it "createObjectStore (keyPath: [\"a\", \"b\"], autoIncrement: false)" do
349− { db, store } <- setup { keyPath: [ "patate", "autruche" ], autoIncrement: false }
350− IDBObjectStore.name store `shouldEqual` "store"
351− IDBObjectStore.keyPath store `shouldEqual` [ "patate", "autruche" ]
352− IDBObjectStore.autoIncrement store `shouldEqual` false
353− IDBObjectStore.indexNames store `shouldEqual` []
354− tearDown db
355−
356− it "deleteObjectStore" do
357− let
358− onUpgradeNeeded var db _ _ = launchAff' do
312+ takeVar var
313+
314+ it "createObjectStore (keyPath: [], autoIncrement: true)" do
315+ { db, store } <- setup { keyPath: [], autoIncrement: true }
316+ IDBObjectStore.name store `shouldEqual` "store"
317+ IDBObjectStore.keyPath store `shouldEqual` []
318+ IDBObjectStore.autoIncrement store `shouldEqual` true
319+ IDBObjectStore.indexNames store `shouldEqual` []
320+ tearDown db
321+
322+ it "createObjectStore (keyPath: [\"patate\"], autoIncrement: true)" do
323+ { db, store } <- setup { keyPath: ["patate"], autoIncrement: true }
324+ IDBObjectStore.name store `shouldEqual` "store"
325+ IDBObjectStore.keyPath store `shouldEqual` ["patate"]
326+ IDBObjectStore.autoIncrement store `shouldEqual` true
327+ IDBObjectStore.indexNames store `shouldEqual` []
328+ tearDown db
329+
330+ it "createObjectStore (keyPath: [\"a\", \"b\"], autoIncrement: false)" do
331+ { db, store } <- setup { keyPath: ["patate", "autruche"], autoIncrement: false }
332+ IDBObjectStore.name store `shouldEqual` "store"
333+ IDBObjectStore.keyPath store `shouldEqual` ["patate", "autruche"]
334+ IDBObjectStore.autoIncrement store `shouldEqual` false
335+ IDBObjectStore.indexNames store `shouldEqual` []
336+ tearDown db
337+
338+ it "deleteObjectStore" do
339+ let onUpgradeNeeded var db _ _ = launchAff' do
359340 _ <- IDBDatabase.deleteObjectStore db "store"
360− AVar.put true var
361−
362− var <- AVar.empty
363− { db } <- setup IDBDatabase.defaultParameters
364− IDBDatabase.close db
365− db' <- IDBFactory.open "db" (Just 999)
366− { onUpgradeNeeded: Just (onUpgradeNeeded var)
367− , onBlocked: Nothing
368− }
369− deleted <- AVar.take var
370− deleted `shouldEqual` true
371− tearDown db'
341+ putVar true var
372342
373− describe "IDBObjectStore" do
374− let
343+ var <- makeEmptyVar
344+ { db, store } <- setup IDBDatabase.defaultParameters
345+ IDBDatabase.close db
346+ db' <- IDBFactory.open "db" (Just 999) { onUpgradeNeeded : Just (onUpgradeNeeded var)
347+ , onBlocked : Nothing
348+ }
349+ deleted <- takeVar var
350+ deleted `shouldEqual` true
351+ tearDown db'
352+
353+
354+ describe "IDBObjectStore" do
355+ let
375356 tearDown db = do
376357 IDBDatabase.close db
377358 _ <- IDBFactory.deleteDatabase (IDBDatabase.name db)
378359 pure unit
379360
380361 setup { storeParams, onUpgradeNeeded } = do
381− let
382− onUpgradeNeeded' var db _ _ = launchAff' do
383− store <- IDBDatabase.createObjectStore db "store" storeParams
384− liftEffect $ maybe (pure unit) identity (onUpgradeNeeded <*> pure db <*> pure store)
385− AVar.put { db, store } var
386−
387− var <- AVar.empty
388− _ <- IDBFactory.open "db" Nothing
389− { onUpgradeNeeded: Just (onUpgradeNeeded' var)
390− , onBlocked: Nothing
362+ let onUpgradeNeeded' var db _ _ = launchAff' do
363+ store <- IDBDatabase.createObjectStore db "store" storeParams
364+ liftEff $ maybe (pure unit) id (onUpgradeNeeded <*> pure db <*> pure store)
365+ putVar { db, store } var
366+
367+ var <- makeEmptyVar
368+ db <- IDBFactory.open "db" Nothing
369+ { onUpgradeNeeded : Just (onUpgradeNeeded' var)
370+ , onBlocked : Nothing
391371 }
392372
393− AVar.take var
394−
395− it "add()" do
396− date <- liftEffect $ toDateTime <$> now
397− { db } <- setup
398− { storeParams: { autoIncrement: true, keyPath: [] }
399− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
400− -- no key
401− key <- IDBObjectStore.add store "patate" none
402− (toKey 1) `shouldEqual` key
403−
404− -- int key
405− key' <- IDBObjectStore.add store "patate" (Just 14)
406− (toKey 14) `shouldEqual` key'
407−
408− -- number key
409− key'' <- IDBObjectStore.add store "patate" (Just 14.42)
410− (toKey 14.42) `shouldEqual` key''
411−
412− -- string key
413− key''' <- IDBObjectStore.add store "patate" (Just "key")
414− (toKey "key") `shouldEqual` key'''
415−
416− -- date key
417− key'''' <- IDBObjectStore.add store "patate" (Just date)
418− (toKey date) `shouldEqual` key''''
419−
420− -- array key
421− key''''' <- IDBObjectStore.add store "patate" (Just $ toKey [ 14, 42 ])
422− (toKey [ 14, 42 ]) `shouldEqual` key'''''
423− }
424− tearDown db
425−
426− it "clear()" do
427− { db } <- setup
428− { storeParams: IDBDatabase.defaultParameters
429− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
430− key <- IDBObjectStore.add store "patate" (Just 14)
431− _ <- IDBObjectStore.clear store
432− val <- IDBObjectStore.get store (IDBKeyRange.only key)
433− val `shouldEqual` (Nothing :: Maybe String)
434− }
435− tearDown db
436−
437− it "count()" do
438− { db } <- setup
439− { storeParams: IDBDatabase.defaultParameters
440− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
441− _ <- IDBObjectStore.add store "patate" (Just 14)
442− _ <- IDBObjectStore.add store "autruche" (Just 42)
443− n <- IDBObjectStore.count store Nothing
444− n `shouldEqual` 2
445− }
446− tearDown db
447−
448− it "getKey()" do
449− { db } <- setup
450− { storeParams: IDBDatabase.defaultParameters
451− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
452− key <- IDBObjectStore.add store "patate" (Just 14)
453− mkey <- IDBObjectStore.getKey store (IDBKeyRange.only 14)
454− mkey `shouldEqual` (Just key)
455−
456− mkey' <- IDBObjectStore.getKey store (IDBKeyRange.only 42)
457− mkey' `shouldEqual` none
458− }
459− tearDown db
460−
461− it "getAllKeys()" do
462− { db } <- setup
463− { storeParams: IDBDatabase.defaultParameters
464− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
465− key1 <- IDBObjectStore.add store "patate" (Just 14)
466− key2 <- IDBObjectStore.add store "autruche" (Just 42)
467− key3 <- IDBObjectStore.add store 14 (Just 1337)
468−
469− -- no bounds
470− keys <- IDBObjectStore.getAllKeys store Nothing Nothing
471− keys `shouldEqual` [ key1, key2, key3 ]
472−
473− -- lower bound
474− keys' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.lowerBound 14 true) Nothing
475− keys' `shouldEqual` [ key2, key3 ]
476−
477− -- upper bound
478− keys'' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.upperBound 42 false) Nothing
479− keys'' `shouldEqual` [ key1, key2 ]
480−
481− -- count
482− keys''' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.lowerBound 1 true) (Just 2)
483− keys''' `shouldEqual` [ key1, key2 ]
373+ takeVar var
374+
375+ it "add()" do
376+ date <- liftEff $ toDateTime <$> now
377+ { db } <- setup
378+ { storeParams: { autoIncrement: true, keyPath: [] }
379+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
380+ -- no key
381+ key <- IDBObjectStore.add store "patate" none
382+ (toKey 1) `shouldEqual` key
383+
384+ -- int key
385+ key' <- IDBObjectStore.add store "patate" (Just 14)
386+ (toKey 14) `shouldEqual` key'
387+
388+ -- number key
389+ key'' <- IDBObjectStore.add store "patate" (Just 14.42)
390+ (toKey 14.42) `shouldEqual` key''
391+
392+ -- string key
393+ key''' <- IDBObjectStore.add store "patate" (Just "key")
394+ (toKey "key") `shouldEqual` key'''
395+
396+ -- date key
397+ key'''' <- IDBObjectStore.add store "patate" (Just date)
398+ (toKey date) `shouldEqual` key''''
399+
400+ -- array key
401+ key''''' <- IDBObjectStore.add store "patate" (Just $ toKey [14, 42])
402+ (toKey [14, 42]) `shouldEqual` key'''''
403+ }
404+ tearDown db
405+
406+ it "clear()" do
407+ { db } <- setup
408+ { storeParams: IDBDatabase.defaultParameters
409+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
410+ key <- IDBObjectStore.add store "patate" (Just 14)
411+ _ <- IDBObjectStore.clear store
412+ val <- IDBObjectStore.get store (IDBKeyRange.only key)
413+ val `shouldEqual` (Nothing :: Maybe String)
414+ }
415+ tearDown db
416+
417+ it "count()" do
418+ { db } <- setup
419+ { storeParams: IDBDatabase.defaultParameters
420+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
421+ _ <- IDBObjectStore.add store "patate" (Just 14)
422+ _ <- IDBObjectStore.add store "autruche" (Just 42)
423+ n <- IDBObjectStore.count store Nothing
424+ n `shouldEqual` 2
425+ }
426+ tearDown db
427+
428+ it "getKey()" do
429+ { db } <- setup
430+ { storeParams: IDBDatabase.defaultParameters
431+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
432+ key <- IDBObjectStore.add store "patate" (Just 14)
433+ mkey <- IDBObjectStore.getKey store (IDBKeyRange.only 14)
434+ mkey `shouldEqual` (Just key)
435+
436+ mkey' <- IDBObjectStore.getKey store (IDBKeyRange.only 42)
437+ mkey' `shouldEqual` none
484438 }
485− tearDown db
486−
487− it "openCursor()" do
488− let
489− cb =
490− { onSuccess: const $ pure unit
491− , onError: show >>> fail >>> launchAff'
439+ tearDown db
440+
441+ it "getAllKeys()" do
442+ { db } <- setup
443+ { storeParams: IDBDatabase.defaultParameters
444+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
445+ key1 <- IDBObjectStore.add store "patate" (Just 14)
446+ key2 <- IDBObjectStore.add store "autruche" (Just 42)
447+ key3 <- IDBObjectStore.add store 14 (Just 1337)
448+
449+ -- no bounds
450+ keys <- IDBObjectStore.getAllKeys store Nothing Nothing
451+ keys `shouldEqual` [key1, key2, key3]
452+
453+ -- lower bound
454+ keys' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.lowerBound 14 true) Nothing
455+ keys' `shouldEqual` [key2, key3]
456+
457+ -- upper bound
458+ keys'' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.upperBound 42 false) Nothing
459+ keys'' `shouldEqual` [key1, key2]
460+
461+ -- count
462+ keys''' <- IDBObjectStore.getAllKeys store (Just $ IDBKeyRange.lowerBound 1 true) (Just 2)
463+ keys''' `shouldEqual` [key1, key2]
464+ }
465+ tearDown db
466+
467+ it "openCursor()" do
468+ let cb =
469+ { onSuccess : const $ pure unit
470+ , onError : show >>> fail >>> launchAff'
492471 , onComplete: pure unit
493472 }
494− { db } <- setup
495− { storeParams: IDBDatabase.defaultParameters
496− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
497− _ <- IDBObjectStore.openCursor store Nothing Next cb
498− _ <- IDBObjectStore.openCursor store Nothing NextUnique cb
499− _ <- IDBObjectStore.openCursor store Nothing Prev cb
500− _ <- IDBObjectStore.openCursor store Nothing PrevUnique cb
501− _ <- IDBObjectStore.openCursor store (Just $ IDBKeyRange.upperBound 1 true) Next cb
502− pure unit
503− }
504− tearDown db
473+ { db } <- setup
474+ { storeParams: IDBDatabase.defaultParameters
475+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
476+ _ <- IDBObjectStore.openCursor store Nothing Next cb
477+ _ <- IDBObjectStore.openCursor store Nothing NextUnique cb
478+ _ <- IDBObjectStore.openCursor store Nothing Prev cb
479+ _ <- IDBObjectStore.openCursor store Nothing PrevUnique cb
480+ _ <- IDBObjectStore.openCursor store (Just $ IDBKeyRange.upperBound 1 true) Next cb
481+ pure unit
482+ }
483+ tearDown db
505484
506− it "openKeyCursor()" do
507− let
508− cb =
509− { onSuccess: const $ pure unit
510− , onError: show >>> fail >>> launchAff'
485+ it "openKeyCursor()" do
486+ let cb =
487+ { onSuccess : const $ pure unit
488+ , onError : show >>> fail >>> launchAff'
511489 , onComplete: pure unit
512490 }
513− { db } <- setup
514− { storeParams: IDBDatabase.defaultParameters
515− , onUpgradeNeeded: Just $ \_ store -> launchAff' do
516− _ <- IDBObjectStore.openKeyCursor store Nothing Next cb
517− _ <- IDBObjectStore.openKeyCursor store Nothing NextUnique cb
518− _ <- IDBObjectStore.openKeyCursor store Nothing Prev cb
519− _ <- IDBObjectStore.openKeyCursor store Nothing PrevUnique cb
520− _ <- IDBObjectStore.openKeyCursor store (Just $ IDBKeyRange.lowerBound 1 true) Next cb
521− pure unit
522− }
523− tearDown db
491+ { db } <- setup
492+ { storeParams: IDBDatabase.defaultParameters
493+ , onUpgradeNeeded: Just $ \_ store -> launchAff' do
494+ _ <- IDBObjectStore.openKeyCursor store Nothing Next cb
495+ _ <- IDBObjectStore.openKeyCursor store Nothing NextUnique cb
496+ _ <- IDBObjectStore.openKeyCursor store Nothing Prev cb
497+ _ <- IDBObjectStore.openKeyCursor store Nothing PrevUnique cb
498+ _ <- IDBObjectStore.openKeyCursor store (Just $ IDBKeyRange.lowerBound 1 true) Next cb
499+ pure unit
500+ }
501+ tearDown db
524502
525− describe "IDBIndex" do
526− let
503+ describe "IDBIndex" do
504+ let
527505 tearDown db = do
528506 IDBDatabase.close db
529507 _ <- IDBFactory.deleteDatabase (IDBDatabase.name db)
530508 pure unit
531509
532− setup
533− :: forall value
534− . { storeParams :: { keyPath :: Array String, autoIncrement :: Boolean }
535− , indexParams :: { unique :: Boolean, multiEntry :: Boolean }
536− , values :: Array (Tuple value (Maybe Key))
537− , keyPath :: Array String
538− , onUpgradeNeeded :: Maybe (Database -> Transaction -> Index -> Effect Unit)
539− }
540− -> Aff { db :: Database, index :: Index, store :: ObjectStore }
510+ setup :: forall value e e'.
511+ { storeParams :: { keyPath :: Array String, autoIncrement :: Boolean }
512+ , indexParams :: { unique :: Boolean, multiEntry :: Boolean }
513+ , values :: Array (Tuple value (Maybe Key))
514+ , keyPath :: Array String
515+ , onUpgradeNeeded :: Maybe (Database -> Transaction -> Index -> Eff (idb :: IDB, avar :: AVAR, exception :: EXCEPTION | e') Unit)
516+ } -> Aff (idb :: IDB, avar :: AVAR | e) { db :: Database, index :: Index, store :: ObjectStore }
541517 setup { storeParams, indexParams, values, keyPath, onUpgradeNeeded } = do
542− let
543− onUpgradeNeeded' var db tx _ = launchAff' do
544− store <- IDBDatabase.createObjectStore db "store" storeParams
545− _ <- traverse (uncurry (IDBObjectStore.add store)) values
546− index <- IDBObjectStore.createIndex store "index" keyPath indexParams
547− liftEffect $ maybe (pure unit) identity (onUpgradeNeeded <*> pure db <*> pure tx <*> pure index)
548− AVar.put { db, index, store } var
549−
550− var <- AVar.empty
551− _ <- IDBFactory.open "db" Nothing
552− { onUpgradeNeeded: Just (onUpgradeNeeded' var)
553− , onBlocked: Nothing
518+ let onUpgradeNeeded' var db tx _ = launchAff' do
519+ store <- IDBDatabase.createObjectStore db "store" storeParams
520+ _ <- traverse (uncurry (IDBObjectStore.add store)) values
521+ index <- IDBObjectStore.createIndex store "index" keyPath indexParams
522+ liftEff $ maybe (pure unit) id (onUpgradeNeeded <*> pure db <*> pure tx <*> pure index)
523+ putVar { db, index, store } var
524+
525+ var <- makeEmptyVar
526+ db <- IDBFactory.open "db" Nothing
527+ { onUpgradeNeeded : Just (onUpgradeNeeded' var)
528+ , onBlocked : Nothing
554529 }
555− AVar.take var
556−
557− it "returns an IDBIndex and the properties are set correctly" do
558− { db, index } <- setup
559− { storeParams: IDBDatabase.defaultParameters
560− , indexParams: IDBObjectStore.defaultParameters
561− , onUpgradeNeeded: Nothing
562− , keyPath: []
563− , values: []
564− }
565− IDBIndex.name index `shouldEqual` "index"
566− IDBIndex.keyPath index `shouldEqual` []
567− IDBIndex.unique index `shouldEqual` IDBObjectStore.defaultParameters.unique
568− IDBIndex.multiEntry index `shouldEqual` IDBObjectStore.defaultParameters.multiEntry
569− tearDown db
570−
571− it "attempt to create an index that requires unique values on an object store already contains duplicates" do
572− let onAbort var = launchAff' (AVar.put true var)
573− txVar <- AVar.empty
574− dbVar <- AVar.empty
575− res <- attempt $ setup
576− { storeParams: IDBDatabase.defaultParameters
577− , indexParams:
578− { unique: true
579− , multiEntry: false
580− }
581− , keyPath: [ "indexedProperty" ]
582− , values:
583− [ { indexedProperty: "bar" } :+: (Just $ toKey 1)
584− , { indexedProperty: "bar" } :+: (Just $ toKey 2)
585− ]
586− , onUpgradeNeeded: Just $ \db tx _ -> launchAff' do
587− IDBTransaction.onAbort tx (onAbort txVar)
588− IDBDatabase.onAbort db (onAbort dbVar)
589− }
590− case res of
591− Right _ ->
592− fail "expected abort"
593− _ -> do
594− shouldEqual true =<< AVar.take txVar
595− shouldEqual true =<< AVar.take dbVar
596−
597− it "the index is usable right after being made" do
598− { db } <- setup
599− { storeParams:
600− { keyPath: [ "key" ]
601− , autoIncrement: false
602− }
603− , indexParams: IDBObjectStore.defaultParameters
604− , keyPath: [ "indexedProperty" ]
605− , values:
606− [ { key: "key1", indexedProperty: "indexed_1" } :+: Nothing
607− , { key: "key2", indexedProperty: "indexed_2" } :+: Nothing
608− , { key: "key3", indexedProperty: "indexed_3" } :+: Nothing
609− ]
610− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
611− val <- IDBIndex.get index (IDBKeyRange.only "indexed_2")
612− ((\r -> r.key) <$> val) `shouldEqual` (Just $ toKey "key2")
613− }
614− tearDown db
615−
616− it "empty keyPath" do
617− { db } <- setup
618− { storeParams: IDBDatabase.defaultParameters
619− , indexParams: IDBObjectStore.defaultParameters
620− , keyPath: []
621− , values:
622− [ "object_1" :+: (Just $ toKey 1)
623− , "object_2" :+: (Just $ toKey 2)
624− , "object_3" :+: (Just $ toKey 3)
625− ]
626− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
627− val <- IDBIndex.get index (IDBKeyRange.only "object_3")
628− val `shouldEqual` (Just "object_3")
629− }
630− tearDown db
631−
632− it "index can be valid keys [date]" do
633− date <- liftEffect $ toDateTime <$> now
634− { db } <- setup
635− { storeParams:
636− { keyPath: [ "key" ]
637− , autoIncrement: false
638− }
639− , indexParams: IDBObjectStore.defaultParameters
640− , keyPath: [ "i" ]
641− , values:
642− [ { key: "date", i: (toKey date) } :+: Nothing
643− ]
644− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
645− val <- IDBIndex.get index (IDBKeyRange.only date)
646− ((\r -> r.key) <$> val) `shouldEqual` (Just "date")
647− }
648− tearDown db
649−
650− it "index can be valid keys [num]" do
651− let num = 14
652− { db } <- setup
653− { storeParams:
654− { keyPath: [ "key" ]
655− , autoIncrement: false
656− }
657− , indexParams: IDBObjectStore.defaultParameters
658− , keyPath: [ "i" ]
659− , values:
660− [ { key: "num", i: (toKey num) } :+: Nothing
661− ]
662− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
663− val <- IDBIndex.get index (IDBKeyRange.only num)
664− ((\r -> r.key) <$> val) `shouldEqual` (Just "num")
665− }
666− tearDown db
667−
668− it "index can be valid keys [array]" do
669− let array = [ "patate", "autruche" ]
670− { db } <- setup
671− { storeParams:
672− { keyPath: [ "key" ]
673− , autoIncrement: false
674− }
675− , indexParams: IDBObjectStore.defaultParameters
676− , keyPath: [ "i" ]
677− , values:
678− [ { key: "array", i: (toKey array) } :+: Nothing
679− ]
680− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
681− val <- IDBIndex.get index (IDBKeyRange.only array)
682− ((\r -> r.key) <$> val) `shouldEqual` (Just "array")
683− }
684− tearDown db
685−
686− it "openKeyCursor() - throw InvalidStateError on index deleted by aborted upgrade" do
687− res <- attempt $ setup
688− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
689− , indexParams: IDBObjectStore.defaultParameters
690− , keyPath: [ "indexedProperty" ]
691− , values:
692− [ { key: 14, indexedProperty: "patate" } :+: Nothing
693− ]
694− , onUpgradeNeeded: Just $ \db tx index -> launchAff' do
695− let
696− cb =
697− { onSuccess: const $ pure unit
698− , onError: show >>> fail >>> launchAff'
530+ takeVar var
531+
532+
533+ it "returns an IDBIndex and the properties are set correctly" do
534+ { db, index } <- setup
535+ { storeParams : IDBDatabase.defaultParameters
536+ , indexParams : IDBObjectStore.defaultParameters
537+ , onUpgradeNeeded : Nothing
538+ , keyPath : []
539+ , values : []
540+ }
541+ IDBIndex.name index `shouldEqual` "index"
542+ IDBIndex.keyPath index `shouldEqual` []
543+ IDBIndex.unique index `shouldEqual` IDBObjectStore.defaultParameters.unique
544+ IDBIndex.multiEntry index `shouldEqual` IDBObjectStore.defaultParameters.multiEntry
545+ tearDown db
546+
547+ it "attempt to create an index that requires unique values on an object store already contains duplicates" do
548+ let onAbort var = launchAff' (putVar true var)
549+ txVar <- makeEmptyVar
550+ dbVar <- makeEmptyVar
551+ res <- attempt $ setup
552+ { storeParams : IDBDatabase.defaultParameters
553+ , indexParams : { unique : true
554+ , multiEntry : false
555+ }
556+ , keyPath : ["indexedProperty"]
557+ , values : [ { indexedProperty: "bar" } :+: (Just $ toKey 1)
558+ , { indexedProperty: "bar" } :+: (Just $ toKey 2)
559+ ]
560+ , onUpgradeNeeded : Just $ \db tx _ -> launchAff' do
561+ IDBTransaction.onAbort tx (onAbort txVar)
562+ IDBDatabase.onAbort db (onAbort dbVar)
563+ }
564+ case res of
565+ Right _ ->
566+ fail "expected abort"
567+ _ -> do
568+ shouldEqual true =<< takeVar txVar
569+ shouldEqual true =<< takeVar dbVar
570+
571+
572+ it "the index is usable right after being made" do
573+ { db } <- setup
574+ { storeParams : { keyPath : ["key"]
575+ , autoIncrement : false
576+ }
577+ , indexParams : IDBObjectStore.defaultParameters
578+ , keyPath : ["indexedProperty"]
579+ , values : [ { key: "key1", indexedProperty: "indexed_1" } :+: Nothing
580+ , { key: "key2", indexedProperty: "indexed_2" } :+: Nothing
581+ , { key: "key3", indexedProperty: "indexed_3" } :+: Nothing
582+ ]
583+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
584+ val <- IDBIndex.get index (IDBKeyRange.only "indexed_2")
585+ ((\r -> r.key) <$> val) `shouldEqual` (Just $ toKey "key2")
586+ }
587+ tearDown db
588+
589+ it "empty keyPath" do
590+ { db } <- setup
591+ { storeParams : IDBDatabase.defaultParameters
592+ , indexParams : IDBObjectStore.defaultParameters
593+ , keyPath : []
594+ , values : [ "object_1" :+: (Just $ toKey 1)
595+ , "object_2" :+: (Just $ toKey 2)
596+ , "object_3" :+: (Just $ toKey 3)
597+ ]
598+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
599+ val <- IDBIndex.get index (IDBKeyRange.only "object_3")
600+ val `shouldEqual` (Just "object_3")
601+ }
602+ tearDown db
603+
604+ it "index can be valid keys [date]" do
605+ date <- liftEff $ toDateTime <$> now
606+ { db } <- setup
607+ { storeParams : { keyPath: ["key"]
608+ , autoIncrement: false
609+ }
610+ , indexParams : IDBObjectStore.defaultParameters
611+ , keyPath : ["i"]
612+ , values : [ { key: "date", i: (toKey date) } :+: Nothing
613+ ]
614+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
615+ val <- IDBIndex.get index (IDBKeyRange.only date)
616+ ((\r -> r.key) <$> val) `shouldEqual` (Just "date")
617+ }
618+ tearDown db
619+
620+ it "index can be valid keys [num]" do
621+ let num = 14
622+ { db } <- setup
623+ { storeParams : { keyPath: ["key"]
624+ , autoIncrement: false
625+ }
626+ , indexParams : IDBObjectStore.defaultParameters
627+ , keyPath : ["i"]
628+ , values : [ { key: "num", i: (toKey num) } :+: Nothing
629+ ]
630+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
631+ val <- IDBIndex.get index (IDBKeyRange.only num)
632+ ((\r -> r.key) <$> val) `shouldEqual` (Just "num")
633+ }
634+ tearDown db
635+
636+ it "index can be valid keys [array]" do
637+ let array = ["patate", "autruche"]
638+ { db } <- setup
639+ { storeParams : { keyPath: ["key"]
640+ , autoIncrement: false
641+ }
642+ , indexParams : IDBObjectStore.defaultParameters
643+ , keyPath : ["i"]
644+ , values : [ { key: "array", i: (toKey array) } :+: Nothing
645+ ]
646+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
647+ val <- IDBIndex.get index (IDBKeyRange.only array)
648+ ((\r -> r.key) <$> val) `shouldEqual` (Just "array")
649+ }
650+ tearDown db
651+
652+ it "openKeyCursor() - throw InvalidStateError on index deleted by aborted upgrade" do
653+ res <- attempt $ setup
654+ { storeParams : { keyPath: ["key"], autoIncrement: false }
655+ , indexParams : IDBObjectStore.defaultParameters
656+ , keyPath : ["indexedProperty"]
657+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
658+ ]
659+ , onUpgradeNeeded : Just $ \db tx index -> launchAff' do
660+ let cb =
661+ { onSuccess : const $ pure unit
662+ , onError : show >>> fail >>> launchAff'
699663 , onComplete: pure unit
700664 }
701− IDBTransaction.onAbort tx (pure unit)
702− IDBDatabase.onAbort db (pure unit)
703− IDBTransaction.abort tx
704− cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
705− case cursor of
706− Right _ -> fail "expected InvalidStateError"
707− Left err -> name err `shouldEqual` "InvalidStateError"
708− }
709− case res of
710− Right _ -> fail "expected InvalidStateError"
711− _ -> pure unit
712−
713− it "openKeyCursor() - throw TransactionInactiveError on aborted transaction" do
714− { db } <- setup
715− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
716− , indexParams: IDBObjectStore.defaultParameters
717− , keyPath: [ "indexedProperty" ]
718− , values:
719− [ { key: 14, indexedProperty: "patate" } :+: Nothing
720− ]
721− , onUpgradeNeeded: Nothing
722− }
723− let
724− cb =
725− { onSuccess: const $ pure unit
726− , onError: show >>> fail >>> launchAff'
665+ IDBTransaction.onAbort tx (pure unit)
666+ IDBDatabase.onAbort db (pure unit)
667+ IDBTransaction.abort tx
668+ cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
669+ case cursor of
670+ Right _ -> fail "expected InvalidStateError"
671+ Left err -> name err `shouldEqual` "InvalidStateError"
672+ }
673+ case res of
674+ Right _ -> fail "expected InvalidStateError"
675+ _ -> pure unit
676+
677+ it "openKeyCursor() - throw TransactionInactiveError on aborted transaction" do
678+ { db } <- setup
679+ { storeParams : { keyPath: ["key"], autoIncrement: false }
680+ , indexParams : IDBObjectStore.defaultParameters
681+ , keyPath : ["indexedProperty"]
682+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
683+ ]
684+ , onUpgradeNeeded : Nothing
685+ }
686+ let cb =
687+ { onSuccess : const $ pure unit
688+ , onError : show >>> fail >>> launchAff'
727689 , onComplete: pure unit
728690 }
729− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
730− store <- IDBTransaction.objectStore tx "store"
731− index <- IDBObjectStore.index store "index"
732− IDBTransaction.onAbort tx (pure unit)
733− IDBTransaction.abort tx
734− cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
735− case cursor of
736− Right _ -> fail "expected TransactionInactiveError"
737− Left err -> name err `shouldEqual` "TransactionInactiveError"
738−
739− tearDown db
740−
741− it "openKeyCursor() - throw InvalidStateError when the index is deleted" do
742− { db } <- setup
743− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
744− , indexParams: IDBObjectStore.defaultParameters
745− , keyPath: [ "indexedProperty" ]
746− , values:
747− [ { key: 14, indexedProperty: "patate" } :+: Nothing
748− ]
749− , onUpgradeNeeded: Just $ \_ tx index -> launchAff' do
750− let
751− cb =
752− { onSuccess: const $ pure unit
753− , onError: show >>> fail >>> launchAff'
691+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
692+ store <- IDBTransaction.objectStore tx "store"
693+ index <- IDBObjectStore.index store "index"
694+ IDBTransaction.onAbort tx (pure unit)
695+ IDBTransaction.abort tx
696+ cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
697+ case cursor of
698+ Right _ -> fail "expected TransactionInactiveError"
699+ Left err -> name err `shouldEqual` "TransactionInactiveError"
700+
701+ tearDown db
702+
703+ it "openKeyCursor() - throw InvalidStateError when the index is deleted" do
704+ { db } <- setup
705+ { storeParams : { keyPath: ["key"], autoIncrement: false }
706+ , indexParams : IDBObjectStore.defaultParameters
707+ , keyPath : ["indexedProperty"]
708+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
709+ ]
710+ , onUpgradeNeeded : Just $ \db tx index -> launchAff' do
711+ let cb =
712+ { onSuccess : const $ pure unit
713+ , onError : show >>> fail >>> launchAff'
754714 , onComplete: pure unit
755715 }
756− store <- IDBTransaction.objectStore tx "store"
757− IDBObjectStore.deleteIndex store "index"
758− cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
759− case cursor of
760− Right _ -> fail "expected InvalidStateError"
761− Left err -> name err `shouldEqual` "InvalidStateError"
762− }
763−
764− tearDown db
765−
766− it "openCursor() - throw InvalidStateError on index deleted by aborted upgrade" do
767− res <- attempt $ setup
768− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
769− , indexParams: IDBObjectStore.defaultParameters
770− , keyPath: [ "indexedProperty" ]
771− , values:
772− [ { key: 14, indexedProperty: "patate" } :+: Nothing
773− ]
774− , onUpgradeNeeded: Just $ \db tx index -> launchAff' do
775− let
776− cb =
777− { onSuccess: const $ pure unit
778− , onError: show >>> fail >>> launchAff'
716+ store <- IDBTransaction.objectStore tx "store"
717+ IDBObjectStore.deleteIndex store "index"
718+ cursor <- attempt $ IDBIndex.openKeyCursor index Nothing Next cb
719+ case cursor of
720+ Right _ -> fail "expected InvalidStateError"
721+ Left err -> name err `shouldEqual` "InvalidStateError"
722+ }
723+
724+ tearDown db
725+
726+ it "openCursor() - throw InvalidStateError on index deleted by aborted upgrade" do
727+ res <- attempt $ setup
728+ { storeParams : { keyPath: ["key"], autoIncrement: false }
729+ , indexParams : IDBObjectStore.defaultParameters
730+ , keyPath : ["indexedProperty"]
731+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
732+ ]
733+ , onUpgradeNeeded : Just $ \db tx index -> launchAff' do
734+ let cb =
735+ { onSuccess : const $ pure unit
736+ , onError : show >>> fail >>> launchAff'
779737 , onComplete: pure unit
780738 }
781− IDBTransaction.onAbort tx (pure unit)
782− IDBDatabase.onAbort db (pure unit)
783− IDBTransaction.abort tx
784− cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
785− case cursor of
786− Right _ -> fail "expected InvalidStateError"
787− Left err -> name err `shouldEqual` "InvalidStateError"
788− }
789− case res of
790− Right _ -> fail "expected InvalidStateError"
791− _ -> pure unit
792−
793− it "openCursor() - throw TransactionInactiveError on aborted transaction" do
794− { db } <- setup
795− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
796− , indexParams: IDBObjectStore.defaultParameters
797− , keyPath: [ "indexedProperty" ]
798− , values:
799− [ { key: 14, indexedProperty: "patate" } :+: Nothing
800− ]
801− , onUpgradeNeeded: Nothing
802− }
803− let
804− cb =
805− { onSuccess: const $ pure unit
806− , onError: show >>> fail >>> launchAff'
739+ IDBTransaction.onAbort tx (pure unit)
740+ IDBDatabase.onAbort db (pure unit)
741+ IDBTransaction.abort tx
742+ cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
743+ case cursor of
744+ Right _ -> fail "expected InvalidStateError"
745+ Left err -> name err `shouldEqual` "InvalidStateError"
746+ }
747+ case res of
748+ Right _ -> fail "expected InvalidStateError"
749+ _ -> pure unit
750+
751+ it "openCursor() - throw TransactionInactiveError on aborted transaction" do
752+ { db } <- setup
753+ { storeParams : { keyPath: ["key"], autoIncrement: false }
754+ , indexParams : IDBObjectStore.defaultParameters
755+ , keyPath : ["indexedProperty"]
756+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
757+ ]
758+ , onUpgradeNeeded : Nothing
759+ }
760+ let cb =
761+ { onSuccess : const $ pure unit
762+ , onError : show >>> fail >>> launchAff'
807763 , onComplete: pure unit
808764 }
809− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
810− store <- IDBTransaction.objectStore tx "store"
811− index <- IDBObjectStore.index store "index"
812− IDBTransaction.onAbort tx (pure unit)
813− IDBTransaction.abort tx
814− cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
815− case cursor of
816− Right _ -> fail "expected TransactionInactiveError"
817− Left err -> name err `shouldEqual` "TransactionInactiveError"
818−
819− tearDown db
820−
821− it "openCursor() - throw InvalidStateError when the index is deleted" do
822− { db } <- setup
823− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
824− , indexParams: IDBObjectStore.defaultParameters
825− , keyPath: [ "indexedProperty" ]
826− , values:
827− [ { key: 14, indexedProperty: "patate" } :+: Nothing
828− ]
829− , onUpgradeNeeded: Just $ \db tx index -> launchAff' do
830− let
831− cb =
832− { onSuccess: const $ pure unit
833− , onError: show >>> fail >>> launchAff'
765+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
766+ store <- IDBTransaction.objectStore tx "store"
767+ index <- IDBObjectStore.index store "index"
768+ IDBTransaction.onAbort tx (pure unit)
769+ IDBTransaction.abort tx
770+ cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
771+ case cursor of
772+ Right _ -> fail "expected TransactionInactiveError"
773+ Left err -> name err `shouldEqual` "TransactionInactiveError"
774+
775+ tearDown db
776+
777+ it "openCursor() - throw InvalidStateError when the index is deleted" do
778+ { db } <- setup
779+ { storeParams : { keyPath: ["key"], autoIncrement: false }
780+ , indexParams : IDBObjectStore.defaultParameters
781+ , keyPath : ["indexedProperty"]
782+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
783+ ]
784+ , onUpgradeNeeded : Just $ \db tx index -> launchAff' do
785+ let cb =
786+ { onSuccess : const $ pure unit
787+ , onError : show >>> fail >>> launchAff'
834788 , onComplete: pure unit
835789 }
836− store <- IDBTransaction.objectStore tx "store"
837− IDBObjectStore.deleteIndex store "index"
838− cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
839− case cursor of
840− Right _ -> fail "expected InvalidStateError"
841− Left err -> name err `shouldEqual` "InvalidStateError"
842− }
843−
844− tearDown db
845−
846− it "getKey() - multiEntry - adding keys" do
847− { db } <- setup
848− { storeParams: IDBDatabase.defaultParameters
849− , indexParams: { unique: false, multiEntry: true }
850− , keyPath: [ "name" ]
851− , values:
852− [ { name: [ "patate", "autruche" ] } :+: (Just $ toKey 1)
853− , { name: [ "bob" ] } :+: (Just $ toKey 2)
854− ]
855− , onUpgradeNeeded: Just $ \_ _ index -> launchAff' do
856− key <- IDBIndex.getKey index (IDBKeyRange.only "patate")
857− key `shouldEqual` (Just $ toKey 1)
858−
859− key' <- IDBIndex.getKey index (IDBKeyRange.only "autruche")
860− key' `shouldEqual` (Just $ toKey 1)
861−
862− key'' <- IDBIndex.getKey index (IDBKeyRange.only "bob")
863− key'' `shouldEqual` (Just $ toKey 2)
864− }
865− tearDown db
866−
867− it "get() - returns the record with the first key in the range" do
868− { db } <- setup
869− { storeParams: { keyPath: [ "key" ], autoIncrement: false }
870− , indexParams: IDBObjectStore.defaultParameters
871− , keyPath: [ "indexedProperty" ]
872− , values:
873− [ { key: 14, indexedProperty: "patate" } :+: Nothing
874− , { key: 42, indexedProperty: "autruche" } :+: Nothing
875− , { key: 1337, indexedProperty: "baguette" } :+: Nothing
876− ]
877− , onUpgradeNeeded: Nothing
878− }
879−
880− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
881− store <- IDBTransaction.objectStore tx "store"
882− index <- IDBObjectStore.index store "index"
883− val <- IDBIndex.get index (IDBKeyRange.lowerBound "autruche" false)
884− ((\r -> r.key) <$> val) `shouldEqual` (Just 42)
885−
886− tearDown db
887−
888− describe "IDBCursor" do
889− let
790+ store <- IDBTransaction.objectStore tx "store"
791+ IDBObjectStore.deleteIndex store "index"
792+ cursor <- attempt $ IDBIndex.openCursor index Nothing Next cb
793+ case cursor of
794+ Right _ -> fail "expected InvalidStateError"
795+ Left err -> name err `shouldEqual` "InvalidStateError"
796+ }
797+
798+ tearDown db
799+
800+ it "getKey() - multiEntry - adding keys" do
801+ { db } <- setup
802+ { storeParams : IDBDatabase.defaultParameters
803+ , indexParams : { unique: false, multiEntry: true }
804+ , keyPath : ["name"]
805+ , values : [ { name: ["patate", "autruche"] } :+: (Just $ toKey 1)
806+ , { name: ["bob"] } :+: (Just $ toKey 2)
807+ ]
808+ , onUpgradeNeeded : Just $ \_ _ index -> launchAff' do
809+ key <- IDBIndex.getKey index (IDBKeyRange.only "patate")
810+ key `shouldEqual` (Just $ toKey 1)
811+
812+ key' <- IDBIndex.getKey index (IDBKeyRange.only "autruche")
813+ key' `shouldEqual` (Just $ toKey 1)
814+
815+ key'' <- IDBIndex.getKey index (IDBKeyRange.only "bob")
816+ key'' `shouldEqual` (Just $ toKey 2)
817+ }
818+ tearDown db
819+
820+
821+ it "get() - returns the record with the first key in the range" do
822+ { db } <- setup
823+ { storeParams : { keyPath: ["key"], autoIncrement: false }
824+ , indexParams : IDBObjectStore.defaultParameters
825+ , keyPath : ["indexedProperty"]
826+ , values : [ { key: 14, indexedProperty: "patate" } :+: Nothing
827+ , { key: 42, indexedProperty: "autruche" } :+: Nothing
828+ , { key: 1337, indexedProperty: "baguette" } :+: Nothing
829+ ]
830+ , onUpgradeNeeded : Nothing
831+ }
832+
833+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
834+ store <- IDBTransaction.objectStore tx "store"
835+ index <- IDBObjectStore.index store "index"
836+ val <- IDBIndex.get index (IDBKeyRange.lowerBound "autruche" false)
837+ ((\r -> r.key) <$> val) `shouldEqual` (Just 42)
838+
839+ tearDown db
840+
841+ describe "IDBCursor" do
842+ let
890843 tearDown db = do
891844 IDBDatabase.close db
892845 _ <- IDBFactory.deleteDatabase (IDBDatabase.name db)
893846 pure unit
894847
895− setup
896− :: forall value
897− . { storeParams :: { keyPath :: Array String, autoIncrement :: Boolean }
898− , indexParams :: { unique :: Boolean, multiEntry :: Boolean }
899− , values :: Array (Tuple value (Maybe Key))
900− , keyPath :: Array String
901− , onUpgradeNeeded :: Maybe (Database -> Transaction -> Index -> Effect Unit)
902− }
903− -> Aff { db :: Database, index :: Index, store :: ObjectStore }
848+ setup :: forall value e e'.
849+ { storeParams :: { keyPath :: Array String, autoIncrement :: Boolean }
850+ , indexParams :: { unique :: Boolean, multiEntry :: Boolean }
851+ , values :: Array (Tuple value (Maybe Key))
852+ , keyPath :: Array String
853+ , onUpgradeNeeded :: Maybe (Database -> Transaction -> Index -> Eff (idb :: IDB, avar :: AVAR, exception :: EXCEPTION | e') Unit)
854+ } -> Aff (idb :: IDB, avar :: AVAR | e) { db :: Database, index :: Index, store :: ObjectStore }
904855 setup { storeParams, indexParams, values, keyPath, onUpgradeNeeded } = do
905− let
906− onUpgradeNeeded' var db tx _ = launchAff' do
907− store <- IDBDatabase.createObjectStore db "store" storeParams
908− _ <- traverse (uncurry (IDBObjectStore.add store)) values
909− index <- IDBObjectStore.createIndex store "index" keyPath indexParams
910− liftEffect $ maybe (pure unit) identity (onUpgradeNeeded <*> pure db <*> pure tx <*> pure index)
911− AVar.put { db, index, store } var
912−
913− var <- AVar.empty
914− db <- IDBFactory.open "db" Nothing
915− { onUpgradeNeeded: Just (onUpgradeNeeded' var)
916− , onBlocked: Nothing
856+ let onUpgradeNeeded' var db tx _ = launchAff' do
857+ store <- IDBDatabase.createObjectStore db "store" storeParams
858+ _ <- traverse (uncurry (IDBObjectStore.add store)) values
859+ index <- IDBObjectStore.createIndex store "index" keyPath indexParams
860+ liftEff $ maybe (pure unit) id (onUpgradeNeeded <*> pure db <*> pure tx <*> pure index)
861+ putVar { db, index, store } var
862+
863+ var <- makeEmptyVar
864+ db <- IDBFactory.open "db" Nothing
865+ { onUpgradeNeeded : Just (onUpgradeNeeded' var)
866+ , onBlocked : Nothing
917867 }
918− AVar.take var
919−
920− it "continue() - iterate to the next record" do
921− { db } <- setup
922− { storeParams: IDBDatabase.defaultParameters
923− , indexParams: IDBObjectStore.defaultParameters
924− , keyPath: []
925− , values:
926− [ "cupcake" :+: (Just $ toKey 4)
927− , "pancake" :+: (Just $ toKey 2)
928− , "pie" :+: (Just $ toKey 1)
929− , "pie" :+: (Just $ toKey 3)
930− ]
931− , onUpgradeNeeded: Nothing
932− }
933− let
934− cb vdone vvals =
868+ takeVar var
869+
870+ it "continue() - iterate to the next record" do
871+ { db } <- setup
872+ { storeParams : IDBDatabase.defaultParameters
873+ , indexParams : IDBObjectStore.defaultParameters
874+ , keyPath : []
875+ , values : [ "cupcake" :+: (Just $ toKey 4)
876+ , "pancake" :+: (Just $ toKey 2)
877+ , "pie" :+: (Just $ toKey 1)
878+ , "pie" :+: (Just $ toKey 3)
879+ ]
880+ , onUpgradeNeeded: Nothing
881+ }
882+ let cb vdone vvals =
935883 { onComplete: launchAff' do
936− AVar.put unit vdone
884+ putVar unit vdone
937885
938− , onError: \error -> launchAff' do
886+ , onError: \error -> launchAff' do
939887 fail $ "unexpected error: " <> show error
940888
941889 , onSuccess: \cursor -> launchAff' do
942− vals <- AVar.take vvals
890+ vals <- takeVar vvals
943891 pure (IDBCursor.value cursor) >>= shouldEqual (maybe "" _.v $ head vals)
944− IDBCursor.primaryKey cursor >>= shouldEqual (maybe (toKey 0) _.k $ head vals)
945− AVar.put (drop 1 vals) vvals
892+ IDBCursor.primaryKey cursor >>= shouldEqual (maybe (toKey 0) _.k $ head vals)
893+ putVar (drop 1 vals) vvals
946894 IDBCursor.continue cursor none
947895 }
948− vdone <- AVar.empty
949− vvals <- AVar.new
950− [ { v: "pie", k: toKey 1 }
951− , { v: "pancake", k: toKey 2 }
952− , { v: "pie", k: toKey 3 }
953− , { v: "cupcake", k: toKey 4 }
954− ]
955− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
956− store <- IDBTransaction.objectStore tx "store"
957− IDBObjectStore.openCursor store Nothing Next (cb vdone vvals)
958− AVar.take vdone
959− tearDown db
960−
961− it "continue() - attempt to iterate in the wrong direction" do
962− { db } <- setup
963− { storeParams: IDBDatabase.defaultParameters
964− , indexParams: IDBObjectStore.defaultParameters
965− , keyPath: []
966− , values:
967− [ "cupcake" :+: (Just $ toKey 4)
968− , "pancake" :+: (Just $ toKey 2)
969− , "pie" :+: (Just $ toKey 1)
970− , "pie" :+: (Just $ toKey 3)
971− ]
972− , onUpgradeNeeded: Nothing
973− }
974− let
975− cb vdone =
896+ vdone <- makeEmptyVar
897+ vvals <- makeVar
898+ [ { v: "pie" , k: toKey 1 }
899+ , { v: "pancake", k: toKey 2 }
900+ , { v: "pie" , k: toKey 3 }
901+ , { v: "cupcake", k: toKey 4 }
902+ ]
903+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
904+ store <- IDBTransaction.objectStore tx "store"
905+ IDBObjectStore.openCursor store Nothing Next (cb vdone vvals)
906+ takeVar vdone
907+ tearDown db
908+
909+ it "continue() - attempt to iterate in the wrong direction" do
910+ { db } <- setup
911+ { storeParams : IDBDatabase.defaultParameters
912+ , indexParams : IDBObjectStore.defaultParameters
913+ , keyPath : []
914+ , values : [ "cupcake" :+: (Just $ toKey 4)
915+ , "pancake" :+: (Just $ toKey 2)
916+ , "pie" :+: (Just $ toKey 1)
917+ , "pie" :+: (Just $ toKey 3)
918+ ]
919+ , onUpgradeNeeded: Nothing
920+ }
921+ let cb vdone =
976922 { onComplete: launchAff' do
977923 fail $ "shouldn't complete"
978924
979− , onError: \error -> launchAff' do
925+ , onError: \error -> launchAff' do
980926 fail $ "unexpected error: " <> show error
981927
982928 , onSuccess: \cursor -> launchAff' do
983929 res <- attempt $ IDBCursor.continue cursor (Just 1)
984930 case res of
985− Left err -> do
931+ Left err -> do
986932 name err `shouldEqual` "DataError"
987− AVar.put unit vdone
933+ putVar unit vdone
988934 Right _ -> do
989935 fail "expected continue to fail"
990936 }
991− vdone <- AVar.empty
992− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
993− store <- IDBTransaction.objectStore tx "store"
994− IDBObjectStore.openCursor store Nothing Next (cb vdone)
995− AVar.take vdone
996− tearDown db
997−
998− it "advance() - iterate cursor number of times specified by count" do
999− { db } <- setup
1000− { storeParams: { keyPath: [ "pKey" ], autoIncrement: false }
1001− , indexParams: IDBObjectStore.defaultParameters
1002− , keyPath: []
1003− , values:
1004− [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1005− , { pKey: "pkey_1", iKey: "ikey_1" } :+: Nothing
1006− , { pKey: "pkey_2", iKey: "ikey_2" } :+: Nothing
1007− , { pKey: "pkey_3", iKey: "ikey_3" } :+: Nothing
1008− ]
1009− , onUpgradeNeeded: Nothing
1010− }
1011− let
1012− cb vdone vjump =
937+ vdone <- makeEmptyVar
938+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
939+ store <- IDBTransaction.objectStore tx "store"
940+ IDBObjectStore.openCursor store Nothing Next (cb vdone)
941+ takeVar vdone
942+ tearDown db
943+
944+
945+ it "advance() - iterate cursor number of times specified by count" do
946+ { db } <- setup
947+ { storeParams : { keyPath: ["pKey"], autoIncrement: false }
948+ , indexParams : IDBObjectStore.defaultParameters
949+ , keyPath : []
950+ , values : [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
951+ , { pKey: "pkey_1", iKey: "ikey_1" } :+: Nothing
952+ , { pKey: "pkey_2", iKey: "ikey_2" } :+: Nothing
953+ , { pKey: "pkey_3", iKey: "ikey_3" } :+: Nothing
954+ ]
955+ , onUpgradeNeeded: Nothing
956+ }
957+ let cb vdone vjump =
1013958 { onComplete: launchAff' do
1014− AVar.put unit vdone
959+ putVar unit vdone
1015960
1016− , onError: \error -> launchAff' do
961+ , onError: \error -> launchAff' do
1017962 fail $ "unexpected error: " <> show error
1018963
1019964 , onSuccess: \cursor -> launchAff' do
1020− jump <- AVar.take vjump
1021− if jump then do
1022− IDBCursor.advance cursor 3
1023− else do
1024− let value = IDBCursor.value cursor
1025− value.pKey `shouldEqual` "pkey_3"
1026− value.iKey `shouldEqual` "ikey_3"
1027− IDBCursor.continue cursor none
1028− AVar.put false vjump
965+ jump <- takeVar vjump
966+ if jump
967+ then do
968+ IDBCursor.advance cursor 3
969+ else do
970+ let value = IDBCursor.value cursor
971+ value.pKey `shouldEqual` "pkey_3"
972+ value.iKey `shouldEqual` "ikey_3"
973+ IDBCursor.continue cursor none
974+ putVar false vjump
1029975 }
1030− vdone <- AVar.empty
1031− vjump <- AVar.new true
1032− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
1033− store <- IDBTransaction.objectStore tx "store"
1034− IDBObjectStore.openCursor store Nothing Next (cb vdone vjump)
1035− AVar.take vdone
1036− tearDown db
1037−
1038− it "delete() - remove a record from the object store" do
1039− { db } <- setup
1040− { storeParams: { keyPath: [ "pKey" ], autoIncrement: false }
1041− , indexParams: IDBObjectStore.defaultParameters
1042− , keyPath: []
1043− , values:
1044− [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1045− , { pKey: "pkey_1", iKey: "ikey_1" } :+: Nothing
1046− , { pKey: "pkey_2", iKey: "ikey_2" } :+: Nothing
1047− , { pKey: "pkey_3", iKey: "ikey_3" } :+: Nothing
1048− ]
1049− , onUpgradeNeeded: Nothing
1050− }
1051− let
1052− cb vdone store =
976+ vdone <- makeEmptyVar
977+ vjump <- makeVar true
978+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
979+ store <- IDBTransaction.objectStore tx "store"
980+ IDBObjectStore.openCursor store Nothing Next (cb vdone vjump)
981+ takeVar vdone
982+ tearDown db
983+
984+ it "delete() - remove a record from the object store" do
985+ { db } <- setup
986+ { storeParams : { keyPath: ["pKey"], autoIncrement: false }
987+ , indexParams : IDBObjectStore.defaultParameters
988+ , keyPath : []
989+ , values : [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
990+ , { pKey: "pkey_1", iKey: "ikey_1" } :+: Nothing
991+ , { pKey: "pkey_2", iKey: "ikey_2" } :+: Nothing
992+ , { pKey: "pkey_3", iKey: "ikey_3" } :+: Nothing
993+ ]
994+ , onUpgradeNeeded: Nothing
995+ }
996+ let cb vdone store =
1053997 { onComplete: launchAff' do
1054998 mval <- map _.pKey <$> IDBIndex.get store (IDBKeyRange.only "pkey_0")
1055999 mval `shouldEqual` (Nothing :: Maybe String)
1056− AVar.put unit vdone
1000+ putVar unit vdone
10571001
1058− , onError: \error -> launchAff' do
1002+ , onError: \error -> launchAff' do
10591003 fail $ "unexpected error: " <> show error
10601004
10611005 , onSuccess: \cursor -> launchAff' do
@@ -1064,31 +1008,29 @@ main = do
10641008 IDBCursor.delete cursor
10651009 IDBCursor.advance cursor 4
10661010 }
1067− vdone <- AVar.empty
1068− tx <- IDBDatabase.transaction db [ "store" ] ReadWrite
1069− store <- IDBTransaction.objectStore tx "store"
1070− IDBObjectStore.openCursor store Nothing Next (cb vdone store)
1071− AVar.take vdone
1072− tearDown db
1073−
1074− it "update() - modify a record in the object store" do
1075− { db } <- setup
1076− { storeParams: { keyPath: [ "pKey" ], autoIncrement: false }
1077− , indexParams: IDBObjectStore.defaultParameters
1078− , keyPath: []
1079− , values:
1080− [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1081− ]
1082− , onUpgradeNeeded: Nothing
1083− }
1084− let
1085− cb vdone store =
1011+ vdone <- makeEmptyVar
1012+ tx <- IDBDatabase.transaction db ["store"] ReadWrite
1013+ store <- IDBTransaction.objectStore tx "store"
1014+ IDBObjectStore.openCursor store Nothing Next (cb vdone store)
1015+ takeVar vdone
1016+ tearDown db
1017+
1018+ it "update() - modify a record in the object store" do
1019+ { db } <- setup
1020+ { storeParams : { keyPath: ["pKey"], autoIncrement: false }
1021+ , indexParams : IDBObjectStore.defaultParameters
1022+ , keyPath : []
1023+ , values : [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1024+ ]
1025+ , onUpgradeNeeded: Nothing
1026+ }
1027+ let cb vdone store =
10861028 { onComplete: launchAff' do
10871029 mval <- map _.iKey <$> IDBIndex.get store (IDBKeyRange.only "pkey_0")
10881030 mval `shouldEqual` (Just "patate")
1089− AVar.put unit vdone
1031+ putVar unit vdone
10901032
1091− , onError: \error -> launchAff' do
1033+ , onError: \error -> launchAff' do
10921034 fail $ "unexpected error: " <> show error
10931035
10941036 , onSuccess: \cursor -> launchAff' do
@@ -1098,29 +1040,27 @@ main = do
10981040 key `shouldEqual` toKey "pkey_0"
10991041 IDBCursor.advance cursor 4
11001042 }
1101− vdone <- AVar.empty
1102− tx <- IDBDatabase.transaction db [ "store" ] ReadWrite
1103− store <- IDBTransaction.objectStore tx "store"
1104− IDBObjectStore.openCursor store Nothing Next (cb vdone store)
1105− AVar.take vdone
1106− tearDown db
1107−
1108− it "update() - throw ReadOnlyError after update on ReadOnly transaction" do
1109− { db } <- setup
1110− { storeParams: { keyPath: [ "pKey" ], autoIncrement: false }
1111− , indexParams: IDBObjectStore.defaultParameters
1112− , keyPath: []
1113− , values:
1114− [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1115− ]
1116− , onUpgradeNeeded: Nothing
1117− }
1118− let
1119− cb vdone =
1043+ vdone <- makeEmptyVar
1044+ tx <- IDBDatabase.transaction db ["store"] ReadWrite
1045+ store <- IDBTransaction.objectStore tx "store"
1046+ IDBObjectStore.openCursor store Nothing Next (cb vdone store)
1047+ takeVar vdone
1048+ tearDown db
1049+
1050+ it "update() - throw ReadOnlyError after update on ReadOnly transaction" do
1051+ { db } <- setup
1052+ { storeParams : { keyPath: ["pKey"], autoIncrement: false }
1053+ , indexParams : IDBObjectStore.defaultParameters
1054+ , keyPath : []
1055+ , values : [ { pKey: "pkey_0", iKey: "ikey_0" } :+: Nothing
1056+ ]
1057+ , onUpgradeNeeded: Nothing
1058+ }
1059+ let cb vdone =
11201060 { onComplete: launchAff' do
11211061 fail $ "shouldn't complete"
11221062
1123− , onError: \error -> launchAff' do
1063+ , onError: \error -> launchAff' do
11241064 fail $ "unexpected error: " <> show error
11251065
11261066 , onSuccess: \cursor -> launchAff' do
@@ -1128,14 +1068,13 @@ main = do
11281068 case res of
11291069 Left err -> do
11301070 name err `shouldEqual` "ReadOnlyError"
1131− AVar.put unit vdone
1071+ putVar unit vdone
11321072 Right _ ->
11331073 fail $ "expected ReadOnlyError"
11341074 }
1135− vdone <- AVar.empty
1136− tx <- IDBDatabase.transaction db [ "store" ] ReadOnly
1137− store <- IDBTransaction.objectStore tx "store"
1138− IDBObjectStore.openCursor store Nothing Next (cb vdone)
1139− AVar.take vdone
1140− tearDown db
1141−
1075+ vdone <- makeEmptyVar
1076+ tx <- IDBDatabase.transaction db ["store"] ReadOnly
1077+ store <- IDBTransaction.objectStore tx "store"
1078+ IDBObjectStore.openCursor store Nothing Next (cb vdone)
1079+ takeVar vdone
1080+ tearDown db
yarn.lockdeleted−81
@@ -1,81 +0,0 @@
1−# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2−# yarn lockfile v1
3−
4−
5−base64-arraybuffer-es6@^0.7.0:
6− version "0.7.0"
7− resolved "https://registry.yarnpkg.com/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.7.0.tgz#dbe1e6c87b1bf1ca2875904461a7de40f21abc86"
8− integrity sha512-ESyU/U1CFZDJUdr+neHRhNozeCv72Y7Vm0m1DCbjX3KBjT6eYocvAJlSk6+8+HkVwXlT1FNxhGW6q3UKAlCvvw==
9−
10−domexception@^1.0.1:
11− version "1.0.1"
12− resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
13− integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
14− dependencies:
15− webidl-conversions "^4.0.2"
16−
17−fake-indexeddb@^4.0.1:
18− version "4.0.1"
19− resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-4.0.1.tgz#09bb2468e21d0832b2177e894765fb109edac8fb"
20− integrity sha512-hFRyPmvEZILYgdcLBxVdHLik4Tj3gDTu/g7s9ZDOiU3sTNiGx+vEu1ri/AMsFJUZ/1sdRbAVrEcKndh3sViBcA==
21− dependencies:
22− realistic-structured-clone "^3.0.0"
23−
24−lodash@^4.7.0:
25− version "4.17.21"
26− resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
27− integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
28−
29−punycode@^2.1.1:
30− version "2.3.0"
31− resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
32− integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
33−
34−realistic-structured-clone@^3.0.0:
35− version "3.0.0"
36− resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-3.0.0.tgz#7b518049ce2dad41ac32b421cd297075b00e3e35"
37− integrity sha512-rOjh4nuWkAqf9PWu6JVpOWD4ndI+JHfgiZeMmujYcPi+fvILUu7g6l26TC1K5aBIp34nV+jE1cDO75EKOfHC5Q==
38− dependencies:
39− domexception "^1.0.1"
40− typeson "^6.1.0"
41− typeson-registry "^1.0.0-alpha.20"
42−
43−tr46@^2.1.0:
44− version "2.1.0"
45− resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
46− integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
47− dependencies:
48− punycode "^2.1.1"
49−
50−typeson-registry@^1.0.0-alpha.20:
51− version "1.0.0-alpha.39"
52− resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211"
53− integrity sha512-NeGDEquhw+yfwNhguLPcZ9Oj0fzbADiX4R0WxvoY8nGhy98IbzQy1sezjoEFWOywOboj/DWehI+/aUlRVrJnnw==
54− dependencies:
55− base64-arraybuffer-es6 "^0.7.0"
56− typeson "^6.0.0"
57− whatwg-url "^8.4.0"
58−
59−typeson@^6.0.0, typeson@^6.1.0:
60− version "6.1.0"
61− resolved "https://registry.yarnpkg.com/typeson/-/typeson-6.1.0.tgz#5b2a53705a5f58ff4d6f82f965917cabd0d7448b"
62− integrity sha512-6FTtyGr8ldU0pfbvW/eOZrEtEkczHRUtduBnA90Jh9kMPCiFNnXIon3vF41N0S4tV1HHQt4Hk1j4srpESziCaA==
63−
64−webidl-conversions@^4.0.2:
65− version "4.0.2"
66− resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
67− integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
68−
69−webidl-conversions@^6.1.0:
70− version "6.1.0"
71− resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
72− integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
73−
74−whatwg-url@^8.4.0:
75− version "8.7.0"
76− resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
77− integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
78− dependencies:
79− lodash "^4.7.0"
80− tr46 "^2.1.0"
81− webidl-conversions "^6.1.0"