@atlaspack/graph 3.4.1-canary.52 → 3.4.1-canary.521

package/dist/shared-buffer.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SharedBuffer = void 0;
+// @ts-expect-error TS2339
+if (process.browser) {
+    exports.SharedBuffer = ArrayBuffer;
+    // Safari has removed the constructor
+    if (typeof SharedArrayBuffer !== 'undefined') {
+        let channel = new MessageChannel();
+        try {
+            // Firefox might throw when sending the Buffer over a MessagePort
+            channel.port1.postMessage(new SharedArrayBuffer(0));
+            exports.SharedBuffer = SharedArrayBuffer;
+        }
+        catch (_) {
+            // NOOP
+        }
+        channel.port1.close();
+        channel.port2.close();
+    }
+}
+else {
+    exports.SharedBuffer = SharedArrayBuffer;
+}

package/dist/types.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toNodeId = toNodeId;
+exports.fromNodeId = fromNodeId;
+function toNodeId(x) {
+    return x;
+}
+function fromNodeId(x) {
+    return x;
+}

package/lib/AdjacencyList.js

@@ -21,13 +21,21 @@ function _nullthrows() {
 var _sharedBuffer = require("./shared-buffer");
 var _types = require("./types");
 var _Graph = require("./Graph");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /** The address of the node in the nodes map. */
+
 /** The address of the edge in the edges map. */
+
 // eslint-disable-next-line no-unused-vars
+
 // eslint-disable-next-line no-unused-vars
+
 const DEFAULT_PARAMS = {
   initialCapacity: 2,
+  // TODO: Find a heuristic for right-sizing nodes.
+  // e.g., given an average ratio of `e` edges for every `n` nodes,
+  // init nodes with `capacity * n / e`.
+  initialNodeCapacity: 2,
   unloadFactor: 0.3,
   maxGrowFactor: 8,
   minGrowFactor: 2,
@@ -99,7 +107,10 @@ class AdjacencyList {
   constructor(opts) {
     let nodes;
     let edges;
+
+    // @ts-expect-error TS2339
     if (opts !== null && opts !== void 0 && opts.nodes) {
+      // @ts-expect-error TS2339
       ({
         nodes,
         edges
@@ -116,13 +127,9 @@ class AdjacencyList {
         ...opts
       };
       let {
-        initialCapacity
+        initialCapacity,
+        initialNodeCapacity
       } = this.#params;
-
-      // TODO: Find a heuristic for right-sizing nodes.
-      // e.g., given an average ratio of `e` edges for every `n` nodes,
-      // init nodes with `capacity * n / e`.
-      let initialNodeCapacity = 2;
       NodeTypeMap.assertMaxCapacity(initialNodeCapacity);
       EdgeTypeMap.assertMaxCapacity(initialCapacity);
       this.#nodes = new NodeTypeMap(initialNodeCapacity);
@@ -152,6 +159,7 @@ class AdjacencyList {
   get stats() {
     let edgeTypes = new Set();
     let buckets = new Map();
+    // @ts-expect-error TS2488
     for (let {
       from,
       to,
@@ -224,13 +232,17 @@ class AdjacencyList {
 
     // Copy the existing edges into the new array.
     nodes.nextId = this.#nodes.nextId;
-    this.#edges.forEach(edge => void link(this.#edges.from(edge), this.#edges.to(edge), this.#edges.typeOf(edge), edges, nodes, this.#params.unloadFactor));
+    this.#edges.forEach(edge => void link(this.#edges.from(edge), this.#edges.to(edge), this.#edges.typeOf(edge),
+    // @ts-expect-error TS2345
+    edges, nodes, this.#params.unloadFactor));
 
     // We expect to preserve the same number of edges.
     (0, _assert().default)(this.#edges.count === edges.count, `Edge mismatch! ${this.#edges.count} does not match ${edges.count}.`);
 
     // Finally, copy the new data arrays over to this graph.
+    // @ts-expect-error TS2322
     this.#nodes = nodes;
+    // @ts-expect-error TS2322
     this.#edges = edges;
   }
 
@@ -599,6 +611,7 @@ class SharedTypeMap {
   static #TYPE = 1;
 
   /** The largest possible capacity. */
+  // @ts-expect-error TS1094
   static get MAX_CAPACITY() {
     return Math.floor(
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Invalid_array_length#what_went_wrong
@@ -631,6 +644,7 @@ class SharedTypeMap {
 
   /** The address of the first item in the map. */
   get addressableLimit() {
+    // @ts-expect-error TS2339
     return this.constructor.HEADER_SIZE + this.capacity;
   }
 
@@ -653,7 +667,6 @@ class SharedTypeMap {
         BYTES_PER_ELEMENT
       } = Uint32Array;
       let CAPACITY = SharedTypeMap.#CAPACITY;
-      // $FlowFixMe[incompatible-call]
       this.data = new Uint32Array(new _sharedBuffer.SharedBuffer(this.getLength(capacityOrData) * BYTES_PER_ELEMENT));
       this.data[CAPACITY] = capacityOrData;
     } else {
@@ -670,6 +683,7 @@ class SharedTypeMap {
    * and is expected to be of equal or smaller capacity to this map.
    */
   set(data) {
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE,
       ITEM_SIZE
@@ -720,6 +734,7 @@ class SharedTypeMap {
    * get the length of the map, in bytes.
    */
   getLength(capacity = this.capacity) {
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE,
       ITEM_SIZE
@@ -729,6 +744,7 @@ class SharedTypeMap {
 
   /** Get the next available address in the map. */
   getNextAddress() {
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE,
       ITEM_SIZE
@@ -738,6 +754,7 @@ class SharedTypeMap {
 
   /** Get the address of the first item with the given hash. */
   head(hash) {
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE
     } = this.constructor;
@@ -763,6 +780,7 @@ class SharedTypeMap {
     let COUNT = SharedTypeMap.#COUNT;
     let NEXT = SharedTypeMap.#NEXT;
     let TYPE = SharedTypeMap.#TYPE;
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE
     } = this.constructor;
@@ -789,6 +807,7 @@ class SharedTypeMap {
     let COUNT = SharedTypeMap.#COUNT;
     let NEXT = SharedTypeMap.#NEXT;
     let TYPE = SharedTypeMap.#TYPE;
+    // @ts-expect-error TS2339
     let {
       HEADER_SIZE
     } = this.constructor;
@@ -801,6 +820,7 @@ class SharedTypeMap {
     let candidate = head;
     while (candidate !== null && candidate !== item) {
       prev = candidate;
+      // @ts-expect-error TS2322
       candidate = this.next(candidate);
     }
     if (prev !== null && next !== null) {
@@ -818,6 +838,7 @@ class SharedTypeMap {
   forEach(cb) {
     let max = this.count;
     let len = this.length;
+    // @ts-expect-error TS2339
     let {
       ITEM_SIZE
     } = this.constructor;
@@ -834,10 +855,10 @@ class SharedTypeMap {
   // See https://github.com/facebook/flow/issues/1163#issuecomment-353523840
   /*:: @@iterator(): Iterator<TAddress> { return ({}: any); } */
 
-  // $FlowFixMe[unsupported-syntax]
   *[Symbol.iterator]() {
     let max = this.count;
     let len = this.length;
+    // @ts-expect-error TS2339
     let {
       ITEM_SIZE
     } = this.constructor;
@@ -849,6 +870,7 @@ class SharedTypeMap {
     }
   }
   inspect() {
+    // @ts-expect-error TS2339
     const {
       HEADER_SIZE
     } = this.constructor;
@@ -1168,6 +1190,7 @@ class EdgeTypeMap extends SharedTypeMap {
 
   /** Get the next available address in the map. */
   getNextAddress() {
+    // @ts-expect-error TS2339
     let {
       ITEM_SIZE
     } = this.constructor;
@@ -1359,7 +1382,8 @@ function link(from, to, type, edges, nodes, unloadFactor = DEFAULT_PARAMS.unload
   // Since the space occupied by deleted edges isn't reclaimed,
   // we include them in our count to avoid overflowing the `edges` array.
   let deletes = edges.deletes;
-  if (edges.getLoad(count + deletes) >= 1) {
+  let total = count + deletes;
+  if (edges.getLoad(total) >= 1) {
     if (edges.getLoad(deletes) >= unloadFactor && edges.getLoad(count) < unloadFactor) {
       // If we have a significant number of deletes, reclaim the space.
       return LinkResult.TooManyDeletes;

package/lib/BitSet.js

@@ -9,7 +9,8 @@ function ctz32(n) {
   if (n === 0) {
     return 32;
   }
-  return 31 - Math.clz32(n & -n);
+  let reversed = n & -n;
+  return 31 - Math.clz32(reversed);
 }
 class BitSet {
   constructor(maxBits) {
@@ -25,17 +26,28 @@ class BitSet {
     res.union(b);
     return res;
   }
+  static intersect(a, b) {
+    let res = a.clone();
+    res.intersect(b);
+    return res;
+  }
   get capacity() {
     return this.bits.length * 32;
   }
   add(bit) {
-    this.bits[bit >>> 5] |= 1 << (bit & 31);
+    let i = bit >>> 5;
+    let b = bit & 31;
+    this.bits[i] |= 1 << b;
   }
   delete(bit) {
-    this.bits[bit >>> 5] &= ~(1 << (bit & 31));
+    let i = bit >>> 5;
+    let b = bit & 31;
+    this.bits[i] &= ~(1 << b);
   }
   has(bit) {
-    return Boolean(this.bits[bit >>> 5] & 1 << (bit & 31));
+    let i = bit >>> 5;
+    let b = bit & 31;
+    return Boolean(this.bits[i] & 1 << b);
   }
   empty() {
     for (let k = 0; k < this.bits.length; k++) {
@@ -63,6 +75,26 @@ class BitSet {
       this.bits[i] &= ~other.bits[i];
     }
   }
+  size() {
+    let bits = this.bits;
+    let setBitsCount = 0;
+    for (let k = 0; k < bits.length; k++) {
+      let chunk = bits[k];
+      while (chunk !== 0) {
+        chunk &= chunk - 1; // Clear the least significant bit set
+        setBitsCount++;
+      }
+    }
+    return setBitsCount;
+  }
+  equals(other) {
+    for (let i = 0; i < this.bits.length; i++) {
+      if (this.bits[i] !== other.bits[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
   forEach(fn) {
     // https://lemire.me/blog/2018/02/21/iterating-over-set-bits-quickly/
     let bits = this.bits;
@@ -70,7 +102,6 @@ class BitSet {
       let v = bits[k];
       while (v !== 0) {
         let t = (v & -v) >>> 0;
-        // $FlowFixMe
         fn((k << 5) + ctz32(v));
         v ^= t;
       }

package/lib/ContentGraph.js

@@ -12,7 +12,7 @@ function _nullthrows() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class ContentGraph extends _Graph.default {
   constructor(opts) {
     if (opts) {
@@ -30,18 +30,14 @@ class ContentGraph extends _Graph.default {
       this._nodeIdToContentKey = new Map();
     }
   }
-
-  // $FlowFixMe[prop-missing]
   static deserialize(opts) {
     return new ContentGraph(opts);
   }
-
-  // $FlowFixMe[prop-missing]
   serialize() {
-    // $FlowFixMe[prop-missing]
     return {
       ...super.serialize(),
       _contentKeyToNodeId: this._contentKeyToNodeId,
+      // @ts-expect-error TS2353
       _nodeIdToContentKey: this._nodeIdToContentKey
     };
   }

package/lib/Graph.js

@@ -15,7 +15,7 @@ function _nullthrows() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const NULL_EDGE_TYPE = exports.NULL_EDGE_TYPE = 1;
 const ALL_EDGE_TYPES = exports.ALL_EDGE_TYPES = -1;
 
@@ -29,13 +29,20 @@ const ALL_EDGE_TYPES = exports.ALL_EDGE_TYPES = -1;
 
 class Graph {
   constructor(opts) {
-    this.nodes = (opts === null || opts === void 0 ? void 0 : opts.nodes) || [];
-    this.setRootNodeId(opts === null || opts === void 0 ? void 0 : opts.rootNodeId);
-    let adjacencyList = opts === null || opts === void 0 ? void 0 : opts.adjacencyList;
-    let initialCapacity = opts === null || opts === void 0 ? void 0 : opts.initialCapacity;
-    this.adjacencyList = adjacencyList ? _AdjacencyList.default.deserialize(adjacencyList) : new _AdjacencyList.default(typeof initialCapacity === 'number' ? {
-      initialCapacity
-    } : undefined);
+    let {
+      nodes,
+      rootNodeId,
+      adjacencyList,
+      ...adjacencyListOpts
+    } = opts ?? {};
+    this.nodes = nodes ?? [];
+    this.setRootNodeId(rootNodeId);
+    this.adjacencyList = adjacencyList ? adjacencyList instanceof _AdjacencyList.default ? adjacencyList : _AdjacencyList.default.deserialize(adjacencyList) : new _AdjacencyList.default(adjacencyListOpts);
+    if (opts !== null && opts !== void 0 && opts.nodes && !opts.adjacencyList) {
+      for (let i = 0; i < this.nodes.length; i++) {
+        this.adjacencyList.addNode();
+      }
+    }
   }
   setRootNodeId(id) {
     this.rootNodeId = id;
@@ -248,6 +255,7 @@ class Graph {
       context: null
     }];
     while (queue.length !== 0) {
+      // @ts-expect-error TS2339
       let {
         nodeId,
         context
@@ -257,7 +265,6 @@ class Graph {
       skipped = false;
       let newContext = visit(nodeId, context, actions);
       if (typeof newContext !== 'undefined') {
-        // $FlowFixMe[reassign-const]
         context = newContext;
       }
       if (skipped) {
@@ -324,6 +331,7 @@ class Graph {
       }
     }
     this._visited = visited;
+    return;
   }
 
   /**
@@ -365,15 +373,18 @@ class Graph {
     const enter = typeof visit === 'function' ? visit : visit.enter;
     while (queue.length !== 0) {
       const command = queue.pop();
+
+      // @ts-expect-error TS18048
       if (command.exit != null) {
+        // @ts-expect-error TS2339
         let {
           nodeId,
           context,
           exit
         } = command;
+        // @ts-expect-error TS18048
         let newContext = exit(nodeId, command.context, actions);
         if (typeof newContext !== 'undefined') {
-          // $FlowFixMe[reassign-const]
           context = newContext;
         }
         if (skipped) {
@@ -384,6 +395,7 @@ class Graph {
           return context;
         }
       } else {
+        // @ts-expect-error TS2339
         let {
           nodeId,
           context
@@ -394,7 +406,6 @@ class Graph {
         if (enter) {
           let newContext = enter(nodeId, context, actions);
           if (typeof newContext !== 'undefined') {
-            // $FlowFixMe[reassign-const]
             context = newContext;
           }
         }
@@ -439,6 +450,8 @@ class Graph {
       if (stop === true) {
         return node;
       }
+
+      // @ts-expect-error TS2345
       for (let child of this.getNodeIdsConnectedFrom(node)) {
         if (!visited.has(child)) {
           visited.add(child);
@@ -506,7 +519,7 @@ class Graph {
 exports.default = Graph;
 function mapVisitor(filter, visit) {
   function makeEnter(visit) {
-    return function (nodeId, context, actions) {
+    return function mappedEnter(nodeId, context, actions) {
       let value = filter(nodeId, actions);
       if (value != null) {
         return visit(value, context, actions);
@@ -521,7 +534,7 @@ function mapVisitor(filter, visit) {
     mapped.enter = makeEnter(visit.enter);
   }
   if (visit.exit != null) {
-    mapped.exit = function (nodeId, context, actions) {
+    mapped.exit = function mappedExit(nodeId, context, actions) {
       let exit = visit.exit;
       if (!exit) {
         return;

package/lib/index.js

@@ -49,6 +49,5 @@ var _types = require("./types");
 var _Graph = _interopRequireWildcard(require("./Graph"));
 var _ContentGraph = _interopRequireDefault(require("./ContentGraph"));
 var _BitSet = require("./BitSet");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }

package/lib/shared-buffer.js

@@ -4,10 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SharedBuffer = void 0;
+// flow-to-ts helpers
+
+// /flow-to-ts helpers
+
 // Copy from @atlaspack/utils to fix: https://github.com/stackblitz/core/issues/1855
 let SharedBuffer = exports.SharedBuffer = void 0;
 
-// $FlowFixMe[prop-missing]
+// @ts-expect-error TS2339
 if (process.browser) {
   exports.SharedBuffer = SharedBuffer = ArrayBuffer;
   // Safari has removed the constructor