clojurific 0.12.1 → 0.12.2

package/README.md

@@ -5,8 +5,9 @@ ClojureScript compiled to ES modules, bundled by Vite.
 [Clojurific](https://github.com/WhimsicalCode/clojurific) is a fork of
 ClojureScript whose `:module-format :esm` compiles every namespace to an ES
 module, leaving bundling, minification, npm packages and TypeScript to Vite,
-without the Google Closure Compiler. This package has the compiler, the `cljf`
-command, a Vite plugin with hot reloading, and a Karma adapter. It needs
+without the Google Closure Compiler. This package has the `cljf` command, a
+Vite plugin with hot reloading, and a Karma adapter; `cljf` gets the compiler,
+`com.whimsical/clojurific`, from Clojars. It needs
 Node.js 20 or later and Java 17 or later, not the Clojure CLI.
 
 Status: experimental. Versions are `0.<minor>.<release>`: `<minor>` is the

package/cljf/launcher.js

@@ -21,11 +21,18 @@ const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '
 
 export const version = JSON.parse(readFileSync(path.join(packageRoot, 'package.json'), 'utf8')).version;
 
-// The compiler's sources: compiler/ in the npm package, the fork itself
-// (src/main/js is the package's root) when run from its repository
-export const compilerDir = existsSync(path.join(packageRoot, 'compiler', 'deps.edn'))
-  ? path.join(packageRoot, 'compiler')
-  : path.resolve(packageRoot, '../../..');
+// Whether this is the npm package, which has no-clojurescript/, rather than
+// the fork's repository (src/main/js is the package's root)
+const packaged = existsSync(path.join(packageRoot, 'no-clojurescript', 'deps.edn'));
+
+// The fork's repository, its compiler's sources, when run from it
+export const compilerDir = packaged ? null : path.resolve(packageRoot, '../../..');
+
+// The compiler: the npm package's version from Clojars (com.whimsical/clojurific
+// is released with the package), or the fork's sources
+export const compiler = packaged ? { ':mvn/version': version } : { ':local/root': compilerDir };
+
+const noClojureScript = path.join(packaged ? packageRoot : compilerDir, 'no-clojurescript');
 
 const log = line => process.stderr.write(`${line}\n`);
 
@@ -37,7 +44,7 @@ export function normalizeAliases(aliases = []) {
 
 function cacheKey(aliases) {
   return createHash('sha256')
-    .update(JSON.stringify({ version, compiler: compilerDir, aliases }))
+    .update(JSON.stringify({ version, compiler, aliases }))
     .digest('hex')
     .slice(0, 32);
 }
@@ -75,8 +82,8 @@ async function resolve({ project, aliases, java, cache, env, log }) {
   const output = `${cache}.resolve.json`;
   await fs.writeFile(input, edn({
     ':aliases': aliases,
-    ':compiler': { ':local/root': compilerDir },
-    ':no-clojurescript': { ':local/root': path.join(compilerDir, 'no-clojurescript') },
+    ':compiler': compiler,
+    ':no-clojurescript': { ':local/root': noClojureScript },
     ':output': output,
   }));
   log('cljf: resolving dependencies');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clojurific",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "ClojureScript compiled to ES modules, bundled by Vite",
   "license": "EPL-1.0",
   "repository": {
@@ -24,7 +24,7 @@
     "cljf/resolver/clojurific",
     "vite-plugin-cljs",
     "karma-esm",
-    "compiler"
+    "no-clojurescript"
   ],
   "engines": {
     "node": ">=20"

package/compiler/deps.edn

@@ -1,9 +0,0 @@
-{:paths ["src/main/clojure" "src/main/cljs"],
- :deps
- {com.cognitect/transit-java {:mvn/version "1.0.362"},
-  org.clojure/clojure {:mvn/version "1.12.6"},
-  org.clojure/core.specs.alpha {:mvn/version "0.1.24"},
-  org.clojure/google-closure-library
-  {:mvn/version "0.0-20250515-f04e4c0e"},
-  org.clojure/spec.alpha {:mvn/version "0.1.143"},
-  org.clojure/tools.reader {:mvn/version "1.3.6"}}}

package/compiler/src/main/cljs/cljs/analyzer/passes/and_or.cljc

@@ -1,118 +0,0 @@
-;; Copyright (c) Rich Hickey. All rights reserved.
-;; The use and distribution terms for this software are covered by the
-;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this distribution.
-;; By using this software in any fashion, you are agreeing to be bound by
-;; the terms of this license.
-;; You must not remove this notice, or any other, from this software.
-
-(ns cljs.analyzer.passes.and-or
-  (:require [cljs.analyzer.passes :as passes]))
-
-(def simple-ops
-  #{:var :js-var :local :invoke :const :host-field :host-call :js :quote})
-
-(defn ->expr-env [ast]
-  (assoc-in ast [:env :context] :expr))
-
-(defn simple-op? [ast]
-  (contains? simple-ops (:op ast)))
-
-(defn simple-test-expr?
-  [{:keys [op] :as ast}]
-  (boolean
-    (and (simple-op? ast)
-         ('#{boolean seq}
-           (or (:tag ast)
-               (when (#{:local :var} op)
-                 (-> ast :info :tag)))))))
-
-(defn single-binding-let? [ast]
-  (and (= :let (:op ast))
-       (= 1 (count (-> ast :bindings)))))
-
-(defn no-statements? [let-ast]
-  (= [] (-> let-ast :body :statements)))
-
-(defn returns-if? [let-ast]
-  (= :if (-> let-ast :body :ret :op)))
-
-(defn simple-test-binding-let? [ast]
-  (and (single-binding-let? ast)
-       (no-statements? ast)
-       (simple-test-expr? (-> ast :bindings first :init))
-       (returns-if? ast)))
-
-(defn test=then? [if-ast]
-  ;; remove :env, if same, local will differ only by
-  ;; :context (:expr | :statement)
-  (= (dissoc (:test if-ast) :env)
-     (dissoc (:then if-ast) :env)))
-
-(defn test=else? [if-ast]
-  ;; remove :env, if same, local will differ only by
-  ;; :context (:expr | :statement)
-  (= (dissoc (:test if-ast) :env)
-     (dissoc (:else if-ast) :env)))
-
-(defn simple-and? [ast]
-  (and (simple-test-binding-let? ast)
-       (test=else? (-> ast :body :ret))))
-
-(defn simple-or? [ast]
-  (and (simple-test-binding-let? ast)
-       (test=then? (-> ast :body :ret))))
-
-(defn optimizable-and? [ast]
-  (and (simple-and? ast)
-       (simple-test-expr? (-> ast :body :ret :then))))
-
-(defn optimizable-or? [ast]
-  (and (simple-or? ast)
-       (simple-test-expr? (-> ast :body :ret :else))))
-
-(defn remove-loop-let [fn-ast local]
-  (update fn-ast :loop-lets
-    (fn [loop-lets]
-      (map
-        (fn [m]
-          (update m :params
-            (fn [xs] (remove #(= local (:name %)) xs))))
-        loop-lets))))
-
-(defn remove-local-pass [local]
-  (fn [env ast opts]
-    (cond-> (update-in ast [:env :locals] dissoc local)
-      (= :fn (:op ast)) (remove-loop-let local))))
-
-(defn optimize-and [ast]
-  (let [{:keys [init name]} (-> ast :bindings first)]
-    {:op :js
-     :env (:env ast)
-     :segs ["((" ") && (" "))"]
-     :args [init
-            (passes/walk
-              (->expr-env (-> ast :body :ret :then))
-              [(remove-local-pass name)])]
-     :form (:form ast)
-     :children [:args]
-     :tag 'boolean}))
-
-(defn optimize-or [ast]
-  (let [{:keys [init name]} (-> ast :bindings first)]
-    {:op :js
-     :env (:env ast)
-     :segs ["((" ") || (" "))"]
-     :args [init
-            (passes/walk
-              (->expr-env (-> ast :body :ret :else))
-              [(remove-local-pass name)])]
-     :form (:form ast)
-     :children [:args]
-     :tag 'boolean}))
-
-(defn optimize [env ast _]
-  (cond
-    (optimizable-and? ast) (optimize-and ast)
-    (optimizable-or? ast)  (optimize-or ast)
-    :else ast))

package/compiler/src/main/cljs/cljs/analyzer/passes/lite.cljc

@@ -1,32 +0,0 @@
-;; Copyright (c) Rich Hickey. All rights reserved.
-;; The use and distribution terms for this software are covered by the
-;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this distribution.
-;; By using this software in any fashion, you are agreeing to be bound by
-;; the terms of this license.
-;; You must not remove this notice, or any other, from this software.
-
-(ns cljs.analyzer.passes.lite
-  (:refer-clojure :exclude [var?]))
-
-(defn var? [ast]
-  (= :var (:op ast)))
-
-(def ctor->ctor-lite
-  '{cljs.core/vector cljs.core/vector-lite
-    cljs.core/vec    cljs.core/vec-lite})
-
-(defn update-var [{:keys [name] :as ast}]
-  (let [replacement (get ctor->ctor-lite name)]
-    (-> ast
-      (assoc :name replacement)
-      (assoc-in [:info :name] replacement))))
-
-(defn replace-var? [ast]
-  (and (var? ast)
-       (contains? ctor->ctor-lite (:name ast))))
-
-(defn use-lite-types
-  [env ast _]
-  (cond-> ast
-    (replace-var? ast) update-var))

package/compiler/src/main/cljs/cljs/analyzer/passes.cljc

@@ -1,32 +0,0 @@
-;; Copyright (c) Rich Hickey. All rights reserved.
-;; The use and distribution terms for this software are covered by the
-;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this distribution.
-;; By using this software in any fashion, you are agreeing to be bound by
-;; the terms of this license.
-;; You must not remove this notice, or any other, from this software.
-
-(ns cljs.analyzer.passes)
-
-(defn apply-passes
-  ([ast passes]
-   (apply-passes ast passes nil))
-  ([ast passes opts]
-   (reduce
-     (fn [ast pass]
-       (pass (:env ast) ast opts))
-     ast passes)))
-
-(defn walk
-  ([ast passes]
-   (walk ast passes nil))
-  ([ast passes opts]
-   (reduce
-     (fn [ast child-k]
-       (assoc ast
-         child-k
-         (let [child (get ast child-k)]
-           (if (vector? child)
-             (into [] (map #(walk % passes opts)) child)
-             (walk child passes opts)))))
-     (some-> ast (apply-passes passes opts)) (:children ast))))

package/compiler/src/main/cljs/cljs/bootstrap_nodejs.js

@@ -1,154 +0,0 @@
-// Copyright 2013 The Closure Library Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS-IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @fileoverview A nodejs script for dynamically requiring Closure within
- * nodejs.
- *
- * Example of usage:
- * <code>
- * require('./bootstrap/nodejs')
- * goog.require('goog.ui.Component')
- * </code>
- *
- * This loads goog.ui.Component in the global scope.
- *
- * If you want to load custom libraries, you can require the custom deps file
- * directly. If your custom libraries introduce new globals, you may
- * need to run goog.nodeGlobalRequire to get them to load correctly.
- *
- * <code>
- * require('./path/to/my/deps.js')
- * goog.bootstrap.nodeJs.nodeGlobalRequire('./path/to/my/base.js')
- * goog.require('my.Class')
- * </code>
- *
- * @author nick@medium.com (Nick Santos)
- *
- * @nocompile
- */
-
-var fs        = require("fs");
-var vm        = require("vm");
-var path      = require("path");
-var CLJS_ROOT = ".";
-
-
-/**
- * The goog namespace in the global scope.
- */
-global.goog = {};
-
-
-/**
- * Imports a script using Node's require() API.
- *
- * @param {string} src The script source.
- * @return {boolean} True if the script was imported, false otherwise.
- */
-global.CLOSURE_IMPORT_SCRIPT = function(src, opt_sourceText) {
-    // if CLJS_ROOT has been rewritten (by REPLs) need to compute require path
-    // so we can delete the old entry from the Node.js require cache
-    if(CLJS_ROOT !== ".") {
-        var cached = null;
-        if(src.substring(0, 2) == "..") {
-            cached = path.join(CLJS_ROOT, src.substring(3));
-        } else {
-            cached = path.join(CLJS_ROOT, "goog", src);
-        }
-        if(require.cache[cached]) delete require.cache[cached];
-    }
-
-    // Sources are always expressed relative to closure's base.js, but
-    // require() is always relative to the current source.
-    if (opt_sourceText === undefined) {
-        var flags = null;
-        if (goog.debugLoader_) {
-            var dep = goog.debugLoader_.dependencies_[src];
-            if (dep) {
-                flags = dep.loadFlags;
-            }
-        } else {
-            flags = goog.dependencies_.loadFlags[src];
-        }
-        if (flags && flags["foreign-lib"]) {
-            nodeGlobalRequire(path.resolve(__dirname, "..", src));
-        } else {
-            require(path.join(".", "..", src));
-        }
-    } else {
-        eval(opt_sourceText);
-    }
-    return true;
-};
-
-
-/**
- * Loads a file when using Closure's goog.require() API with goog.modules.
- *
- * @param {string} src The file source.
- * @return {string} The file contents.
- */
-global.CLOSURE_LOAD_FILE_SYNC = function(src) {
-    return fs.readFileSync(
-      path.resolve(__dirname, "..", src), {encoding: "utf-8"});
-};
-
-
-// Declared here so it can be used to require base.js
-function nodeGlobalRequire(file) {
-    var _module  = global.module,
-        _exports = global.exports,
-        exportedRequire = false;
-
-    // to circumvent Node.js environment detection in bundled libraries
-    global.module = undefined;
-    global.exports = undefined;
-
-    // to allow requires of Node.js libraries (i.e. platform libs) that
-    // couldn't be bundled for some reason
-    if(global.require == undefined) {
-        exportedRequire = true;
-        global.require = require;
-    }
-
-    vm.runInThisContext.call(global, fs.readFileSync(file), file);
-
-    global.exports = _exports;
-    global.module = _module;
-
-    if(exportedRequire) {
-        global.require = undefined;
-    }
-}
-
-
-// Load Closure's base.js into memory.  It is assumed base.js is in the
-// directory above this directory given this script's location in
-// bootstrap/nodejs.js.
-nodeGlobalRequire(path.resolve(__dirname, "..", "base.js"));
-
-
-/**
- * Bootstraps a file into the global scope.
- *
- * This is strictly for cases where normal require() won't work,
- * because the file declares global symbols with 'var' that need to
- * be added to the global scope.
- * @suppress {missingProvide}
- *
- * @param {string} file The path to the file.
- */
-goog.nodeGlobalRequire = nodeGlobalRequire;
-

package/compiler/src/main/cljs/cljs/core/specs/alpha.cljc

@@ -1,272 +0,0 @@
-;   Copyright (c) Rich Hickey. All rights reserved.
-;   The use and distribution terms for this software are covered by the
-;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;   which can be found in the file epl-v10.html at the root of this distribution.
-;   By using this software in any fashion, you are agreeing to be bound by
-;   the terms of this license.
-;   You must not remove this notice, or any other, from this software.
-
-(ns cljs.core.specs.alpha
-  (:require [clojure.spec.alpha :as s]
-            #?(:clj  [cljs.core :as core]
-               :cljs [cljs.core$macros :as core])))
-
-;;;; destructure
-
-(s/def ::local-name (s/and simple-symbol? #(not= '& %)))
-
-(s/def ::binding-form
-  (s/or :local-symbol ::local-name
-        :seq-destructure ::seq-binding-form
-        :map-destructure ::map-binding-form))
-
-;; sequential destructuring
-
-(s/def ::seq-binding-form
-  (s/and vector?
-         (s/cat :forms (s/* ::binding-form)
-                :rest-forms (s/? (s/cat :ampersand #{'&} :form ::binding-form))
-                :as-form (s/? (s/cat :as #{:as} :as-sym ::local-name)))))
-
-;; map destructuring
-
-(s/def ::non-binding-elements (s/cat :ampersand #{'&} ::non-binding-element (s/+ any?)))
-(s/def ::keys-form (s/and vector? (s/cat :bindings (s/* ident?) :nonbinding (s/? ::non-binding-elements))))
-(s/def ::syms-form (s/and vector? (s/cat :bindings (s/* symbol?) :nonbinding (s/? ::non-binding-elements))))
-(s/def ::simple-syms-form (s/and vector? (s/cat :bindings (s/* simple-symbol?) :nonbinding (s/? ::non-binding-elements))))
-
-(s/def ::keys ::keys-form)
-(s/def ::syms ::syms-form)
-(s/def ::strs ::simple-syms-form)
-(s/def ::keys! ::keys-form)
-(s/def ::syms! ::syms-form)
-(s/def ::strs! ::simple-syms-form)
-(s/def ::or map?)
-(s/def ::as ::local-name)
-(s/def ::defaults ::local-name)
-(s/def ::select ::local-name)
-(s/def ::excess ::local-name)
-(s/def ::missing ::local-name)
-(s/def ::all ::local-name)
-
-(s/def ::map-special-binding
-  (s/keys :opt-un [::as ::or ::keys ::syms ::strs ::keys! ::syms! ::strs! ::select ::excess ::missing ::defaults ::all]))
-
-(s/def ::map-binding (s/tuple ::binding-form any?))
-
-(s/def ::ns-keys
-  (s/tuple
-    (s/and qualified-keyword? #(-> % name #{"keys" "syms" "keys!" "syms!"}))
-    ::simple-syms-form))
-
-(s/def ::map-bindings
-  (s/every (s/or :map-binding ::map-binding
-                 :qualified-keys-or-syms ::ns-keys
-                 :special-binding (s/tuple #{:as :or :keys :syms :strs :keys! :syms! :strs! :select :excess :missing :defaults :all} any?))
-    :kind map?))
-
-(s/def ::map-binding-form (s/merge ::map-bindings ::map-special-binding))
-
-;; bindings
-
-(defn even-number-of-forms?
-  "Returns true if there are an even number of forms in a binding vector"
-  [forms]
-  (even? (count forms)))
-
-(s/def ::binding (s/cat :form ::binding-form :init-expr any?))
-(s/def ::bindings (s/and vector? even-number-of-forms? (s/* ::binding)))
-
-;; let, if-let, when-let
-
-(s/fdef core/let
-  :args (s/cat :bindings ::bindings
-               :body (s/* any?)))
-
-(s/fdef core/if-let
-  :args (s/cat :bindings (s/and vector? ::binding)
-               :then any?
-               :else (s/? any?)))
-
-(s/fdef core/when-let
-  :args (s/cat :bindings (s/and vector? ::binding)
-               :body (s/* any?)))
-
-;; defn, defn-, fn
-
-(s/def ::param-list
-  (s/and
-    vector?
-    (s/cat :params (s/* ::binding-form)
-           :var-params (s/? (s/cat :ampersand #{'&} :var-form ::binding-form)))))
-
-(s/def ::params+body
-  (s/cat :params ::param-list
-         :body (s/alt :prepost+body (s/cat :prepost map?
-                                           :body (s/+ any?))
-                      :body (s/* any?))))
-
-(s/def ::defn-args
-  (s/cat :fn-name simple-symbol?
-         :docstring (s/? string?)
-         :meta (s/? map?)
-         :fn-tail (s/alt :arity-1 ::params+body
-                         :arity-n (s/cat :bodies (s/+ (s/spec ::params+body))
-                                         :attr-map (s/? map?)))))
-
-(s/fdef core/defn
-  :args ::defn-args
-  :ret any?)
-
-(s/fdef core/defn-
-  :args ::defn-args
-  :ret any?)
-
-(s/fdef core/fn
-  :args (s/cat :fn-name (s/? simple-symbol?)
-               :fn-tail (s/alt :arity-1 ::params+body
-                               :arity-n (s/+ (s/spec ::params+body))))
-  :ret any?)
-
-;;;; ns
-
-(s/def ::exclude (s/coll-of simple-symbol?))
-(s/def ::only (s/coll-of simple-symbol?))
-(s/def ::rename (s/map-of simple-symbol? simple-symbol?))
-(s/def ::filters (s/keys* :opt-un [::exclude ::only ::rename]))
-
-(s/def ::ns-refer-clojure
-  (s/spec (s/cat :clause #{:refer-clojure}
-                 :refer-filters ::filters)))
-
-(s/def ::refer (s/coll-of simple-symbol?))
-(s/def ::refer-macros (s/coll-of simple-symbol?))
-(s/def ::include-macros #{true})
-
-(s/def ::lib (s/or :sym simple-symbol?
-                   :str string?))
-
-(s/def ::libspec
-  (s/alt :lib ::lib
-         :lib+opts (s/spec (s/cat :lib ::lib
-                                  :options (s/keys* :opt-un [::as ::refer ::refer-macros ::include-macros])))))
-
-(s/def ::macros-libspec
-  (s/alt :lib simple-symbol?
-         :lib+opts (s/spec (s/cat :lib simple-symbol?
-                                  :options (s/keys* :opt-un [::as ::refer])))))
-
-(s/def ::ns-require
-  (s/spec (s/cat :clause #{:require}
-                 :body (s/+ (s/alt :libspec ::libspec
-                                   :flag #{:reload :reload-all :verbose})))))
-
-(s/def ::ns-require-macros
-  (s/spec (s/cat :clause #{:require-macros}
-                :body (s/+ (s/alt :libspec ::macros-libspec
-                                  :flag #{:reload :reload-all :verbose})))))
-
-(s/def ::package-list
-  (s/spec
-    (s/cat :package simple-symbol?
-           :classes (s/+ simple-symbol?))))
-
-(s/def ::import-list
-  (s/* (s/alt :class simple-symbol?
-              :package-list ::package-list)))
-
-(s/def ::ns-import
-  (s/spec
-    (s/cat :clause #{:import}
-           :classes ::import-list)))
-
-;; same as ::libspec, but also supports the ::filters options in the libspec
-(s/def ::use-libspec
-  (s/alt :lib ::lib
-         :lib+opts (s/spec (s/cat :lib ::lib
-                                  :options (s/keys* :req-un [::only] :opt-un [::rename])))))
-
-(s/def ::ns-use
-  (s/spec (s/cat :clause #{:use}
-                 :libs (s/+ (s/alt :libspec ::use-libspec
-                                   :flag #{:reload :reload-all :verbose})))))
-
-;; same as ::libspec-macros, but also supports the ::filters options in the libspec
-(s/def ::use-macros-libspec
-  (s/alt :lib simple-symbol?
-         :lib+opts (s/spec (s/cat :lib simple-symbol?
-                                  :options (s/keys* :req-un [::only] :opt-un [::rename])))))
-
-(s/def ::ns-use-macros
-  (s/spec (s/cat :clause #{:use-macros}
-                 :libs (s/+ (s/alt :libspec ::use-macros-libspec
-                                   :flag #{:reload :reload-all :verbose})))))
-
-(s/def ::ns-refer-global
-  (s/spec (s/cat :clause #{:refer-global}
-                 :options (s/keys* :req-un [::only]))))
-
-(s/def ::ns-require-global
-  (s/spec (s/cat :clause #{:require-global}
-                 :body (s/+ ::libspec))))
-
-(s/def ::ns-clauses
-  (s/* (s/alt
-         :refer-clojure ::ns-refer-clojure
-         :require ::ns-require
-         :require-macros ::ns-require-macros
-         :import ::ns-import
-         :use ::ns-use
-         :use-macros ::ns-use-macros
-         :refer-global ::ns-refer-global
-         :require-global ::ns-require-global)))
-
-(s/def ::ns-form
-  (s/cat :ns-name simple-symbol?
-         :docstring (s/? string?)
-         :attr-map (s/? map?)
-         :ns-clauses ::ns-clauses))
-
-(s/fdef core/ns-special-form
-  :args ::ns-form)
-
-(defn- quoted
-  "Returns a spec that accepts a (quote ...) form of the spec"
-  [spec]
-  (s/spec (s/cat :quote #{'quote} :spec spec)))
-
-(s/def ::quoted-import-list
-  (s/* (s/alt :class (quoted simple-symbol?)
-              :package-list (quoted ::package-list))))
-
-(s/fdef core/import
-  :args ::quoted-import-list)
-
-(s/fdef core/require
-  :args (s/+ (s/alt :libspec (quoted ::libspec)
-                    :flag #{:reload :reload-all :verbose})))
-
-(s/fdef core/require-macros
-  :args (s/+ (s/alt :libspec (quoted ::macros-libspec)
-                    :flag #{:reload :reload-all :verbose})))
-
-(s/fdef core/use
-  :args (s/+ (s/alt :libspec (quoted ::use-libspec)
-                    :flag #{:reload :reload-all :verbose})))
-
-(s/fdef core/use-macros
-  :args (s/+ (s/alt :libspec (quoted ::use-macros-libspec)
-                    :flag #{:reload :reload-all :verbose})))
-
-(comment
-
-  (s/valid? ::ns-refer-global
-    '(:refer-global :only [Date] :rename {Date MyDate}))
-
-  (s/valid? ::ns-refer-global
-    '(:refer-global :only))
-  
-  (s/valid? ::ns-require-global
-    '(:require-global [jquery :as jq :refer [carousel] :rename {carousel car}]))
-
-)