@profullstack/libsql-pg 0.1.0 → 0.1.2

package/index.d.ts

@@ -0,0 +1,73 @@
+// Type declarations for @profullstack/libsql-pg. The runtime mirrors @libsql/client;
+// values are typed loosely on purpose so a drop-in swap compiles.
+export type InValue = null | string | number | bigint | boolean | Uint8Array | Date;
+export type InArgs = InValue[] | Record<string, InValue>;
+export type InStatement = string | { sql: string; args?: InArgs };
+export interface Row { [column: string]: any; [index: number]: any; length: number }
+export interface ResultSet {
+  columns: string[];
+  columnTypes: string[];
+  rows: Row[];
+  rowsAffected: number;
+  lastInsertRowid: bigint | undefined;
+}
+export type TransactionMode = 'write' | 'read' | 'deferred';
+export interface Transaction {
+  execute(stmt: InStatement): Promise<ResultSet>;
+  batch(stmts: InStatement[]): Promise<ResultSet[]>;
+  executeMultiple(sql: string): Promise<void>;
+  commit(): Promise<void>;
+  rollback(): Promise<void>;
+  close(): void;
+  readonly closed: boolean;
+}
+export interface Client {
+  execute(stmt: InStatement): Promise<ResultSet>;
+  batch(stmts: InStatement[], mode?: TransactionMode): Promise<ResultSet[]>;
+  transaction(mode?: TransactionMode): Promise<Transaction>;
+  executeMultiple(sql: string): Promise<void>;
+  sync(): Promise<void>;
+  close(): void;
+  readonly closed: boolean;
+  readonly protocol: 'postgres';
+}
+export interface Config {
+  url: string;
+  authToken?: string;
+  syncUrl?: string;
+  dialect?: 'sqlite' | 'postgres';
+  pool?: { max?: number; idleTimeoutMillis?: number; connectionTimeoutMillis?: number };
+  ssl?: any;
+}
+export function createClient(config: Config): Client;
+export function connectionSettings(url: string, explicit?: Record<string, any>): Record<string, any>;
+export function rewriteSql(sql: string, opts?: Record<string, any>): string;
+export function rewriteStatement(sql: string, opts?: Record<string, any>): { sql: string; [k: string]: any };
+export function createRewriter(opts?: Record<string, any>): (sql: string) => { sql: string; [k: string]: any };
+export function rewriteFunctions(sql: string): string;
+export function insertTarget(sql: string): { table: string; columns: string[] } | null;
+export function jsonPathToArray(path: string): string;
+export function unsupportedIdioms(sql: string): string[];
+export function convertSchema(sql: string, opts?: Record<string, any>): string;
+export function convertStatement(stmt: string, ctx: any, opts?: Record<string, any>): string | null;
+export function convertDdl(sql: string): string;
+export function mapType(declared: string, opts?: Record<string, any>): string;
+export function positional(sql: string, args?: InValue[]): { sql: string; values: InValue[] };
+export function named(sql: string, args: Record<string, InValue>): { sql: string; values: InValue[] };
+export function bind(stmt: InStatement): { sql: string; values: InValue[] };
+export function prepare(stmt: InStatement, opts?: Record<string, any>): { sql: string; values: InValue[] };
+export function translateError(err: any, info?: Record<string, any>): Error;
+export function ftsError(table: string, sql: string): Error;
+export function toResultSet(res: any, opts?: Record<string, any>): ResultSet;
+export function makeRow(columns: string[], values: any[]): Row;
+export function emptyResultSet(): ResultSet;
+export function copyDatabase(opts: Record<string, any>): Promise<any>;
+export function verifyCopy(opts: Record<string, any>): Promise<any>;
+export function orderTables(tables: any[]): any[];
+export function referencedTables(sql: string): string[];
+export function userTables(master: any[]): any[];
+export function coerce(value: any, dataType: string): any;
+export function insertSql(table: string, cols: string[]): string;
+export function splitStatements(sql: string): string[];
+export function codeMask(sql: string): string;
+export function stripComments(sql: string): string;

package/index.js

@@ -5,4 +5,4 @@ export { positional, named, bind, prepare } from './src/bind.js';
 export { translateError, ftsError } from './src/errors.js';
 export { toResultSet, makeRow, emptyResultSet } from './src/result.js';
 export { copyDatabase, verifyCopy, orderTables, referencedTables, userTables, coerce, insertSql } from './src/copy.js';
-export { splitStatements, codeMask } from './src/sqlparse.js';
+export { splitStatements, codeMask, stripComments } from './src/sqlparse.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profullstack/libsql-pg",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Drop-in replacement for @libsql/client that talks to Postgres, plus the tools to move a Turso/libSQL database into it: the same execute/batch/transaction surface, SQLite idioms rewritten on the way through, a schema converter and a row copier.",
   "keywords": [
@@ -57,6 +57,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@profullstack/libsql-pg": "^0.1.1",
     "pg": "^8.13.0"
   },
   "peerDependencies": {
@@ -68,6 +69,9 @@
     }
   },
   "devDependencies": {
+    "@libsql/client": "^0.15.15"
+  },
+  "optionalDependencies": {
     "@libsql/client": "^0.15.0"
   }
 }

package/src/cli.js

@@ -79,7 +79,7 @@ export async function main(argv, io = {}) {
     });
     if (typeof flags.out === 'string') {
       await writeFile(flags.out, converted);
-      err(`wrote ${flags.out} (${converted.split('\n').filter((l) => /TODO/.test(l)).length} TODO line(s))\n`);
+      err(`wrote ${flags.out} (${converted.split('\n').filter((l) => /TODO/.test(l) && !/Review every TODO/.test(l)).length} TODO line(s))\n`);
     } else out(converted);
     return 0;
   }

package/src/schema.js

@@ -1,5 +1,5 @@
 import { rewriteFunctions, rewriteStatement } from './rewrite.js';
-import { codeMask, matchParen, quoteIdent, replaceCode, splitStatements, splitTopLevel, unquote } from './sqlparse.js';
+import { codeMask, matchParen, quoteIdent, replaceCode, splitStatements, splitTopLevel, stripComments, unquote } from './sqlparse.js';
 
 /**
  * SQLite DDL to Postgres DDL.
@@ -523,7 +523,7 @@ export function convertSchema(sql, opts = {}) {
   /** @type {ConvertContext} */
   const ctx = { tables: new Map(), usesPgcrypto: false, notes: [] };
   const out = [];
-  for (const stmt of splitStatements(sql)) {
+  for (const stmt of splitStatements(stripComments(sql))) {
     const converted = convertStatement(stmt, ctx, opts);
     if (converted !== null) out.push(converted);
   }

package/src/sqlparse.js

@@ -281,3 +281,40 @@ export function literalValue(text) {
   if (!/^'.*'$/s.test(t)) return null;
   return t.slice(1, -1).replace(/''/g, "'");
 }
+
+
+/**
+ * Drop `-- ...` and `/* ... *\/` comments outside string literals and quoted
+ * identifiers. Column definitions with a trailing comment otherwise parse the
+ * comment as a column named `--`.
+ * @param {string} sql
+ */
+export function stripComments(sql) {
+  let out = '';
+  let i = 0;
+  const len = sql.length;
+  while (i < len) {
+    const c = sql[i];
+    if (c === "'" || c === '"' || c === '`') {
+      let j = i + 1;
+      while (j < len) {
+        if (sql[j] === c) {
+          if (c === "'" && sql[j + 1] === "'") { j += 2; continue; }
+          break;
+        }
+        j++;
+      }
+      out += sql.slice(i, Math.min(j + 1, len));
+      i = j + 1;
+    } else if (c === '-' && sql[i + 1] === '-') {
+      while (i < len && sql[i] !== '\n') i++;
+    } else if (c === '/' && sql[i + 1] === '*') {
+      const end = sql.indexOf('*/', i + 2);
+      i = end === -1 ? len : end + 2;
+    } else {
+      out += c;
+      i++;
+    }
+  }
+  return out;
+}