@cosmicdrift/kumiko-guards 0.330.2 → 0.332.0

package/src/guard-test-stack-drift.ts

@@ -17,7 +17,7 @@
  */
 
 import * as path from "node:path";
-import { Project, type SourceFile, SyntaxKind } from "ts-morph";
+import { type Identifier, Node, Project, type SourceFile, SyntaxKind } from "ts-morph";
 import {
   type GuardViolation,
   type RepoCheck,
@@ -70,10 +70,23 @@ export interface Violation {
   forbiddenCalls: Array<{ name: string; line: number }>;
 }
 
+// `import { setupTestStack as stack }` + `stack()` must resolve to the imported
+// name, otherwise an alias hides both entrypoints and forbidden factories.
+function importedNameOf(identifier: Identifier): string {
+  const localName = identifier.getText();
+  for (const imp of identifier.getSourceFile().getImportDeclarations()) {
+    for (const spec of imp.getNamedImports()) {
+      if ((spec.getAliasNode()?.getText() ?? spec.getName()) === localName) return spec.getName();
+    }
+  }
+  return localName;
+}
+
 function collectCallNames(sf: SourceFile): Map<string, number[]> {
   const calls = new Map<string, number[]>();
   for (const call of sf.getDescendantsOfKind(SyntaxKind.CallExpression)) {
-    const name = call.getExpression().getText();
+    const callee = call.getExpression();
+    const name = Node.isIdentifier(callee) ? importedNameOf(callee) : callee.getText();
     const arr = calls.get(name) ?? [];
     arr.push(call.getStartLineNumber());
     calls.set(name, arr);

package/src/guard-text-field-stance.ts

@@ -144,9 +144,6 @@ function scanFieldFactories(sf: SourceFile, roots: readonly RepoRoot[]): Finding
     const place = enclosingFieldName(call) ?? `${callee}(...)`;
     const line = call.getStartLineNumber();
     findings.push({ file, line, place, callee });
-    console.warn(
-      `  [text-field-stance WARN] ${file}:${line}  ${callee}(...) at "${place}" has no personal stance — mark ${VALID_PERSONAL_HINT}`,
-    );
   }
   return findings;
 }
@@ -212,6 +209,10 @@ function analyse(
 ): GuardOutcome {
   const { findings } = scan(files, roots);
   if (!compareBaseline) {
+    for (const f of findings)
+      console.warn(
+        `  [text-field-stance WARN] ${f.file}:${f.line}  ${f.callee}(...) at "${f.place}" has no personal stance — mark ${VALID_PERSONAL_HINT}`,
+      );
     console.log("  Baseline comparison skipped (--no-baseline).");
     return { violations: [] };
   }

package/src/guard-thin-wrappers.ts

@@ -67,6 +67,8 @@ function isKnownReason(r: string): r is WrapperReason {
 // ── Built-in filter ─────────────────────────────────────────────────────
 
 const BUILTIN_NAMES = new Set([
+  "test",
+  "exec",
   "push",
   "pop",
   "shift",
@@ -300,9 +302,6 @@ function extractCalleeName(callNode: ReturnType<FnNode["getBody"]> | undefined):
   if (!expr) return null;
   if (expr.isKind(SyntaxKind.Identifier)) return expr.getText();
   if (expr.isKind(SyntaxKind.PropertyAccessExpression)) {
-    // `/re/.test(x)` is a RegExp method call, not a call to a function named
-    // "test" — a regex-literal receiver is never a wrapper callee.
-    if (expr.getExpression().isKind(SyntaxKind.RegularExpressionLiteral)) return null;
     return expr.getName();
   }
   return null;

package/src/index.ts

@@ -1,3 +1,4 @@
+export { gitEnv } from "./_lib/git-env";
 export {
   type AstGuard,
   buildGuardKitInventory,

package/src/pre-push.sh

@@ -6,9 +6,10 @@
 #      scripts/check-wt.sh, delegate to it.
 #   2. Else if running inside a worktree under the parent workspace (no
 #      check-wt.sh), run this worktree's own package.json scripts
-#      (typecheck, lint, test, test:dom) directly — the parent's
-#      `bun check` would otherwise check the main checkout instead of the
-#      worktree.
+#      (typecheck, lint, test, test:dom) plus the consumer-CI guards
+#      (kumiko-guards guards/checks, kumiko-guard-comment-lang) directly —
+#      the parent's `bun check` would otherwise check the main checkout
+#      instead of the worktree.
 #   3. Else if running inside the cosmicdriftgamestudio Parent-Workspace,
 #      delegate to its `bun check` with KUMIKO_CLI_SCOPE set to THIS
 #      sub-repo only — so a push from one sub-repo doesn't run
@@ -129,6 +130,24 @@ if [ "$(git rev-parse --git-dir)" != "$(git rev-parse --git-common-dir)" ] \
   cd "$REPO_ROOT" && exec "$REPO_ROOT/scripts/check-wt.sh"
 fi
 
+# Runs a guard bin from the worktree's or the parent's node_modules/.bin
+# (same guards consumer CI runs); an unresolvable bin is skipped, not fatal.
+run_guard_bin() {
+  GUARD_LABEL="$1"
+  GUARD_BIN="$2"
+  shift 2
+  for GUARD_CANDIDATE in "$REPO_ROOT/node_modules/.bin/$GUARD_BIN" "$PARENT_DIR/node_modules/.bin/$GUARD_BIN"; do
+    if [ -x "$GUARD_CANDIDATE" ]; then
+      echo "[pre-push] $GUARD_BIN $*"
+      if ! "$GUARD_CANDIDATE" "$@"; then
+        FAILED="$FAILED $GUARD_LABEL"
+      fi
+      return 0
+    fi
+  done
+  echo "[pre-push] $GUARD_BIN: not resolvable in worktree/parent, skipped"
+}
+
 # infra#899: no tracked scripts/check-wt.sh — the parent-scoped `bun check`
 # branch below would check the main checkout, not this worktree. Run the
 # worktree's own package.json scripts directly instead (only when nested
@@ -137,7 +156,7 @@ fi
 if [ "$(git rev-parse --git-dir)" != "$(git rev-parse --git-common-dir)" ] \
    && [ -n "$PARENT_DIR" ]; then
   cd "$REPO_ROOT"
-  echo "[pre-push] worktree without scripts/check-wt.sh — running this worktree's package.json scripts (typecheck, lint, test, test:dom)…"
+  echo "[pre-push] worktree without scripts/check-wt.sh — running this worktree's package.json scripts (typecheck, lint, test, test:dom) and guards (guards, checks, comment-lang)…"
   if ! has_package_script test; then
     echo "[pre-push] FATAL: worktree without a package.json \"test\" script — nothing to run, refusing push." >&2
     echo "Add a \"test\" script to package.json, or set PRE_PUSH_SKIP=1 to bypass (use sparingly)." >&2
@@ -154,6 +173,9 @@ if [ "$(git rev-parse --git-dir)" != "$(git rev-parse --git-common-dir)" ] \
       echo "[pre-push] $SCRIPT_NAME: no script, skipped"
     fi
   done
+  run_guard_bin guards kumiko-guards guards
+  run_guard_bin checks kumiko-guards checks
+  run_guard_bin comment-lang kumiko-guard-comment-lang --touched --base=origin/main
   if [ -n "$FAILED" ]; then
     echo "[pre-push] worktree check failed:$FAILED" >&2
     exit 1