document-dataply 0.0.9-alpha.2 → 0.0.9-alpha.4

package/dist/cjs/index.js

@@ -10081,9 +10081,24 @@ function compareValue(a, b) {
   }
   return aList.length - bList.length;
 }
+function comparePrimaryValue(a, b) {
+  const aArr = Array.isArray(a);
+  const bArr = Array.isArray(b);
+  if (!aArr && !bArr) {
+    return comparePrimitive(a, b);
+  }
+  const aList = aArr ? a : [a];
+  const bList = bArr ? b : [b];
+  const len = Math.min(aList.length, bList.length);
+  for (let i = 0; i < len; i++) {
+    const diff = comparePrimitive(aList[i], bList[i]);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
 var DocumentValueComparator = class extends import_dataply2.ValueComparator {
   primaryAsc(a, b) {
-    return compareValue(a.v, b.v);
+    return comparePrimaryValue(a.v, b.v);
   }
   asc(a, b) {
     const diff = compareValue(a.v, b.v);
@@ -10245,8 +10260,12 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         throw new Error("Document metadata verification failed");
       }
       const metadata = await this.getDocumentInnerMetadata(tx);
-      const targetIndices = /* @__PURE__ */ new Map();
-      targetIndices.set("_id", { type: "btree", fields: ["_id"] });
+      const targetIndices = /* @__PURE__ */ new Map([
+        ["_id", { type: "btree", fields: ["_id"] }]
+      ]);
+      for (const [name, info] of Object.entries(metadata.indices)) {
+        targetIndices.set(name, info[1]);
+      }
       for (const [name, option] of this.pendingCreateIndices) {
         const config = this.toIndexMetaConfig(option);
         targetIndices.set(name, config);
@@ -10413,19 +10432,39 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * Convert CreateIndexOption to IndexMetaConfig for metadata storage.
    */
   toIndexMetaConfig(option) {
+    if (!option || typeof option !== "object") {
+      throw new Error("Index option must be a non-null object");
+    }
+    if (!option.type) {
+      throw new Error('Index option must have a "type" property ("btree" or "fts")');
+    }
     if (option.type === "btree") {
+      if (!Array.isArray(option.fields) || option.fields.length === 0) {
+        throw new Error('btree index requires a non-empty "fields" array');
+      }
+      for (let i = 0; i < option.fields.length; i++) {
+        if (typeof option.fields[i] !== "string" || option.fields[i].length === 0) {
+          throw new Error(`btree index "fields[${i}]" must be a non-empty string, got: ${JSON.stringify(option.fields[i])}`);
+        }
+      }
       return {
         type: "btree",
         fields: option.fields
       };
     }
     if (option.type === "fts") {
+      if (typeof option.fields !== "string" || option.fields.length === 0) {
+        throw new Error(`fts index requires a non-empty string "fields", got: ${JSON.stringify(option.fields)}`);
+      }
       if (option.tokenizer === "ngram") {
+        if (typeof option.gramSize !== "number" || option.gramSize < 1) {
+          throw new Error(`fts ngram index requires a positive "gramSize" number, got: ${JSON.stringify(option.gramSize)}`);
+        }
         return {
           type: "fts",
           fields: option.fields,
           tokenizer: "ngram",
-          gramSize: option.ngram
+          gramSize: option.gramSize
         };
       }
       return {
@@ -10702,9 +10741,10 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       const currentVersion = innerMetadata.schemeVersion ?? 0;
       if (currentVersion < version) {
         await callback(tx2);
-        innerMetadata.schemeVersion = version;
-        innerMetadata.updatedAt = Date.now();
-        await this.updateDocumentInnerMetadata(innerMetadata, tx2);
+        const freshMetadata = await this.getDocumentInnerMetadata(tx2);
+        freshMetadata.schemeVersion = version;
+        freshMetadata.updatedAt = Date.now();
+        await this.updateDocumentInnerMetadata(freshMetadata, tx2);
       }
     }, tx);
   }

package/dist/types/types/index.d.ts

@@ -151,7 +151,7 @@ export type CreateIndexFTSOption<T extends DocumentJSON> = {
     type: 'fts';
     fields: DeepFlattenKeys<DataplyDocument<T>> & string;
     tokenizer: 'ngram';
-    ngram: number;
+    gramSize: number;
 };
 export type CreateIndexOption<T extends DocumentJSON> = CreateIndexBTreeOption<T> | CreateIndexFTSOption<T>;
 export interface DocumentDataplyOptions extends DataplyOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-dataply",
-  "version": "0.0.9-alpha.2",
+  "version": "0.0.9-alpha.4",
   "description": "Simple and powerful JSON document database supporting complex queries and flexible indexing policies.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",