squint-cljs 0.14.200 → 0.14.202

package/src/squint/multi.js

@@ -46,6 +46,46 @@ function gh() {
   return _globalHierarchy ?? (_globalHierarchy = make_hierarchy());
 }
 
+// A hierarchy may also be a plain map literal like
+// {:parents {} :ancestors {} :descendants {}} with set values, as in CLJS.
+// Normalize such a rep to the Map-based one the internals expect.
+function fieldMap(m) {
+  if (m instanceof Map) return m;
+  const out = new Map();
+  if (m) for (const k of Object.keys(m)) out.set(k, new Set(m[k]));
+  return out;
+}
+function toHierarchy(h) {
+  if (h.parents instanceof Map && h.ancestors instanceof Map && h.descendants instanceof Map) {
+    return h;
+  }
+  return {
+    parents: fieldMap(h.parents),
+    ancestors: fieldMap(h.ancestors),
+    descendants: fieldMap(h.descendants),
+  };
+}
+
+// derive/underive with an explicit hierarchy throw on a malformed one,
+// like CLJS. A field is a map: a js/Map or a plain object.
+function checkHierarchy(h) {
+  const ok =
+    h != null &&
+    typeof h === 'object' &&
+    ['parents', 'ancestors', 'descendants'].every((f) => {
+      const m = h[f];
+      return m instanceof Map || (m != null && typeof m === 'object' && m.constructor === Object);
+    });
+  if (!ok) throw new Error('Invalid hierarchy: expected map with :parents, :ancestors and :descendants');
+  return h;
+}
+
+// keywords and symbols are strings in squint; namespaced means a '/' past
+// position 0, the same threshold as `namespace`
+function namespaced(x) {
+  return typeof x === 'string' && x.indexOf('/') > 0;
+}
+
 function _isa(h, child, parent) {
   if (_EQ_(child, parent)) return true;
   if (typeof child === 'function' && typeof parent === 'function') {
@@ -64,7 +104,7 @@ function _isa(h, child, parent) {
 
 export function isa_QMARK_(a, b, c) {
   if (c === undefined) return _isa(gh(), a, b);
-  return _isa(a, b, c);
+  return _isa(toHierarchy(a), b, c);
 }
 
 function _deriveInto(h, tag, parent) {
@@ -102,6 +142,11 @@ function _deriveInto(h, tag, parent) {
 
 export function derive(a, b, c) {
   if (c === undefined) {
+    // validation matches the CLJS asserts
+    if (!namespaced(b)) throw new Error('Parent must be a namespace-qualified keyword or symbol');
+    if (!(typeof a === 'function' || namespaced(a))) {
+      throw new Error('Tag must be a namespace-qualified keyword or symbol, or a class');
+    }
     // Rebuild-and-swap the global hierarchy so its identity changes;
     // MultiFn's cache compares hierarchy identity to decide when to
     // invalidate, so in-place mutation would leave stale cached
@@ -111,6 +156,14 @@ export function derive(a, b, c) {
     _deriveInto(_globalHierarchy, a, b);
     return null;
   }
+  checkHierarchy(a);
+  // vectors are allowed as compound dispatch tags, beyond CLJS
+  if (!(typeof b === 'function' || typeof b === 'string' || Array.isArray(b))) {
+    throw new Error('Tag must be a keyword or symbol, or a class');
+  }
+  if (!(typeof c === 'string' || Array.isArray(c))) {
+    throw new Error('Parent must be a keyword or symbol');
+  }
   const next = cloneHierarchy(a);
   _deriveInto(next, b, c);
   return next;
@@ -125,15 +178,15 @@ function rebuildFromPairs(pairs) {
 function cloneHierarchy(h) {
   const out = make_hierarchy();
   for (const f of ['parents', 'ancestors', 'descendants']) {
-    for (const [k, s] of h[f]) out[f].set(k, new Set(s));
+    for (const [k, s] of fieldMap(h[f])) out[f].set(k, new Set(s));
   }
   return out;
 }
 
 export function underive(a, b, c) {
-  const [h, tag, parent] = c === undefined ? [gh(), a, b] : [a, b, c];
+  const [h, tag, parent] = c === undefined ? [gh(), a, b] : [checkHierarchy(a), b, c];
   const pairs = [];
-  for (const [child, parents] of h.parents) {
+  for (const [child, parents] of fieldMap(h.parents)) {
     for (const p of parents) {
       if (!(_EQ_(child, tag) && _EQ_(p, parent))) pairs.push([child, p]);
     }
@@ -155,9 +208,12 @@ export function underive(a, b, c) {
 // internally holds the entry but .get misses on reference equality.
 function hAnd(a, b, field) {
   const [h, tag] = b === undefined ? [gh(), a] : [a, b];
-  const key = findKeyByEquiv(h[field], tag);
+  // an invalid hierarchy gives nil instead of throwing
+  if (h == null || typeof h !== 'object') return null;
+  const m = fieldMap(h[field]);
+  const key = findKeyByEquiv(m, tag);
   if (key === undefined) return null;
-  const s = h[field].get(key);
+  const s = m.get(key);
   return s && s.size ? new Set(s) : null;
 }
 export function parents(a, b)     { return hAnd(a, b, 'parents'); }
@@ -220,7 +276,8 @@ class MultiFn {
     this.resetCache();
   }
   findBest(val) {
-    const h = this.hierarchy.deref();
+    // an atom-held hierarchy can hold the plain-map rep
+    const h = toHierarchy(this.hierarchy.deref());
     let best = null;
     for (const [dv, fn] of this.methodTable) {
       if (_isa(h, val, dv)) {
@@ -279,7 +336,7 @@ export function defmulti(name, dispatchFn, opts) {
   let hierarchy;
   if (opts.hierarchy == null) hierarchy = { deref: gh };
   else if (typeof opts.hierarchy.deref === 'function') hierarchy = opts.hierarchy;
-  else { const h = opts.hierarchy; hierarchy = { deref: () => h }; }
+  else { const h = toHierarchy(opts.hierarchy); hierarchy = { deref: () => h }; }
   const mf = new MultiFn(name, dispatchFn, defaultVal, hierarchy);
   const call = function (...args) { return mf.invoke(args); };
   call.multiFn = mf;

package/src/squint/string.js

@@ -1,14 +1,27 @@
 /*eslint no-unused-vars: ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_", "destructuredArrayIgnorePattern": "^_"}]*/
 
-import { iterable, string_QMARK_ } from './core.js';
+import { get, iterable, string_QMARK_ } from './core.js';
 
 export function blank_QMARK_(s) {
-  if (!s) return true;
+  if (s == null) return true;
+  // a non-string is not blank, like CLJS
+  if (typeof s !== 'string') return false;
   if (s.length === 0) return true;
-  if (s.trimLeft().length === 0) return true;
+  if (s.trimStart().length === 0) return true;
   return false;
 }
 
+export function escape(s, cmap) {
+  let buffer = '';
+  const length = s.length;
+  for (let i = 0; i < length; i++) {
+    const ch = s.charAt(i);
+    const replacement = get(cmap, ch);
+    buffer += replacement != null ? String(replacement) : ch;
+  }
+  return buffer;
+}
+
 export function join(sep, coll) {
   if (coll === undefined) {
     coll = sep;
@@ -32,11 +45,11 @@ export function trim(s) {
 }
 
 export function triml(s) {
-  return s.trimLeft();
+  return s.trimStart();
 }
 
 export function trimr(s) {
-  return s.trimRight();
+  return s.trimEnd();
 }
 
 function discardTrailingIfNeeded(limit, v) {
@@ -162,6 +175,10 @@ export function capitalize(s) {
   return s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
 }
 
+export function reverse(s) {
+  return [...s].reverse().join('');
+}
+
 export function includes_QMARK_(s, substr) {
   return s.indexOf(substr) != -1;
 }