@technicity/data-service-generator 0.4.3 → 0.4.7

package/dist/getOrderBy.js

@@ -27,7 +27,7 @@ function getOrderBy(args, primaryKey) {
                 out = out.concat(orderByPrimaryKey);
             }
         }
-        flip = getFlip(args, out, primaryKey);
+        flip = getFlip(args);
         if (flip) {
             out = flipOrderByDirection(out);
         }
@@ -35,16 +35,8 @@ function getOrderBy(args, primaryKey) {
     return { orderBy: out, flip };
 }
 exports.getOrderBy = getOrderBy;
-function getFlip(args, orderBy, primaryKey) {
-    if (args?.$paginate?.after != null &&
-        orderBy?.find((x) => x.column === primaryKey)?.direction === "desc") {
-        return true;
-    }
-    if (args?.$paginate?.before != null &&
-        orderBy?.find((x) => x.column === primaryKey)?.direction === "asc") {
-        return true;
-    }
-    return false;
+function getFlip(args) {
+    return args?.$paginate?.last != null;
 }
 function flipOrderByDirection(orderBy) {
     return orderBy.map((x) => ({ ...x, direction: flipDirection(x.direction) }));

package/dist/getSqlAst.js

@@ -10,7 +10,7 @@ const _ = require("lodash/fp");
 const getOrderBy_1 = require("./getOrderBy");
 const namespace = new alias_namespace_1.default(true);
 function getSqlAst(input) {
-    const { table, fieldName, fields, args, grabMany, sqlJoin, sqlBatch, junction, getWhere, artifacts, rowWithCursorId, dialect, } = input;
+    const { table, fieldName, fields, args, grabMany, sqlJoin, sqlBatch, junction, getWhere, artifacts, rowWithMatchingCursor, dialect, } = input;
     const tableArtifacts = artifacts[table];
     const primaryKey = tableArtifacts.primaryKey;
     const format = dialect === "mysql"
@@ -25,7 +25,9 @@ function getSqlAst(input) {
                 argsMapped = _.cloneDeep(argsMapped);
                 argsMapped.$where = argsMapped.$where[0];
             }
-            const whereResult = getWhere(table, argsMapped, dialect, orderBy, rowWithCursorId);
+            const whereResult = getWhere(
+            // table is escaped already
+            table, argsMapped, dialect, orderBy, rowWithMatchingCursor);
             if (whereResult == null) {
                 return undefined;
             }
@@ -112,7 +114,9 @@ function getSqlAst(input) {
                             }
                             const argsMapped = _.cloneDeep(args);
                             argsMapped.$where = argsMapped.$where[1];
-                            const whereResult = getWhere(table, argsMapped, dialect, orderBy, rowWithCursorId);
+                            const whereResult = getWhere(
+                            // table is escaped already
+                            table, argsMapped, dialect, orderBy, rowWithMatchingCursor);
                             if (whereResult == null) {
                                 return undefined;
                             }

package/dist/getWhere.d.ts

@@ -1,2 +1,2 @@
 import type { IOrderBy, IDialect } from "./types";
-export declare function getWhere(table: string, args: any, dialect: IDialect, orderBy?: IOrderBy | undefined, rowWithCursorId?: any): string | null;
+export declare function getWhere(table: string, args: any, dialect: IDialect, orderBy?: IOrderBy | undefined, rowWithMatchingCursor?: any): string | null;

package/dist/getWhere.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWhere = void 0;
 const stringifyWhere_1 = require("./stringifyWhere");
-function getWhere(table, args, dialect, orderBy, rowWithCursorId) {
+function getWhere(
+// Note: `table` is not escaped in getWhere, so it should be escaped beforehand.
+table, args, dialect, orderBy, rowWithMatchingCursor) {
     if (args?.$where == null && args?.$paginate == null) {
         return null;
     }
@@ -13,7 +15,7 @@ function getWhere(table, args, dialect, orderBy, rowWithCursorId) {
         dialect,
         args,
         orderBy,
-        rowWithCursorId,
+        rowWithMatchingCursor,
     }) || null);
 }
 exports.getWhere = getWhere;

package/dist/runtime/RuntimeKSQL.js

@@ -74,7 +74,7 @@ class RuntimeKSQL {
                     delete input.args.$where[k];
                 }
             }
-            const where = getWhere_1.getWhere(tableKSQL, input.args, "mysql");
+            const where = getWhere_1.getWhere(SqlString.escapeId(tableKSQL), input.args, "mysql");
             if (!where) {
                 throw new Error("Invalid $where");
             }

package/dist/runtime/__shared.js

@@ -23,7 +23,7 @@ async function resolve(input, dbCall, formatQuery, options) {
     const context = {};
     const kind = input.kind;
     const primaryKey = input.artifacts[input.table].primaryKey;
-    let rowWithCursorId = undefined;
+    let rowWithMatchingCursor = undefined;
     if (kind === "listPaginated") {
         if (input.args?.$paginate == null) {
             throw new Error("$paginate required but not supplied");
@@ -33,7 +33,7 @@ async function resolve(input, dbCall, formatQuery, options) {
             const cursor = input.args.$paginate.after != null
                 ? input.args.$paginate.after
                 : input.args.$paginate.before;
-            rowWithCursorId = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
+            rowWithMatchingCursor = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
                 input.table,
                 primaryKey,
                 cursor_1.decodeCursor(cursor),
@@ -49,7 +49,7 @@ async function resolve(input, dbCall, formatQuery, options) {
         fields,
         getWhere: getWhere_1.getWhere,
         orderBy: orderByListPaginatedRootResult?.orderBy,
-        rowWithCursorId,
+        rowWithMatchingCursor,
         dialect: options.dialect,
     });
     let { sql, shapeDefinition } = await util_1.compileSqlAST(sqlAST, context, options);
@@ -113,9 +113,31 @@ async function resolve(input, dbCall, formatQuery, options) {
         //   return true;
         // });
         if (kind === "listPaginated") {
+            const argsTotalCount = input.args && _.cloneDeep(input.args);
+            if (argsTotalCount != null) {
+                if (argsTotalCount.$paginate != null) {
+                    // We don't want the where clause to include cursor-related stuff
+                    delete argsTotalCount.$paginate.after;
+                    delete argsTotalCount.$paginate.before;
+                }
+            }
+            const sqlASTTotalCount = getSqlAst_1.getSqlAst({
+                ...input,
+                args: argsTotalCount,
+                // Because we're going to manually set children anyway
+                fields: [],
+                getWhere: getWhere_1.getWhere,
+                // We don't want the where clause to include cursor-related stuff
+                rowWithMatchingCursor: null,
+                dialect: options.dialect,
+            });
+            // Because orderBy doesn't matter for total count.
+            // getOrderBy adds an element if paginating, so deleting args.$orderBy
+            // isn't sufficient.
+            delete sqlASTTotalCount.orderBy;
             data = await wrapListPaginated(data, input.args, orderByListPaginatedRootResult.flip, (xs) => {
                 postProcess(xs, fields, shouldRemoveExtraKeys);
-            }, sqlAST, dbCall, input.artifacts[input.table].primaryKey, context, options);
+            }, sqlASTTotalCount, dbCall, input.artifacts[input.table].primaryKey, context, options);
         }
         return data;
     }
@@ -128,11 +150,8 @@ exports.resolve = resolve;
 // Not recursive at the moment; only supported at the root.
 // TODO - remove if support for pagination for mysql dialect
 // is added (I doubt it)
-async function wrapListPaginated(data, args, flip, cb, sqlAST, dbCall, primaryKey, context, options) {
-    const isPaginatingBackward = args.$paginate.last != null;
-    const limit = isPaginatingBackward
-        ? args.$paginate.last
-        : args.$paginate.first;
+async function wrapListPaginated(data, args, flip, cb, sqlASTTotalCount, dbCall, primaryKey, context, options) {
+    const limit = flip ? args.$paginate.last : args.$paginate.first;
     const hasMoreResults = data.length === limit + 1;
     if (hasMoreResults) {
         // because we peeked
@@ -141,15 +160,14 @@ async function wrapListPaginated(data, args, flip, cb, sqlAST, dbCall, primaryKe
     if (flip) {
         data = data.reverse();
     }
-    const hasPreviousPage = isPaginatingBackward ? hasMoreResults : false;
-    const hasNextPage = isPaginatingBackward ? false : hasMoreResults;
+    const hasPreviousPage = flip ? hasMoreResults : false;
+    const hasNextPage = flip ? false : hasMoreResults;
     const startKey = data?.[0]?.[primaryKey];
     const endKey = data?.[data.length - 1]?.[primaryKey];
     const startCursor = startKey == null ? null : cursor_1.encodeCursor(startKey);
     const endCursor = endKey == null ? null : cursor_1.encodeCursor(endKey);
     // Replace field selection with `COUNT(*)`
     const fieldNameTotalCount = "totalCount";
-    const sqlASTTotalCount = { ...sqlAST };
     sqlASTTotalCount.children = [
         {
             type: "expression",
@@ -158,9 +176,6 @@ async function wrapListPaginated(data, args, flip, cb, sqlAST, dbCall, primaryKe
             as: fieldNameTotalCount,
         },
     ];
-    // Remove ORDER BY to avoid the error:
-    // Column "X" is invalid in the ORDER BY clause because it is not contained in either an aggregate function or the GROUP BY clause.
-    delete sqlASTTotalCount.orderBy;
     const { sql: sqlTotalCount } = await util_1.compileSqlAST(sqlASTTotalCount, context, options);
     const totalCount = await dbCall(sqlTotalCount).then((xs) => xs[0][fieldNameTotalCount]);
     cb(data);
@@ -225,9 +240,10 @@ async function post(input) {
 exports.post = post;
 async function patch(input) {
     async function _patch() {
-        const { dbCall, formatQuery } = input;
+        const { dbCall, formatQuery, dialect } = input;
+        const escapeId = stringifyWhere_1.getEscapeId(dialect);
         const tableArtifacts = input.artifacts[input.table];
-        const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
+        const where = getWhere_1.getWhere(escapeId(input.table), input.args, input.dialect);
         if (where == null) {
             throw new Error("Null where");
         }
@@ -322,9 +338,10 @@ function getUpdateQuery(table, data, where, dialect, formatQuery) {
 }
 async function patchList(input) {
     async function _patchList() {
-        const { dbCall, formatQuery } = input;
+        const { dbCall, formatQuery, dialect } = input;
+        const escapeId = stringifyWhere_1.getEscapeId(dialect);
         const tableArtifacts = input.artifacts[input.table];
-        const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
+        const where = getWhere_1.getWhere(escapeId(input.table), input.args, input.dialect);
         if (where == null) {
             throw new Error("Null where");
         }
@@ -386,8 +403,9 @@ async function del(input) {
 }
 exports.del = del;
 async function deleteList(input) {
-    const { dbCall, formatQuery } = input;
-    const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
+    const { dbCall, formatQuery, dialect } = input;
+    const escapeId = stringifyWhere_1.getEscapeId(dialect);
+    const where = getWhere_1.getWhere(escapeId(input.table), input.args, input.dialect);
     if (where == null) {
         throw new Error("Null where");
     }

package/dist/stringifyWhere.d.ts

@@ -11,7 +11,7 @@ export declare function stringifyWhere(input: {
     dialect: IDialect;
     args: IArgs;
     orderBy?: IOrderBy | undefined;
-    rowWithCursorId?: any;
+    rowWithMatchingCursor?: any;
 }): string;
 export declare function getEscapeId(dialect: IDialect): any;
 export declare function getEscape(dialect: IDialect): any;

package/dist/stringifyWhere.js

@@ -6,7 +6,7 @@ const MySqlString = require("sqlstring");
 // @ts-ignore
 const TSqlString = require("tsqlstring");
 function stringifyWhere(input) {
-    const { where, table, dialect, args, orderBy, rowWithCursorId } = input;
+    const { where, table, dialect, args, orderBy, rowWithMatchingCursor } = input;
     const escapeId = getEscapeId(dialect);
     const escape = getEscape(dialect);
     let result = _stringifyWhere(where, table, escapeId, escape, "");
@@ -16,7 +16,7 @@ function stringifyWhere(input) {
         orderBy,
         escapeId,
         escape,
-        rowWithCursorId,
+        rowWithMatchingCursor,
     });
     if (paginationWhere) {
         result = result + " AND " + paginationWhere;
@@ -159,11 +159,11 @@ function getOperatorNeq(value) {
 //   return { k, v };
 // }
 function stringifyPaginationWhere(input) {
-    const { table, args, orderBy, escapeId, escape, rowWithCursorId } = input;
+    const { table, args, orderBy, escapeId, escape, rowWithMatchingCursor, } = input;
     if (args?.$paginate?.after == null && args?.$paginate?.before == null) {
         return "";
     }
-    if (rowWithCursorId == null) {
+    if (rowWithMatchingCursor == null) {
         return "";
     }
     // orderBy should never be null because of getOrderBy, but add a check.
@@ -188,12 +188,12 @@ function stringifyPaginationWhere(input) {
         let a = orderBy.slice(0, i).map(({ column: col2 }) => {
             const field = `${table}.${escapeId(col2)}`;
             const op = "=";
-            const v = printValue(rowWithCursorId[col2]);
+            const v = printValue(rowWithMatchingCursor[col2]);
             return `${field} ${op} ${v}`;
         });
         const field = `${table}.${escapeId(column)}`;
         const op = getCompOp(direction);
-        const v = printValue(rowWithCursorId[column]);
+        const v = printValue(rowWithMatchingCursor[column]);
         a.push(`${field} ${op} ${v}`);
         return "(" + a.join(" AND ") + ")";
     })

package/dist/types.d.ts

@@ -65,7 +65,7 @@ export declare type IGetSQLASTInput = {
     grabMany: boolean;
     getWhere: typeof getWhere;
     orderBy?: IOrderBy | undefined;
-    rowWithCursorId?: any;
+    rowWithMatchingCursor?: any;
     artifacts: IArtifacts;
     dialect: IDialect;
     firstChild?: IASTChildColumn | IASTChildComposite;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.4.3",
+  "version": "0.4.7",
   "main": "./dist/index.js",
   "files": [
     "dist"