@kaynooo/cli-git 0.18.0 → 0.18.1

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.
package/dist/gb.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gc.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gcl.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gd.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
@@ -2638,6 +2649,7 @@ var OPTIONS = {
2638
2649
  staged: { type: "boolean", short: "s", description: "only what is staged" },
2639
2650
  ref: { type: "string", description: "compare to this commit, branch or tag, or a..b, instead of the index" },
2640
2651
  patch: { type: "boolean", short: "p", description: "print the patch of every file listed, not just of the paths given" },
2652
+ stat: { type: "boolean", description: "list the files with their added and removed lines, the paths given too, never a patch" },
2641
2653
  json: jsonOption("[{title, files: [{path, added, removed}], patch?}] per section, added and removed being null for a binary file, patch there with paths or --patch, the files then those of the paths")
2642
2654
  };
2643
2655
  var LITERAL = { ...process24.env, GIT_LITERAL_PATHSPECS: "1" };
@@ -2693,10 +2705,12 @@ async function main(argv) {
2693
2705
  badUsage(`--ref takes a commit, branch or tag, not ${values.ref}`);
2694
2706
  if (values.ref !== undefined && values.staged === true)
2695
2707
  badUsage("--ref and --staged exclude each other: --ref compares the working tree");
2708
+ if (values.stat === true && values.patch === true)
2709
+ badUsage("--stat and --patch exclude each other");
2696
2710
  if (await toplevelOf(".") === undefined)
2697
2711
  fail("not inside a git repository", 2);
2698
2712
  const wanted = sections(values);
2699
- const patched = positionals.length > 0 || values.patch === true;
2713
+ const patched = (positionals.length > 0 || values.patch === true) && values.stat !== true;
2700
2714
  if (values.json === true) {
2701
2715
  printJson(await Promise.all(wanted.map(async ({ title, args }) => ({
2702
2716
  title,
@@ -2710,7 +2724,7 @@ async function main(argv) {
2710
2724
  await show(patches.join(""));
2711
2725
  return 0;
2712
2726
  }
2713
- const found = await Promise.all(wanted.map(async (each) => ({ ...each, files: parseNumstat(await diff([...each.args, "--numstat", "-z"], [])) })));
2727
+ const found = await Promise.all(wanted.map(async (each) => ({ ...each, files: parseNumstat(await diff([...each.args, "--numstat", "-z"], positionals)) })));
2714
2728
  const { dim } = paint(process24.stdout);
2715
2729
  const green = role("ok", process24.stdout);
2716
2730
  const red = role("problem", process24.stdout);
package/dist/gf.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gm.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gp.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gst.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/dist/gu.js CHANGED
@@ -652,21 +652,32 @@ function wholeNumber(value, name, fallback, min = 1) {
652
652
  badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
653
653
  return number;
654
654
  }
655
+ function durationMs(text, unit) {
656
+ if (BARE_DURATION.test(text))
657
+ return Number(text) * UNIT_MS[unit];
658
+ if (!DURATION.test(text))
659
+ return 0;
660
+ let ms = 0;
661
+ for (const [, amount, part] of text.matchAll(DURATION_PART))
662
+ ms += Number(amount) * UNIT_MS[part];
663
+ return ms;
664
+ }
655
665
  function duration(value, name, fallback, unit = "s") {
656
666
  if (value === undefined)
657
667
  return fallback;
658
- const match = DURATION.exec(value.trim());
659
- const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
668
+ const ms = durationMs(value.trim(), unit);
660
669
  if (ms < 1)
661
670
  badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
662
671
  return ms;
663
672
  }
664
- var WHOLE, DURATION, UNIT_MS;
673
+ var WHOLE, BARE_DURATION, DURATION, DURATION_PART, UNIT_MS;
665
674
  var init_input = __esm(() => {
666
675
  init_args();
667
676
  WHOLE = /^\d+$/;
668
- DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
669
- UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
677
+ BARE_DURATION = /^\d+(?:\.\d+)?$/;
678
+ DURATION = /^(?:\d+(?:\.\d+)?(?:ms|min|[smhd]))+$/;
679
+ DURATION_PART = /(\d+(?:\.\d+)?)(ms|min|[smhd])/g;
680
+ UNIT_MS = { ms: 1, s: 1000, m: 60000, min: 60000, h: 3600000, d: 86400000 };
670
681
  });
671
682
 
672
683
  // ../kit/src/args.ts
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@kaynooo/cli-git",
3
3
  "type": "module",
4
- "version": "0.18.0",
4
+ "version": "0.18.1",
5
5
  "description": "gst, gc, gb, gp, gf, gm, gcl, gd and gu: a repository's state in one call, a commit of exactly the paths given, its message checked before anything is staged, a branch picked, nested repositories pushed or fetched, a branch merged with its conflicts listed, a clone into the workspace, the changes per file and an undo that keeps what it takes away.",
6
6
  "author": "Kaynooo <contact@kaynooo.fr>",
7
7
  "license": "MIT",
@@ -56,6 +56,6 @@
56
56
  "gu": "$npm_execpath src/gu.ts"
57
57
  },
58
58
  "devDependencies": {
59
- "@kaynooo/cli-kit": "0.46.1"
59
+ "@kaynooo/cli-kit": "0.46.2"
60
60
  }
61
61
  }