@atproto/bsync 0.0.25 → 0.0.26

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atproto/bsync
 
+## 0.0.26
+
+### Patch Changes
+
+- [#4929](https://github.com/bluesky-social/atproto/pull/4929) [`f01c59f`](https://github.com/bluesky-social/atproto/commit/f01c59f5bd3f75fb8b47a9eecd4858b84033fb7c) Thanks [@devinivy](https://github.com/devinivy)! - **BREAKING:** Drop support for Node.js 18 and 20. Node.js 22 is now the minimum supported version. Docker images now use Node.js 24.
+
+- [#4943](https://github.com/bluesky-social/atproto/pull/4943) [`c459153`](https://github.com/bluesky-social/atproto/commit/c459153395a30ce89e050892c8fab7dc98e019b9) Thanks [@devinivy](https://github.com/devinivy)! - **BREAKING:** Convert to pure ESM. All packages now ship `"type": "module"` with ES module output and Node16 module resolution.
+
+  Node.js 22's `require()` compatibility layer can still load these packages in CommonJS code.
+
+- [#4930](https://github.com/bluesky-social/atproto/pull/4930) [`908bece`](https://github.com/bluesky-social/atproto/commit/908bece169258bff5ad121e5eec157d6ded6f705) Thanks [@devinivy](https://github.com/devinivy)! - Build with TypeScript 6.0.
+
+- Updated dependencies [[`affb50c`](https://github.com/bluesky-social/atproto/commit/affb50c040b497a12631df99a6310f8e78cab557), [`f01c59f`](https://github.com/bluesky-social/atproto/commit/f01c59f5bd3f75fb8b47a9eecd4858b84033fb7c), [`c459153`](https://github.com/bluesky-social/atproto/commit/c459153395a30ce89e050892c8fab7dc98e019b9), [`908bece`](https://github.com/bluesky-social/atproto/commit/908bece169258bff5ad121e5eec157d6ded6f705)]:
+  - @atproto/common@0.6.0
+  - @atproto/syntax@0.6.0
+
 ## 0.0.25
 
 ### Patch Changes

package/bin/migration-create.ts

@@ -19,7 +19,7 @@ export async function main() {
   await fs.writeFile(path.join(dir, `${filename}.ts`), template, { flag: 'wx' })
   await fs.writeFile(
     path.join(dir, 'index.ts'),
-    `export * as _${prefix} from './${filename}'\n`,
+    `export * as _${prefix} from './${filename}.js'\n`,
     { flag: 'a' },
   )
 }

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import { Interceptor, PromiseClient } from '@connectrpc/connect';
 import { ConnectTransportOptions } from '@connectrpc/connect-node';
-import { Service } from './proto/bsync_connect';
+import { Service } from './proto/bsync_connect.js';
 export type BsyncClient = PromiseClient<typeof Service>;
 export declare const createClient: (opts: ConnectTransportOptions) => BsyncClient;
 export declare const authWithApiKey: (apiKey: string) => Interceptor;

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EAEd,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,uBAAuB,EAExB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,OAAO,CAAC,CAAA;AAEvD,eAAO,MAAM,YAAY,GAAI,MAAM,uBAAuB,KAAG,WAG5D,CAAA;AAED,eAAO,MAAM,cAAc,GACxB,QAAQ,MAAM,KAAG,WAKjB,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EAEd,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,uBAAuB,EAExB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAElD,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,OAAO,CAAC,CAAA;AAEvD,eAAO,MAAM,YAAY,GAAI,MAAM,uBAAuB,KAAG,WAG5D,CAAA;AAED,eAAO,MAAM,cAAc,GACxB,QAAQ,MAAM,KAAG,WAKjB,CAAA"}

package/dist/client.js

@@ -1,17 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.authWithApiKey = exports.createClient = void 0;
-const connect_1 = require("@connectrpc/connect");
-const connect_node_1 = require("@connectrpc/connect-node");
-const bsync_connect_1 = require("./proto/bsync_connect");
-const createClient = (opts) => {
-    const transport = (0, connect_node_1.createConnectTransport)(opts);
-    return (0, connect_1.createPromiseClient)(bsync_connect_1.Service, transport);
+import { createPromiseClient, } from '@connectrpc/connect';
+import { createConnectTransport, } from '@connectrpc/connect-node';
+import { Service } from './proto/bsync_connect.js';
+export const createClient = (opts) => {
+    const transport = createConnectTransport(opts);
+    return createPromiseClient(Service, transport);
 };
-exports.createClient = createClient;
-const authWithApiKey = (apiKey) => (next) => (req) => {
+export const authWithApiKey = (apiKey) => (next) => (req) => {
     req.header.set('authorization', `Bearer ${apiKey}`);
     return next(req);
 };
-exports.authWithApiKey = authWithApiKey;
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,iDAI4B;AAC5B,2DAGiC;AACjC,yDAA+C;AAIxC,MAAM,YAAY,GAAG,CAAC,IAA6B,EAAe,EAAE;IACzE,MAAM,SAAS,GAAG,IAAA,qCAAsB,EAAC,IAAI,CAAC,CAAA;IAC9C,OAAO,IAAA,6BAAmB,EAAC,uBAAO,EAAE,SAAS,CAAC,CAAA;AAChD,CAAC,CAAA;AAHY,QAAA,YAAY,gBAGxB;AAEM,MAAM,cAAc,GACzB,CAAC,MAAc,EAAe,EAAE,CAChC,CAAC,IAAI,EAAE,EAAE,CACT,CAAC,GAAG,EAAE,EAAE;IACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,MAAM,EAAE,CAAC,CAAA;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC,CAAA;AANU,QAAA,cAAc,kBAMxB","sourcesContent":["import {\n  Interceptor,\n  PromiseClient,\n  createPromiseClient,\n} from '@connectrpc/connect'\nimport {\n  ConnectTransportOptions,\n  createConnectTransport,\n} from '@connectrpc/connect-node'\nimport { Service } from './proto/bsync_connect'\n\nexport type BsyncClient = PromiseClient<typeof Service>\n\nexport const createClient = (opts: ConnectTransportOptions): BsyncClient => {\n  const transport = createConnectTransport(opts)\n  return createPromiseClient(Service, transport)\n}\n\nexport const authWithApiKey =\n  (apiKey: string): Interceptor =>\n  (next) =>\n  (req) => {\n    req.header.set('authorization', `Bearer ${apiKey}`)\n    return next(req)\n  }\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,GACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAEL,sBAAsB,GACvB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAIlD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAA6B,EAAe,EAAE;IACzE,MAAM,SAAS,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAA;IAC9C,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,MAAc,EAAe,EAAE,CAChC,CAAC,IAAI,EAAE,EAAE,CACT,CAAC,GAAG,EAAE,EAAE;IACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,MAAM,EAAE,CAAC,CAAA;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC,CAAA","sourcesContent":["import {\n  Interceptor,\n  PromiseClient,\n  createPromiseClient,\n} from '@connectrpc/connect'\nimport {\n  ConnectTransportOptions,\n  createConnectTransport,\n} from '@connectrpc/connect-node'\nimport { Service } from './proto/bsync_connect.js'\n\nexport type BsyncClient = PromiseClient<typeof Service>\n\nexport const createClient = (opts: ConnectTransportOptions): BsyncClient => {\n  const transport = createConnectTransport(opts)\n  return createPromiseClient(Service, transport)\n}\n\nexport const authWithApiKey =\n  (apiKey: string): Interceptor =>\n  (next) =>\n  (req) => {\n    req.header.set('authorization', `Bearer ${apiKey}`)\n    return next(req)\n  }\n"]}

package/dist/config.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readEnv = exports.envToCfg = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const common_1 = require("@atproto/common");
-const envToCfg = (env) => {
+import assert from 'node:assert';
+import { envBool, envInt, envList, envStr } from '@atproto/common';
+export const envToCfg = (env) => {
     const serviceCfg = {
         port: env.port ?? 2585,
         version: env.version ?? 'unknown',
         longPollTimeoutMs: env.longPollTimeoutMs ?? 10000,
     };
-    (0, node_assert_1.default)(env.dbUrl, 'missing postgres url');
+    assert(env.dbUrl, 'missing postgres url');
     const dbCfg = {
         url: env.dbUrl,
         schema: env.dbSchema,
@@ -21,7 +15,7 @@ const envToCfg = (env) => {
         poolIdleTimeoutMs: env.dbPoolIdleTimeoutMs,
         migrate: env.dbMigrate,
     };
-    (0, node_assert_1.default)(env.apiKeys.length > 0, 'missing api keys');
+    assert(env.apiKeys.length > 0, 'missing api keys');
     const authCfg = {
         apiKeys: new Set(env.apiKeys),
     };
@@ -31,23 +25,21 @@ const envToCfg = (env) => {
         auth: authCfg,
     };
 };
-exports.envToCfg = envToCfg;
-const readEnv = () => {
+export const readEnv = () => {
     return {
         // service
-        port: (0, common_1.envInt)('BSYNC_PORT'),
-        version: (0, common_1.envStr)('BSYNC_VERSION'),
-        longPollTimeoutMs: (0, common_1.envInt)('BSYNC_LONG_POLL_TIMEOUT_MS'),
+        port: envInt('BSYNC_PORT'),
+        version: envStr('BSYNC_VERSION'),
+        longPollTimeoutMs: envInt('BSYNC_LONG_POLL_TIMEOUT_MS'),
         // database
-        dbUrl: (0, common_1.envStr)('BSYNC_DB_POSTGRES_URL'),
-        dbSchema: (0, common_1.envStr)('BSYNC_DB_POSTGRES_SCHEMA'),
-        dbPoolSize: (0, common_1.envInt)('BSYNC_DB_POOL_SIZE'),
-        dbPoolMaxUses: (0, common_1.envInt)('BSYNC_DB_POOL_MAX_USES'),
-        dbPoolIdleTimeoutMs: (0, common_1.envInt)('BSYNC_DB_POOL_IDLE_TIMEOUT_MS'),
-        dbMigrate: (0, common_1.envBool)('BSYNC_DB_MIGRATE'),
+        dbUrl: envStr('BSYNC_DB_POSTGRES_URL'),
+        dbSchema: envStr('BSYNC_DB_POSTGRES_SCHEMA'),
+        dbPoolSize: envInt('BSYNC_DB_POOL_SIZE'),
+        dbPoolMaxUses: envInt('BSYNC_DB_POOL_MAX_USES'),
+        dbPoolIdleTimeoutMs: envInt('BSYNC_DB_POOL_IDLE_TIMEOUT_MS'),
+        dbMigrate: envBool('BSYNC_DB_MIGRATE'),
         // secrets
-        apiKeys: (0, common_1.envList)('BSYNC_API_KEYS'),
+        apiKeys: envList('BSYNC_API_KEYS'),
     };
 };
-exports.readEnv = readEnv;
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAgC;AAChC,4CAAkE;AAE3D,MAAM,QAAQ,GAAG,CAAC,GAAsB,EAAgB,EAAE;IAC/D,MAAM,UAAU,GAA4B;QAC1C,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,IAAI;QACtB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;QACjC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,KAAK;KAClD,CAAA;IAED,IAAA,qBAAM,EAAC,GAAG,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAA;IACzC,MAAM,KAAK,GAAuB;QAChC,GAAG,EAAE,GAAG,CAAC,KAAK;QACd,MAAM,EAAE,GAAG,CAAC,QAAQ;QACpB,QAAQ,EAAE,GAAG,CAAC,UAAU;QACxB,WAAW,EAAE,GAAG,CAAC,aAAa;QAC9B,iBAAiB,EAAE,GAAG,CAAC,mBAAmB;QAC1C,OAAO,EAAE,GAAG,CAAC,SAAS;KACvB,CAAA;IAED,IAAA,qBAAM,EAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAA;IAClD,MAAM,OAAO,GAAyB;QACpC,OAAO,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;KAC9B,CAAA;IAED,OAAO;QACL,OAAO,EAAE,UAAU;QACnB,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC,CAAA;AA3BY,QAAA,QAAQ,YA2BpB;AA2BM,MAAM,OAAO,GAAG,GAAsB,EAAE;IAC7C,OAAO;QACL,UAAU;QACV,IAAI,EAAE,IAAA,eAAM,EAAC,YAAY,CAAC;QAC1B,OAAO,EAAE,IAAA,eAAM,EAAC,eAAe,CAAC;QAChC,iBAAiB,EAAE,IAAA,eAAM,EAAC,4BAA4B,CAAC;QACvD,WAAW;QACX,KAAK,EAAE,IAAA,eAAM,EAAC,uBAAuB,CAAC;QACtC,QAAQ,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC;QAC5C,UAAU,EAAE,IAAA,eAAM,EAAC,oBAAoB,CAAC;QACxC,aAAa,EAAE,IAAA,eAAM,EAAC,wBAAwB,CAAC;QAC/C,mBAAmB,EAAE,IAAA,eAAM,EAAC,+BAA+B,CAAC;QAC5D,SAAS,EAAE,IAAA,gBAAO,EAAC,kBAAkB,CAAC;QACtC,UAAU;QACV,OAAO,EAAE,IAAA,gBAAO,EAAC,gBAAgB,CAAC;KACnC,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,OAAO,WAgBnB","sourcesContent":["import assert from 'node:assert'\nimport { envBool, envInt, envList, envStr } from '@atproto/common'\n\nexport const envToCfg = (env: ServerEnvironment): ServerConfig => {\n  const serviceCfg: ServerConfig['service'] = {\n    port: env.port ?? 2585,\n    version: env.version ?? 'unknown',\n    longPollTimeoutMs: env.longPollTimeoutMs ?? 10000,\n  }\n\n  assert(env.dbUrl, 'missing postgres url')\n  const dbCfg: ServerConfig['db'] = {\n    url: env.dbUrl,\n    schema: env.dbSchema,\n    poolSize: env.dbPoolSize,\n    poolMaxUses: env.dbPoolMaxUses,\n    poolIdleTimeoutMs: env.dbPoolIdleTimeoutMs,\n    migrate: env.dbMigrate,\n  }\n\n  assert(env.apiKeys.length > 0, 'missing api keys')\n  const authCfg: ServerConfig['auth'] = {\n    apiKeys: new Set(env.apiKeys),\n  }\n\n  return {\n    service: serviceCfg,\n    db: dbCfg,\n    auth: authCfg,\n  }\n}\n\nexport type ServerConfig = {\n  service: ServiceConfig\n  db: DatabaseConfig\n  auth: AuthConfig\n}\n\ntype ServiceConfig = {\n  port: number\n  version?: string\n  longPollTimeoutMs: number\n}\n\ntype DatabaseConfig = {\n  url: string\n  schema?: string\n  poolSize?: number\n  poolMaxUses?: number\n  poolIdleTimeoutMs?: number\n  migrate?: boolean\n}\n\ntype AuthConfig = {\n  apiKeys: Set<string>\n}\n\nexport const readEnv = (): ServerEnvironment => {\n  return {\n    // service\n    port: envInt('BSYNC_PORT'),\n    version: envStr('BSYNC_VERSION'),\n    longPollTimeoutMs: envInt('BSYNC_LONG_POLL_TIMEOUT_MS'),\n    // database\n    dbUrl: envStr('BSYNC_DB_POSTGRES_URL'),\n    dbSchema: envStr('BSYNC_DB_POSTGRES_SCHEMA'),\n    dbPoolSize: envInt('BSYNC_DB_POOL_SIZE'),\n    dbPoolMaxUses: envInt('BSYNC_DB_POOL_MAX_USES'),\n    dbPoolIdleTimeoutMs: envInt('BSYNC_DB_POOL_IDLE_TIMEOUT_MS'),\n    dbMigrate: envBool('BSYNC_DB_MIGRATE'),\n    // secrets\n    apiKeys: envList('BSYNC_API_KEYS'),\n  }\n}\n\nexport type ServerEnvironment = {\n  // service\n  port?: number\n  version?: string\n  longPollTimeoutMs?: number\n  // database\n  dbUrl?: string\n  dbSchema?: string\n  dbPoolSize?: number\n  dbPoolMaxUses?: number\n  dbPoolIdleTimeoutMs?: number\n  dbMigrate?: boolean\n  // secrets\n  apiKeys: string[]\n}\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAElE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAsB,EAAgB,EAAE;IAC/D,MAAM,UAAU,GAA4B;QAC1C,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,IAAI;QACtB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;QACjC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,KAAK;KAClD,CAAA;IAED,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAA;IACzC,MAAM,KAAK,GAAuB;QAChC,GAAG,EAAE,GAAG,CAAC,KAAK;QACd,MAAM,EAAE,GAAG,CAAC,QAAQ;QACpB,QAAQ,EAAE,GAAG,CAAC,UAAU;QACxB,WAAW,EAAE,GAAG,CAAC,aAAa;QAC9B,iBAAiB,EAAE,GAAG,CAAC,mBAAmB;QAC1C,OAAO,EAAE,GAAG,CAAC,SAAS;KACvB,CAAA;IAED,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAA;IAClD,MAAM,OAAO,GAAyB;QACpC,OAAO,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;KAC9B,CAAA;IAED,OAAO;QACL,OAAO,EAAE,UAAU;QACnB,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC,CAAA;AA2BD,MAAM,CAAC,MAAM,OAAO,GAAG,GAAsB,EAAE;IAC7C,OAAO;QACL,UAAU;QACV,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC;QAC1B,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC;QAChC,iBAAiB,EAAE,MAAM,CAAC,4BAA4B,CAAC;QACvD,WAAW;QACX,KAAK,EAAE,MAAM,CAAC,uBAAuB,CAAC;QACtC,QAAQ,EAAE,MAAM,CAAC,0BAA0B,CAAC;QAC5C,UAAU,EAAE,MAAM,CAAC,oBAAoB,CAAC;QACxC,aAAa,EAAE,MAAM,CAAC,wBAAwB,CAAC;QAC/C,mBAAmB,EAAE,MAAM,CAAC,+BAA+B,CAAC;QAC5D,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC;QACtC,UAAU;QACV,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC;KACnC,CAAA;AACH,CAAC,CAAA","sourcesContent":["import assert from 'node:assert'\nimport { envBool, envInt, envList, envStr } from '@atproto/common'\n\nexport const envToCfg = (env: ServerEnvironment): ServerConfig => {\n  const serviceCfg: ServerConfig['service'] = {\n    port: env.port ?? 2585,\n    version: env.version ?? 'unknown',\n    longPollTimeoutMs: env.longPollTimeoutMs ?? 10000,\n  }\n\n  assert(env.dbUrl, 'missing postgres url')\n  const dbCfg: ServerConfig['db'] = {\n    url: env.dbUrl,\n    schema: env.dbSchema,\n    poolSize: env.dbPoolSize,\n    poolMaxUses: env.dbPoolMaxUses,\n    poolIdleTimeoutMs: env.dbPoolIdleTimeoutMs,\n    migrate: env.dbMigrate,\n  }\n\n  assert(env.apiKeys.length > 0, 'missing api keys')\n  const authCfg: ServerConfig['auth'] = {\n    apiKeys: new Set(env.apiKeys),\n  }\n\n  return {\n    service: serviceCfg,\n    db: dbCfg,\n    auth: authCfg,\n  }\n}\n\nexport type ServerConfig = {\n  service: ServiceConfig\n  db: DatabaseConfig\n  auth: AuthConfig\n}\n\ntype ServiceConfig = {\n  port: number\n  version?: string\n  longPollTimeoutMs: number\n}\n\ntype DatabaseConfig = {\n  url: string\n  schema?: string\n  poolSize?: number\n  poolMaxUses?: number\n  poolIdleTimeoutMs?: number\n  migrate?: boolean\n}\n\ntype AuthConfig = {\n  apiKeys: Set<string>\n}\n\nexport const readEnv = (): ServerEnvironment => {\n  return {\n    // service\n    port: envInt('BSYNC_PORT'),\n    version: envStr('BSYNC_VERSION'),\n    longPollTimeoutMs: envInt('BSYNC_LONG_POLL_TIMEOUT_MS'),\n    // database\n    dbUrl: envStr('BSYNC_DB_POSTGRES_URL'),\n    dbSchema: envStr('BSYNC_DB_POSTGRES_SCHEMA'),\n    dbPoolSize: envInt('BSYNC_DB_POOL_SIZE'),\n    dbPoolMaxUses: envInt('BSYNC_DB_POOL_MAX_USES'),\n    dbPoolIdleTimeoutMs: envInt('BSYNC_DB_POOL_IDLE_TIMEOUT_MS'),\n    dbMigrate: envBool('BSYNC_DB_MIGRATE'),\n    // secrets\n    apiKeys: envList('BSYNC_API_KEYS'),\n  }\n}\n\nexport type ServerEnvironment = {\n  // service\n  port?: number\n  version?: string\n  longPollTimeoutMs?: number\n  // database\n  dbUrl?: string\n  dbSchema?: string\n  dbPoolSize?: number\n  dbPoolMaxUses?: number\n  dbPoolIdleTimeoutMs?: number\n  dbMigrate?: boolean\n  // secrets\n  apiKeys: string[]\n}\n"]}

package/dist/context.d.ts

@@ -1,9 +1,9 @@
-import TypedEventEmitter from 'typed-emitter';
-import { ServerConfig } from './config';
-import { Database } from './db';
-import { createMuteOpChannel } from './db/schema/mute_op';
-import { createNotifOpChannel } from './db/schema/notif_op';
-import { createOperationChannel } from './db/schema/operation';
+import type TypedEmitter from 'typed-emitter';
+import { ServerConfig } from './config.js';
+import { Database } from './db/index.js';
+import { createMuteOpChannel } from './db/schema/mute_op.js';
+import { createNotifOpChannel } from './db/schema/notif_op.js';
+import { createOperationChannel } from './db/schema/operation.js';
 export type AppContextOptions = {
     db: Database;
     cfg: ServerConfig;
@@ -13,7 +13,7 @@ export declare class AppContext {
     db: Database;
     cfg: ServerConfig;
     shutdown: AbortSignal;
-    events: TypedEventEmitter<AppEvents>;
+    events: TypedEmitter.default<AppEvents>;
     constructor(opts: AppContextOptions);
     static fromConfig(cfg: ServerConfig, shutdown: AbortSignal, overrides?: Partial<AppContextOptions>): Promise<AppContext>;
 }

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,QAAQ,CAAA;IACZ,GAAG,EAAE,YAAY,CAAA;IACjB,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,UAAU;IACrB,EAAE,EAAE,QAAQ,CAAA;IACZ,GAAG,EAAE,YAAY,CAAA;IACjB,QAAQ,EAAE,WAAW,CAAA;IACrB,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;gBAExB,IAAI,EAAE,iBAAiB;WAOtB,UAAU,CACrB,GAAG,EAAE,YAAY,EACjB,QAAQ,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,UAAU,CAAC;CAUvB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,CAAC,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;IACjC,CAAC,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAA;IAClC,CAAC,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAA;CACrC,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,QAAQ,CAAA;IACZ,GAAG,EAAE,YAAY,CAAA;IACjB,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,UAAU;IACrB,EAAE,EAAE,QAAQ,CAAA;IACZ,GAAG,EAAE,YAAY,CAAA;IACjB,QAAQ,EAAE,WAAW,CAAA;IACrB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAE3B,IAAI,EAAE,iBAAiB;WAOtB,UAAU,CACrB,GAAG,EAAE,YAAY,EACjB,QAAQ,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,UAAU,CAAC;CAUvB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,CAAC,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;IACjC,CAAC,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAA;IAClC,CAAC,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAA;CACrC,CAAA"}

package/dist/context.js

@@ -1,44 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppContext = void 0;
-const node_stream_1 = require("node:stream");
-const db_1 = require("./db");
-const mute_op_1 = require("./db/schema/mute_op");
-const notif_op_1 = require("./db/schema/notif_op");
-const operation_1 = require("./db/schema/operation");
-class AppContext {
+import { EventEmitter } from 'node:events';
+import { Database } from './db/index.js';
+import { createMuteOpChannel } from './db/schema/mute_op.js';
+import { createNotifOpChannel } from './db/schema/notif_op.js';
+import { createOperationChannel } from './db/schema/operation.js';
+export class AppContext {
     constructor(opts) {
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cfg", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "shutdown", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "events", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.db = opts.db;
         this.cfg = opts.cfg;
         this.shutdown = opts.shutdown;
-        this.events = new node_stream_1.EventEmitter();
+        this.events = new EventEmitter();
     }
     static async fromConfig(cfg, shutdown, overrides) {
-        const db = new db_1.Database({
+        const db = new Database({
             url: cfg.db.url,
             schema: cfg.db.schema,
             poolSize: cfg.db.poolSize,
@@ -48,5 +21,4 @@ class AppContext {
         return new AppContext({ db, cfg, shutdown, ...overrides });
     }
 }
-exports.AppContext = AppContext;
 //# sourceMappingURL=context.js.map

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAG1C,6BAA+B;AAC/B,iDAAyD;AACzD,mDAA2D;AAC3D,qDAA8D;AAQ9D,MAAa,UAAU;IAMrB,YAAY,IAAuB;QALnC;;;;;WAAY;QACZ;;;;;WAAiB;QACjB;;;;;WAAqB;QACrB;;;;;WAAoC;QAGlC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,0BAAY,EAAkC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CACrB,GAAiB,EACjB,QAAqB,EACrB,SAAsC;QAEtC,MAAM,EAAE,GAAG,IAAI,aAAQ,CAAC;YACtB,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG;YACf,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM;YACrB,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ;YACzB,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,WAAW;YAC/B,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,iBAAiB;SAC5C,CAAC,CAAA;QACF,OAAO,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF;AA3BD,gCA2BC","sourcesContent":["import { EventEmitter } from 'node:stream'\nimport TypedEventEmitter from 'typed-emitter'\nimport { ServerConfig } from './config'\nimport { Database } from './db'\nimport { createMuteOpChannel } from './db/schema/mute_op'\nimport { createNotifOpChannel } from './db/schema/notif_op'\nimport { createOperationChannel } from './db/schema/operation'\n\nexport type AppContextOptions = {\n  db: Database\n  cfg: ServerConfig\n  shutdown: AbortSignal\n}\n\nexport class AppContext {\n  db: Database\n  cfg: ServerConfig\n  shutdown: AbortSignal\n  events: TypedEventEmitter<AppEvents>\n\n  constructor(opts: AppContextOptions) {\n    this.db = opts.db\n    this.cfg = opts.cfg\n    this.shutdown = opts.shutdown\n    this.events = new EventEmitter() as TypedEventEmitter<AppEvents>\n  }\n\n  static async fromConfig(\n    cfg: ServerConfig,\n    shutdown: AbortSignal,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<AppContext> {\n    const db = new Database({\n      url: cfg.db.url,\n      schema: cfg.db.schema,\n      poolSize: cfg.db.poolSize,\n      poolMaxUses: cfg.db.poolMaxUses,\n      poolIdleTimeoutMs: cfg.db.poolIdleTimeoutMs,\n    })\n    return new AppContext({ db, cfg, shutdown, ...overrides })\n  }\n}\n\nexport type AppEvents = {\n  [createMuteOpChannel]: () => void\n  [createNotifOpChannel]: () => void\n  [createOperationChannel]: () => void\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAQjE,MAAM,OAAO,UAAU;IAMrB,YAAY,IAAuB;QACjC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,YAAY,EAAqC,CAAA;IACrE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CACrB,GAAiB,EACjB,QAAqB,EACrB,SAAsC;QAEtC,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC;YACtB,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG;YACf,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM;YACrB,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ;YACzB,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,WAAW;YAC/B,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,iBAAiB;SAC5C,CAAC,CAAA;QACF,OAAO,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF","sourcesContent":["import { EventEmitter } from 'node:events'\nimport type TypedEmitter from 'typed-emitter'\nimport { ServerConfig } from './config.js'\nimport { Database } from './db/index.js'\nimport { createMuteOpChannel } from './db/schema/mute_op.js'\nimport { createNotifOpChannel } from './db/schema/notif_op.js'\nimport { createOperationChannel } from './db/schema/operation.js'\n\nexport type AppContextOptions = {\n  db: Database\n  cfg: ServerConfig\n  shutdown: AbortSignal\n}\n\nexport class AppContext {\n  db: Database\n  cfg: ServerConfig\n  shutdown: AbortSignal\n  events: TypedEmitter.default<AppEvents>\n\n  constructor(opts: AppContextOptions) {\n    this.db = opts.db\n    this.cfg = opts.cfg\n    this.shutdown = opts.shutdown\n    this.events = new EventEmitter() as TypedEmitter.default<AppEvents>\n  }\n\n  static async fromConfig(\n    cfg: ServerConfig,\n    shutdown: AbortSignal,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<AppContext> {\n    const db = new Database({\n      url: cfg.db.url,\n      schema: cfg.db.schema,\n      poolSize: cfg.db.poolSize,\n      poolMaxUses: cfg.db.poolMaxUses,\n      poolIdleTimeoutMs: cfg.db.poolIdleTimeoutMs,\n    })\n    return new AppContext({ db, cfg, shutdown, ...overrides })\n  }\n}\n\nexport type AppEvents = {\n  [createMuteOpChannel]: () => void\n  [createNotifOpChannel]: () => void\n  [createOperationChannel]: () => void\n}\n"]}

package/dist/db/index.d.ts

@@ -1,8 +1,10 @@
 import { Migrator } from 'kysely';
-import { Pool as PgPool } from 'pg';
-import TypedEmitter from 'typed-emitter';
-import { DatabaseSchema } from './schema';
-import { PgOptions } from './types';
+import pg from 'pg';
+declare const PgPool: typeof pg.Pool;
+type PgPool = InstanceType<typeof PgPool>;
+import type TypedEmitter from 'typed-emitter';
+import { DatabaseSchema } from './schema/index.js';
+import { PgOptions } from './types.js';
 export declare class Database {
     opts: PgOptions;
     pool: PgPool;
@@ -25,7 +27,7 @@ export declare class Database {
     migrateToLatestOrThrow(): Promise<import("kysely").MigrationResult[]>;
 }
 export default Database;
-type TxnEmitter = TypedEmitter<TxnEvents>;
+type TxnEmitter = TypedEmitter.default<TxnEvents>;
 type TxnEvents = {
     commit: () => void;
 };

package/dist/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,QAAQ,EAOT,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,IAAI,IAAI,MAAM,EAAoB,MAAM,IAAI,CAAA;AACrD,OAAO,YAAY,MAAM,eAAe,CAAA;AAIxC,OAAO,EAAE,cAAc,EAAsB,MAAM,UAAU,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,qBAAa,QAAQ;IAQV,IAAI,EAAE,SAAS;IAPxB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,cAAc,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAyB,UAAU,CAAA;IACxC,SAAS,UAAQ;gBAGR,IAAI,EAAE,SAAS,EACtB,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAkDlD,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,aAAa,YAEhB;IAED,iBAAiB;IAIjB,oBAAoB;IAId,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAwBlE,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI;IAKjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAclC,sBAAsB;CAa7B;AAED,eAAe,QAAQ,CAAA;AA6BvB,KAAK,UAAU,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;AAEzC,KAAK,SAAS,GAAG;IACf,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,QAAQ,EAOT,MAAM,QAAQ,CAAA;AAEf,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,QAAA,MAAc,MAAM,gBAAuB,CAAA;AAC3C,KAAK,MAAM,GAAG,YAAY,CAAC,OAAO,MAAM,CAAC,CAAA;AACzC,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAI7C,OAAO,EAAE,cAAc,EAAsB,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,qBAAa,QAAQ;IAQV,IAAI,EAAE,SAAS;IAPxB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,cAAc,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAyB,UAAU,CAAA;IACxC,SAAS,UAAQ;gBAGR,IAAI,EAAE,SAAS,EACtB,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAkDlD,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,aAAa,YAEhB;IAED,iBAAiB;IAIjB,oBAAoB;IAId,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAwBlE,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI;IAKjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAclC,sBAAsB;CAa7B;AAED,eAAe,QAAQ,CAAA;AA6BvB,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;AAEjD,KAAK,SAAS,GAAG;IACf,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB,CAAA"}

package/dist/db/index.js

@@ -1,87 +1,18 @@
-"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 node_assert_1 = __importDefault(require("node:assert"));
-const node_stream_1 = require("node:stream");
-const kysely_1 = require("kysely");
-const pg_1 = require("pg");
-const logger_1 = require("../logger");
-const migrations = __importStar(require("./migrations"));
-const provider_1 = require("./migrations/provider");
-class Database {
+import assert from 'node:assert';
+import { EventEmitter } from 'node:events';
+import { Kysely, Migrator, PostgresDialect, } from 'kysely';
+// eslint-disable-next-line import/default
+import pg from 'pg';
+// eslint-disable-next-line import/no-named-as-default-member
+const { Pool: PgPool, types: pgTypes } = pg;
+import { dbLogger } from '../logger.js';
+import * as migrations from './migrations/index.js';
+import { DbMigrationProvider } from './migrations/provider.js';
+export class Database {
     constructor(opts, instances) {
-        Object.defineProperty(this, "opts", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: opts
-        });
-        Object.defineProperty(this, "pool", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "migrator", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "txEvt", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new node_stream_1.EventEmitter()
-        });
-        Object.defineProperty(this, "destroyed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
+        this.opts = opts;
+        this.txEvt = new EventEmitter();
+        this.destroyed = false;
         // if instances are provided, use those
         if (instances) {
             this.db = instances.db;
@@ -91,14 +22,14 @@ class Database {
             // else create a pool & connect
             const { schema, url } = opts;
             const pool = opts.pool ??
-                new pg_1.Pool({
+                new PgPool({
                     connectionString: url,
                     max: opts.poolSize,
                     maxUses: opts.poolMaxUses,
                     idleTimeoutMillis: opts.poolIdleTimeoutMs,
                 });
             // Select count(*) and other pg bigints as js integer
-            pg_1.types.setTypeParser(pg_1.types.builtins.INT8, (n) => parseInt(n, 10));
+            pgTypes.setTypeParser(pgTypes.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}`);
@@ -112,14 +43,14 @@ class Database {
                 }
             });
             this.pool = pool;
-            this.db = new kysely_1.Kysely({
-                dialect: new kysely_1.PostgresDialect({ pool }),
+            this.db = new Kysely({
+                dialect: new PostgresDialect({ pool }),
             });
         }
-        this.migrator = new kysely_1.Migrator({
+        this.migrator = new Migrator({
             db: this.db,
             migrationTableSchema: opts.schema,
-            provider: new provider_1.DbMigrationProvider(migrations),
+            provider: new DbMigrationProvider(migrations),
         });
     }
     get schema() {
@@ -129,10 +60,10 @@ class Database {
         return this.db.isTransaction;
     }
     assertTransaction() {
-        (0, node_assert_1.default)(this.isTransaction, 'Transaction required');
+        assert(this.isTransaction, 'Transaction required');
     }
     assertNotTransaction() {
-        (0, node_assert_1.default)(!this.isTransaction, 'Cannot be in a transaction');
+        assert(!this.isTransaction, 'Cannot be in a transaction');
     }
     async transaction(fn) {
         const leakyTxPlugin = new LeakyTxPlugin();
@@ -194,20 +125,14 @@ class Database {
         return results;
     }
 }
-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');
+export default Database;
+const onPoolError = (err) => dbLogger.error({ err }, 'db pool error');
+const onClientError = (err) => dbLogger.error({ err }, 'db client error');
 // utils
 // -------
 class LeakyTxPlugin {
     constructor() {
-        Object.defineProperty(this, "txOver", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
+        this.txOver = false;
     }
     endTx() {
         this.txOver = true;

package/dist/db/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { EventEmitter } from 'node:stream'\nimport {\n  Kysely,\n  KyselyPlugin,\n  Migrator,\n  PluginTransformQueryArgs,\n  PluginTransformResultArgs,\n  PostgresDialect,\n  QueryResult,\n  RootOperationNode,\n  UnknownRow,\n} from 'kysely'\nimport { Pool as PgPool, types as pgTypes } from 'pg'\nimport TypedEmitter from 'typed-emitter'\nimport { dbLogger } from '../logger'\nimport * as migrations from './migrations'\nimport { DbMigrationProvider } from './migrations/provider'\nimport { DatabaseSchema, DatabaseSchemaType } from './schema'\nimport { PgOptions } from './types'\n\nexport class Database {\n  pool: PgPool\n  db: DatabaseSchema\n  migrator: Migrator\n  txEvt = new EventEmitter() as TxnEmitter\n  destroyed = false\n\n  constructor(\n    public opts: PgOptions,\n    instances?: { db: DatabaseSchema; pool: PgPool },\n  ) {\n    // if instances are provided, use those\n    if (instances) {\n      this.db = instances.db\n      this.pool = instances.pool\n    } else {\n      // else create a pool & connect\n      const { schema, url } = opts\n      const pool =\n        opts.pool ??\n        new PgPool({\n          connectionString: url,\n          max: opts.poolSize,\n          maxUses: opts.poolMaxUses,\n          idleTimeoutMillis: opts.poolIdleTimeoutMs,\n        })\n\n      // Select count(*) and other pg bigints as js integer\n      pgTypes.setTypeParser(pgTypes.builtins.INT8, (n) => parseInt(n, 10))\n\n      // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)\n      if (schema && !/^[a-z_]+$/i.test(schema)) {\n        throw new Error(\n          `Postgres schema must only contain [A-Za-z_]: ${schema}`,\n        )\n      }\n\n      pool.on('error', onPoolError)\n      pool.on('connect', (client) => {\n        client.on('error', onClientError)\n        if (schema) {\n          // Shared objects such as extensions will go in the public schema\n          client.query(`SET search_path TO \"${schema}\",public;`)\n        }\n      })\n\n      this.pool = pool\n      this.db = new Kysely<DatabaseSchemaType>({\n        dialect: new PostgresDialect({ pool }),\n      })\n    }\n\n    this.migrator = new Migrator({\n      db: this.db,\n      migrationTableSchema: opts.schema,\n      provider: new DbMigrationProvider(migrations),\n    })\n  }\n\n  get schema(): string | undefined {\n    return this.opts.schema\n  }\n\n  get isTransaction() {\n    return this.db.isTransaction\n  }\n\n  assertTransaction() {\n    assert(this.isTransaction, 'Transaction required')\n  }\n\n  assertNotTransaction() {\n    assert(!this.isTransaction, 'Cannot be in a transaction')\n  }\n\n  async transaction<T>(fn: (db: Database) => Promise<T>): Promise<T> {\n    const leakyTxPlugin = new LeakyTxPlugin()\n    const { dbTxn, txRes } = await this.db\n      .withPlugin(leakyTxPlugin)\n      .transaction()\n      .execute(async (txn) => {\n        const dbTxn = new Database(this.opts, {\n          db: txn,\n          pool: this.pool,\n        })\n        const txRes = await fn(dbTxn)\n          .catch(async (err) => {\n            leakyTxPlugin.endTx()\n            // ensure that all in-flight queries are flushed & the connection is open\n            await dbTxn.db.getExecutor().provideConnection(noopAsync)\n            throw err\n          })\n          .finally(() => leakyTxPlugin.endTx())\n        return { dbTxn, txRes }\n      })\n    dbTxn?.txEvt.emit('commit')\n    return txRes\n  }\n\n  onCommit(fn: () => void) {\n    this.assertTransaction()\n    this.txEvt.once('commit', fn)\n  }\n\n  async close(): Promise<void> {\n    if (this.destroyed) return\n    await this.db.destroy()\n    this.destroyed = true\n  }\n\n  async migrateToOrThrow(migration: string) {\n    if (this.schema) {\n      await this.db.schema.createSchema(this.schema).ifNotExists().execute()\n    }\n    const { error, results } = await this.migrator.migrateTo(migration)\n    if (error) {\n      throw error\n    }\n    if (!results) {\n      throw new Error('An unknown failure occurred while migrating')\n    }\n    return results\n  }\n\n  async migrateToLatestOrThrow() {\n    if (this.schema) {\n      await this.db.schema.createSchema(this.schema).ifNotExists().execute()\n    }\n    const { error, results } = await this.migrator.migrateToLatest()\n    if (error) {\n      throw error\n    }\n    if (!results) {\n      throw new Error('An unknown failure occurred while migrating')\n    }\n    return results\n  }\n}\n\nexport default Database\n\nconst onPoolError = (err: Error) => dbLogger.error({ err }, 'db pool error')\nconst onClientError = (err: Error) => dbLogger.error({ err }, 'db client error')\n\n// utils\n// -------\n\nclass LeakyTxPlugin implements KyselyPlugin {\n  private txOver = false\n\n  endTx() {\n    this.txOver = true\n  }\n\n  transformQuery(args: PluginTransformQueryArgs): RootOperationNode {\n    if (this.txOver) {\n      throw new Error('tx already failed')\n    }\n    return args.node\n  }\n\n  async transformResult(\n    args: PluginTransformResultArgs,\n  ): Promise<QueryResult<UnknownRow>> {\n    return args.result\n  }\n}\n\ntype TxnEmitter = TypedEmitter<TxnEvents>\n\ntype TxnEvents = {\n  commit: () => void\n}\n\nconst noopAsync = async () => {}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { EventEmitter } from 'node:events'\nimport {\n  Kysely,\n  KyselyPlugin,\n  Migrator,\n  PluginTransformQueryArgs,\n  PluginTransformResultArgs,\n  PostgresDialect,\n  QueryResult,\n  RootOperationNode,\n  UnknownRow,\n} from 'kysely'\n// eslint-disable-next-line import/default\nimport pg from 'pg'\n// eslint-disable-next-line import/no-named-as-default-member\nconst { Pool: PgPool, types: pgTypes } = pg\ntype PgPool = InstanceType<typeof PgPool>\nimport type TypedEmitter from 'typed-emitter'\nimport { dbLogger } from '../logger.js'\nimport * as migrations from './migrations/index.js'\nimport { DbMigrationProvider } from './migrations/provider.js'\nimport { DatabaseSchema, DatabaseSchemaType } from './schema/index.js'\nimport { PgOptions } from './types.js'\n\nexport class Database {\n  pool: PgPool\n  db: DatabaseSchema\n  migrator: Migrator\n  txEvt = new EventEmitter() as TxnEmitter\n  destroyed = false\n\n  constructor(\n    public opts: PgOptions,\n    instances?: { db: DatabaseSchema; pool: PgPool },\n  ) {\n    // if instances are provided, use those\n    if (instances) {\n      this.db = instances.db\n      this.pool = instances.pool\n    } else {\n      // else create a pool & connect\n      const { schema, url } = opts\n      const pool =\n        opts.pool ??\n        new PgPool({\n          connectionString: url,\n          max: opts.poolSize,\n          maxUses: opts.poolMaxUses,\n          idleTimeoutMillis: opts.poolIdleTimeoutMs,\n        })\n\n      // Select count(*) and other pg bigints as js integer\n      pgTypes.setTypeParser(pgTypes.builtins.INT8, (n) => parseInt(n, 10))\n\n      // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)\n      if (schema && !/^[a-z_]+$/i.test(schema)) {\n        throw new Error(\n          `Postgres schema must only contain [A-Za-z_]: ${schema}`,\n        )\n      }\n\n      pool.on('error', onPoolError)\n      pool.on('connect', (client) => {\n        client.on('error', onClientError)\n        if (schema) {\n          // Shared objects such as extensions will go in the public schema\n          client.query(`SET search_path TO \"${schema}\",public;`)\n        }\n      })\n\n      this.pool = pool\n      this.db = new Kysely<DatabaseSchemaType>({\n        dialect: new PostgresDialect({ pool }),\n      })\n    }\n\n    this.migrator = new Migrator({\n      db: this.db,\n      migrationTableSchema: opts.schema,\n      provider: new DbMigrationProvider(migrations),\n    })\n  }\n\n  get schema(): string | undefined {\n    return this.opts.schema\n  }\n\n  get isTransaction() {\n    return this.db.isTransaction\n  }\n\n  assertTransaction() {\n    assert(this.isTransaction, 'Transaction required')\n  }\n\n  assertNotTransaction() {\n    assert(!this.isTransaction, 'Cannot be in a transaction')\n  }\n\n  async transaction<T>(fn: (db: Database) => Promise<T>): Promise<T> {\n    const leakyTxPlugin = new LeakyTxPlugin()\n    const { dbTxn, txRes } = await this.db\n      .withPlugin(leakyTxPlugin)\n      .transaction()\n      .execute(async (txn) => {\n        const dbTxn = new Database(this.opts, {\n          db: txn,\n          pool: this.pool,\n        })\n        const txRes = await fn(dbTxn)\n          .catch(async (err) => {\n            leakyTxPlugin.endTx()\n            // ensure that all in-flight queries are flushed & the connection is open\n            await dbTxn.db.getExecutor().provideConnection(noopAsync)\n            throw err\n          })\n          .finally(() => leakyTxPlugin.endTx())\n        return { dbTxn, txRes }\n      })\n    dbTxn?.txEvt.emit('commit')\n    return txRes\n  }\n\n  onCommit(fn: () => void) {\n    this.assertTransaction()\n    this.txEvt.once('commit', fn)\n  }\n\n  async close(): Promise<void> {\n    if (this.destroyed) return\n    await this.db.destroy()\n    this.destroyed = true\n  }\n\n  async migrateToOrThrow(migration: string) {\n    if (this.schema) {\n      await this.db.schema.createSchema(this.schema).ifNotExists().execute()\n    }\n    const { error, results } = await this.migrator.migrateTo(migration)\n    if (error) {\n      throw error\n    }\n    if (!results) {\n      throw new Error('An unknown failure occurred while migrating')\n    }\n    return results\n  }\n\n  async migrateToLatestOrThrow() {\n    if (this.schema) {\n      await this.db.schema.createSchema(this.schema).ifNotExists().execute()\n    }\n    const { error, results } = await this.migrator.migrateToLatest()\n    if (error) {\n      throw error\n    }\n    if (!results) {\n      throw new Error('An unknown failure occurred while migrating')\n    }\n    return results\n  }\n}\n\nexport default Database\n\nconst onPoolError = (err: Error) => dbLogger.error({ err }, 'db pool error')\nconst onClientError = (err: Error) => dbLogger.error({ err }, 'db client error')\n\n// utils\n// -------\n\nclass LeakyTxPlugin implements KyselyPlugin {\n  private txOver = false\n\n  endTx() {\n    this.txOver = true\n  }\n\n  transformQuery(args: PluginTransformQueryArgs): RootOperationNode {\n    if (this.txOver) {\n      throw new Error('tx already failed')\n    }\n    return args.node\n  }\n\n  async transformResult(\n    args: PluginTransformResultArgs,\n  ): Promise<QueryResult<UnknownRow>> {\n    return args.result\n  }\n}\n\ntype TxnEmitter = TypedEmitter.default<TxnEvents>\n\ntype TxnEvents = {\n  commit: () => void\n}\n\nconst noopAsync = async () => {}\n"]}

package/dist/db/migrations/20240108T220751294Z-init.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.up = up;
-exports.down = down;
-const kysely_1 = require("kysely");
-async function up(db) {
+import { sql } from 'kysely';
+export async function up(db) {
     await db.schema
         .createTable('mute_op')
         .addColumn('id', 'bigserial', (col) => col.primaryKey())
         .addColumn('type', 'int2', (col) => col.notNull()) // integer enum: 0->add, 1->remove, 2->clear
         .addColumn('actorDid', 'varchar', (col) => col.notNull())
         .addColumn('subject', 'varchar', (col) => col.notNull())
-        .addColumn('createdAt', 'timestamptz', (col) => col.notNull().defaultTo((0, kysely_1.sql) `CURRENT_TIMESTAMP`))
+        .addColumn('createdAt', 'timestamptz', (col) => col.notNull().defaultTo(sql `CURRENT_TIMESTAMP`))
         .execute();
     await db.schema
         .createTable('mute_item')
@@ -20,7 +16,7 @@ async function up(db) {
         .addPrimaryKeyConstraint('mute_item_pkey', ['actorDid', 'subject'])
         .execute();
 }
-async function down(db) {
+export async function down(db) {
     await db.schema.dropTable('mute_item').execute();
     await db.schema.dropTable('mute_op').execute();
 }

package/dist/db/migrations/20240108T220751294Z-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"20240108T220751294Z-init.js","sourceRoot":"","sources":["../../../src/db/migrations/20240108T220751294Z-init.ts"],"names":[],"mappings":";;AAEA,gBAkBC;AAED,oBAGC;AAzBD,mCAAoC;AAE7B,KAAK,UAAU,EAAE,CAAC,EAAmB;IAC1C,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,SAAS,CAAC;SACtB,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;SACvD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;SAC9F,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACxD,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACvD,SAAS,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CAC7C,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,IAAA,YAAG,EAAA,mBAAmB,CAAC,CAChD;SACA,OAAO,EAAE,CAAA;IACZ,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,WAAW,CAAC;SACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACxD,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACvD,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACrD,uBAAuB,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;SAClE,OAAO,EAAE,CAAA;AACd,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,EAAmB;IAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAA;IAChD,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAA;AAChD,CAAC","sourcesContent":["import { Kysely, sql } from 'kysely'\n\nexport async function up(db: Kysely<unknown>): Promise<void> {\n  await db.schema\n    .createTable('mute_op')\n    .addColumn('id', 'bigserial', (col) => col.primaryKey())\n    .addColumn('type', 'int2', (col) => col.notNull()) // integer enum: 0->add, 1->remove, 2->clear\n    .addColumn('actorDid', 'varchar', (col) => col.notNull())\n    .addColumn('subject', 'varchar', (col) => col.notNull())\n    .addColumn('createdAt', 'timestamptz', (col) =>\n      col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`),\n    )\n    .execute()\n  await db.schema\n    .createTable('mute_item')\n    .addColumn('actorDid', 'varchar', (col) => col.notNull())\n    .addColumn('subject', 'varchar', (col) => col.notNull())\n    .addColumn('fromId', 'bigint', (col) => col.notNull())\n    .addPrimaryKeyConstraint('mute_item_pkey', ['actorDid', 'subject'])\n    .execute()\n}\n\nexport async function down(db: Kysely<unknown>): Promise<void> {\n  await db.schema.dropTable('mute_item').execute()\n  await db.schema.dropTable('mute_op').execute()\n}\n"]}
+{"version":3,"file":"20240108T220751294Z-init.js","sourceRoot":"","sources":["../../../src/db/migrations/20240108T220751294Z-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,GAAG,EAAE,MAAM,QAAQ,CAAA;AAEpC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,EAAmB;IAC1C,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,SAAS,CAAC;SACtB,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;SACvD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;SAC9F,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACxD,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACvD,SAAS,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CAC7C,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,GAAG,CAAA,mBAAmB,CAAC,CAChD;SACA,OAAO,EAAE,CAAA;IACZ,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,WAAW,CAAC;SACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACxD,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACvD,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACrD,uBAAuB,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;SAClE,OAAO,EAAE,CAAA;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAmB;IAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAA;IAChD,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAA;AAChD,CAAC","sourcesContent":["import { Kysely, sql } from 'kysely'\n\nexport async function up(db: Kysely<unknown>): Promise<void> {\n  await db.schema\n    .createTable('mute_op')\n    .addColumn('id', 'bigserial', (col) => col.primaryKey())\n    .addColumn('type', 'int2', (col) => col.notNull()) // integer enum: 0->add, 1->remove, 2->clear\n    .addColumn('actorDid', 'varchar', (col) => col.notNull())\n    .addColumn('subject', 'varchar', (col) => col.notNull())\n    .addColumn('createdAt', 'timestamptz', (col) =>\n      col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`),\n    )\n    .execute()\n  await db.schema\n    .createTable('mute_item')\n    .addColumn('actorDid', 'varchar', (col) => col.notNull())\n    .addColumn('subject', 'varchar', (col) => col.notNull())\n    .addColumn('fromId', 'bigint', (col) => col.notNull())\n    .addPrimaryKeyConstraint('mute_item_pkey', ['actorDid', 'subject'])\n    .execute()\n}\n\nexport async function down(db: Kysely<unknown>): Promise<void> {\n  await db.schema.dropTable('mute_item').execute()\n  await db.schema.dropTable('mute_op').execute()\n}\n"]}

package/dist/db/migrations/20240717T224303472Z-notif-ops.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.up = up;
-exports.down = down;
-const kysely_1 = require("kysely");
-async function up(db) {
+import { sql } from 'kysely';
+export async function up(db) {
     await db.schema
         .createTable('notif_op')
         .addColumn('id', 'bigserial', (col) => col.primaryKey())
         .addColumn('actorDid', 'varchar', (col) => col.notNull())
         .addColumn('priority', 'boolean')
-        .addColumn('createdAt', 'timestamptz', (col) => col.notNull().defaultTo((0, kysely_1.sql) `CURRENT_TIMESTAMP`))
+        .addColumn('createdAt', 'timestamptz', (col) => col.notNull().defaultTo(sql `CURRENT_TIMESTAMP`))
         .execute();
     await db.schema
         .createTable('notif_item')
@@ -18,7 +14,7 @@ async function up(db) {
         .addColumn('fromId', 'bigint', (col) => col.notNull())
         .execute();
 }
-async function down(db) {
+export async function down(db) {
     await db.schema.dropTable('notif_item').execute();
     await db.schema.dropTable('notif_op').execute();
 }