From 2577e0d4a7b128c48f0eb8479432bc6f3d51fb1a Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@twinql.com>
Date: Tue, 15 Nov 2016 10:54:55 -0800
Subject: [PATCH] Produce different output for Firefox and Firefox add-ons.

Firefox itself doesn't need `require("chrome")` to get access to Cu,
and shouldn't touch the Add-on SDK at all.
---
 project.clj                                   | 36 +++++++++++++---
 release-addon/README.md                       |  5 +++
 release-addon/wrap_bare.sh                    |  7 +++
 release-addon/wrapper.prefix                  | 34 +++++++++++++++
 release-addon/wrapper.suffix                  |  6 +++
 release-browser/wrapper.prefix                | 43 ++++++++-----------
 release-browser/wrapper.suffix                |  8 +---
 src/addon/datomish/sqlite_module.cljs         |  9 ++++
 .../datomish/cljify.cljs                      |  0
 .../datomish/core.cljs                        |  1 -
 .../datomish/js_sqlite.cljs                   |  0
 .../datomish/preload.cljs                     |  0
 .../datomish/sqlitejsm_sqlite.cljs            |  7 +--
 .../externs/datomish.js                       |  4 ++
 src/browser/datomish/sqlite_module.cljs       |  9 ++++
 15 files changed, 128 insertions(+), 41 deletions(-)
 create mode 100644 release-addon/README.md
 create mode 100755 release-addon/wrap_bare.sh
 create mode 100644 release-addon/wrapper.prefix
 create mode 100644 release-addon/wrapper.suffix
 create mode 100644 src/addon/datomish/sqlite_module.cljs
 rename src/{browser => browser-common}/datomish/cljify.cljs (100%)
 rename src/{browser => browser-common}/datomish/core.cljs (99%)
 rename src/{browser => browser-common}/datomish/js_sqlite.cljs (100%)
 rename src/{browser => browser-common}/datomish/preload.cljs (100%)
 rename src/{browser => browser-common}/datomish/sqlitejsm_sqlite.cljs (90%)
 rename src/{browser => browser-common}/externs/datomish.js (87%)
 create mode 100644 src/browser/datomish/sqlite_module.cljs

diff --git a/project.clj b/project.clj
index d687ca63..8a80783a 100644
--- a/project.clj
+++ b/project.clj
@@ -47,6 +47,31 @@
                  }
                 :notify-command ["release-node/wrap_bare.sh"]}
 
+               :release-addon
+               ;; Release builds for use in Firefox add-ons are much like the ones
+               ;; for Firefox itself, but they can freely use `console` and must
+               ;; `require("chrome")` to get access to Components.
+               {
+                :source-paths   ["src/common" "src/browser-common" "src/addon"]
+                :assert         false
+                :compiler
+                {
+                 :elide-asserts  true
+                 :externs        ["src/browser-common/externs/datomish.js"]
+                 :language-in    :ecmascript5
+                 :language-out   :ecmascript5
+                 :optimizations  :advanced
+                 :output-dir     "target/release-addon"
+                 :output-to      "target/release-addon/datomish.bare.js"
+                 :output-wrapper false
+                 :parallel-build true
+                 :preloads       [datomish.preload]
+                 :pretty-print   true
+                 :pseudo-names   true
+                 :static-fns     true
+                 }
+                :notify-command ["release-addon/wrap_bare.sh"]}
+
                :release-browser
                ;; Release builds for use in Firefox must:
                ;; * Use :optimizations > :none, so that a single file is generated
@@ -57,15 +82,16 @@
                ;; There's no point in generating a source map -- it'll be wrong
                ;; due to wrapping.
                {
-                :source-paths   ["src/common" "src/browser"]
+                :source-paths   ["src/common" "src/browser-common" "src/browser"]
                 :assert         false
                 :compiler
                 {
+                 :verbose        true
                  :elide-asserts  true
-                 :externs        ["src/browser/externs/datomish.js"]
-                 :language-in    :ecmascript5
-                 :language-out   :ecmascript5
-                 :optimizations  :advanced
+                 :externs        ["src/browser-common/externs/datomish.js"]
+                 :language-in    :ecmascript5-strict
+                 :language-out   :ecmascript5-strict
+                 :optimizations  :simple
                  :output-dir     "target/release-browser"
                  :output-to      "target/release-browser/datomish.bare.js"
                  :output-wrapper false
diff --git a/release-addon/README.md b/release-addon/README.md
new file mode 100644
index 00000000..f31204bf
--- /dev/null
+++ b/release-addon/README.md
@@ -0,0 +1,5 @@
+# Datomish
+
+Datomish is a persistent, embedded knowledge base. It's written in ClojureScript, and draws heavily on [DataScript](https://github.com/tonsky/datascript) and [Datomic](http://datomic.com).
+
+For more info, check out the [project page](https://github.com/mozila/datomish).
diff --git a/release-addon/wrap_bare.sh b/release-addon/wrap_bare.sh
new file mode 100755
index 00000000..ff03a0d4
--- /dev/null
+++ b/release-addon/wrap_bare.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+(cat release-browser/wrapper.prefix; cat target/release-browser/datomish.bare.js; cat release-browser/wrapper.suffix) > target/release-browser/datomish.js
+
+echo "Packed target/release-browser/datomish.js"
diff --git a/release-addon/wrapper.prefix b/release-addon/wrapper.prefix
new file mode 100644
index 00000000..5693f1c6
--- /dev/null
+++ b/release-addon/wrapper.prefix
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Datomish 0.1.0-SNAPSHOT
+
+(function (definition) {
+    // This file will function properly as a <script> tag, or a module
+    // using CommonJS and NodeJS or RequireJS module formats.
+
+    // Wrapper gratefully adapted from:
+    // https://github.com/kriskowal/q/blob/v1/q.js
+    // https://github.com/swannodette/mori/blob/master/support/wrapper.js
+    // https://github.com/tonsky/datascript/blob/master/release-js/wrapper.js
+
+    // CommonJS
+    if (typeof exports === "object") {
+        module.exports = definition();
+
+    // RequireJS
+    } else if (typeof define === "function" && define.amd) {
+        define(definition);
+
+    // <script>
+    } else {
+        datomish = definition();
+    }
+})(function () {
+    return function () {
+
+// Monkeypatch setTimeout so that the Closure Compiler
+// output can use it in a Sandbox context.
+var { setTimeout } = require("sdk/timers");
+this.setTimeout = setTimeout;
diff --git a/release-addon/wrapper.suffix b/release-addon/wrapper.suffix
new file mode 100644
index 00000000..4a9569b7
--- /dev/null
+++ b/release-addon/wrapper.suffix
@@ -0,0 +1,6 @@
+
+        ;return this.datomish.js;
+
+    }.call({});
+
+});
diff --git a/release-browser/wrapper.prefix b/release-browser/wrapper.prefix
index 5693f1c6..bdbb7bdc 100644
--- a/release-browser/wrapper.prefix
+++ b/release-browser/wrapper.prefix
@@ -2,33 +2,28 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// Datomish 0.1.0-SNAPSHOT
+this.EXPORTED_SYMBOLS = ["Datomish"];
 
-(function (definition) {
-    // This file will function properly as a <script> tag, or a module
-    // using CommonJS and NodeJS or RequireJS module formats.
 
-    // Wrapper gratefully adapted from:
-    // https://github.com/kriskowal/q/blob/v1/q.js
-    // https://github.com/swannodette/mori/blob/master/support/wrapper.js
-    // https://github.com/tonsky/datascript/blob/master/release-js/wrapper.js
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
-    // CommonJS
-    if (typeof exports === "object") {
-        module.exports = definition();
+// So we can polyfill setImmediate.
+Cu.import("resource://gre/modules/Services.jsm");
 
-    // RequireJS
-    } else if (typeof define === "function" && define.amd) {
-        define(definition);
+var setImmediate = function (callback) {
+  let args = new Array(arguments.length - 1);
+  for (let i = 0; i < args.length; i++) {
+      args[i] = arguments[i + 1];
+  }
 
-    // <script>
-    } else {
-        datomish = definition();
-    }
-})(function () {
-    return function () {
+  callback = callback.bind(callback, args);
+  Services.tm.currentThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
+}
 
-// Monkeypatch setTimeout so that the Closure Compiler
-// output can use it in a Sandbox context.
-var { setTimeout } = require("sdk/timers");
-this.setTimeout = setTimeout;
+var console = {
+  log: function (s) {
+    dump(s);
+  }
+};
+
+this.Datomish = (function () {
diff --git a/release-browser/wrapper.suffix b/release-browser/wrapper.suffix
index 4a9569b7..fd785664 100644
--- a/release-browser/wrapper.suffix
+++ b/release-browser/wrapper.suffix
@@ -1,6 +1,2 @@
-
-        ;return this.datomish.js;
-
-    }.call({});
-
-});
+return datomish.js;
+}).call(this);
diff --git a/src/addon/datomish/sqlite_module.cljs b/src/addon/datomish/sqlite_module.cljs
new file mode 100644
index 00000000..b7a37833
--- /dev/null
+++ b/src/addon/datomish/sqlite_module.cljs
@@ -0,0 +1,9 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+(ns datomish.sqlite-module)
+
+(def sqlite (.import (aget (js/require "chrome") "Cu") "resource://gre/modules/Sqlite.jsm"))
+
+(println "Add-on code: sqlite is" (pr-str sqlite))
diff --git a/src/browser/datomish/cljify.cljs b/src/browser-common/datomish/cljify.cljs
similarity index 100%
rename from src/browser/datomish/cljify.cljs
rename to src/browser-common/datomish/cljify.cljs
diff --git a/src/browser/datomish/core.cljs b/src/browser-common/datomish/core.cljs
similarity index 99%
rename from src/browser/datomish/core.cljs
rename to src/browser-common/datomish/core.cljs
index 37be3214..a188114d 100644
--- a/src/browser/datomish/core.cljs
+++ b/src/browser-common/datomish/core.cljs
@@ -10,4 +10,3 @@
      [datomish.js-sqlite :as js-sqlite]
      [datomish.sqlite :as sqlite]
      [datomish.transact :as transact]))
-
diff --git a/src/browser/datomish/js_sqlite.cljs b/src/browser-common/datomish/js_sqlite.cljs
similarity index 100%
rename from src/browser/datomish/js_sqlite.cljs
rename to src/browser-common/datomish/js_sqlite.cljs
diff --git a/src/browser/datomish/preload.cljs b/src/browser-common/datomish/preload.cljs
similarity index 100%
rename from src/browser/datomish/preload.cljs
rename to src/browser-common/datomish/preload.cljs
diff --git a/src/browser/datomish/sqlitejsm_sqlite.cljs b/src/browser-common/datomish/sqlitejsm_sqlite.cljs
similarity index 90%
rename from src/browser/datomish/sqlitejsm_sqlite.cljs
rename to src/browser-common/datomish/sqlitejsm_sqlite.cljs
index 88694797..7deba552 100644
--- a/src/browser/datomish/sqlitejsm_sqlite.cljs
+++ b/src/browser-common/datomish/sqlitejsm_sqlite.cljs
@@ -5,11 +5,8 @@
 (ns datomish.sqlitejsm-sqlite
   (:require
    [cljs-promises.async]
-   [datomish.sqlite :as s]))
-
-(def sqlite (.import (aget (js/require "chrome") "Cu") "resource://gre/modules/Sqlite.jsm"))
-
-(println "sqlite is" (pr-str sqlite))
+   [datomish.sqlite :as s]
+   [datomish.sqlite-module :refer [sqlite]]))
 
 ;; mozIStorageRow instances expose two methods: getResultByIndex and getResultByName.
 ;; Our code expects to treat rows as associative containers, from keyword to value.
diff --git a/src/browser/externs/datomish.js b/src/browser-common/externs/datomish.js
similarity index 87%
rename from src/browser/externs/datomish.js
rename to src/browser-common/externs/datomish.js
index f6356568..bad6c648 100644
--- a/src/browser/externs/datomish.js
+++ b/src/browser-common/externs/datomish.js
@@ -6,6 +6,10 @@ var Array = {};
 Array.length = 0;
 Array.isArray = function () {};
 
+var Components = {};
+Components.utils = {};
+Components.utils.import = function (name, scope) {};
+
 var SqliteStatic = {};
 
 /**
diff --git a/src/browser/datomish/sqlite_module.cljs b/src/browser/datomish/sqlite_module.cljs
new file mode 100644
index 00000000..b44a9cd1
--- /dev/null
+++ b/src/browser/datomish/sqlite_module.cljs
@@ -0,0 +1,9 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+(ns datomish.sqlite-module)
+
+(def sqlite (.import (aget js/Components "utils") "resource://gre/modules/Sqlite.jsm"))
+
+(println "Browser code: sqlite is" (pr-str sqlite))