clojurific 0.12.7 → 0.12.9

package/README.md

@@ -28,10 +28,10 @@ Dependencies and source paths come from the project's `deps.edn`:
 
 ```js
 // vite.config.mjs
-import cljs from 'clojurific/vite';
+import cljf from 'clojurific/vite';
 
 export default {
-  plugins: [cljs({ outputDir: 'target/cljs' })],
+  plugins: [cljf({ outputDir: 'target/cljs' })],
 };
 ```
 
@@ -57,8 +57,8 @@ npx cljf repl
 ```
 
 `cljf repl` is a ClojureScript REPL evaluating in the pages the dev server
-runs, through its nREPL server: `cljs({ outputDir: 'target/cljs',
-compilerOptions: { repl: { 'nrepl-port': 0 } } })` with `nrepl/nrepl` in
+runs, through its nREPL server: `cljf({ outputDir: 'target/cljs',
+compilerOptions: { repl: { nreplPort: 0 } } })` with `nrepl/nrepl` in
 `deps.edn`.
 
 `cljf` resolves `deps.edn` with tools.deps, adds the compiler, and removes
@@ -87,7 +87,7 @@ npx cljf setup-java
 | `CLJF_MAVEN_REPO` | a Maven Central mirror to download the dependency resolver from; other dependencies use `:mvn/repos` |
 | `CLJF_CACHE_DIR` | where `setup-java` installs Java |
 
-See [ESM.md](https://github.com/WhimsicalCode/clojurific/blob/main/ESM.md) for
+See [README.md](https://github.com/WhimsicalCode/clojurific/blob/main/README.md) for
 compiler options, the Vite plugin's options, the REPL and how the launcher
 works.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clojurific",
-  "version": "0.12.7",
+  "version": "0.12.9",
   "description": "ClojureScript compiled to ES modules, bundled by Vite",
   "license": "EPL-1.0",
   "repository": {

package/vite-plugin-cljs/edn.js

@@ -0,0 +1,39 @@
+// Compiler options given as JavaScript values, written as EDN.
+//
+// Object keys are keywords: camelCase keys are written in kebab-case
+// (nreplPort is :nrepl-port), others as they are ('nrepl-port', ':nrepl-port').
+// Strings starting with : are keywords, with ' symbols, others strings.
+
+// The options whose map keys are names rather than options, written as they
+// are: :closure-defines' (goog.DEBUG), :js-entries' entry names and their
+// :exports' JavaScript names
+const NAME_KEYS = new Set(['closure-defines', 'js-entries', 'exports']);
+
+const CAMEL_CASE = /^[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)+$/;
+
+function optionKey(key) {
+  if (key.startsWith(':')) return key.slice(1);
+  return CAMEL_CASE.test(key) ? key.replace(/[A-Z]/g, c => `-${c.toLowerCase()}`) : key;
+}
+
+function ednString(s) {
+  return JSON.stringify(s);
+}
+
+/**
+ * The EDN of a JavaScript value.
+ * @param {*} v
+ * @param {boolean} [names] v's keys are names, written as they are
+ * @returns {string}
+ */
+export function ednValue(v, names = false) {
+  if (Array.isArray(v)) return `[${v.map(x => ednValue(x)).join(' ')}]`;
+  if (typeof v === 'string') return v.startsWith(':') || v.startsWith("'") ? v.replace(/^'/, '') : ednString(v);
+  if (v && typeof v === 'object') {
+    return `{${Object.entries(v).map(([k, x]) => {
+      const key = names ? k.replace(/^:/, '') : optionKey(k);
+      return `:${key} ${ednValue(x, !names && NAME_KEYS.has(key))}`;
+    }).join(' ')}}`;
+  }
+  return String(v);
+}

package/vite-plugin-cljs/index.js

@@ -15,6 +15,7 @@ import os from 'node:os';
 import { Worker } from 'node:worker_threads';
 import { compilerCommand } from '../cljf/launcher.js';
 import { pruneChunks, propertyRenames } from './prune.js';
+import { ednValue } from './edn.js';
 
 const EVENT_PREFIX = '[cljf.esm] ';
 const NPM_AS = 'cljs-npm-as:';
@@ -124,19 +125,6 @@ function inputObject(input, root) {
   }));
 }
 
-function ednString(s) {
-  return JSON.stringify(s);
-}
-
-function ednValue(v) {
-  if (Array.isArray(v)) return `[${v.map(ednValue).join(' ')}]`;
-  if (typeof v === 'string') return v.startsWith(':') || v.startsWith("'") ? v.replace(/^'/, '') : ednString(v);
-  if (v && typeof v === 'object') {
-    return `{${Object.entries(v).map(([k, x]) => `${k.startsWith(':') ? k : ':' + k} ${ednValue(x)}`).join(' ')}}`;
-  }
-  return String(v);
-}
-
 // oxc's minifier shipped with Rolldown, as used by Vite
 function resolveFromProject(root, specifier, purpose) {
   const tryResolve = (base, spec) => {
@@ -238,7 +226,7 @@ export default module.exports;
  *   to cwd. Pages load namespaces from it, i.e. outputDir "out" serves my.app
  *   as /out/my/app.js
  * @param {object|string} [options.compilerOptions] more compiler options, an
- *   EDN string or an object with keyword keys
+ *   EDN string or an object with keyword keys, camelCase or kebab-case
  * @param {string|false} [options.manifest] writes the entry points' scripts
  *   and preloads to this file in Vite's outDir, for server rendered pages,
  *   defaults to "manifest.json"
@@ -256,7 +244,7 @@ export default module.exports;
  *   defaults to false: only from this machine. A proxy in front of the dev
  *   server must set X-Real-IP to the client's address.
  */
-export default function cljs(options) {
+export default function cljf(options) {
   const manifestName = options.manifest ?? 'manifest.json';
   let config, proc, server, minify, root, cwd, outputDir, compiler;
   // the namespaces of the pages' scripts, compiled as main namespaces
@@ -328,8 +316,8 @@ export default function cljs(options) {
         } else if (event.type === 'compiled' || event.type === 'error') {
           compiled();
           const logger = config?.logger ?? console;
-          if (event.type === 'error') logger.error(`[cljs] ${event.message}`);
-          else logger.info(`[cljs] compiled ${event.namespaces} namespace(s) in ${event.ms}ms`);
+          if (event.type === 'error') logger.error(`[cljf] ${event.message}`);
+          else logger.info(`[cljf] compiled ${event.namespaces} namespace(s) in ${event.ms}ms`);
           if (first && event.type === 'compiled') {
             first = false;
             resolve();
@@ -402,7 +390,7 @@ export default function cljs(options) {
   }
 
   return {
-    name: 'cljs',
+    name: 'cljf',
     // before Vite's resolver, which would take cljs-npm-as: specifiers
     enforce: 'pre',
 
@@ -623,7 +611,7 @@ export default function cljs(options) {
           this.warn('nothing was pruned: package.json has "type": "commonjs", so the bundler treats the project\'s ' +
             '.js files as CommonJS and wraps the ClojureScript they import in initializers. Use "type": "module".');
         }
-        config.logger.info(`[cljs] removed ${pruned.removed} unused statements (${pruneMs}ms), ` +
+        config.logger.info(`[cljf] removed ${pruned.removed} unused statements (${pruneMs}ms), ` +
           `renamed ${Object.keys(renames).length} properties, ` +
           `minified (${Date.now() - start - pruneMs}ms)`);
       }
@@ -686,7 +674,7 @@ export default function cljs(options) {
       // since: a reloaded page runs the output with warnings
       let problem = null;
       const showProblem = err => {
-        problem = { type: 'error', err: { stack: '', plugin: 'cljs', ...err } };
+        problem = { type: 'error', err: { stack: '', plugin: 'cljf', ...err } };
         server.ws.send(problem);
       };
       server.ws.on('connection', socket => problem && socket.send(JSON.stringify(problem)));
@@ -702,14 +690,14 @@ export default function cljs(options) {
         for (const name of ssrEntries) {
           const file = info?.entries?.[name];
           if (!file) {
-            config.logger.error(`[cljs] ssrEntries: no :js-entries ${name}`, { timestamp: true });
+            config.logger.error(`[cljf] ssrEntries: no :js-entries ${name}`, { timestamp: true });
             continue;
           }
           try {
             await runner.import(path.join(outputDir, file));
             ssrEntries = ssrEntries.filter(n => n !== name);
           } catch (e) {
-            config.logger.error(`[cljs] running ${name} (${file}): ${e.stack ?? e}`, { timestamp: true });
+            config.logger.error(`[cljf] running ${name} (${file}): ${e.stack ?? e}`, { timestamp: true });
           }
         }
       };
@@ -738,7 +726,7 @@ export default function cljs(options) {
             send({
               op: 'console-result',
               rid: data.rid,
-              result: { error: 'cljs_eval only runs in pages on the dev server\'s machine, see the cljs plugin\'s replRemoteConsole' },
+              result: { error: 'cljs_eval only runs in pages on the dev server\'s machine, see the cljf plugin\'s replRemoteConsole' },
             });
             return;
           }
@@ -829,7 +817,7 @@ export default function cljs(options) {
         const outstanding = [...warnings.values()].flat();
         if (event.type === 'compiled' && outstanding.length) {
           const [first] = outstanding;
-          config.logger.warn(`[cljs] compiled ${event.namespaces} namespace(s) in ${event.ms}ms, ` +
+          config.logger.warn(`[cljf] compiled ${event.namespaces} namespace(s) in ${event.ms}ms, ` +
             `hot reload paused by ${outstanding.length} warning(s)`, { timestamp: true });
           showProblem({
             message: outstanding
@@ -840,7 +828,7 @@ export default function cljs(options) {
           });
           ready();
         } else if (event.type === 'compiled') {
-          config.logger.info(`[cljs] compiled ${event.namespaces} namespace(s) in ${event.ms}ms`, { timestamp: true });
+          config.logger.info(`[cljf] compiled ${event.namespaces} namespace(s) in ${event.ms}ms`, { timestamp: true });
           problem = null;
           // the namespaces held back that this compile didn't update
           const client = server.environments.client;
@@ -850,7 +838,7 @@ export default function cljs(options) {
           runSsrEntries();
           ready();
         } else if (event.type === 'error') {
-          config.logger.error(`[cljs] ${event.message}`, { timestamp: true });
+          config.logger.error(`[cljf] ${event.message}`, { timestamp: true });
           showProblem({
             message: event.message,
             id: event.file,