From ade1ef7a4cd275edd81e4ae3a58948891a7e16ef Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 18 Nov 2015 13:59:17 -0800
Subject: [PATCH] Load deserializers from files specified in package.json

---
 .../packages/package-with-deserializers/package.json   |  7 +++++++
 .../package-with-deserializers/the-deserializer.js     |  6 ++++++
 spec/package-manager-spec.coffee                       | 10 ++++++++++
 src/package.coffee                                     |  7 +++++++
 4 files changed, 30 insertions(+)
 create mode 100644 spec/fixtures/packages/package-with-deserializers/package.json
 create mode 100644 spec/fixtures/packages/package-with-deserializers/the-deserializer.js

diff --git a/spec/fixtures/packages/package-with-deserializers/package.json b/spec/fixtures/packages/package-with-deserializers/package.json
new file mode 100644
index 000000000..867457e0a
--- /dev/null
+++ b/spec/fixtures/packages/package-with-deserializers/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "package-with-deserializers",
+  "version": "1.0.0",
+  "atom-deserializers": {
+    "TheDeserializerName": "./the-deserializer.js"
+  }
+}
diff --git a/spec/fixtures/packages/package-with-deserializers/the-deserializer.js b/spec/fixtures/packages/package-with-deserializers/the-deserializer.js
new file mode 100644
index 000000000..d70e62bfd
--- /dev/null
+++ b/spec/fixtures/packages/package-with-deserializers/the-deserializer.js
@@ -0,0 +1,6 @@
+module.exports = function (state) {
+  return {
+    wasDeserializedBy: 'TheDeserializer',
+    state: state
+  }
+}
diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index 4b5f3c26d..59e076834 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -79,6 +79,16 @@ describe "PackageManager", ->
 
       expect(loadedPackage.name).toBe "package-with-main"
 
+    it "registers any deserializers specified in the package's package.json", ->
+      atom.packages.loadPackage("package-with-deserializers")
+
+      state = {deserializer: 'TheDeserializerName', a: 'b'}
+
+      expect(atom.deserializers.deserialize(state)).toEqual {
+        wasDeserializedBy: 'TheDeserializer'
+        state: state
+      }
+
   describe "::unloadPackage(name)", ->
     describe "when the package is active", ->
       it "throws an error", ->
diff --git a/src/package.coffee b/src/package.coffee
index 4cd6a18fd..b40cabac3 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -84,6 +84,7 @@ class Package
         @loadKeymaps()
         @loadMenus()
         @loadStylesheets()
+        @loadDeserializers()
         @settingsPromise = @loadSettings()
         @requireMainModule() unless @mainModule? or @activationShouldBeDeferred()
       catch error
@@ -253,6 +254,12 @@ class Package
     @stylesheets = @getStylesheetPaths().map (stylesheetPath) =>
       [stylesheetPath, @themeManager.loadStylesheet(stylesheetPath, true)]
 
+  loadDeserializers: ->
+    for name, implementationPath of @metadata['atom-deserializers']
+      deserialize = require(path.join(@path, implementationPath))
+      atom.deserializers.add({name, deserialize})
+    return
+
   getStylesheetsPath: ->
     path.join(@path, 'styles')