mapshaper 0.6.54 → 0.6.56

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.54";
+  var VERSION = "0.6.56";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1403,6 +1403,14 @@
     else console.error(msg);
   }
 
+  function truncateString(str, maxLen) {
+    maxLen = maxLen || 80;
+    if (str.length > maxLen) {
+      str = str.substring(0, maxLen - 3).trimEnd() + '...';
+    }
+    return str;
+  }
+
   var Logging = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getLoggingSetter: getLoggingSetter,
@@ -1424,7 +1432,8 @@
     formatColumns: formatColumns,
     formatStringsAsGrid: formatStringsAsGrid,
     formatLogArgs: formatLogArgs,
-    logArgs: logArgs
+    logArgs: logArgs,
+    truncateString: truncateString
   });
 
   function Transform() {
@@ -14209,6 +14218,87 @@
     };
   }
 
+  // Return array of variables on the left side of assignment operations
+  // @hasDot (bool) Return property assignments via dot notation
+  function getAssignedVars(exp, hasDot) {
+    var rxp = /[a-z_$][.a-z0-9_$]*(?= *=[^>=])/ig; // ignore arrow functions and comparisons
+    var matches = exp.match(rxp) || [];
+    var f = function(s) {
+      var i = s.indexOf('.');
+      return hasDot ? i > -1 : i == -1;
+    };
+    var vars = utils.uniq(matches.filter(f));
+    return vars;
+  }
+
+  // Return array of objects with properties assigned via dot notation
+  // e.g.  'd.value = 45' ->  ['d']
+  // export function getAssignmentObjects(exp) {
+  //   var matches = getAssignedVars(exp, true),
+  //       names = [];
+  //   matches.forEach(function(s) {
+  //     var match = /^([^.]+)\.[^.]+$/.exec(s);
+  //     var name = match ? match[1] : null;
+  //     if (name && name != 'this') {
+  //       names.push(name);
+  //     }
+  //   });
+  //   return utils.uniq(names);
+  // }
+
+  function getExpressionFunction(exp, opts) {
+    var func = compileExpressionToFunction(exp, opts);
+    return function(rec, ctx) {
+      var val;
+      try {
+        val = func.call(ctx.$, rec, ctx);
+      } catch(e) {
+        stop(e.name, "in expression [" + exp + "]:", e.message);
+      }
+      return val;
+    };
+  }
+
+  function compileExpressionToFunction(exp, opts) {
+    // $$ added to avoid duplication with data field variables (an error condition)
+    var functionBody, func;
+    if (opts.returns) {
+      // functionBody = 'return ' + functionBody;
+      functionBody = 'var $$retn = ' + exp + '; return $$retn;';
+    } else {
+      functionBody = exp;
+    }
+    functionBody = 'with($$env){with($$record){ ' + functionBody + '}}';
+    try {
+      func = new Function('$$record,$$env',  functionBody);
+    } catch(e) {
+      // if (opts.quiet) throw e;
+      stop(e.name, 'in expression [' + exp + ']');
+    }
+    return func;
+  }
+
+  function getBaseContext(ctx) {
+    ctx = ctx || {};
+    // Mask global properties (is this effective/worth doing?)
+    ctx.globalThis = void 0; // some globals are not iterable
+    (function() {
+      for (var key in this) {
+        ctx[key] = void 0;
+      }
+    }());
+    ctx.console = console;
+    return ctx;
+  }
+
+  var Expressions = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getAssignedVars: getAssignedVars,
+    getExpressionFunction: getExpressionFunction,
+    compileExpressionToFunction: compileExpressionToFunction,
+    getBaseContext: getBaseContext
+  });
+
   // Compiled expression returns a value
   function compileValueExpression(exp, lyr, arcs, opts) {
     opts = opts || {};
@@ -14216,7 +14306,6 @@
     return compileFeatureExpression(exp, lyr, arcs, opts);
   }
 
-
   function compileFeaturePairFilterExpression(exp, lyr, arcs) {
     var func = compileFeaturePairExpression(exp, lyr, arcs);
     return function(idA, idB) {
@@ -14232,13 +14321,16 @@
     var exp = cleanExpression(rawExp);
     // don't add layer data to the context
     // (fields are not added to the pair expression context)
-    var ctx = getExpressionContext({});
+    var ctx = getFeatureExpressionContext({});
     var getA = getProxyFactory(lyr, arcs);
     var getB = getProxyFactory(lyr, arcs);
     var vars = getAssignedVars(exp);
     var functionBody = "with($$env){with($$record){return " + exp + "}}";
     var func;
 
+    // protect global object from assigned values
+    nullifyUnsetProperties(vars, ctx);
+
     try {
       func = new Function("$$record,$$env", functionBody);
     } catch(e) {
@@ -14246,9 +14338,6 @@
       stop(e.name, "in expression [" + exp + "]");
     }
 
-    // protect global object from assigned values
-    nullifyUnsetProperties(vars, ctx);
-
     function getProxyFactory(lyr, arcs) {
       var records = lyr.data ? lyr.data.getRecords() : [];
       var getFeatureById = initFeatureProxy(lyr, arcs);
@@ -14284,12 +14373,12 @@
     };
   }
 
-  function compileFeatureExpression(rawExp, lyr, arcs, opts_) {
-    var opts = utils.extend({}, opts_),
+  function compileFeatureExpression(rawExp, lyr, arcs, optsArg) {
+    var opts = optsArg || {},
+        ctx = opts.context || {},
         exp = cleanExpression(rawExp || ''),
         mutable = !opts.no_assign, // block assignment expressions
-        vars = getAssignedVars(exp),
-        func, records;
+        vars = getAssignedVars(exp);
 
     if (mutable && vars.length > 0 && !lyr.data) {
       initDataTable(lyr);
@@ -14297,110 +14386,45 @@
 
     if (!mutable) {
       // protect global object from assigned values
-      opts.context = opts.context || {};
-      nullifyUnsetProperties(vars, opts.context);
+      nullifyUnsetProperties(vars, ctx);
     }
 
-    records = lyr.data ? lyr.data.getRecords() : [];
-    func = getExpressionFunction(exp, lyr, arcs, opts);
+    var records = lyr.data ? lyr.data.getRecords() : [];
+    var getFeatureById = initFeatureProxy(lyr, arcs, opts);
+    var layerOnlyProxy = addLayerGetters({}, lyr, arcs);
+    var func = getExpressionFunction(exp, opts);
+    ctx = getFeatureExpressionContext(lyr, ctx, opts);
 
-    // @destRec (optional) substitute for records[recId] (used by -calc)
+    // recId: index of a data record in the records array.
+    // destRec: (optional argument, used by -calc) an object used to capture assignments
+    //   By default, assignments are captured by records[recId]
+    //
     return function(recId, destRec) {
-      var record;
+      var rec;
       if (destRec) {
-        record = destRec;
+        rec = destRec;
       } else {
-        record = records[recId] || (records[recId] = {});
-      }
+        rec = records[recId] || (records[recId] = {});
+      }
+      // Assigning feature/layer proxy to '$' ... ctx.$ is also exposed as 'this'
+      // in the expression context.
+      ctx.$ = recId >= 0 ? getFeatureById(recId) : layerOnlyProxy;
+      // "_" is used as an alias for the expression context, so functions can still
+      // be used when masked by variables of the same name.
+      ctx._ = ctx;
+      // Expose data properties using "d", like d3 does. (data propertries are
+      // also available as "this.properties")
+      ctx.d = rec || null;
 
-      // initialize new fields to null so assignments work
       if (mutable) {
-        nullifyUnsetProperties(vars, record);
-      }
-      return func(record, recId);
-    };
-  }
-
-  // Return array of variables on the left side of assignment operations
-  // @hasDot (bool) Return property assignments via dot notation
-  function getAssignedVars(exp, hasDot) {
-    var rxp = /[a-z_$][.a-z0-9_$]*(?= *=[^>=])/ig; // ignore arrow functions and comparisons
-    var matches = exp.match(rxp) || [];
-    var f = function(s) {
-      var i = s.indexOf('.');
-      return hasDot ? i > -1 : i == -1;
-    };
-    var vars = utils.uniq(matches.filter(f));
-    return vars;
-  }
-
-  // Return array of objects with properties assigned via dot notation
-  // e.g.  'd.value = 45' ->  ['d']
-  function getAssignmentObjects(exp) {
-    var matches = getAssignedVars(exp, true),
-        names = [];
-    matches.forEach(function(s) {
-      var match = /^([^.]+)\.[^.]+$/.exec(s);
-      var name = match ? match[1] : null;
-      if (name && name != 'this') {
-        names.push(name);
-      }
-    });
-    return utils.uniq(names);
-  }
-
-  function compileExpressionToFunction(exp, opts) {
-    // $$ added to avoid duplication with data field variables (an error condition)
-    var functionBody, func;
-    if (opts.returns) {
-      // functionBody = 'return ' + functionBody;
-      functionBody = 'var $$retn = ' + exp + '; return $$retn;';
-    } else {
-      functionBody = exp;
-    }
-    functionBody = 'with($$env){with($$record){ ' + functionBody + '}}';
-    try {
-      func = new Function('$$record,$$env',  functionBody);
-    } catch(e) {
-      // if (opts.quiet) throw e;
-      stop(e.name, 'in expression [' + exp + ']');
-    }
-    return func;
-  }
-
-  function getExpressionFunction(exp, lyr, arcs, opts) {
-    var getFeatureById = initFeatureProxy(lyr, arcs, opts);
-    var layerOnlyProxy = addLayerGetters({}, lyr, arcs);
-    var ctx = getExpressionContext(lyr, opts.context, opts);
-    var func = compileExpressionToFunction(exp, opts);
-    return function(rec, i) {
-      var val;
-      // Assigning feature/layer proxy to '$' -- maybe this should be removed,
-      // since it is also exposed as "this".
-      // (kludge) i is undefined in calc expressions ... we still
-      //   may need layer data (but not single-feature data)
-      ctx.$ = i >= 0 ? getFeatureById(i) : layerOnlyProxy;
-      ctx._ = ctx; // provide access to functions when masked by variable names
-      ctx.d = rec || null; // expose data properties a la d3 (also exposed as this.properties)
-      try {
-        val = func.call(ctx.$, rec, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + exp + "]:", e.message);
+        // initialize assigned variables to rec.null so rec can capture them
+        nullifyUnsetProperties(vars, rec);
       }
-      return val;
+      return func(rec, ctx);
     };
   }
 
-  function nullifyUnsetProperties(vars, obj) {
-    for (var i=0; i<vars.length; i++) {
-      if (vars[i] in obj === false) {
-        obj[vars[i]] = null;
-      }
-    }
-  }
-
-  function getExpressionContext(lyr, mixins, opts) {
+  function getFeatureExpressionContext(lyr, mixins, opts) {
     var defs = getStashedVar('defs');
     var env = getBaseContext();
     var ctx = {};
@@ -14446,29 +14470,20 @@
     }, ctx);
   }
 
-  function getBaseContext(ctx) {
-    ctx = ctx || {};
-    // Mask global properties (is this effective/worth doing?)
-    ctx.globalThis = void 0; // some globals are not iterable
-    (function() {
-      for (var key in this) {
-        ctx[key] = void 0;
+  function nullifyUnsetProperties(vars, obj) {
+    for (var i=0; i<vars.length; i++) {
+      if (vars[i] in obj === false) {
+        obj[vars[i]] = null;
       }
-    }());
-    ctx.console = console;
-    return ctx;
+    }
   }
 
-  var Expressions = /*#__PURE__*/Object.freeze({
+  var FeatureExpressions = /*#__PURE__*/Object.freeze({
     __proto__: null,
     compileValueExpression: compileValueExpression,
     compileFeaturePairFilterExpression: compileFeaturePairFilterExpression,
     compileFeaturePairExpression: compileFeaturePairExpression,
-    compileFeatureExpression: compileFeatureExpression,
-    getAssignedVars: getAssignedVars,
-    getAssignmentObjects: getAssignmentObjects,
-    compileExpressionToFunction: compileExpressionToFunction,
-    getBaseContext: getBaseContext
+    compileFeatureExpression: compileFeatureExpression
   });
 
   function getMode(values) {
@@ -25221,11 +25236,12 @@ ${svg}
         describe: 'use field values to calculate data island weights'
       });
 
-    parser.command('external')
-      .option('module', {
-        DEFAULT: true,
-        describe: 'name of Node module containing the command'
-      });
+    // replaced by -require
+    // parser.command('external')
+    //   .option('module', {
+    //     DEFAULT: true,
+    //     describe: 'name of Node module containing the command'
+    //   });
 
     parser.command('filter-points')
       // .describe('remove points that are not part of a group')
@@ -25311,17 +25327,17 @@ ${svg}
       .option('no-replace', noReplaceOpt);
 
     parser.command('require')
-      .describe('require a Node module for use in -each expressions')
+      .describe('require a Node module or ES module to use in JS expressions')
       .option('module', {
         DEFAULT: true,
-        describe: 'name of Node module or path to module file'
+        describe: 'name of installed module or path to module file'
       })
       .option('alias', {
         describe: 'Set the module name to an alias'
-      })
-      .option('init', {
-        describe: 'JS expression to run after the module loads'
       });
+      // .option('init', {
+      //   describe: 'JS expression to run after the module loads'
+      // });
 
     parser.command('rotate')
       // .describe('apply d3-style 3-axis rotation to a lat-long dataset')
@@ -35318,7 +35334,6 @@ ${svg}
     if (targets.length === 0 && targetId) {
       stop('Layer not found:', targetId);
     }
-    // var vars = getAssignedVars(exp);
     var defs = getStashedVar('defs') || {};
 
     var ctx;
@@ -41983,8 +41998,8 @@ ${svg}
     return true;
   }
 
-  cmd.require = async function(targets, opts) {
-    var defs = getStashedVar('defs');
+  cmd.require = async function(opts) {
+    var globals = getStashedVar('defs');
     var moduleFile, moduleName, mod;
     if (!opts.module) {
       stop("Missing module name or path to module");
@@ -42000,25 +42015,33 @@ ${svg}
       moduleFile = require$1('path').join(process.cwd(), moduleFile);
     }
     try {
-      mod = require$1(moduleFile || moduleName);
+      // import CJS and ES modules
+      mod = await import(moduleFile || moduleName);
+      if (mod.default) {
+        mod = mod.default;
+      }
       if (typeof mod == 'function') {
-        // -require now includes the functionality of the old -external command
+        // assuming that functions are mapshpaper command generators...
+        // this MUST be changed asap.
         var retn = mod(api);
         if (retn && isValidExternalCommand(retn)) {
           cmd.registerCommand(retn.name, retn);
         }
       }
     } catch(e) {
-      stop('Unable to load external module:', e.message, getErrorDetail(e));
+      if (!mod) {
+        stop('Unable to load external module:', e.message, getErrorDetail(e));
+      }
     }
     if (moduleName || opts.alias) {
-      defs[opts.alias || moduleName] = mod;
+      globals[opts.alias || moduleName] = mod;
     } else {
-      Object.assign(defs, mod);
-    }
-    if (opts.init) {
-      await evalTemplateExpression(opts.init, targets);
+      Object.assign(globals, mod);
     }
+    // instead of an init expression, you could use -run <expression>
+    // if (opts.init) {
+    //   await evalTemplateExpression(opts.init, targets);
+    // }
   };
 
   // Parse an array or a string of command line tokens into an array of
@@ -42123,7 +42146,8 @@ ${svg}
       stop('Expected a string containing mapshaper commands; received:', tmp);
     }
     if (tmp) {
-      message(`command: [${tmp}]`);
+      // truncate message (command might include a large GeoJSON string in an -i command)
+      message(`command: [${truncateString(tmp, 150)}]`);
       commands = parseCommands(tmp);
 
       // TODO: remove duplication with mapshaper-run-commands.mjs
@@ -44473,9 +44497,9 @@ ${svg}
       } else if (name == 'explode') {
         outputLayers = applyCommandToEachLayer(cmd.explodeFeatures, targetLayers, arcs, opts);
 
-      } else if (name == 'external') {
-        // -require now incorporates -external
-        cmd.require(targets, opts);
+      // -require now incorporates functionality of -external
+      // } else if (name == 'external') {
+      //   cmd.require(targets, opts);
 
       } else if (name == 'filter') {
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
@@ -44617,7 +44641,7 @@ ${svg}
         cmd.renameLayers(targetLayers, opts.names, job.catalog);
 
       } else if (name == 'require') {
-        cmd.require(targets, opts);
+        await cmd.require(opts);
 
       } else if (name == 'rotate') {
         targets.forEach(function(targ) {
@@ -45445,6 +45469,7 @@ ${svg}
     Explode,
     Export,
     Expressions,
+    FeatureExpressions,
     FileExport,
     FileImport,
     FilenameUtils,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.54",
+  "version": "0.6.56",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -308,9 +308,10 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="coordinate-info colored-text selectable"></div>
 		<div class="intersection-display">
-			<div class="intersection-check text-btn colored-text">Check line intersections</div>
-			<div class="intersection-count">0 line intersections</div>
+			<span class="intersection-check text-btn colored-text">Check line intersections</span><span class="intersection-count">0 line intersections</span>
+			<img class="close-btn" draggable="false" src="images/close.png">
 			<div class="repair-btn text-btn colored-text">Repair</div>
+			
 		</div>
 		<div class="map-layers"></div>
 		<div class="basemap-container"><div class="basemap"></div></div>

package/www/mapshaper-gui.js

@@ -654,8 +654,9 @@
     },
 
     show: function(css) {
+      var tag = this.el && this.el.tagName;
       if (!this.visible()) {
-        this.css('display:block;');
+        this.css('display', tag == 'SPAN' ? 'inline-block' : 'block');
         this._hidden = false;
       }
       return this;
@@ -3561,7 +3562,10 @@
         repairBtn = el.findChild(".repair-btn"),
         _simplifiedXX, // saved simplified intersections, for repair
         _unsimplifiedXX, // saved unsimplified intersection data, for performance
-        _disabled = false;
+        _disabled = false,
+        _on = false;
+
+    el.findChild('.close-btn').on('click', dismissForever);
 
     gui.on('simplify_drag_start', function() {
       if (intersectionsAreOn()) {
@@ -3570,19 +3574,20 @@
     });
 
     gui.on('simplify_drag_end', function() {
-      updateAsync();
+      updateSync('simplify_drag_end');
     });
 
     checkBtn.on('click', function() {
       checkBtn.hide();
-      refreshSync();
+      _on = true;
+      updateSync();
     });
 
     repairBtn.on('click', function() {
       var e = model.getActiveLayer();
       if (!_simplifiedXX || !e.dataset.arcs) return;
-      var xx = _simplifiedXX = internal.repairIntersections(e.dataset.arcs, _simplifiedXX);
-      showIntersections(xx, e.layer, e.dataset.arcs);
+      _simplifiedXX = internal.repairIntersections(e.dataset.arcs, _simplifiedXX);
+      showIntersections(_simplifiedXX, e.layer, e.dataset.arcs);
       repairBtn.hide();
       model.updated({repair: true});
       gui.session.simplificationRepair();
@@ -3593,7 +3598,8 @@
         reset(); // need this?
         return;
       }
-      var needRefresh = e.flags.simplify_method || e.flags.simplify || e.flags.repair;
+      var needRefresh = e.flags.simplify_method || e.flags.simplify ||
+        e.flags.repair || e.flags.clean;
       if (needRefresh) {
         updateAsync();
       } else if (e.flags.simplify_amount) {
@@ -3608,17 +3614,18 @@
     });
 
     function intersectionsAreOn() {
-      return !!(_simplifiedXX || _unsimplifiedXX);
+      return _on && !_disabled;
     }
 
-    function clearSavedData() {
+    function turnOff() {
+      hide();
+      _on = false;
       _simplifiedXX = null;
       _unsimplifiedXX = null;
     }
 
     function reset() {
-      clearSavedData();
-      hide();
+      turnOff();
       if (_disabled) {
         return;
       }
@@ -3633,8 +3640,7 @@
 
     function dismissForever() {
       _disabled = true;
-      clearSavedData();
-      hide();
+      turnOff();
     }
 
     function hide() {
@@ -3645,12 +3651,11 @@
     // Update intersection display, after a short delay so map can redraw after previous
     // operation (e.g. simplification change)
     function updateAsync() {
-      if (intersectionsAreOn()) {
-        setTimeout(refreshSync, 10);
-      }
+      setTimeout(updateSync, 10);
     }
 
-    function refreshSync() {
+    function updateSync(action) {
+      if (!intersectionsAreOn()) return;
       var e = model.getActiveLayer();
       var arcs = e.dataset && e.dataset.arcs;
       var intersectionOpts = {
@@ -3661,13 +3666,14 @@
         return;
       }
       if (arcs.getRetainedInterval() > 0) {
+        // simplification
         _simplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
       } else {
         // no simplification
-        _simplifiedXX = null; // clear old simplified XX
-        if (!_unsimplifiedXX) {
-          // save intersections at 0 simplification, to avoid recalculating
-          // every time the simplification slider is set to 100% or the layer is selected at 100%
+        _simplifiedXX = null; // clear any old simplified XX
+        if (_unsimplifiedXX && action == 'simplify_drag_end') {
+          // re-use previously generated intersection data (optimization)
+        } else {
           _unsimplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
         }
       }
@@ -3675,7 +3681,7 @@
     }
 
     function showIntersections(xx, lyr, arcs) {
-      var pointLyr, count = 0;
+      var pointLyr, count = 0, html;
       el.show();
       readout.show();
       checkBtn.hide();
@@ -3685,12 +3691,13 @@
       }
       if (count == 0) {
         map.setIntersectionLayer(null);
-        readout.html('<span class="icon black"></span>No self-intersections');
+        html = '<span class="icon black"></span>No self-intersections';
       } else {
         map.setIntersectionLayer(pointLyr, {layers:[pointLyr]});
-        readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', count, utils$1.pluralSuffix(count)));
-        readout.findChild('.close-btn').on('click', dismissForever);
+        html = utils$1.format('<span class="icon"></span>%s line intersection%s', count, utils$1.pluralSuffix(count));
       }
+      readout.html(html);
+
       if (_simplifiedXX && count > 0) {
         repairBtn.show();
       } else {
@@ -5367,6 +5374,14 @@
     else console.error(msg);
   }
 
+  function truncateString(str, maxLen) {
+    maxLen = maxLen || 80;
+    if (str.length > maxLen) {
+      str = str.substring(0, maxLen - 3).trimEnd() + '...';
+    }
+    return str;
+  }
+
   var uniqCount = 0;
   function getUniqueName(prefix) {
     return (prefix || "__id_") + (++uniqCount);

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.54";
+  var VERSION = "0.6.56";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1403,6 +1403,14 @@
     else console.error(msg);
   }
 
+  function truncateString(str, maxLen) {
+    maxLen = maxLen || 80;
+    if (str.length > maxLen) {
+      str = str.substring(0, maxLen - 3).trimEnd() + '...';
+    }
+    return str;
+  }
+
   var Logging = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getLoggingSetter: getLoggingSetter,
@@ -1424,7 +1432,8 @@
     formatColumns: formatColumns,
     formatStringsAsGrid: formatStringsAsGrid,
     formatLogArgs: formatLogArgs,
-    logArgs: logArgs
+    logArgs: logArgs,
+    truncateString: truncateString
   });
 
   function Transform() {
@@ -14209,6 +14218,87 @@
     };
   }
 
+  // Return array of variables on the left side of assignment operations
+  // @hasDot (bool) Return property assignments via dot notation
+  function getAssignedVars(exp, hasDot) {
+    var rxp = /[a-z_$][.a-z0-9_$]*(?= *=[^>=])/ig; // ignore arrow functions and comparisons
+    var matches = exp.match(rxp) || [];
+    var f = function(s) {
+      var i = s.indexOf('.');
+      return hasDot ? i > -1 : i == -1;
+    };
+    var vars = utils.uniq(matches.filter(f));
+    return vars;
+  }
+
+  // Return array of objects with properties assigned via dot notation
+  // e.g.  'd.value = 45' ->  ['d']
+  // export function getAssignmentObjects(exp) {
+  //   var matches = getAssignedVars(exp, true),
+  //       names = [];
+  //   matches.forEach(function(s) {
+  //     var match = /^([^.]+)\.[^.]+$/.exec(s);
+  //     var name = match ? match[1] : null;
+  //     if (name && name != 'this') {
+  //       names.push(name);
+  //     }
+  //   });
+  //   return utils.uniq(names);
+  // }
+
+  function getExpressionFunction(exp, opts) {
+    var func = compileExpressionToFunction(exp, opts);
+    return function(rec, ctx) {
+      var val;
+      try {
+        val = func.call(ctx.$, rec, ctx);
+      } catch(e) {
+        stop(e.name, "in expression [" + exp + "]:", e.message);
+      }
+      return val;
+    };
+  }
+
+  function compileExpressionToFunction(exp, opts) {
+    // $$ added to avoid duplication with data field variables (an error condition)
+    var functionBody, func;
+    if (opts.returns) {
+      // functionBody = 'return ' + functionBody;
+      functionBody = 'var $$retn = ' + exp + '; return $$retn;';
+    } else {
+      functionBody = exp;
+    }
+    functionBody = 'with($$env){with($$record){ ' + functionBody + '}}';
+    try {
+      func = new Function('$$record,$$env',  functionBody);
+    } catch(e) {
+      // if (opts.quiet) throw e;
+      stop(e.name, 'in expression [' + exp + ']');
+    }
+    return func;
+  }
+
+  function getBaseContext(ctx) {
+    ctx = ctx || {};
+    // Mask global properties (is this effective/worth doing?)
+    ctx.globalThis = void 0; // some globals are not iterable
+    (function() {
+      for (var key in this) {
+        ctx[key] = void 0;
+      }
+    }());
+    ctx.console = console;
+    return ctx;
+  }
+
+  var Expressions = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getAssignedVars: getAssignedVars,
+    getExpressionFunction: getExpressionFunction,
+    compileExpressionToFunction: compileExpressionToFunction,
+    getBaseContext: getBaseContext
+  });
+
   // Compiled expression returns a value
   function compileValueExpression(exp, lyr, arcs, opts) {
     opts = opts || {};
@@ -14216,7 +14306,6 @@
     return compileFeatureExpression(exp, lyr, arcs, opts);
   }
 
-
   function compileFeaturePairFilterExpression(exp, lyr, arcs) {
     var func = compileFeaturePairExpression(exp, lyr, arcs);
     return function(idA, idB) {
@@ -14232,13 +14321,16 @@
     var exp = cleanExpression(rawExp);
     // don't add layer data to the context
     // (fields are not added to the pair expression context)
-    var ctx = getExpressionContext({});
+    var ctx = getFeatureExpressionContext({});
     var getA = getProxyFactory(lyr, arcs);
     var getB = getProxyFactory(lyr, arcs);
     var vars = getAssignedVars(exp);
     var functionBody = "with($$env){with($$record){return " + exp + "}}";
     var func;
 
+    // protect global object from assigned values
+    nullifyUnsetProperties(vars, ctx);
+
     try {
       func = new Function("$$record,$$env", functionBody);
     } catch(e) {
@@ -14246,9 +14338,6 @@
       stop(e.name, "in expression [" + exp + "]");
     }
 
-    // protect global object from assigned values
-    nullifyUnsetProperties(vars, ctx);
-
     function getProxyFactory(lyr, arcs) {
       var records = lyr.data ? lyr.data.getRecords() : [];
       var getFeatureById = initFeatureProxy(lyr, arcs);
@@ -14284,12 +14373,12 @@
     };
   }
 
-  function compileFeatureExpression(rawExp, lyr, arcs, opts_) {
-    var opts = utils.extend({}, opts_),
+  function compileFeatureExpression(rawExp, lyr, arcs, optsArg) {
+    var opts = optsArg || {},
+        ctx = opts.context || {},
         exp = cleanExpression(rawExp || ''),
         mutable = !opts.no_assign, // block assignment expressions
-        vars = getAssignedVars(exp),
-        func, records;
+        vars = getAssignedVars(exp);
 
     if (mutable && vars.length > 0 && !lyr.data) {
       initDataTable(lyr);
@@ -14297,110 +14386,45 @@
 
     if (!mutable) {
       // protect global object from assigned values
-      opts.context = opts.context || {};
-      nullifyUnsetProperties(vars, opts.context);
+      nullifyUnsetProperties(vars, ctx);
     }
 
-    records = lyr.data ? lyr.data.getRecords() : [];
-    func = getExpressionFunction(exp, lyr, arcs, opts);
+    var records = lyr.data ? lyr.data.getRecords() : [];
+    var getFeatureById = initFeatureProxy(lyr, arcs, opts);
+    var layerOnlyProxy = addLayerGetters({}, lyr, arcs);
+    var func = getExpressionFunction(exp, opts);
+    ctx = getFeatureExpressionContext(lyr, ctx, opts);
 
-    // @destRec (optional) substitute for records[recId] (used by -calc)
+    // recId: index of a data record in the records array.
+    // destRec: (optional argument, used by -calc) an object used to capture assignments
+    //   By default, assignments are captured by records[recId]
+    //
     return function(recId, destRec) {
-      var record;
+      var rec;
       if (destRec) {
-        record = destRec;
+        rec = destRec;
       } else {
-        record = records[recId] || (records[recId] = {});
-      }
+        rec = records[recId] || (records[recId] = {});
+      }
+      // Assigning feature/layer proxy to '$' ... ctx.$ is also exposed as 'this'
+      // in the expression context.
+      ctx.$ = recId >= 0 ? getFeatureById(recId) : layerOnlyProxy;
+      // "_" is used as an alias for the expression context, so functions can still
+      // be used when masked by variables of the same name.
+      ctx._ = ctx;
+      // Expose data properties using "d", like d3 does. (data propertries are
+      // also available as "this.properties")
+      ctx.d = rec || null;
 
-      // initialize new fields to null so assignments work
       if (mutable) {
-        nullifyUnsetProperties(vars, record);
-      }
-      return func(record, recId);
-    };
-  }
-
-  // Return array of variables on the left side of assignment operations
-  // @hasDot (bool) Return property assignments via dot notation
-  function getAssignedVars(exp, hasDot) {
-    var rxp = /[a-z_$][.a-z0-9_$]*(?= *=[^>=])/ig; // ignore arrow functions and comparisons
-    var matches = exp.match(rxp) || [];
-    var f = function(s) {
-      var i = s.indexOf('.');
-      return hasDot ? i > -1 : i == -1;
-    };
-    var vars = utils.uniq(matches.filter(f));
-    return vars;
-  }
-
-  // Return array of objects with properties assigned via dot notation
-  // e.g.  'd.value = 45' ->  ['d']
-  function getAssignmentObjects(exp) {
-    var matches = getAssignedVars(exp, true),
-        names = [];
-    matches.forEach(function(s) {
-      var match = /^([^.]+)\.[^.]+$/.exec(s);
-      var name = match ? match[1] : null;
-      if (name && name != 'this') {
-        names.push(name);
-      }
-    });
-    return utils.uniq(names);
-  }
-
-  function compileExpressionToFunction(exp, opts) {
-    // $$ added to avoid duplication with data field variables (an error condition)
-    var functionBody, func;
-    if (opts.returns) {
-      // functionBody = 'return ' + functionBody;
-      functionBody = 'var $$retn = ' + exp + '; return $$retn;';
-    } else {
-      functionBody = exp;
-    }
-    functionBody = 'with($$env){with($$record){ ' + functionBody + '}}';
-    try {
-      func = new Function('$$record,$$env',  functionBody);
-    } catch(e) {
-      // if (opts.quiet) throw e;
-      stop(e.name, 'in expression [' + exp + ']');
-    }
-    return func;
-  }
-
-  function getExpressionFunction(exp, lyr, arcs, opts) {
-    var getFeatureById = initFeatureProxy(lyr, arcs, opts);
-    var layerOnlyProxy = addLayerGetters({}, lyr, arcs);
-    var ctx = getExpressionContext(lyr, opts.context, opts);
-    var func = compileExpressionToFunction(exp, opts);
-    return function(rec, i) {
-      var val;
-      // Assigning feature/layer proxy to '$' -- maybe this should be removed,
-      // since it is also exposed as "this".
-      // (kludge) i is undefined in calc expressions ... we still
-      //   may need layer data (but not single-feature data)
-      ctx.$ = i >= 0 ? getFeatureById(i) : layerOnlyProxy;
-      ctx._ = ctx; // provide access to functions when masked by variable names
-      ctx.d = rec || null; // expose data properties a la d3 (also exposed as this.properties)
-      try {
-        val = func.call(ctx.$, rec, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + exp + "]:", e.message);
+        // initialize assigned variables to rec.null so rec can capture them
+        nullifyUnsetProperties(vars, rec);
       }
-      return val;
+      return func(rec, ctx);
     };
   }
 
-  function nullifyUnsetProperties(vars, obj) {
-    for (var i=0; i<vars.length; i++) {
-      if (vars[i] in obj === false) {
-        obj[vars[i]] = null;
-      }
-    }
-  }
-
-  function getExpressionContext(lyr, mixins, opts) {
+  function getFeatureExpressionContext(lyr, mixins, opts) {
     var defs = getStashedVar('defs');
     var env = getBaseContext();
     var ctx = {};
@@ -14446,29 +14470,20 @@
     }, ctx);
   }
 
-  function getBaseContext(ctx) {
-    ctx = ctx || {};
-    // Mask global properties (is this effective/worth doing?)
-    ctx.globalThis = void 0; // some globals are not iterable
-    (function() {
-      for (var key in this) {
-        ctx[key] = void 0;
+  function nullifyUnsetProperties(vars, obj) {
+    for (var i=0; i<vars.length; i++) {
+      if (vars[i] in obj === false) {
+        obj[vars[i]] = null;
       }
-    }());
-    ctx.console = console;
-    return ctx;
+    }
   }
 
-  var Expressions = /*#__PURE__*/Object.freeze({
+  var FeatureExpressions = /*#__PURE__*/Object.freeze({
     __proto__: null,
     compileValueExpression: compileValueExpression,
     compileFeaturePairFilterExpression: compileFeaturePairFilterExpression,
     compileFeaturePairExpression: compileFeaturePairExpression,
-    compileFeatureExpression: compileFeatureExpression,
-    getAssignedVars: getAssignedVars,
-    getAssignmentObjects: getAssignmentObjects,
-    compileExpressionToFunction: compileExpressionToFunction,
-    getBaseContext: getBaseContext
+    compileFeatureExpression: compileFeatureExpression
   });
 
   function getMode(values) {
@@ -25221,11 +25236,12 @@ ${svg}
         describe: 'use field values to calculate data island weights'
       });
 
-    parser.command('external')
-      .option('module', {
-        DEFAULT: true,
-        describe: 'name of Node module containing the command'
-      });
+    // replaced by -require
+    // parser.command('external')
+    //   .option('module', {
+    //     DEFAULT: true,
+    //     describe: 'name of Node module containing the command'
+    //   });
 
     parser.command('filter-points')
       // .describe('remove points that are not part of a group')
@@ -25311,17 +25327,17 @@ ${svg}
       .option('no-replace', noReplaceOpt);
 
     parser.command('require')
-      .describe('require a Node module for use in -each expressions')
+      .describe('require a Node module or ES module to use in JS expressions')
       .option('module', {
         DEFAULT: true,
-        describe: 'name of Node module or path to module file'
+        describe: 'name of installed module or path to module file'
       })
       .option('alias', {
         describe: 'Set the module name to an alias'
-      })
-      .option('init', {
-        describe: 'JS expression to run after the module loads'
       });
+      // .option('init', {
+      //   describe: 'JS expression to run after the module loads'
+      // });
 
     parser.command('rotate')
       // .describe('apply d3-style 3-axis rotation to a lat-long dataset')
@@ -35318,7 +35334,6 @@ ${svg}
     if (targets.length === 0 && targetId) {
       stop('Layer not found:', targetId);
     }
-    // var vars = getAssignedVars(exp);
     var defs = getStashedVar('defs') || {};
 
     var ctx;
@@ -41983,8 +41998,8 @@ ${svg}
     return true;
   }
 
-  cmd.require = async function(targets, opts) {
-    var defs = getStashedVar('defs');
+  cmd.require = async function(opts) {
+    var globals = getStashedVar('defs');
     var moduleFile, moduleName, mod;
     if (!opts.module) {
       stop("Missing module name or path to module");
@@ -42000,25 +42015,33 @@ ${svg}
       moduleFile = require$1('path').join(process.cwd(), moduleFile);
     }
     try {
-      mod = require$1(moduleFile || moduleName);
+      // import CJS and ES modules
+      mod = await import(moduleFile || moduleName);
+      if (mod.default) {
+        mod = mod.default;
+      }
       if (typeof mod == 'function') {
-        // -require now includes the functionality of the old -external command
+        // assuming that functions are mapshpaper command generators...
+        // this MUST be changed asap.
         var retn = mod(api);
         if (retn && isValidExternalCommand(retn)) {
           cmd.registerCommand(retn.name, retn);
         }
       }
     } catch(e) {
-      stop('Unable to load external module:', e.message, getErrorDetail(e));
+      if (!mod) {
+        stop('Unable to load external module:', e.message, getErrorDetail(e));
+      }
     }
     if (moduleName || opts.alias) {
-      defs[opts.alias || moduleName] = mod;
+      globals[opts.alias || moduleName] = mod;
     } else {
-      Object.assign(defs, mod);
-    }
-    if (opts.init) {
-      await evalTemplateExpression(opts.init, targets);
+      Object.assign(globals, mod);
     }
+    // instead of an init expression, you could use -run <expression>
+    // if (opts.init) {
+    //   await evalTemplateExpression(opts.init, targets);
+    // }
   };
 
   // Parse an array or a string of command line tokens into an array of
@@ -42123,7 +42146,8 @@ ${svg}
       stop('Expected a string containing mapshaper commands; received:', tmp);
     }
     if (tmp) {
-      message(`command: [${tmp}]`);
+      // truncate message (command might include a large GeoJSON string in an -i command)
+      message(`command: [${truncateString(tmp, 150)}]`);
       commands = parseCommands(tmp);
 
       // TODO: remove duplication with mapshaper-run-commands.mjs
@@ -44473,9 +44497,9 @@ ${svg}
       } else if (name == 'explode') {
         outputLayers = applyCommandToEachLayer(cmd.explodeFeatures, targetLayers, arcs, opts);
 
-      } else if (name == 'external') {
-        // -require now incorporates -external
-        cmd.require(targets, opts);
+      // -require now incorporates functionality of -external
+      // } else if (name == 'external') {
+      //   cmd.require(targets, opts);
 
       } else if (name == 'filter') {
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
@@ -44617,7 +44641,7 @@ ${svg}
         cmd.renameLayers(targetLayers, opts.names, job.catalog);
 
       } else if (name == 'require') {
-        cmd.require(targets, opts);
+        await cmd.require(opts);
 
       } else if (name == 'rotate') {
         targets.forEach(function(targ) {
@@ -45445,6 +45469,7 @@ ${svg}
     Explode,
     Export,
     Expressions,
+    FeatureExpressions,
     FileExport,
     FileImport,
     FilenameUtils,

package/www/page.css

@@ -959,10 +959,6 @@ img.close-btn:hover,
 	left: 13px;
 }
 
-.intersection-count {
-	vertical-align: middle;
-}
-
 .intersection-check {
 	display: none;
 }
@@ -979,13 +975,13 @@ img.close-btn:hover,
 	background-color: black;
 }
 
-.intersection-count .close-btn {
+.intersection-display .close-btn {
 	width: 16px;
 	height: 16px;
 	cursor: pointer;
 	position: relative;
 	top: 4px;
-	margin-left: 2px;
+	margin-left: 1px;
 }
 
 /*.intersection-display .text-btn.disabled {