@quazardous/qdadm 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quazardous/qdadm",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Vue 3 framework for admin dashboards with PrimeVue",
   "author": "quazardous",
   "license": "MIT",

package/src/entity/storage/LocalStorage.ts

@@ -1,6 +1,7 @@
 import { IStorage } from './IStorage'
 import type { EntityRecord, ListParams, ListResult, StorageCapabilities } from '../../types'
-import { StorageError } from './MemoryStorage'
+import { StorageError } from './errors'
+import { sortItems, filterItems, searchItems, paginate, defaultGenerateId } from '../../query/clientFilter'
 
 /**
  * LocalStorage options
@@ -36,7 +37,7 @@ export class LocalStorage<T extends EntityRecord = EntityRecord> extends IStorag
     const {
       key,
       idField = 'id',
-      generateId = () => Date.now().toString(36) + Math.random().toString(36).substr(2),
+      generateId = defaultGenerateId,
     } = options
 
     this.key = key
@@ -62,49 +63,17 @@ export class LocalStorage<T extends EntityRecord = EntityRecord> extends IStorag
 
     let items = this._getAll()
 
-    // Apply filters (exact match for dropdown filters)
-    for (const [key, value] of Object.entries(filters)) {
-      if (value === null || value === undefined || value === '') continue
-      items = items.filter((item) => {
-        const itemValue = item[key as keyof T]
-        if (typeof value === 'string' && typeof itemValue === 'string') {
-          return itemValue.toLowerCase() === value.toLowerCase()
-        }
-        return itemValue === value
-      })
-    }
+    // Apply filters (shared pipeline, #1192 — legacy exact-match semantics)
+    items = filterItems(items, filters, { stringMatch: 'exact' })
 
-    // Apply search (substring match on all string fields)
-    if (search && typeof search === 'string' && search.trim()) {
-      const query = search.toLowerCase().trim()
-      items = items.filter((item) => {
-        for (const value of Object.values(item)) {
-          if (typeof value === 'string' && value.toLowerCase().includes(query)) {
-            return true
-          }
-        }
-        return false
-      })
-    }
+    // Apply search (shared pipeline, #1192)
+    items = searchItems(items, search as string | undefined)
 
     const total = items.length
 
-    // Apply sorting
-    if (sort_by) {
-      items.sort((a, b) => {
-        const aVal = a[sort_by as keyof T]
-        const bVal = b[sort_by as keyof T]
-        if (aVal === undefined || aVal === null) return 1
-        if (bVal === undefined || bVal === null) return -1
-        if (aVal < bVal) return sort_order === 'asc' ? -1 : 1
-        if (aVal > bVal) return sort_order === 'asc' ? 1 : -1
-        return 0
-      })
-    }
-
-    // Apply pagination
-    const start = (page - 1) * page_size
-    items = items.slice(start, start + page_size)
+    // Apply sorting + pagination (shared pipeline, #1192)
+    sortItems(items, sort_by, sort_order)
+    items = paginate(items, page, page_size)
 
     return { items, total }
   }

package/src/entity/storage/MemoryStorage.ts

@@ -1,5 +1,7 @@
 import { IStorage } from './IStorage'
 import type { EntityRecord, ListParams, ListResult, StorageCapabilities } from '../../types'
+import { StorageError } from './errors'
+import { sortItems, filterItems, paginate, defaultGenerateId } from '../../query/clientFilter'
 
 /**
  * MemoryStorage options
@@ -10,17 +12,8 @@ export interface MemoryStorageOptions<T extends EntityRecord = EntityRecord> {
   initialData?: T[]
 }
 
-/**
- * Storage error with HTTP-like status
- */
-export class StorageError extends Error {
-  status: number
-  constructor(message: string, status: number) {
-    super(message)
-    this.status = status
-    this.name = 'StorageError'
-  }
-}
+// StorageError moved to ./errors (#1192); re-exported for back-compat.
+export { StorageError } from './errors'
 
 /**
  * MemoryStorage - In-memory storage adapter
@@ -46,7 +39,7 @@ export class MemoryStorage<T extends EntityRecord = EntityRecord> extends IStora
     super()
     const {
       idField = 'id',
-      generateId = () => Date.now().toString(36) + Math.random().toString(36).substr(2),
+      generateId = defaultGenerateId,
       initialData = [],
     } = options
 
@@ -72,36 +65,14 @@ export class MemoryStorage<T extends EntityRecord = EntityRecord> extends IStora
 
     let items = this._getAll()
 
-    // Apply filters
-    for (const [key, value] of Object.entries(filters)) {
-      if (value === null || value === undefined || value === '') continue
-      items = items.filter((item) => {
-        const itemValue = item[key as keyof T]
-        if (typeof value === 'string' && typeof itemValue === 'string') {
-          return itemValue.toLowerCase().includes(value.toLowerCase())
-        }
-        return itemValue === value
-      })
-    }
+    // Apply filters (shared pipeline, #1192 — legacy substring semantics)
+    items = filterItems(items, filters, { stringMatch: 'includes' })
 
     const total = items.length
 
-    // Apply sorting
-    if (sort_by) {
-      items.sort((a, b) => {
-        const aVal = a[sort_by as keyof T]
-        const bVal = b[sort_by as keyof T]
-        if (aVal === undefined || aVal === null) return 1
-        if (bVal === undefined || bVal === null) return -1
-        if (aVal < bVal) return sort_order === 'asc' ? -1 : 1
-        if (aVal > bVal) return sort_order === 'asc' ? 1 : -1
-        return 0
-      })
-    }
-
-    // Apply pagination
-    const start = (page - 1) * page_size
-    items = items.slice(start, start + page_size)
+    // Apply sorting + pagination (shared pipeline, #1192)
+    sortItems(items, sort_by, sort_order)
+    items = paginate(items, page, page_size)
 
     return { items, total }
   }

package/src/entity/storage/MockApiStorage.ts

@@ -1,7 +1,8 @@
 import { IStorage } from './IStorage'
-import { StorageError } from './MemoryStorage'
+import { StorageError } from './errors'
 import { QueryExecutor } from '../../query'
 import type { EntityRecord, ListParams, ListResult, StorageCapabilities } from '../../types'
+import { sortItems, searchItems, paginate, defaultGenerateId } from '../../query/clientFilter'
 
 /**
  * MockApiStorage options
@@ -59,7 +60,7 @@ export class MockApiStorage<T extends EntityRecord = EntityRecord> extends IStor
     const {
       entityName,
       idField = 'id',
-      generateId = () => Date.now().toString(36) + Math.random().toString(36).substr(2),
+      generateId = defaultGenerateId,
       initialData = null,
       authCheck = null,
     } = options
@@ -144,37 +145,14 @@ export class MockApiStorage<T extends EntityRecord = EntityRecord> extends IStor
         .items as T[]
     }
 
-    // Apply search (substring match on all string fields)
-    if (search && typeof search === 'string' && search.trim()) {
-      const query = search.toLowerCase().trim()
-      items = items.filter((item) => {
-        for (const value of Object.values(item)) {
-          if (typeof value === 'string' && value.toLowerCase().includes(query)) {
-            return true
-          }
-        }
-        return false
-      })
-    }
+    // Apply search (shared pipeline, #1192)
+    items = searchItems(items, search as string | undefined)
 
     const total = items.length
 
-    // Apply sorting
-    if (sort_by) {
-      items.sort((a, b) => {
-        const aVal = a[sort_by as keyof T]
-        const bVal = b[sort_by as keyof T]
-        if (aVal === undefined || aVal === null) return 1
-        if (bVal === undefined || bVal === null) return -1
-        if (aVal < bVal) return sort_order === 'asc' ? -1 : 1
-        if (aVal > bVal) return sort_order === 'asc' ? 1 : -1
-        return 0
-      })
-    }
-
-    // Apply pagination
-    const start = (page - 1) * page_size
-    items = items.slice(start, start + page_size)
+    // Apply sorting + pagination (shared pipeline, #1192)
+    sortItems(items, sort_by, sort_order)
+    items = paginate(items, page, page_size)
 
     return { items, total }
   }

package/src/entity/storage/SdkStorage.ts

@@ -1,5 +1,6 @@
 import { IStorage } from './IStorage'
 import type { EntityRecord, ListParams, ListResult, StorageCapabilities } from '../../types'
+import { sortItems, filterItems, paginate } from '../../query/clientFilter'
 
 /**
  * SDK method result with data property
@@ -289,33 +290,12 @@ export class SdkStorage<T extends EntityRecord = EntityRecord> extends IStorage<
     if (this.clientSidePagination && items.length > 0) {
       total = items.length
 
-      if (sort_by) {
-        items = [...items].sort((a, b) => {
-          const aVal = a[sort_by as keyof T]
-          const bVal = b[sort_by as keyof T]
-          if (aVal === undefined || aVal === null) return 1
-          if (bVal === undefined || bVal === null) return -1
-          if (aVal < bVal) return sort_order === 'asc' ? -1 : 1
-          if (aVal > bVal) return sort_order === 'asc' ? 1 : -1
-          return 0
-        })
-      }
-
-      for (const [key, value] of Object.entries(filters)) {
-        if (value === null || value === undefined || value === '') continue
-        items = items.filter((item) => {
-          const itemValue = item[key as keyof T]
-          if (typeof value === 'string' && typeof itemValue === 'string') {
-            return itemValue.toLowerCase().includes(value.toLowerCase())
-          }
-          return itemValue === value
-        })
-      }
-
+      // Shared pipeline (#1192) — original order preserved: sort, then
+      // filter (substring semantics), then paginate.
+      items = sortItems([...items], sort_by, sort_order)
+      items = filterItems(items, filters, { stringMatch: 'includes' })
       total = items.length
-
-      const start = (page - 1) * page_size
-      items = items.slice(start, start + page_size)
+      items = paginate(items, page, page_size)
     }
 
     return { items, total }

package/src/entity/storage/errors.ts

@@ -0,0 +1,15 @@
+/**
+ * Storage error types (#1192) — moved out of MemoryStorage so sibling
+ * adapters no longer cross-import from one another.
+ */
+
+/** Error with an HTTP-like status code, thrown by storage adapters. */
+export class StorageError extends Error {
+  status: number
+
+  constructor(message: string, status = 500) {
+    super(message)
+    this.name = 'StorageError'
+    this.status = status
+  }
+}

package/src/query/clientFilter.ts

@@ -0,0 +1,87 @@
+/**
+ * Shared client-side list pipeline (#1192, KPI-5)
+ *
+ * The sort / search / paginate blocks below were byte-identical across
+ * MemoryStorage, LocalStorage, MockApiStorage, SdkStorage and
+ * EntityManager.query — one implementation now serves them all.
+ *
+ * Filtering intentionally takes a `stringMatch` mode because the adapters
+ * historically diverged (Memory/Sdk: substring `includes`, Local: exact
+ * case-insensitive) and this refactor is behavior-preserving. MockApiStorage
+ * keeps delegating operator filters to QueryExecutor; converging every
+ * adapter onto QueryExecutor would change plain-string semantics and is
+ * out of scope here.
+ */
+
+export type SortOrder = 'asc' | 'desc'
+
+/** Sort by a field, nulls/undefined last — the canonical adapter comparator. */
+export function sortItems<T>(items: T[], sortBy?: string | null, sortOrder: SortOrder = 'asc'): T[] {
+  if (!sortBy) return items
+  return items.sort((a, b) => {
+    const aVal = a[sortBy as keyof T]
+    const bVal = b[sortBy as keyof T]
+    if (aVal === undefined || aVal === null) return 1
+    if (bVal === undefined || bVal === null) return -1
+    if (aVal < bVal) return sortOrder === 'asc' ? -1 : 1
+    if (aVal > bVal) return sortOrder === 'asc' ? 1 : -1
+    return 0
+  })
+}
+
+export interface FilterItemsOptions {
+  /**
+   * How string filter values match string item values:
+   * - 'includes': case-insensitive substring (MemoryStorage/SdkStorage legacy)
+   * - 'exact': case-insensitive equality (LocalStorage legacy)
+   */
+  stringMatch?: 'includes' | 'exact'
+}
+
+/** Apply simple field filters; empty/null/undefined filter values are skipped. */
+export function filterItems<T>(
+  items: T[],
+  filters: Record<string, unknown> = {},
+  options: FilterItemsOptions = {}
+): T[] {
+  const { stringMatch = 'includes' } = options
+  let result = items
+  for (const [key, value] of Object.entries(filters)) {
+    if (value === null || value === undefined || value === '') continue
+    result = result.filter((item) => {
+      const itemValue = item[key as keyof T]
+      if (typeof value === 'string' && typeof itemValue === 'string') {
+        return stringMatch === 'exact'
+          ? itemValue.toLowerCase() === value.toLowerCase()
+          : itemValue.toLowerCase().includes(value.toLowerCase())
+      }
+      return itemValue === value
+    })
+  }
+  return result
+}
+
+/** Substring match on every string field (the adapters' full-text search). */
+export function searchItems<T>(items: T[], search?: string | null): T[] {
+  if (!search || typeof search !== 'string' || !search.trim()) return items
+  const query = search.toLowerCase().trim()
+  return items.filter((item) => {
+    for (const value of Object.values(item as Record<string, unknown>)) {
+      if (typeof value === 'string' && value.toLowerCase().includes(query)) {
+        return true
+      }
+    }
+    return false
+  })
+}
+
+/** Slice a page out of the item list. */
+export function paginate<T>(items: T[], page = 1, pageSize = 20): T[] {
+  const start = (page - 1) * pageSize
+  return items.slice(start, start + pageSize)
+}
+
+/** Default id generator for in-memory adapters (was triplicated, with a deprecated substr). */
+export function defaultGenerateId(): string {
+  return Date.now().toString(36) + Math.random().toString(36).slice(2)
+}