@an5/adapters 0.2.3 → 0.2.5

package/dotnet/Postgres/PostgresEngine.cs

@@ -1,121 +1,121 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-
-namespace An5Orm
-{
-// ─── PostgreSQL Engine ─────────────────────────────────────────────────────
-
-    internal class PostgresEngine : IQueryEngine
-    {
-        public Dialect Dialect => Dialect.Postgres;
-        private readonly string _connectionString;
-        private readonly int _commandTimeout;
-
-        public PostgresEngine(string connectionString, int commandTimeout)
-        {
-            _connectionString = connectionString;
-            _commandTimeout = commandTimeout;
-        }
-
-        private Npgsql.NpgsqlConnection OpenConnection()
-        {
-            var conn = new Npgsql.NpgsqlConnection(_connectionString);
-            conn.Open();
-            return conn;
-        }
-
-        private Npgsql.NpgsqlCommand BuildCommand(
-            Npgsql.NpgsqlConnection conn, string sql, Dictionary<string, object> parameters)
-        {
-            var cmd = new Npgsql.NpgsqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
-            if (parameters != null)
-            {
-                foreach (var kv in parameters)
-                {
-                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
-                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
-                }
-            }
-            return cmd;
-        }
-
-        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
-        {
-            var results = new List<Dictionary<string, object>>();
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            using var reader = cmd.ExecuteReader();
-            while (reader.Read())
-            {
-                var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-                for (int i = 0; i < reader.FieldCount; i++)
-                {
-                    row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
-                }
-                results.Add(row);
-            }
-            return results;
-        }
-
-        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
-        {
-            var results = new List<T>();
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            using var reader = cmd.ExecuteReader();
-            var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-            while (reader.Read())
-            {
-                var item = new T();
-                foreach (var prop in props)
-                {
-                    if (!HasColumn(reader, prop.Name)) continue;
-                    var val = reader[prop.Name];
-                    if (val == DBNull.Value) continue;
-                    try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
-                }
-                results.Add(item);
-            }
-            return results;
-        }
-
-        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
-        {
-            using var conn = OpenConnection();
-            using var cmd = BuildCommand(conn, sql, parameters);
-            return cmd.ExecuteNonQuery();
-        }
-
-        private static bool HasColumn(Npgsql.NpgsqlDataReader reader, string name)
-        {
-            for (int i = 0; i < reader.FieldCount; i++)
-                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
-            return false;
-        }
-
-        public An5TransactionBase BeginTransaction()
-        {
-            var conn = OpenConnection();
-            var tx = conn.BeginTransaction();
-            return new PostgresTransaction(conn, tx);
-        }
-    }
-
-    internal class PostgresTransaction : An5TransactionBase
-    {
-        private readonly Npgsql.NpgsqlConnection _conn;
-        private readonly Npgsql.NpgsqlTransaction _tx;
-
-        public PostgresTransaction(Npgsql.NpgsqlConnection conn, Npgsql.NpgsqlTransaction tx)
-        {
-            _conn = conn;
-            _tx = tx;
-        }
-
-        public override void Commit() { _tx.Commit(); }
-        public override void Rollback() { _tx.Rollback(); }
-        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+
+namespace An5Orm
+{
+// ─── PostgreSQL Engine ─────────────────────────────────────────────────────
+
+    internal class PostgresEngine : IQueryEngine
+    {
+        public Dialect Dialect => Dialect.Postgres;
+        private readonly string _connectionString;
+        private readonly int _commandTimeout;
+
+        public PostgresEngine(string connectionString, int commandTimeout)
+        {
+            _connectionString = connectionString;
+            _commandTimeout = commandTimeout;
+        }
+
+        private Npgsql.NpgsqlConnection OpenConnection()
+        {
+            var conn = new Npgsql.NpgsqlConnection(_connectionString);
+            conn.Open();
+            return conn;
+        }
+
+        private Npgsql.NpgsqlCommand BuildCommand(
+            Npgsql.NpgsqlConnection conn, string sql, Dictionary<string, object> parameters)
+        {
+            var cmd = new Npgsql.NpgsqlCommand(sql, conn) { CommandTimeout = _commandTimeout };
+            if (parameters != null)
+            {
+                foreach (var kv in parameters)
+                {
+                    var paramName = kv.Key.StartsWith("@") ? kv.Key : "@" + kv.Key;
+                    cmd.Parameters.AddWithValue(paramName, kv.Value ?? DBNull.Value);
+                }
+            }
+            return cmd;
+        }
+
+        public List<Dictionary<string, object>> QueryRaw(string sql, Dictionary<string, object> parameters)
+        {
+            var results = new List<Dictionary<string, object>>();
+            using var conn = OpenConnection();
+            using var cmd = BuildCommand(conn, sql, parameters);
+            using var reader = cmd.ExecuteReader();
+            while (reader.Read())
+            {
+                var row = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                for (int i = 0; i < reader.FieldCount; i++)
+                {
+                    row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
+                }
+                results.Add(row);
+            }
+            return results;
+        }
+
+        public List<T> QueryRaw<T>(string sql, Dictionary<string, object> parameters) where T : new()
+        {
+            var results = new List<T>();
+            using var conn = OpenConnection();
+            using var cmd = BuildCommand(conn, sql, parameters);
+            using var reader = cmd.ExecuteReader();
+            var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            while (reader.Read())
+            {
+                var item = new T();
+                foreach (var prop in props)
+                {
+                    if (!HasColumn(reader, prop.Name)) continue;
+                    var val = reader[prop.Name];
+                    if (val == DBNull.Value) continue;
+                    try { prop.SetValue(item, Convert.ChangeType(val, prop.PropertyType)); } catch { }
+                }
+                results.Add(item);
+            }
+            return results;
+        }
+
+        public int ExecuteRaw(string sql, Dictionary<string, object> parameters)
+        {
+            using var conn = OpenConnection();
+            using var cmd = BuildCommand(conn, sql, parameters);
+            return cmd.ExecuteNonQuery();
+        }
+
+        private static bool HasColumn(Npgsql.NpgsqlDataReader reader, string name)
+        {
+            for (int i = 0; i < reader.FieldCount; i++)
+                if (reader.GetName(i).Equals(name, StringComparison.OrdinalIgnoreCase)) return true;
+            return false;
+        }
+
+        public An5TransactionBase BeginTransaction()
+        {
+            var conn = OpenConnection();
+            var tx = conn.BeginTransaction();
+            return new PostgresTransaction(conn, tx);
+        }
+    }
+
+    internal class PostgresTransaction : An5TransactionBase
+    {
+        private readonly Npgsql.NpgsqlConnection _conn;
+        private readonly Npgsql.NpgsqlTransaction _tx;
+
+        public PostgresTransaction(Npgsql.NpgsqlConnection conn, Npgsql.NpgsqlTransaction tx)
+        {
+            _conn = conn;
+            _tx = tx;
+        }
+
+        public override void Commit() { _tx.Commit(); }
+        public override void Rollback() { _tx.Rollback(); }
+        public override void Dispose() { _tx.Dispose(); _conn.Dispose(); }
+    }
+}

package/package.json

@@ -1,18 +1,26 @@
 {
   "name": "@an5/adapters",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Standalone language adapters for AN5 ORM - TypeScript, Python, .NET query execution.",
   "license": "MIT",
-  "main": "typescript/index.js",
-  "types": "typescript/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
-    ".": "./typescript/index.js",
-    "./browser": "./typescript/browser.js",
-    "./typescript": "./typescript/index.js",
-    "./typescript/*": "./typescript/*",
+    ".": "./dist/index.js",
+    "./browser": "./dist/browser.js",
+    "./config": "./dist/config.js",
+    "./base": "./dist/base/index.js",
+    "./base/*": "./dist/base/*",
+    "./mssql": "./dist/mssql/index.js",
+    "./postgres": "./dist/postgres/index.js",
+    "./mysql": "./dist/mysql/index.js",
+    "./sqlite": "./dist/sqlite/index.js",
+    "./googlesheets": "./dist/googlesheets/index.js",
+    "./googlesheets/*": "./dist/googlesheets/*",
+    "./typescript": "./dist/index.js",
+    "./typescript/*": "./dist/*",
     "./python": "./python/an5_adapter.py",
-    "./dotnet": "./dotnet/An5Adapter.cs",
-    "./config": "./typescript/config.js"
+    "./dotnet": "./dotnet/An5Adapter.cs"
   },
   "author": "an5ORM",
   "homepage": "https://github.com/an5ORM/an5",
@@ -29,14 +37,16 @@
     "dotnet"
   ],
   "files": [
-    "typescript/**/*.{ts,js,d.ts}",
+    "dist/**/*.{js,d.ts}",
+    "typescript/src/**/*.ts",
     "python/**/*.py",
     "dotnet/**/*",
     "README.md"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "test": "node test/unit.test.js",
+    "build:python": "python -m build --outdir dist-py",
+    "test": "node test/unit.test.js && node test/package.test.js",
     "test:python": "python -m compileall python 2>&1"
   },
   "dependencies": {

package/python/an5_adapter.py

@@ -1,97 +1,97 @@
-"""Standalone Python runtime adapter for AN5 ORM."""
-
-from typing import Dict, List, Optional
-
-try:
-    from .base import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect, set_adapter_metadata
-    from .mssql import connect as connect_mssql
-    from .postgres import connect as connect_postgres
-    from .table_client import AdapterTableClient
-except ImportError:
-    from base import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect, set_adapter_metadata
-    from mssql import connect as connect_mssql
-    from postgres import connect as connect_postgres
-    from table_client import AdapterTableClient
-
-# Backward-compatible aliases used by tests and older imports.
-_detect_dialect = detect_dialect
-try:
-    from .mssql import parse_connection_string as _parse_connection_string
-except ImportError:
-    from mssql import parse_connection_string as _parse_connection_string
-
-class An5Adapter:
-    def __init__(self, connection_string: str):
-        self._dialect = detect_dialect(connection_string)
-        self._conn_str = connection_string
-
-    def _connect(self):
-        if self._dialect == DIALECT_POSTGRES:
-            return connect_postgres(self._conn_str)
-        return connect_mssql(self._conn_str)
-
-    def _to_dicts(self, cursor, query: str) -> List[Dict]:
-        if cursor.description:
-            cols = [col[0] for col in cursor.description]
-            rows = cursor.fetchall() if cursor.description else []
-            return [dict(zip(cols, row)) for row in rows]
-        return []
-
-    def exec(self, query: str, params: Optional[List] = None) -> List[Dict]:
-        conn = self._connect()
-        try:
-            cursor = conn.cursor()
-            cursor.execute(query, params or [])
-            return self._to_dicts(cursor, query)
-        finally:
-            conn.close()
-
-    def execute(self, query: str, params: Optional[List] = None) -> int:
-        conn = self._connect()
-        try:
-            cursor = conn.cursor()
-            cursor.execute(query, params or [])
-            return cursor.rowcount
-        finally:
-            conn.close()
-
-    def query_raw(self, query: str, *values) -> List[Dict]:
-        return self.exec(query, list(values))
-
-    def execute_raw(self, query: str, *values) -> int:
-        return self.execute(query, list(values))
-
-    def table(self, model_name: str) -> AdapterTableClient:
-        return AdapterTableClient(self, model_name)
-
-    def __getattr__(self, model_name: str) -> AdapterTableClient:
-        return self.table(model_name)
-
-    def transaction(self, fn):
-        conn = self._connect()
-        conn.autocommit = False
-        try:
-            result = fn(self)
-            conn.commit()
-            return result
-        except Exception:
-            conn.rollback()
-            raise
-        finally:
-            if self._dialect == DIALECT_POSTGRES:
-                conn.autocommit = True
-            conn.close()
-
-def create_an5_adapter(connection_string: str) -> An5Adapter:
-    return An5Adapter(connection_string)
-
-__all__ = [
-    "An5Adapter",
-    "AdapterTableClient",
-    "create_an5_adapter",
-    "DIALECT_MSSQL",
-    "DIALECT_POSTGRES",
-    "_detect_dialect",
-    "_parse_connection_string",
-    "set_adapter_metadata",
-]
+"""Standalone Python runtime adapter for AN5 ORM."""
+
+from typing import Dict, List, Optional
+
+try:
+    from .base import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect, set_adapter_metadata
+    from .mssql import connect as connect_mssql
+    from .postgres import connect as connect_postgres
+    from .table_client import AdapterTableClient
+except ImportError:
+    from base import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect, set_adapter_metadata
+    from mssql import connect as connect_mssql
+    from postgres import connect as connect_postgres
+    from table_client import AdapterTableClient
+
+# Backward-compatible aliases used by tests and older imports.
+_detect_dialect = detect_dialect
+try:
+    from .mssql import parse_connection_string as _parse_connection_string
+except ImportError:
+    from mssql import parse_connection_string as _parse_connection_string
+
+class An5Adapter:
+    def __init__(self, connection_string: str):
+        self._dialect = detect_dialect(connection_string)
+        self._conn_str = connection_string
+
+    def _connect(self):
+        if self._dialect == DIALECT_POSTGRES:
+            return connect_postgres(self._conn_str)
+        return connect_mssql(self._conn_str)
+
+    def _to_dicts(self, cursor, query: str) -> List[Dict]:
+        if cursor.description:
+            cols = [col[0] for col in cursor.description]
+            rows = cursor.fetchall() if cursor.description else []
+            return [dict(zip(cols, row)) for row in rows]
+        return []
+
+    def exec(self, query: str, params: Optional[List] = None) -> List[Dict]:
+        conn = self._connect()
+        try:
+            cursor = conn.cursor()
+            cursor.execute(query, params or [])
+            return self._to_dicts(cursor, query)
+        finally:
+            conn.close()
+
+    def execute(self, query: str, params: Optional[List] = None) -> int:
+        conn = self._connect()
+        try:
+            cursor = conn.cursor()
+            cursor.execute(query, params or [])
+            return cursor.rowcount
+        finally:
+            conn.close()
+
+    def query_raw(self, query: str, *values) -> List[Dict]:
+        return self.exec(query, list(values))
+
+    def execute_raw(self, query: str, *values) -> int:
+        return self.execute(query, list(values))
+
+    def table(self, model_name: str) -> AdapterTableClient:
+        return AdapterTableClient(self, model_name)
+
+    def __getattr__(self, model_name: str) -> AdapterTableClient:
+        return self.table(model_name)
+
+    def transaction(self, fn):
+        conn = self._connect()
+        conn.autocommit = False
+        try:
+            result = fn(self)
+            conn.commit()
+            return result
+        except Exception:
+            conn.rollback()
+            raise
+        finally:
+            if self._dialect == DIALECT_POSTGRES:
+                conn.autocommit = True
+            conn.close()
+
+def create_an5_adapter(connection_string: str) -> An5Adapter:
+    return An5Adapter(connection_string)
+
+__all__ = [
+    "An5Adapter",
+    "AdapterTableClient",
+    "create_an5_adapter",
+    "DIALECT_MSSQL",
+    "DIALECT_POSTGRES",
+    "_detect_dialect",
+    "_parse_connection_string",
+    "set_adapter_metadata",
+]

package/python/base/__init__.py

@@ -1,3 +1,3 @@
-from .dialects import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect
-from .metadata import model_to_table, model_fields, set_adapter_metadata
-from .sql import _quote, _parse_where, _build_order_by, _resolve_table, _quote_table
+from .dialects import DIALECT_MSSQL, DIALECT_POSTGRES, detect_dialect
+from .metadata import model_to_table, model_fields, set_adapter_metadata
+from .sql import _quote, _parse_where, _build_order_by, _resolve_table, _quote_table

package/python/base/dialects.py

@@ -1,8 +1,8 @@
-DIALECT_MSSQL = "mssql"
-DIALECT_POSTGRES = "postgres"
-
-def detect_dialect(connection_string: str) -> str:
-    cs = connection_string.strip().lower()
-    if cs.startswith("postgres://") or cs.startswith("postgresql://"):
-        return DIALECT_POSTGRES
-    return DIALECT_MSSQL
+DIALECT_MSSQL = "mssql"
+DIALECT_POSTGRES = "postgres"
+
+def detect_dialect(connection_string: str) -> str:
+    cs = connection_string.strip().lower()
+    if cs.startswith("postgres://") or cs.startswith("postgresql://"):
+        return DIALECT_POSTGRES
+    return DIALECT_MSSQL

package/python/base/metadata.py

@@ -1,10 +1,10 @@
-from typing import Any, Dict
-
-model_to_table: Dict[str, str] = {}
-model_fields: Dict[str, Any] = {}
-
-def set_adapter_metadata(metadata: Dict[str, Any]) -> None:
-    model_to_table.clear()
-    model_to_table.update(metadata.get("model_to_table") or metadata.get("modelToTable") or {})
-    model_fields.clear()
-    model_fields.update(metadata.get("model_fields") or metadata.get("modelFields") or {})
+from typing import Any, Dict
+
+model_to_table: Dict[str, str] = {}
+model_fields: Dict[str, Any] = {}
+
+def set_adapter_metadata(metadata: Dict[str, Any]) -> None:
+    model_to_table.clear()
+    model_to_table.update(metadata.get("model_to_table") or metadata.get("modelToTable") or {})
+    model_fields.clear()
+    model_fields.update(metadata.get("model_fields") or metadata.get("modelFields") or {})