primitive-admin 1.1.0 → 1.2.0-alpha.0

package/dist/src/lib/api-client.js

@@ -412,13 +412,10 @@ export class ApiClient {
             qs.set("cursor", params.cursor);
         const q = qs.toString();
         const resp = await this.get(`/admin/api/admins/me/apps${q ? `?${q}` : ""}`);
-        // The server now emits `items` with `apps` as a deprecation-window alias
-        // (#1316). Read `items` first so listings keep working once the alias is
-        // removed; fall back to the legacy `apps` key meanwhile.
         return {
-            items: resp?.items ?? (Array.isArray(resp?.apps) ? resp.apps : []),
+            items: resp?.items ?? [],
             hasMore: resp?.hasMore,
-            nextCursor: resp?.nextCursor ?? resp?.cursor ?? null,
+            nextCursor: resp?.nextCursor ?? null,
         };
     }
     /**
@@ -455,15 +452,13 @@ export class ApiClient {
             if (cursor)
                 qs.set("cursor", cursor);
             const resp = await this.get(`/admin/api/apps?${qs.toString()}`);
-            // `items` first, with the `apps` alias (#1316) as the fallback,
-            // exactly as `listApps()` reads its own envelope.
-            const rows = resp.items ?? (Array.isArray(resp.apps) ? resp.apps : []);
+            const rows = resp.items ?? [];
             return {
                 items: rows.map((row) => ({
                     appId: String(row.appId ?? row.id ?? ""),
                     name: String(row.name ?? ""),
                 })),
-                nextCursor: resp.nextCursor ?? resp.cursor,
+                nextCursor: resp.nextCursor,
             };
         });
         return drainAppsUntilConverged(drainOnce);
@@ -596,14 +591,11 @@ export class ApiClient {
     // ============================================
     async listInvitations(appId, params) {
         const result = await this.get(`/app/${appId}/api/invitations`, params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias
-        // so the CLI keeps paginating against pre-#1316 servers.
-        const nextCursor = result?.nextCursor ?? result?.cursor;
+        const nextCursor = result?.nextCursor;
         return {
             items: result?.items ?? [],
             nextCursor,
             hasMore: result?.hasMore ?? nextCursor != null,
-            cursor: nextCursor,
         };
     }
     async createInvitation(appId, data) {
@@ -633,12 +625,9 @@ export class ApiClient {
     // ============================================
     async listDeferredGrants(appId, params) {
         const result = await this.get(`/app/${appId}/api/deferred-grants`, params);
-        // `items` is the key every list envelope is built from (#3646, #1982);
-        // `grants` is the deprecated legacy name, read only as a fallback.
-        const items = result?.items ?? result?.grants ?? [];
+        const items = result?.items ?? [];
         return {
             items,
-            grants: items,
             nextCursor: result?.nextCursor ?? null,
             hasMore: result?.hasMore,
         };
@@ -1020,13 +1009,11 @@ export class ApiClient {
     }
     async listWebhookEvents(appId, webhookId, params) {
         const result = await this.get(`/admin/api/apps/${appId}/webhooks/${webhookId}/events`, params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias.
-        const nextCursor = result?.nextCursor ?? result?.cursor ?? null;
+        const nextCursor = result?.nextCursor ?? null;
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore ?? !!nextCursor,
             nextCursor,
-            cursor: nextCursor,
         };
     }
     // ============================================
@@ -1576,13 +1563,11 @@ export class ApiClient {
     }
     async listWorkflowRuns(appId, workflowId, params) {
         const result = await this.get(`/admin/api/apps/${appId}/workflows/${workflowId}/runs`, params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias.
-        const nextCursor = result?.nextCursor ?? result?.cursor ?? null;
+        const nextCursor = result?.nextCursor ?? null;
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore,
             nextCursor,
-            cursor: nextCursor,
             resumeAfter: result?.resumeAfter,
             scanned: typeof result?.scanned === "number" ? result.scanned : undefined,
         };
@@ -1594,12 +1579,11 @@ export class ApiClient {
      */
     async listUserWorkflowRuns(appId, userId, params) {
         const result = await this.get(`/admin/api/apps/${appId}/users/${encodeURIComponent(userId)}/workflow-runs`, params);
-        const nextCursor = result?.nextCursor ?? result?.cursor ?? null;
+        const nextCursor = result?.nextCursor ?? null;
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore,
             nextCursor,
-            cursor: nextCursor,
             scanned: typeof result?.scanned === "number" ? result.scanned : undefined,
         };
     }
@@ -1707,17 +1691,12 @@ export class ApiClient {
     }
     async listAllAdmins(params) {
         const result = await this.get("/admin/api/admins", params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias.
-        const nextCursor = result?.nextCursor ?? result?.cursor ?? null;
-        const items = result?.items ?? result?.admins ?? [];
+        const nextCursor = result?.nextCursor ?? null;
+        const items = result?.items ?? [];
         return {
-            // `items` is the key every list envelope is built from (#3646, #1982);
-            // `admins` is the deprecated legacy name, read only as a fallback.
             items,
-            admins: items,
             hasMore: result?.hasMore,
             nextCursor,
-            cursor: nextCursor,
         };
     }
     async searchAdminByEmail(email) {
@@ -1963,14 +1942,6 @@ export class ApiClient {
     async removeDatabaseManager(appId, databaseId, userId) {
         return this.delete(`/app/${appId}/api/databases/${databaseId}/permissions/${userId}`);
     }
-    /** @deprecated Use {@link addDatabaseManager} instead. */
-    async grantDatabasePermission(appId, databaseId, data) {
-        return this.addDatabaseManager(appId, databaseId, data.userId);
-    }
-    /** @deprecated Use {@link removeDatabaseManager} instead. */
-    async revokeDatabasePermission(appId, databaseId, userId) {
-        return this.delete(`/app/${appId}/api/databases/${databaseId}/permissions/${userId}`);
-    }
     // ============================================
     // DATABASE RECORDS & SCHEMA
     // ============================================
@@ -2272,14 +2243,11 @@ export class ApiClient {
     // ============================================
     async listGroups(appId, params) {
         const result = await this.get(`/app/${appId}/api/groups`, params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias
-        // so the CLI keeps paginating against pre-#1316 servers.
-        const nextCursor = result?.nextCursor ?? result?.cursor;
+        const nextCursor = result?.nextCursor;
         return {
             items: result?.items ?? [],
             nextCursor,
             hasMore: result?.hasMore ?? nextCursor != null,
-            cursor: nextCursor,
         };
     }
     async createGroup(appId, data) {
@@ -2311,14 +2279,11 @@ export class ApiClient {
             ...(options?.limit !== undefined ? { limit: options.limit } : {}),
             ...(options?.cursor ? { cursor: options.cursor } : {}),
         });
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias
-        // so the CLI keeps paginating against pre-#1316 servers.
-        const nextCursor = result?.nextCursor ?? result?.cursor;
+        const nextCursor = result?.nextCursor;
         return {
             items: result?.items ?? [],
             nextCursor,
             hasMore: result?.hasMore ?? nextCursor != null,
-            cursor: nextCursor,
         };
     }
     async addGroupMember(appId, groupType, groupId, data) {
@@ -2365,7 +2330,7 @@ export class ApiClient {
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore,
-            nextCursor: result?.nextCursor ?? result?.cursor ?? null,
+            nextCursor: result?.nextCursor ?? null,
         };
     }
     async listAllCollections(appId, params) {
@@ -2379,7 +2344,7 @@ export class ApiClient {
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore,
-            nextCursor: result?.nextCursor ?? result?.cursor ?? null,
+            nextCursor: result?.nextCursor ?? null,
         };
     }
     async createCollection(appId, data) {
@@ -2408,7 +2373,7 @@ export class ApiClient {
         return {
             items: result?.items ?? [],
             hasMore: result?.hasMore,
-            nextCursor: result?.nextCursor ?? result?.cursor ?? null,
+            nextCursor: result?.nextCursor ?? null,
         };
     }
     async addCollectionDocument(appId, collectionId, data) {
@@ -2427,7 +2392,7 @@ export class ApiClient {
         const result = await this.get(`/app/${appId}/api/documents/${documentId}/collections${q ? `?${q}` : ""}`);
         return {
             items: result?.items ?? [],
-            nextCursor: result?.nextCursor ?? result?.cursor ?? null,
+            nextCursor: result?.nextCursor ?? null,
         };
     }
     // ============================================
@@ -2675,9 +2640,6 @@ export class ApiClient {
      * through the caller's document permission (reader+) or the app-admin arm.
      * Returns the unified `{ items, hasMore, nextCursor? }` envelope. The cursor
      * is an opaque token — feed `nextCursor` back as `cursor` for the next page.
-     * The server also dual-emits a deprecated `cursor` alias (#1316); the
-     * normalizer drops it so CLI output is already on `nextCursor` when #1982
-     * removes it.
      */
     async queryDocumentRecords(appId, documentId, modelName, queryOptions) {
         const query = {};
@@ -3002,9 +2964,6 @@ export class ApiClient {
      * of them". `paginateAll` carries the repeat-cursor and max-page guards, so
      * a server handing out a non-advancing cursor fails loudly instead of
      * looping forever.
-     *
-     * Tolerant of a pre-contract server, which answers with a bare
-     * `{ documents }` array and no cursor: that reads as a single page.
      */
     async listAdminDocuments(appId, userId) {
         return paginateAll(async (cursor) => {
@@ -3022,9 +2981,6 @@ export class ApiClient {
      * `--limit`/`--cursor` asked for, with the server's own page boundary
      * beside it. `documents export-all`, which really does mean every document,
      * keeps the walking `listAdminDocuments()` above.
-     *
-     * Tolerant of a pre-contract server, which answers with a bare
-     * `{ documents }` array and no cursor: that reads as a single page.
      */
     async listAdminDocumentsPage(appId, userId, options = {}) {
         const params = new URLSearchParams({ userId });
@@ -3034,11 +2990,9 @@ export class ApiClient {
             params.set("cursor", options.cursor);
         const result = await this.get(`/admin/api/apps/${appId}/documents?${params.toString()}`);
         return {
-            items: result?.items ?? result?.documents ?? [],
+            items: result?.items ?? [],
             hasMore: result?.hasMore,
-            // #1316: prefer `nextCursor`; the deprecated `cursor` alias keeps a
-            // shipped CLI paginating against a server that still dual-emits.
-            nextCursor: result?.nextCursor ?? result?.cursor ?? null,
+            nextCursor: result?.nextCursor ?? null,
         };
     }
     /**
@@ -3115,14 +3069,11 @@ export class ApiClient {
     }
     async listBucketBlobs(appId, bucketIdOrKey, params) {
         const result = await this.get(`/app/${appId}/api/blob-buckets/${encodeURIComponent(bucketIdOrKey)}/blobs`, params);
-        // #1316: prefer `nextCursor`; fall back to the deprecated `cursor` alias
-        // so the CLI keeps paginating against pre-#1316 servers.
-        const nextCursor = result?.nextCursor ?? result?.cursor;
+        const nextCursor = result?.nextCursor;
         return {
             items: result?.items ?? [],
             nextCursor,
             hasMore: result?.hasMore ?? nextCursor != null,
-            cursor: nextCursor,
         };
     }
     async uploadBucketBlob(appId, bucketIdOrKey, data, meta) {