@peerbit/test-utils 3.1.44 → 3.1.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"log-utils.d.ts","sourceRoot":"","sources":["../../src/log-utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,GAC5B,cAAc;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,EACnD,qBAAoB,MAAmB,SAsDvC,CAAC"}
1
+ {"version":3,"file":"log-utils.d.ts","sourceRoot":"","sources":["../../src/log-utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB,GAC5B,cAAc;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,EACnD,qBAAoB,MAAmB,SAwEvC,CAAC"}
@@ -1,5 +1,6 @@
1
1
  /* eslint-disable no-console */
2
- import Table from "tty-table";
2
+ import Table from "cli-table3";
3
+ import wrapAnsi from "wrap-ansi";
3
4
  export const printMemoryUsage = (memoryUsages, progressColumnName = "progress") => {
4
5
  // do ascii graph
5
6
  let max = Math.max(...memoryUsages.map((x) => x.value));
@@ -17,7 +18,7 @@ export const printMemoryUsage = (memoryUsages, progressColumnName = "progress")
17
18
  }).join("");
18
19
  });
19
20
  console.log("Memory Usage Graph");
20
- // do a nicely tty-table formatted table with "Memory ascii", "Memory bytes (mb)", "# of inserts".
21
+ // Format the memory graph, megabytes and progress as a terminal table.
21
22
  const colorString = (bytes, string) => {
22
23
  // color encode byte values so that the highest get red color and lowest get green color
23
24
  // and values in between get a color in in shades of red and green
@@ -31,18 +32,34 @@ export const printMemoryUsage = (memoryUsages, progressColumnName = "progress")
31
32
  let color = colors[bucket];
32
33
  return `\x1b[${color}m${string}\x1b[0m`;
33
34
  };
34
- let table = Table([
35
- { value: "Memory usage (*)", width: steps + 2, align: "left" },
36
- { value: "Memory bytes (mb)" },
37
- { value: progressColumnName },
38
- ], lines.map((line, i) => {
39
- return [
40
- { value: colorString(memoryUsages[i].value, line) },
41
- { value: Math.round(memoryUsages[i].value / 1e6) },
42
- { value: memoryUsages[i].progress /* insertBatchSize * (i + 1) */ },
43
- ];
44
- }));
45
- console.log(table.render());
35
+ const requestedColumns = process.stdout.columns || Number(process.env.COLUMNS) || 80;
36
+ const columns = Number.isFinite(requestedColumns) && requestedColumns > 0
37
+ ? Math.floor(requestedColumns)
38
+ : 80;
39
+ // Reserve borders and padding, with at least two display columns per cell.
40
+ const contentColumns = Math.max(6, columns - 10);
41
+ const numericColumns = Math.min(18, Math.floor(contentColumns / 3));
42
+ const progressColumns = Math.min(16, Math.floor(contentColumns / 3));
43
+ const contentWidths = [
44
+ Math.min(steps, contentColumns - numericColumns - progressColumns),
45
+ numericColumns,
46
+ progressColumns,
47
+ ];
48
+ const wrap = (value, index) => wrapAnsi(String(value), contentWidths[index], { hard: true, trim: false });
49
+ const table = new Table({
50
+ head: ["Memory usage (*)", "Memory bytes (mb)", progressColumnName].map(wrap),
51
+ colWidths: contentWidths.map((width) => width + 2),
52
+ colAligns: ["left", "center", "center"],
53
+ style: { head: ["yellow"], border: [] },
54
+ });
55
+ for (const [i, line] of lines.entries()) {
56
+ table.push([
57
+ colorString(memoryUsages[i].value, line),
58
+ Math.round(memoryUsages[i].value / 1e6),
59
+ memoryUsages[i].progress,
60
+ ].map(wrap));
61
+ }
62
+ console.log(table.toString());
46
63
  console.log("Max memory usage", Math.round(max / 1e6), "mb");
47
64
  console.log("Min memory usage", Math.round(min / 1e6), "mb");
48
65
  };
@@ -1 +1 @@
1
- {"version":3,"file":"log-utils.js","sourceRoot":"","sources":["../../src/log-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log-utils.js","sourceRoot":"","sources":["../../src/log-utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@peerbit/test-utils",
3
- "version": "3.1.44",
3
+ "version": "3.1.47",
4
4
  "description": "Test utils for Peerbit",
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -72,20 +72,21 @@
72
72
  "@chainsafe/libp2p-yamux": "^8.0.1",
73
73
  "@libp2p/interface": "^3.2.5",
74
74
  "@multiformats/multiaddr": "^13.0.3",
75
+ "cli-table3": "^0.6.5",
75
76
  "it-pushable": "^3.1.4",
76
77
  "libp2p": "^3.3.8",
77
78
  "libsodium-wrappers": "^0.7.15",
78
- "tty-table": "^4.2.1",
79
- "@peerbit/indexer-interface": "3.1.0",
79
+ "wrap-ansi": "^8.1.0",
80
80
  "@peerbit/any-store": "2.2.17",
81
- "@peerbit/crypto": "3.1.6",
82
- "@peerbit/blocks": "4.3.2",
81
+ "@peerbit/blocks": "4.3.3",
82
+ "@peerbit/indexer-interface": "3.1.0",
83
83
  "@peerbit/keychain": "1.2.17",
84
- "@peerbit/program": "6.0.63",
85
- "@peerbit/stream": "5.2.3",
86
- "@peerbit/pubsub": "5.4.8",
87
- "@peerbit/libp2p-test-utils": "3.0.10",
88
- "peerbit": "5.4.5"
84
+ "@peerbit/crypto": "3.1.6",
85
+ "@peerbit/pubsub": "5.4.11",
86
+ "@peerbit/libp2p-test-utils": "3.0.11",
87
+ "@peerbit/stream": "5.2.4",
88
+ "@peerbit/program": "6.0.66",
89
+ "peerbit": "5.4.8"
89
90
  },
90
91
  "devDependencies": {
91
92
  "@types/libsodium-wrappers": "^0.7.14",
package/src/log-utils.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  /* eslint-disable no-console */
2
- import Table from "tty-table";
2
+ import Table from "cli-table3";
3
+ import wrapAnsi from "wrap-ansi";
3
4
 
4
5
  export const printMemoryUsage = (
5
6
  memoryUsages: { value: number; progress: number }[],
@@ -23,7 +24,7 @@ export const printMemoryUsage = (
23
24
 
24
25
  console.log("Memory Usage Graph");
25
26
 
26
- // do a nicely tty-table formatted table with "Memory ascii", "Memory bytes (mb)", "# of inserts".
27
+ // Format the memory graph, megabytes and progress as a terminal table.
27
28
 
28
29
  const colorString = (bytes: number, string: string) => {
29
30
  // color encode byte values so that the highest get red color and lowest get green color
@@ -39,22 +40,40 @@ export const printMemoryUsage = (
39
40
  return `\x1b[${color}m${string}\x1b[0m`;
40
41
  };
41
42
 
42
- let table = Table(
43
- [
44
- { value: "Memory usage (*)", width: steps + 2, align: "left" },
45
- { value: "Memory bytes (mb)" },
46
- { value: progressColumnName },
47
- ],
48
- lines.map((line, i) => {
49
- return [
50
- { value: colorString(memoryUsages[i].value, line) },
51
- { value: Math.round(memoryUsages[i].value / 1e6) },
52
- { value: memoryUsages[i].progress /* insertBatchSize * (i + 1) */ },
53
- ];
54
- }),
55
- );
43
+ const requestedColumns =
44
+ process.stdout.columns || Number(process.env.COLUMNS) || 80;
45
+ const columns =
46
+ Number.isFinite(requestedColumns) && requestedColumns > 0
47
+ ? Math.floor(requestedColumns)
48
+ : 80;
49
+ // Reserve borders and padding, with at least two display columns per cell.
50
+ const contentColumns = Math.max(6, columns - 10);
51
+ const numericColumns = Math.min(18, Math.floor(contentColumns / 3));
52
+ const progressColumns = Math.min(16, Math.floor(contentColumns / 3));
53
+ const contentWidths = [
54
+ Math.min(steps, contentColumns - numericColumns - progressColumns),
55
+ numericColumns,
56
+ progressColumns,
57
+ ];
58
+ const wrap = (value: string | number, index: number) =>
59
+ wrapAnsi(String(value), contentWidths[index], { hard: true, trim: false });
60
+ const table = new Table({
61
+ head: ["Memory usage (*)", "Memory bytes (mb)", progressColumnName].map(wrap),
62
+ colWidths: contentWidths.map((width) => width + 2),
63
+ colAligns: ["left", "center", "center"],
64
+ style: { head: ["yellow"], border: [] },
65
+ });
66
+ for (const [i, line] of lines.entries()) {
67
+ table.push(
68
+ [
69
+ colorString(memoryUsages[i].value, line),
70
+ Math.round(memoryUsages[i].value / 1e6),
71
+ memoryUsages[i].progress,
72
+ ].map(wrap),
73
+ );
74
+ }
56
75
 
57
- console.log(table.render());
76
+ console.log(table.toString());
58
77
  console.log("Max memory usage", Math.round(max / 1e6), "mb");
59
78
  console.log("Min memory usage", Math.round(min / 1e6), "mb");
60
79
  };