@dbos-inc/drizzle-datasource 4.28.4-preview → 4.28.7-preview

package/dist/index.d.mts

@@ -0,0 +1,31 @@
+import { Client, ClientConfig, Pool, PoolClient, PoolConfig } from 'pg';
+import { FunctionName } from '@dbos-inc/dbos-sdk';
+import { DBOSDataSource } from '@dbos-inc/dbos-sdk/datasource';
+import { NodePgDatabase } from 'drizzle-orm/node-postgres';
+import { PgTransactionConfig } from 'drizzle-orm/pg-core';
+export type TransactionConfig = Pick<PgTransactionConfig, 'isolationLevel' | 'accessMode'> & {
+    name?: string;
+};
+export interface transaction_completion {
+    workflow_id: string;
+    function_num: number;
+    output: string | null;
+    error: string | null;
+}
+export declare class DrizzleDataSource<CT = NodePgDatabase<{
+    [key: string]: object;
+}>> implements DBOSDataSource<TransactionConfig> {
+    #private;
+    readonly name: string;
+    static get client(): NodePgDatabase<{
+        [key: string]: object;
+    }>;
+    get client(): CT;
+    static initializeDBOSSchema(configOrClient: ClientConfig | Client | PoolClient, schemaName?: string): Promise<void>;
+    constructor(name: string, configOrPool: PoolConfig | Pool, entities?: {
+        [key: string]: object;
+    }, schemaName?: string);
+    runTransaction<T>(func: () => Promise<T>, config?: TransactionConfig): Promise<T>;
+    registerTransaction<This, Args extends unknown[], Return>(func: (this: This, ...args: Args) => Promise<Return>, config?: TransactionConfig & FunctionName): (this: This, ...args: Args) => Promise<Return>;
+    transaction(config?: TransactionConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: PropertyKey, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
+}

package/package.json

@@ -1,10 +1,23 @@
 {
   "name": "@dbos-inc/drizzle-datasource",
-  "version": "4.28.4-preview",
+  "version": "4.28.7-preview",
   "description": "DBOS DataSource library for Drizzle ORM with PostgreSQL support",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./package.json": "./package.json"
+  },
   "homepage": "https://docs.dbos.dev/",
   "repository": {
     "type": "git",
@@ -12,7 +25,7 @@
     "directory": "packages/drizzle-datasource"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.json",
+    "build": "tsc --project tsconfig.json && node scripts/emit-esm-types.js",
     "test": "jest --detectOpenHandles"
   },
   "dependencies": {

package/scripts/emit-esm-types.js

@@ -0,0 +1,6 @@
+const fs = require('fs');
+
+// ESM consumers need a .d.mts so the declarations' own imports resolve through the "import" condition.
+const declarations = fs.readFileSync('dist/index.d.ts', 'utf8');
+// The copied sourceMappingURL would point at a map that names index.d.ts as its file.
+fs.writeFileSync('dist/index.d.mts', declarations.replace(/^\/\/# sourceMappingURL=.*\n?/m, ''));

package/tests/esm-consumer.mts

@@ -0,0 +1,8 @@
+// Typechecked by esmtypes.test.ts, never executed: .mts makes it ESM regardless of the package type.
+import { DrizzleDataSource } from '@dbos-inc/drizzle-datasource';
+import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
+
+declare const dataSource: DrizzleDataSource;
+
+export const instanceClient: NodePgDatabase<{ [key: string]: object }> = dataSource.client;
+export const staticClient: NodePgDatabase<{ [key: string]: object }> = DrizzleDataSource.client;

package/tests/esmtypes.test.ts

@@ -0,0 +1,27 @@
+import { execFileSync } from 'child_process';
+import { readFileSync } from 'fs';
+import path from 'path';
+
+const packageRoot = path.join(__dirname, '..');
+
+describe('ESM type declarations', () => {
+  test('an ESM consumer under NodeNext typechecks against the built declarations', () => {
+    const tsc = require.resolve('typescript/bin/tsc');
+    const project = path.join(__dirname, 'tsconfig.esmcheck.json');
+    try {
+      execFileSync(process.execPath, [tsc, '--project', project], { cwd: packageRoot, stdio: 'pipe' });
+    } catch (error) {
+      const { stdout } = error as { stdout?: Buffer };
+      throw new Error(`ESM consumer failed to typecheck. Run 'npm run build' first.\n${stdout?.toString() ?? ''}`);
+    }
+  }, 120000);
+
+  test('the ESM declarations carry no reference to the CommonJS declaration map', () => {
+    const declarations = readFileSync(path.join(packageRoot, 'dist', 'index.d.mts'), 'utf8');
+    expect(declarations).not.toContain('sourceMappingURL');
+  });
+
+  test('the exports map still resolves the package manifest', () => {
+    expect(() => require.resolve('@dbos-inc/drizzle-datasource/package.json')).not.toThrow();
+  });
+});

package/tests/tsconfig.esmcheck.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "esnext",
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true
+  },
+  "files": ["esm-consumer.mts"]
+}