Skip to content

Commit

Permalink
Merge 74743af into 0ea4fa1
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikolay-borzov
nikolay-borzov committed Feb 20, 2020
2 parents 0ea4fa1 + 74743af commit d68e5d7
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 12 deletions.
29 changes: 20 additions & 9 deletions src/html.ts
View file
Expand Up @@ -86,6 +86,10 @@ function makeMergedBundle(exploreResults: ExploreBundleResult[]): ExploreBundleR

type TreeNodesMap = { [source: string]: string[] };

function getNodePath(parts: string[], depthIndex: number): string {
return parts.slice(0, depthIndex + 1).join('/');
}

function getTreeNodesMap(fileDataMap: FileDataMap): TreeNodesMap {
let partsSourceTuples = Object.keys(fileDataMap).map<[string[], string]>(file => [
file.split('/'),
Expand All @@ -95,15 +99,22 @@ function getTreeNodesMap(fileDataMap: FileDataMap): TreeNodesMap {
const maxDepth = Math.max(...partsSourceTuples.map(([parts]) => parts.length));

for (let depthIndex = 0; depthIndex < maxDepth; depthIndex += 1) {
partsSourceTuples = partsSourceTuples.map(([parts, file]) => {
const rootPart = parts[depthIndex];

if (rootPart) {
const sameRootParts = partsSourceTuples.filter(
([pathParts]) => pathParts[depthIndex] === rootPart
);

if (sameRootParts.length === 1) {
partsSourceTuples = partsSourceTuples.map(([parts, file], currentNodeIndex) => {
if (parts[depthIndex]) {
const nodePath = getNodePath(parts, depthIndex);

const hasSameRootPaths = partsSourceTuples.some(([pathParts], index) => {
if (index === currentNodeIndex) {
return false;
}
if (!pathParts[depthIndex]) {
return false;
}

return getNodePath(pathParts, depthIndex) === nodePath;
});

if (!hasSameRootPaths) {
// Collapse non-contributing path parts
return [[...parts.slice(0, depthIndex), parts.slice(depthIndex).join('/')], file];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/cli.test.ts.snap
View file
Expand Up @@ -68,7 +68,7 @@ exports['CLI should multiple bundles output result as html 1'] = `
</body>
<script>
const treeDataMap = {"0":{"name":"[combined]","data":{"name":"/ \u2022 3.62 KB \u2022 100.0%","data":{"$area":3709},"children":[{"name":"inline-map.js \u2022 2.92 KB \u2022 80.6%","data":{"$area":2991},"children":[{"name":"node_modules \u2022 480 B \u2022 12.9%","data":{"$area":480},"children":[{"name":"browser-pack \u2022 480 B \u2022 12.9%","data":{"$area":480},"children":[{"name":"_prelude.js \u2022 480 B \u2022 12.9%","data":{"$area":480}}]}]},{"name":"src \u2022 201 B \u2022 5.4%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 2.8%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 2.6%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 2.25 KB \u2022 62.2%","data":{"$area":2308}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]},{"name":"foo.min.js \u2022 718 B \u2022 19.4%","data":{"$area":718},"children":[{"name":"node_modules \u2022 480 B \u2022 12.9%","data":{"$area":480},"children":[{"name":"browser-pack \u2022 480 B \u2022 12.9%","data":{"$area":480},"children":[{"name":"_prelude.js \u2022 480 B \u2022 12.9%","data":{"$area":480}}]}]},{"name":"src \u2022 201 B \u2022 5.4%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 2.8%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 2.6%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 35 B \u2022 0.9%","data":{"$area":35}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]}]}},"1":{"name":"data/inline-map.js","data":{"name":"/ \u2022 2.92 KB \u2022 100.0%","data":{"$area":2991},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 16.0%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 6.7%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 3.5%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 3.2%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 2.25 KB \u2022 77.2%","data":{"$area":2308}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]}},"2":{"name":"data/foo.min.js","data":{"name":"/ \u2022 718 B \u2022 100.0%","data":{"$area":718},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 66.9%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 28.0%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 14.5%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 13.5%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 35 B \u2022 4.9%","data":{"$area":35}},{"name":"[unmapped] \u2022 1 B \u2022 0.1%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.1%","data":{"$area":1}}]}}};
const treeDataMap = {"0":{"name":"[combined]","data":{"name":"/ \u2022 3.62 KB \u2022 100.0%","data":{"$area":3709},"children":[{"name":"inline-map.js \u2022 2.92 KB \u2022 80.6%","data":{"$area":2991},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 12.9%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 5.4%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 2.8%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 2.6%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 2.25 KB \u2022 62.2%","data":{"$area":2308}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]},{"name":"foo.min.js \u2022 718 B \u2022 19.4%","data":{"$area":718},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 12.9%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 5.4%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 2.8%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 2.6%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 35 B \u2022 0.9%","data":{"$area":35}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]}]}},"1":{"name":"data/inline-map.js","data":{"name":"/ \u2022 2.92 KB \u2022 100.0%","data":{"$area":2991},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 16.0%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 6.7%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 3.5%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 3.2%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 2.25 KB \u2022 77.2%","data":{"$area":2308}},{"name":"[unmapped] \u2022 1 B \u2022 0.0%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.0%","data":{"$area":1}}]}},"2":{"name":"data/foo.min.js","data":{"name":"/ \u2022 718 B \u2022 100.0%","data":{"$area":718},"children":[{"name":"node_modules/browser-pack/_prelude.js \u2022 480 B \u2022 66.9%","data":{"$area":480}},{"name":"src \u2022 201 B \u2022 28.0%","data":{"$area":201},"children":[{"name":"bar.js \u2022 104 B \u2022 14.5%","data":{"$area":104}},{"name":"foo.js \u2022 97 B \u2022 13.5%","data":{"$area":97}}]},{"name":"[sourceMappingURL] \u2022 35 B \u2022 4.9%","data":{"$area":35}},{"name":"[unmapped] \u2022 1 B \u2022 0.1%","data":{"$area":1}},{"name":"[EOLs] \u2022 1 B \u2022 0.1%","data":{"$area":1}}]}}};
</script>
<script src="data:application/javascript;base64,function colorize(child) {
  child.dom.style.backgroundColor = child.data.backgroundColor
}

// Vendored from https://github.com/rmmh/webtreemap/blob/9fa0c066a10ea4402d960b0c6c1a432846ac7fc4/webtreemap.js

// Copyright 2013 Google Inc. All Rights Reserved.
//
// 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.

// Size of border around nodes.
// We could support arbitrary borders using getComputedStyle(), but I am
// skeptical the extra complexity (and performance hit) is worth it.

;(function() {
var kBorderWidth = 1;

// Padding around contents.
// TODO: do this with a nested div to allow it to be CSS-styleable.
var kPadding = 4;

// x/y ratio to aim for -- wider rectangles are better for text display
var kAspectRatio = 1.2;

var focused = null;

function focus(tree) {
  focused = tree;

  // Hide all visible siblings of all our ancestors by lowering them.
  var level = 0;
  var root = tree;
  while (root.parent) {
    root = root.parent;
    level += 1;
    for (var i = 0, sibling; sibling = root.children[i]; ++i) {
      if (sibling.dom)
        sibling.dom.style.zIndex = 0;
    }
  }
  var width = root.dom.offsetWidth;
  var height = root.dom.offsetHeight;
  // Unhide (raise) and maximize us and our ancestors.
  for (var t = tree; t.parent; t = t.parent) {
    // Shift off by border so we don't get nested borders.
    // TODO: actually make nested borders work (need to adjust width/height).
    position(t.dom, -kBorderWidth, -kBorderWidth, width, height);
    t.dom.style.zIndex = 1;
  }
  // And layout into the topmost box.
  layout(tree, level, width, height);
}

function makeDom(tree, level) {
  var dom = document.createElement('div');
  dom.style.zIndex = 1;
  dom.className = 'webtreemap-node webtreemap-level' + Math.min(level, 4);
  if (tree.data['$symbol']) {
    dom.className += (' webtreemap-symbol-' +
  tree.data['$symbol'].replace(' ', '_'));
  }
  if (tree.data['$dominant_symbol']) {
    dom.className += (' webtreemap-symbol-' +
  tree.data['$dominant_symbol'].replace(' ', '_'));
    dom.className += (' webtreemap-aggregate');
  }

  dom.onmousedown = function(e) {
    if (e.button == 0) {
      if (focused && tree == focused && focused.parent) {
        focus(focused.parent);
      } else {
        focus(tree);
      }
    }
    e.stopPropagation();
    return true;
  };

  var caption = document.createElement('div');
  caption.className = 'webtreemap-caption';
  caption.innerHTML = tree.name;
  dom.appendChild(caption);
  dom.title = tree.name;

  tree.dom = dom;
  return dom;
}

function position(dom, x, y, width, height) {
  // CSS width/height does not include border.
  width -= kBorderWidth*2;
  height -= kBorderWidth*2;

  dom.style.left   = x + 'px';
  dom.style.top    = y + 'px';
  dom.style.width  = Math.max(width, 0) + 'px';
  dom.style.height = Math.max(height, 0) + 'px';
}

// Given a list of rectangles |nodes|, the 1-d space available
// |space|, and a starting rectangle index |start|, compute an span of
// rectangles that optimizes a pleasant aspect ratio.
//
// Returns [end, sum], where end is one past the last rectangle and sum is the
// 2-d sum of the rectangles' areas.
function selectSpan(nodes, space, start) {
  // Add rectangle one by one, stopping when aspect ratios begin to go
  // bad.  Result is [start,end) covering the best run for this span.
  // http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.36.6685
  var node = nodes[start];
  var rmin = node.data['$area'];  // Smallest seen child so far.
  var rmax = rmin;                // Largest child.
  var rsum = 0;                   // Sum of children in this span.
  var last_score = 0;             // Best score yet found.
  for (var end = start; node = nodes[end]; ++end) {
    var size = node.data['$area'];
    if (size < rmin)
      rmin = size;
    if (size > rmax)
      rmax = size;
    rsum += size;

    // This formula is from the paper, but you can easily prove to
    // yourself it's taking the larger of the x/y aspect ratio or the
    // y/x aspect ratio.  The additional magic fudge constant of kAspectRatio
    // lets us prefer wider rectangles to taller ones.
    var score = Math.max(space*space*rmax / (rsum*rsum),
                         kAspectRatio*rsum*rsum / (space*space*rmin));
    if (last_score && score > last_score) {
      rsum -= size;  // Undo size addition from just above.
      break;
    }
    last_score = score;
  }
  return [end, rsum];
}

function layout(tree, level, width, height) {
  if (!('children' in tree))
    return;

  var total = tree.data['$area'];

  // XXX why do I need an extra -1/-2 here for width/height to look right?
  var x1 = 0, y1 = 0, x2 = width - 1, y2 = height - 2;
  x1 += kPadding; y1 += kPadding;
  x2 -= kPadding; y2 -= kPadding;
  y1 += 14;  // XXX get first child height for caption spacing

  var pixels_to_units = Math.sqrt(total / ((x2 - x1) * (y2 - y1)));

  // The algorithm does best at laying out items from largest to smallest.
  // Sort them to ensure this.
  if (!tree.children.sorted) {
    tree.children.sort(function (a, b) {
      return b.data['$area'] - a.data['$area'];
    });
    tree.children.sorted = true;
  }

  for (var start = 0, child; child = tree.children[start]; ++start) {
    if (x2 - x1 < 60 || y2 - y1 < 40) {
      if (child.dom) {
        child.dom.style.zIndex = 0;
        position(child.dom, -2, -2, 0, 0);
        colorize(child)
      }
      continue;
    }

    // Dynamically decide whether to split in x or y based on aspect ratio.
    var ysplit = ((y2 - y1) / (x2 - x1)) > kAspectRatio;

    var space;  // Space available along layout axis.
    if (ysplit)
      space = (y2 - y1) * pixels_to_units;
    else
      space = (x2 - x1) * pixels_to_units;

    var span = selectSpan(tree.children, space, start);
    var end = span[0], rsum = span[1];

    // Now that we've selected a span, lay out rectangles [start,end) in our
    // available space.
    var x = x1, y = y1;
    for (var i = start; i < end; ++i) {
      child = tree.children[i];
      if (!child.dom) {
        child.parent = tree;
        child.dom = makeDom(child, level + 1);
        tree.dom.appendChild(child.dom);
      } else {
        child.dom.style.zIndex = 1;
      }
      var size = child.data['$area'];
      var frac = size / rsum;
      if (ysplit) {
        width = rsum / space;
        height = size / width;
      } else {
        height = rsum / space;
        width = size / height;
      }
      width /= pixels_to_units;
      height /= pixels_to_units;
      width = Math.round(width);
      height = Math.round(height);
      position(child.dom, x, y, width, height);
      colorize(child)
      if ('children' in child) {
        layout(child, level + 1, width, height);
      }
      if (ysplit)
        y += height;
      else
        x += width;
    }

    // Shrink our available space based on the amount we used.
    if (ysplit)
      x1 += Math.round((rsum / space) / pixels_to_units);
    else
      y1 += Math.round((rsum / space) / pixels_to_units);

    // end points one past where we ended, which is where we want to
    // begin the next iteration, but subtract one to balance the ++ in
    // the loop.
    start = end - 1;
  }
}

function appendTreemap(dom, data) {
  var style = getComputedStyle(dom, null);
  var width = parseInt(style.width);
  var height = parseInt(style.height);
  if (!data.dom)
    makeDom(data, 0);
  dom.appendChild(data.dom);
  position(data.dom, 0, 0, width, height);
  layout(data, 0, width, height);
}

window.appendTreemap = appendTreemap;
})(window);
"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/html.test.ts.snap
View file
Expand Up @@ -118,7 +118,7 @@ exports['html getWebTreeMapData should collapse non-contributing nodes 1'] = {
]
},
{
"name": "j/k.js \u2022 6 B \u2022 21.4%",
"name": "j/i.js \u2022 6 B \u2022 21.4%",
"data": {
"$area": 6
}
Expand Down
2 changes: 1 addition & 1 deletion tests/html.test.ts
View file
Expand Up @@ -12,7 +12,7 @@ describe('html', () => {
'd/f.js': { size: 3 },
'd/g/h.js': { size: 4 },
'd/g/i.js': { size: 5 },
'd/j/k.js': { size: 6 },
'd/j/i.js': { size: 6 },
z: { size: 7 },
};

Expand Down

0 comments on commit d68e5d7

Please sign in to comment.