strata-storage 2.5.0 → 2.6.1

package/ios/Plugin/StrataStoragePlugin.swift

@@ -13,11 +13,42 @@ import Capacitor
 public class StrataStoragePlugin: CAPPlugin {
     private let userDefaultsStorage = UserDefaultsStorage()
     private let keychainStorage = KeychainStorage()
-    private let sqliteStorage = SQLiteStorage()
+    private let filesystemStorage = FilesystemStorage()
 
     /// Storage types that have a real native backend on iOS.
-    /// `filesystem` is intentionally absent — see isAvailable / resolveUnsupported.
-    private let supportedStorageTypes: Set<String> = ["preferences", "secure", "sqlite"]
+    private let supportedStorageTypes: Set<String> = ["preferences", "secure", "sqlite", "filesystem"]
+
+    // MARK: - SQLite multi-store helpers
+
+    /// Default database name (→ file `strata_storage.db`) and table.
+    private static let defaultDatabase = "strata_storage"
+    private static let defaultTable = "storage"
+
+    /// Sanitizes a database name into a safe `.db` filename. Strips everything
+    /// outside `[A-Za-z0-9_]` (which also blocks path separators / traversal),
+    /// then appends `.db`. Empty input falls back to the default. The filename
+    /// CANNOT be a bound parameter, so it must be sanitized before use.
+    private func sqliteFileName(from database: String?) -> String {
+        let raw = database ?? StrataStoragePlugin.defaultDatabase
+        let cleaned = String(raw.unicodeScalars.filter { CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_").contains($0) })
+        let safe = cleaned.isEmpty ? StrataStoragePlugin.defaultDatabase : cleaned
+        return "\(safe).db"
+    }
+
+    /// Sanitizes a table name to a safe SQL identifier matching `^[A-Za-z0-9_]+$`.
+    /// Disallowed characters are removed; empty input falls back to the default.
+    /// The table name is interpolated into SQL (it cannot be bound), so this is
+    /// the single point that guarantees injection-safety for the identifier.
+    private func sqliteTableName(from table: String?) -> String {
+        let raw = table ?? StrataStoragePlugin.defaultTable
+        let cleaned = String(raw.unicodeScalars.filter { CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_").contains($0) })
+        return cleaned.isEmpty ? StrataStoragePlugin.defaultTable : cleaned
+    }
+
+    /// Returns the cached SQLite store for the call's `database` option.
+    private func sqliteStore(for call: CAPPluginCall) -> SQLiteStorage {
+        return SQLiteStorageManager.shared.store(forFile: sqliteFileName(from: call.getString("database")))
+    }
 
     /**
      * Check if a specific storage type is available.
@@ -30,16 +61,10 @@ public class StrataStoragePlugin: CAPPlugin {
         ])
     }
 
-    private func rejectUnsupportedFilesystem(_ call: CAPPluginCall) {
-        call.reject(
-            "Filesystem storage is not implemented in the native iOS plugin. " +
-            "Use the 'preferences', 'secure', or 'sqlite' storage types, or a " +
-            "web/Capacitor Filesystem-backed adapter."
-        )
-    }
-
     /**
-     * Get value from storage
+     * Get value from storage.
+     * For sqlite/filesystem the resolved `value` is the full StorageValue
+     * wrapper object (or NSNull on a miss).
      */
     @objc func get(_ call: CAPPluginCall) {
         guard let key = call.getString("key") else {
@@ -56,10 +81,9 @@ public class StrataStoragePlugin: CAPPlugin {
             case "secure":
                 value = try keychainStorage.get(key: key)
             case "sqlite":
-                value = sqliteStorage.get(key: key)
+                value = sqliteStore(for: call).get(table: sqliteTableName(from: call.getString("table")), key: key)
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                value = filesystemStorage.get(key: key)
             case "preferences":
                 fallthrough
             default:
@@ -75,7 +99,9 @@ public class StrataStoragePlugin: CAPPlugin {
     }
 
     /**
-     * Set value in storage
+     * Set value in storage.
+     * For sqlite/filesystem the `value` option is the full StorageValue
+     * wrapper object and is stored verbatim (JSON) for a perfect round-trip.
      */
     @objc func set(_ call: CAPPluginCall) {
         guard let key = call.getString("key") else {
@@ -83,25 +109,44 @@ public class StrataStoragePlugin: CAPPlugin {
             return
         }
 
-        let value = call.getValue("value") ?? NSNull()
         let storage = call.getString("storage") ?? "preferences"
 
         do {
             switch storage {
             case "secure":
+                let value = call.getValue("value") ?? NSNull()
                 _ = try keychainStorage.set(key: key, value: value)
             case "sqlite":
-                let ok = try sqliteStorage.set(key: key, value: value)
+                // getObject returns JSObject ([String: JSValue]); upcast each
+                // value to Any (the canonical Capacitor pattern) so the bridged
+                // Foundation values are JSONSerialization-compatible.
+                guard let jsObject = call.getObject("value") else {
+                    call.reject("SQLite value must be a StorageValue object")
+                    return
+                }
+                let ok = try sqliteStore(for: call).set(
+                    table: sqliteTableName(from: call.getString("table")),
+                    key: key,
+                    wrapper: jsObject as [String: Any]
+                )
                 if !ok {
                     call.reject("Failed to write value to SQLite")
                     return
                 }
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                guard let jsObject = call.getObject("value") else {
+                    call.reject("Filesystem value must be a StorageValue object")
+                    return
+                }
+                let ok = try filesystemStorage.set(key: key, wrapper: jsObject as [String: Any])
+                if !ok {
+                    call.reject("Failed to write value to filesystem")
+                    return
+                }
             case "preferences":
                 fallthrough
             default:
+                let value = call.getValue("value") ?? NSNull()
                 userDefaultsStorage.set(key: key, value: value)
             }
 
@@ -127,10 +172,9 @@ public class StrataStoragePlugin: CAPPlugin {
             case "secure":
                 _ = try keychainStorage.remove(key: key)
             case "sqlite":
-                _ = sqliteStorage.remove(key: key)
+                _ = sqliteStore(for: call).remove(table: sqliteTableName(from: call.getString("table")), key: key)
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                _ = filesystemStorage.remove(key: key)
             case "preferences":
                 fallthrough
             default:
@@ -158,10 +202,9 @@ public class StrataStoragePlugin: CAPPlugin {
             case "secure":
                 _ = try keychainStorage.clear(prefix: prefix)
             case "sqlite":
-                _ = sqliteStorage.clear(prefix: prefix)
+                _ = sqliteStore(for: call).clear(table: sqliteTableName(from: call.getString("table")), prefix: prefix)
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                _ = filesystemStorage.clear(prefix: prefix)
             case "preferences":
                 fallthrough
             default:
@@ -188,10 +231,9 @@ public class StrataStoragePlugin: CAPPlugin {
             case "secure":
                 keys = try keychainStorage.keys(pattern: pattern)
             case "sqlite":
-                keys = sqliteStorage.keys(pattern: pattern)
+                keys = sqliteStore(for: call).keys(table: sqliteTableName(from: call.getString("table")), pattern: pattern)
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                keys = filesystemStorage.keys(pattern: pattern)
             case "preferences":
                 fallthrough
             default:
@@ -207,32 +249,45 @@ public class StrataStoragePlugin: CAPPlugin {
     }
 
     /**
-     * Get storage size information
+     * Get storage size information.
+     * When `detailed` is true, resolves `{ total, count, detailed: { keys,
+     * values, metadata } }`; otherwise `{ total, count }`.
      */
     @objc func size(_ call: CAPPluginCall) {
         let storage = call.getString("storage") ?? "preferences"
+        let detailed = call.getBool("detailed") ?? false
 
         do {
-            let sizeInfo: (total: Int, count: Int)
+            // segments carries total/count/keys/values/metadata in bytes.
+            let segments: [String: Int]
 
             switch storage {
             case "secure":
-                sizeInfo = try keychainStorage.size()
+                let info = try keychainStorage.size()
+                segments = ["total": info.total, "count": info.count, "keys": 0, "values": info.total, "metadata": 0]
             case "sqlite":
-                sizeInfo = try sqliteStorage.size()
+                segments = try sqliteStore(for: call).size(table: sqliteTableName(from: call.getString("table")))
             case "filesystem":
-                rejectUnsupportedFilesystem(call)
-                return
+                segments = filesystemStorage.size()
             case "preferences":
                 fallthrough
             default:
-                sizeInfo = userDefaultsStorage.size()
+                let info = userDefaultsStorage.size()
+                segments = ["total": info.total, "count": info.count, "keys": 0, "values": info.total, "metadata": 0]
             }
 
-            call.resolve([
-                "total": sizeInfo.total,
-                "count": sizeInfo.count
-            ])
+            var result: [String: Any] = [
+                "total": segments["total"] ?? 0,
+                "count": segments["count"] ?? 0
+            ]
+            if detailed {
+                result["detailed"] = [
+                    "keys": segments["keys"] ?? 0,
+                    "values": segments["values"] ?? 0,
+                    "metadata": segments["metadata"] ?? 0
+                ]
+            }
+            call.resolve(result)
         } catch {
             call.reject("Failed to get size", nil, error)
         }
@@ -241,7 +296,7 @@ public class StrataStoragePlugin: CAPPlugin {
     /**
      * Query SQLite-backed storage.
      * Matches the optional `query` method in the JS contract:
-     * resolves `{ results: [{ key, value }] }`.
+     * resolves `{ results: [{ key }] }` (JS re-fetches each value via get).
      */
     @objc func query(_ call: CAPPluginCall) {
         let storage = call.getString("storage") ?? "sqlite"
@@ -252,7 +307,10 @@ public class StrataStoragePlugin: CAPPlugin {
         }
 
         let condition = call.getObject("condition") ?? [:]
-        let results = sqliteStorage.query(condition: condition)
+        let results = sqliteStore(for: call).query(
+            table: sqliteTableName(from: call.getString("table")),
+            condition: condition
+        )
         call.resolve([
             "results": results
         ])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strata-storage",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Zero-dependency universal storage plugin providing a unified API for all storage operations across web, Android, and iOS platforms",
   "type": "module",
   "main": "dist/index.js",
@@ -103,9 +103,9 @@
     }
   },
   "devDependencies": {
-    "@angular/common": "^21.2.14",
-    "@angular/core": "^21.2.14",
-    "@angular/forms": "^21.2.14",
+    "@angular/common": "^21.2.15",
+    "@angular/core": "^21.2.15",
+    "@angular/forms": "^21.2.15",
     "@capacitor/core": "^8.3.4",
     "@types/node": "^25.9.1",
     "@types/react": "^19.2.15",
@@ -114,7 +114,7 @@
     "@vitest/coverage-v8": "^4.1.7",
     "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-prettier": "^5.5.6",
     "jsdom": "^29.1.1",
     "prettier": "^3.8.3",
     "react": "^19.2.6",
@@ -122,7 +122,7 @@
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.60.0",
     "vitest": "^4.1.7",
-    "vue": "^3.5.34",
+    "vue": "^3.5.35",
     "zone.js": "~0.16.0"
   },
   "engines": {