convex-ents 0.14.0-alpha.0 → 0.14.0-alpha.1

package/dist/index.js

@@ -226,7 +226,15 @@ function deletionConfigFromEntDefinition(table) {
   return table.deletionConfig;
 }
 function defineEnt(documentSchema) {
-  return new EntDefinitionImpl(documentSchema);
+  if (isValidator(documentSchema)) {
+    if (!(documentSchema.kind === "object" || documentSchema.kind === "union" && documentSchema.members.every((member) => member.kind === "object"))) {
+      throw new Error("Ent shape must be an object or a union of objects");
+    }
+  }
+  return new EntDefinitionImpl((0, import_values.asObjectValidator)(documentSchema));
+}
+function isValidator(v3) {
+  return !!v3.isConvexValidator;
 }
 function defineEntFromTable(definition) {
   const validator = definition.validator;
@@ -259,14 +267,12 @@ var EntDefinitionImpl = class {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   vectorIndexes = [];
-  documentSchema;
   edgeConfigs = {};
   fieldConfigs = {};
   defaults = {};
   deletionConfig;
   constructor(documentSchema) {
-    this.documentSchema = documentSchema;
-    this.validator = import_values.v.object(documentSchema);
+    this.validator = documentSchema;
   }
   index(name, fields) {
     this.indexes.push({ indexDescriptor: name, fields });
@@ -300,15 +306,15 @@ var EntDefinitionImpl = class {
       indexes: this.indexes,
       searchIndexes: this.searchIndexes,
       vectorIndexes: this.vectorIndexes,
-      documentType: import_values.v.object(this.documentSchema).json
+      documentType: this.validator.json
     };
   }
   field(name, validator, options) {
-    if (this.documentSchema[name] !== void 0) {
+    if (this._has(name)) {
       throw new Error(`Duplicate field "${name}"`);
     }
     const finalValidator = options?.default !== void 0 ? import_values.v.optional(validator) : validator;
-    this.documentSchema = { ...this.documentSchema, [name]: finalValidator };
+    this._expand(name, finalValidator);
     if (options?.unique === true || options?.index === true) {
       this.indexes.push({ indexDescriptor: name, fields: [name] });
     }
@@ -332,10 +338,10 @@ var EntDefinitionImpl = class {
     }
     if (options?.field !== void 0 || options?.ref === void 0) {
       const fieldName = options?.field ?? edgeName + "Id";
-      this.documentSchema = {
-        ...this.documentSchema,
-        [fieldName]: options?.optional === true ? import_values.v.optional(import_values.v.id(to)) : import_values.v.id(to)
-      };
+      this._expand(
+        fieldName,
+        options?.optional === true ? import_values.v.optional(import_values.v.id(to)) : import_values.v.id(to)
+      );
       this.edgeConfigs[edgeName] = {
         name: edgeName,
         to,
@@ -394,7 +400,7 @@ var EntDefinitionImpl = class {
     return this;
   }
   deletion(type, options) {
-    if (this.documentSchema.deletionTime !== void 0) {
+    if (this._has("deletionTime")) {
       throw new Error(
         `Cannot enable "${type}" deletion because "deletionTime" field was already defined.`
       );
@@ -402,13 +408,33 @@ var EntDefinitionImpl = class {
     if (this.deletionConfig !== void 0) {
       throw new Error(`Deletion behavior can only be specified once.`);
     }
-    this.documentSchema = {
-      ...this.documentSchema,
-      deletionTime: import_values.v.optional(import_values.v.number())
-    };
+    this._expand("deletionTime", import_values.v.optional(import_values.v.number()));
     this.deletionConfig = { type, ...options };
     return this;
   }
+  _has(name) {
+    if (this.validator.kind === "object") {
+      return this.validator.fields[name] !== void 0;
+    }
+    if (this.validator.kind === "union") {
+      return this.validator.members.some(
+        (member) => member.kind === "object" && member.fields[name] !== void 0
+      );
+    }
+    return false;
+  }
+  _expand(name, validator) {
+    if (this.validator.kind === "object") {
+      this.validator.fields[name] = validator;
+    }
+    if (this.validator.kind === "union") {
+      this.validator.members.forEach((member) => {
+        if (member.kind === "object") {
+          member.fields[name] = validator;
+        }
+      });
+    }
+  }
 };
 function getEntDefinitions(schema) {
   const tables = schema.tables;