@technicity/data-service-generator 0.5.3 → 0.5.7

package/dist/generation/generate.js

@@ -679,6 +679,11 @@ async function getJSONSchemaWhere(table) {
                                 properties: { $like: { type: "string", minLength: 1 } },
                                 additionalProperties: false,
                             },
+                            {
+                                type: "object",
+                                properties: { $nlike: { type: "string", minLength: 1 } },
+                                additionalProperties: false,
+                            },
                             {
                                 type: "object",
                                 properties: { $in: { type: "array", items: v } },
@@ -814,14 +819,17 @@ function getTypeShared() {
     last: number;
     after?: string;
     before?: string;
+} | {
+  limit: number;
+  offset?: number;
 }
 
 export type ListPaginated<T> = {
   paginationInfo: {
-    hasPreviousPage: boolean,
-    hasNextPage: boolean,
-    startCursor: string | number,
-    endCursor: string | number,
+    hasPreviousPage?: boolean,
+    hasNextPage?: boolean,
+    startCursor?: string | number,
+    endCursor?: string | number,
     totalCount: number,
   },
   results: Array<T>,

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { generate } from "./generation/generate";
 export { SDKNotFoundError } from "./runtime/lib/SDKNotFoundError";
+export { traverseFieldArgs } from "./traverseFieldArgs";

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SDKNotFoundError = exports.generate = void 0;
+exports.traverseFieldArgs = exports.SDKNotFoundError = exports.generate = void 0;
 var generate_1 = require("./generation/generate");
 Object.defineProperty(exports, "generate", { enumerable: true, get: function () { return generate_1.generate; } });
 var SDKNotFoundError_1 = require("./runtime/lib/SDKNotFoundError");
 Object.defineProperty(exports, "SDKNotFoundError", { enumerable: true, get: function () { return SDKNotFoundError_1.SDKNotFoundError; } });
+var traverseFieldArgs_1 = require("./traverseFieldArgs");
+Object.defineProperty(exports, "traverseFieldArgs", { enumerable: true, get: function () { return traverseFieldArgs_1.traverseFieldArgs; } });

package/dist/runtime/lib/shared.js

@@ -88,29 +88,57 @@ async function getData(input, dbCall, formatQuery, dialect) {
     const context = {};
     const action = input.action;
     const primaryKey = input.artifacts[input.resource].primaryKey;
+    let paginationType;
+    let limit = undefined;
+    let offset = undefined;
     let rowWithMatchingCursor = undefined;
     if (action === "findManyPaginated") {
         if (input.args?.$paginate == null) {
             throw new Error("$paginate required but not supplied");
         }
-        if (input.args.$paginate.after != null ||
-            input.args.$paginate.before != null) {
-            const cursor = input.args.$paginate.after != null
-                ? input.args.$paginate.after
-                : input.args.$paginate.before;
-            rowWithMatchingCursor = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
-                input.resource,
-                primaryKey,
-                cursor_1.decodeCursor(cursor),
-            ])).then((xs) => xs[0]);
+        if (typeof input?.args?.$paginate?.limit === "number") {
+            paginationType = "limit-offset";
+            limit = input.args.$paginate.limit;
+            offset = input.args.$paginate.offset;
         }
+        else {
+            paginationType = "cursor";
+            limit = (typeof input?.args?.$paginate?.first === "number"
+                ? input?.args?.$paginate?.first
+                : input?.args?.$paginate?.last);
+            // + 1 to peek if there is more data
+            limit += 1;
+            if (input.args.$paginate.after != null ||
+                input.args.$paginate.before != null) {
+                const cursor = input.args.$paginate.after != null
+                    ? input.args.$paginate.after
+                    : input.args.$paginate.before;
+                rowWithMatchingCursor = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
+                    input.resource,
+                    primaryKey,
+                    cursor_1.decodeCursor(cursor),
+                ])).then((xs) => xs[0]);
+            }
+        }
+    }
+    else if (action === "findMany") {
+        limit = input?.args?.$limit;
     }
     // 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.resource, input.artifacts);
-    const orderByListPaginatedRootResult = action === "findManyPaginated"
-        ? getOrderBy_1.getOrderBy(input.args, primaryKey)
-        : undefined;
+    const orderByListPaginatedRootResult = 
+    // MSSQL's OFFSET and FETCH requires ORDER BY, so we need to provide a fallback
+    dialect === "mssql" && paginationType === "limit-offset"
+        ? {
+            orderBy: getOrderBy_1.getOrderBy(input.args, primaryKey)?.orderBy ?? [
+                { column: primaryKey, direction: "asc" },
+            ],
+            flip: false,
+        }
+        : action === "findManyPaginated"
+            ? getOrderBy_1.getOrderBy(input.args, primaryKey)
+            : undefined;
     const grabMany = action === "findMany" ||
         action === "findManyPaginated" ||
         action === "updateMany" ||
@@ -134,23 +162,21 @@ async function getData(input, dbCall, formatQuery, dialect) {
     }
     // TODO - remove if limit support added for mysql dialect
     if (action === "findMany" || action === "findManyPaginated") {
-        let limit = undefined;
-        if (action === "findManyPaginated") {
-            limit = (typeof input?.args?.$paginate?.first === "number"
-                ? input?.args?.$paginate?.first
-                : input?.args?.$paginate?.last);
-            // + 1 to peek if there is more data
-            limit += 1;
-        }
-        else {
-            limit = input?.args?.$limit;
-        }
         if (typeof limit === "number") {
-            if (dialect === "mysql") {
-                sql += ` LIMIT ${limit}`;
+            const escape = stringifyWhere_1.getEscape(dialect);
+            if (dialect === "mssql") {
+                if (typeof offset === "number") {
+                    sql += ` OFFSET ${escape(offset)} ROWS FETCH NEXT ${escape(limit)} ROWS ONLY`;
+                }
+                else {
+                    sql = sql.replace("SELECT", `SELECT TOP ${escape(limit)}`);
+                }
             }
             else {
-                sql = sql.replace("SELECT", `SELECT TOP ${limit}`);
+                sql += ` LIMIT ${escape(limit)}`;
+                if (typeof offset === "number") {
+                    sql += ` OFFSET ${escape(offset)}`;
+                }
             }
         }
     }
@@ -194,6 +220,8 @@ async function getData(input, dbCall, formatQuery, dialect) {
                     // We don't want the where clause to include cursor-related stuff
                     delete argsTotalCount.$paginate.after;
                     delete argsTotalCount.$paginate.before;
+                    // We don't need offset
+                    delete argsTotalCount.$paginate.offset;
                 }
             }
             const sqlASTTotalCount = getSqlAst_1.getSqlAst({
@@ -213,9 +241,16 @@ async function getData(input, dbCall, formatQuery, dialect) {
             // 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);
-            }, sqlASTTotalCount, dbCall, input.artifacts[input.resource].primaryKey, context, options);
+            const totalCount = await getTotalCount(sqlASTTotalCount, dbCall, context, options);
+            if (paginationType === "cursor") {
+                data = wrapListPaginationCursor(data, input.args, orderByListPaginatedRootResult.flip, (xs) => {
+                    postProcess(xs, fields, shouldRemoveExtraKeys);
+                }, input.artifacts[input.resource].primaryKey, totalCount);
+            }
+            else {
+                postProcess(data, fields, shouldRemoveExtraKeys);
+                data = wrapListPaginationLimitOffset(data, totalCount);
+            }
         }
         return data;
     }
@@ -224,10 +259,13 @@ async function getData(input, dbCall, formatQuery, dialect) {
     }
     return data;
 }
+function wrapListPaginationLimitOffset(data, totalCount) {
+    return { paginationInfo: { totalCount }, results: data };
+}
 // 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, sqlASTTotalCount, dbCall, primaryKey, context, options) {
+function wrapListPaginationCursor(data, args, flip, cb, primaryKey, totalCount) {
     const limit = flip ? args.$paginate.last : args.$paginate.first;
     const hasMoreResults = data.length === limit + 1;
     if (hasMoreResults) {
@@ -243,6 +281,19 @@ async function wrapListPaginated(data, args, flip, cb, sqlASTTotalCount, dbCall,
     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);
+    cb(data);
+    return {
+        paginationInfo: {
+            hasPreviousPage,
+            hasNextPage,
+            startCursor,
+            endCursor,
+            totalCount,
+        },
+        results: data,
+    };
+}
+async function getTotalCount(sqlASTTotalCount, dbCall, context, options) {
     // Replace field selection with `COUNT(*)`
     const fieldNameTotalCount = "totalCount";
     sqlASTTotalCount.children = [
@@ -255,17 +306,7 @@ async function wrapListPaginated(data, args, flip, cb, sqlASTTotalCount, dbCall,
     ];
     const { sql: sqlTotalCount } = await util_1.compileSqlAST(sqlASTTotalCount, context, options);
     const totalCount = await dbCall(sqlTotalCount).then((xs) => xs[0][fieldNameTotalCount]);
-    cb(data);
-    return {
-        paginationInfo: {
-            hasPreviousPage,
-            hasNextPage,
-            startCursor,
-            endCursor,
-            totalCount,
-        },
-        results: data,
-    };
+    return totalCount;
 }
 async function create(input, dbCall, formatQuery, dialect) {
     async function _create() {
@@ -667,6 +708,7 @@ const ops = [
     "$in",
     "$nin",
     "$like",
+    "$nlike",
     "$btwn",
     "$nbtwn",
 ];

package/dist/runtime/lib/stringifyWhere.js

@@ -111,6 +111,9 @@ function _stringifyWhere(where, table, escapeId, escape, result) {
             if (operator === "$like") {
                 return `${table}.${escapeId(k)} LIKE ${printValue(operand)}`;
             }
+            if (operator === "$nlike") {
+                return `${table}.${escapeId(k)} NOT LIKE ${printValue(operand)}`;
+            }
             if (operator === "$in") {
                 if (operand.length === 0) {
                     // Would do "FALSE" instead, as it's more readable, but it

package/dist/traverseFieldArgs.d.ts

@@ -0,0 +1,2 @@
+import { IArgs, IField } from "./runtime/IRuntime";
+export declare function traverseFieldArgs(fields: IField[], cb: (args: IArgs | undefined) => IArgs): void;

package/dist/traverseFieldArgs.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traverseFieldArgs = void 0;
+function traverseFieldArgs(fields, cb) {
+    for (let x of fields) {
+        if (typeof x !== "object") {
+            continue;
+        }
+        x.args = cb(x.args);
+        traverseFieldArgs(x.fields, cb);
+    }
+}
+exports.traverseFieldArgs = traverseFieldArgs;

package/package.json

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