@delma/fylo 1.1.2 → 2.0.1

package/src/core/directory.ts

@@ -1,16 +1,18 @@
-import { Walker } from "./walker"
-import TTID from "@delma/ttid"
-import { S3 } from "../adapters/s3"
-import { Redis } from "../adapters/redis"
-import { Cipher } from "../adapters/cipher"
+import { Walker } from './walker'
+import TTID from '@delma/ttid'
+import { S3 } from '../adapters/s3'
+import { Redis } from '../adapters/redis'
+import { Cipher } from '../adapters/cipher'
 
 export class Dir {
-
     private static readonly KEY_LIMIT = 1024
 
-    private static readonly SLASH_ASCII = "%2F"
+    private static readonly SLASH_ASCII = '%2F'
 
-    private readonly transactions: Array<{ action: (...args: string[]) => Promise<void>, args: string[] }>;
+    private readonly transactions: Array<{
+        action: (...args: string[]) => Promise<void>
+        args: string[]
+    }>
 
     private static _redis: Redis | null = null
 
@@ -28,7 +30,6 @@ export class Dir {
     }
 
     static async reconstructData(collection: string, items: string[]) {
-
         items = await this.readValues(collection, items)
 
         let fieldVal: Record<string, string> = {}
@@ -41,7 +42,7 @@ export class Dir {
             // Decrypt value if field is encrypted — fieldPath starts with TTID segment
             // so strip it to get the actual field name for the check
             const fieldOnly = segs.slice(1).join('/')
-            if(Cipher.isConfigured() && Cipher.isEncryptedField(collection, fieldOnly)) {
+            if (Cipher.isConfigured() && Cipher.isEncryptedField(collection, fieldOnly)) {
                 fieldVal[fieldPath] = await Cipher.decrypt(val)
             } else {
                 fieldVal[fieldPath] = val
@@ -52,15 +53,12 @@ export class Dir {
     }
 
     private static async readValues(collection: string, items: string[]) {
-
-        for(let i = 0; i < items.length; i++) {
-
+        for (let i = 0; i < items.length; i++) {
             const segments = items[i].split('/')
 
             const filename = segments.pop()!
 
-            if(TTID.isUUID(filename)) {
-
+            if (TTID.isUUID(filename)) {
                 const file = S3.file(collection, items[i])
                 const val = await file.text()
 
@@ -71,193 +69,176 @@ export class Dir {
         return items
     }
 
-    private static async filterByTimestamp(_id: _ttid, indexes: string[], { updated, created }: { updated?: _timestamp, created?: _timestamp }) {
-
+    private static async filterByTimestamp(
+        _id: _ttid,
+        indexes: string[],
+        { updated, created }: { updated?: _timestamp; created?: _timestamp }
+    ) {
         const { createdAt, updatedAt } = TTID.decodeTime(_id)
 
-        if(updated && updatedAt) {
-
-            if((updated.$gt || updated.$gte) && (updated.$lt || updated.$lte)) {
-
-                if(updated.$gt && updated.$lt) {
-
-                    if(updated.$gt! > updated.$lt!) throw new Error("Invalid updated query")
+        if (updated && updatedAt) {
+            if ((updated.$gt || updated.$gte) && (updated.$lt || updated.$lte)) {
+                if (updated.$gt && updated.$lt) {
+                    if (updated.$gt! > updated.$lt!) throw new Error('Invalid updated query')
 
                     indexes = updatedAt > updated.$gt! && updatedAt < updated.$lt! ? indexes : []
-
-                } else if(updated.$gt && updated.$lte) {
-
-                    if(updated.$gt! > updated.$lte!) throw new Error("Invalid updated query")
+                } else if (updated.$gt && updated.$lte) {
+                    if (updated.$gt! > updated.$lte!) throw new Error('Invalid updated query')
 
                     indexes = updatedAt > updated.$gt! && updatedAt <= updated.$lte! ? indexes : []
-
-                } else if(updated.$gte && updated.$lt) {
-
-                    if(updated.$gte! > updated.$lt!) throw new Error("Invalid updated query")
+                } else if (updated.$gte && updated.$lt) {
+                    if (updated.$gte! > updated.$lt!) throw new Error('Invalid updated query')
 
                     indexes = updatedAt >= updated.$gte! && updatedAt < updated.$lt! ? indexes : []
+                } else if (updated.$gte && updated.$lte) {
+                    if (updated.$gte! > updated.$lte!) throw new Error('Invalid updated query')
 
-                } else if(updated.$gte && updated.$lte) {
-
-                    if(updated.$gte! > updated.$lte!) throw new Error("Invalid updated query")
-
-                    indexes = updatedAt >= updated.$gte! && updatedAt <= updated.$lte! ? indexes : []
+                    indexes =
+                        updatedAt >= updated.$gte! && updatedAt <= updated.$lte! ? indexes : []
                 }
-
-            } else if((updated.$gt || updated.$gte) && !updated.$lt && !updated.$lte) {
-
-                indexes = updated.$gt ? updatedAt > updated.$gt! ? indexes : [] : updatedAt >= updated.$gte! ? indexes : []
-
-            } else if(!updated.$gt && !updated.$gte && (updated.$lt || updated.$lte)) {
-
-                indexes = updated.$lt ? updatedAt < updated.$lt! ? indexes : [] : updatedAt <= updated.$lte! ? indexes : []
+            } else if ((updated.$gt || updated.$gte) && !updated.$lt && !updated.$lte) {
+                indexes = updated.$gt
+                    ? updatedAt > updated.$gt!
+                        ? indexes
+                        : []
+                    : updatedAt >= updated.$gte!
+                      ? indexes
+                      : []
+            } else if (!updated.$gt && !updated.$gte && (updated.$lt || updated.$lte)) {
+                indexes = updated.$lt
+                    ? updatedAt < updated.$lt!
+                        ? indexes
+                        : []
+                    : updatedAt <= updated.$lte!
+                      ? indexes
+                      : []
             }
         }
 
-        if(created) {
-
-            if((created.$gt || created.$gte) && (created.$lt || created.$lte)) {
-
-                if(created.$gt && created.$lt) {
-
-                    if(created.$gt! > created.$lt!) throw new Error("Invalid created query")
+        if (created) {
+            if ((created.$gt || created.$gte) && (created.$lt || created.$lte)) {
+                if (created.$gt && created.$lt) {
+                    if (created.$gt! > created.$lt!) throw new Error('Invalid created query')
 
                     indexes = createdAt > created.$gt! && createdAt < created.$lt! ? indexes : []
-
-                } else if(created.$gt && created.$lte) {
-
-                    if(created.$gt! > created.$lte!) throw new Error("Invalid updated query")
+                } else if (created.$gt && created.$lte) {
+                    if (created.$gt! > created.$lte!) throw new Error('Invalid updated query')
 
                     indexes = createdAt > created.$gt! && createdAt <= created.$lte! ? indexes : []
-
-                } else if(created.$gte && created.$lt) {
-
-                    if(created.$gte! > created.$lt!) throw new Error("Invalid updated query")
+                } else if (created.$gte && created.$lt) {
+                    if (created.$gte! > created.$lt!) throw new Error('Invalid updated query')
 
                     indexes = createdAt >= created.$gte! && createdAt < created.$lt! ? indexes : []
+                } else if (created.$gte && created.$lte) {
+                    if (created.$gte! > created.$lte!) throw new Error('Invalid updated query')
 
-                } else if(created.$gte && created.$lte) {
-
-                    if(created.$gte! > created.$lte!) throw new Error("Invalid updated query")
-
-                    indexes = createdAt >= created.$gte! && createdAt <= created.$lte! ? indexes : []
+                    indexes =
+                        createdAt >= created.$gte! && createdAt <= created.$lte! ? indexes : []
                 }
-
-            } else if((created.$gt || created.$gte) && !created.$lt && !created.$lte) {
-
-                if(created.$gt) indexes = createdAt > created.$gt! ? indexes : []
-                else if(created.$gte) indexes = createdAt >= created.$gte! ? indexes : []
-
-            } else if(!created.$gt && !created.$gte && (created.$lt || created.$lte)) {
-
-                if(created.$lt) indexes = createdAt < created.$lt! ? indexes : []
-                else if(created.$lte) indexes = createdAt <= created.$lte! ? indexes : []
+            } else if ((created.$gt || created.$gte) && !created.$lt && !created.$lte) {
+                if (created.$gt) indexes = createdAt > created.$gt! ? indexes : []
+                else if (created.$gte) indexes = createdAt >= created.$gte! ? indexes : []
+            } else if (!created.$gt && !created.$gte && (created.$lt || created.$lte)) {
+                if (created.$lt) indexes = createdAt < created.$lt! ? indexes : []
+                else if (created.$lte) indexes = createdAt <= created.$lte! ? indexes : []
             }
         }
 
         return indexes.length > 0
     }
 
-    static async *searchDocs<T extends Record<string, any>>(collection: string, pattern: string | string[], { updated, created }: { updated?: _timestamp, created?: _timestamp }, { listen = false, skip = false }: { listen: boolean, skip: boolean }, deleted: boolean = false): AsyncGenerator<Record<_ttid, T> | _ttid | void, void, { count: number, limit?: number  }> {
-
+    static async *searchDocs<T extends Record<string, any>>(
+        collection: string,
+        pattern: string | string[],
+        { updated, created }: { updated?: _timestamp; created?: _timestamp },
+        { listen = false, skip = false }: { listen: boolean; skip: boolean },
+        deleted: boolean = false
+    ): AsyncGenerator<Record<_ttid, T> | _ttid | void, void, { count: number; limit?: number }> {
         const data = yield
         let count = data.count
         let limit = data.limit
 
         const constructData = async (collection: string, _id: _ttid, items: string[]) => {
-
-            if(created || updated) {
-
-                if(await this.filterByTimestamp(_id, items, { created, updated })) {
-
+            if (created || updated) {
+                if (await this.filterByTimestamp(_id, items, { created, updated })) {
                     const data = await this.reconstructData(collection, items)
 
                     return { [_id]: data } as Record<_ttid, T>
-
                 } else return {}
-
             } else {
-
                 const data = await this.reconstructData(collection, items)
 
                 return { [_id]: data } as Record<_ttid, T>
             }
         }
 
-        const processQuery = async function*(p: string): AsyncGenerator<Record<_ttid, T> | _ttid | void, void, { count: number, limit?: number  }> {
-
+        const processQuery = async function* (
+            p: string
+        ): AsyncGenerator<
+            Record<_ttid, T> | _ttid | void,
+            void,
+            { count: number; limit?: number }
+        > {
             let finished = false
 
-            if(listen && !deleted) {
-
+            if (listen && !deleted) {
                 const iter = Walker.search(collection, p, { listen, skip })
 
                 do {
-
                     const { value, done } = await iter.next({ count, limit })
 
-                    if(done) finished = true
+                    if (done) finished = true
 
-                    if(value) {
+                    if (value) {
                         const data = yield await constructData(collection, value._id, value.data)
                         count = data.count
                         limit = data.limit
                     }
-
-                } while(!finished)
-
-            } else if(listen && deleted) {
-
-                const iter = Walker.search(collection, p, { listen, skip }, "delete")
+                } while (!finished)
+            } else if (listen && deleted) {
+                const iter = Walker.search(collection, p, { listen, skip }, 'delete')
 
                 do {
-
                     const { value, done } = await iter.next({ count, limit })
 
-                    if(done) finished = true
+                    if (done) finished = true
 
-                    if(value) {
+                    if (value) {
                         const data = yield value._id
                         count = data.count
                         limit = data.limit
                     }
-
-                } while(!finished)
-
+                } while (!finished)
             } else {
-
                 const iter = Walker.search(collection, p, { listen, skip })
 
                 do {
-
                     const { value, done } = await iter.next({ count, limit })
 
-                    if(done) finished = true
+                    if (done) finished = true
 
-                    if(value) {
+                    if (value) {
                         const data = yield await constructData(collection, value._id, value.data)
                         count = data.count
                         limit = data.limit
                     }
-
-                } while(!finished)
+                } while (!finished)
             }
         }
 
-        if(Array.isArray(pattern)) {
-
-            for(const p of pattern) yield* processQuery(p)
-
+        if (Array.isArray(pattern)) {
+            for (const p of pattern) yield* processQuery(p)
         } else yield* processQuery(pattern)
     }
 
-    async putKeys(collection: string, { dataKey, indexKey }: { dataKey: string, indexKey: string }) {
-
+    async putKeys(
+        collection: string,
+        { dataKey, indexKey }: { dataKey: string; indexKey: string }
+    ) {
         let dataBody: string | undefined
         let indexBody: string | undefined
 
-        if(dataKey.length > Dir.KEY_LIMIT) {
-
+        if (dataKey.length > Dir.KEY_LIMIT) {
             const dataSegs = dataKey.split('/')
 
             dataBody = dataSegs.pop()!
@@ -265,8 +246,7 @@ export class Dir {
             indexKey = `${dataSegs.join('/')}/${Bun.randomUUIDv7()}`
         }
 
-        if(indexKey.length > Dir.KEY_LIMIT) {
-
+        if (indexKey.length > Dir.KEY_LIMIT) {
             const indexSegs = indexKey.split('/')
 
             const _id = indexSegs.pop()! as _ttid
@@ -295,23 +275,18 @@ export class Dir {
     }
 
     async executeRollback() {
-
         do {
-
             const transaction = this.transactions.pop()
 
-            if(transaction) {
-
+            if (transaction) {
                 const { action, args } = transaction
 
                 await action(...args)
             }
-
-        } while(this.transactions.length > 0)
+        } while (this.transactions.length > 0)
     }
 
     async deleteKeys(collection: string, dataKey: string) {
-
         const segments = dataKey.split('/')
 
         const _id = segments.shift()!
@@ -324,13 +299,10 @@ export class Dir {
         let dataBody: string | undefined
         let indexBody: string | undefined
 
-        if(dataFile.size > 0) dataBody = await dataFile.text()
-        if(indexFile.size > 0) indexBody = await indexFile.text()
+        if (dataFile.size > 0) dataBody = await dataFile.text()
+        if (indexFile.size > 0) indexBody = await indexFile.text()
 
-        await Promise.all([
-            S3.delete(collection, indexKey),
-            S3.delete(collection, dataKey)
-        ])
+        await Promise.all([S3.delete(collection, indexKey), S3.delete(collection, dataKey)])
 
         this.transactions.push({
             action: S3.put,
@@ -346,31 +318,32 @@ export class Dir {
     }
 
     static async extractKeys<T>(collection: string, _id: _ttid, data: T, parentField?: string) {
+        const keys: { data: string[]; indexes: string[] } = { data: [], indexes: [] }
 
-        const keys: { data: string[], indexes: string[] } = { data: [], indexes: [] }
-
-        const obj = {...data}
-
-        for(const field in obj) {
+        const obj = { ...data }
 
+        for (const field in obj) {
             const newField = parentField ? `${parentField}/${field}` : field
 
-            if(typeof obj[field] === 'object' && !Array.isArray(obj[field])) {
+            if (typeof obj[field] === 'object' && !Array.isArray(obj[field])) {
                 const items = await this.extractKeys(collection, _id, obj[field], newField)
                 keys.data.push(...items.data)
                 keys.indexes.push(...items.indexes)
-            } else if(typeof obj[field] === 'object' && Array.isArray(obj[field])) {
+            } else if (typeof obj[field] === 'object' && Array.isArray(obj[field])) {
                 const items: (string | number | boolean)[] = obj[field]
-                if(items.some((item) => typeof item === 'object')) throw new Error(`Cannot have an array of objects`)
-                for(let i = 0; i < items.length; i++) {
+                if (items.some((item) => typeof item === 'object'))
+                    throw new Error(`Cannot have an array of objects`)
+                for (let i = 0; i < items.length; i++) {
                     let val = String(items[i]).split('/').join(this.SLASH_ASCII)
-                    if(Cipher.isConfigured() && Cipher.isEncryptedField(collection, newField)) val = await Cipher.encrypt(val, true)
+                    if (Cipher.isConfigured() && Cipher.isEncryptedField(collection, newField))
+                        val = await Cipher.encrypt(val, true)
                     keys.data.push(`${_id}/${newField}/${i}/${val}`)
                     keys.indexes.push(`${newField}/${i}/${val}/${_id}`)
                 }
             } else {
                 let val = String(obj[field]).replaceAll('/', this.SLASH_ASCII)
-                if(Cipher.isConfigured() && Cipher.isEncryptedField(collection, newField)) val = await Cipher.encrypt(val, true)
+                if (Cipher.isConfigured() && Cipher.isEncryptedField(collection, newField))
+                    val = await Cipher.encrypt(val, true)
                 keys.data.push(`${_id}/${newField}/${val}`)
                 keys.indexes.push(`${newField}/${val}/${_id}`)
             }
@@ -380,20 +353,17 @@ export class Dir {
     }
 
     static constructData(fieldVal: Record<string, string>) {
-
         const data: Record<string, any> = {}
 
-        for(let fullField in fieldVal) {
-
+        for (let fullField in fieldVal) {
             const fields = fullField.split('/').slice(1)
 
             let curr = data
 
-            while(fields.length > 1) {
-
+            while (fields.length > 1) {
                 const field = fields.shift()!
 
-                if(typeof curr[field] !== 'object' || curr[field] === null)
+                if (typeof curr[field] !== 'object' || curr[field] === null)
                     curr[field] = isNaN(Number(fields[0])) ? {} : []
 
                 curr = curr[field]
@@ -408,7 +378,6 @@ export class Dir {
     }
 
     static parseValue(value: string) {
-
         try {
             return JSON.parse(value)
         } catch {

package/src/core/extensions.ts

@@ -1,10 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-Object.appendGroup = function (target: Record<string, any>, source: Record<string, any>): Record<string, any> {
+Object.appendGroup = function (
+    target: Record<string, any>,
+    source: Record<string, any>
+): Record<string, any> {
     const result = { ...target }
 
     for (const [sourceId, sourceGroup] of Object.entries(source)) {
-
         if (!result[sourceId]) {
             result[sourceId] = sourceGroup
             continue