@pikku/kysely 0.6.0 → 0.6.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pikku/pino
 
+## 0.6.2
+
+### Patch Changes
+
+- 990c2c2: fix: not requiring kysely as a peerDependency
+
+## 0.6.1
+
+### Patch Changes
+
+- 8fcaa7e: feat: adding kysely wrapper
+- Updated dependencies [eb8a8b4]
+  - @pikku/core@0.6.13
+
 ## 0.6.1
 
 ### Patch Changes

package/bin/pikku-kysely-pure.ts

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+import { mkdir, readFile, writeFile } from 'fs/promises'
+import { dirname } from 'path'
+import { fileURLToPath } from 'url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+const main = async (output: string, input?: string) => {
+  let execDirectory = process.cwd()
+  let inputPath = `${__dirname}/../node_modules/kysely-codegen/dist/db.d.ts`
+  if (input) {
+    inputPath = `${execDirectory}/${input}`
+  }
+
+  let kysely
+  try {
+    kysely = await readFile(inputPath, 'utf8')
+  } catch {
+    console.error(`Could not read file ${input}`)
+    process.exit(1)
+  }
+
+  kysely = kysely
+    .replace(/import type { ColumnType } from "kysely";/, '')
+    .replace(
+      new RegExp('^export\\s+type\\s+Generated<[^>]+>.*?;\\s*$', 'ms'),
+      ''
+    )
+    .replace(/Generated<(.*)>/g, '$1')
+    .replace(/export type Timestamp =.*;/, 'export type Timestamp = Date')
+  console.log('Writing kysely-pure.gen.ts')
+
+  const outputPath = `${execDirectory}/${output}`
+  const outputDirectory = dirname(outputPath)
+  await mkdir(outputDirectory, { recursive: true })
+  await writeFile(outputPath, kysely, 'utf-8')
+  console.log(outputPath)
+}
+
+if (process.argv.length !== 4) {
+  console.error('Expected the following usage:')
+  console.error('node kysely-pure.js <output> <input>')
+  process.exit(1)
+}
+
+const [, , output, input] = process.argv
+main(output!, input)

package/dist/bin/pikku-kysely-pure.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin/pikku-kysely-pure.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+import { mkdir, readFile, writeFile } from 'fs/promises';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const main = async (output, input) => {
+    let execDirectory = process.cwd();
+    let inputPath = `${__dirname}/../node_modules/kysely-codegen/dist/db.d.ts`;
+    if (input) {
+        inputPath = `${execDirectory}/${input}`;
+    }
+    let kysely;
+    try {
+        kysely = await readFile(inputPath, 'utf8');
+    }
+    catch {
+        console.error(`Could not read file ${input}`);
+        process.exit(1);
+    }
+    kysely = kysely
+        .replace(/import type { ColumnType } from "kysely";/, '')
+        .replace(new RegExp('^export\\s+type\\s+Generated<[^>]+>.*?;\\s*$', 'ms'), '')
+        .replace(/Generated<(.*)>/g, '$1')
+        .replace(/export type Timestamp =.*;/, 'export type Timestamp = Date');
+    console.log('Writing kysely-pure.gen.ts');
+    const outputPath = `${execDirectory}/${output}`;
+    const outputDirectory = dirname(outputPath);
+    await mkdir(outputDirectory, { recursive: true });
+    await writeFile(outputPath, kysely, 'utf-8');
+    console.log(outputPath);
+};
+if (process.argv.length !== 4) {
+    console.error('Expected the following usage:');
+    console.error('node kysely-pure.js <output> <input>');
+    process.exit(1);
+}
+const [, , output, input] = process.argv;
+main(output, input);

package/dist/{index.d.ts → src/index.d.ts}

@@ -1,2 +1,3 @@
 export { KyselyChannelStore } from './kysely-channel-store.js';
 export { KyselyEventHubStore } from './kysely-eventhub-store.js';
+export { PikkuKysely } from './pikku-kysely.js';

package/dist/{index.js → src/index.js}

@@ -1,2 +1,3 @@
 export { KyselyChannelStore } from './kysely-channel-store.js';
 export { KyselyEventHubStore } from './kysely-eventhub-store.js';
+export { PikkuKysely } from './pikku-kysely.js';

package/dist/src/pikku-kysely.d.ts

@@ -0,0 +1,12 @@
+import type { Logger } from '@pikku/core/services';
+import { Kysely } from 'kysely';
+import postgres from 'postgres';
+export declare class PikkuKysely<DB> {
+    private logger;
+    private poolConfig;
+    kysely: Kysely<DB>;
+    private postgres;
+    constructor(logger: Logger, poolConfig: postgres.Options<{}>, defaultSchemaName: string);
+    init(): Promise<void>;
+    close(): Promise<void>;
+}

package/dist/src/pikku-kysely.js

@@ -0,0 +1,39 @@
+import { CamelCasePlugin, Kysely } from 'kysely';
+import { PostgresJSDialect } from 'kysely-postgres-js';
+import postgres from 'postgres';
+export class PikkuKysely {
+    logger;
+    poolConfig;
+    kysely;
+    postgres;
+    constructor(logger, poolConfig, defaultSchemaName) {
+        this.logger = logger;
+        this.poolConfig = poolConfig;
+        delete poolConfig.ssl;
+        this.postgres = postgres(poolConfig);
+        this.kysely = new Kysely({
+            dialect: new PostgresJSDialect({
+                postgres: this.postgres,
+            }),
+            plugins: [new CamelCasePlugin()],
+        });
+        if (defaultSchemaName) {
+            this.kysely = this.kysely.withSchema(defaultSchemaName);
+        }
+    }
+    async init() {
+        this.logger.info(`Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`);
+        try {
+            const response = await this.postgres `SELECT version();`;
+            const version = response[0]?.version;
+            this.logger.info(version);
+        }
+        catch (error) {
+            this.logger.error('Error connecting to database', error);
+            process.exit(1);
+        }
+    }
+    async close() {
+        await this.kysely.destroy();
+    }
+}

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/index.ts","../src/kysely-channel-store.ts","../src/kysely-eventhub-store.ts","../src/pikku-kysely.ts","../bin/pikku-kysely-pure.ts"],"version":"5.7.3"}

package/package.json

@@ -1,25 +1,34 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
-  "module": "dist/index.js",
-  "main": "dist/index.js",
+  "module": "dist/src/index.js",
+  "main": "dist/src/index.js",
+  "bin": {
+    "kysely-pure": "dist/bin/kysely-pure.js"
+  },
   "type": "module",
   "scripts": {
     "tsc": "tsc",
+    "ncu": "npx npm-check-updates",
     "build:esm": "tsc -b",
     "build": "yarn build:esm",
-    "ncu": "ncu",
     "release": "npm run build && npm test"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.6.7",
-    "kysely": "*"
+    "@pikku/core": "^0.6.13"
+  },
+  "dependencies": {
+    "kysely": "^0.27.6",
+    "kysely-postgres-js": "^2.0.0",
+    "postgres": "^3.4.5"
   },
   "devDependencies": {
-    "kysely": "latest",
-    "kysely-codegen": "latest",
+    "kysely": "^0.27.6",
+    "kysely-codegen": "^0.16.6",
+    "kysely-postgres-js": "^2.0.0",
+    "postgres": "^3.4.5",
     "typescript": "^5.6"
   }
 }

package/src/index.ts

@@ -1,2 +1,3 @@
 export { KyselyChannelStore } from './kysely-channel-store.js'
 export { KyselyEventHubStore } from './kysely-eventhub-store.js'
+export { PikkuKysely } from './pikku-kysely.js'

package/src/pikku-kysely.ts

@@ -0,0 +1,46 @@
+import type { Logger } from '@pikku/core/services'
+import { CamelCasePlugin, Kysely } from 'kysely'
+import { PostgresJSDialect } from 'kysely-postgres-js'
+import postgres from 'postgres'
+
+export class PikkuKysely<DB> {
+  public kysely: Kysely<DB>
+  private postgres: postgres.Sql<{}>
+
+  constructor(
+    private logger: Logger,
+    private poolConfig: postgres.Options<{}>,
+    defaultSchemaName: string
+  ) {
+    delete poolConfig.ssl
+    this.postgres = postgres(poolConfig)
+    this.kysely = new Kysely<DB>({
+      dialect: new PostgresJSDialect({
+        postgres: this.postgres,
+      }),
+      plugins: [new CamelCasePlugin()],
+    })
+
+    if (defaultSchemaName) {
+      this.kysely = this.kysely.withSchema(defaultSchemaName)
+    }
+  }
+
+  public async init() {
+    this.logger.info(
+      `Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`
+    )
+    try {
+      const response = await this.postgres`SELECT version();`
+      const version = response[0]?.version
+      this.logger.info(version)
+    } catch (error) {
+      this.logger.error('Error connecting to database', error)
+      process.exit(1)
+    }
+  }
+
+  public async close() {
+    await this.kysely.destroy()
+  }
+}

package/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src",
+    "rootDir": ".",
     "module": "Node16",
     "outDir": "dist",
     "target": "esnext",
     "declaration": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "bin/**/*.ts", "bin/pikku-kysely-pure.ts"],
   "exclude": ["**/*.test.ts", "node_modules", "bin/dist"],
   "references": [
     {

package/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./src/index.ts","./src/kysely-channel-store.ts","./src/kysely-eventhub-store.ts"],"version":"5.7.3"}