[components] npx convex data (#29645)

GitOrigin-RevId: 4946d2eb61bf66545c98b8b2a1efb92cd8278c62

Author: ldanilek

crates/isolate/src/environment/udf/mod.rs

@@ -237,7 +237,8 @@ impl<RT: Runtime> IsolateEnvironment<RT> for DatabaseUdfEnvironment<RT> {
     }
 
     fn get_table_mapping_without_system_tables(&mut self) -> anyhow::Result<TableMappingValue> {
-        Ok(self.phase.tx()?.table_mapping().clone().into())
+        let namespace = self.phase.component()?.into();
+        Ok(self.phase.tx()?.table_mapping().namespace(namespace).into())
     }
 
     fn get_all_table_mappings(&mut self) -> anyhow::Result<NamespacedTableMapping> {

crates/isolate/src/isolate2/runner.rs

@@ -781,7 +781,10 @@ impl<RT: Runtime> UdfShared<RT> {
 
     fn get_table_mapping_without_system_tables(&self) -> TableMappingValue {
         let inner = self.inner.lock();
-        inner.table_mapping.clone().into()
+        inner
+            .table_mapping
+            .namespace(TableNamespace::by_component_TODO())
+            .into()
     }
 }
 

crates/value/src/table_mapping.rs

@@ -439,13 +439,14 @@ fn table_does_not_exist(table: &TableName) -> ErrorMetadata {
 #[derive(Serialize)]
 pub struct TableMappingValue(BTreeMap<TableNumber, TableName>);
 
-impl From<TableMapping> for TableMappingValue {
-    fn from(table_mapping: TableMapping) -> Self {
+impl From<NamespacedTableMapping> for TableMappingValue {
+    fn from(table_mapping: NamespacedTableMapping) -> Self {
         TableMappingValue(
             table_mapping
                 .iter()
-                .filter(|(_, _, _, name)| !name.is_system())
-                .map(|(_, _, number, name)| (number, name.clone()))
+                .filter(|(_, _, name)| !name.is_system())
+                .filter(|(tablet_id, ..)| table_mapping.is_active(*tablet_id))
+                .map(|(_, number, name)| (number, name.clone()))
                 .collect(),
         )
     }

npm-packages/convex/src/cli/data.ts

@@ -43,6 +43,14 @@ export const data = new Command("data")
       .choices(["asc", "desc"])
       .default("desc"),
   )
+  .addOption(
+    new Option(
+      "--component-path <path>",
+      "Path to the component in the component tree defined in convex.config.ts.\n" +
+        "  By default, inspects data in the root component",
+      // TODO(ENG-6967): Remove hideHelp before launching components
+    ).hideHelp(),
+  )
   .addDeploymentSelectionOptions(actionDescription("Inspect the database in"))
   .showHelpAfterError()
   .action(async (tableName, options) => {
@@ -59,9 +67,16 @@ export const data = new Command("data")
       await listDocuments(ctx, deploymentUrl, adminKey, tableName, {
         ...options,
         order: options.order as "asc" | "desc",
+        componentPath: options.componentPath ?? "",
       });
     } else {
-      await listTables(ctx, deploymentUrl, adminKey, deploymentName);
+      await listTables(
+        ctx,
+        deploymentUrl,
+        adminKey,
+        deploymentName,
+        options.componentPath ?? "",
+      );
     }
   });
 
@@ -70,12 +85,14 @@ async function listTables(
   deploymentUrl: string,
   adminKey: string,
   deploymentName: string | undefined,
+  componentPath: string,
 ) {
   const tables = (await runPaginatedQuery(
     ctx,
     deploymentUrl,
     adminKey,
     "_system/cli/tables",
+    componentPath,
     {},
   )) as { name: string }[];
   if (tables.length === 0) {
@@ -100,13 +117,15 @@ async function listDocuments(
   options: {
     limit: number;
     order: "asc" | "desc";
+    componentPath: string;
   },
 ) {
   const data = (await runPaginatedQuery(
     ctx,
     deploymentUrl,
     adminKey,
     "_system/cli/tableData",
+    options.componentPath,
     {
       table: tableName,
       order: options.order ?? "desc",

npm-packages/convex/src/cli/env.ts

@@ -93,6 +93,7 @@ const envGet = new Command("get")
       url,
       adminKey,
       "_system/cli/queryEnvironmentVariables:get",
+      undefined,
       { name: envVarName },
     )) as EnvVar | null;
     if (envVar === null) {
@@ -145,6 +146,7 @@ const envList = new Command("list")
       url,
       adminKey,
       "_system/cli/queryEnvironmentVariables",
+      undefined,
       {},
     )) as EnvVar[];
     if (envs.length === 0) {

npm-packages/convex/src/cli/functionSpec.ts

@@ -34,6 +34,7 @@ export const functionSpec = new Command("function-spec")
       deploymentUrl,
       adminKey,
       "_system/cli/modules:apiSpec",
+      undefined,
       {},
     )) as any[];
 

npm-packages/convex/src/cli/lib/localDeployment/upgrade.ts

@@ -146,6 +146,7 @@ async function handleUpgrade(
     deploymentUrl,
     args.adminKey,
     "_system/cli/queryEnvironmentVariables",
+    undefined,
     {},
   )) as Array<{
     name: string;

npm-packages/convex/src/cli/lib/run.ts

@@ -55,6 +55,7 @@ export async function runPaginatedQuery(
   deploymentUrl: string,
   adminKey: string,
   functionName: string,
+  componentPath: string | undefined,
   args: Record<string, Value>,
   limit?: number,
 ) {
@@ -67,6 +68,7 @@ export async function runPaginatedQuery(
       deploymentUrl,
       adminKey,
       functionName,
+      componentPath,
       {
         ...args,
         // The pagination is limited on the backend, so the 10000
@@ -89,23 +91,30 @@ export async function runQuery(
   deploymentUrl: string,
   adminKey: string,
   functionName: string,
+  componentPath: string | undefined,
   args: Record<string, Value>,
 ): Promise<Value> {
-  const client = new ConvexHttpClient(deploymentUrl);
-  client.setAdminAuth(adminKey);
-
-  try {
-    return await client.query(
-      makeFunctionReference<"query">(functionName),
-      args,
-    );
-  } catch (err) {
-    return await ctx.crash({
-      exitCode: 1,
-      errorType: "invalid filesystem or env vars",
-      printedMessage: `Failed to run query "${functionName}":\n${chalk.red((err as Error).toString().trim())}`,
-    });
-  }
+  let onResult: (result: Value) => void;
+  const resultPromise = new Promise<Value>((resolve) => {
+    onResult = resolve;
+  });
+  const [donePromise, onDone] = waitUntilCalled();
+  await subscribe(
+    ctx,
+    deploymentUrl,
+    adminKey,
+    functionName,
+    args,
+    componentPath,
+    donePromise,
+    {
+      onChange: (result) => {
+        onDone();
+        onResult(result);
+      },
+    },
+  );
+  return resultPromise;
 }
 
 export function formatValue(value: Value) {

npm-packages/system-udfs/convex/_system/cli/tables.ts

@@ -1,21 +1,21 @@
 import { paginationOptsValidator } from "convex/server";
 import { queryPrivateSystem } from "../secretSystemTables";
-import { maximumBytesRead, maximumRowsRead } from "../paginationLimits";
+import { performOp } from "udf-syscall-ffi";
 
 export default queryPrivateSystem({
   args: {
     paginationOpts: paginationOptsValidator,
   },
-  handler: async (ctx, { paginationOpts }) => {
-    const results = await ctx.db
-      .query("_tables")
-      .filter((q) => q.eq(q.field("state"), "active"))
-      .paginate({ ...paginationOpts, maximumBytesRead, maximumRowsRead });
+  handler: async () => {
+    const tables: Record<number, string> = performOp(
+      "getTableMappingWithoutSystemTables",
+    );
+    // We don't need to paginate but keep the PaginationResult return type for backwards
+    // compatibility.
     return {
-      ...results,
-      page: results.page
-        .filter((table) => !table.name.startsWith("_"))
-        .map((table) => ({ name: table.name })),
+      page: Object.values(tables).map((name) => ({ name })),
+      isDone: true,
+      continueCursor: "end",
     };
   },
 });

npm-packages/system-udfs/convex/schema.ts

@@ -242,6 +242,12 @@ export default defineSchema({
       v.literal("deleting"),
       v.literal("hidden"),
     ),
+    namespace: v.optional(
+      v.object({
+        kind: v.literal("byComponent"),
+        id: v.string(),
+      }),
+    ),
   }),
   _components: defineTable({
     definitionId: v.id("_component_definitions"),