dagre-compound - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12-beta.0

dist/types/core/config.d.ts

@@ -0,4 +1,4 @@
+import { LayoutConfig } from '../interfaces/layout';
 import { DeepPartial } from './util';
-import { LayoutConfig } from '../interfaces/layout';
 export declare const LAYOUT_CONFIG: LayoutConfig;
 export declare function mergeConfig(config?: DeepPartial<LayoutConfig>, source?: LayoutConfig): LayoutConfig;

dist/types/core/graph.d.ts

@@ -1,8 +0,9 @@
-import { graphlib } from 'dagre';
+import { Edge, graphlib } from 'dagre';
+import { SafeAny } from '../interfaces/any';
+import { AttrDef, BaseEdge, GraphDef, GroupNode, IGraphLabel, InclusionType, MetaEdge, MetaNode, Node, NodeDef, NodeInputDef, NodeType } from '../interfaces/graph';
 import { Hierarchy } from './hierarchy';
-import { AttrDef, InclusionType, NodeDef, NodeInputDef, NodeType, Node, BaseEdge, GraphDef, MetaNode, GroupNode, MetaEdge } from '../interfaces/graph';
 export declare class BaseNode implements NodeDef, Node {
     attr: AttrDef;
     inputs: NodeInputDef[];
-    name: any;
+    name: SafeAny;
     cardinality: number;
@@ -13,3 +14,3 @@ include: InclusionType;
     type: NodeType;
-    path: any[];
+    path: SafeAny[];
     width?: number;
@@ -30,3 +31,3 @@ height?: number;
     attr: AttrDef;
-    bridgeGraph: graphlib.Graph<GroupNode | BaseNode, MetaEdge>;
+    bridgeGraph: graphlib.Graph<GroupNode | BaseNode>;
     cardinality: number;
@@ -36,11 +37,11 @@ depth: number;
     isGroupNode: boolean;
-    metaGraph: graphlib.Graph<GroupNode | BaseNode, MetaEdge>;
+    metaGraph: graphlib.Graph<GroupNode | BaseNode>;
     name: string;
     parentNode: Node;
     type: NodeType;
-    path: any[];
+    path: SafeAny[];
     constructor(name: string, opt?: {});
     getFirstChild(): GroupNode | BaseNode;
     getChildren(): Array<GroupNode | BaseNode>;
-    leaves(): any[];
+    leaves(): SafeAny[];
 }
@@ -50,3 +51,7 @@ export declare class MetaEdgeImpl implements MetaEdge {
     w: string;
-    baseEdgeList: BaseEdge[];
+    baseEdgeList: Edge[];
+    points: Array<{
+        x: number;
+        y: number;
+    }>;
     inbound: boolean;
@@ -59,2 +64,2 @@ name: string;
 export declare function createMetaEdge(v: string, w: string): MetaEdge;
-export declare function createGraph<N, E>(name: string, type: string | number, opt?: graphlib.GraphOptions): graphlib.Graph<N, E>;
+export declare function createGraph<N>(name: string, type: string | number, opt?: IGraphLabel): graphlib.Graph<N>;

dist/types/core/hierarchy.d.ts

@@ -1,10 +0,11 @@
-import { BaseNode, SlimGraph } from './graph';
 import { graphlib } from 'dagre';
+import { SafeAny } from '../interfaces/any';
+import { GroupNode, IGraphLabel, MetaEdge, MetaNode } from '../interfaces/graph';
 import { HierarchyParams } from '../interfaces/hierarchy';
-import { GroupNode, MetaEdge, MetaNode } from '../interfaces/graph';
+import { BaseNode, SlimGraph } from './graph';
 export declare class Hierarchy {
-    graphOptions: graphlib.GraphOptions;
+    graphOptions: IGraphLabel;
     private readonly index;
     root: MetaNode;
-    constructor(graphOptions?: graphlib.GraphOptions);
+    constructor(graphOptions?: IGraphLabel);
     getNodeMap(): {
@@ -14,4 +15,4 @@ [nodeName: string]: GroupNode | BaseNode;
     node(name: string): GroupNode | BaseNode;
-    setNode(name: any, node: GroupNode | BaseNode): void;
-    getBridgeGraph(nodeName: string): graphlib.Graph<GroupNode | BaseNode, MetaEdge> | null;
+    setNode(name: SafeAny, node: GroupNode | BaseNode): void;
+    getBridgeGraph(nodeName: string): graphlib.Graph<GroupNode | BaseNode> | null;
     getChildName(nodeName: string, descendantName: string): string;
@@ -18,0 +19,0 @@ getPredecessors(nodeName: string): MetaEdge[];

dist/types/core/layout.d.ts

@@ -0,4 +1,4 @@
+import { LayoutConfig } from '../interfaces/layout';
 import { RenderGroupNodeInfo, RenderNodeInfo } from './render-info';
 import { DeepPartial } from './util';
-import { LayoutConfig } from '../interfaces/layout';
 export declare function layoutScene(renderNodeInfo: RenderGroupNodeInfo, setting?: DeepPartial<LayoutConfig>): void;
@@ -5,0 +5,0 @@ export declare function layoutChildren(renderNodeInfo: RenderGroupNodeInfo, setting?: DeepPartial<LayoutConfig>): void;

dist/types/core/render-info.d.ts

@@ -1,5 +0,6 @@
-import { Hierarchy } from './hierarchy';
 import { graphlib } from 'dagre';
-import { Node, GroupNode, AttrDef, MetaEdge } from '../interfaces/graph';
+import { SafeAny } from '../interfaces/any';
+import { AttrDef, GroupNode, IGraphLabel, MetaEdge, Node } from '../interfaces/graph';
 import { Point } from '../interfaces/layout';
+import { Hierarchy } from './hierarchy';
 export declare class RenderGraphInfo {
@@ -39,3 +40,3 @@ hierarchy: Hierarchy;
     paddingBottom: number;
-    displayName: any;
+    displayName: SafeAny;
     attr: AttrDef;
@@ -52,5 +53,5 @@ constructor(node: T);
 export declare class RenderGroupNodeInfo extends RenderNodeInfo<GroupNode> {
-    coreGraph: graphlib.Graph<RenderNodeInfo, RenderMetaEdgeInfo>;
-    constructor(groupNode: GroupNode, graphOptions: graphlib.GraphOptions);
+    coreGraph: graphlib.Graph<RenderNodeInfo>;
+    constructor(groupNode: GroupNode, graphOptions: IGraphLabel);
 }
 export declare function buildRenderInfo(graphHierarchy: Hierarchy): RenderGraphInfo;

dist/types/dagre-compound.d.ts

@@ -1,2 +0,1 @@
-/// <reference path="types/dagre.d.ts" />
 import { DeepPartial } from './core/util';
@@ -3,0 +2,0 @@ import { HierarchyBaseEdgeInfo, HierarchyBaseNodeInfo, HierarchyFlattenedGraphInfo, HierarchyGraphDef, HierarchyGraphEdgeDef, HierarchyGraphNodeInfo, HierarchyGraphOption } from './interfaces/hierarchy';

dist/types/interfaces/graph.d.ts

@@ -0,4 +1,14 @@
+import { Edge, GraphEdge, GraphLabel, graphlib } from 'dagre';
 import { BaseNode } from '../core/graph';
-import { graphlib } from 'dagre';
 import { Hierarchy } from '../core/hierarchy';
+import { SafeAny } from './any';
+export interface GraphOptions {
+    directed?: boolean | undefined;
+    multigraph?: boolean | undefined;
+    compound?: boolean | undefined;
+}
+export interface IGraphLabel extends GraphLabel {
+    name?: string;
+    type?: string | number;
+}
 export declare enum NodeType {
@@ -23,5 +33,5 @@ META = 0,
 export interface NodeDef {
-    name: any;
+    name: SafeAny;
     inputs: NodeInputDef[];
-    path: any[];
+    path: SafeAny[];
     attr?: AttrDef;
@@ -32,11 +42,11 @@ width?: number;
 export interface NodeInputDef {
-    name: any;
+    name: SafeAny;
     attr?: AttrDef;
 }
 export interface AttrDef {
-    [key: string]: any;
+    [key: string]: SafeAny;
 }
 export interface BaseEdge {
-    w: any;
-    v: any;
+    w: SafeAny;
+    v: SafeAny;
     name?: string;
@@ -48,4 +58,4 @@ }
 export interface Node {
-    name: any;
-    path?: any[];
+    name: SafeAny;
+    path?: SafeAny[];
     type: NodeType;
@@ -62,8 +72,8 @@ isGroupNode: boolean;
     depth: number;
-    path: any[];
+    path: SafeAny[];
     getFirstChild(): GroupNode | Node;
     getChildren(): Array<GroupNode | BaseNode>;
-    leaves(): any[];
+    leaves(): SafeAny[];
 }
-export interface MetaEdge extends graphlib.EdgeObject {
+export interface MetaEdge extends Edge, GraphEdge {
     baseEdgeList: BaseEdge[];
@@ -74,4 +84,4 @@ inbound?: boolean;
 export interface GroupNode extends Node {
-    metaGraph: graphlib.Graph<GroupNode | BaseNode, MetaEdge>;
-    bridgeGraph: graphlib.Graph<GroupNode | BaseNode, MetaEdge>;
+    metaGraph: graphlib.Graph<GroupNode | BaseNode>;
+    bridgeGraph: graphlib.Graph<GroupNode | BaseNode>;
 }

dist/types/interfaces/hierarchy.d.ts

@@ -0,1 +1,2 @@
+import { SafeAny } from './any';
 import { Align, RankDir } from './common';
@@ -17,15 +18,15 @@ import { AttrDef, BaseEdge } from './graph';
 export interface HierarchyGraphNodeDef {
-    id: any;
+    id: SafeAny;
     width?: number;
     height?: number;
-    [key: string]: any;
+    [key: string]: SafeAny;
 }
 export interface HierarchyGraphEdgeDef {
-    v: any;
-    w: any;
+    v: SafeAny;
+    w: SafeAny;
     weight?: number;
-    [key: string]: any;
+    [key: string]: SafeAny;
 }
 export interface HierarchyGraphCompoundDef {
-    [parent: string]: any[];
+    [parent: string]: SafeAny[];
 }
@@ -38,3 +39,3 @@ export interface HierarchyGraphDef {
 export interface HierarchyBaseNodeInfo {
-    id: any;
+    id: SafeAny;
     name: string;
@@ -61,4 +62,4 @@ type: HierarchyNodeType | number;
     paddingBottom: number;
-    path?: any[];
-    [key: string]: any;
+    path?: SafeAny[];
+    [key: string]: SafeAny;
 }
@@ -80,3 +81,3 @@ export interface HierarchyBaseEdgeInfo {
     parentNodeName?: string | null;
-    [key: string]: any;
+    [key: string]: SafeAny;
 }
@@ -83,0 +84,0 @@ export interface HierarchyGraphNodeInfo extends HierarchyBaseNodeInfo {

dist/types/public-api.d.ts

 export { LAYOUT_CONFIG, mergeConfig } from './core/config';
 export { DeepPartial } from './core/util';
+export * from './dagre-compound';
 export * from './interfaces/common';
@@ -7,2 +8,1 @@ export * from './interfaces/graph';
 export * from './interfaces/layout';
-export * from './dagre-compound';

package.json

 {
   "name": "dagre-compound",
-  "version": "0.0.11",
+  "version": "0.0.12-beta.0",
   "description": "A multi-level compound graph layout library based on dagre",
@@ -31,3 +31,5 @@ "keywords": [
   "scripts": {
-    "lint": "tslint  --project tsconfig.json -t codeFrame 'src/**/*.ts' 'test-data/**/*.ts' --fix",
+    "format": "prettier --config .prettierrc.js --check \"src/**/*.ts\"",
+    "lint": "eslint --cache --ext .ts src/",
+    "lint:fix": "eslint --fix --cache src/ --ext .ts",
     "prebuild": "rimraf dist",
@@ -45,10 +47,12 @@ "doc": "typedoc --out docs --target es6 --theme minimal --mode file src",
     "semantic-release-prepare": "ts-node tools/semantic-release-prepare",
-    "precommit": "lint-staged",
+    "pre-commit": "lint-staged",
     "travis-deploy-once": "travis-deploy-once",
-    "commitmsg": "commitlint -E HUSKY_GIT_PARAMS"
+    "commitmsg": "commitlint -E HUSKY_GIT_PARAMS",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "{src,test}/**/*.ts": [
-      "./node_modules/.bin/prettier --write",
-      "git add"
+      "./node_modules/.bin/prettier --config .prettierrc.js --write \"src/**/*.ts\"",
+      "eslint --fix",
+      "git add ."
     ]
@@ -92,6 +96,2 @@ },
   },
-  "prettier": {
-    "semi": true,
-    "singleQuote": true
-  },
   "commitlint": {
@@ -103,5 +103,6 @@ "extends": [
   "devDependencies": {
-    "@commitlint/cli": "^7.1.2",
-    "@commitlint/config-conventional": "^7.1.2",
+    "@commitlint/cli": "^7.6.1",
+    "@commitlint/config-conventional": "^7.6.0",
     "@rollup/plugin-typescript": "^8.1.0",
+    "@types/dagre": "^0.7.48",
     "@types/jest": "^23.3.2",
@@ -112,2 +113,4 @@ "@types/lodash.camelcase": "^4.3.6",
     "@types/rollup-plugin-sourcemaps": "^0.4.2",
+    "@typescript-eslint/eslint-plugin": "^5.14.0",
+    "@typescript-eslint/parser": "^5.14.0",
     "colors": "^1.3.2",
@@ -118,3 +121,7 @@ "commitizen": "^3.0.0",
     "cz-conventional-changelog": "^2.1.0",
-    "husky": "^1.0.1",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "husky": "^7.0.4",
     "jest": "^23.6.0",
@@ -124,3 +131,3 @@ "jest-config": "^23.6.0",
     "lodash.camelcase": "^4.3.0",
-    "prettier": "^1.14.3",
+    "prettier": "2.5.1",
     "prompt": "^1.0.0",
@@ -140,5 +147,2 @@ "replace-in-file": "^3.4.2",
     "ts-node": "^7.0.1",
-    "tslint": "^5.20.1",
-    "tslint-config-prettier": "^1.15.0",
-    "tslint-config-standard": "^8.0.1",
     "typedoc": "^0.19.2",
@@ -148,4 +152,5 @@ "typescript": "^4.0.5"
   "peerDependencies": {
-    "dagre": "^0.8.5"
+    "dagre": "^0.8.5",
+    "@types/dagre": "^0.7.48"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

1157870

increased by3.72%

Number of package files

34

increased by70%

Lines of code

1442

increased by34.01%

Worsened metrics

Dependency count

2

increased by100%

Dev dependency count

42

increased by10.53%

No dependency changes