@an5/adapters 0.2.1 → 0.2.2

package/typescript/{googlesheets → src/googlesheets}/helpers.ts

@@ -1,124 +1,124 @@
-import { getModelToTable } from '../base/metadata';
-
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-export function esc(name: string): string {
-  return name.includes(' ') || /[^\w]/.test(name) ? `'${name.replace(/'/g, "''")}'` : name;
-}
-
-export function resolveSheetName(modelName: string, mapping?: Record<string, string>): string {
-  if (mapping?.[modelName]) return mapping[modelName];
-  const modelToTable = getModelToTable();
-  return modelToTable[modelName] || modelName;
-}
-
-export function matchWhere(row: Record<string, any>, where: any): boolean {
-  if (!where) return true;
-
-  const cleanWhere: Record<string, any> = {};
-  for (const [key, value] of Object.entries(where)) {
-    if (
-      key.includes('_') &&
-      value && typeof value === 'object' &&
-      !(value instanceof Date) &&
-      !(value as any).in && !(value as any).contains &&
-      !(value as any).not && !(value as any).gte &&
-      !(value as any).lte && !(value as any).gt && !(value as any).lt
-    ) {
-      Object.assign(cleanWhere, value);
-    } else {
-      cleanWhere[key] = value;
-    }
-  }
-
-  for (const [key, value] of Object.entries(cleanWhere)) {
-    if (key === 'OR' && Array.isArray(value)) {
-      if (!value.some((v: any) => matchWhere(row, v))) return false;
-      continue;
-    }
-    if (key === 'AND' && Array.isArray(value)) {
-      if (!value.every((v: any) => matchWhere(row, v))) return false;
-      continue;
-    }
-
-    const cellVal = row[key];
-
-    if (value === null) {
-      if (cellVal !== null && cellVal !== undefined) return false;
-    } else if (typeof value === 'object' && !(value instanceof Date)) {
-      const v = value as any;
-      if (v.not !== undefined) {
-        if (v.not === null) { if (cellVal === null || cellVal === undefined) return false; }
-        else if (cellVal == v.not) return false;
-      }
-      if (v.equals !== undefined && cellVal != v.equals) return false;
-      if (v.contains !== undefined && (!cellVal || !String(cellVal).includes(v.contains))) return false;
-      if (v.startsWith !== undefined && (!cellVal || !String(cellVal).startsWith(v.startsWith))) return false;
-      if (v.endsWith !== undefined && (!cellVal || !String(cellVal).endsWith(v.endsWith))) return false;
-      if (v.gte !== undefined && !(Number(cellVal) >= Number(v.gte))) return false;
-      if (v.lte !== undefined && !(Number(cellVal) <= Number(v.lte))) return false;
-      if (v.gt !== undefined && !(Number(cellVal) > Number(v.gt))) return false;
-      if (v.lt !== undefined && !(Number(cellVal) < Number(v.lt))) return false;
-      if (v.in !== undefined) {
-        if (!Array.isArray(v.in) || !v.in.includes(cellVal)) return false;
-      }
-    } else {
-      if (cellVal != value) return false;
-    }
-  }
-  return true;
-}
-
-export function buildOrderBy(orderBy: any): string {
-  if (!orderBy) return '';
-  const entries = Array.isArray(orderBy) ? orderBy : [orderBy];
-  const parts: string[] = [];
-  for (const entry of entries) {
-    for (const [key, dir] of Object.entries(entry)) {
-      parts.push(`${key} ${String(dir || 'asc').toUpperCase()}`);
-    }
-  }
-  return parts.join(', ');
-}
-
-export function sortRows(rows: Record<string, any>[], orderBy: string): Record<string, any>[] {
-  if (!orderBy) return rows;
-  const clauses = orderBy.split(',').map(c => c.trim());
-  return [...rows].sort((a, b) => {
-    for (const clause of clauses) {
-      const [field, dir] = clause.split(/\s+/);
-      const direction = dir?.toUpperCase() === 'DESC' ? -1 : 1;
-      const aVal = a[field];
-      const bVal = b[field];
-      if (aVal == null && bVal == null) continue;
-      if (aVal == null) return 1 * direction;
-      if (bVal == null) return -1 * direction;
-      if (aVal < bVal) return -1 * direction;
-      if (aVal > bVal) return 1 * direction;
-    }
-    return 0;
-  });
-}
-
-export function coerceCell(raw: any, fieldMeta?: { ts?: string; sql?: string }): any {
-  if (raw === undefined || raw === '') return null;
-  if (raw instanceof Date) return raw.toISOString();
-  if (fieldMeta) {
-    const tsType = (fieldMeta.ts || '').toLowerCase().replace('?', '');
-    if (['number', 'int', 'float', 'double', 'decimal'].includes(tsType)) {
-      const n = Number(raw);
-      return isNaN(n) ? raw : n;
-    }
-    if (tsType === 'boolean' || tsType === 'bool') {
-      if (raw === 'true' || raw === true) return true;
-      if (raw === 'false' || raw === false) return false;
-    }
-  }
-  if (typeof raw === 'string' && /^-?\d+\.?\d*$/.test(raw.trim()) && !/^0\d/.test(raw.trim())) {
-    const n = Number(raw);
-    if (!isNaN(n) && String(n) === raw.trim()) return n;
-  }
-  if (raw === 'true') return true;
-  if (raw === 'false') return false;
-  return raw;
-}
+import { getModelToTable } from '../base/metadata';
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+export function esc(name: string): string {
+  return name.includes(' ') || /[^\w]/.test(name) ? `'${name.replace(/'/g, "''")}'` : name;
+}
+
+export function resolveSheetName(modelName: string, mapping?: Record<string, string>): string {
+  if (mapping?.[modelName]) return mapping[modelName];
+  const modelToTable = getModelToTable();
+  return modelToTable[modelName] || modelName;
+}
+
+export function matchWhere(row: Record<string, any>, where: any): boolean {
+  if (!where) return true;
+
+  const cleanWhere: Record<string, any> = {};
+  for (const [key, value] of Object.entries(where)) {
+    if (
+      key.includes('_') &&
+      value && typeof value === 'object' &&
+      !(value instanceof Date) &&
+      !(value as any).in && !(value as any).contains &&
+      !(value as any).not && !(value as any).gte &&
+      !(value as any).lte && !(value as any).gt && !(value as any).lt
+    ) {
+      Object.assign(cleanWhere, value);
+    } else {
+      cleanWhere[key] = value;
+    }
+  }
+
+  for (const [key, value] of Object.entries(cleanWhere)) {
+    if (key === 'OR' && Array.isArray(value)) {
+      if (!value.some((v: any) => matchWhere(row, v))) return false;
+      continue;
+    }
+    if (key === 'AND' && Array.isArray(value)) {
+      if (!value.every((v: any) => matchWhere(row, v))) return false;
+      continue;
+    }
+
+    const cellVal = row[key];
+
+    if (value === null) {
+      if (cellVal !== null && cellVal !== undefined) return false;
+    } else if (typeof value === 'object' && !(value instanceof Date)) {
+      const v = value as any;
+      if (v.not !== undefined) {
+        if (v.not === null) { if (cellVal === null || cellVal === undefined) return false; }
+        else if (cellVal == v.not) return false;
+      }
+      if (v.equals !== undefined && cellVal != v.equals) return false;
+      if (v.contains !== undefined && (!cellVal || !String(cellVal).includes(v.contains))) return false;
+      if (v.startsWith !== undefined && (!cellVal || !String(cellVal).startsWith(v.startsWith))) return false;
+      if (v.endsWith !== undefined && (!cellVal || !String(cellVal).endsWith(v.endsWith))) return false;
+      if (v.gte !== undefined && !(Number(cellVal) >= Number(v.gte))) return false;
+      if (v.lte !== undefined && !(Number(cellVal) <= Number(v.lte))) return false;
+      if (v.gt !== undefined && !(Number(cellVal) > Number(v.gt))) return false;
+      if (v.lt !== undefined && !(Number(cellVal) < Number(v.lt))) return false;
+      if (v.in !== undefined) {
+        if (!Array.isArray(v.in) || !v.in.includes(cellVal)) return false;
+      }
+    } else {
+      if (cellVal != value) return false;
+    }
+  }
+  return true;
+}
+
+export function buildOrderBy(orderBy: any): string {
+  if (!orderBy) return '';
+  const entries = Array.isArray(orderBy) ? orderBy : [orderBy];
+  const parts: string[] = [];
+  for (const entry of entries) {
+    for (const [key, dir] of Object.entries(entry)) {
+      parts.push(`${key} ${String(dir || 'asc').toUpperCase()}`);
+    }
+  }
+  return parts.join(', ');
+}
+
+export function sortRows(rows: Record<string, any>[], orderBy: string): Record<string, any>[] {
+  if (!orderBy) return rows;
+  const clauses = orderBy.split(',').map(c => c.trim());
+  return [...rows].sort((a, b) => {
+    for (const clause of clauses) {
+      const [field, dir] = clause.split(/\s+/);
+      const direction = dir?.toUpperCase() === 'DESC' ? -1 : 1;
+      const aVal = a[field];
+      const bVal = b[field];
+      if (aVal == null && bVal == null) continue;
+      if (aVal == null) return 1 * direction;
+      if (bVal == null) return -1 * direction;
+      if (aVal < bVal) return -1 * direction;
+      if (aVal > bVal) return 1 * direction;
+    }
+    return 0;
+  });
+}
+
+export function coerceCell(raw: any, fieldMeta?: { ts?: string; sql?: string }): any {
+  if (raw === undefined || raw === '') return null;
+  if (raw instanceof Date) return raw.toISOString();
+  if (fieldMeta) {
+    const tsType = (fieldMeta.ts || '').toLowerCase().replace('?', '');
+    if (['number', 'int', 'float', 'double', 'decimal'].includes(tsType)) {
+      const n = Number(raw);
+      return isNaN(n) ? raw : n;
+    }
+    if (tsType === 'boolean' || tsType === 'bool') {
+      if (raw === 'true' || raw === true) return true;
+      if (raw === 'false' || raw === false) return false;
+    }
+  }
+  if (typeof raw === 'string' && /^-?\d+\.?\d*$/.test(raw.trim()) && !/^0\d/.test(raw.trim())) {
+    const n = Number(raw);
+    if (!isNaN(n) && String(n) === raw.trim()) return n;
+  }
+  if (raw === 'true') return true;
+  if (raw === 'false') return false;
+  return raw;
+}

package/typescript/{googlesheets → src/googlesheets}/index.ts

@@ -1,2 +1,3 @@
-export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter, An5SheetsAdapterConfig } from './an5SheetsAdapter';
-export { parseSheetsConnectionString } from './parseConnectionString';
+export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter } from './an5SheetsAdapter';
+export type { An5SheetsAdapterConfig } from './an5SheetsAdapter';
+export { parseSheetsConnectionString } from './parseConnectionString';

package/typescript/{googlesheets → src/googlesheets}/parseConnectionString.ts

@@ -1,44 +1,44 @@
-import type { An5SheetsAdapterConfig } from './config';
-
-/**
- * Parse a `googlesheets://` connection string into An5SheetsAdapterConfig.
- *
- * Format:
- *   googlesheets://spreadsheetId;clientEmail=xxx;privateKey=xxx
- *   googlesheets://spreadsheetId;clientEmail=xxx;privateKey=xxx;sheetMapping=users:Users,orders:Orders
- *
- * The privateKey must be URL-encoded (use encodeURIComponent on the raw key).
- */
-export function parseSheetsConnectionString(url: string): An5SheetsAdapterConfig {
-  const clean = url.replace(/^googlesheets:\/\//, '');
-  const parts = clean.split(';');
-
-  const spreadsheetId = parts[0].trim();
-  const config: Record<string, string> = {};
-
-  for (let i = 1; i < parts.length; i++) {
-    const part = parts[i].trim();
-    if (!part) continue;
-    const eqIdx = part.indexOf('=');
-    if (eqIdx === -1) continue;
-    const key = part.slice(0, eqIdx).trim().toLowerCase();
-    const value = decodeURIComponent(part.slice(eqIdx + 1).trim());
-    config[key] = value;
-  }
-
-  const result: An5SheetsAdapterConfig = { spreadsheetId };
-
-  if (config.clientemail) result.clientEmail = config.clientemail;
-  if (config.privatekey) result.privateKey = config.privatekey;
-
-  if (config.sheetmapping) {
-    const mapping: Record<string, string> = {};
-    for (const pair of config.sheetmapping.split(',')) {
-      const [k, v] = pair.split(':');
-      if (k && v) mapping[k.trim()] = v.trim();
-    }
-    result.sheetMapping = mapping;
-  }
-
-  return result;
-}
+import type { An5SheetsAdapterConfig } from './config';
+
+/**
+ * Parse a `googlesheets://` connection string into An5SheetsAdapterConfig.
+ *
+ * Format:
+ *   googlesheets://spreadsheetId;clientEmail=xxx;privateKey=xxx
+ *   googlesheets://spreadsheetId;clientEmail=xxx;privateKey=xxx;sheetMapping=users:Users,orders:Orders
+ *
+ * The privateKey must be URL-encoded (use encodeURIComponent on the raw key).
+ */
+export function parseSheetsConnectionString(url: string): An5SheetsAdapterConfig {
+  const clean = url.replace(/^googlesheets:\/\//, '');
+  const parts = clean.split(';');
+
+  const spreadsheetId = parts[0].trim();
+  const config: Record<string, string> = {};
+
+  for (let i = 1; i < parts.length; i++) {
+    const part = parts[i].trim();
+    if (!part) continue;
+    const eqIdx = part.indexOf('=');
+    if (eqIdx === -1) continue;
+    const key = part.slice(0, eqIdx).trim().toLowerCase();
+    const value = decodeURIComponent(part.slice(eqIdx + 1).trim());
+    config[key] = value;
+  }
+
+  const result: An5SheetsAdapterConfig = { spreadsheetId };
+
+  if (config.clientemail) result.clientEmail = config.clientemail;
+  if (config.privatekey) result.privateKey = config.privatekey;
+
+  if (config.sheetmapping) {
+    const mapping: Record<string, string> = {};
+    for (const pair of config.sheetmapping.split(',')) {
+      const [k, v] = pair.split(':');
+      if (k && v) mapping[k.trim()] = v.trim();
+    }
+    result.sheetMapping = mapping;
+  }
+
+  return result;
+}

package/typescript/{googlesheets → src/googlesheets}/retry.ts

@@ -1,32 +1,32 @@
-// ─── Retry helper ─────────────────────────────────────────────────────────────
-
-export const MAX_RETRIES = 3;
-export const BASE_DELAY = 1000;
-
-function isRateLimitError(err: any): boolean {
-  const code = err?.code || err?.status || err?.response?.status;
-  if (code === 429) return true;
-  if (code === 500 || code === 503) return true;
-  if (code === 403) {
-    const reason = err?.errors?.[0]?.reason || '';
-    if (reason === 'rateLimitExceeded') return true;
-    if (typeof err?.body === 'string' && err.body.includes('rateLimitExceeded')) return true;
-    if (typeof err?.message === 'string' && err.message.includes('rateLimitExceeded')) return true;
-  }
-  return false;
-}
-
-export async function withRetry<T>(fn: () => Promise<T>, attempt = 1): Promise<T> {
-  try {
-    return await fn();
-  } catch (err: any) {
-    if (isRateLimitError(err) && attempt <= MAX_RETRIES) {
-      const delay = err.retryAfter
-        ? err.retryAfter * 1000
-        : BASE_DELAY * Math.pow(2, attempt - 1) + Math.random() * 500;
-      await new Promise(r => setTimeout(r, delay));
-      return withRetry(fn, attempt + 1);
-    }
-    throw err;
-  }
-}
+// ─── Retry helper ─────────────────────────────────────────────────────────────
+
+export const MAX_RETRIES = 3;
+export const BASE_DELAY = 1000;
+
+function isRateLimitError(err: any): boolean {
+  const code = err?.code || err?.status || err?.response?.status;
+  if (code === 429) return true;
+  if (code === 500 || code === 503) return true;
+  if (code === 403) {
+    const reason = err?.errors?.[0]?.reason || '';
+    if (reason === 'rateLimitExceeded') return true;
+    if (typeof err?.body === 'string' && err.body.includes('rateLimitExceeded')) return true;
+    if (typeof err?.message === 'string' && err.message.includes('rateLimitExceeded')) return true;
+  }
+  return false;
+}
+
+export async function withRetry<T>(fn: () => Promise<T>, attempt = 1): Promise<T> {
+  try {
+    return await fn();
+  } catch (err: any) {
+    if (isRateLimitError(err) && attempt <= MAX_RETRIES) {
+      const delay = err.retryAfter
+        ? err.retryAfter * 1000
+        : BASE_DELAY * Math.pow(2, attempt - 1) + Math.random() * 500;
+      await new Promise(r => setTimeout(r, delay));
+      return withRetry(fn, attempt + 1);
+    }
+    throw err;
+  }
+}