Fixed cache / database error message.

Author: MarkusBordihn

package.json

@@ -7,11 +7,11 @@
   "private": true,
   "dependencies": {
     "closure-builder": "^2.2.39",
-    "command-line-usage": "^5.0.3",
+    "command-line-usage": "^5.0.4",
     "jsdoc": "^3.5.5",
     "npm": "^5.8.0",
     "npm-check-updates": "^2.14.1",
-    "nw": "^0.29.2",
+    "nw": "^0.29.3",
     "nw-builder": "^3.5.1",
     "rimraf": "^2.6.2"
   },

src/cache/cache.js

@@ -22,7 +22,6 @@ goog.provide('cwc.Cache');
 goog.require('cwc.framework.External');
 goog.require('cwc.framework.Internal');
 goog.require('cwc.framework.StyleSheet');
-goog.require('cwc.renderer.Helper');
 goog.require('cwc.utils.Database');
 goog.require('cwc.utils.Logger');
 goog.require('cwc.utils.Resources');
@@ -42,11 +41,11 @@ cwc.Cache = function(helper) {
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
-  /** @type {!cwc.renderer.Helper} */
-  this.rendererHelper = new cwc.renderer.Helper();
+  /** @private {!string} */
+  this.version = '3';
 
   /** @private {!cwc.utils.Database} */
-  this.database_ = new cwc.utils.Database(this.name);
+  this.database_ = new cwc.utils.Database(this.name, this.version);
 
   /** @private {!Object} */
   this.databaseConfig_ = {
@@ -55,9 +54,6 @@ cwc.Cache = function(helper) {
 
   /** @private {!cwc.utils.Logger} */
   this.log_ = new cwc.utils.Logger(this.name);
-
-  /** @private {!string} */
-  this.version_ = '3';
 };
 
 
@@ -77,12 +73,12 @@ cwc.Cache.prototype.prepare = function() {
  * @param {!string|number} version
  */
 cwc.Cache.prototype.update = function(version) {
-  if (version && this.version_ <= version) {
-    this.log_.info('No updates needed', version, '>=', this.version_);
+  if (version && this.version <= version) {
+    this.log_.info('No updates needed', version, '>=', this.version);
     return;
   }
 
-  this.log_.info('Updating Cache to version', this.version_);
+  this.log_.info('Updating Cache to version', this.version);
   this.database_.clearFiles();
 
   this.log_.info('Loading external frameworks ...');
@@ -94,7 +90,7 @@ cwc.Cache.prototype.update = function(version) {
   this.log_.info('Loading Style Sheets ...');
   this.loadFiles(cwc.framework.StyleSheet);
 
-  this.database_.addFile('__version__', this.version_);
+  this.database_.addFile('__version__', this.version);
 };
 
 

src/utils/database.js

@@ -57,6 +57,7 @@ cwc.utils.Database = function(name, version) {
  * @export
  */
 cwc.utils.Database.prototype.open = function(config = this.config_) {
+  let formerConfig = this.config_;
   let objectStoreNames = [this.defaultObjectStore_];
   if (config) {
     this.config_ = config;
@@ -65,7 +66,7 @@ cwc.utils.Database.prototype.open = function(config = this.config_) {
     }
   }
   return new Promise((resolve, reject) => {
-    if (this.database_) {
+    if (this.database_ && formerConfig === this.config_) {
       return resolve(this.database_);
     }
 
@@ -123,8 +124,12 @@ cwc.utils.Database.prototype.addFile = function(name, content,
 cwc.utils.Database.prototype.clearFiles = function(
     group = this.defaultObjectStore_) {
   this.open().then(() => {
-    this.log_.info('Clear files in group', group);
-    this.getObjectStore_(group)['clear']();
+    if (this.existObjectStore_(group)) {
+      this.log_.info('Clear files in group', group);
+      this.getObjectStore_(group)['clear']();
+    } else {
+      this.log_.warn('ObjectStore', group, 'does not exists!');
+    }
   });
 };
 
@@ -191,3 +196,14 @@ cwc.utils.Database.prototype.getObjectStoreReadOnly_ = function(
     group = this.defaultObjectStore_) {
   return this.database_['transaction'](group, 'readonly')['objectStore'](group);
 };
+
+
+/**
+ * @param {string=} group
+ * @return {boolean}
+ * @private
+ */
+cwc.utils.Database.prototype.existObjectStore_ = function(
+    group = this.defaultObjectStore_) {
+  return this.database_ && this.database_['objectStoreNames'].contains(group);
+};

static_files/resources/tutorial/simple/blocks/tutorial-1.cwc

@@ -6,14 +6,14 @@
       "type": "application/blockly+xml",
       "size": 48,
       "content": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"></xml>",
-      "version": 1,
+      "version": 1
     },
     "__javascript__": {
       "name": "__javascript__",
       "type": "application/javascript",
       "size": 0,
       "content": "",
-      "version": 1,
+      "version": 1
     }
   },
   "description": "",