@clioplaylists/clio 0.1.7 → 0.1.9

package/dist/dataplane/server/db/db.js

@@ -1,16 +1,55 @@
-import { Kysely, Migrator, PostgresDialect, } from 'kysely';
-import assert from 'node:assert';
-import EventEmitter from 'node:events';
-import { Pool as PgPool, types as pgTypes } from 'pg';
-import { dbLogger } from '../../../logger';
-import * as migrations from './migrations';
-import { CtxMigrationProvider } from './migrations/provider';
-export class Database {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Database = void 0;
+const kysely_1 = require("kysely");
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_events_1 = __importDefault(require("node:events"));
+const pg_1 = require("pg");
+const logger_1 = require("../../../logger");
+const migrations = __importStar(require("./migrations"));
+const provider_1 = require("./migrations/provider");
+class Database {
     opts;
     pool;
     db;
     migrator;
-    txEvt = new EventEmitter();
+    txEvt = new node_events_1.default();
     destroyed = false;
     constructor(opts, instances) {
         this.opts = opts;
@@ -24,14 +63,14 @@ export class Database {
         // else create a pool & connect
         const { schema, url } = opts;
         const pool = opts.pool ??
-            new PgPool({
+            new pg_1.Pool({
                 connectionString: url,
                 max: opts.poolSize,
                 maxUses: opts.poolMaxUses,
                 idleTimeoutMillis: opts.poolIdleTimeoutMs,
             });
         // Select count(*) and other pg bigints as js integer
-        pgTypes.setTypeParser(pgTypes.builtins.INT8, (n) => parseInt(n, 10));
+        pg_1.types.setTypeParser(pg_1.types.builtins.INT8, (n) => parseInt(n, 10));
         // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)
         if (schema && !/^[a-z_]+$/i.test(schema)) {
             throw new Error(`Postgres schema must only contain [A-Za-z_]: ${schema}`);
@@ -47,13 +86,13 @@ export class Database {
             }
         });
         this.pool = pool;
-        this.db = new Kysely({
-            dialect: new PostgresDialect({ pool }),
+        this.db = new kysely_1.Kysely({
+            dialect: new kysely_1.PostgresDialect({ pool }),
         });
-        this.migrator = new Migrator({
+        this.migrator = new kysely_1.Migrator({
             db: this.db,
             migrationTableSchema: opts.schema,
-            provider: new CtxMigrationProvider(migrations, 'pg'),
+            provider: new provider_1.CtxMigrationProvider(migrations, 'pg'),
         });
     }
     get schema() {
@@ -87,10 +126,10 @@ export class Database {
         return this.db.isTransaction;
     }
     assertTransaction() {
-        assert(this.isTransaction, 'Transaction required');
+        (0, node_assert_1.default)(this.isTransaction, 'Transaction required');
     }
     assertNotTransaction() {
-        assert(!this.isTransaction, 'Cannot be in a transaction');
+        (0, node_assert_1.default)(!this.isTransaction, 'Cannot be in a transaction');
     }
     onCommit(fn) {
         this.assertTransaction();
@@ -129,9 +168,10 @@ export class Database {
         this.destroyed = true;
     }
 }
-export default Database;
-const onPoolError = (err) => dbLogger.error({ err }, 'db pool error');
-const onClientError = (err) => dbLogger.error({ err }, 'db client error');
+exports.Database = Database;
+exports.default = Database;
+const onPoolError = (err) => logger_1.dbLogger.error({ err }, 'db pool error');
+const onClientError = (err) => logger_1.dbLogger.error({ err }, 'db client error');
 // utils
 // -------
 class LeakyTxPlugin {

package/dist/dataplane/server/db/index.js

@@ -1 +1,17 @@
-export * from './db';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./db"), exports);

package/dist/dataplane/server/db/migrations/20250515T045948368Z-init.d.ts

@@ -0,0 +1,3 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;

package/dist/dataplane/server/db/migrations/20250515T045948368Z-init.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.up = up;
+exports.down = down;
+// @TODO subject indexes, naming?
+// @TODO drop indexes in down()?
+async function up(db) {
+    // actor
+    await db.schema
+        .createTable('actor')
+        .addColumn('did', 'varchar', (col) => col.primaryKey())
+        .addColumn('handle', 'varchar', (col) => col.unique())
+        .addColumn('indexed_at', 'varchar', (col) => col.notNull())
+        .addColumn('takedown_ref', 'varchar')
+        .addColumn('upstream_status', 'varchar')
+        .execute();
+    // await db.schema // Supports user search
+    //   .createIndex(`actor_handle_tgrm_idx`)
+    //   .on('actor')
+    //   .using('gist')
+    //   .expression(sql`"handle" gist_trgm_ops`)
+    //   .execute()
+    // actor_sync
+    await db.schema
+        .createTable('actor_sync')
+        .addColumn('did', 'varchar', (col) => col.primaryKey())
+        .addForeignKeyConstraint('fx_actor_sync_did_to_actor_did', ['did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('commit_cid', 'varchar', (col) => col.notNull())
+        .addColumn('repo_rev', 'varchar', (col) => col.notNull())
+        .execute();
+    // artist
+    await db.schema
+        .createTable('artist')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('name', 'varchar', (col) => col.notNull())
+        .addColumn('mb_id', 'varchar(36)', (col) => col.notNull())
+        .execute();
+    // song
+    await db.schema
+        .createTable('song')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('track_name', 'varchar', (col) => col.notNull())
+        .addColumn('track_mb_id', 'varchar', (col) => col.notNull().unique())
+        .addColumn('album_artwork_ref', 'varchar')
+        .addColumn('indexed_at', 'varchar', (col) => col.notNull())
+        .execute();
+    // did_cache
+    await db.schema
+        .createTable('did_cache')
+        .addColumn('did', 'varchar', (col) => col.primaryKey())
+        .addColumn('doc', 'text', (col) => col.notNull())
+        .addColumn('updatedAt', 'bigint', (col) => col.notNull())
+        .execute();
+    // playlist_idea
+    await db.schema
+        .createTable('playlist_idea')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('uri', 'varchar', (col) => {
+        col.notNull();
+        col.unique();
+        return col;
+    })
+        .addColumn('title', 'varchar', (col) => col.notNull())
+        .addColumn('description', 'varchar')
+        .addColumn('creator_did', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_playlist_idea_creator_did_to_actor_did', ['creator_did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('owner_did', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_playlist_idea_owner_did_to_actor_did', ['owner_did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('created_at', 'varchar', (col) => col.notNull())
+        .execute();
+    // playlist
+    await db.schema
+        .createTable('playlist')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('playlist_idea_uri', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_playlist_playlist_idea_uri_to_playlist_idea_uri', ['playlist_idea_uri'], 'playlist_idea', ['uri'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('type', 'varchar', (col) => col.notNull())
+        .addColumn('name', 'varchar', (col) => col.notNull())
+        .execute();
+    // playlist_item
+    await db.schema
+        .createTable('playlist_item')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('playlist_id', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_playlist_item_playlist_id_to_playlist_id', ['playlist_id'], 'playlist', ['id'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('song_id', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_playlist_item_song_id_to_song_id', ['song_id'], 'song', ['id'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('position', 'integer', (col) => col.notNull())
+        .execute();
+    // artist_list_item
+    await db.schema
+        .createTable('artist_list_item')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('artist_id', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_artist_list_item_artist_id_to_artist_id', ['artist_id'], 'artist', ['id'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('song_id', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_artist_list_item_song_id_to_song_id', ['song_id'], 'song', ['id'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('position', 'integer', (col) => col.notNull())
+        .execute();
+    // profile
+    await db.schema
+        .createTable('profile')
+        .addColumn('uri', 'varchar', (col) => col.primaryKey())
+        .addColumn('cid', 'varchar', (col) => col.notNull())
+        .addColumn('creator_did', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_profile_creator_did_to_actor_did', ['creator_did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('display_name', 'varchar')
+        .addColumn('description', 'varchar')
+        .addColumn('avatar_cid', 'varchar')
+        .addColumn('banner_cid', 'varchar')
+        .addColumn('created_at', 'varchar', (col) => col.notNull())
+        .addColumn('indexed_at', 'varchar', (col) => col.notNull())
+        .execute();
+    // record
+    await db.schema
+        .createTable('record')
+        .addColumn('uri', 'varchar', (col) => col.primaryKey())
+        .addColumn('cid', 'varchar', (col) => col.notNull())
+        .addColumn('did', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_record_did_to_actor_did', ['did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('json', 'text', (col) => col.notNull())
+        .addColumn('indexed_at', 'varchar', (col) => col.notNull())
+        .addColumn('takedown_ref', 'varchar')
+        .execute();
+    // subscription_cursor
+    await db.schema
+        .createTable('subscription_cursor')
+        .addColumn('service', 'varchar', (col) => col.primaryKey())
+        .addColumn('cursor', 'bigint', (col) => col.notNull())
+        .addColumn('updated_at', 'bigint', (col) => col.notNull())
+        .execute();
+}
+async function down(db) {
+    await db.schema.dropTable('subscription_cursor').execute();
+    await db.schema.dropTable('record').execute();
+    await db.schema.dropTable('profile').execute();
+    await db.schema.dropTable('artist_list_item').execute();
+    await db.schema.dropTable('playlist_item').execute();
+    await db.schema.dropTable('playlist').execute();
+    await db.schema.dropTable('playlist_idea').execute();
+    await db.schema.dropTable('did_cache').execute();
+    await db.schema.dropTable('song').execute();
+    await db.schema.dropTable('artist').execute();
+    await db.schema.dropTable('actor_sync').execute();
+    await db.schema.dropTable('actor').execute();
+}

package/dist/dataplane/server/db/migrations/20260119T210000000Z-song-recommendation.d.ts

@@ -0,0 +1,3 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;

package/dist/dataplane/server/db/migrations/20260119T210000000Z-song-recommendation.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.up = up;
+exports.down = down;
+async function up(db) {
+    await db.schema
+        .createTable('song_recommendation')
+        .addColumn('id', 'integer', (col) => {
+        col.primaryKey();
+        col.generatedAlwaysAsIdentity();
+        return col;
+    })
+        .addColumn('uri', 'varchar', (col) => col.notNull().unique())
+        .addColumn('cid', 'varchar', (col) => col.notNull())
+        .addColumn('recommender_did', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_song_rec_recommender_did_to_actor_did', ['recommender_did'], 'actor', ['did'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('playlist_idea_uri', 'varchar', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_song_rec_playlist_idea_uri_to_playlist_idea_uri', ['playlist_idea_uri'], 'playlist_idea', ['uri'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('playlist_idea_cid', 'varchar', (col) => col.notNull())
+        .addColumn('song_id', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('fx_song_rec_song_id_to_song_id', ['song_id'], 'song', ['id'], (cb) => cb.onDelete('cascade').onUpdate('cascade'))
+        .addColumn('note', 'varchar')
+        .addColumn('created_at', 'varchar', (col) => col.notNull())
+        .addColumn('indexed_at', 'varchar', (col) => col.notNull())
+        .execute();
+    await db.schema
+        .createIndex('song_rec_dedup_idx')
+        .on('song_recommendation')
+        .columns(['recommender_did', 'playlist_idea_uri', 'song_id'])
+        .unique()
+        .execute();
+}
+async function down(db) {
+    await db.schema.dropIndex('song_rec_dedup_idx').execute();
+    await db.schema.dropTable('song_recommendation').execute();
+}

package/dist/dataplane/server/db/migrations/20260119T220000000Z-oauth.d.ts

@@ -0,0 +1,3 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;

package/dist/dataplane/server/db/migrations/20260119T220000000Z-oauth.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.up = up;
+exports.down = down;
+async function up(db) {
+    await db.schema
+        .createTable('oauth_state')
+        .addColumn('key', 'varchar', (col) => col.primaryKey())
+        .addColumn('value', 'jsonb', (col) => col.notNull())
+        .addColumn('created_at', 'bigint', (col) => col.notNull())
+        .addColumn('expires_at', 'bigint', (col) => col.notNull())
+        .execute();
+    await db.schema.createIndex('oauth_state_expires_at_idx').on('oauth_state').column('expires_at').execute();
+    await db.schema
+        .createTable('oauth_session')
+        .addColumn('key', 'varchar', (col) => col.primaryKey())
+        .addColumn('value', 'jsonb', (col) => col.notNull())
+        .addColumn('updated_at', 'bigint', (col) => col.notNull())
+        .execute();
+}
+async function down(db) {
+    await db.schema.dropTable('oauth_session').execute();
+    await db.schema.dropIndex('oauth_state_expires_at_idx').execute();
+    await db.schema.dropTable('oauth_state').execute();
+}

package/dist/dataplane/server/db/migrations/index.d.ts

@@ -1,2 +1,3 @@
-export * as _20230309T045948368Z from './20230309T045948368Z-init';
-export * as _20230420T211446071Z from './20230420T211446071Z-did-cache';
+export * as _20230309T045948368Z from './20250515T045948368Z-init';
+export * as _20260119T210000000Z from './20260119T210000000Z-song-recommendation';
+export * as _20260119T220000000Z from './20260119T220000000Z-oauth';

package/dist/dataplane/server/db/migrations/index.js

@@ -1,5 +1,42 @@
+"use strict";
 // NOTE this file can be edited by hand, but it is also appended to by the migration:create command.
 // It's important that every migration is exported from here with the proper name. We'd simplify
 // this with kysely's FileMigrationProvider, but it doesn't play nicely with the build process.
-export * as _20230309T045948368Z from './20230309T045948368Z-init';
-export * as _20230420T211446071Z from './20230420T211446071Z-did-cache';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._20260119T220000000Z = exports._20260119T210000000Z = exports._20230309T045948368Z = void 0;
+exports._20230309T045948368Z = __importStar(require("./20250515T045948368Z-init"));
+exports._20260119T210000000Z = __importStar(require("./20260119T210000000Z-song-recommendation"));
+exports._20260119T220000000Z = __importStar(require("./20260119T220000000Z-oauth"));

package/dist/dataplane/server/db/migrations/provider.js

@@ -1,5 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CtxMigrationProvider = void 0;
 // Passes a context argument to migrations. We use this to thread the dialect into migrations
-export class CtxMigrationProvider {
+class CtxMigrationProvider {
     migrations;
     ctx;
     constructor(migrations, ctx) {
@@ -17,3 +20,4 @@ export class CtxMigrationProvider {
         return ctxMigrations;
     }
 }
+exports.CtxMigrationProvider = CtxMigrationProvider;

package/dist/dataplane/server/db/pagination.d.ts

@@ -33,7 +33,7 @@ export declare abstract class GenericKeyset<R, LR extends LabeledResult> {
     unpack(cursorStr?: string): LR | undefined;
     packCursor(cursor?: Cursor): string | undefined;
     unpackCursor(cursorStr?: string): Cursor | undefined;
-    getSql(labeled?: LR, direction?: 'asc' | 'desc', tryIndex?: boolean): import("kysely").RawBuilder<unknown> | undefined;
+    getSql(labeled?: LR, direction?: 'asc' | 'desc', tryIndex?: boolean): import("kysely").RawBuilder<0 | 1> | undefined;
 }
 type SortAtCidResult = {
     sortAt: string;

package/dist/dataplane/server/db/pagination.js

@@ -1,5 +1,8 @@
-import { InvalidRequestError } from '@atproto/xrpc-server';
-import { sql } from 'kysely';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paginate = exports.IndexedAtDidKeyset = exports.CreatedAtDidKeyset = exports.TimeCidKeyset = exports.GenericKeyset = void 0;
+const xrpc_server_1 = require("@atproto/xrpc-server");
+const kysely_1 = require("kysely");
 /**
  * The GenericKeyset is an abstract class that sets-up the interface and partial implementation
  * of a keyset-paginated cursor with two parts. There are three types involved:
@@ -14,7 +17,7 @@ import { sql } from 'kysely';
  *   Result -*-> LabeledResult <-*-> Cursor <--> packed/string cursor
  *                     ↳ SQL Condition
  */
-export class GenericKeyset {
+class GenericKeyset {
     primary;
     secondary;
     constructor(primary, secondary) {
@@ -50,7 +53,7 @@ export class GenericKeyset {
         const result = cursorStr.split('__');
         const [primary, secondary, ...others] = result;
         if (!primary || !secondary || others.length > 0) {
-            throw new InvalidRequestError('Malformed cursor');
+            throw new xrpc_server_1.InvalidRequestError('Malformed cursor');
         }
         return {
             primary,
@@ -63,24 +66,25 @@ export class GenericKeyset {
         if (tryIndex) {
             // The tryIndex param will likely disappear and become the default implementation: here for now for gradual rollout query-by-query.
             if (direction === 'asc') {
-                return sql `((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`;
+                return (0, kysely_1.sql) `((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`;
             }
             else {
-                return sql `((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`;
+                return (0, kysely_1.sql) `((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`;
             }
         }
         else {
             // @NOTE this implementation can struggle to use an index on (primary, secondary) for pagination due to the "or" usage.
             if (direction === 'asc') {
-                return sql `((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`;
+                return (0, kysely_1.sql) `((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`;
             }
             else {
-                return sql `((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`;
+                return (0, kysely_1.sql) `((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`;
             }
         }
     }
 }
-export class TimeCidKeyset extends GenericKeyset {
+exports.GenericKeyset = GenericKeyset;
+class TimeCidKeyset extends GenericKeyset {
     labelResult(result) {
         return { primary: result.sortAt, secondary: result.cid };
     }
@@ -93,7 +97,7 @@ export class TimeCidKeyset extends GenericKeyset {
     cursorToLabeledResult(cursor) {
         const primaryDate = new Date(parseInt(cursor.primary, 10));
         if (isNaN(primaryDate.getTime())) {
-            throw new InvalidRequestError('Malformed cursor');
+            throw new xrpc_server_1.InvalidRequestError('Malformed cursor');
         }
         return {
             primary: primaryDate.toISOString(),
@@ -101,28 +105,37 @@ export class TimeCidKeyset extends GenericKeyset {
         };
     }
 }
-export class CreatedAtDidKeyset extends TimeCidKeyset {
+exports.TimeCidKeyset = TimeCidKeyset;
+class CreatedAtDidKeyset extends TimeCidKeyset {
     labelResult(result) {
         return { primary: result.createdAt, secondary: result.did };
     }
 }
-export class IndexedAtDidKeyset extends TimeCidKeyset {
+exports.CreatedAtDidKeyset = CreatedAtDidKeyset;
+class IndexedAtDidKeyset extends TimeCidKeyset {
     labelResult(result) {
         return { primary: result.indexedAt, secondary: result.did };
     }
 }
-export const paginate = (qb, opts) => {
-    const { limit, cursor, keyset, direction = 'desc', tryIndex, nullsLast, } = opts;
+exports.IndexedAtDidKeyset = IndexedAtDidKeyset;
+const paginate = (qb, opts) => {
+    const { limit, cursor, keyset, direction = 'desc', tryIndex, nullsLast } = opts;
     const keysetSql = keyset.getSql(keyset.unpack(cursor), direction, tryIndex);
-    return qb
-        .if(!!limit, (q) => q.limit(limit))
-        .if(!nullsLast, (q) => q.orderBy(keyset.primary, direction).orderBy(keyset.secondary, direction))
-        .if(!!nullsLast, (q) => q
-        .orderBy(direction === 'asc'
-        ? sql `${keyset.primary} asc nulls last`
-        : sql `${keyset.primary} desc nulls last`)
-        .orderBy(direction === 'asc'
-        ? sql `${keyset.secondary} asc nulls last`
-        : sql `${keyset.secondary} desc nulls last`))
-        .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb));
+    let q = qb;
+    if (typeof limit === 'number') {
+        q = q.limit(limit);
+    }
+    if (nullsLast) {
+        q = q
+            .orderBy(direction === 'asc' ? (0, kysely_1.sql) `${keyset.primary} asc nulls last` : (0, kysely_1.sql) `${keyset.primary} desc nulls last`)
+            .orderBy(direction === 'asc' ? (0, kysely_1.sql) `${keyset.secondary} asc nulls last` : (0, kysely_1.sql) `${keyset.secondary} desc nulls last`);
+    }
+    else {
+        q = q.orderBy(keyset.primary, direction).orderBy(keyset.secondary, direction);
+    }
+    if (keysetSql) {
+        q = q.where(keysetSql);
+    }
+    return q;
 };
+exports.paginate = paginate;

package/dist/dataplane/server/db/tables/actor-sync.d.ts

@@ -1,8 +1,8 @@
 export declare const tableName = "actor_sync";
 export interface ActorSync {
     did: string;
-    commitCid: string;
-    repoRev: string | null;
+    commit_cid: string;
+    repo_rev: string;
 }
 export type PartialDB = {
     [tableName]: ActorSync;

package/dist/dataplane/server/db/tables/actor-sync.js

@@ -1 +1,4 @@
-export const tableName = 'actor_sync';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'actor_sync';

package/dist/dataplane/server/db/tables/actor.d.ts

@@ -1,10 +1,10 @@
 export declare const tableName = "actor";
 export interface ActorTable {
     did: string;
-    handle?: string | null;
+    handle: string | null;
     indexed_at: string;
-    takedownRef?: string | null;
-    upstreamStatus?: string | null;
+    takedown_ref: string | null;
+    upstream_status: string | null;
 }
 export type PartialDB = {
     [tableName]: ActorTable;

package/dist/dataplane/server/db/tables/actor.js

@@ -1 +1,4 @@
-export const tableName = 'actor';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'actor';

package/dist/dataplane/server/db/tables/artist-list-item.d.ts

@@ -2,9 +2,9 @@ import { Generated } from 'kysely';
 export declare const tableName = "artist_list_item";
 export interface ArtistListItemTable {
     id: Generated<number>;
-    song_id: number;
-    seq_num: number;
     artist_id: number;
+    song_id: number;
+    position: number;
 }
 export type PartialDB = {
     [tableName]: ArtistListItemTable;