@hpcc-js/util 2.38.0 → 2.42.0

package/src/graph2.ts

@@ -1,9 +1,11 @@
 import { compare2 } from "./array";
 
+type ID = string | number;
+
 class GraphItem<T = any> {
     protected _graph: Graph2;
     _: T;
-    id(): string {
+    id(): ID {
         return this._graph.id(this._);
     }
 
@@ -92,7 +94,7 @@ class Vertex<V = any> extends ChildGraphItem<V> {
         this._inEdges.push(e);
     }
 
-    removeInEdge(id: string) {
+    removeInEdge(id: ID) {
         this._inEdges = this._inEdges.filter(e => e._.id !== id);
     }
 
@@ -104,7 +106,7 @@ class Vertex<V = any> extends ChildGraphItem<V> {
         this._outEdges.push(e);
     }
 
-    removeOutEdge(id: string) {
+    removeOutEdge(id: ID) {
         this._outEdges = this._outEdges.filter(e => e._.id !== id);
     }
 }
@@ -165,14 +167,14 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    _sourceFunc = (_: any): string => typeof _.source === "function" ? _.source() : _.source;
-    sourceFunc(_: (_: E) => string): this {
+    _sourceFunc = (_: any): ID => typeof _.source === "function" ? _.source() : _.source;
+    sourceFunc(_: (_: E) => ID): this {
         this._sourceFunc = _;
         return this;
     }
 
-    _targetFunc = (_: any): string => typeof _.target === "function" ? _.target() : _.target;
-    targetFunc(_: (_: E) => string): this {
+    _targetFunc = (_: any): ID => typeof _.target === "function" ? _.target() : _.target;
+    targetFunc(_: (_: E) => ID): this {
         this._targetFunc = _;
         return this;
     }
@@ -187,7 +189,7 @@ export class Graph2<V = any, E = any, S = any> {
         return this._idFunc(_);
     }
 
-    type(id: string): "S" | "V" | "E" | "" {
+    type(id: ID): "S" | "V" | "E" | "" {
         if (this.subgraphExists(id)) return "S";
         if (this.vertexExists(id)) return "V";
         if (this.edgeExists(id)) return "E";
@@ -210,14 +212,14 @@ export class Graph2<V = any, E = any, S = any> {
         return [...this.allSubgraphs(), ...this.allVertices(), ...this.allEdges()];
     }
 
-    item(id: string): S | V | E | undefined {
+    item(id: ID): S | V | E | undefined {
         if (this.subgraphExists(id)) return this.subgraph(id);
         if (this.vertexExists(id)) return this.vertex(id);
         if (this.edgeExists(id)) return this.edge(id);
         return undefined;
     }
 
-    itemExists(id: string): boolean {
+    itemExists(id: ID): boolean {
         return this.edgeExists(id) || this.vertexExists(id) || this.subgraphExists(id);
     }
 
@@ -240,23 +242,23 @@ export class Graph2<V = any, E = any, S = any> {
         return retVal;
     }
 
-    subgraphExists(id: string): boolean {
+    subgraphExists(id: ID): boolean {
         return !!this._subgraphMap[id];
     }
 
-    subgraph(id: string): S {
+    subgraph(id: ID): S {
         return this._subgraphMap[id]._;
     }
 
-    subgraphSubgraphs(id: string): S[] {
+    subgraphSubgraphs(id: ID): S[] {
         return this._subgraphMap[id].children().filter(child => this.isSubgraph(child._)).map(child => child._);
     }
 
-    subgraphVertices(id: string): V[] {
+    subgraphVertices(id: ID): V[] {
         return this._subgraphMap[id].children().filter(child => this.isVertex(child._)).map(child => child._);
     }
 
-    subgraphEdges(id: string): E[] {
+    subgraphEdges(id: ID): E[] {
         return this._subgraphMap[id].children().filter(child => this.isEdge(child._)).map(child => child._);
     }
 
@@ -289,7 +291,7 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    removeSubgraph(id: string, promoteChildren = true): this {
+    removeSubgraph(id: ID, promoteChildren = true): this {
         const sg = this._subgraphMap[id];
         if (!sg) throw new Error(`Subgraph '${id}' does not exist.`);
         sg.children().forEach(child => {
@@ -307,9 +309,9 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    subgraphParent(id: string): S | undefined;
-    subgraphParent(id: string, parentID: string): this;
-    subgraphParent(id: string, parentID?: string): S | undefined | this {
+    subgraphParent(id: ID): S | undefined;
+    subgraphParent(id: ID, parentID: ID): this;
+    subgraphParent(id: ID, parentID?: ID): S | undefined | this {
         const item = this._subgraphMap[id];
         if (!item) throw new Error(`Subgraph '${id}' does not exist.`);
         if (parentID === void 0) {
@@ -341,11 +343,11 @@ export class Graph2<V = any, E = any, S = any> {
         return retVal;
     }
 
-    vertexExists(id: string): boolean {
+    vertexExists(id: ID): boolean {
         return !!this._vertexMap[id];
     }
 
-    vertex(id: string): V {
+    vertex(id: ID): V {
         return this._vertexMap[id]._;
     }
 
@@ -379,15 +381,15 @@ export class Graph2<V = any, E = any, S = any> {
         return this._vertexMap[vertexID].outEdges().map(e => e._);
     }
 
-    private _neighbors(id: string): Vertex[] {
+    private _neighbors(id: ID): Vertex[] {
         return [...this._vertexMap[id].outEdges().map(e => e._target), ...this._vertexMap[id].inEdges().map(e => e._source)];
     }
 
-    neighbors(id: string): V[] {
+    neighbors(id: ID): V[] {
         return this._neighbors(id).map(n => n._);
     }
 
-    singleNeighbors(id: string): V[] {
+    singleNeighbors(id: ID): V[] {
         return this._neighbors(id).filter(n => n.edgeCount() === 1).map(n => n._);
     }
 
@@ -420,7 +422,7 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    removeVertex(id: string): this {
+    removeVertex(id: ID): this {
         const v = this._vertexMap[id];
         if (!v) throw new Error(`Vertex '${id}' does not exist.`);
         v.edges().forEach(e => {
@@ -430,9 +432,9 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    vertexParent(id: string): S | undefined;
-    vertexParent(id: string, parentID: string): this;
-    vertexParent(id: string, parentID?: string): S | undefined | this {
+    vertexParent(id: ID): S | undefined;
+    vertexParent(id: ID, parentID: ID): this;
+    vertexParent(id: ID, parentID?: ID): S | undefined | this {
         const item = this._vertexMap[id];
         if (!item) throw new Error(`Vertex '${id}' does not exist.`);
         if (parentID === void 0) {
@@ -446,11 +448,11 @@ export class Graph2<V = any, E = any, S = any> {
     }
 
     // Edges  ---
-    edgeExists(id: string): boolean {
+    edgeExists(id: ID): boolean {
         return !!this._edgeMap[id];
     }
 
-    edge(id: string): E {
+    edge(id: ID): E {
         return this._edgeMap[id]._;
     }
 
@@ -489,7 +491,7 @@ export class Graph2<V = any, E = any, S = any> {
         return this;
     }
 
-    removeEdge(id: string): this {
+    removeEdge(id: ID): this {
         const e: Edge<E> = this._edgeMap[id];
         if (!e) throw new Error(`Edge '${id}' does not exist.`);
 
@@ -532,14 +534,14 @@ export class Graph2<V = any, E = any, S = any> {
 
     dijkstra(source: string, target: string): { ids: string[], len: number } {
         const edges = this.allEdges();
-        const Q = new Set<string>();
+        const Q = new Set<string | number>();
         const prev: { [key: string]: string } = {};
         const dist: { [key: string]: number } = {};
         const adj: { [key: string]: { [key: string]: number } } = {};
 
-        function vertex_with_min_dist(Q: Set<string>, dist: { [key: string]: number }) {
+        function vertex_with_min_dist(Q: Set<string | number>, dist: { [key: string]: number }) {
             let min_distance = Infinity;
-            let u: string | null = null;
+            let u: string | number | null = null;
 
             Q.forEach(v => {
                 if (dist[v] < min_distance) {

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/util";
-export declare const PKG_VERSION = "2.38.0";
-export declare const BUILD_VERSION = "2.83.0";
+export declare const PKG_VERSION = "2.42.0";
+export declare const BUILD_VERSION = "2.97.0";
 //# sourceMappingURL=__package__.d.ts.map

package/types/graph2.d.ts

@@ -1,7 +1,8 @@
+declare type ID = string | number;
 declare class GraphItem<T = any> {
     protected _graph: Graph2;
     _: T;
-    id(): string;
+    id(): ID;
     constructor(g: Graph2, _: T);
 }
 declare class ChildGraphItem<S = any> extends GraphItem<S> {
@@ -26,10 +27,10 @@ declare class Vertex<V = any> extends ChildGraphItem<V> {
     edgeCount(): number;
     inEdges(): Edge<any>[];
     addInEdge(e: Edge): void;
-    removeInEdge(id: string): void;
+    removeInEdge(id: ID): void;
     outEdges(): Edge<any>[];
     addOutEdge(e: Edge): void;
-    removeOutEdge(id: string): void;
+    removeOutEdge(id: ID): void;
 }
 declare class Edge<E = any> extends ChildGraphItem<E> {
     _source: Vertex;
@@ -48,57 +49,57 @@ export declare class Graph2<V = any, E = any, S = any> {
     isDirected(): boolean;
     _idFunc: (_: any) => string;
     idFunc(_: (_: S | V | E) => string): this;
-    _sourceFunc: (_: any) => string;
-    sourceFunc(_: (_: E) => string): this;
-    _targetFunc: (_: any) => string;
-    targetFunc(_: (_: E) => string): this;
+    _sourceFunc: (_: any) => ID;
+    sourceFunc(_: (_: E) => ID): this;
+    _targetFunc: (_: any) => ID;
+    targetFunc(_: (_: E) => ID): this;
     _updateFunc: (before: S | V | E, after: S | V | E) => S | V | E;
     updateFunc(_: (before: S | V | E, after: S | V | E) => S | V | E): this;
     id(_: S | V | E): string;
-    type(id: string): "S" | "V" | "E" | "";
+    type(id: ID): "S" | "V" | "E" | "";
     isSubgraph(_: S | V | E): _ is S;
     isVertex(_: S | V | E): _ is V;
     isEdge(_: S | V | E): _ is E;
     allItems(): Array<S | V | E>;
-    item(id: string): S | V | E | undefined;
-    itemExists(id: string): boolean;
+    item(id: ID): S | V | E | undefined;
+    itemExists(id: ID): boolean;
     allSubgraphs(): S[];
     subgraphs(): S[];
-    subgraphExists(id: string): boolean;
-    subgraph(id: string): S;
-    subgraphSubgraphs(id: string): S[];
-    subgraphVertices(id: string): V[];
-    subgraphEdges(id: string): E[];
+    subgraphExists(id: ID): boolean;
+    subgraph(id: ID): S;
+    subgraphSubgraphs(id: ID): S[];
+    subgraphVertices(id: ID): V[];
+    subgraphEdges(id: ID): E[];
     addSubgraph(s: S, parent?: S): this;
     mergeSubgraphs(_subgraphs?: S[]): this;
     updateSubgraph(sg: S): this;
-    removeSubgraph(id: string, promoteChildren?: boolean): this;
-    subgraphParent(id: string): S | undefined;
-    subgraphParent(id: string, parentID: string): this;
+    removeSubgraph(id: ID, promoteChildren?: boolean): this;
+    subgraphParent(id: ID): S | undefined;
+    subgraphParent(id: ID, parentID: ID): this;
     allVertices(): V[];
     vertices(): V[];
-    vertexExists(id: string): boolean;
-    vertex(id: string): V;
+    vertexExists(id: ID): boolean;
+    vertex(id: ID): V;
     allEdges(): E[];
     edges(): E[];
     vertexEdges(vertexID: string): E[];
     inEdges(vertexID: string): E[];
     outEdges(vertexID: string): E[];
     private _neighbors;
-    neighbors(id: string): V[];
-    singleNeighbors(id: string): V[];
+    neighbors(id: ID): V[];
+    singleNeighbors(id: ID): V[];
     addVertex(v: V, parent?: S): this;
     mergeVertices(_vertices: V[]): this;
     updateVertex(v: V): this;
-    removeVertex(id: string): this;
-    vertexParent(id: string): S | undefined;
-    vertexParent(id: string, parentID: string): this;
-    edgeExists(id: string): boolean;
-    edge(id: string): E;
+    removeVertex(id: ID): this;
+    vertexParent(id: ID): S | undefined;
+    vertexParent(id: ID, parentID: ID): this;
+    edgeExists(id: ID): boolean;
+    edge(id: ID): E;
     addEdge(e: E, parent?: S): this;
     mergeEdges(_edges: E[]): this;
     updateEdge(e: E): this;
-    removeEdge(id: string): this;
+    removeEdge(id: ID): this;
     protected _hwalk(item: Subgraph<S> | Vertex<V>, formatter: HierarchyFormatter<V, S>): object;
     hierarchy(formatter: HierarchyFormatter<V, S>): object[];
     dijkstra(source: string, target: string): {

package/types/graph2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph2.d.ts","sourceRoot":"","sources":["../src/graph2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph2.d.ts","sourceRoot":"","sources":["../src/graph2.ts"],"names":[],"mappings":"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"}

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/util";
-export declare const PKG_VERSION = "2.38.0";
-export declare const BUILD_VERSION = "2.83.0";
+export declare const PKG_VERSION = "2.42.0";
+export declare const BUILD_VERSION = "2.97.0";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/graph2.d.ts

@@ -1,7 +1,8 @@
+declare type ID = string | number;
 declare class GraphItem<T = any> {
     protected _graph: Graph2;
     _: T;
-    id(): string;
+    id(): ID;
     constructor(g: Graph2, _: T);
 }
 declare class ChildGraphItem<S = any> extends GraphItem<S> {
@@ -26,10 +27,10 @@ declare class Vertex<V = any> extends ChildGraphItem<V> {
     edgeCount(): number;
     inEdges(): Edge<any>[];
     addInEdge(e: Edge): void;
-    removeInEdge(id: string): void;
+    removeInEdge(id: ID): void;
     outEdges(): Edge<any>[];
     addOutEdge(e: Edge): void;
-    removeOutEdge(id: string): void;
+    removeOutEdge(id: ID): void;
 }
 declare class Edge<E = any> extends ChildGraphItem<E> {
     _source: Vertex;
@@ -48,57 +49,57 @@ export declare class Graph2<V = any, E = any, S = any> {
     isDirected(): boolean;
     _idFunc: (_: any) => string;
     idFunc(_: (_: S | V | E) => string): this;
-    _sourceFunc: (_: any) => string;
-    sourceFunc(_: (_: E) => string): this;
-    _targetFunc: (_: any) => string;
-    targetFunc(_: (_: E) => string): this;
+    _sourceFunc: (_: any) => ID;
+    sourceFunc(_: (_: E) => ID): this;
+    _targetFunc: (_: any) => ID;
+    targetFunc(_: (_: E) => ID): this;
     _updateFunc: (before: S | V | E, after: S | V | E) => S | V | E;
     updateFunc(_: (before: S | V | E, after: S | V | E) => S | V | E): this;
     id(_: S | V | E): string;
-    type(id: string): "S" | "V" | "E" | "";
+    type(id: ID): "S" | "V" | "E" | "";
     isSubgraph(_: S | V | E): _ is S;
     isVertex(_: S | V | E): _ is V;
     isEdge(_: S | V | E): _ is E;
     allItems(): Array<S | V | E>;
-    item(id: string): S | V | E | undefined;
-    itemExists(id: string): boolean;
+    item(id: ID): S | V | E | undefined;
+    itemExists(id: ID): boolean;
     allSubgraphs(): S[];
     subgraphs(): S[];
-    subgraphExists(id: string): boolean;
-    subgraph(id: string): S;
-    subgraphSubgraphs(id: string): S[];
-    subgraphVertices(id: string): V[];
-    subgraphEdges(id: string): E[];
+    subgraphExists(id: ID): boolean;
+    subgraph(id: ID): S;
+    subgraphSubgraphs(id: ID): S[];
+    subgraphVertices(id: ID): V[];
+    subgraphEdges(id: ID): E[];
     addSubgraph(s: S, parent?: S): this;
     mergeSubgraphs(_subgraphs?: S[]): this;
     updateSubgraph(sg: S): this;
-    removeSubgraph(id: string, promoteChildren?: boolean): this;
-    subgraphParent(id: string): S | undefined;
-    subgraphParent(id: string, parentID: string): this;
+    removeSubgraph(id: ID, promoteChildren?: boolean): this;
+    subgraphParent(id: ID): S | undefined;
+    subgraphParent(id: ID, parentID: ID): this;
     allVertices(): V[];
     vertices(): V[];
-    vertexExists(id: string): boolean;
-    vertex(id: string): V;
+    vertexExists(id: ID): boolean;
+    vertex(id: ID): V;
     allEdges(): E[];
     edges(): E[];
     vertexEdges(vertexID: string): E[];
     inEdges(vertexID: string): E[];
     outEdges(vertexID: string): E[];
     private _neighbors;
-    neighbors(id: string): V[];
-    singleNeighbors(id: string): V[];
+    neighbors(id: ID): V[];
+    singleNeighbors(id: ID): V[];
     addVertex(v: V, parent?: S): this;
     mergeVertices(_vertices: V[]): this;
     updateVertex(v: V): this;
-    removeVertex(id: string): this;
-    vertexParent(id: string): S | undefined;
-    vertexParent(id: string, parentID: string): this;
-    edgeExists(id: string): boolean;
-    edge(id: string): E;
+    removeVertex(id: ID): this;
+    vertexParent(id: ID): S | undefined;
+    vertexParent(id: ID, parentID: ID): this;
+    edgeExists(id: ID): boolean;
+    edge(id: ID): E;
     addEdge(e: E, parent?: S): this;
     mergeEdges(_edges: E[]): this;
     updateEdge(e: E): this;
-    removeEdge(id: string): this;
+    removeEdge(id: ID): this;
     protected _hwalk(item: Subgraph<S> | Vertex<V>, formatter: HierarchyFormatter<V, S>): object;
     hierarchy(formatter: HierarchyFormatter<V, S>): object[];
     dijkstra(source: string, target: string): {