Merge pull request #226 from JarvusInnovations/develop

Release: v2.2.0

Author: themightychris

.github/workflows/rust-core.yml

@@ -31,17 +31,6 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      # The transaction tests commit to throwaway gix repos; gix's update_ref
-      # writes a reflog entry, which needs a committer identity from git config.
-      # CI runners have none configured, so without this the reflog write fails
-      # ("The reflog could not be created or updated"). Mirrors hologit's own
-      # holo-tree-napi.yml. (Upstream follow-up: holo-tree's update_ref should
-      # use the commit's identity for the reflog instead of ambient git config.)
-      - name: Configure git identity (commit-bearing tests write reflogs)
-        run: |
-          git config --global user.name "gitsheets CI"
-          git config --global user.email "ci@gitsheets.local"
-
       - uses: dtolnay/rust-toolchain@stable
 
       - uses: Swatinem/rust-cache@v2
@@ -79,13 +68,6 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      # Same reflog-identity requirement as the core job (the Sheet/Transaction
-      # boundary tests commit to scratch repos).
-      - name: Configure git identity (commit-bearing tests write reflogs)
-        run: |
-          git config --global user.name "gitsheets CI"
-          git config --global user.email "ci@gitsheets.local"
-
       - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node }}
@@ -141,14 +123,6 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      # The Sheet/Transaction commit tests + the cross-binding commit-parity test
-      # commit to scratch repos, whose update_ref writes a reflog needing a
-      # committer identity from git config (same requirement as the other jobs).
-      - name: Configure git identity (commit-bearing tests write reflogs)
-        run: |
-          git config --global user.name "gitsheets CI"
-          git config --global user.email "ci@gitsheets.local"
-
       - uses: actions/setup-python@v6
         with:
           python-version: '3.11'

package-lock.json

@@ -45,6 +45,7 @@
   "dependencies": {
     "@toon-format/toon": "^2.2.0",
     "axi-sdk-js": "^0.1.6",
+    "csv-stringify": "^6.8.0",
     "gitsheets": "*"
   },
   "devDependencies": {

packages/gitsheets-axi/package.json

@@ -7,9 +7,12 @@ import { createContext, type GitsheetsContext } from './context.js';
 import { homeCommand } from './commands/home.js';
 import { sheetsCommand, SHEETS_HELP } from './commands/sheets.js';
 import { queryCommand, QUERY_HELP } from './commands/query.js';
+import { countCommand, COUNT_HELP } from './commands/count.js';
+import { distinctCommand, DISTINCT_HELP } from './commands/distinct.js';
 import { readCommand, READ_HELP } from './commands/read.js';
 import { upsertCommand, UPSERT_HELP } from './commands/upsert.js';
 import { patchCommand, PATCH_HELP } from './commands/patch.js';
+import { renameCommand, RENAME_HELP } from './commands/rename.js';
 import { deleteCommand, DELETE_HELP } from './commands/delete.js';
 import { checkCommand, CHECK_HELP } from './commands/check.js';
 import { diffCommand, DIFF_HELP } from './commands/diff.js';
@@ -28,35 +31,37 @@ const DESCRIPTION =
 const VERSION = readPackageVersion();
 
 export const TOP_HELP = `usage: gitsheets-axi [command] [args] [flags]
-commands[16]:
-  (none)=home, sheets, query, read,
-  upsert, patch, delete,
-  check, diff, normalize,
+commands[19]:
+  (none)=home, sheets, query, count,
+  distinct, read, upsert, patch, rename,
+  delete, check, diff, normalize,
   init, infer, migrate-config,
   attachment, push, setup
 flags[2]:
   --help, -v/-V/--version
 examples:
   gitsheets-axi
-  gitsheets-axi query users --filter status=active
+  gitsheets-axi query repos --filter status=unclassified --sort pushed_at
+  gitsheets-axi count repos --filter archived=true
+  gitsheets-axi query repos --group-by target_team
+  gitsheets-axi distinct repos disposition
   gitsheets-axi upsert users --data '{"slug":"jane","email":"jane@x.org"}'
   gitsheets-axi patch users '{"slug":"jane"}' --patch '{"name":"Jane"}'
   gitsheets-axi check users users/jane.toml --fix
   gitsheets-axi diff posts HEAD~10
-  gitsheets-axi normalize users
-  gitsheets-axi init users
-  gitsheets-axi infer users
   gitsheets-axi attachment list users jane
-  gitsheets-axi push
   gitsheets-axi setup hooks
 `;
 
 const COMMAND_HELP: Record<string, string> = {
   sheets: SHEETS_HELP,
   query: QUERY_HELP,
+  count: COUNT_HELP,
+  distinct: DISTINCT_HELP,
   read: READ_HELP,
   upsert: UPSERT_HELP,
   patch: PATCH_HELP,
+  rename: RENAME_HELP,
   delete: DELETE_HELP,
   check: CHECK_HELP,
   diff: DIFF_HELP,
@@ -74,9 +79,12 @@ type CommandFn = (args: string[], ctx: GitsheetsContext) => Promise<string | Rec
 const COMMANDS: Record<string, CommandFn> = {
   sheets: sheetsCommand,
   query: queryCommand,
+  count: countCommand,
+  distinct: distinctCommand,
   read: readCommand,
   upsert: upsertCommand,
   patch: patchCommand,
+  rename: renameCommand,
   delete: deleteCommand,
   check: checkCommand,
   diff: diffCommand,

packages/gitsheets-axi/src/cli.ts

@@ -0,0 +1,99 @@
+import { AxiError } from 'axi-sdk-js';
+
+import type { GitsheetsContext } from '../context.js';
+import { translateError } from '../errors.js';
+import { renderObject } from '../output/render.js';
+import { openSheetForCommand } from '../util/open-sheet.js';
+import { buildPredicate } from '../util/filter.js';
+
+export const COUNT_HELP = `usage: gitsheets-axi count <sheet> [--filter k=v ...] [--prefix p]
+flags[2]:
+  --filter <expr>      Filter clause (repeatable). k=v · k!=v · k<v · k>v ·
+                       k<=v · k>=v · k~regex · "k in (a,b)" · k:present · k:empty
+  --prefix <p>         Tenant sub-tree scope
+examples:
+  gitsheets-axi count repos
+  gitsheets-axi count repos --filter status=unclassified
+  gitsheets-axi count repos --filter 'pushed_at<2022-01-01' --filter archived=false
+note:
+  With no --filter, counts candidate record paths without parsing (cheap).
+  A filter scans body-less records and counts matches.
+`;
+
+interface CountFlags {
+  sheet: string;
+  filters: string[];
+  prefix: string | undefined;
+}
+
+function parseCountFlags(args: string[]): CountFlags {
+  const sheet = args[0];
+  if (!sheet || sheet.startsWith('-')) {
+    throw new AxiError('count requires a sheet name', 'VALIDATION_ERROR', [
+      'Run `gitsheets-axi count <sheet>`',
+    ]);
+  }
+  const flags: CountFlags = { sheet, filters: [], prefix: undefined };
+  for (let i = 1; i < args.length; i++) {
+    const arg = args[i];
+    const next = args[i + 1];
+    switch (arg) {
+      case '--filter':
+        if (!next) throw new AxiError('--filter expects an expression', 'VALIDATION_ERROR');
+        flags.filters.push(next);
+        i++;
+        break;
+      case '--prefix':
+        if (!next) throw new AxiError('--prefix expects a path', 'VALIDATION_ERROR');
+        flags.prefix = next;
+        i++;
+        break;
+      default:
+        throw new AxiError(`Unknown flag: ${arg}`, 'VALIDATION_ERROR', [
+          'Run `gitsheets-axi count --help`',
+        ]);
+    }
+  }
+  return flags;
+}
+
+export async function countCommand(
+  args: string[],
+  ctx: GitsheetsContext,
+): Promise<string> {
+  if (args.length === 0 || (args.length === 1 && args[0] === '--help')) {
+    return COUNT_HELP;
+  }
+
+  const flags = parseCountFlags(args);
+  const repo = await ctx.repo();
+  const sheet = await openSheetForCommand(
+    repo,
+    flags.sheet,
+    flags.prefix !== undefined ? { prefix: flags.prefix } : {},
+  );
+
+  // No filter → the cheap candidate-path count.
+  if (flags.filters.length === 0) {
+    try {
+      return renderObject({ sheet: flags.sheet, count: await sheet.count() });
+    } catch (error) {
+      throw translateError(error);
+    }
+  }
+
+  // Filtered → scan body-less and count matches, reporting the total too.
+  const predicate = buildPredicate(flags.filters);
+  let matched = 0;
+  let total = 0;
+  try {
+    const records = await sheet.queryAll({}, { withBody: false });
+    total = records.length;
+    for (const r of records) {
+      if (predicate(r as Record<string, unknown>)) matched++;
+    }
+  } catch (error) {
+    throw translateError(error);
+  }
+  return renderObject({ sheet: flags.sheet, count: matched, of: total });
+}