@technicity/data-service-generator 0.4.0 → 0.4.1

package/dist/getOrderBy.d.ts

@@ -0,0 +1,5 @@
+import { IArgs, IOrderBy } from "./types";
+export declare function getOrderBy(args: IArgs | undefined, primaryKey: string): {
+    orderBy: IOrderBy | undefined;
+    flip: boolean;
+};

package/dist/getOrderBy.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOrderBy = void 0;
+// https://gist.github.com/pcattori/2bb645d587e45c9fdbcabf5cef7a7106
+function getOrderBy(args, primaryKey) {
+    let out = undefined;
+    let flip = false;
+    if (Array.isArray(args?.$orderBy)) {
+        out = args?.$orderBy.map((x) => {
+            const [column, direction] = Object.entries(x)[0];
+            return { column, direction };
+        });
+    }
+    else if (typeof args?.$orderBy === "object" && args.$orderBy != null) {
+        const [column, direction] = Object.entries(args.$orderBy)[0];
+        out = [{ column, direction }];
+    }
+    if (args?.$paginate?.first != null || args?.$paginate?.last != null) {
+        // If paginating and primaryKey is not in orderBy, add it to end.
+        // Not necessarily "asc"; see flip.
+        if (!out?.find((x) => x.column === primaryKey)) {
+            const orderByPrimaryKey = { column: primaryKey, direction: "asc" };
+            if (out == null) {
+                out = [orderByPrimaryKey];
+            }
+            else {
+                out = out.concat(orderByPrimaryKey);
+            }
+        }
+        flip = getFlip(args, out, primaryKey);
+        if (flip) {
+            out = flipOrderByDirection(out);
+        }
+    }
+    return { orderBy: out, flip };
+}
+exports.getOrderBy = getOrderBy;
+function getFlip(args, orderBy, primaryKey) {
+    if (args?.$paginate?.first != null &&
+        orderBy?.find((x) => x.column === primaryKey)?.direction === "desc") {
+        return true;
+    }
+    if (args?.$paginate?.last != null &&
+        orderBy?.find((x) => x.column === primaryKey)?.direction === "asc") {
+        return true;
+    }
+    return false;
+}
+function flipOrderByDirection(orderBy) {
+    return orderBy.map((x) => ({ ...x, direction: flipDirection(x.direction) }));
+}
+function flipDirection(direction) {
+    return direction === "asc" ? "desc" : "asc";
+}

package/dist/getSqlAst.js

@@ -7,6 +7,7 @@ const TSqlString = require("tsqlstring");
 // @ts-ignore
 const alias_namespace_1 = require("join-monster/dist/alias-namespace");
 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;
@@ -15,7 +16,7 @@ function getSqlAst(input) {
     const format = dialect === "mysql"
         ? SqlString.format.bind(SqlString)
         : TSqlString.format.bind(TSqlString);
-    const orderBy = args?.$orderBy == null ? undefined : getOrderBy(args, primaryKey);
+    const orderBy = input.orderBy ?? getOrderBy_1.getOrderBy(args, primaryKey)?.orderBy;
     let where = input.where;
     if (input.where == null) {
         where = (table, args) => {
@@ -24,7 +25,7 @@ function getSqlAst(input) {
                 argsMapped = _.cloneDeep(argsMapped);
                 argsMapped.$where = argsMapped.$where[0];
             }
-            const whereResult = getWhere(table, argsMapped, primaryKey, dialect, orderBy, rowWithCursorId);
+            const whereResult = getWhere(table, argsMapped, dialect, orderBy, rowWithCursorId);
             if (whereResult == null) {
                 return undefined;
             }
@@ -111,7 +112,7 @@ function getSqlAst(input) {
                             }
                             const argsMapped = _.cloneDeep(args);
                             argsMapped.$where = argsMapped.$where[1];
-                            const whereResult = getWhere(table, argsMapped, artifacts[relationField.junctionTable].primaryKey, dialect, orderBy, rowWithCursorId);
+                            const whereResult = getWhere(table, argsMapped, dialect, orderBy, rowWithCursorId);
                             if (whereResult == null) {
                                 return undefined;
                             }
@@ -198,34 +199,3 @@ function columnToASTChild(columnName, namespace, fromOtherTable) {
 function toClumsyName(keyArr) {
     return keyArr.map((name) => name.slice(0, 3)).join("#");
 }
-function getOrderBy(args, primaryKey) {
-    let out = undefined;
-    if (Array.isArray(args.$orderBy)) {
-        out = args.$orderBy.map((x) => {
-            const [column, direction] = Object.entries(x)[0];
-            return { column, direction };
-        });
-    }
-    else {
-        const [column, direction] = Object.entries(args.$orderBy)[0];
-        out = [{ column, direction }];
-    }
-    if (args?.$paginate?.first != null) {
-        out = out
-            .filter((x) => x.column !== primaryKey)
-            // id needs to be last
-            .concat({ column: primaryKey, direction: "asc" });
-    }
-    else if (args?.$paginate?.last != null) {
-        out = out
-            .filter((x) => x.column !== primaryKey)
-            // Need to flip if we're paginating backwards.
-            .map((x) => ({
-            column: x.column,
-            direction: x.direction === "asc" ? "desc" : "asc",
-        }))
-            // id needs to be last
-            .concat({ column: primaryKey, direction: "desc" });
-    }
-    return out;
-}

package/dist/getWhere.d.ts

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

package/dist/getWhere.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWhere = void 0;
 const stringifyWhere_1 = require("./stringifyWhere");
-function getWhere(table, args, primaryKey, dialect, orderBy, rowWithCursorId) {
+function getWhere(table, args, dialect, orderBy, rowWithCursorId) {
     if (args?.$where == null && args?.$paginate == null) {
         return null;
     }
@@ -13,7 +13,6 @@ function getWhere(table, args, primaryKey, dialect, orderBy, rowWithCursorId) {
         dialect,
         args,
         orderBy,
-        primaryKey,
         rowWithCursorId,
     }) || null);
 }

package/dist/runtime/RuntimeKSQL.js

@@ -66,7 +66,6 @@ class RuntimeKSQL {
             return resolved;
         }
         else {
-            const primaryKey = input.artifacts[input.table].primaryKey;
             const table = input.table;
             const tableKSQL = getKSQLTablename(input.table);
             if (input.args?.$where) {
@@ -75,7 +74,7 @@ class RuntimeKSQL {
                     delete input.args.$where[k];
                 }
             }
-            const where = getWhere_1.getWhere(tableKSQL, input.args, primaryKey, "mysql");
+            const where = getWhere_1.getWhere(tableKSQL, input.args, "mysql");
             if (!where) {
                 throw new Error("Invalid $where");
             }

package/dist/runtime/__shared.js

@@ -18,9 +18,11 @@ const runTransforms_1 = require("../runTransforms");
 const addNullFallbacks_1 = require("../addNullFallbacks");
 const SDKNotFoundError_1 = require("../SDKNotFoundError");
 const stringifyWhere_1 = require("../stringifyWhere");
+const getOrderBy_1 = require("../getOrderBy");
 async function resolve(input, dbCall, formatQuery, options) {
     const context = {};
     const kind = input.kind;
+    const primaryKey = input.artifacts[input.table].primaryKey;
     let rowWithCursorId = undefined;
     if (kind === "listPaginated") {
         if (input.args?.$paginate == null) {
@@ -31,7 +33,6 @@ async function resolve(input, dbCall, formatQuery, options) {
             const cursor = input.args.$paginate.after != null
                 ? input.args.$paginate.after
                 : input.args.$paginate.before;
-            const primaryKey = input.artifacts[input.table].primaryKey;
             rowWithCursorId = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
                 input.table,
                 primaryKey,
@@ -42,10 +43,12 @@ async function resolve(input, dbCall, formatQuery, options) {
     // we need to read the query AST and build a new "SQL AST" from which the SQL and
     // const sqlAST = queryAST.queryASTToSqlAST(resolveInfo, options, context);
     const fields = input.fields ?? getScalarFields(input.table, input.artifacts);
+    const orderByListPaginatedRootResult = kind === "listPaginated" ? getOrderBy_1.getOrderBy(input.args, primaryKey) : undefined;
     const sqlAST = getSqlAst_1.getSqlAst({
         ...input,
         fields,
         getWhere: getWhere_1.getWhere,
+        orderBy: orderByListPaginatedRootResult?.orderBy,
         rowWithCursorId,
         dialect: options.dialect,
     });
@@ -110,7 +113,7 @@ async function resolve(input, dbCall, formatQuery, options) {
         //   return true;
         // });
         if (kind === "listPaginated") {
-            data = await wrapListPaginated(data, input.args, (xs) => {
+            data = await wrapListPaginated(data, input.args, orderByListPaginatedRootResult.flip, (xs) => {
                 postProcess(xs, fields, shouldRemoveExtraKeys);
             }, sqlAST, dbCall, input.artifacts[input.table].primaryKey, context, options);
         }
@@ -125,8 +128,7 @@ 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, cb, sqlAST, dbCall, primaryKey, context, options) {
-    const flip = typeof args.$paginate.first === "number" ? false : true;
+async function wrapListPaginated(data, args, flip, cb, sqlAST, dbCall, primaryKey, context, options) {
     const limit = flip ? args.$paginate.last : args.$paginate.first;
     const hasMoreResults = data.length === limit + 1;
     if (hasMoreResults) {
@@ -138,10 +140,10 @@ async function wrapListPaginated(data, args, cb, sqlAST, dbCall, primaryKey, con
     }
     const hasPreviousPage = flip ? hasMoreResults : false;
     const hasNextPage = flip ? false : hasMoreResults;
-    const startId = data?.[0]?.[primaryKey];
-    const endId = data?.[data.length - 1]?.[primaryKey];
-    const startCursor = startId == null ? null : cursor_1.encodeCursor(startId);
-    const endCursor = endId == null ? null : cursor_1.encodeCursor(endId);
+    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 };
@@ -222,7 +224,7 @@ async function patch(input) {
     async function _patch() {
         const { dbCall, formatQuery } = input;
         const tableArtifacts = input.artifacts[input.table];
-        const where = getWhere_1.getWhere(input.table, input.args, tableArtifacts.primaryKey, input.dialect);
+        const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
         if (where == null) {
             throw new Error("Null where");
         }
@@ -319,7 +321,7 @@ async function patchList(input) {
     async function _patchList() {
         const { dbCall, formatQuery } = input;
         const tableArtifacts = input.artifacts[input.table];
-        const where = getWhere_1.getWhere(input.table, input.args, tableArtifacts.primaryKey, input.dialect);
+        const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
         if (where == null) {
             throw new Error("Null where");
         }
@@ -382,8 +384,7 @@ async function del(input) {
 exports.del = del;
 async function deleteList(input) {
     const { dbCall, formatQuery } = input;
-    const tableArtifacts = input.artifacts[input.table];
-    const where = getWhere_1.getWhere(input.table, input.args, tableArtifacts.primaryKey, input.dialect);
+    const where = getWhere_1.getWhere(input.table, input.args, input.dialect);
     if (where == null) {
         throw new Error("Null where");
     }

package/dist/stringifyWhere.d.ts

@@ -10,7 +10,6 @@ export declare function stringifyWhere(input: {
     table: string;
     dialect: IDialect;
     args: IArgs;
-    primaryKey: string;
     orderBy?: IOrderBy | undefined;
     rowWithCursorId?: any;
 }): string;

package/dist/stringifyWhere.js

@@ -5,9 +5,8 @@ const _ = require("lodash/fp");
 const MySqlString = require("sqlstring");
 // @ts-ignore
 const TSqlString = require("tsqlstring");
-const cursor_1 = require("./cursor");
 function stringifyWhere(input) {
-    const { where, table, dialect, args, primaryKey, orderBy, rowWithCursorId, } = input;
+    const { where, table, dialect, args, orderBy, rowWithCursorId } = input;
     const escapeId = getEscapeId(dialect);
     const escape = getEscape(dialect);
     let result = _stringifyWhere(where, table, escapeId, escape, "");
@@ -15,8 +14,6 @@ function stringifyWhere(input) {
         table,
         args,
         orderBy,
-        primaryKey,
-        dialect,
         escapeId,
         escape,
         rowWithCursorId,
@@ -162,54 +159,46 @@ function getOperatorNeq(value) {
 //   return { k, v };
 // }
 function stringifyPaginationWhere(input) {
-    const { table, args, orderBy, primaryKey, dialect, escapeId, escape, rowWithCursorId, } = input;
-    if (args?.$paginate?.after != null || args?.$paginate?.before != null) {
-        const idDir = args.$paginate.after != null ? "asc" : "desc";
-        const cursor = args.$paginate.after != null
-            ? args.$paginate.after
-            : args.$paginate.before;
-        const getCompOp = (dir) => (dir === "asc" ? ">" : "<");
-        if (orderBy == null) {
-            return `${table}.${escapeId(primaryKey)} ${getCompOp(idDir)} ${cursor_1.decodeCursor(cursor)}`;
+    const { table, args, orderBy, escapeId, escape, rowWithCursorId } = input;
+    if (args?.$paginate?.after == null && args?.$paginate?.before == null) {
+        return "";
+    }
+    if (rowWithCursorId == null) {
+        return "";
+    }
+    // orderBy should never be null because of getOrderBy, but add a check.
+    if (orderBy == null) {
+        throw new Error("orderBy cannot be null when paginating");
+    }
+    function getCompOp(dir) {
+        return dir === "asc" ? ">" : "<";
+    }
+    function printValue(v) {
+        if (v === true) {
+            v = 1;
         }
-        else {
-            const orders = orderBy
-                .filter((x) => x.column !== primaryKey)
-                .concat({ column: primaryKey, direction: "asc" });
-            function printValue(v) {
-                if (v === true) {
-                    v = 1;
-                }
-                if (v === false) {
-                    v = 0;
-                }
-                return escape(v);
-            }
-            const cond = orders
-                .map(({ direction }, i) => {
-                const a = orders
-                    .slice(0, i + 1)
-                    .map(({ column: col2 }, j, arr) => {
-                    const field = `${table}.${escapeId(col2)}`;
-                    const op = j === arr.length - 1 ? getCompOp(direction) : "=";
-                    let v = rowWithCursorId[col2];
-                    // TODO?
-                    if (dialect === "mssql" && v instanceof Date) {
-                        // Clone, since setMinutes mutates
-                        v = new Date(v.valueOf());
-                        v.setMinutes(v.getMinutes() + new Date().getTimezoneOffset());
-                    }
-                    v = printValue(v);
-                    return `${field} ${op} ${v}`;
-                })
-                    .join(" AND ");
-                return "(" + a + ")";
-            })
-                .join(" OR ");
-            return "(" + cond + ")";
+        if (v === false) {
+            v = 0;
         }
+        return escape(v);
     }
-    return "";
+    // https://gist.github.com/pcattori/2bb645d587e45c9fdbcabf5cef7a7106
+    const cond = orderBy
+        .map(({ column, direction }, i) => {
+        let a = orderBy.slice(0, i).map(({ column: col2 }) => {
+            const field = `${table}.${escapeId(col2)}`;
+            const op = "=";
+            const v = printValue(rowWithCursorId[col2]);
+            return `${field} ${op} ${v}`;
+        });
+        const field = `${table}.${escapeId(column)}`;
+        const op = getCompOp(direction);
+        const v = printValue(rowWithCursorId[column]);
+        a.push(`${field} ${op} ${v}`);
+        return "(" + a.join(" AND ") + ")";
+    })
+        .join(" OR ");
+    return "(" + cond + ")";
 }
 function getEscapeId(dialect) {
     if (dialect === "mysql") {

package/dist/types.d.ts

@@ -64,6 +64,7 @@ export declare type IGetSQLASTInput = {
     junction?: IJunction;
     grabMany: boolean;
     getWhere: typeof getWhere;
+    orderBy?: IOrderBy | undefined;
     rowWithCursorId?: any;
     artifacts: IArtifacts;
     dialect: IDialect;

package/package.json

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