@converse/skeletor 0.0.5 → 0.0.6

package/src/storage.js

@@ -1,17 +1,19 @@
 /**
  * IndexedDB, localStorage and sessionStorage adapter
  */
-import mergebounce from 'mergebounce';
-import localForage from "localforage/src/localforage";
 import * as memoryDriver from 'localforage-driver-memory';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import isString from 'lodash-es/isString.js';
+import localForage from "localforage/src/localforage";
+import mergebounce from 'mergebounce';
 import sessionStorageWrapper from "./drivers/sessionStorage.js";
-import { extendPrototype } from 'localforage-setitems';
+import { extendPrototype as extendPrototypeWithSetItems } from 'localforage-setitems';
+import { extendPrototype as extendPrototypeWithGetItems } from 'localforage-getitems';
 
 const IN_MEMORY = memoryDriver._driver
 localForage.defineDriver(memoryDriver);
-extendPrototype(localForage);
+extendPrototypeWithSetItems(localForage);
+extendPrototypeWithGetItems(localForage);
 
 function S4() {
     // Generate four random hex digits.
@@ -80,7 +82,7 @@ class Storage {
         await Promise.all(removed_keys.map(k => this.store.removeItem(k).catch(e => console.error(e))));
     }
 
-    sync (name) {
+    sync () {
         const that = this;
 
         async function localSync (method, model, options) {
@@ -237,9 +239,10 @@ class Storage {
     async findAll () {
         /* Return the array of all models currently in storage.
          */
-        const data = await this.store.getItem(this.name);
-        if (data && data.length) {
-            return Promise.all(data.map(item => this.store.getItem(item)));
+        const keys = await this.store.getItem(this.name);
+        if (keys?.length) {
+            const items = await this.store.getItems(keys);
+            return Object.values(items);
         }
         return [];
     }

package/src/storage.js~

@@ -1,17 +1,19 @@
 /**
  * IndexedDB, localStorage and sessionStorage adapter
  */
-import mergebounce from 'mergebounce';
-import * as localForage from "localforage";
 import * as memoryDriver from 'localforage-driver-memory';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import isString from 'lodash-es/isString.js';
+import localForage from "localforage/src/localforage";
+import mergebounce from 'mergebounce';
 import sessionStorageWrapper from "./drivers/sessionStorage.js";
-import { extendPrototype } from 'localforage-setitems';
+import { extendPrototype as extendPrototypeWithSetItems } from 'localforage-setitems';
+import { extendPrototype as extendPrototypeWithGetItems } from 'localforage-getitems';
 
 const IN_MEMORY = memoryDriver._driver
 localForage.defineDriver(memoryDriver);
-extendPrototype(localForage);
+extendPrototypeWithSetItems(localForage);
+extendPrototypeWithGetItems(localForage);
 
 function S4() {
     // Generate four random hex digits.
@@ -80,7 +82,7 @@ class Storage {
         await Promise.all(removed_keys.map(k => this.store.removeItem(k).catch(e => console.error(e))));
     }
 
-    sync (name) {
+    sync () {
         const that = this;
 
         async function localSync (method, model, options) {
@@ -187,7 +189,7 @@ class Storage {
 
     getCollectionReferenceData (model) {
         if (!model.collection) {
-            return;
+            return {};
         }
         const ids = model.collection.map(m => this.getItemName(m.id));
         const new_id = this.getItemName(model.id);
@@ -237,9 +239,11 @@ class Storage {
     async findAll () {
         /* Return the array of all models currently in storage.
          */
-        const data = await this.store.getItem(this.name);
-        if (data && data.length) {
-            return Promise.all(data.map(item => this.store.getItem(item)));
+        const keys = await this.store.getItem(this.name);
+        if (keys?.length) {
+            const items = await this.store.getItems(keys);
+            debugger;
+            return Object.values(items);
         }
         return [];
     }

package/CHANGES.md

@@ -1,37 +0,0 @@
-# Changelog
-
-## 0.0.5 (2021-07-08)
-
-- #13 Import the default export of localforage
-- Don't expect a collection's `model` attribute to have a `prototype`. It might be an arrow function, in which case it doesn't.
-- Update to mergebounce 0.1.0
-
-## 0.0.4 (2021-05-12)
-
-- Upgrade to lit 2.0.0-rc.2
-
-## 0.0.3 (2021-04-28)
-
-- Create the `ElementView`, which is like a Backbone View but extends
-  `HTMLElement` and is therefore also a custom element or web component.
-/home/kalie/src/converse.prosody/src/converse.js/src/headless/core.js:     * @property {object} converse.env._           - The instance of [lodash-es](http://lodash.com) used by Converse.
-- Allow writes to the client-side store to be batched (via [mergebounce](https://github.com/conversejs/mergebounce)).
-  This is particularly useful for IndexedDB, which has a very slow writing speed.
-  To enabled batched writes, pass in `true` for the 3rd parameter of the
-  `Storage` constructor.
-
-## 0.0.2 (2020-09-18)
-
-Initial fork from Backbone
-
-- Removes the dependency on jQuery
-- Instead of the `render` method Views can have a `toHTML` method which must return a
-  [lit-html](https://lit-html.polymer-project.org/) `TemplateResult`.
-- Replaces [underscore](http://underscorejs.org) with [lodash](https://lodash.com)
-- Imports lodash methods individually to allow for tree-shaking
-- Uses the native browser API instead of lodash
-- Drops support for older browsers (including IE) and uses ES6+ language features
-- Splits models, views and collections into separate modules
-- Adds a new `ElementView` class, which is a like a Backbone View, but doubles
-  as an instance of HTMLElement and can be used to register a custom element or
-  web-component.