document-dataply 0.0.7-alpha.1 → 0.0.7

package/dist/cjs/index.js

@@ -10148,15 +10148,6 @@ function tokenize(text, options) {
   return [];
 }
 
-// src/utils/hash.ts
-function fastStringHash(str) {
-  let hash = 0;
-  for (let i = 0; i < str.length; i++) {
-    hash = (hash << 5) - hash + str.charCodeAt(i) | 0;
-  }
-  return hash >>> 0;
-}
-
 // src/core/documentAPI.ts
 var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
   indices = {};
@@ -10322,7 +10313,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
             tokens = tokenize(v, indexConfig);
           }
           const batchInsertData = [];
-          for (const token of tokens) {
+          for (let i = 0, len = tokens.length; i < len; i++) {
+            const token = tokens[i];
             const keyToInsert = isFts ? this.getTokenKey(k, token) : k;
             const entry = { k, v: token };
             batchInsertData.push([keyToInsert, entry]);
@@ -10387,25 +10379,24 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
     const data = JSON.parse(row);
     return data.magicString === "document-dataply" && data.version === 1;
   }
+  flatten(obj, parentKey = "", result = {}) {
+    for (const key in obj) {
+      const newKey = parentKey ? `${parentKey}.${key}` : key;
+      if (typeof obj[key] === "object" && obj[key] !== null) {
+        this.flatten(obj[key], newKey, result);
+      } else {
+        result[newKey] = obj[key];
+      }
+    }
+    return result;
+  }
   /**
    * returns flattened document
    * @param document 
    * @returns 
    */
   flattenDocument(document) {
-    const result = {};
-    const flatten = (obj, parentKey = "") => {
-      for (const key in obj) {
-        const newKey = parentKey ? `${parentKey}.${key}` : key;
-        if (typeof obj[key] === "object" && obj[key] !== null) {
-          flatten(obj[key], newKey);
-        } else {
-          result[newKey] = obj[key];
-        }
-      }
-    };
-    flatten(document);
-    return result;
+    return this.flatten(document, "", {});
   }
   async getDocumentMetadata(tx) {
     const metadata = await this.getMetadata(tx);
@@ -10533,21 +10524,21 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
     return { verySmallChunkSize, smallChunkSize };
   }
   getTokenKey(pk, token) {
-    return fastStringHash(pk + ":" + token);
+    return pk + ":" + token;
   }
   async applyCandidateByFTS(candidate, matchedTokens, filterValues, order) {
     const keys = /* @__PURE__ */ new Set();
-    for (const token of matchedTokens) {
+    for (let i = 0, len = matchedTokens.length; i < len; i++) {
+      const token = matchedTokens[i];
       const pairs = await candidate.tree.where(
         { primaryEqual: { v: token } },
-        { order }
-      );
-      for (const c of pairs.values()) {
-        if (!c || typeof c.k !== "number") continue;
-        const dpk = c.k;
-        if (filterValues === void 0 || filterValues.has(dpk)) {
-          keys.add(dpk);
+        {
+          order
         }
+      );
+      for (const pair of pairs.values()) {
+        if (filterValues && !filterValues.has(pair.k)) continue;
+        keys.add(pair.k);
       }
     }
     return keys;
@@ -10580,7 +10571,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
     const useIndexOrder = orderBy === void 0 || driver.field === orderBy;
     const candidates = [driver, ...others];
     let keys = void 0;
-    for (const candidate of candidates) {
+    for (let i = 0, len = candidates.length; i < len; i++) {
+      const candidate = candidates[i];
       const currentOrder = useIndexOrder ? sortOrder : void 0;
       if (candidate.isFtsMatch && candidate.matchTokens && candidate.matchTokens.length > 0) {
         keys = await this.applyCandidateByFTS(
@@ -10631,7 +10623,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         if (isFts) {
           tokens = tokenize(v, indexConfig);
         }
-        for (const token of tokens) {
+        for (let i = 0, len = tokens.length; i < len; i++) {
+          const token = tokens[i];
           const keyToInsert = isFts ? this.getTokenKey(dpk, token) : dpk;
           const [error] = await catchPromise(tree.insert(keyToInsert, { k: dpk, v: token }));
           if (error) {
@@ -10685,7 +10678,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
           if (isFts) {
             tokens = tokenize(v, indexConfig);
           }
-          for (const token of tokens) {
+          for (let j = 0, len2 = tokens.length; j < len2; j++) {
+            const token = tokens[j];
             const keyToInsert = isFts ? this.getTokenKey(item.pk, token) : item.pk;
             batchInsertData.push([keyToInsert, { k: item.pk, v: token }]);
           }
@@ -10736,7 +10730,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
           if (isFts && typeof oldV === "string") {
             oldTokens = tokenize(oldV, indexConfig);
           }
-          for (const oldToken of oldTokens) {
+          for (let j = 0, len2 = oldTokens.length; j < len2; j++) {
+            const oldToken = oldTokens[j];
             const keyToDelete = isFts ? this.getTokenKey(pk, oldToken) : pk;
             await treeTx.delete(keyToDelete, { k: pk, v: oldToken });
           }
@@ -10747,7 +10742,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
             newTokens = tokenize(newV, indexConfig);
           }
           const batchInsertData = [];
-          for (const newToken of newTokens) {
+          for (let j = 0, len2 = newTokens.length; j < len2; j++) {
+            const newToken = newTokens[j];
             const keyToInsert = isFts ? this.getTokenKey(pk, newToken) : pk;
             batchInsertData.push([keyToInsert, { k: pk, v: newToken }]);
           }
@@ -10825,7 +10821,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
           if (isFts) {
             tokens = tokenize(v, indexConfig);
           }
-          for (const token of tokens) {
+          for (let j = 0, len2 = tokens.length; j < len2; j++) {
+            const token = tokens[j];
             const keyToDelete = isFts ? this.getTokenKey(pk, token) : pk;
             await tree.delete(keyToDelete, { k: pk, v: token });
           }
@@ -10852,10 +10849,13 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * FTS 조건에 대해 문서가 유효한지 검증합니다.
    */
   verifyFts(doc, ftsConditions) {
-    for (const { field, matchTokens } of ftsConditions) {
-      const docValue = this.flattenDocument(doc)[field];
+    const flatDoc = this.flattenDocument(doc);
+    for (let i = 0, len = ftsConditions.length; i < len; i++) {
+      const { field, matchTokens } = ftsConditions[i];
+      const docValue = flatDoc[field];
       if (typeof docValue !== "string") return false;
-      for (const token of matchTokens) {
+      for (let j = 0, jLen = matchTokens.length; j < jLen; j++) {
+        const token = matchTokens[j];
         if (!docValue.includes(token)) return false;
       }
     }
@@ -10899,8 +10899,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         if (!s) continue;
         const doc = JSON.parse(s);
         chunkTotalSize += s.length * 2;
-        if (!this.verifyFts(doc, ftsConditions)) continue;
-        yield { doc, rawSize: s.length * 2 };
+        if (ftsConditions.length > 0 && !this.verifyFts(doc, ftsConditions)) continue;
+        yield doc;
       }
       currentChunkSize = this.adjustChunkSize(currentChunkSize, chunkTotalSize);
     }
@@ -10962,7 +10962,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
           });
         }
         const results = [];
-        for await (const { doc } of self.processChunkedKeys(
+        for await (const doc of self.processChunkedKeys(
           keys,
           0,
           self.options.pageSize,
@@ -10998,7 +10998,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         }
       } else {
         let yieldedCount = 0;
-        for await (const { doc } of self.processChunkedKeys(
+        for await (const doc of self.processChunkedKeys(
           keys,
           offset,
           self.options.pageSize,

package/dist/types/core/documentAPI.d.ts

@@ -5,7 +5,7 @@ export declare class DocumentDataplyAPI<T extends DocumentJSON, IC extends Index
     runWithDefault: <T_1>(callback: (tx: Transaction) => Promise<T_1>, tx?: Transaction) => Promise<T_1>;
     streamWithDefault: <T_1>(callback: (tx: Transaction) => AsyncGenerator<T_1>, tx?: Transaction) => AsyncGenerator<T_1>;
     indices: DocumentDataplyInnerMetadata['indices'];
-    readonly trees: Map<string, BPTreeAsync<number, DataplyTreeValue<Primitive>>>;
+    readonly trees: Map<string, BPTreeAsync<string | number, DataplyTreeValue<Primitive>>>;
     readonly comparator: DocumentValueComparator<DataplyTreeValue<Primitive>, Primitive>;
     private pendingBackfillFields;
     private readonly lock;
@@ -26,6 +26,7 @@ export declare class DocumentDataplyAPI<T extends DocumentJSON, IC extends Index
     createDocumentInnerMetadata(indices: DocumentDataplyInnerMetadata['indices']): DocumentDataplyInnerMetadata;
     initializeDocumentFile(tx: Transaction): Promise<void>;
     verifyDocumentFile(tx: Transaction): Promise<boolean>;
+    private flatten;
     /**
      * returns flattened document
      * @param document
@@ -48,20 +49,30 @@ export declare class DocumentDataplyAPI<T extends DocumentJSON, IC extends Index
      * @returns Driver and other candidates for query execution
      */
     getSelectivityCandidate<U extends Partial<DocumentDataplyIndexedQuery<T, IC>>, V extends DataplyTreeValue<U>>(query: Partial<DocumentDataplyQuery<V>>, orderByField?: string): Promise<{
-        driver: {
+        driver: ({
             tree: BPTreeAsync<number, V>;
             condition: Partial<DocumentDataplyCondition<U>>;
             field: string;
-            isFtsMatch?: boolean;
-            matchTokens?: string[];
-        };
-        others: {
+            isFtsMatch: false;
+        } | {
+            tree: BPTreeAsync<string, V>;
+            condition: Partial<DocumentDataplyCondition<U>>;
+            field: string;
+            isFtsMatch: true;
+            matchTokens: string[];
+        });
+        others: ({
             tree: BPTreeAsync<number, V>;
             condition: Partial<DocumentDataplyCondition<U>>;
             field: string;
-            isFtsMatch?: boolean;
-            matchTokens?: string[];
-        }[];
+            isFtsMatch: false;
+        } | {
+            tree: BPTreeAsync<string, V>;
+            condition: Partial<DocumentDataplyCondition<U>>;
+            field: string;
+            isFtsMatch: true;
+            matchTokens: string[];
+        })[];
         rollback: () => void;
     } | null>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-dataply",
-  "version": "0.0.7-alpha.1",
+  "version": "0.0.7",
   "description": "Simple and powerful JSON document database supporting complex queries and flexible indexing policies.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -42,11 +42,11 @@
     "dataply"
   ],
   "dependencies": {
-    "dataply": "^0.0.23-alpha.2"
+    "dataply": "^0.0.23"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.3",
     "jest": "^30.2.0",
     "ts-jest": "^29.4.6",
     "typescript": "^5.9.3"

package/dist/types/utils/hash.d.ts

@@ -1 +0,0 @@
-export declare function fastStringHash(str: string): number;