calabasas 0.6.0 → 0.7.0

package/dist/index.js

@@ -2298,6 +2298,7 @@ async function push(options) {
       syncChannels: calabasasConfig.sync?.channels ?? false,
       syncRoles: calabasasConfig.sync?.roles ?? false,
       syncMembers: calabasasConfig.sync?.members ?? false,
+      syncPresence: calabasasConfig.sync?.presence ?? false,
       eventConfigs
     })
   });
@@ -2333,7 +2334,8 @@ async function push(options) {
     `Guilds:   ${calabasasConfig.sync?.guilds ? "enabled" : "disabled"}`,
     `Channels: ${calabasasConfig.sync?.channels ? "enabled" : "disabled"}`,
     `Roles:    ${calabasasConfig.sync?.roles ? "enabled" : "disabled"}`,
-    `Members:  ${calabasasConfig.sync?.members ? "enabled" : "disabled"}`
+    `Members:  ${calabasasConfig.sync?.members ? "enabled" : "disabled"}`,
+    `Presence: ${calabasasConfig.sync?.presence ? "enabled" : "disabled"}`
   ].join(`
 `);
   const eventSummary = eventConfigs.length > 0 ? `
@@ -2427,6 +2429,16 @@ function generateSchemaFile(sync) {
   .index("by_user_guild", ["discordUserId", "guildDiscordId"])
   .index("by_guild", ["guildDiscordId"]);`);
   }
+  if (sync.presence) {
+    tables.push(`export const calabasasPresence = defineTable({
+  discordUserId: v.string(),
+  guildDiscordId: v.string(),
+  status: v.string(),
+  updatedAt: v.number(),
+})
+  .index("by_guild", ["guildDiscordId"])
+  .index("by_user_guild", ["discordUserId", "guildDiscordId"]);`);
+  }
   const tableNames = [];
   if (sync.guilds) {
     tableNames.push("calabasasGuilds");
@@ -2438,6 +2450,8 @@ function generateSchemaFile(sync) {
     tableNames.push("calabasasRoles");
   if (sync.members)
     tableNames.push("calabasasMembers");
+  if (sync.presence)
+    tableNames.push("calabasasPresence");
   const tablesExport = tableNames.length > 0 ? `export const calabasasTables = {
   ${tableNames.join(`,
   `)},
@@ -2549,6 +2563,16 @@ var MEMBER_TYPE = `{
   roles?: string[];
   joinedAt?: string;
 }`;
+var PRESENCE_VALIDATOR = `v.object({
+    userId: v.string(),
+    guildId: v.string(),
+    status: v.string(),
+  })`;
+var PRESENCE_TYPE = `{
+  userId: string;
+  guildId: string;
+  status: string;
+}`;
 var GUILD_ADMIN_VALIDATOR = `v.object({
     guildId: v.string(),
     adminUserIds: v.array(v.string()),
@@ -2736,6 +2760,42 @@ function generateMemberMutation() {
   },
 });`;
 }
+function generatePresenceMutation() {
+  return `export const syncPresence = internalMutation({
+  args: {
+    data: presenceValidator,
+    operation: v.union(v.literal("upsert"), v.literal("delete")),
+  },
+  returns: v.null(),
+  handler: async (ctx, { data: presence, operation }) => {
+    const existing = await ctx.db
+      .query("calabasasPresence")
+      .withIndex("by_user_guild", (q) =>
+        q.eq("discordUserId", presence.userId).eq("guildDiscordId", presence.guildId)
+      )
+      .unique();
+
+    if (operation === "delete") {
+      if (existing) await ctx.db.delete(existing._id);
+      return null;
+    }
+
+    const doc = {
+      discordUserId: presence.userId,
+      guildDiscordId: presence.guildId,
+      status: presence.status,
+      updatedAt: Date.now(),
+    };
+
+    if (existing) {
+      await ctx.db.patch(existing._id, doc);
+    } else {
+      await ctx.db.insert("calabasasPresence", doc);
+    }
+    return null;
+  },
+});`;
+}
 function generateGuildAdminMutation() {
   return `export const _syncGuildAdmins = internalMutation({
   args: {
@@ -2854,6 +2914,13 @@ function generateSyncFile(sync) {
     publicMutations.push(generatePublicSyncMutation("member"));
     enabledTypes.push("member");
   }
+  if (sync.presence) {
+    validators.push(`const presenceValidator = ${PRESENCE_VALIDATOR};`);
+    types.push(`export type PresenceSync = ${PRESENCE_TYPE};`);
+    internalMutations.push(generateInternalSyncMutation("presence", generatePresenceMutation()));
+    publicMutations.push(generatePublicSyncMutation("presence"));
+    enabledTypes.push("presence");
+  }
   if (internalMutations.length === 0) {
     return `/**
  * THIS FILE IS AUTO-GENERATED BY \`calabasas generate\`
@@ -3068,6 +3135,27 @@ function generateTypeForEvent(eventName) {
 ${fieldEntries}
 }`;
 }
+function splitObjectFields(content) {
+  const fields = [];
+  let depth = 0;
+  let current = "";
+  for (const char of content) {
+    if (char === "(" || char === "{")
+      depth++;
+    if (char === ")" || char === "}")
+      depth--;
+    if (char === "," && depth === 0) {
+      if (current.trim())
+        fields.push(current.trim());
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  if (current.trim())
+    fields.push(current.trim());
+  return fields;
+}
 function validatorToType(validator) {
   if (validator.startsWith("v.string()"))
     return "string";
@@ -3086,7 +3174,19 @@ function validatorToType(validator) {
     return `Array<${validatorToType(inner)}>`;
   }
   if (validator.startsWith("v.object(")) {
-    return "Record<string, unknown>";
+    const objectLiteral = validator.slice(9, -1).trim();
+    const content = objectLiteral.slice(1, -1).trim();
+    if (!content)
+      return "Record<string, never>";
+    const fields = splitObjectFields(content);
+    const fieldTypes = fields.filter((f) => f.includes(":")).map((field) => {
+      const colonIndex = field.indexOf(":");
+      const key = field.slice(0, colonIndex).trim();
+      const fieldValidator = field.slice(colonIndex + 1).trim();
+      const tsType = validatorToType(fieldValidator);
+      return `${key}: ${tsType}`;
+    });
+    return `{ ${fieldTypes.join("; ")} }`;
   }
   return "unknown";
 }
@@ -3466,7 +3566,7 @@ async function generate(options) {
   fs4.writeFileSync(eventHandlersPath, eventHandlersCode);
   const generated = [options.output];
   const syncConfig = config.sync ?? {};
-  const hasSyncEnabled = syncConfig.guilds || syncConfig.channels || syncConfig.roles || syncConfig.members;
+  const hasSyncEnabled = syncConfig.guilds || syncConfig.channels || syncConfig.roles || syncConfig.members || syncConfig.presence;
   if (hasSyncEnabled) {
     const schemaPath = path4.join(generatedDir, "schema.ts");
     const schemaCode = generateSchemaFile(syncConfig);
@@ -3496,6 +3596,8 @@ async function generate(options) {
       syncExports.push("syncRole");
     if (syncConfig.members)
       syncExports.push("syncMember");
+    if (syncConfig.presence)
+      syncExports.push("syncPresence");
     p5.note(`1. Add tables to your convex/schema.ts:
    import { calabasasTables } from "./calabasas/_generated/schema";
 
@@ -3654,6 +3756,7 @@ import * as p7 from "@clack/prompts";
 // src/lib/registry/components/channel-select.ts
 var channelSelect = {
   name: "channel-select",
+  kind: "component",
   description: "Searchable combobox to pick a Discord channel (with type icons)",
   requiredSyncTypes: ["channels"],
   requiredShadcnComponents: ["popover", "command", "button"],
@@ -3801,6 +3904,7 @@ export function ChannelSelect({
 // src/lib/registry/components/role-select.ts
 var roleSelect = {
   name: "role-select",
+  kind: "component",
   description: "Searchable combobox to pick a Discord role (with color dots)",
   requiredSyncTypes: ["roles"],
   requiredShadcnComponents: ["popover", "command", "button"],
@@ -3939,6 +4043,7 @@ export function RoleSelect({
 // src/lib/registry/components/member-select.ts
 var memberSelect = {
   name: "member-select",
+  kind: "component",
   description: "Searchable combobox to pick a Discord member (with avatar)",
   requiredSyncTypes: ["members"],
   requiredShadcnComponents: ["popover", "command", "button"],
@@ -4090,6 +4195,7 @@ export function MemberSelect({
 // src/lib/registry/components/guild-select.ts
 var guildSelect = {
   name: "guild-select",
+  kind: "component",
   description: "Searchable combobox to pick a Discord server (with icon)",
   requiredSyncTypes: ["guilds"],
   requiredShadcnComponents: ["popover", "command", "button"],
@@ -4245,6 +4351,7 @@ export function GuildSelect({
 // src/lib/registry/components/role-badge.ts
 var roleBadge = {
   name: "role-badge",
+  kind: "component",
   description: "Colored role pill badges that match Discord's role tags",
   requiredSyncTypes: ["roles"],
   requiredShadcnComponents: ["badge", "tooltip"],
@@ -4388,6 +4495,7 @@ export function RoleBadge({
 // src/lib/registry/components/server-info.ts
 var serverInfo = {
   name: "server-info",
+  kind: "component",
   description: "Guild overview card with icon, name, boost tier, and feature tags",
   requiredSyncTypes: ["guilds"],
   requiredShadcnComponents: ["card", "avatar", "badge"],
@@ -4590,6 +4698,7 @@ export function ServerInfo({
 // src/lib/registry/components/permission-viewer.ts
 var permissionViewer = {
   name: "permission-viewer",
+  kind: "component",
   description: "Read-only permission grid that parses Discord permission bitfields",
   requiredSyncTypes: ["roles"],
   requiredShadcnComponents: ["card", "badge", "tooltip", "separator"],
@@ -4822,6 +4931,7 @@ export function PermissionViewer({
 // src/lib/registry/components/member-card.ts
 var memberCard = {
   name: "member-card",
+  kind: "component",
   description: "Profile card with avatar, name, role badges, and join date",
   requiredSyncTypes: ["members", "roles"],
   requiredShadcnComponents: ["card", "avatar", "badge", "separator"],
@@ -5058,6 +5168,7 @@ export function MemberCard({
 // src/lib/registry/components/channel-tree.ts
 var channelTree = {
   name: "channel-tree",
+  kind: "component",
   description: "Hierarchical channel sidebar grouped by category with type icons",
   requiredSyncTypes: ["channels"],
   requiredShadcnComponents: ["collapsible", "scroll-area", "tooltip"],
@@ -5325,6 +5436,7 @@ function ChannelItem({
 // src/lib/registry/components/member-roster.ts
 var memberRoster = {
   name: "member-roster",
+  kind: "component",
   description: "Member list grouped by hoisted roles, like Discord's right sidebar",
   requiredSyncTypes: ["members", "roles"],
   requiredShadcnComponents: ["scroll-area", "avatar", "badge", "separator"],
@@ -5581,6 +5693,44 @@ export function MemberRoster({
 });`
 };
 
+// src/lib/registry/components/use-online-count.ts
+var useOnlineCount = {
+  name: "use-online-count",
+  kind: "hook",
+  description: "React hook that returns the number of online members in a guild",
+  requiredSyncTypes: ["presence"],
+  requiredShadcnComponents: [],
+  generateReactComponent: () => `"use client";
+
+import { useQuery } from "convex/react";
+import { api } from "@/convex/_generated/api";
+
+/**
+ * Returns the number of online members in a Discord guild.
+ *
+ * Requires \`sync.presence: true\` in your calabasas config.
+ * The GuildPresences privileged intent must be enabled for your bot.
+ *
+ * @param guildDiscordId - The Discord guild ID
+ * @returns The online member count, or \`undefined\` while loading
+ */
+export function useOnlineCount(guildDiscordId: string): number | undefined {
+  return useQuery(api.calabasas.queries.onlineCount, { guildDiscordId });
+}
+`,
+  generateConvexQueries: () => `export const onlineCount = query({
+  args: { guildDiscordId: v.string() },
+  returns: v.number(),
+  handler: async (ctx, { guildDiscordId }) => {
+    const presences = await ctx.db
+      .query("calabasasPresence")
+      .withIndex("by_guild", (q) => q.eq("guildDiscordId", guildDiscordId))
+      .collect();
+    return presences.length;
+  },
+});`
+};
+
 // src/lib/registry/index.ts
 var REGISTRY = [
   channelSelect,
@@ -5592,7 +5742,8 @@ var REGISTRY = [
   permissionViewer,
   memberCard,
   channelTree,
-  memberRoster
+  memberRoster,
+  useOnlineCount
 ];
 function getComponent(name) {
   return REGISTRY.find((c) => c.name === name);
@@ -5613,6 +5764,8 @@ function parseEnabledSyncTypes(configPath) {
       enabled.add("roles");
     if (/members:\s*true/.test(syncContent))
       enabled.add("members");
+    if (/presence:\s*true/.test(syncContent))
+      enabled.add("presence");
   }
   return enabled;
 }
@@ -5704,9 +5857,10 @@ async function add(componentNames) {
     if (!fs6.existsSync(componentsDir)) {
       fs6.mkdirSync(componentsDir, { recursive: true });
     }
-    const componentPath = path6.join(componentsDir, `${comp.name}.tsx`);
+    const ext = comp.kind === "hook" ? ".ts" : ".tsx";
+    const componentPath = path6.join(componentsDir, `${comp.name}${ext}`);
     fs6.writeFileSync(componentPath, comp.generateReactComponent());
-    p7.log.success(`Created components/calabasas/${comp.name}.tsx`);
+    p7.log.success(`Created components/calabasas/${comp.name}${ext}`);
     const queryBlock = comp.generateConvexQueries();
     const namesInBlock = queryNamesInBlock(queryBlock);
     const newNames = namesInBlock.filter((n) => !existing.has(n));
@@ -5757,45 +5911,52 @@ Install with: npx shadcn@latest add ${missingShadcn.join(" ")}`, "Required shadc
   }
   const firstInstalled = components[0];
   if (firstInstalled) {
-    const pascal = toPascalCase(firstInstalled.name);
-    const needsGuild = firstInstalled.requiredSyncTypes.some((t) => t === "channels" || t === "roles" || t === "members");
-    const displayComponents = new Set([
-      "role-badge",
-      "server-info",
-      "permission-viewer",
-      "member-card"
-    ]);
-    const isDisplay = displayComponents.has(firstInstalled.name);
     let usage;
-    if (isDisplay) {
-      const propsMap = {
-        "role-badge": `  guildDiscordId="123456789"
+    if (firstInstalled.kind === "hook") {
+      const camel = firstInstalled.name.split("-").map((w, i) => i === 0 ? w : w.charAt(0).toUpperCase() + w.slice(1)).join("");
+      usage = `import { ${camel} } from "@/components/calabasas/${firstInstalled.name}";
+
+const count = ${camel}("123456789");`;
+    } else {
+      const pascal = toPascalCase(firstInstalled.name);
+      const needsGuild = firstInstalled.requiredSyncTypes.some((t) => t === "channels" || t === "roles" || t === "members");
+      const displayComponents = new Set([
+        "role-badge",
+        "server-info",
+        "permission-viewer",
+        "member-card"
+      ]);
+      const isDisplay = displayComponents.has(firstInstalled.name);
+      if (isDisplay) {
+        const propsMap = {
+          "role-badge": `  guildDiscordId="123456789"
   roleIds={["role_id_1", "role_id_2"]}`,
-        "server-info": `  guildDiscordId="123456789"`,
-        "permission-viewer": `  guildDiscordId="123456789"
+          "server-info": `  guildDiscordId="123456789"`,
+          "permission-viewer": `  guildDiscordId="123456789"
   roleDiscordId="role_id"`,
-        "member-card": `  guildDiscordId="123456789"
+          "member-card": `  guildDiscordId="123456789"
   memberDiscordUserId="user_id"`
-      };
-      const props = propsMap[firstInstalled.name] ?? `  guildDiscordId="123456789"`;
-      usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
+        };
+        const props = propsMap[firstInstalled.name] ?? `  guildDiscordId="123456789"`;
+        usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
 
 <${pascal}
 ${props}
 />`;
-    } else if (needsGuild) {
-      usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
+      } else if (needsGuild) {
+        usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
 
 <${pascal}
   guildDiscordId="123456789"
   onValueChange={(id) => console.log(id)}
 />`;
-    } else {
-      usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
+      } else {
+        usage = `import { ${pascal} } from "@/components/calabasas/${firstInstalled.name}";
 
 <${pascal}
   onValueChange={(id) => console.log(id)}
 />`;
+      }
     }
     p7.note(usage, "Usage example");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calabasas",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CLI for Calabasas - Discord Gateway as a Service for Convex",
   "type": "module",
   "bin": {
@@ -19,6 +19,7 @@
     "build": "bun run build:cli && bun run build:lib",
     "build:cli": "bun build src/index.ts --outdir dist --target node --splitting --external @clack/prompts --external picocolors && node scripts/fix-duplicate-exports.js",
     "build:lib": "bun build src/config.ts --outfile dist/config.js --target node --format esm && cp src/config.d.ts dist/config.d.ts",
+    "test": "bun test",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "bun run build"
   },