@breakside/jskit 2023.10.0 → 2023.12.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2023.10.0",
+  "JSBundleVersion": "2023.12.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "DOM+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+  "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
 }

package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-    "JSBundleVersion": "2023.10.0",
+    "JSBundleVersion": "2023.12.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
       "node": "DOM+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+    "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2023.10.0",
+  "JSBundleVersion": "2023.12.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
     "html": "FontKit+HTML.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+  "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
 }

package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-    "JSBundleVersion": "2023.10.0",
+    "JSBundleVersion": "2023.12.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
       "html": "FontKit+HTML.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+    "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2023.10.0",
+  "JSBundleVersion": "2023.12.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "Foundation+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+  "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
 }

package/Frameworks/Foundation.jsframework/JS/JSFileManager+HTML.js

@@ -45,6 +45,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     _identifier: null,
 
     _db: null,
+    _rootURL: null,
 
     error: null,
 
@@ -57,7 +58,6 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     // MARK: - Opening the File System
 
     open: function(completion, target){
-        logger.info("opening indexeddb file manager");
         if (!completion){
             completion = Promise.completion(function JSFileManager_open_promise_completion(status){
                 if (status != JSFileManager.State.success){
@@ -68,6 +68,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         }
         var request = indexedDB.open(this._identifier, CURRENT_DATABASE_VERSION);
         var manager = this;
+        var oldVersion = 0;
         request.onblocked = function JSFileManager_open_onblocked(e){
             logger.info("indexeddb file manager upgrade blocked by other windows");
             completion.call(target, JSFileManager.State.conflictingVersions);
@@ -81,6 +82,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         request.onupgradeneeded = function JSFileManager_open_onupgradeneeded(e){
             logger.info("indexeddb upgrade needed");
             logger.info("indexeddb upgrading");
+            oldVersion = e.oldVersion;
             try{
                 manager._db = e.target.result;
                 manager.upgrade(e.oldVersion, e.newVersion);
@@ -90,10 +92,24 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             }
         };
         request.onsuccess = function JSFileManager_open_onsuccess(e){
-            logger.info("indexeddb open");
             manager._db = e.target.result;
-            completion.call(target, JSFileManager.State.success);
+            if (oldVersion === 1){
+                var v1url = manager._rootURL.appendingPathComponents(["Containers", "io.breakside.JSKit.Foundation.JSFileManager"], true);
+                var v2url = manager.persistentContainerURL;
+                logger.info("moving persistentContainerURL from %{public} to %{public}", v1url.encodedString, v2url.encodedString);
+                manager.moveItemAtURL(v1url, v2url, function(success){
+                    if (success){
+                        completion.call(target, JSFileManager.State.success);        
+                    }else{
+                        logger.error("failed to move persistentContainerURL");
+                        completion.call(target, JSFileManager.State.genericFailure);
+                    }
+                });
+            }else{
+                completion.call(target, JSFileManager.State.success);
+            }
         };
+        this._rootURL = this.urlForPath("/");
         return completion.promise;
     },
 
@@ -108,7 +124,6 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         url.path = path;
         if (path.startsWith("/")){
             url.scheme = JSFileManager.Scheme.jskitfile;
-            url.host = "";
         }
         if (baseURL){
             url.resolveToBaseURL(baseURL);
@@ -132,7 +147,10 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     },
 
     _getPersistentContainerURL: function(){
-        return JSURL.initWithString('%s:///Containers/%s/'.sprintf(JSFileManager.Scheme.jskitfile, this._identifier));
+        if (JSBundle.mainBundleIdentifier){
+            return this._rootURL.appendingPathComponents(["Containers", JSBundle.mainBundleIdentifier], true);
+        }
+        return this._rootURL;
     },
 
     _getWorkingDirectoryURL: function(){
@@ -140,7 +158,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     },
 
     begin: function(permission, stores){
-        return new JSFileManagerTransaction(this._db, stores, permission);
+        return new JSHTMLFileManagerTransaction(this._db, stores, permission);
     },
 
     // --------------------------------------------------------------------
@@ -158,7 +176,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             throw new Error("JSFileManager.itemExistsAtURL unsupported scheme: %s".sprintf(url.scheme));
         }
         var exists = false;
-        var transaction = this.begin(JSFileManager.Permission.read, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.read, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(function JSFileManager_itemExists_completion(success){
             completion.call(target, success && exists);
         });
@@ -183,7 +201,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             throw new Error("JSFileManager.attributesOfItemAtURL unsupported scheme: %s".sprintf(url.scheme));
         }
         var metadata = null;
-        var transaction = this.begin(JSFileManager.Permission.read, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.read, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(function JSFileManager_attributesOfItem_completion(success){
             completion.call(target, metadata);
         });
@@ -196,12 +214,11 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     _metadataInTransactionAtURL: function(transaction, url, completion){
         var parent = url.removingLastPathComponent();
         try {
-            var index = transaction.metadata.index(JSFileManager.Indexes.metadataPath);
+            var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataPath);
             var lookup = [parent.path || '', url.lastPathComponent];
             var request = index.get(lookup);
             var metadata;
             request.onsuccess = function JSFileManager_metadata_onsuccess(e){
-                logger.debug("metadata query success; exists: %b", !!e.target.result);
                 completion(e.target.result || null);
                 // FIXME: url could include a symlink folder, in which case we won't
                 // get a result here even if the url is valid after resolving the symlink.
@@ -219,7 +236,6 @@ JSClass("JSHTMLFileManager", JSFileManager, {
                 logger.error("Error querying metadata: %{error}", request.error);
                 completion(null);
             };
-            logger.debug("looking up metadata");
         }catch(e){
             logger.error("Exception thrown querying metadata: %{error}", e);
         }
@@ -242,7 +258,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.pathComponents.length === 1){
             throw new Error("JSFileManager.createDirectoryAtURL cannot create root path");
         }
-        var transaction = this.begin(JSFileManager.Permission.readwrite, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(completion, target);
         this._createDirectoryInTransactionAtURL(transaction, url, function JSFileManager_createDirectory_completion(success){
             if (!success){
@@ -309,8 +325,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.pathComponents.length === 1){
             throw new Error("JSFileManager.createFileAtURL cannot create root path");
         }
-        logger.debug("creating file");
-        var transaction = this.begin(JSFileManager.Permission.readwrite, [JSFileManager.Tables.metadata, JSFileManager.Tables.data]);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, [JSHTMLFileManager.Tables.metadata, JSHTMLFileManager.Tables.data]);
         transaction.addCompletion(completion, target);
         var parent = url.removingLastPathComponent();
         var manager = this;
@@ -318,7 +333,6 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         var metadata = null;
         var create = function JSFileManager_createFile_create(parentExists){
             if (parentExists){
-                logger.debug("writing file data");
                 var dataRequest;
                 if (metadata === null){
                     dataRequest = transaction.data.add(data);
@@ -354,16 +368,13 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         };
         manager._metadataInTransactionAtURL(transaction, url, function JSFileManager_createFile_metadata(existingMetadata){
             if (existingMetadata !== null){
-                logger.debug("overwriting file");
                 metadata = existingMetadata;
                 create(true);
             }else{
-                logger.debug("new file, checking for parent");
                 manager._metadataInTransactionAtURL(transaction, parent, function JSFileManager_createFile_parent_metadata(parentMetadata){
                     if (parentMetadata !== null){
                         create(parentMetadata.itemType == JSFileManager.ItemType.directory);
                     }else{
-                        logger.debug("creating parent");
                         manager._createDirectoryInTransactionAtURL(transaction, parent, create);
                     }
                 });
@@ -402,7 +413,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.path == toURL.path){
             throw new Error("JSFileManager.moveItemAtURL target and destination are the same");
         }
-        var transaction = this.begin(JSFileManager.Permission.readwrite, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(completion, target);
         var parent = url.removingLastPathComponent();
         var toParent = toURL.removingLastPathComponent();
@@ -414,18 +425,15 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             }else{
                 var move = function JSFileManager_moveItem_move(toParentExists){
                     if (toParentExists){
-                        var toMetadata = JSCopy(metadata);
-                        toMetadata.parent = toParent.path;
-                        toMetadata.name = toURL.lastPathComponent;
-                        var request = transaction.metadata.put(toMetadata);
-                        request.onsuccess = function JSFileManager_moveItem_onsuccess(){
+                        manager._moveItemInTransactionAtURL(transaction, url, toURL, toParent, metadata);
+                        transaction.indexedDBTransaction.addEventListener("complete", function(){
                             try{
                                 manager.postNotificationForURL(parent, JSFileManager.Notification.directoryDidRemoveItem, {url: url, name: metadata.name, itemType: metadata.itemType});
-                                manager.postNotificationForURL(toParent, JSFileManager.Notification.directoryDidAddItem, {url: toURL, name: toMetadata.name, itemType: toMetadata.itemType});
+                                manager.postNotificationForURL(toParent, JSFileManager.Notification.directoryDidAddItem, {url: toURL, name: toURL.lastPathComponent, itemType: metadata.itemType});
                             }catch (e){
                                 logger.error("Error posting notification: %{error}", e);
                             }
-                        };
+                        });
                     }else{
                         logger.info("could not create parent directory, aborting move transaction");
                         transaction.abort();
@@ -443,6 +451,59 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         return completion.promise;
     },
 
+    _moveItemInTransactionAtURL: function(transaction, url, toURL, toParent, metadata){
+        switch (metadata.itemType){
+            case JSFileManager.ItemType.directory:
+                this._moveDirectoryInTransactionAtURL(transaction, url, toURL, toParent, metadata);
+                break;
+            case JSFileManager.ItemType.file:
+                this._moveMetadataInTransactionAtURL(transaction, url, toURL, toParent, metadata);
+                break;
+            case JSFileManager.ItemType.symbolicLink:
+                this._moveMetadataInTransactionAtURL(transaction, url, toURL, toParent, metadata);
+                break;
+        }
+    },
+
+    _moveMetadataInTransactionAtURL: function(transaction, url, toURL, toParent, metadata){
+        var manager = this;
+        var copiedMetadata = JSCopy(metadata);
+        copiedMetadata.parent = toParent.path;
+        copiedMetadata.name = toURL.lastPathComponent;
+        transaction.metadata.put(copiedMetadata);
+        var lookup = [url.removingLastPathComponent().path, url.lastPathComponent];
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataPath);
+        var keyRequest = index.getKey(lookup);
+        keyRequest.onsuccess = function JSFileManager_removeMetadata_onsuccess(e){
+            var key = e.target.result;
+            if (key !== undefined){
+                transaction.metadata.delete(key);
+            }
+        };
+    },
+
+    _moveDirectoryInTransactionAtURL: function(transaction, url, toURL, toParent, metadata){
+        this._moveMetadataInTransactionAtURL(transaction, url, toURL, toParent, metadata);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataParent);
+        var lookup = url.path;
+        var request = index.getAll(lookup);
+        var manager = this;
+        request.onsuccess = function JSFileManager_removeDirectory_onsuccess(e){
+            var results = e.target.result;
+            if (results){
+                var child;
+                var childURL;
+                var childToURL;
+                for (var i = 0, l = results.length; i < l; ++i){
+                    child = results[i];
+                    childURL = url.appendingPathComponent(child.name, child.itemType == JSFileManager.ItemType.directory);
+                    childToURL = toURL.appendingPathComponent(child.name, child.itemType == JSFileManager.ItemType.directory);
+                    manager._moveItemInTransactionAtURL(transaction, childURL, childToURL, toURL, child);
+                }
+            }
+        };
+    },
+
     copyItemAtURL: function(url, toURL, completion, target){
         if (!completion){
             completion = Promise.completion(Promise.resolveTrue);
@@ -470,7 +531,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.path == toURL.path){
             throw new Error("JSFileManager.copyItemAtURL target and destination are the same");
         }
-        var transaction = this.begin(JSFileManager.Permission.readwrite, [JSFileManager.Tables.metadata, JSFileManager.Tables.data]);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, [JSHTMLFileManager.Tables.metadata, JSHTMLFileManager.Tables.data]);
         transaction.addCompletion(completion, target);
         var toParent = toURL.removingLastPathComponent();
         var manager = this;
@@ -539,6 +600,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         var manager = this;
         var copiedMetadata = JSCopy(metadata);
         copiedMetadata.parent = toParent.path;
+        copiedMetadata.name = toURL.lastPathComponent;
         var request = transaction.metadata.put(copiedMetadata);
         request.onsuccess = function JSFileManager_copyMetadata_onsuccess(){
             try{
@@ -551,7 +613,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
 
     _copyDirectoryInTransactionAtURL: function(transaction, url, toURL, toParent, metadata){
         this._copyMetadataInTransactionAtURL(transaction, url, toURL, toParent, metadata);
-        var index = transaction.metadata.index(JSFileManager.Indexes.metadataParent);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataParent);
         var lookup = url.path;
         var request = index.getAll(lookup);
         var manager = this;
@@ -589,9 +651,9 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             throw new Error("JSFileManager.removeItemAtURL cannot remove root path");
         }
         var parent = url.removingLastPathComponent();
-        var transaction = this.begin(JSFileManager.Permission.readwrite, [JSFileManager.Tables.metadata, JSFileManager.Tables.data]);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, [JSHTMLFileManager.Tables.metadata, JSHTMLFileManager.Tables.data]);
         transaction.addCompletion(completion, target);
-        var index = transaction.metadata.index(JSFileManager.Indexes.metadataPath);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataPath);
         var manager = this;
         this._metadataInTransactionAtURL(transaction, url, function JSFileManager_removeItem_metadata(metadata){
             if (metadata !== null){
@@ -626,7 +688,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     _removeMetadataInTransactionAtURL: function(transaction, url, parent, metadata){
         var manager = this;
         var lookup = [parent.path, url.lastPathComponent];
-        var index = transaction.metadata.index(JSFileManager.Indexes.metadataPath);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataPath);
         var keyRequest = index.getKey(lookup);
         keyRequest.onsuccess = function JSFileManager_removeMetadata_onsuccess(e){
             var key = e.target.result;
@@ -645,7 +707,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
 
     _removeDirectoryInTransactionAtURL: function(transaction, url, parent, metadata){
         this._removeMetadataInTransactionAtURL(transaction, url, parent, metadata);
-        var index = transaction.metadata.index(JSFileManager.Indexes.metadataParent);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataParent);
         var lookup = url.path;
         var request = index.getAll(lookup);
         var manager = this;
@@ -677,7 +739,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.scheme != JSFileManager.Scheme.jskitfile){
             throw new Error("JSFileManager.contentsAtURL unsupported scheme: %s".sprintf(url.scheme));
         }
-        var transaction = this.begin(JSFileManager.Permission.readonly, [JSFileManager.Tables.metadata, JSFileManager.Tables.data]);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readonly, [JSHTMLFileManager.Tables.metadata, JSHTMLFileManager.Tables.data]);
         var contents = null;
         var visitedURLSet = {};
         transaction.addCompletion(function JSFileManager_contents_completion(success){
@@ -737,9 +799,9 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.scheme != JSFileManager.Scheme.jskitfile){
             throw new Error("JSFileManager.removeItemAtURL unsupported scheme: %s".sprintf(url.scheme));
         }
-        var transaction = this.begin(JSFileManager.Permission.readwrite, [JSFileManager.Tables.metadata]);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, [JSHTMLFileManager.Tables.metadata]);
         transaction.addCompletion(completion, target);
-        var index = transaction.metadata.index(JSFileManager.Indexes.metadataParent);
+        var index = transaction.metadata.index(JSHTMLFileManager.Indexes.metadataParent);
         var lookup = url.path;
         var request = index.getAll(lookup);
         var manager = this;
@@ -792,7 +854,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
         if (url.isEqual(absoluteToURL)){
             throw new Error("JSFileManager.createSymbolicLinkAtURL target and destination are the same");
         }
-        var transaction = this.begin(JSFileManager.Permission.readwrite, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.readwrite, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(completion, target);
         var parent = url.removingLastPathComponent();
         var manager = this;
@@ -836,7 +898,7 @@ JSClass("JSHTMLFileManager", JSFileManager, {
             throw new Error("JSFileManager.attributesOfItemAtURL unsupported scheme: %s".sprintf(url.scheme));
         }
         var link = null;
-        var transaction = this.begin(JSFileManager.Permission.read, JSFileManager.Tables.metadata);
+        var transaction = this.begin(JSHTMLFileManager.Permission.read, JSHTMLFileManager.Tables.metadata);
         transaction.addCompletion(function JSFileManager_destinationOfSymbolicLink_completion(success){
             completion.call(target, link);
         });
@@ -895,11 +957,11 @@ JSClass("JSHTMLFileManager", JSFileManager, {
     },
 
     _createCurrentVersion: function(){
-        var metadata = this._db.createObjectStore(JSFileManager.Tables.metadata, {autoIncrement: true, keyPath: "id"});
+        var metadata = this._db.createObjectStore(JSHTMLFileManager.Tables.metadata, {autoIncrement: true, keyPath: "id"});
         var transaction = metadata.transaction;
-        var pathIndex = metadata.createIndex(JSFileManager.Indexes.metadataPath, ["parent", "name"], {unique: true});
-        var parentIndex = metadata.createIndex(JSFileManager.Indexes.metadataParent, "parent", {unique: false});
-        var data = this._db.createObjectStore(JSFileManager.Tables.data, {autoIncrement: true});
+        var pathIndex = metadata.createIndex(JSHTMLFileManager.Indexes.metadataPath, ["parent", "name"], {unique: true});
+        var parentIndex = metadata.createIndex(JSHTMLFileManager.Indexes.metadataParent, "parent", {unique: false});
+        var data = this._db.createObjectStore(JSHTMLFileManager.Tables.data, {autoIncrement: true});
         var t = this.timestamp;
         var root = {parent: '', name: '/', itemType: JSFileManager.ItemType.directory, created: t, updated: t, added: t, size: 0};
         metadata.add(root);
@@ -911,9 +973,9 @@ JSClass("JSHTMLFileManager", JSFileManager, {
 });
 
 
-var JSFileManagerTransaction = function(db, storeName, permission){
+var JSHTMLFileManagerTransaction = function(db, storeName, permission){
     if (this === undefined){
-        return new JSFileManagerTransaction(db, storeName, permission);
+        return new JSHTMLFileManagerTransaction(db, storeName, permission);
     }
     this.indexedDBTransaction = db.transaction(storeName, permission);
     this.indexedDBTransaction.addEventListener('abort', this);
@@ -929,7 +991,7 @@ var JSFileManagerTransaction = function(db, storeName, permission){
     }
 };
 
-JSFileManagerTransaction.prototype = {
+JSHTMLFileManagerTransaction.prototype = {
 
     addCompletion: function(completion, target){
         this.completion = completion;
@@ -991,21 +1053,21 @@ if (self){
     indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
 }
 
-var CURRENT_DATABASE_VERSION = 1;
+var CURRENT_DATABASE_VERSION = 2;
 
-JSFileManager.Tables = {
+JSHTMLFileManager.Tables = {
     // {parent: "/some/path", name: "filename.txt", itemType: 1, created: 1234, modified: 1234, added: 1234, dataKey: 1234}
     metadata: "metadata",
     // Blob
     data: "data"
 };
 
-JSFileManager.Indexes = {
+JSHTMLFileManager.Indexes = {
     metadataPath: "path",
     metadataParent: "parent"
 };
 
-JSFileManager.Permission = {
+JSHTMLFileManager.Permission = {
     readonly: "readonly",
     readwrite: "readwrite"
 };

package/Frameworks/Foundation.jsframework/JS/JSFileManager+Node.js

@@ -60,6 +60,13 @@ JSClass("JSNodeFileManager", JSFileManager, {
             });
         }
         this._rootURL = this.urlForPath(pathLib.join(process.cwd(), this._identifier), true);
+        var v1Path = this.pathForURL(this._rootURL.appendingPathComponent(this._identifier, true));
+        var v1Exists = fs.existsSync();
+        if (v1Exists){
+            var v2Path = this.pathForURL(this.persistentContainerURL);
+            logger.info("Moving persistentContainerURL from %{public} to %{public}", v1Path, v2Path);
+            fs.renameSync(v1Path, v2Path);
+        }
         completion.call(target, JSFileManager.State.success);
         return completion.promise;
     },
@@ -115,7 +122,7 @@ JSClass("JSNodeFileManager", JSFileManager, {
     },
 
     _getPersistentContainerURL: function(){
-        return this._rootURL.appendingPathComponent(this._identifier, true);
+        return this._rootURL.appendingPathComponents(["Containers", JSBundle.mainBundleIdentifier], true);
     },
 
     // --------------------------------------------------------------------

package/Frameworks/Foundation.jsframework/JS/JSUserDefaults.js

@@ -194,7 +194,6 @@ JSClass("JSUserDefaults", JSObject, {
             }
         }else{
             var data = JSON.stringify(this._values).utf8();
-            logger.info("saving user defaults");
             this._fileManager.createFileAtURL(this._url, data, function JSUserDefaults_persist_createFile(success){
                 if (!success){
                     logger.error("failed to write user defaults");

package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-    "JSBundleVersion": "2023.10.0",
+    "JSBundleVersion": "2023.12.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
       "node": "Foundation+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+    "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
   },
   "Resources": [
     {

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2023.10.0",
+  "JSBundleVersion": "2023.12.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "SecurityKit+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+  "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
 }

package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-    "JSBundleVersion": "2023.10.0",
+    "JSBundleVersion": "2023.12.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
       "node": "SecurityKit+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+    "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
   },
   "Resources": [],
   "ResourceLookup": {

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2023.10.0",
+  "JSBundleVersion": "2023.12.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+  "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
 }

package/Node/io.breakside.jskit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2023.10.0",
+    "JSBundleVersion": "2023.12.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "82e4b33e5cc31b920a148b1308206727138f5593"
+    "GitRevision": "590b22d102229b09d1bd77087adbb6e91149ca9d"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKit
-JSBundleVersion: 2023.10.0
+JSBundleVersion: 2023.12.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSIncludeDirectories:

package/Root/Frameworks/APIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKitTesting
-JSBundleVersion: 2023.10.0
+JSBundleVersion: 2023.12.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |