@nicia-ai/typegraph 0.10.0 → 0.11.1

package/dist/index.cjs

@@ -579,6 +579,10 @@ function baseFieldBuilder(field2) {
 function stringField(field2) {
   return {
     ...baseFieldBuilder(field2),
+    gt: (value) => comparison("gt", field2, value),
+    gte: (value) => comparison("gte", field2, value),
+    lt: (value) => comparison("lt", field2, value),
+    lte: (value) => comparison("lte", field2, value),
     contains: (pattern) => stringOp("contains", field2, pattern),
     startsWith: (pattern) => stringOp("startsWith", field2, pattern),
     endsWith: (pattern) => stringOp("endsWith", field2, pattern),
@@ -4936,6 +4940,10 @@ var FieldAccessTracker = class {
   #fields = /* @__PURE__ */ new Map();
   record(alias, field2, isSystemField) {
     const key = `${alias}\0${field2}`;
+    const existing = this.#fields.get(key);
+    if (existing !== void 0 && existing.isSystemField && !isSystemField) {
+      return;
+    }
     this.#fields.set(key, { alias, field: field2, isSystemField });
   }
   getAccessedFields() {
@@ -6617,6 +6625,10 @@ var ExecutableQuery = class _ExecutableQuery {
   #recordOrderByFieldsForPagination(tracker) {
     for (const spec of this.#state.orderBy) {
       const field2 = spec.field;
+      if (field2.path.length === 1 && field2.path[0] !== "props" && field2.jsonPointer === void 0) {
+        tracker.record(field2.alias, field2.path[0], true);
+        continue;
+      }
       if (field2.path.length !== 1 || field2.path[0] !== "props") {
         return false;
       }
@@ -6657,7 +6669,19 @@ var ExecutableQuery = class _ExecutableQuery {
       const alias = spec.field.alias;
       const jsonPointer2 = spec.field.jsonPointer;
       if (jsonPointer2 === void 0) {
-        throw new MissingSelectiveFieldError(alias, "orderBy");
+        if (spec.field.path.length !== 1) {
+          throw new MissingSelectiveFieldError(alias, "orderBy");
+        }
+        const fieldName = spec.field.path[0];
+        const outputName2 = outputNameByAliasField.get(
+          `${alias}\0${fieldName}`
+        );
+        if (outputName2 === void 0) {
+          throw new MissingSelectiveFieldError(alias, fieldName);
+        }
+        const aliasObject2 = this.#getOrCreateAliasObject(cursorContext, alias);
+        aliasObject2[fieldName] = nullToUndefined2(row[outputName2]);
+        continue;
       }
       const segments = chunkP5CNM325_cjs.parseJsonPointer(jsonPointer2);
       if (segments.length === 0) {
@@ -6680,14 +6704,7 @@ var ExecutableQuery = class _ExecutableQuery {
           continue;
         }
       }
-      let aliasObject;
-      const existing = cursorContext[alias];
-      if (typeof existing === "object" && existing !== null) {
-        aliasObject = existing;
-      } else {
-        aliasObject = {};
-        cursorContext[alias] = aliasObject;
-      }
+      const aliasObject = this.#getOrCreateAliasObject(cursorContext, alias);
       const kindNames = this.#getNodeKindNamesForAlias(alias);
       const typeInfo = kindNames ? this.#config.schemaIntrospector.getSharedFieldTypeInfo(
         kindNames,
@@ -6714,6 +6731,15 @@ var ExecutableQuery = class _ExecutableQuery {
     }
     return cursorContext;
   }
+  #getOrCreateAliasObject(cursorContext, alias) {
+    const existing = cursorContext[alias];
+    if (typeof existing === "object" && existing !== null) {
+      return existing;
+    }
+    const created = {};
+    cursorContext[alias] = created;
+    return created;
+  }
   #getNodeKindNamesForAlias(alias) {
     if (alias === this.#state.startAlias) {
       return this.#state.startKinds;
@@ -7541,9 +7567,12 @@ var QueryBuilder = class _QueryBuilder {
    * Orders results.
    */
   orderBy(alias, field2, direction = "asc") {
-    const kindNames = this.#getKindNamesForAlias(alias);
-    const typeInfo = kindNames ? this.#config.schemaIntrospector.getSharedFieldTypeInfo(kindNames, field2) : void 0;
-    const orderSpec = {
+    const isSystem = field2 === "id" || field2 === "kind";
+    const typeInfo = isSystem ? void 0 : this.#getOrderByTypeInfo(alias, field2);
+    const orderSpec = isSystem ? {
+      field: fieldRef(alias, [field2], { valueType: "string" }),
+      direction
+    } : {
       field: fieldRef(alias, ["props"], {
         jsonPointer: chunkP5CNM325_cjs.jsonPointer([field2]),
         valueType: typeInfo?.valueType,
@@ -7557,6 +7586,10 @@ var QueryBuilder = class _QueryBuilder {
     };
     return new _QueryBuilder(this.#config, newState);
   }
+  #getOrderByTypeInfo(alias, field2) {
+    const kindNames = this.#getKindNamesForAlias(alias);
+    return kindNames ? this.#config.schemaIntrospector.getSharedFieldTypeInfo(kindNames, field2) : void 0;
+  }
   /**
    * Limits the number of results.
    */
@@ -8267,21 +8300,29 @@ function narrowEdge(edge) {
 function narrowEdges(edges) {
   return edges;
 }
+function buildCreateEdgeInput(kind, from, to, props, options) {
+  const input = {
+    kind,
+    fromKind: from.kind,
+    fromId: from.id,
+    toKind: to.kind,
+    toId: to.id,
+    props
+  };
+  if (options?.id !== void 0) input.id = options.id;
+  if (options?.validFrom !== void 0) input.validFrom = options.validFrom;
+  if (options?.validTo !== void 0) input.validTo = options.validTo;
+  return input;
+}
+function buildUpdateEdgeInput(id, props, options) {
+  const input = { id, props };
+  if (options?.validTo !== void 0) input.validTo = options.validTo;
+  return input;
+}
 function mapBulkEdgeInputs(kind, items) {
-  return items.map((item) => {
-    const input = {
-      kind,
-      fromKind: item.from.kind,
-      fromId: item.from.id,
-      toKind: item.to.kind,
-      toId: item.to.id,
-      props: item.props ?? {}
-    };
-    if (item.id !== void 0) input.id = item.id;
-    if (item.validFrom !== void 0) input.validFrom = item.validFrom;
-    if (item.validTo !== void 0) input.validTo = item.validTo;
-    return input;
-  });
+  return items.map(
+    (item) => buildCreateEdgeInput(kind, item.from, item.to, item.props ?? {}, item)
+  );
 }
 function createEdgeCollection(config) {
   const {
@@ -8301,18 +8342,16 @@ function createEdgeCollection(config) {
   } = config;
   return {
     async create(from, to, props, options) {
-      const input = {
-        kind,
-        fromKind: from.kind,
-        fromId: from.id,
-        toKind: to.kind,
-        toId: to.id,
-        props: props ?? {}
-      };
-      if (options?.id !== void 0) input.id = options.id;
-      if (options?.validFrom !== void 0) input.validFrom = options.validFrom;
-      if (options?.validTo !== void 0) input.validTo = options.validTo;
-      const result = await executeEdgeCreate2(input, backend);
+      const result = await executeEdgeCreate2(
+        buildCreateEdgeInput(
+          kind,
+          from,
+          to,
+          props ?? {},
+          options
+        ),
+        backend
+      );
       return narrowEdge(result);
     },
     async getById(id, options) {
@@ -8349,12 +8388,10 @@ function createEdgeCollection(config) {
       );
     },
     async update(id, props, options) {
-      const input = {
-        id,
-        props
-      };
-      if (options?.validTo !== void 0) input.validTo = options.validTo;
-      const result = await executeEdgeUpdate2(input, backend);
+      const result = await executeEdgeUpdate2(
+        buildUpdateEdgeInput(id, props, options),
+        backend
+      );
       return narrowEdge(result);
     },
     async findFrom(from) {
@@ -8467,29 +8504,26 @@ function createEdgeCollection(config) {
         for (const item of items) {
           const existing = existingMap.get(item.id);
           if (existing) {
-            const input = {
-              id: item.id,
-              props: item.props
-            };
-            if (item.validTo !== void 0) input.validTo = item.validTo;
             toUpdate.push({
               index: itemIndex,
-              input,
+              input: buildUpdateEdgeInput(
+                item.id,
+                item.props ?? {},
+                item
+              ),
               clearDeleted: existing.deleted_at !== void 0
             });
           } else {
-            const input = {
-              kind,
-              id: item.id,
-              fromKind: item.from.kind,
-              fromId: item.from.id,
-              toKind: item.to.kind,
-              toId: item.to.id,
-              props: item.props
-            };
-            if (item.validFrom !== void 0) input.validFrom = item.validFrom;
-            if (item.validTo !== void 0) input.validTo = item.validTo;
-            toCreate.push({ index: itemIndex, input });
+            toCreate.push({
+              index: itemIndex,
+              input: buildCreateEdgeInput(
+                kind,
+                item.from,
+                item.to,
+                item.props ?? {},
+                item
+              )
+            });
           }
           itemIndex++;
         }
@@ -8618,17 +8652,20 @@ function narrowNode(node) {
 function narrowNodes(nodes) {
   return nodes;
 }
+function buildCreateInput(kind, props, options) {
+  const input = { kind, props };
+  if (options?.id !== void 0) input.id = options.id;
+  if (options?.validFrom !== void 0) input.validFrom = options.validFrom;
+  if (options?.validTo !== void 0) input.validTo = options.validTo;
+  return input;
+}
+function buildUpdateInput(kind, id, props, options) {
+  const input = { kind, id, props };
+  if (options?.validTo !== void 0) input.validTo = options.validTo;
+  return input;
+}
 function mapBulkNodeInputs(kind, items) {
-  return items.map((item) => {
-    const input = {
-      kind,
-      props: item.props
-    };
-    if (item.id !== void 0) input.id = item.id;
-    if (item.validFrom !== void 0) input.validFrom = item.validFrom;
-    if (item.validTo !== void 0) input.validTo = item.validTo;
-    return input;
-  });
+  return items.map((item) => buildCreateInput(kind, item.props, item));
 }
 function createNodeCollection(config) {
   const {
@@ -8653,14 +8690,13 @@ function createNodeCollection(config) {
   } = config;
   return {
     async create(props, options) {
-      const input = {
-        kind,
-        props
-      };
-      if (options?.id !== void 0) input.id = options.id;
-      if (options?.validFrom !== void 0) input.validFrom = options.validFrom;
-      if (options?.validTo !== void 0) input.validTo = options.validTo;
-      const result = await executeNodeCreate2(input, backend);
+      return this.createFromRecord(props, options);
+    },
+    async createFromRecord(data, options) {
+      const result = await executeNodeCreate2(
+        buildCreateInput(kind, data, options),
+        backend
+      );
       return narrowNode(result);
     },
     async getById(id, options) {
@@ -8698,13 +8734,10 @@ function createNodeCollection(config) {
       );
     },
     async update(id, props, options) {
-      const input = {
-        kind,
-        id,
-        props
-      };
-      if (options?.validTo !== void 0) input.validTo = options.validTo;
-      const result = await executeNodeUpdate2(input, backend);
+      const result = await executeNodeUpdate2(
+        buildUpdateInput(kind, id, props, options),
+        backend
+      );
       return narrowNode(result);
     },
     async delete(id) {
@@ -8760,31 +8793,28 @@ function createNodeCollection(config) {
       return backend.countNodesByKind(params);
     },
     async upsertById(id, props, options) {
+      return this.upsertByIdFromRecord(
+        id,
+        props,
+        options
+      );
+    },
+    async upsertByIdFromRecord(id, data, options) {
       const existing = await backend.getNode(graphId, kind, id);
       if (existing) {
-        const input = {
-          kind,
-          id,
-          props
-        };
-        if (options?.validTo !== void 0) input.validTo = options.validTo;
         const clearDeleted = existing.deleted_at !== void 0;
-        const result = await executeNodeUpdate2(input, backend, {
-          clearDeleted
-        });
-        return narrowNode(result);
-      } else {
-        const input = {
-          kind,
-          id,
-          props
-        };
-        if (options?.validFrom !== void 0)
-          input.validFrom = options.validFrom;
-        if (options?.validTo !== void 0) input.validTo = options.validTo;
-        const result = await executeNodeCreate2(input, backend);
-        return narrowNode(result);
+        const result2 = await executeNodeUpdate2(
+          buildUpdateInput(kind, id, data, options),
+          backend,
+          { clearDeleted }
+        );
+        return narrowNode(result2);
       }
+      const result = await executeNodeCreate2(
+        buildCreateInput(kind, data, { ...options, id }),
+        backend
+      );
+      return narrowNode(result);
     },
     async bulkCreate(items) {
       const batchInputs = mapBulkNodeInputs(
@@ -8828,26 +8858,25 @@ function createNodeCollection(config) {
         for (const item of items) {
           const existing = existingMap.get(item.id);
           if (existing) {
-            const input = {
-              kind,
-              id: item.id,
-              props: item.props
-            };
-            if (item.validTo !== void 0) input.validTo = item.validTo;
             toUpdate.push({
               index: itemIndex,
-              input,
+              input: buildUpdateInput(
+                kind,
+                item.id,
+                item.props,
+                item
+              ),
               clearDeleted: existing.deleted_at !== void 0
             });
           } else {
-            const input = {
-              kind,
-              id: item.id,
-              props: item.props
-            };
-            if (item.validFrom !== void 0) input.validFrom = item.validFrom;
-            if (item.validTo !== void 0) input.validTo = item.validTo;
-            toCreate.push({ index: itemIndex, input });
+            toCreate.push({
+              index: itemIndex,
+              input: buildCreateInput(
+                kind,
+                item.props,
+                item
+              )
+            });
           }
           itemIndex++;
         }