convex-ents 0.7.7-alpha.0 → 0.8.0

package/dist/{index-yIcYQW0v.d.ts → index-uXk5iZ86.d.ts}

@@ -329,10 +329,7 @@ interface PromiseEntWriter<EntsDataModel extends GenericEntsDataModel, Table ext
      */
     delete(): Promise<GenericId<Table>>;
 }
-declare class EntWriterInstance<EntsDataModel extends GenericEntsDataModel, Table extends TableNamesInDataModel<EntsDataModel>> {
-    edge<Edge extends keyof EntsDataModel[Table]["edges"]>(edge: Edge): PromiseEdgeWriter<EntsDataModel, Table, Edge>;
-    edgeX<Edge extends keyof EntsDataModel[Table]["edges"]>(edge: Edge): PromiseEdgeWriterOrThrow<EntsDataModel, Table, Edge>;
-    doc(): DocumentByName<EntsDataModel, Table>;
+declare class EntWriterInstance<EntsDataModel extends GenericEntsDataModel, Table extends TableNamesInDataModel<EntsDataModel>> extends EntInstance<EntsDataModel, Table> {
     /**
      * Patch this existing document, shallow merging it with the given partial
      * document.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { EntDefinition, defineEnt, defineEntFromTable, defineEntSchema, getEntDefinitions } from './schema.js';
-export { G as GenericEnt, T as GenericEntWriter, t as PromiseEdgeEnts, r as PromiseEdgeEntsOrNull, u as PromiseEdgeEntsWriter, I as PromiseEdgeWriter, K as PromiseEdgeWriterOrNull, J as PromiseEdgeWriterOrThrow, w as PromiseEnt, U as PromiseEntId, v as PromiseEntOrNull, S as PromiseEntWriter, R as PromiseEntWriterOrNull, p as PromiseEnts, n as PromiseEntsOrNull, q as PromiseEntsOrNulls, N as PromiseEntsWriter, o as PromiseEntsWriterOrNull, j as PromiseOrderedQuery, i as PromiseOrderedQueryBase, P as PromiseOrderedQueryOrNull, L as PromiseOrderedQueryWriter, d as PromiseOrderedQueryWriterOrNull, k as PromiseQuery, e as PromiseQueryOrNull, M as PromiseQueryWriter, f as PromiseQueryWriterOrNull, h as PromiseTable, g as PromiseTableBase, Q as PromiseTableWriter, Z as addEntRules, A as entsTableFactory } from './index-yIcYQW0v.js';
+export { G as GenericEnt, T as GenericEntWriter, t as PromiseEdgeEnts, r as PromiseEdgeEntsOrNull, u as PromiseEdgeEntsWriter, I as PromiseEdgeWriter, K as PromiseEdgeWriterOrNull, J as PromiseEdgeWriterOrThrow, w as PromiseEnt, U as PromiseEntId, v as PromiseEntOrNull, S as PromiseEntWriter, R as PromiseEntWriterOrNull, p as PromiseEnts, n as PromiseEntsOrNull, q as PromiseEntsOrNulls, N as PromiseEntsWriter, o as PromiseEntsWriterOrNull, j as PromiseOrderedQuery, i as PromiseOrderedQueryBase, P as PromiseOrderedQueryOrNull, L as PromiseOrderedQueryWriter, d as PromiseOrderedQueryWriterOrNull, k as PromiseQuery, e as PromiseQueryOrNull, M as PromiseQueryWriter, f as PromiseQueryWriterOrNull, h as PromiseTable, g as PromiseTableBase, Q as PromiseTableWriter, Z as addEntRules, A as entsTableFactory } from './index-uXk5iZ86.js';
 export { scheduledDeleteFactory } from './deletion.js';
 import 'convex/server';
 import 'convex/values';

package/dist/index.js

@@ -191,30 +191,20 @@ function defineEnt(documentSchema) {
   return new EntDefinitionImpl(documentSchema);
 }
 function defineEntFromTable(definition) {
-  const validator = definition.documentType;
-  const validatorJson = (
-    // @ts-expect-error Private field
-    validator.json
-  );
-  if (validatorJson.type !== "object") {
+  const validator = definition.validator;
+  if (validator.kind !== "object") {
     throw new Error(
       "Only tables with object definition are supported in Ents, not unions"
     );
   }
-  const tableSchema = Object.fromEntries(
-    Object.entries(validatorJson.value).map(([k, v3]) => [
-      k,
-      // @ts-expect-error Private constructor
-      new import_values.Validator(v3.fieldType, v3.optional)
-    ])
-  );
-  const entDefinition = defineEnt(tableSchema);
+  const entDefinition = defineEnt(validator.fields);
   entDefinition.indexes = definition.indexes;
   entDefinition.searchIndexes = definition.searchIndexes;
   entDefinition.vectorIndexes = definition.vectorIndexes;
   return entDefinition;
 }
 var EntDefinitionImpl = class {
+  validator;
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   indexes = [];
@@ -231,6 +221,7 @@ var EntDefinitionImpl = class {
   deletionConfig;
   constructor(documentSchema) {
     this.documentSchema = documentSchema;
+    this.validator = import_values.v.object(documentSchema);
   }
   index(name, fields) {
     this.indexes.push({ indexDescriptor: name, fields });
@@ -923,7 +914,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
       this.table,
       args.length === 1 ? async () => {
         const id = args[0];
-        if (this.ctx.db.normalizeId(this.table, id) === null) {
+        if (this.normalizeId(id) === null) {
           throw new Error(`Invalid id \`${id}\` for table "${this.table}"`);
         }
         return {
@@ -970,7 +961,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
       args.length === 1 ? async () => {
         const ids = args[0];
         ids.forEach((id) => {
-          if (this.ctx.db.normalizeId(this.table, id) === null) {
+          if (this.normalizeId(id) === null) {
             throw new Error(
               `Invalid id \`${id}\` for table "${this.table}"`
             );
@@ -1005,7 +996,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
     );
   }
   normalizeId(id) {
-    return this.ctx.db.normalizeId(this.table, id);
+    return isSystemTable(this.table) ? this.ctx.db.system.normalizeId(this.table, id) : this.ctx.db.normalizeId(this.table, id);
   }
   // normalizeId or throw
   normalizeIdX(id) {