@nicia-ai/typegraph 0.16.2 → 0.17.0

package/dist/index.cjs

@@ -2185,14 +2185,18 @@ function buildStandardProjection(input) {
   });
   return drizzleOrm.sql.join(projectedFields, drizzleOrm.sql`, `);
 }
-function compileSelectiveProjection(fields, dialect, ast, collapsedTraversalCteAlias) {
-  const aliasToCte = /* @__PURE__ */ new Map([
+function buildAliasToCteMap(ast) {
+  const map = /* @__PURE__ */ new Map([
     [ast.start.alias, `cte_${ast.start.alias}`]
   ]);
   for (const traversal of ast.traversals) {
-    aliasToCte.set(traversal.nodeAlias, `cte_${traversal.nodeAlias}`);
-    aliasToCte.set(traversal.edgeAlias, `cte_${traversal.nodeAlias}`);
+    map.set(traversal.nodeAlias, `cte_${traversal.nodeAlias}`);
+    map.set(traversal.edgeAlias, `cte_${traversal.nodeAlias}`);
   }
+  return map;
+}
+function compileSelectiveProjection(fields, dialect, ast, collapsedTraversalCteAlias) {
+  const aliasToCte = buildAliasToCteMap(ast);
   const columns = fields.map((field2) => {
     const cteAlias = collapsedTraversalCteAlias ?? aliasToCte.get(field2.alias) ?? `cte_${field2.alias}`;
     if (field2.isSystemField) {
@@ -2241,6 +2245,7 @@ function buildStandardOrderBy(input) {
   if (!ast.orderBy || ast.orderBy.length === 0) {
     return void 0;
   }
+  const aliasToCte = buildAliasToCteMap(ast);
   const parts = [];
   for (const orderSpec of ast.orderBy) {
     const valueType = orderSpec.field.valueType;
@@ -2249,7 +2254,7 @@ function buildStandardOrderBy(input) {
         "Ordering by JSON arrays or objects is not supported"
       );
     }
-    const cteAlias = collapsedTraversalCteAlias ?? `cte_${orderSpec.field.alias}`;
+    const cteAlias = collapsedTraversalCteAlias ?? aliasToCte.get(orderSpec.field.alias) ?? `cte_${orderSpec.field.alias}`;
     const field2 = compileFieldValue(
       orderSpec.field,
       dialect,
@@ -2296,8 +2301,14 @@ function buildStandardGroupBy(input) {
   if (allFields.length === 0) {
     return void 0;
   }
+  const aliasToCte = buildAliasToCteMap(ast);
   const parts = allFields.map(
-    (field2) => compileFieldValue(field2, dialect, field2.valueType, `cte_${field2.alias}`)
+    (field2) => compileFieldValue(
+      field2,
+      dialect,
+      field2.valueType,
+      aliasToCte.get(field2.alias) ?? `cte_${field2.alias}`
+    )
   );
   return drizzleOrm.sql`GROUP BY ${drizzleOrm.sql.join(parts, drizzleOrm.sql`, `)}`;
 }
@@ -2372,6 +2383,7 @@ function buildStandardVectorOrderBy(input) {
   const distanceOrder = drizzleOrm.sql`cte_embeddings.distance ASC`;
   const additionalOrders = [];
   if (ast.orderBy && ast.orderBy.length > 0) {
+    const aliasToCte = buildAliasToCteMap(ast);
     for (const orderSpec of ast.orderBy) {
       const valueType = orderSpec.field.valueType;
       if (valueType === "array" || valueType === "object") {
@@ -2379,7 +2391,7 @@ function buildStandardVectorOrderBy(input) {
           "Ordering by JSON arrays or objects is not supported"
         );
       }
-      const cteAlias = `cte_${orderSpec.field.alias}`;
+      const cteAlias = aliasToCte.get(orderSpec.field.alias) ?? `cte_${orderSpec.field.alias}`;
       const field2 = compileFieldValue(
         orderSpec.field,
         dialect,
@@ -3849,6 +3861,16 @@ function mapSubgraphEdgeRow(row, projectionPlan) {
   applyProjectedFields(projectedEdge, row, kindPlan);
   return projectedEdge;
 }
+
+// src/query/ast.ts
+function mergeEdgeKinds(traversal) {
+  const inverse = traversal.inverseEdgeKinds;
+  if (inverse === void 0 || inverse.length === 0) return traversal.edgeKinds;
+  return [
+    ...traversal.edgeKinds,
+    ...inverse.filter((kind) => !traversal.edgeKinds.includes(kind))
+  ];
+}
 var OPERATOR_MAP = {
   union: "UNION",
   unionAll: "UNION ALL",
@@ -5431,16 +5453,6 @@ function getStreamBatchSize(options) {
   return options?.batchSize ?? chunkMME3H4ZF_cjs.DEFAULT_STREAM_BATCH_SIZE;
 }
 
-// src/query/ast.ts
-function mergeEdgeKinds(traversal) {
-  const inverse = traversal.inverseEdgeKinds;
-  if (inverse === void 0 || inverse.length === 0) return traversal.edgeKinds;
-  return [
-    ...traversal.edgeKinds,
-    ...inverse.filter((kind) => !traversal.edgeKinds.includes(kind))
-  ];
-}
-
 // src/query/execution/field-tracker.ts
 var OBJECT_PROTOTYPE_PROPERTIES = /* @__PURE__ */ new Set([
   "__proto__",
@@ -6560,11 +6572,33 @@ var ExecutableQuery = class _ExecutableQuery {
    * Orders results.
    */
   orderBy(alias, field2, direction = "asc") {
-    const kindNames = alias === this.#state.startAlias ? this.#state.startKinds : this.#state.traversals.find(
-      (traversal) => traversal.nodeAlias === alias
-    )?.nodeKinds;
-    const typeInfo = kindNames ? this.#config.schemaIntrospector.getSharedFieldTypeInfo(kindNames, field2) : void 0;
-    const orderSpec = {
+    const edgeTraversal = this.#state.traversals.find(
+      (traversal) => traversal.edgeAlias === alias
+    );
+    const isEdge = edgeTraversal !== void 0;
+    const isSystem = field2 === "id" || field2 === "kind" || isEdge && (field2 === "from_id" || field2 === "to_id");
+    let typeInfo;
+    if (!isSystem) {
+      if (isEdge) {
+        const edgeKindNames = mergeEdgeKinds(edgeTraversal);
+        typeInfo = this.#config.schemaIntrospector.getSharedEdgeFieldTypeInfo(
+          edgeKindNames,
+          field2
+        );
+      } else {
+        const kindNames = alias === this.#state.startAlias ? this.#state.startKinds : this.#state.traversals.find(
+          (traversal) => traversal.nodeAlias === alias
+        )?.nodeKinds;
+        typeInfo = kindNames ? this.#config.schemaIntrospector.getSharedFieldTypeInfo(
+          kindNames,
+          field2
+        ) : void 0;
+      }
+    }
+    const orderSpec = isSystem ? {
+      field: fieldRef(alias, [field2], { valueType: "string" }),
+      direction
+    } : {
       field: fieldRef(alias, ["props"], {
         jsonPointer: chunkP5CNM325_cjs.jsonPointer([field2]),
         valueType: typeInfo?.valueType,
@@ -8108,8 +8142,13 @@ var QueryBuilder = class _QueryBuilder {
    * Orders results.
    */
   orderBy(alias, field2, direction = "asc") {
-    const isSystem = field2 === "id" || field2 === "kind";
-    const typeInfo = isSystem ? void 0 : this.#getOrderByTypeInfo(alias, field2);
+    const edgeKindNames = this.#getEdgeKindNamesForAlias(alias);
+    const isEdge = edgeKindNames !== void 0;
+    const isSystem = field2 === "id" || field2 === "kind" || isEdge && (field2 === "from_id" || field2 === "to_id");
+    const typeInfo = isSystem ? void 0 : isEdge ? this.#config.schemaIntrospector.getSharedEdgeFieldTypeInfo(
+      edgeKindNames,
+      field2
+    ) : this.#getOrderByTypeInfo(alias, field2);
     const orderSpec = isSystem ? {
       field: fieldRef(alias, [field2], { valueType: "string" }),
       direction