@an5/adapters 0.1.0 → 0.1.2

package/README.md

@@ -19,7 +19,7 @@ Adapters are runtime packages only. They do not import generated `an5Client` art
 ### TypeScript
 
 ```bash
-npm install an5-adapters
+npm install @an5/adapters
 ```
 
 ### Python
@@ -39,7 +39,7 @@ dotnet add package An5Adapters
 ### TypeScript
 
 ```typescript
-import { createAn5Adapter, setAdapterMetadata } from 'an5-adapters';
+import { createAn5Adapter, setAdapterMetadata } from '@an5/adapters';
 
 setAdapterMetadata({
   modelToTable: { User: 'dbo.users' },
@@ -120,7 +120,7 @@ db.Transaction(tx => {
 ### Google Sheets
 
 ```typescript
-import { createAn5Adapter } from 'an5-adapters';
+import { createAn5Adapter } from '@an5/adapters';
 
 const db = createAn5Adapter({
   spreadsheetId: '1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgVE2upms',
@@ -160,7 +160,7 @@ await db.table('users').deleteAll();
 ### Integrated factory (auto-detect adapter)
 
 ```typescript
-import { createAn5Adapter, createAdapter, An5Adapter } from 'an5-adapters';
+import { createAn5Adapter, createAdapter, An5Adapter } from '@an5/adapters';
 
 // Auto-detects from connection string
 const sqlDb = createAn5Adapter({ connectionString: 'sqlserver://localhost:1433;database=mydb;user=sa;password=pass' });
@@ -197,7 +197,7 @@ const sheetsDb3 = new An5Adapter({
 Use the package root for normal applications:
 
 ```typescript
-import { createAn5Adapter } from 'an5-adapters';
+import { createAn5Adapter } from '@an5/adapters';
 ```
 
 Provider folders are still available to source-level consumers through `typescript/*`, but the public factory in `typescript/an5Adapter.ts` is the preferred entry point. The old `unified.ts` entry point has been removed because the factory now lives directly in `An5Adapter`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/adapters",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Standalone language adapters for AN5 ORM - TypeScript, Python, .NET query execution.",
   "license": "MIT",
   "main": "typescript/index.js",

package/python/base/metadata.py

@@ -4,6 +4,7 @@ model_to_table: Dict[str, str] = {}
 model_fields: Dict[str, Any] = {}
 
 def set_adapter_metadata(metadata: Dict[str, Any]) -> None:
-    global model_to_table, model_fields
-    model_to_table = dict(metadata.get("model_to_table") or metadata.get("modelToTable") or {})
-    model_fields = dict(metadata.get("model_fields") or metadata.get("modelFields") or {})
+    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 {})

package/python/table_client.py

@@ -1,7 +1,10 @@
 import json
 import uuid
 from typing import Dict, List, Optional
-from .base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
+try:
+    from .base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
+except ImportError:
+    from base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
 
 # ─── Table Client ───────────────────────────────────────────────────────────────────
 
@@ -28,8 +31,8 @@ class AdapterTableClient:
             return ""
         if self._dialect == DIALECT_POSTGRES:
             return f" LIMIT {take} OFFSET {skip}"
-        o = order_sql or " ORDER BY (SELECT NULL)"
-        return f"{o} OFFSET {skip} ROWS FETCH NEXT {take} ROWS ONLY"
+        order_prefix = "" if order_sql else " ORDER BY (SELECT NULL)"
+        return f"{order_prefix} OFFSET {skip} ROWS FETCH NEXT {take} ROWS ONLY"
 
     def find_many(self, where=None, order_by=None, skip: int = 0, take: Optional[int] = None, select=None) -> List[Dict]:
         params: Dict = {}
@@ -39,12 +42,9 @@ class AdapterTableClient:
         query = f"SELECT * FROM {self._table_sql}{self._nolock}"
         if where_sql:
             query += f" WHERE {where_sql}"
-        if take is not None and self._dialect == DIALECT_POSTGRES:
-            query += self._pagination(take, skip, order_sql)
-        else:
-            if order_sql:
-                query += f" {order_sql}"
-            query += self._pagination(take, skip, order_sql)
+        if order_sql:
+            query += f" {order_sql}"
+        query += self._pagination(take, skip, order_sql)
         return self._adapter.exec(query, list(params.values()))
 
     def find_first(self, where=None, order_by=None, select=None) -> Optional[Dict]:
@@ -205,5 +205,3 @@ class AdapterTableClient:
 
         scored.sort(key=lambda x: x[1])
         return [{**row, "distance": dist} for row, dist in scored[:take]]
-
-