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

package/src/{ContentGraph.js → ContentGraph.ts}

@@ -1,27 +1,30 @@
-// @flow strict-local
 import type {ContentKey, NodeId} from './types';
 
-import Graph, {type SerializedGraph, type GraphOpts} from './Graph';
+import Graph, {SerializedGraph, GraphOpts} from './Graph';
 import nullthrows from 'nullthrows';
 
-export type ContentGraphOpts<TNode, TEdgeType: number = 1> = {|
-  ...GraphOpts<TNode, TEdgeType>,
-  _contentKeyToNodeId: Map<ContentKey, NodeId>,
-  _nodeIdToContentKey: Map<NodeId, ContentKey>,
-|};
-export type SerializedContentGraph<TNode, TEdgeType: number = 1> = {|
-  ...SerializedGraph<TNode, TEdgeType>,
-  _contentKeyToNodeId: Map<ContentKey, NodeId>,
-|};
+export type ContentGraphOpts<TNode, TEdgeType extends number = 1> = GraphOpts<
+  TNode,
+  TEdgeType
+> & {
+  _contentKeyToNodeId: Map<ContentKey, NodeId>;
+  _nodeIdToContentKey: Map<NodeId, ContentKey>;
+};
+export type SerializedContentGraph<
+  TNode,
+  TEdgeType extends number = 1,
+> = SerializedGraph<TNode, TEdgeType> & {
+  _contentKeyToNodeId: Map<ContentKey, NodeId>;
+};
 
-export default class ContentGraph<TNode, TEdgeType: number = 1> extends Graph<
+export default class ContentGraph<
   TNode,
-  TEdgeType,
-> {
+  TEdgeType extends number = 1,
+> extends Graph<TNode, TEdgeType> {
   _contentKeyToNodeId: Map<ContentKey, NodeId>;
   _nodeIdToContentKey: Map<NodeId, ContentKey>;
 
-  constructor(opts: ?ContentGraphOpts<TNode, TEdgeType>) {
+  constructor(opts?: ContentGraphOpts<TNode, TEdgeType> | null) {
     if (opts) {
       let {_contentKeyToNodeId, _nodeIdToContentKey, ...rest} = opts;
       super(rest);
@@ -34,19 +37,17 @@ export default class ContentGraph<TNode, TEdgeType: number = 1> extends Graph<
     }
   }
 
-  // $FlowFixMe[prop-missing]
-  static deserialize(
+  static deserialize<TNode, TEdgeType extends number = 1>(
     opts: ContentGraphOpts<TNode, TEdgeType>,
   ): ContentGraph<TNode, TEdgeType> {
     return new ContentGraph(opts);
   }
 
-  // $FlowFixMe[prop-missing]
   serialize(): SerializedContentGraph<TNode, TEdgeType> {
-    // $FlowFixMe[prop-missing]
     return {
       ...super.serialize(),
       _contentKeyToNodeId: this._contentKeyToNodeId,
+      // @ts-expect-error TS2353
       _nodeIdToContentKey: this._nodeIdToContentKey,
     };
   }
@@ -68,7 +69,7 @@ export default class ContentGraph<TNode, TEdgeType: number = 1> extends Graph<
       : this.addNodeByContentKey(contentKey, node);
   }
 
-  getNodeByContentKey(contentKey: ContentKey): ?TNode {
+  getNodeByContentKey(contentKey: ContentKey): TNode | null | undefined {
     let nodeId = this._contentKeyToNodeId.get(contentKey);
     if (nodeId != null) {
       return super.getNode(nodeId);

package/src/{Graph.js → Graph.ts}

@@ -1,45 +1,44 @@
-// @flow strict-local
-
 import {fromNodeId} from './types';
-import AdjacencyList, {type SerializedAdjacencyList} from './AdjacencyList';
+import AdjacencyList, {SerializedAdjacencyList} from './AdjacencyList';
 import type {Edge, NodeId} from './types';
 import type {
   TraversalActions,
   GraphVisitor,
   GraphTraversalCallback,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 import {BitSet} from './BitSet';
 
 import nullthrows from 'nullthrows';
 
 export type NullEdgeType = 1;
 export const NULL_EDGE_TYPE: NullEdgeType = 1;
-export type GraphOpts<TNode, TEdgeType: number = NullEdgeType> = {|
-  nodes?: Array<TNode | null>,
-  adjacencyList?: SerializedAdjacencyList<TEdgeType>,
-  rootNodeId?: ?NodeId,
-  initialCapacity?: number,
-|};
-
-export type SerializedGraph<TNode, TEdgeType: number = NullEdgeType> = {|
-  nodes: Array<TNode | null>,
-  adjacencyList: SerializedAdjacencyList<TEdgeType>,
-  rootNodeId: ?NodeId,
-|};
+export type GraphOpts<TNode, TEdgeType extends number = NullEdgeType> = {
+  nodes?: Array<TNode | null>;
+  adjacencyList?: SerializedAdjacencyList<TEdgeType> | AdjacencyList<TEdgeType>;
+  rootNodeId?: NodeId | null | undefined;
+  initialCapacity?: number;
+  initialNodeCapacity?: number;
+};
+
+export type SerializedGraph<TNode, TEdgeType extends number = NullEdgeType> = {
+  nodes: Array<TNode | null>;
+  adjacencyList: SerializedAdjacencyList<TEdgeType>;
+  rootNodeId: NodeId | null | undefined;
+};
 
 export type AllEdgeTypes = -1;
 export const ALL_EDGE_TYPES: AllEdgeTypes = -1;
 
-type DFSCommandVisit<TContext> = {|
-  nodeId: NodeId,
-  context: TContext | null,
-|};
+type DFSCommandVisit<TContext> = {
+  nodeId: NodeId;
+  context: TContext | null;
+};
 
-type DFSCommandExit<TContext> = {|
-  nodeId: NodeId,
-  exit: GraphTraversalCallback<NodeId, TContext>,
-  context: TContext | null,
-|};
+type DFSCommandExit<TContext> = {
+  nodeId: NodeId;
+  exit: GraphTraversalCallback<NodeId, TContext>;
+  context: TContext | null;
+};
 
 /**
  * Internal type used for queue iterative DFS implementation.
@@ -51,8 +50,8 @@ type DFSCommand<TContext> =
 /**
  * Options for DFS traversal.
  */
-export type DFSParams<TContext> = {|
-  visit: GraphVisitor<NodeId, TContext>,
+export type DFSParams<TContext> = {
+  visit: GraphVisitor<NodeId, TContext>;
   /**
    * Custom function to get next entries to visit.
    *
@@ -71,34 +70,40 @@ export type DFSParams<TContext> = {|
    *
    * Only due to the latter we aren't replacing this.
    */
-  getChildren: (nodeId: NodeId) => Array<NodeId>,
-  startNodeId?: ?NodeId,
-|};
+  getChildren: (nodeId: NodeId) => Array<NodeId>;
+  startNodeId?: NodeId | null | undefined;
+};
 
-export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
+export default class Graph<TNode, TEdgeType extends number = NullEdgeType> {
   nodes: Array<TNode | null>;
   adjacencyList: AdjacencyList<TEdgeType>;
-  rootNodeId: ?NodeId;
-  _visited: ?BitSet;
+  rootNodeId: NodeId | null | undefined;
+  _visited: BitSet | null | undefined;
 
-  constructor(opts: ?GraphOpts<TNode, TEdgeType>) {
-    this.nodes = opts?.nodes || [];
-    this.setRootNodeId(opts?.rootNodeId);
+  constructor(opts?: GraphOpts<TNode, TEdgeType> | null) {
+    let {nodes, rootNodeId, adjacencyList, ...adjacencyListOpts} = opts ?? {};
+
+    this.nodes = nodes ?? [];
+    this.setRootNodeId(rootNodeId);
 
-    let adjacencyList = opts?.adjacencyList;
-    let initialCapacity = opts?.initialCapacity;
     this.adjacencyList = adjacencyList
-      ? AdjacencyList.deserialize(adjacencyList)
-      : new AdjacencyList<TEdgeType>(
-          typeof initialCapacity === 'number' ? {initialCapacity} : undefined,
-        );
+      ? adjacencyList instanceof AdjacencyList
+        ? adjacencyList
+        : AdjacencyList.deserialize(adjacencyList)
+      : new AdjacencyList<TEdgeType>(adjacencyListOpts);
+
+    if (opts?.nodes && !opts.adjacencyList) {
+      for (let i = 0; i < this.nodes.length; i++) {
+        this.adjacencyList.addNode();
+      }
+    }
   }
 
-  setRootNodeId(id: ?NodeId) {
+  setRootNodeId(id?: NodeId | null) {
     this.rootNodeId = id;
   }
 
-  static deserialize(
+  static deserialize<TNode, TEdgeType extends number = NullEdgeType>(
     opts: GraphOpts<TNode, TEdgeType>,
   ): Graph<TNode, TEdgeType> {
     return new this({
@@ -132,7 +137,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     return this.nodes[id] != null;
   }
 
-  getNode(id: NodeId): ?TNode {
+  getNode(id: NodeId): TNode | null | undefined {
     return this.nodes[id];
   }
 
@@ -159,7 +164,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
   hasEdge(
     from: NodeId,
     to: NodeId,
-    type?:
+    type:
       | TEdgeType
       | NullEdgeType
       | Array<TEdgeType | NullEdgeType> = NULL_EDGE_TYPE,
@@ -169,7 +174,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
 
   forEachNodeIdConnectedTo(
     to: NodeId,
-    fn: (nodeId: NodeId) => boolean | void,
+    fn: (nodeId: NodeId) => boolean | undefined,
     type: AllEdgeTypes | TEdgeType | NullEdgeType = NULL_EDGE_TYPE,
   ) {
     this._assertHasNodeId(to);
@@ -327,9 +332,9 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
   // Update a node's downstream nodes making sure to prune any orphaned branches
   replaceNodeIdsConnectedTo(
     fromNodeId: NodeId,
-    toNodeIds: $ReadOnlyArray<NodeId>,
-    replaceFilter?: null | ((NodeId) => boolean),
-    type?: TEdgeType | NullEdgeType = NULL_EDGE_TYPE,
+    toNodeIds: ReadonlyArray<NodeId>,
+    replaceFilter?: null | ((arg1: NodeId) => boolean),
+    type: TEdgeType | NullEdgeType = NULL_EDGE_TYPE,
     removeOrphans: boolean = true,
   ): void {
     this._assertHasNodeId(fromNodeId);
@@ -355,13 +360,13 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
 
   traverse<TContext>(
     visit: GraphVisitor<NodeId, TContext>,
-    startNodeId: ?NodeId,
+    startNodeId?: NodeId | null,
     type:
       | TEdgeType
       | NullEdgeType
       | Array<TEdgeType | NullEdgeType>
       | AllEdgeTypes = NULL_EDGE_TYPE,
-  ): ?TContext {
+  ): TContext | null | undefined {
     let enter = typeof visit === 'function' ? visit : visit.enter;
     if (
       type === ALL_EDGE_TYPES &&
@@ -379,23 +384,23 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
   }
 
   filteredTraverse<TValue, TContext>(
-    filter: (NodeId, TraversalActions) => ?TValue,
+    filter: (arg1: NodeId, arg2: TraversalActions) => TValue | null | undefined,
     visit: GraphVisitor<TValue, TContext>,
-    startNodeId: ?NodeId,
+    startNodeId?: NodeId | null,
     type?: TEdgeType | Array<TEdgeType | NullEdgeType> | AllEdgeTypes,
-  ): ?TContext {
+  ): TContext | null | undefined {
     return this.traverse(mapVisitor(filter, visit), startNodeId, type);
   }
 
   traverseAncestors<TContext>(
-    startNodeId: ?NodeId,
+    startNodeId: NodeId | null | undefined,
     visit: GraphVisitor<NodeId, TContext>,
     type:
       | TEdgeType
       | NullEdgeType
       | Array<TEdgeType | NullEdgeType>
       | AllEdgeTypes = NULL_EDGE_TYPE,
-  ): ?TContext {
+  ): TContext | null | undefined {
     return this.dfs({
       visit,
       startNodeId,
@@ -405,8 +410,8 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
 
   dfsFast<TContext>(
     visit: GraphTraversalCallback<NodeId, TContext>,
-    startNodeId: ?NodeId,
-  ): ?TContext {
+    startNodeId?: NodeId | null,
+  ): TContext | null | undefined {
     let traversalStartNode = nullthrows(
       startNodeId ?? this.rootNodeId,
       'A start node is required to traverse',
@@ -437,6 +442,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
 
     let queue = [{nodeId: traversalStartNode, context: null}];
     while (queue.length !== 0) {
+      // @ts-expect-error TS2339
       let {nodeId, context} = queue.pop();
       if (!this.hasNode(nodeId) || visited.has(nodeId)) continue;
       visited.add(nodeId);
@@ -444,7 +450,6 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
       skipped = false;
       let newContext = visit(nodeId, context, actions);
       if (typeof newContext !== 'undefined') {
-        // $FlowFixMe[reassign-const]
         context = newContext;
       }
 
@@ -472,7 +477,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
   // A post-order implementation of dfsFast
   postOrderDfsFast(
     visit: GraphTraversalCallback<NodeId, TraversalActions>,
-    startNodeId: ?NodeId,
+    startNodeId?: NodeId | null,
   ): void {
     let traversalStartNode = nullthrows(
       startNodeId ?? this.rootNodeId,
@@ -542,7 +547,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     visit,
     startNodeId,
     getChildren,
-  }: DFSParams<TContext>): ?TContext {
+  }: DFSParams<TContext>): TContext | null | undefined {
     let traversalStartNode = nullthrows(
       startNodeId ?? this.rootNodeId,
       'A start node is required to traverse',
@@ -578,11 +583,13 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     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;
         }
 
@@ -595,6 +602,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
           return context;
         }
       } else {
+        // @ts-expect-error TS2339
         let {nodeId, context} = command;
         if (!this.hasNode(nodeId) || visited.has(nodeId)) continue;
         visited.add(nodeId);
@@ -603,7 +611,6 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
         if (enter) {
           let newContext = enter(nodeId, context, actions);
           if (typeof newContext !== 'undefined') {
-            // $FlowFixMe[reassign-const]
             context = newContext;
           }
         }
@@ -641,7 +648,9 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     this._visited = visited;
   }
 
-  bfs(visit: (nodeId: NodeId) => ?boolean): ?NodeId {
+  bfs(
+    visit: (nodeId: NodeId) => boolean | null | undefined,
+  ): NodeId | null | undefined {
     let rootNodeId = nullthrows(
       this.rootNodeId,
       'A root node is required to traverse',
@@ -657,6 +666,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
         return node;
       }
 
+      // @ts-expect-error TS2345
       for (let child of this.getNodeIdsConnectedFrom(node)) {
         if (!visited.has(child)) {
           visited.add(child);
@@ -682,7 +692,10 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     return sorted.reverse();
   }
 
-  findAncestor(nodeId: NodeId, fn: (nodeId: NodeId) => boolean): ?NodeId {
+  findAncestor(
+    nodeId: NodeId,
+    fn: (nodeId: NodeId) => boolean,
+  ): NodeId | null | undefined {
     let res = null;
     this.traverseAncestors(nodeId, (nodeId, ctx, traversal) => {
       if (fn(nodeId)) {
@@ -697,7 +710,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     nodeId: NodeId,
     fn: (nodeId: NodeId) => boolean,
   ): Array<NodeId> {
-    let res = [];
+    let res: Array<NodeId> = [];
     this.traverseAncestors(nodeId, (nodeId, ctx, traversal) => {
       if (fn(nodeId)) {
         res.push(nodeId);
@@ -707,7 +720,10 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     return res;
   }
 
-  findDescendant(nodeId: NodeId, fn: (nodeId: NodeId) => boolean): ?NodeId {
+  findDescendant(
+    nodeId: NodeId,
+    fn: (nodeId: NodeId) => boolean,
+  ): NodeId | null | undefined {
     let res = null;
     this.traverse((nodeId, ctx, traversal) => {
       if (fn(nodeId)) {
@@ -722,7 +738,7 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
     nodeId: NodeId,
     fn: (nodeId: NodeId) => boolean,
   ): Array<NodeId> {
-    let res = [];
+    let res: Array<NodeId> = [];
     this.traverse((nodeId, ctx, traversal) => {
       if (fn(nodeId)) {
         res.push(nodeId);
@@ -740,11 +756,21 @@ export default class Graph<TNode, TEdgeType: number = NullEdgeType> {
 }
 
 export function mapVisitor<NodeId, TValue, TContext>(
-  filter: (NodeId, TraversalActions) => ?TValue,
+  filter: (arg1: NodeId, arg2: TraversalActions) => TValue | null | undefined,
   visit: GraphVisitor<TValue, TContext>,
 ): GraphVisitor<NodeId, TContext> {
-  function makeEnter(visit) {
-    return function mappedEnter(nodeId, context, actions) {
+  function makeEnter(
+    visit: (
+      node: TValue,
+      context: TContext | null | undefined,
+      actions: TraversalActions,
+    ) => TContext | null | undefined,
+  ) {
+    return function mappedEnter(
+      nodeId: NodeId,
+      context: TContext | null | undefined,
+      actions: TraversalActions,
+    ) {
       let value = filter(nodeId, actions);
       if (value != null) {
         return visit(value, context, actions);
@@ -756,13 +782,17 @@ export function mapVisitor<NodeId, TValue, TContext>(
     return makeEnter(visit);
   }
 
-  let mapped = {};
+  let mapped: Record<string, any> = {};
   if (visit.enter != null) {
     mapped.enter = makeEnter(visit.enter);
   }
 
   if (visit.exit != null) {
-    mapped.exit = function mappedExit(nodeId, context, actions) {
+    mapped.exit = function mappedExit(
+      nodeId: NodeId,
+      context: TContext | null | undefined,
+      actions: TraversalActions,
+    ) {
       let exit = visit.exit;
       if (!exit) {
         return;

package/src/{index.js → index.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 export type {NodeId, ContentKey, Edge} from './types';
 export type {GraphOpts} from './Graph';
 export type {ContentGraphOpts, SerializedContentGraph} from './ContentGraph';

package/src/{shared-buffer.js → shared-buffer.ts}

@@ -1,8 +1,11 @@
-// @flow
+// flow-to-ts helpers
+export type Class<T> = new (...args: any[]) => T;
+// /flow-to-ts helpers
+
 // Copy from @atlaspack/utils to fix: https://github.com/stackblitz/core/issues/1855
 export let SharedBuffer: Class<ArrayBuffer> | Class<SharedArrayBuffer>;
 
-// $FlowFixMe[prop-missing]
+// @ts-expect-error TS2339
 if (process.browser) {
   SharedBuffer = ArrayBuffer;
   // Safari has removed the constructor
@@ -12,7 +15,7 @@ if (process.browser) {
       // Firefox might throw when sending the Buffer over a MessagePort
       channel.port1.postMessage(new SharedArrayBuffer(0));
       SharedBuffer = SharedArrayBuffer;
-    } catch (_) {
+    } catch (_: any) {
       // NOOP
     }
     channel.port1.close();

package/src/{types.js → types.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 // forcing NodeId to be opaque as it should only be created once
 export type NodeId = number;
 export function toNodeId(x: number): NodeId {
@@ -11,8 +9,8 @@ export function fromNodeId(x: NodeId): number {
 
 export type ContentKey = string;
 
-export type Edge<TEdgeType: number> = {|
-  from: NodeId,
-  to: NodeId,
-  type: TEdgeType,
-|};
+export type Edge<TEdgeType extends number> = {
+  from: NodeId;
+  to: NodeId;
+  type: TEdgeType;
+};