strata-storage 2.4.3 → 2.6.0

package/ios/Plugin/StrataStoragePlugin.swift

@@ -3,93 +3,159 @@ import Capacitor
 
 /**
  * Main Capacitor plugin for Strata Storage
- * Coordinates between different storage types on iOS
+ * Coordinates between different storage types on iOS.
+ *
+ * NOTE: Method registration with the Capacitor bridge lives in
+ * StrataStoragePlugin.m (CAP_PLUGIN / CAP_PLUGIN_METHOD). Keep the two in
+ * sync when adding or renaming methods.
  */
 @objc(StrataStoragePlugin)
 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.
+    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 storage is available
+     * Check if a specific storage type is available.
+     * Matches the JS contract: resolves `{ available: boolean }`.
      */
     @objc func isAvailable(_ call: CAPPluginCall) {
+        let storage = call.getString("storage") ?? "preferences"
         call.resolve([
-            "available": true,
-            "platform": "ios",
-            "adapters": [
-                "preferences": true,
-                "secure": true,
-                "sqlite": true,
-                "filesystem": true
-            ]
+            "available": supportedStorageTypes.contains(storage)
         ])
     }
-    
+
     /**
-     * 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 {
             call.reject("Key is required")
             return
         }
-        
+
         let storage = call.getString("storage") ?? "preferences"
-        
+
         do {
             let value: Any?
-            
+
             switch storage {
             case "secure":
                 value = try keychainStorage.get(key: key)
             case "sqlite":
-                value = try sqliteStorage.get(key: key)
+                value = sqliteStore(for: call).get(table: sqliteTableName(from: call.getString("table")), key: key)
+            case "filesystem":
+                value = filesystemStorage.get(key: key)
             case "preferences":
                 fallthrough
             default:
                 value = userDefaultsStorage.get(key: key)
             }
-            
+
             call.resolve([
                 "value": value ?? NSNull()
             ])
         } catch {
-            call.reject("Failed to get value", error.localizedDescription)
+            call.reject("Failed to get value", nil, error)
         }
     }
-    
+
     /**
-     * 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 {
             call.reject("Key is required")
             return
         }
-        
-        let value = call.getValue("value") ?? NSNull()
+
         let storage = call.getString("storage") ?? "preferences"
-        
+
         do {
             switch storage {
             case "secure":
-                try keychainStorage.set(key: key, value: value)
+                let value = call.getValue("value") ?? NSNull()
+                _ = try keychainStorage.set(key: key, value: value)
             case "sqlite":
-                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":
+                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)
             }
-            
+
             call.resolve()
         } catch {
-            call.reject("Failed to set value", error.localizedDescription)
+            call.reject("Failed to set value", nil, error)
         }
     }
-    
+
     /**
      * Remove value from storage
      */
@@ -98,107 +164,248 @@ public class StrataStoragePlugin: CAPPlugin {
             call.reject("Key is required")
             return
         }
-        
+
         let storage = call.getString("storage") ?? "preferences"
-        
+
         do {
             switch storage {
             case "secure":
-                try keychainStorage.remove(key: key)
+                _ = try keychainStorage.remove(key: key)
             case "sqlite":
-                try sqliteStorage.remove(key: key)
+                _ = sqliteStore(for: call).remove(table: sqliteTableName(from: call.getString("table")), key: key)
+            case "filesystem":
+                _ = filesystemStorage.remove(key: key)
             case "preferences":
                 fallthrough
             default:
                 userDefaultsStorage.remove(key: key)
             }
-            
+
             call.resolve()
         } catch {
-            call.reject("Failed to remove value", error.localizedDescription)
+            call.reject("Failed to remove value", nil, error)
         }
     }
-    
+
     /**
-     * Clear storage
+     * Clear storage.
+     * The JS contract sends an optional `pattern`. The native backends accept
+     * a prefix; we use `pattern` as that prefix (prefix/contains matching).
      */
     @objc func clear(_ call: CAPPluginCall) {
         let storage = call.getString("storage") ?? "preferences"
-        let prefix = call.getString("prefix")
-        
+        // Accept both `pattern` (JS contract) and legacy `prefix`.
+        let prefix = call.getString("pattern") ?? call.getString("prefix")
+
         do {
             switch storage {
             case "secure":
-                try keychainStorage.clear(prefix: prefix)
+                _ = try keychainStorage.clear(prefix: prefix)
             case "sqlite":
-                try sqliteStorage.clear(prefix: prefix)
+                _ = sqliteStore(for: call).clear(table: sqliteTableName(from: call.getString("table")), prefix: prefix)
+            case "filesystem":
+                _ = filesystemStorage.clear(prefix: prefix)
             case "preferences":
                 fallthrough
             default:
                 userDefaultsStorage.clear(prefix: prefix)
             }
-            
+
             call.resolve()
         } catch {
-            call.reject("Failed to clear storage", error.localizedDescription)
+            call.reject("Failed to clear storage", nil, error)
         }
     }
-    
+
     /**
      * Get all keys from storage
      */
     @objc func keys(_ call: CAPPluginCall) {
         let storage = call.getString("storage") ?? "preferences"
         let pattern = call.getString("pattern")
-        
+
         do {
             let keys: [String]
-            
+
             switch storage {
             case "secure":
                 keys = try keychainStorage.keys(pattern: pattern)
             case "sqlite":
-                keys = try sqliteStorage.keys(pattern: pattern)
+                keys = sqliteStore(for: call).keys(table: sqliteTableName(from: call.getString("table")), pattern: pattern)
+            case "filesystem":
+                keys = filesystemStorage.keys(pattern: pattern)
             case "preferences":
                 fallthrough
             default:
                 keys = userDefaultsStorage.keys(pattern: pattern)
             }
-            
+
             call.resolve([
                 "keys": keys
             ])
         } catch {
-            call.reject("Failed to get keys", error.localizedDescription)
+            call.reject("Failed to get keys", nil, error)
         }
     }
-    
+
     /**
-     * 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":
+                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)
+        }
+    }
+
+    /**
+     * Query SQLite-backed storage.
+     * Matches the optional `query` method in the JS contract:
+     * resolves `{ results: [{ key }] }` (JS re-fetches each value via get).
+     */
+    @objc func query(_ call: CAPPluginCall) {
+        let storage = call.getString("storage") ?? "sqlite"
+
+        guard storage == "sqlite" else {
+            call.reject("Query is only supported for the 'sqlite' storage type")
+            return
+        }
+
+        let condition = call.getObject("condition") ?? [:]
+        let results = sqliteStore(for: call).query(
+            table: sqliteTableName(from: call.getString("table")),
+            condition: condition
+        )
+        call.resolve([
+            "results": results
+        ])
+    }
+
+    /**
+     * iOS-specific: read a UserDefaults value.
+     * Resolves `{ value: unknown }`.
+     */
+    @objc func getUserDefaults(_ call: CAPPluginCall) {
+        guard let key = call.getString("key") else {
+            call.reject("Key is required")
+            return
+        }
+        let suiteName = call.getString("suiteName")
+        let store = suiteName != nil ? UserDefaultsStorage(suiteName: suiteName) : userDefaultsStorage
+        call.resolve([
+            "value": store.get(key: key) ?? NSNull()
+        ])
+    }
+
+    /**
+     * iOS-specific: write a UserDefaults value.
+     */
+    @objc func setUserDefaults(_ call: CAPPluginCall) {
+        guard let key = call.getString("key") else {
+            call.reject("Key is required")
+            return
+        }
+        let value = call.getValue("value") ?? NSNull()
+        let suiteName = call.getString("suiteName")
+        let store = suiteName != nil ? UserDefaultsStorage(suiteName: suiteName) : userDefaultsStorage
+        _ = store.set(key: key, value: value)
+        call.resolve()
+    }
+
+    /**
+     * iOS-specific: read a Keychain value. Resolves `{ value: string | null }`.
+     */
+    @objc func getKeychain(_ call: CAPPluginCall) {
+        guard let key = call.getString("key") else {
+            call.reject("Key is required")
+            return
+        }
+        let service = call.getString("service")
+        let accessGroup = call.getString("accessGroup")
+        let store = (service != nil || accessGroup != nil)
+            ? KeychainStorage(service: service, accessGroup: accessGroup)
+            : keychainStorage
+
+        do {
+            let value = try store.get(key: key)
+            // The JS contract types this as `string | null`. Serialize
+            // non-string values to a JSON string so the bridge stays typed.
+            if let value = value {
+                if let str = value as? String {
+                    call.resolve(["value": str])
+                } else if let data = try? JSONSerialization.data(withJSONObject: value, options: []),
+                          let str = String(data: data, encoding: .utf8) {
+                    call.resolve(["value": str])
+                } else {
+                    call.resolve(["value": NSNull()])
+                }
+            } else {
+                call.resolve(["value": NSNull()])
+            }
+        } catch {
+            call.reject("Failed to read keychain item", nil, error)
+        }
+    }
+
+    /**
+     * iOS-specific: write a Keychain value, honoring the `accessible` option.
+     */
+    @objc func setKeychain(_ call: CAPPluginCall) {
+        guard let key = call.getString("key") else {
+            call.reject("Key is required")
+            return
+        }
+        guard let value = call.getString("value") else {
+            call.reject("Value is required and must be a string")
+            return
+        }
+        let service = call.getString("service")
+        let accessGroup = call.getString("accessGroup")
+        let accessible = call.getString("accessible")
+        let store = (service != nil || accessGroup != nil)
+            ? KeychainStorage(service: service, accessGroup: accessGroup)
+            : keychainStorage
+
+        do {
+            _ = try store.set(key: key, value: value, accessible: accessible)
+            call.resolve()
         } catch {
-            call.reject("Failed to get size", error.localizedDescription)
+            call.reject("Failed to write keychain item", nil, error)
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strata-storage",
-  "version": "2.4.3",
+  "version": "2.6.0",
   "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",
@@ -13,9 +13,7 @@
     "StrataStorage.podspec",
     "AI-INTEGRATION-GUIDE.md"
   ],
-  "bin": {
-    "strata-storage": "./scripts/cli.js"
-  },
+  "bin": "./scripts/cli.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -82,11 +80,18 @@
   "homepage": "https://github.com/aoneahsan/strata-storage#readme",
   "peerDependencies": {
     "@angular/core": ">=21.0.6",
+    "@angular/forms": ">=21.0.6",
     "@capacitor/core": ">=8.0.0",
     "react": ">=19.2.3",
     "vue": ">=3.5.26"
   },
   "peerDependenciesMeta": {
+    "@angular/core": {
+      "optional": true
+    },
+    "@angular/forms": {
+      "optional": true
+    },
     "@capacitor/core": {
       "optional": true
     },
@@ -95,28 +100,33 @@
     },
     "vue": {
       "optional": true
-    },
-    "@angular/core": {
-      "optional": true
     }
   },
   "devDependencies": {
-    "@types/node": "^25.0.9",
-    "@types/react": "^19.2.9",
-    "@typescript-eslint/eslint-plugin": "^8.53.1",
-    "@typescript-eslint/parser": "^8.53.1",
-    "@vitest/coverage-v8": "^4.0.17",
-    "eslint": "^9.39.2",
+    "@angular/common": "^21.2.14",
+    "@angular/core": "^21.2.14",
+    "@angular/forms": "^21.2.14",
+    "@capacitor/core": "^8.3.4",
+    "@types/node": "^25.9.1",
+    "@types/react": "^19.2.15",
+    "@typescript-eslint/eslint-plugin": "^8.60.0",
+    "@typescript-eslint/parser": "^8.60.0",
+    "@vitest/coverage-v8": "^4.1.7",
+    "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
-    "jsdom": "^27.4.0",
-    "prettier": "^3.8.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.1",
-    "vitest": "^4.0.17"
+    "jsdom": "^29.1.1",
+    "prettier": "^3.8.3",
+    "react": "^19.2.6",
+    "rxjs": "^7.8.2",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.60.0",
+    "vitest": "^4.1.7",
+    "vue": "^3.5.34",
+    "zone.js": "~0.16.0"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=24.13.0"
   },
   "capacitor": {
     "ios": {
@@ -126,5 +136,6 @@
       "src": "android",
       "androidModule": "strata-storage"
     }
-  }
+  },
+  "packageManager": "yarn@4.14.1"
 }

package/scripts/build.js

@@ -26,7 +26,7 @@ fs.mkdirSync(distDir, { recursive: true });
 // Compile TypeScript to ESM
 console.log('📦 Building ES Modules...');
 try {
-  execSync('npx tsc', { stdio: 'inherit', cwd: rootDir });
+  execSync('yarn exec tsc', { stdio: 'inherit', cwd: rootDir });
 } catch (error) {
   console.error('❌ Build failed');
   process.exit(1);
@@ -141,6 +141,18 @@ const distPackageJson = {
     './firebase': {
       types: './firebase.d.ts',
       default: './firebase.js'
+    },
+    './react': {
+      types: './integrations/react/index.d.ts',
+      default: './integrations/react/index.js'
+    },
+    './vue': {
+      types: './integrations/vue/index.d.ts',
+      default: './integrations/vue/index.js'
+    },
+    './angular': {
+      types: './integrations/angular/index.d.ts',
+      default: './integrations/angular/index.js'
     }
   },
   author: packageJson.author,
@@ -151,9 +163,8 @@ const distPackageJson = {
   peerDependenciesMeta: packageJson.peerDependenciesMeta,
   capacitor: packageJson.capacitor,
   sideEffects: false,
-  engines: {
-    node: '>=18.0.0'
-  }
+  // Mirror the root engines so the published manifest never drifts from it.
+  engines: packageJson.engines || { node: '>=18.0.0' }
 };
 
 fs.writeFileSync(
@@ -162,4 +173,4 @@ fs.writeFileSync(
 );
 
 console.log('✅ Build completed successfully!');
-console.log(`📂 Output: ${distDir}`);
+console.log(`📂 Output: ${distDir}`);

package/scripts/configure.js

@@ -399,11 +399,7 @@ async function installDependencies(config) {
   }
   
   // Install command
-  const command = config.packageManager === 'yarn' 
-    ? `yarn add ${deps.join(' ')}`
-    : config.packageManager === 'pnpm'
-    ? `pnpm add ${deps.join(' ')}`
-    : `npm install ${deps.join(' ')}`;
+  const command = `yarn add ${deps.join(' ')}`;
   
   try {
     log.info(`Running: ${command}`);
@@ -445,4 +441,4 @@ configure().catch((error) => {
   log.error('Configuration failed:');
   console.error(error);
   process.exit(1);
-});
+});

package/scripts/postinstall.js

@@ -30,7 +30,7 @@ if (isCapacitorProject) {
   console.log('📱 Capacitor Support Available (Optional):');
   console.log('   import { registerCapacitorAdapters } from "strata-storage/capacitor";');
   console.log('   await registerCapacitorAdapters(storage);');
-  console.log('   Run "npx cap sync" to sync native code\n');
+  console.log('   Run "yarn cap sync" to sync native code\n');
 }
 
 console.log('✨ Features:');
@@ -41,4 +41,4 @@ console.log('   • Built-in encryption & compression');
 console.log('   • Cross-tab synchronization\n');
 
 console.log('📖 Documentation: https://github.com/aoneahsan/strata-storage');
-console.log('⭐ Star us on GitHub: https://github.com/aoneahsan/strata-storage\n');
+console.log('⭐ Star us on GitHub: https://github.com/aoneahsan/strata-storage\n');