@dbsp/nql 1.0.2 → 1.0.3

package/dist/index.js

@@ -1,3 +1,4 @@
+import { isRankingWindowFunction } from '@dbsp/types';
 import { createToken, Lexer, CstParser } from 'chevrotain';
 
 // src/errors/types.ts
@@ -1008,7 +1009,6 @@ function compileMembership(expr, ctx, fns, aliasContext, outerAliases) {
     const result2 = {
       kind: "in",
       field,
-      values: [],
       subquery
     };
     if (inExpr.negated) {
@@ -1451,8 +1451,9 @@ function resolveBindingsInWhere(where, bindings) {
   if (!bindings || bindings.size === 0) return where;
   if (where.kind === "in") {
     const inWhere = where;
-    if (inWhere.values && inWhere.values.length === 1) {
-      const val = inWhere.values[0];
+    const inValues = inWhere.subquery ? void 0 : inWhere.values;
+    if (inValues && inValues.length === 1) {
+      const val = inValues[0];
       if (val && typeof val === "object" && "$ref" in val) {
         const ref = val.$ref;
         if (bindings.has(ref)) {
@@ -1472,7 +1473,6 @@ function resolveBindingsInWhere(where, bindings) {
           return {
             kind: "in",
             field: inWhere.field,
-            values: [],
             subquery: cteRef
           };
         }
@@ -1507,8 +1507,6 @@ function extractBindName(stmt) {
   }
   return void 0;
 }
-
-// src/compiler/compile-select.ts
 function compileSelectClause(clause, ctx, fns) {
   if (clause.items.length === 1 && clause.items[0]?.type === "star") {
     return { type: "all" };
@@ -1633,17 +1631,36 @@ function compileSelectExpression(item, ctx, fns) {
       }
       return { field: f, direction: o.direction };
     }) : void 0;
+    const over = {
+      ...partitionBy && { partitionBy },
+      ...orderBy && { orderBy }
+    };
+    const alias = exprItem.alias ?? fn;
+    if (isRankingWindowFunction(fn)) {
+      return {
+        kind: "window",
+        function: fn,
+        alias,
+        over
+      };
+    }
+    if (fn === "lag" || fn === "lead") {
+      return {
+        kind: "window",
+        function: fn,
+        field: field ?? "",
+        alias,
+        ...offset !== void 0 && { offset },
+        ...defaultValue !== void 0 && { defaultValue },
+        over
+      };
+    }
     return {
       kind: "window",
       function: fn,
       ...field !== void 0 && { field },
-      alias: exprItem.alias ?? fn,
-      ...offset !== void 0 && { offset },
-      ...defaultValue !== void 0 && { defaultValue },
-      over: {
-        ...partitionBy && { partitionBy },
-        ...orderBy && { orderBy }
-      }
+      alias,
+      over
     };
   }
   if (expr.type === "subquery") {