squint-cljs 0.12.192 → 0.13.194

package/src/squint/multi.js

@@ -22,7 +22,7 @@ function setHasEquiv(s, v) {
 }
 
 // Map<any, Set<any>> insert with value equality on both keys and
-// members — so a preference/ancestry relation expressed with freshly
+// members - so a preference/ancestry relation expressed with freshly
 // allocated vectors like [:km :m] reads back the same as the original.
 // Without this, everything that keys on dispatch values (prefer tables,
 // hierarchy maps) silently loses entries for compound keys.
@@ -77,9 +77,9 @@ function _deriveInto(h, tag, parent) {
   }
   addRel(h.parents, tag, parent);
   // Matches Clojure's derive: new ancestor relations flow to
-  // { tag and everything under tag } × { parent and everything above parent }.
+  // { tag and everything under tag } x { parent and everything above parent }.
   // Crucially, the left side is the DESCENDANTS of tag (plus tag), not
-  // its ancestors — deriving 'tag isa parent' must not make tag's
+  // its ancestors - deriving 'tag isa parent' must not make tag's
   // existing ancestors also isa parent.
   const withSelf = (m, t) => {
     const acc = new Set([t]);
@@ -195,7 +195,7 @@ class MultiFn {
     this.methodCache = new Map();
     this.cachedHierarchy = this.hierarchy.deref();
     // defaultDispatchVal is immutable after construction, so the
-    // resolved default fn only changes when methodTable changes —
+    // resolved default fn only changes when methodTable changes -
     // which always routes through resetCache. Memoize here so
     // getMethod's no-match branch is O(1).
     const defKey = findKeyByEquiv(this.methodTable, this.defaultDispatchVal);
@@ -238,8 +238,8 @@ class MultiFn {
     // Two-path cache read: primitives hit Map.get in O(1); non-primitive
     // dispatch values (typically vectors) scan the cache with _EQ_ so
     // freshly-allocated structurally-equal vectors hit prior entries.
-    // Previously non-primitives skipped the cache entirely — every
-    // dispatch redid findBest, which scans methodTable × _isa cost.
+    // Previously non-primitives skipped the cache entirely - every
+    // dispatch redid findBest, which scans methodTable x _isa cost.
     if (isPrimitive(val)) {
       const cached = this.methodCache.get(val);
       if (cached !== undefined) return cached;
@@ -270,10 +270,10 @@ class MultiFn {
 export function defmulti(name, dispatchFn, opts) {
   opts = opts || {};
   const defaultVal = 'default' in opts ? opts.default : 'default';
-  // Accept three shapes for :hierarchy —
-  //   (a) omitted     → defer to the global hierarchy
-  //   (b) a deref-able ref (atom/var-like) → use as-is
-  //   (c) a plain hierarchy (the result of make-hierarchy) → wrap so
+  // Accept three shapes for :hierarchy -
+  //   (a) omitted     -> defer to the global hierarchy
+  //   (b) a deref-able ref (atom/var-like) -> use as-is
+  //   (c) a plain hierarchy (the result of make-hierarchy) -> wrap so
   //       MultiFn can call .deref() on it uniformly. The wrapped form
   //       is a frozen snapshot of that hierarchy at defmulti time.
   let hierarchy;

package/src/squint/set.js

@@ -24,7 +24,7 @@ export function intersection(...xs) {
   switch (xs.length) {
     case 0: return null;
     case 1: return xs[0];
-    case 2: return xs[0].length > xs[1].length ? 
+    case 2: return xs[0].size > xs[1].size ?
       _intersection2(xs[0], xs[1]) :
       _intersection2(xs[1], xs[0]);
     default: return _bubble_max_key((x) => 0 - x.size, xs).reduce(_intersection2);
@@ -62,8 +62,8 @@ export function union(...xs) {
   switch (xs.length) {
     case 0: return null;
     case 1: return xs[0];
-    case 2: return xs[0].length > xs[1].length ? 
-      _union2(xs[0], xs[1]) : 
+    case 2: return xs[0].size > xs[1].size ?
+      _union2(xs[0], xs[1]) :
       _union2(xs[1], xs[0]);
     default: return _bubble_max_key((x) => x.size, xs).reduce(_union2);
   }

package/src/squint/string.js

@@ -40,7 +40,7 @@ export function trimr(s) {
 }
 
 function discardTrailingIfNeeded(limit, v) {
-  if (limit == null && v.length > 1) {
+  if ((limit == null || limit === 0) && v.length > 1) {
     for (;;)
     if (v[v.length - 1] === "") {
       v.pop();
@@ -50,8 +50,25 @@ function discardTrailingIfNeeded(limit, v) {
 }
 
 export function split(s, re, limit) {
-  const split = s.split(re, limit);
-  return discardTrailingIfNeeded(limit, split);
+  // Clojure's limit caps the number of splits and keeps the remainder, unlike
+  // JS String.prototype.split which truncates the result. Only a positive
+  // limit changes behaviour; <1 (or unset) does a full split, with trailing
+  // empties discarded when the limit is 0 / unset.
+  if (limit == null || limit < 1) {
+    return discardTrailingIfNeeded(limit, s.split(re));
+  }
+  const parts = [];
+  let rem = s;
+  while (limit > 1) {
+    const m = rem.match(re);
+    if (m == null) break;
+    const idx = m.index;
+    parts.push(rem.substring(0, idx));
+    rem = rem.substring(idx + m[0].length);
+    limit--;
+  }
+  parts.push(rem);
+  return parts;
 }
 
 export function starts_with_QMARK_(s, substr) {

package/src/squint/test.js

@@ -4,9 +4,9 @@ import * as clojure_DOT_string from 'squint-cljs/src/squint/string.js';
 var _STAR_current_env_STAR_ = null;
 var _STAR_current_reporter_STAR_ = "cljs.test/default";
 var current_reporter = function () {
-const or__23476__auto__1 = _STAR_current_reporter_STAR_;
-if (squint_core.truth_(or__23476__auto__1)) {
-return or__23476__auto__1} else {
+const or__23719__auto__1 = _STAR_current_reporter_STAR_;
+if (squint_core.truth_(or__23719__auto__1)) {
+return or__23719__auto__1} else {
 return "cljs.test/default"};
 
 };
@@ -15,9 +15,9 @@ return ({"report-counters": ({"test": 0, "pass": 0, "fail": 0, "error": 0}), "te
 
 };
 var get_current_env = function () {
-const or__23476__auto__1 = _STAR_current_env_STAR_;
-if (squint_core.truth_(or__23476__auto__1)) {
-return or__23476__auto__1} else {
+const or__23719__auto__1 = _STAR_current_env_STAR_;
+if (squint_core.truth_(or__23719__auto__1)) {
+return or__23719__auto__1} else {
 return empty_env()};
 
 };
@@ -34,10 +34,10 @@ return null;
 var update_current_env_BANG_ = (() => {
 const f1 = (function (var_args) {
 const args21 = [];
-const len__23403__auto__2 = arguments.length;
+const len__23467__auto__2 = arguments.length;
 let i33 = 0;
 while(true){
-if ((i33 < len__23403__auto__2)) {
+if ((i33 < len__23467__auto__2)) {
 args21.push((arguments[i33]));
 let G__4 = (i33 + 1);
 i33 = G__4;
@@ -45,8 +45,8 @@ continue;
 };break;
 }
 ;
-const argseq__23572__auto__5 = (((2 < args21.length)) ? (args21.slice(2)) : (null));
-return f1.cljs$core$IFn$_invoke$arity$variadic((arguments[0]), (arguments[1]), argseq__23572__auto__5);
+const argseq__23695__auto__5 = (((2 < args21.length)) ? (args21.slice(2)) : (null));
+return f1.cljs$core$IFn$_invoke$arity$variadic((arguments[0]), (arguments[1]), argseq__23695__auto__5);
 
 });
 f1.cljs$core$IFn$_invoke$arity$variadic = (function (ks, f, args) {
@@ -60,17 +60,17 @@ return f1;
 
 })();
 var testing_contexts_str = function () {
-const temp__23113__auto__1 = squint_core.seq(squint_core.get(get_current_env(), "testing-contexts"));
-if (squint_core.truth_(temp__23113__auto__1)) {
-const contexts2 = temp__23113__auto__1;
+const temp__23371__auto__1 = squint_core.seq(squint_core.get(get_current_env(), "testing-contexts"));
+if (squint_core.truth_(temp__23371__auto__1)) {
+const contexts2 = temp__23371__auto__1;
 return clojure_DOT_string.join(" ", squint_core.reverse(contexts2));
 };
 
 };
 var testing_vars_str = function () {
-const temp__23113__auto__1 = squint_core.seq(squint_core.get(get_current_env(), "testing-vars"));
-if (squint_core.truth_(temp__23113__auto__1)) {
-const vars2 = temp__23113__auto__1;
+const temp__23371__auto__1 = squint_core.seq(squint_core.get(get_current_env(), "testing-vars"));
+if (squint_core.truth_(temp__23371__auto__1)) {
+const vars2 = temp__23371__auto__1;
 return clojure_DOT_string.join(" ", squint_core.map(squint_core.str, vars2));
 };
 
@@ -85,10 +85,10 @@ var current_test_str = function () {
 const vars1 = testing_vars_str();
 const ctx2 = testing_contexts_str();
 if (squint_core.truth_((() => {
-const and__23514__auto__3 = vars1;
-if (squint_core.truth_(and__23514__auto__3)) {
+const and__23759__auto__3 = vars1;
+if (squint_core.truth_(and__23759__auto__3)) {
 return ctx2} else {
-return and__23514__auto__3};
+return and__23759__auto__3};
 
 })())) {
 return `${vars1??''}${" "}${ctx2??''}`} else {
@@ -107,12 +107,12 @@ const line3 = squint_core.get(map__12, "line");
 const column4 = squint_core.get(map__12, "column");
 const file5 = squint_core.get(map__12, "file");
 if (squint_core.truth_((() => {
-const or__23476__auto__6 = line3;
-if (squint_core.truth_(or__23476__auto__6)) {
-return or__23476__auto__6} else {
-const or__23476__auto__7 = column4;
-if (squint_core.truth_(or__23476__auto__7)) {
-return or__23476__auto__7} else {
+const or__23719__auto__6 = line3;
+if (squint_core.truth_(or__23719__auto__6)) {
+return or__23719__auto__6} else {
+const or__23719__auto__7 = column4;
+if (squint_core.truth_(or__23719__auto__7)) {
+return or__23719__auto__7} else {
 return file5};
 };
 
@@ -136,9 +136,9 @@ return inc_report_counter_BANG_("pass");
 squint_multi.defmethod(report, ["cljs.test/default", "fail"], (function (m) {
 inc_report_counter_BANG_("fail");
 console.error(`${"FAIL in "}${current_test_str()??''}${(() => {
-const temp__23113__auto__1 = report_loc(m);
-if (squint_core.truth_(temp__23113__auto__1)) {
-const l2 = temp__23113__auto__1;
+const temp__23371__auto__1 = report_loc(m);
+if (squint_core.truth_(temp__23371__auto__1)) {
+const l2 = temp__23371__auto__1;
 return `${" ("}${l2??''}${")"}`;
 };
 
@@ -152,9 +152,9 @@ return console.error("    actual:", squint_core.pr_str(squint_core.get(m, "actua
 squint_multi.defmethod(report, ["cljs.test/default", "error"], (function (m) {
 inc_report_counter_BANG_("error");
 console.error(`${"ERROR in "}${current_test_str()??''}${(() => {
-const temp__23113__auto__1 = report_loc(m);
-if (squint_core.truth_(temp__23113__auto__1)) {
-const l2 = temp__23113__auto__1;
+const temp__23371__auto__1 = report_loc(m);
+if (squint_core.truth_(temp__23371__auto__1)) {
+const l2 = temp__23371__auto__1;
 return `${" ("}${l2??''}${")"}`;
 };
 
@@ -197,10 +197,10 @@ return ((squint_core.get(results, "fail", 0) === 0) && (squint_core.get(results,
 
 };
 var async_QMARK_ = function (x) {
-const c__23442__auto__1 = Promise;
-const x__23443__auto__2 = x;
-const ret__23444__auto__3 = (x__23443__auto__2 instanceof c__23442__auto__1);
-return ret__23444__auto__3;
+const c__23690__auto__1 = Promise;
+const x__23691__auto__2 = x;
+const ret__23692__auto__3 = (x__23691__auto__2 instanceof c__23690__auto__1);
+return ret__23692__auto__3;
 
 };
 var wrap_async = function (setup, teardown) {
@@ -344,9 +344,9 @@ return f20;
 var test_var = function (v) {
 if (squint_core.truth_(squint_core.fn_QMARK_(v))) {
 const test_name1 = (() => {
-const or__23476__auto__2 = squint_core.get(squint_core.meta(v), "name");
-if (squint_core.truth_(or__23476__auto__2)) {
-return or__23476__auto__2} else {
+const or__23719__auto__2 = squint_core.get(squint_core.meta(v), "name");
+if (squint_core.truth_(or__23719__auto__2)) {
+return or__23719__auto__2} else {
 return "anonymous"};
 
 })();
@@ -469,10 +469,10 @@ var fresh_counters = ({"test": 0, "pass": 0, "fail": 0, "error": 0});
 var run_tests = (() => {
 const f26 = (function (var_args) {
 const args271 = [];
-const len__23403__auto__2 = arguments.length;
+const len__23467__auto__2 = arguments.length;
 let i283 = 0;
 while(true){
-if ((i283 < len__23403__auto__2)) {
+if ((i283 < len__23467__auto__2)) {
 args271.push((arguments[i283]));
 let G__4 = (i283 + 1);
 i283 = G__4;
@@ -480,8 +480,8 @@ continue;
 };break;
 }
 ;
-const argseq__23572__auto__5 = (((0 < args271.length)) ? (args271.slice(0)) : (null));
-return f26.cljs$core$IFn$_invoke$arity$variadic(argseq__23572__auto__5);
+const argseq__23695__auto__5 = (((0 < args271.length)) ? (args271.slice(0)) : (null));
+return f26.cljs$core$IFn$_invoke$arity$variadic(argseq__23695__auto__5);
 
 });
 f26.cljs$core$IFn$_invoke$arity$variadic = (function (args) {

package/src/squint/walk.js

@@ -0,0 +1,103 @@
+import * as squint_core from 'squint-cljs/core.js';
+var walk = function (inner, outer, form) {
+if (squint_core.truth_(squint_core.list_QMARK_(form))) {
+return outer(squint_core.with_meta(squint_core.apply(squint_core.list, squint_core.map(inner, form)), squint_core.meta(form)))} else {
+if (squint_core.truth_(squint_core.map_QMARK_(form))) {
+return outer(squint_core.into(squint_core.empty(form), squint_core.map(inner, form)))} else {
+if (squint_core.truth_(squint_core.vector_QMARK_(form))) {
+return outer(squint_core.into(squint_core.empty(form), squint_core.map(inner, form)))} else {
+if (squint_core.truth_(squint_core.set_QMARK_(form))) {
+return outer(squint_core.into(squint_core.empty(form), squint_core.map(inner, form)))} else {
+if (squint_core.truth_((() => {
+const and__28252__auto__1 = squint_core.seq_QMARK_(form);
+if (squint_core.truth_(and__28252__auto__1)) {
+return squint_core.not(squint_core.string_QMARK_(form))} else {
+return and__28252__auto__1};
+
+})())) {
+return outer(squint_core.with_meta(squint_core.vec(squint_core.map(inner, form)), squint_core.meta(form)))} else {
+if ("else") {
+return outer(form)} else {
+return null}}}}}};
+
+};
+var postwalk = function (f, form) {
+return walk((function (x) {
+return postwalk(f, x);
+
+}), f, form);
+
+};
+var prewalk = function (f, form) {
+return walk((function (x) {
+return prewalk(f, x);
+
+}), squint_core.identity, f(form));
+
+};
+var postwalk_replace = function (smap, form) {
+return postwalk((function (x) {
+if (squint_core.truth_(squint_core.contains_QMARK_(smap, x))) {
+return squint_core.get(smap, x)} else {
+return x};
+
+}), form);
+
+};
+var prewalk_replace = function (smap, form) {
+return prewalk((function (x) {
+if (squint_core.truth_(squint_core.contains_QMARK_(smap, x))) {
+return squint_core.get(smap, x)} else {
+return x};
+
+}), form);
+
+};
+var postwalk_demo = function (form) {
+return postwalk((function (x) {
+squint_core.println("Walked:", squint_core.pr_str(x));
+return x;
+
+}), form);
+
+};
+var prewalk_demo = function (form) {
+return prewalk((function (x) {
+squint_core.println("Walked:", squint_core.pr_str(x));
+return x;
+
+}), form);
+
+};
+var keywordize_keys = function (m) {
+return postwalk((function (x) {
+if (squint_core.truth_(squint_core.map_QMARK_(x))) {
+return squint_core.into(squint_core.empty(x), squint_core.map((function (p__1) {
+const vec__14 = p__1;
+const k5 = squint_core.nth(vec__14, 0, null);
+const v6 = squint_core.nth(vec__14, 1, null);
+return [squint_core.name(k5), v6];
+
+}), x))} else {
+return x};
+
+}), m);
+
+};
+var stringify_keys = function (m) {
+return postwalk((function (x) {
+if (squint_core.truth_(squint_core.map_QMARK_(x))) {
+return squint_core.into(squint_core.empty(x), squint_core.map((function (p__2) {
+const vec__14 = p__2;
+const k5 = squint_core.nth(vec__14, 0, null);
+const v6 = squint_core.nth(vec__14, 1, null);
+return [squint_core.name(k5), v6];
+
+}), x))} else {
+return x};
+
+}), m);
+
+};
+
+export { stringify_keys, postwalk_demo, postwalk, walk, postwalk_replace, prewalk, keywordize_keys, prewalk_demo, prewalk_replace }

package/vite.js

@@ -18,7 +18,7 @@
 // An optional dev-only HTTP endpoint (POST /__repl_eval, off by default, see
 // ENABLE_HTTP_EVAL) drives the same eval path with curl, handy without an editor.
 
-import { compileFile, readConfig } from './node-api.js';
+import { compileFile, readConfig, depsPaths } from './node-api.js';
 import {
   startServer,
   handleBrowserMessage,
@@ -77,8 +77,32 @@ async function __squintImport(spec) {
   const url = await res.text();
   return __rawImport(url);
 }
+// JS-interop completion against the page's globalThis. Mirrors js-completions
+// in squint.repl.nrepl-server (node side) so browser and node behave the same.
+function __jsCompletions(prefix) {
+  if (!prefix || !prefix.startsWith('js/')) return [];
+  const s = prefix.slice(3);
+  const parts = s.split('.');
+  const partial = parts[parts.length - 1];
+  const path = parts.slice(0, -1);
+  let obj = globalThis;
+  for (const seg of path) { obj = obj == null ? obj : obj[seg]; }
+  if (obj == null) return [];
+  const acc = new Set();
+  for (let o = obj; o != null; o = Object.getPrototypeOf(o)) {
+    for (const n of Object.getOwnPropertyNames(o)) acc.add(n);
+  }
+  const pre = 'js/' + (path.length ? path.join('.') + '.' : '');
+  return Array.from(acc).filter((n) => n.startsWith(partial)).sort().slice(0, 100).map((n) => pre + n);
+}
 if (import.meta.hot) {
-  import.meta.hot.on('squint:nrepl', async ({ op, code, id, session }) => {
+  import.meta.hot.on('squint:nrepl', async ({ op, code, id, session, prefix }) => {
+    if (op === 'complete-js') {
+      import.meta.hot.send('squint:nrepl-reply', {
+        op: 'complete-js', id, session, completions: __jsCompletions(prefix),
+      });
+      return;
+    }
     if (op !== 'eval') return;
     // bare dynamic imports in eval'd code resolve through __squintImport
     // (\\s* tolerates squint emitting e.g. \`import ('preact')\` for :refer)
@@ -176,7 +200,14 @@ export default function squint(options = {}) {
       logger = config.logger ?? console;
       // squint.edn is the source of truth; plugin options override it.
       const cfg = readConfig(root) || {};
-      paths = (options.paths ?? cfg.paths ?? ['src']).map((p) => resolve(root, p));
+      // :deps in squint.edn resolve (via `clojure -Spath`) to absolute source
+      // dirs; add them to paths so the dep namespaces are compiled and their
+      // requires resolve. depsPaths reads squint.edn itself: the deps map has
+      // symbol keys that would not survive readConfig's clj<->js round-trip.
+      const depDirs = options.paths ? [] : depsPaths(root);
+      paths = [...(options.paths ?? cfg.paths ?? ['src']), ...depDirs].map((p) =>
+        resolve(root, p),
+      );
       outDir = options.outDir ?? cfg['output-dir'] ?? 'js';
       extension = options.extension ?? cfg.extension ?? 'js';
       main = options.main ?? cfg.main;