Skip to content

Commit 08649d9

Browse files
authored
adapter-indexeddb: replace var with let/const (#8926)
1 parent 2789b70 commit 08649d9

File tree

12 files changed

+150
-150
lines changed

12 files changed

+150
-150
lines changed

packages/node_modules/pouchdb-adapter-indexeddb/src/allDocs.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { DOC_STORE, processAttachment } from './util';
77

88
function allDocsKeys(keys, docStore, allDocsInner) {
99
// It's not guaranteed to be returned in right order
10-
var valuesBatch = new Array(keys.length);
11-
var count = 0;
10+
const valuesBatch = new Array(keys.length);
11+
let count = 0;
1212
keys.forEach(function (key, index) {
1313
docStore.get(key).onsuccess = function (event) {
1414
if (event.target.result) {
@@ -43,7 +43,7 @@ function createKeyRange(start, end, inclusiveStart, inclusiveEnd, key, descendin
4343
function handleKeyRangeError(opts, metadata, err, callback) {
4444
if (err.name === "DataError" && err.code === 0) {
4545
// data error, start is less than end
46-
var returnVal = {
46+
const returnVal = {
4747
total_rows: metadata.doc_count,
4848
offset: opts.skip,
4949
rows: []
@@ -64,7 +64,7 @@ export default function (txn, metadata, opts, callback) {
6464

6565
// TODO: Weird hack, I don't like it
6666
if (opts.limit === 0) {
67-
var returnVal = {
67+
const returnVal = {
6868
total_rows: metadata.doc_count,
6969
offset: opts.skip,
7070
rows: []
@@ -77,19 +77,19 @@ export default function (txn, metadata, opts, callback) {
7777
return callback(null, returnVal);
7878
}
7979

80-
var results = [];
81-
var processing = [];
80+
const results = [];
81+
const processing = [];
8282

83-
var key = 'key' in opts ? opts.key : false;
84-
var keys = 'keys' in opts ? opts.keys : false;
85-
var skip = opts.skip || 0;
86-
var limit = typeof opts.limit === 'number' ? opts.limit : undefined;
87-
var inclusiveEnd = opts.inclusive_end !== false;
88-
var descending = 'descending' in opts && opts.descending ? 'prev' : null;
89-
var start = 'startkey' in opts ? opts.startkey : (descending ? '\uffff' : '');
90-
var end = 'endkey' in opts ? opts.endkey : (descending ? '' : '\uffff');
83+
const key = 'key' in opts ? opts.key : false;
84+
const keys = 'keys' in opts ? opts.keys : false;
85+
let skip = opts.skip || 0;
86+
let limit = typeof opts.limit === 'number' ? opts.limit : undefined;
87+
const inclusiveEnd = opts.inclusive_end !== false;
88+
const descending = 'descending' in opts && opts.descending ? 'prev' : null;
89+
const start = 'startkey' in opts ? opts.startkey : (descending ? '\uffff' : '');
90+
const end = 'endkey' in opts ? opts.endkey : (descending ? '' : '\uffff');
9191

92-
var docStore = txn.txn.objectStore(DOC_STORE);
92+
const docStore = txn.txn.objectStore(DOC_STORE);
9393

9494
if (keys) {
9595
txn.txn.oncomplete = onTxnComplete;
@@ -121,19 +121,19 @@ export default function (txn, metadata, opts, callback) {
121121
txn.txn.oncomplete = onTxnComplete;
122122

123123
function include_doc(row, doc) {
124-
var docData = doc.revs[doc.rev].data;
124+
const docData = doc.revs[doc.rev].data;
125125

126126
row.doc = docData;
127127
row.doc._id = doc.id;
128128
row.doc._rev = doc.rev;
129129
if (opts.conflicts) {
130-
var conflicts = collectConflicts(doc);
130+
const conflicts = collectConflicts(doc);
131131
if (conflicts.length) {
132132
row.doc._conflicts = conflicts;
133133
}
134134
}
135135
if (opts.attachments && docData._attachments) {
136-
for (var name in docData._attachments) {
136+
for (const name in docData._attachments) {
137137
processing.push(processAttachment(name, doc, row.doc, opts.binary,
138138
metadata.idb_attachment_format));
139139
}

packages/node_modules/pouchdb-adapter-indexeddb/src/bulkDocs.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ import { rewrite } from './rewrite';
2525

2626
export default function (api, req, opts, metadata, dbOpts, idbChanges, callback) {
2727

28-
var txn;
28+
let txn;
2929

3030
// TODO: I would prefer to get rid of these globals
31-
var error;
32-
var results = [];
33-
var docs = [];
34-
var lastWriteIndex;
31+
let error;
32+
const results = [];
33+
const docs = [];
34+
let lastWriteIndex;
3535

36-
var revsLimit = dbOpts.revs_limit || 1000;
37-
var rewriteEnabled = dbOpts.name.indexOf("-mrview-") === -1;
36+
const revsLimit = dbOpts.revs_limit || 1000;
37+
const rewriteEnabled = dbOpts.name.indexOf("-mrview-") === -1;
3838
const autoCompaction = dbOpts.auto_compaction;
3939

4040
// We only need to track 1 revision for local documents
@@ -49,8 +49,8 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
4949
// Reads the original doc from the store if available
5050
// As in allDocs with keys option using multiple get calls is the fastest way
5151
function fetchExistingDocs(txn, docs) {
52-
var fetched = 0;
53-
var oldDocs = {};
52+
let fetched = 0;
53+
const oldDocs = {};
5454

5555
function readDone(e) {
5656
if (e.target.result) {
@@ -78,7 +78,7 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
7878
function processDocs(txn, docs, oldDocs) {
7979

8080
docs.forEach(function (doc, i) {
81-
var newDoc;
81+
let newDoc;
8282

8383
// The first document write cannot be a deletion
8484
if ('was_delete' in opts && !(Object.prototype.hasOwnProperty.call(oldDocs, doc.id))) {
@@ -102,7 +102,7 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
102102
// New document
103103
} else {
104104
// Ensure new documents are also stemmed
105-
var merged = merge([], doc.rev_tree[0], docsRevsLimit(doc));
105+
const merged = merge([], doc.rev_tree[0], docsRevsLimit(doc));
106106
doc.rev_tree = merged.tree;
107107
doc.stemmedRevs = merged.stemmedRevs;
108108
newDoc = doc;
@@ -124,7 +124,7 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
124124
// we use to store
125125
function convertDocFormat(doc) {
126126

127-
var newDoc = {
127+
const newDoc = {
128128
id: doc.metadata.id,
129129
rev: doc.metadata.rev,
130130
rev_tree: doc.metadata.rev_tree,
@@ -146,28 +146,28 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
146146
return false;
147147
}
148148

149-
var isRoot = /^1-/.test(doc.rev);
149+
const isRoot = /^1-/.test(doc.rev);
150150

151151
// Reattach first writes after a deletion to last deleted tree
152152
if (oldDoc.deleted && !doc.deleted && opts.new_edits && isRoot) {
153-
var tmp = doc.revs[doc.rev].data;
153+
const tmp = doc.revs[doc.rev].data;
154154
tmp._rev = oldDoc.rev;
155155
tmp._id = oldDoc.id;
156156
doc = convertDocFormat(parseDoc(tmp, opts.new_edits, dbOpts));
157157
}
158158

159-
var merged = merge(oldDoc.rev_tree, doc.rev_tree[0], docsRevsLimit(doc));
159+
const merged = merge(oldDoc.rev_tree, doc.rev_tree[0], docsRevsLimit(doc));
160160
doc.stemmedRevs = merged.stemmedRevs;
161161
doc.rev_tree = merged.tree;
162162

163163
// Merge the old and new rev data
164-
var revs = oldDoc.revs;
164+
const revs = oldDoc.revs;
165165
revs[doc.rev] = doc.revs[doc.rev];
166166
doc.revs = revs;
167167

168168
doc.attachments = oldDoc.attachments;
169169

170-
var inConflict = opts.new_edits && (((oldDoc.deleted && doc.deleted) ||
170+
const inConflict = opts.new_edits && (((oldDoc.deleted && doc.deleted) ||
171171
(!oldDoc.deleted && merged.conflicts !== 'new_leaf') ||
172172
(oldDoc.deleted && !doc.deleted && merged.conflicts === 'new_branch') ||
173173
(oldDoc.rev === doc.rev)));
@@ -185,19 +185,19 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
185185

186186
// We copy the data from the winning revision into the root
187187
// of the document so that it can be indexed
188-
var winningRev = calculateWinningRev(doc);
188+
const winningRev = calculateWinningRev(doc);
189189
// rev of new doc for attachments and to return it
190-
var writtenRev = doc.rev;
190+
const writtenRev = doc.rev;
191191
const isLocal = isLocalId(doc.id);
192192

193-
var theDoc = doc.revs[winningRev].data;
193+
const theDoc = doc.revs[winningRev].data;
194194

195195
const isNewDoc = doc.isNewDoc;
196196

197197
if (rewriteEnabled) {
198198
// doc.data is what we index, so we need to clone and rewrite it, and clean
199199
// it up for indexability
200-
var result = rewrite(theDoc);
200+
const result = rewrite(theDoc);
201201
if (result) {
202202
doc.data = result;
203203
delete doc.data._attachments;
@@ -216,7 +216,7 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
216216
if (!isLocal) {
217217
doc.seq = ++metadata.seq;
218218

219-
var delta = 0;
219+
let delta = 0;
220220
// If its a new document, we wont decrement if deleted
221221
if (doc.isNewDoc) {
222222
delta = doc.deleted ? 0 : 1;
@@ -250,8 +250,8 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
250250
}
251251

252252
if (theDoc._attachments) {
253-
for (var k in theDoc._attachments) {
254-
var attachment = theDoc._attachments[k];
253+
for (const k in theDoc._attachments) {
254+
const attachment = theDoc._attachments[k];
255255
if (attachment.stub) {
256256
if (!(attachment.digest in doc.attachments)) {
257257
error = createError(MISSING_STUB);
@@ -317,7 +317,7 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
317317
return Promise.resolve(attachment);
318318
}
319319

320-
var binData;
320+
let binData;
321321
if (typeof attachment.data === 'string') {
322322
try {
323323
binData = atob(attachment.data);
@@ -354,18 +354,18 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
354354
}
355355

356356
function preProcessAttachments() {
357-
var promises = docs.map(function (doc) {
358-
var data = doc.revs[doc.rev].data;
357+
const promises = docs.map(function (doc) {
358+
const data = doc.revs[doc.rev].data;
359359
if (!data._attachments) {
360360
return Promise.resolve(data);
361361
}
362-
var attachments = Object.keys(data._attachments).map(function (k) {
362+
const attachments = Object.keys(data._attachments).map(function (k) {
363363
data._attachments[k].name = k;
364364
return preProcessAttachment(data._attachments[k]);
365365
});
366366

367367
return Promise.all(attachments).then(function (newAttachments) {
368-
var processed = {};
368+
const processed = {};
369369
newAttachments.forEach(function (attachment) {
370370
processed[attachment.name] = attachment;
371371
delete attachment.name;
@@ -377,8 +377,8 @@ export default function (api, req, opts, metadata, dbOpts, idbChanges, callback)
377377
return Promise.all(promises);
378378
}
379379

380-
for (var i = 0, len = req.docs.length; i < len; i++) {
381-
var result;
380+
for (let i = 0, len = req.docs.length; i < len; i++) {
381+
let result;
382382
// TODO: We should get rid of throwing for invalid docs, also not sure
383383
// why this is needed in idb-next and not idb
384384
try {

packages/node_modules/pouchdb-adapter-indexeddb/src/changes.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function (txn, idbChanges, api, dbOpts, opts) {
1010
}
1111

1212
if (opts.continuous) {
13-
var id = dbOpts.name + ':' + uuid();
13+
const id = dbOpts.name + ':' + uuid();
1414
idbChanges.addListener(dbOpts.name, id, api, opts);
1515
idbChanges.notify(dbOpts.name);
1616
return {
@@ -20,25 +20,25 @@ export default function (txn, idbChanges, api, dbOpts, opts) {
2020
};
2121
}
2222

23-
var limit = 'limit' in opts ? opts.limit : -1;
23+
let limit = 'limit' in opts ? opts.limit : -1;
2424
if (limit === 0) {
2525
limit = 1;
2626
}
2727

28-
var store = txn.txn.objectStore(DOC_STORE).index('seq');
28+
const store = txn.txn.objectStore(DOC_STORE).index('seq');
2929

30-
var filter = filterChange(opts);
31-
var received = 0;
30+
const filter = filterChange(opts);
31+
let received = 0;
3232

33-
var lastSeq = opts.since || 0;
34-
var results = [];
33+
let lastSeq = opts.since || 0;
34+
const results = [];
3535

36-
var processing = [];
36+
const processing = [];
3737

3838
function onReqSuccess(e) {
3939
if (!e.target.result) { return; }
40-
var cursor = e.target.result;
41-
var doc = cursor.value;
40+
const cursor = e.target.result;
41+
const doc = cursor.value;
4242
// Overwrite doc.data, which may have been rewritten (see rewrite.js) with
4343
// the clean version for that rev
4444
doc.data = doc.revs[doc.rev].data;
@@ -53,10 +53,10 @@ export default function (txn, idbChanges, api, dbOpts, opts) {
5353
}
5454

5555
// WARNING: expecting possible old format
56-
var change = opts.processChange(doc.data, doc, opts);
56+
const change = opts.processChange(doc.data, doc, opts);
5757
change.seq = doc.seq;
5858
lastSeq = doc.seq;
59-
var filtered = filter(change);
59+
const filtered = filter(change);
6060

6161
// If its an error
6262
if (typeof filtered === 'object') {
@@ -70,9 +70,9 @@ export default function (txn, idbChanges, api, dbOpts, opts) {
7070
}
7171

7272
if (opts.include_docs && opts.attachments && doc.data._attachments) {
73-
var promises = [];
74-
for (var name in doc.data._attachments) {
75-
var p = processAttachment(name, doc, change.doc, opts.binary, api.blobSupport);
73+
const promises = [];
74+
for (const name in doc.data._attachments) {
75+
const p = processAttachment(name, doc, change.doc, opts.binary, api.blobSupport);
7676
// We add the processing promise to 2 arrays, one tracks all
7777
// the promises needed before we fire onChange, the other
7878
// ensure we process all attachments before onComplete
@@ -101,7 +101,7 @@ export default function (txn, idbChanges, api, dbOpts, opts) {
101101
});
102102
}
103103

104-
var req;
104+
let req;
105105
if (opts.descending) {
106106
req = store.openCursor(null, 'prev');
107107
} else {

packages/node_modules/pouchdb-adapter-indexeddb/src/destroy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default function (dbOpts, openDatabases, idbChanges, callback) {
55
idbChanges.removeAllListeners(dbOpts.name);
66

77
function doDestroy() {
8-
var req = indexedDB.deleteDatabase(dbOpts.name);
8+
const req = indexedDB.deleteDatabase(dbOpts.name);
99
req.onsuccess = function () {
1010
delete openDatabases[dbOpts.name];
1111
callback(null, {ok: true});

packages/node_modules/pouchdb-adapter-indexeddb/src/doCompaction.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ export default function (txn, id, revs, callback) {
99
return callback(txn.error);
1010
}
1111

12-
var docStore = txn.txn.objectStore(DOC_STORE);
12+
const docStore = txn.txn.objectStore(DOC_STORE);
1313

1414
docStore.get(id).onsuccess = function (e) {
15-
var doc = e.target.result;
15+
const doc = e.target.result;
1616

1717
traverseRevTree(doc.rev_tree, function (isLeaf, pos, revHash, ctx, opts) {
18-
var rev = pos + '-' + revHash;
18+
const rev = pos + '-' + revHash;
1919
if (revs.indexOf(rev) !== -1) {
2020
opts.status = 'missing';
2121
}
2222
});
2323

24-
var attachments = [];
24+
const attachments = [];
2525

2626
revs.forEach(function (rev) {
2727
if (rev in doc.revs) {
2828
// Make a list of attachments that are used by the revisions being
2929
// deleted
3030
if (doc.revs[rev].data._attachments) {
31-
for (var k in doc.revs[rev].data._attachments) {
31+
for (const k in doc.revs[rev].data._attachments) {
3232
attachments.push(doc.revs[rev].data._attachments[k].digest);
3333
}
3434
}

0 commit comments

Comments
 (0)