@deterministic-code/datasources-mysql 0.1.1 → 0.1.2

package/dist/connection.js

@@ -0,0 +1,64 @@
+import { DatasourceError, IsolationLevel, StatementTextRenderer, } from "@deterministic-code/datasources";
+import { createRequire } from "node:module";
+import { MysqlCommand } from "./command.js";
+import { mysql2Connect, } from "./i-mysql-engine.js";
+import { MysqlStatementRenderer } from "./MysqlStatementRenderer.js";
+import { MysqlTransaction } from "./transaction.js";
+const require = createRequire(import.meta.url);
+const isoSql = (isolation) => isolation === IsolationLevel.ReadUncommitted
+    ? "READ UNCOMMITTED"
+    : isolation === IsolationLevel.ReadCommitted
+        ? "READ COMMITTED"
+        : "REPEATABLE READ";
+export class MysqlConnection {
+    provider = "mysql";
+    url;
+    isOpen = false;
+    client;
+    connect;
+    static from = (options) => {
+        const url = options?.DATASOURCE_URL ?? "";
+        return new MysqlConnection({
+            url,
+            connect: mysql2Connect(require("mysql2/promise")),
+        });
+    };
+    constructor(options = {}) {
+        this.url = options.url ?? "";
+        this.connect = options.connect;
+    }
+    createCommand = () => new MysqlCommand(this, new StatementTextRenderer(t => new MysqlStatementRenderer(t)));
+    async open() {
+        if (this.isOpen)
+            throw new DatasourceError("Connection is already open");
+        if (!this.client) {
+            if (!this.connect)
+                throw new DatasourceError("MySQL engine is required");
+            this.client = await this.connect(this.url);
+        }
+        await this.client.query("SET SESSION sql_mode = CONCAT(@@sql_mode, ',ANSI_QUOTES')");
+        this.isOpen = true;
+    }
+    async close() {
+        await this.client?.end();
+        this.client = undefined;
+        this.isOpen = false;
+    }
+    [Symbol.asyncDispose] = () => this.close();
+    async startTransaction(isolation = IsolationLevel.Serializable) {
+        this.ensureOpen();
+        const client = this.require();
+        await client.query(`SET TRANSACTION ISOLATION LEVEL ${isoSql(isolation)}`);
+        await client.beginTransaction();
+        return new MysqlTransaction(this, isolation);
+    }
+    ensureOpen() {
+        if (!this.isOpen)
+            throw new DatasourceError("Connection is not open");
+    }
+    require() {
+        if (!this.client)
+            throw new DatasourceError("Connection is not open");
+        return this.client;
+    }
+}

package/dist/converters/BinaryConverter.d.ts

@@ -1,4 +1,4 @@
-import { TypeConverter, type Cell } from "@datasources/core";
+import { TypeConverter, type Cell } from "@deterministic-code/datasources";
 export declare class BinaryConverter extends TypeConverter<Cell, Cell> {
     convert: (from: Cell) => Cell;
     reverseConvert: (to: Cell) => Cell;

package/dist/converters/BinaryConverter.js

@@ -0,0 +1,6 @@
+import { TypeConverter } from "@deterministic-code/datasources";
+const bytes = (value) => typeof value === "string" ? Uint8Array.from(Buffer.from(value, "base64")) : value;
+export class BinaryConverter extends TypeConverter {
+    convert = (from) => bytes(from);
+    reverseConvert = (to) => bytes(to);
+}

package/dist/converters/BoolConverter.d.ts

@@ -1,4 +1,4 @@
-import { TypeConverter, type Cell } from "@datasources/core";
+import { TypeConverter, type Cell } from "@deterministic-code/datasources";
 export declare class BoolConverter extends TypeConverter<Cell, Cell> {
     convert: (from: Cell) => Cell;
     reverseConvert: (to: Cell) => Cell;

package/dist/converters/BoolConverter.js

@@ -0,0 +1,5 @@
+import { TypeConverter } from "@deterministic-code/datasources";
+export class BoolConverter extends TypeConverter {
+    convert = (from) => (typeof from === "number" ? from !== 0 : from);
+    reverseConvert = (to) => (typeof to === "boolean" ? (to ? 1 : 0) : to);
+}

package/dist/converters/DateTimeConverter.d.ts

@@ -1,4 +1,4 @@
-import { TypeConverter, type Cell } from "@datasources/core";
+import { TypeConverter, type Cell } from "@deterministic-code/datasources";
 export declare class DateTimeConverter extends TypeConverter<Cell, Cell> {
     convert: (from: Cell) => Cell;
     reverseConvert: (to: Cell) => Cell;

package/dist/converters/DateTimeConverter.js

@@ -0,0 +1,10 @@
+import { TypeConverter } from "@deterministic-code/datasources";
+const stamp = (date) => date.toISOString().replace("T", " ").replace("Z", "");
+export class DateTimeConverter extends TypeConverter {
+    convert = (from) => typeof from === "string" ? new Date(from) : from;
+    reverseConvert = (to) => to instanceof Date
+        ? stamp(to)
+        : typeof to === "string" && /^\d{4}-\d{2}-\d{2}T/.test(to)
+            ? stamp(new Date(to))
+            : to;
+}

package/dist/converters/DecimalConverter.d.ts

@@ -1,4 +1,4 @@
-import { TypeConverter, type Cell } from "@datasources/core";
+import { TypeConverter, type Cell } from "@deterministic-code/datasources";
 export declare class DecimalConverter extends TypeConverter<Cell, Cell> {
     convert: (from: Cell) => Cell;
     reverseConvert: (to: Cell) => Cell;

package/dist/converters/DecimalConverter.js

@@ -0,0 +1,5 @@
+import { TypeConverter } from "@deterministic-code/datasources";
+export class DecimalConverter extends TypeConverter {
+    convert = (from) => from;
+    reverseConvert = (to) => typeof to === "number" ? String(to) : to;
+}

package/dist/converters/MysqlRowTypeConverters.d.ts

@@ -1,3 +1,3 @@
-import { type Cell, type TypeConverter } from "@datasources/core";
+import { type Cell, type TypeConverter } from "@deterministic-code/datasources";
 export declare const MysqlRowTypeConverters: Record<string, TypeConverter<Cell, Cell>>;
 export declare const reverse: (value: Cell) => Cell;

package/dist/converters/MysqlRowTypeConverters.js

@@ -0,0 +1,20 @@
+import { BinaryConverter } from "./BinaryConverter.js";
+import { BoolConverter } from "./BoolConverter.js";
+import { DateTimeConverter } from "./DateTimeConverter.js";
+import { DecimalConverter } from "./DecimalConverter.js";
+import { UuidConverter } from "./UuidConverter.js";
+export const MysqlRowTypeConverters = {
+    bool: new BoolConverter(),
+    datetime: new DateTimeConverter(),
+    uuid: new UuidConverter(),
+    decimal: new DecimalConverter(),
+    binary: new BinaryConverter(),
+};
+export const reverse = (value) => typeof value === "boolean"
+    ? MysqlRowTypeConverters.bool.reverseConvert(value)
+    : value instanceof Date
+        || (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T/.test(value))
+        ? MysqlRowTypeConverters.datetime.reverseConvert(value)
+        : value instanceof Uint8Array
+            ? MysqlRowTypeConverters.binary.reverseConvert(value)
+            : value;

package/dist/converters/UuidConverter.d.ts

@@ -1,4 +1,4 @@
-import { TypeConverter, type Cell } from "@datasources/core";
+import { TypeConverter, type Cell } from "@deterministic-code/datasources";
 export declare class UuidConverter extends TypeConverter<Cell, Cell> {
     convert: (from: Cell) => Cell;
     reverseConvert: (to: Cell) => Cell;

package/dist/converters/UuidConverter.js

@@ -0,0 +1,5 @@
+import { TypeConverter } from "@deterministic-code/datasources";
+export class UuidConverter extends TypeConverter {
+    convert = (from) => from;
+    reverseConvert = (to) => to;
+}

package/dist/i-mysql-engine.d.ts

@@ -1,4 +1,4 @@
-import type { Parameter } from "@datasources/core";
+import type { Parameter } from "@deterministic-code/datasources";
 import type { Cells, Scalar } from "./scalar.js";
 export interface MysqlExecuteResult {
     rowsAffected: number;

package/dist/i-mysql-engine.js

@@ -0,0 +1,14 @@
+export const mysql2Connect = (mysql) => async (uri) => {
+    const client = (await mysql.createConnection({
+        uri,
+        namedPlaceholders: true,
+    }));
+    return {
+        query: (sql, params) => client.query(sql, params),
+        queryRows: (sql, params) => client.connection.query(sql, params).stream(),
+        beginTransaction: () => client.beginTransaction(),
+        commit: () => client.commit(),
+        rollback: () => client.rollback(),
+        end: () => client.end(),
+    };
+};

package/dist/index.js

@@ -0,0 +1 @@
+export { MysqlDriver } from "./MysqlDriver.js";

package/dist/scalar.js

@@ -0,0 +1 @@
+export {};

package/dist/transaction.d.ts

@@ -1,4 +1,4 @@
-import { type ITransaction, type IsolationLevelName } from "@datasources/core";
+import { type ITransaction, type IsolationLevelName } from "@deterministic-code/datasources";
 import type { MysqlConnection } from "./connection.js";
 export declare class MysqlTransaction implements ITransaction {
     readonly connection: MysqlConnection;

package/dist/transaction.js

@@ -0,0 +1,15 @@
+import { IsolationLevel, } from "@deterministic-code/datasources";
+export class MysqlTransaction {
+    connection;
+    isolation;
+    constructor(connection, isolation = IsolationLevel.ReadCommitted) {
+        this.connection = connection;
+        this.isolation = isolation;
+    }
+    async commit() {
+        await this.connection.require().commit();
+    }
+    async abort() {
+        await this.connection.require().rollback();
+    }
+}

package/package.json

@@ -1,25 +1,24 @@
 {
   "name": "@deterministic-code/datasources-mysql",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
-  "main": "./src/index.ts",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.js",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.js",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "files": [
-    "dist",
-    "src"
+    "dist"
   ],
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "mysql2": "^3.14.0",
-    "@deterministic-code/datasources": "^0.1.1"
+    "@deterministic-code/datasources": "^0.1.2",
+    "mysql2": "^3.14.0"
   }
 }

package/src/MysqlBulkUpdateStatementTextRenderer.ts

@@ -1,10 +0,0 @@
-import { BulkUpdateStatementTextRenderer, type BulkUpdateStatement } from "@datasources/core";
-
-export class MysqlBulkUpdateStatementTextRenderer extends BulkUpdateStatementTextRenderer {
-  override render = (statement: BulkUpdateStatement): string => {
-    const assigns = statement.set
-      .map((column) => `${statement.table}.${column} = data.${column}`)
-      .join(", ");
-    return `UPDATE ${statement.table} JOIN ${this.source(statement)} ON ${this.on(statement)} SET ${assigns}`;
-  };
-}

package/src/MysqlCreateTableStatementRenderer.ts

@@ -1,12 +0,0 @@
-import { CreateTableStatementTextRenderer, type Column } from "@datasources/core";
-import { columnTypes } from "./columnTypes.ts";
-
-export class MysqlCreateTableStatementRenderer extends CreateTableStatementTextRenderer {
-  protected typeName(column: Column): string {
-    return columnTypes[column.type] ?? column.type;
-  }
-
-  protected identity(column: Column): string {
-    return column.identity ? " AUTO_INCREMENT" : "";
-  }
-}

package/src/MysqlDriver.ts

@@ -1,54 +0,0 @@
-import {
-  DatasourceError,
-  StatementTextRenderer,
-  type Cell,
-  type DatasourceOptions,
-  type ICommand,
-  type IConnection,
-  type IDriver,
-  type Information,
-  type ITransaction,
-  type IsolationLevel,
-  type TypeConverter,
-} from "@datasources/core";
-import { MysqlConnection } from "./connection.ts";
-import { MysqlCommand } from "./command.ts";
-import { MysqlTransaction } from "./transaction.ts";
-import { MysqlRowTypeConverters } from "./converters/MysqlRowTypeConverters.ts";
-import { MysqlStatementRenderer } from "./MysqlStatementRenderer.ts";
-import { columnTypes } from "./columnTypes.ts";
-
-export { columnTypes };
-
-const statements = new StatementTextRenderer(t => new MysqlStatementRenderer(t));
-
-export class MysqlDriver implements IDriver {
-  readonly statementRenderer = statements;
-  readonly information: Information = {
-    descriptions: [
-      "MySQL / MariaDB server driver.",
-      "Full connection, command, transaction, and repository support.",
-    ],
-    overrides: [
-      "Overrides SelectInsertedIdStatement to SELECT LAST_INSERT_ID() AS {column}",
-      "Overrides CreateTableStatement identity to AUTO_INCREMENT",
-      "Overrides CreateTableStatement type mapping (int→INT, uuid→CHAR(36), string/datetime→TEXT, bool→TINYINT, decimal→DECIMAL(18,4), float→DOUBLE, binary→BLOB)",
-    ],
-    changeLogs: [],
-  };
-  rowTypeConverters: Record<string, TypeConverter<Cell, Cell>> = MysqlRowTypeConverters;
-  columnType = (name: string): string =>
-    columnTypes[name] ??
-    (() => {
-      throw new DatasourceError(`Unknown mysql type "${name}"`);
-    })();
-  connection = (options?: DatasourceOptions): IConnection =>
-    MysqlConnection.from(options);
-  command = (connection: IConnection): ICommand =>
-    new MysqlCommand(connection as MysqlConnection, statements);
-  transaction = (
-    connection: IConnection,
-    isolation: IsolationLevel = "readCommitted",
-  ): ITransaction =>
-    new MysqlTransaction(connection as MysqlConnection, isolation);
-}

package/src/MysqlStatementRenderer.test.ts

@@ -1,64 +0,0 @@
-import {
-  BulkUpdateStatement,
-  ColumnDefault,
-  CreateTableStatement,
-  DefaultStatementTextRenderer,
-  ForeignKey,
-  SelectInsertedIdStatement,
-  NotNull,
-  PrimaryKey,
-  ReferentialAction,
-  SelectStatement,
-  StatementTextRenderer,
-} from "@datasources/core";
-import { describe, expect, it } from "vitest";
-import { MysqlCreateTableStatementRenderer } from "./MysqlCreateTableStatementRenderer.ts";
-import { MysqlStatementRenderer } from "./MysqlStatementRenderer.ts";
-
-describe("MysqlStatementRenderer", () => {
-  const renderer = new StatementTextRenderer(t => new MysqlStatementRenderer(t));
-
-  it("renders inserted id and create table", () => {
-    expect(renderer.render(new SelectInsertedIdStatement("users", "id"))).toBe(
-      "SELECT LAST_INSERT_ID() AS id",
-    );
-
-    const create = new CreateTableStatement(
-      "orders",
-      [
-        { name: "id", type: "INTEGER", default: new ColumnDefault("0", "df_id"), notNull: new NotNull("nn_id") },
-        { name: "user_id", type: "INTEGER" },
-      ],
-      [
-        new PrimaryKey("pk_orders", ["id"]),
-        new ForeignKey("fk_orders_user", ["user_id"], "users", ["id"], ReferentialAction.Cascade),
-      ],
-    );
-    expect(renderer.render(create)).toBe(new MysqlCreateTableStatementRenderer().render(create));
-    expect(renderer.render(new SelectStatement({ table: "users", fields: ["id"] }))).toBe(
-      "SELECT id FROM users",
-    );
-  });
-
-  it("renders type default and identity", () => {
-    const create = new CreateTableStatement("users", [
-      { name: "id", type: "int", default: new ColumnDefault("0"), notNull: new NotNull(), identity: true },
-    ]);
-    expect(renderer.render(create)).toBe(
-      "CREATE TABLE users (id INT AUTO_INCREMENT DEFAULT 0 NOT NULL)",
-    );
-    expect(DefaultStatementTextRenderer.instance.render(create)).toBe(
-      "CREATE TABLE users (id int DEFAULT 0 NOT NULL)",
-    );
-  });
-
-  it("renders bulk update as join", () => {
-    const update = new BulkUpdateStatement("parents", ["label"], ["id"], [
-      { fields: [{ name: "label", value: "a" }], ids: [{ name: "id", value: 1 }] },
-      { fields: [{ name: "label", value: "b" }], ids: [{ name: "id", value: 2 }] },
-    ]);
-    expect(renderer.render(update)).toBe(
-      "UPDATE parents JOIN (SELECT $label__0 AS label, $id__0 AS id UNION ALL SELECT $label__1 AS label, $id__1 AS id) AS data ON parents.id = data.id SET parents.label = data.label",
-    );
-  });
-});

package/src/MysqlStatementRenderer.ts

@@ -1,34 +0,0 @@
-import {
-  BulkUpdateStatement,
-  CreateTableStatement,
-  SelectInsertedIdStatement,
-  SelectInsertedIdStatementTextRenderer,
-  StatementRenderer,
-  type StatementTextRenderer,
-} from "@datasources/core";
-import { MysqlBulkUpdateStatementTextRenderer } from "./MysqlBulkUpdateStatementTextRenderer.ts";
-import { MysqlCreateTableStatementRenderer } from "./MysqlCreateTableStatementRenderer.ts";
-
-class MysqlSelectInsertedIdStatementTextRenderer extends SelectInsertedIdStatementTextRenderer {
-  override render(statement: SelectInsertedIdStatement): string {
-    return `SELECT LAST_INSERT_ID() AS ${statement.column}`;
-  }
-}
-
-export class MysqlStatementRenderer extends StatementRenderer {
-  constructor(text: StatementTextRenderer) {
-    super(text);
-  }
-
-  protected override visitSelectInsertedId(inserted: SelectInsertedIdStatement): string {
-    return new MysqlSelectInsertedIdStatementTextRenderer().render(inserted);
-  }
-
-  protected override visitCreateTable(create: CreateTableStatement): string {
-    return new MysqlCreateTableStatementRenderer().render(create);
-  }
-
-  protected override visitBulkUpdate(update: BulkUpdateStatement): string {
-    return new MysqlBulkUpdateStatementTextRenderer().render(update);
-  }
-}

package/src/bind.ts

@@ -1,31 +0,0 @@
-import { parametersToRecord, type Cell, type Parameter } from "@datasources/core";
-import { reverse } from "./converters/MysqlRowTypeConverters.ts";
-import type { Scalar } from "./scalar.ts";
-
-const NAME = /\$([A-Za-z_][A-Za-z0-9_]*)/g;
-const TOKEN = /\$[A-Za-z_][A-Za-z0-9_]*|'[^']*'|"[^"]*"|`[^`]*`|\b[A-Za-z_][A-Za-z0-9_]*\b/g;
-
-export const withoutReturning = (sql: string): string =>
-  sql.replace(/\s+RETURNING\b[^;]*$/i, "");
-
-const quoteReserved = (sql: string): string =>
-  sql.replace(TOKEN, (token, offset: number) => {
-    const skip = token.startsWith("$") || token.startsWith("'") || token.startsWith("\"") || token.startsWith("`");
-    const reserved = !skip && token.toLowerCase() === "key"
-      && !/\b(?:PRIMARY|FOREIGN|UNIQUE)\s+$/i.test(sql.slice(0, offset));
-    const mixed = !skip && /[A-Z]/.test(token) && /[a-z]/.test(token);
-    return reserved || mixed ? `\`${token}\`` : token;
-  });
-
-export const toMysql = (sql: string): string =>
-  quoteReserved(withoutReturning(sql)).replace(NAME, (_match, name: string) => `:${name}`);
-
-export const bindParameters = (
-  parameters?: Parameter[] | null,
-): Record<string, Scalar> => {
-  const record = parametersToRecord(parameters);
-  const bound: Record<string, Scalar> = {};
-  for (const [name, value] of Object.entries(record))
-    bound[name] = reverse(value as Cell) as Scalar;
-  return bound;
-};

package/src/columnTypes.ts

@@ -1,10 +0,0 @@
-export const columnTypes: Record<string, string> = {
-  int: "INT",
-  uuid: "CHAR(36)",
-  string: "TEXT",
-  datetime: "TEXT",
-  bool: "TINYINT",
-  decimal: "DECIMAL(18,4)",
-  float: "DOUBLE",
-  binary: "BLOB",
-};