@technicity/data-service-generator 0.13.26 → 0.14.0

package/dist/generation/generate.js

@@ -43,8 +43,6 @@ const json_schema_to_typescript_1 = require("json-schema-to-typescript");
 const getDuplicates_1 = require("../lib/getDuplicates");
 const isNotNullOrUndefined_1 = require("../lib/isNotNullOrUndefined");
 const MySQL_1 = require("../runtime/lib/MySQL");
-const node_util_1 = require("node:util");
-const spawn = (0, node_util_1.promisify)(child_process.spawn);
 // json-schema-to-typescript inlines everything. We don't want that,
 // so use `tsType`, and add imports manually.
 // https://github.com/bcherny/json-schema-to-typescript#custom-schema-properties
@@ -55,6 +53,7 @@ let dialect = "mysql";
 const json2TsOpts = {
     bannerComment: ""
 };
+const keyFields = "$fields";
 async function generate(input) {
     if (input.tables != null && input.excludeTables != null) {
         throw new Error("Must specify either `tables` or `excludeTables`, not both");
@@ -89,7 +88,7 @@ async function generate(input) {
     ]));
     const artifacts = await getArtifacts(tables, includeMappedFields, specialCaseUuidColumn);
     const artifactsSource = getArtifactsSource(artifacts);
-    const sdkSource = await getSDKSource(data, specialCaseUuidColumn, supplementClientOpts);
+    const sdkSource = await getSDKSource(data, specialCaseUuidColumn, supplementClientOpts, artifacts);
     const sdkFilename = "index.ts";
     const sourceIRuntimeFilePath = fs.existsSync(path.join(__dirname, "../runtime", "IRuntime.ts"))
         ? path.join(__dirname, "../runtime", "IRuntime.ts")
@@ -215,7 +214,7 @@ function init(input) {
         });
         query = mysql.query.bind(mysql);
     }
-    if (dialect === "mssql" || dialect === "ksql") {
+    if (dialect === "mssql") {
         const pool = new mssql.ConnectionPool({
             server: server ?? "localhost",
             user,
@@ -236,7 +235,7 @@ function init(input) {
 }
 // It's a bit awkward to put __whereNeedsProcessing, __prepareWhere on the class,
 // but it allows us to share the same database pool, clientOpts, etc.
-async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts) {
+async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts, artifacts) {
     function getTypeImports() {
         let set = new Set();
         for (let d of input) {
@@ -377,6 +376,88 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts)
     }))).join("\n\n")}
   }
 
+  ${await Promise.all(Object.entries(artifacts).map(async ([table, tableArtifacts]) => {
+        const jsonSchema = {
+            type: "object",
+            properties: tableArtifacts.fields.reduce((acc, x) => {
+                if (x.kind === "object") {
+                    return acc;
+                }
+                if (x.kind === "scalar" && x.mapped) {
+                    return acc;
+                }
+                acc[x.name] =
+                    x.kind === "enum"
+                        ? { enum: x.values }
+                        : { type: getJSONTypes(x.type, x.nullable) };
+                return acc;
+            }, {}),
+            required: tableArtifacts.fields
+                .filter((x) => x.kind === "scalar" || x.kind === "enum")
+                .map((x) => x.name),
+            additionalProperties: false
+        };
+        return (0, json_schema_to_typescript_1.compile)(jsonSchema, getTypeReturnName(table), json2TsOpts);
+    })).then((xs) => xs.join(";\n\n"))}
+
+  ${Object.entries(artifacts)
+        .map(([table, tableArtifacts]) => {
+        // https://pkerschbaum.com/blog/how-prisma-adapts-result-types-based-on-the-actual-arguments-given
+        // https://github.com/pkerschbaum/how-prisma-adapts-result-types-based-on-the-actual-arguments-given_example/blob/main/prisma/lib/prisma-client/index.d.ts
+        // https://www.typescriptlang.org/play?target=6&ts=4.9.5#code/C4TwDgpgBACglgYwNYCYA8AVANFA0lCAD2AgDsATAZyiQhAHsAzKDAPigF4oBvAWACgoUANowocUngC6ALhaipAbgEBfZfwGhIUAEoQAjgFc4AJwjlcdSpnZc+gkfgk06TFlIC0AfjncVBYjIqWERUTBxcdi8oUggANwgTKDlcdRVhWgZmDCUBTXBoDBNDYAALEEsQazZOHgEhDLpxSUy3HLkMRpApAJIKakYAQwAbSmgAHyhDCghGCXMoSdJDYeGoaNiEpLlMtK623I1+LULiiErq2xZisoqrNHhkdGxdA2MzC3u2VlZ1fO0AMoQYYQBDAAGGABGY2A4SgAFUrvYGplmi4su4dk0iH1gq1mPD1vJMj05JtEmk8scClAABKDShAkFg2rcKBjZnAOSDUggRRQNRUk5QADCpVBSCZoNhLwBOERtRYvSC1HpjOB0qJhLkAL+-CIYHoJmAUGF8LGSTs9XE5DJhgAtpCKdaIPbBnBhnJKMATBIAObqIRGv3w0hwYAASVtMQdTpMaT1AHoAFTJ+rJqAAWXo5GBUAA8iYQ2HgOn04mBAajSbhYXi+HWda4NHlo7nQ5SIN7RAvT7-QmqQFDcbTTTzYkAGISciZnkgACCReoVocQhTadXQgzUpZlEgCDgcwQUDmwOCwHoJ4gwAQpRPJno9tN4oRFutQigG4-W+TFc3HOlHxX0SHcTSWFZhkDD913fLdRVKeh6DGHAAHdSkQO8zGGQYSHIGIcwgagLyvG87wZKAUOBYYADpYM-OjUz-b9E0TZoEGGQxcyA8cTAjUh2M4iYY1WKC11TBioCnYYSBMVD0NvYCTCIy9GGvW9aM3ejNMY2CWIo8UzG4i0AHUDIgPiwBKUSoBg7SeAAAWGCQkCgUpgGAMBKBkFiUN86iwF9Sg3WouB6ETch6AQShEwQeh+IgMBgGi2L7UNWJSCSxMArgILBg8di4DIYBE0oat-SgAEytIP0oAAEUiygVAYiTauvRJ7XmZ9oCNXMkjcHjlJI9Tmu039dNYnrEgAIRAICAFFW0SQZIRBNAeMLXqZuM8NSj0bDgFC0gLJKX5dPEuzuEc5zXPczzvMTXyUP8wLgtC8KGpiuKEASzKUrSorouy3L8qcoqssGP0JBww6AGIEEMJSjQ8SEGXMDwwAhqGDri0UEdKpJ6qiprtIkoEkq6qBDUocNDpPI0oCc71yoGjTvy0tmdM3PT4cRkwjMSUzEggUM4CMczSEs4BrNsjmHKc0gXLcjyvJ8vygdesKIqiz74sS5LH3+jLAZevKCrBjHIc7bHJBgTGrdpwnGpG2WMEGWgoAAAwARtID3FIGB8nzKaAqZpnG3GDqAefx1nvy-OOxs3YA3YgIDWzjaXztly75cV26VYetWTZCzWPti3XfoNuKAayk2QcKjLwct6Gcdt5vrbqhriY50mkDgMAKbmJSTQ933-djj948nxPv0oPuwDT2N22Y1jyByg7+OAebFpMZbVp4gEEBGQYTCnM8FodU6HEFI4h2rUdtDrEXwQ1FkV2-ZsgMhRCQR5azO27F-H+EA-6wR4kA+gv9JCTB4lOCgs5eSLj9JQaWrEAD6sVphbzkN-SBIDoEFiLM-EU9AsH5hKJLDABQkEoOtDfeoVYRy1iISWGhjYuZZzjhVV+Jo9ygkPIgE8hVhjnhUmpO8jBA4UyfiWZ2CcmIfgAmCICMjwygUWMJSCZ0p5wTFIhZC+kMJQCwjhBYpACKDVUqRKA5FKKrAnluBiM9oKsQkAJLichVGRn4hxXMGjlgiToYOO+TCxwWnUe-D8n8cHANAZuV07phgQKgdZYMz9kn4I0V4mhqSWHhijBkuJQh6EOEYTWMJiQ2GRLEjoz83DOTsn3AI48p4RGWPEfeR8FMeJyOngooQSjsGKXUeBQJHDakZj0UhCAckjEmNwvhXM7TrG2Kog49m8jxpsV8anOQPE+LuKEgErR189TWj0mUh+0AeIAHFry2xAMMeggxyBoHOaxIQAJlT9CgLgqB-iIIaOmLmOYsQ8IwItDQrA7yPyEi4PiCqMKrhfJxCqU0ZwYVCGiD0hwekhA6m+cEYFsx5jkExUSckJhyUEtRT8nibCIWTmnAghcS5yXRHJR+AARIMrlhLqDwk5USZENkPlswaGIZwRRDDnHuACYQPKeFcqkKwWQsB+VQC5WkksXKhUrygPZJKHgDTSmNSYB8VLcVivFViwh9ZgB3OAA8p5Ly0DysVZyZVChWB6rZnIMQtK8SuAJG+K1NrvzYotAoX134yTxGXqKm13dE2xsUtSxSeo1ysUuWaC0jrnXPNeeSlFgQ6WQqXNCsNQg4XojcACJFtQS24gFeW5BGjYHMrnDQ9lUA9UeulHywNAqhXRHdbynoQ6pgzFBQsSNiRkh1CrTa0QaJpWyqqG6hV47VX+o1VqvJwBdVLvFXpQ1lBjWEH3MAM1FqY0fmiF4-NgxHmFs3f2sEXqYAqrvfi9Vk6EU4qzeG+9ilo3HptXGrYUE8Vs2TTB39gGU0Lp4pmj8OaKkmCfS+11sEm1ooPjwytQgriLuAyISVkg10XDdTuv9pbgj7vtUesjtrH33OfS6158qv0+s0hBujzba0hsSHRG1c6TBgZYwuyl1lvzExdJe++zD7VwJnF2pc7DmKcMnvUzUfCDxHiEWeZZClJFdMjl43pP5+nsh4Sog9IzNGZwmfBfRMzDEKXmWYixpoxErOoHYmiVnPzOKA24nZ9n7UHJ2QCsZWmXNSRkrMhSXiTOlHWRM0Lia0JC0i8-QWZhjpS20RJHO10lZ3VVk9dWgwS7vW1uXb6etPqpWrkbWuOU3T1zBvjDeNVKrGnKo7ZNk8WptRMB1WIFNJp9WYKl3zQ10vBc5vqmbM1t4OiWitCAaAvEbWmiAbaZQ9otyOhLE6znStXQVjdZW91HrPU67Vt6Wt9YV31q19KmUavdcbhbLGsNo5IxRmMcg6M7andxrzTuRNlvcPJpHUOHdGD00Zn1u1z9KAZacTZ7meMjR5ZLAV4WYYxZFcuxda7ec7tVce7lOrr2dZNcrp9muP2zZ-Yhx3NuAOcbDbh67d23sx7zbM0HF8SPaYRxfEDkw2PRo2eTrQRebZ4wlcp7nW7lXC7VeLi9suX0fofcNt9uuHPir-ftq3LnDsu5w4BPPQephvSexFwerHy2stz37irjOWy15M03ht7su9tu7Yc0fbCp9hHkAvvaK+xTUPfnQ4-A9WHONvM3Hhn5fzMmjLWJMYlM7wUY9YRWsBtQEX1ocMijVPoZWwQfQe2CNL6PUCL6SxvMR42WtTdn4I2SNOTC8apll3bNyieiO+w9GrBV8eiCK8NK6pVnGo2OpVKq1UBrb5qnizHgOnqNSasEN6jSifFdERcu8QBrTzex7DXGt0b+9bxqTu7-3BtL+Gc-bMm-2skyxpBgmuKiNh+J4s3puOAfamckcFSApsOOUtoB2hQCLGLFUqRtBNpnBOovps0kZm0gtlYqZlIpHIhqNgrlsoMvzCYI5sctZFQXsuEjwhTrLFMgYmhHMsCKYnhOYksoQR0qsvYp7rjq4j4oJNQdFoJLFicvFhJIlokMlneDxPwaRPLhzFlnpDlmYIwQLGZKgTKuTnQknomoYJQBDNAHAQ4OxAyNQCKKDBlBgaCuQPoTthgLPkwQ0oXtOqSqwAABSiYnzILci8hEZswYy7z2goC+D4FUBASgQQjQjXhwgEacjsCgEACU-qgcOUrh7hIEPCWod+TqHGr6NQOhJg7Ai+H4ZgwACMkgXKKO9AfK5Ec4sEya8msBRwekwojRKAtQty9+Ge3AgyvgCSHocg9e7m2q4YvgIxPAACPY6KMq8oFosxPCvgzYExZwKgOxuxvGVI5cLujRtQgwKE7oJosQKEoo9hwAvh6R1EThLhvhfgOA3ArSVAoxbo4xSxUxB6axnIvgCxWxyxik-x0oGx0Ykxuxux6RAghxJovRJxZxDYlx1xDctx9xjxpOMqzxKgrx7xXkPACSa8noPxOA0xXIPAcx3AQJZJoJVJ6xPAmxPx0JOxsJ-A8JvyJ8SJ5x3eVxdh6JdxDx04TxLxPAKg7JnJKMJgfRXApxvJqJApRUQpWJosOJYpbxMehJHeYKEpcJcULu0pAAzDySiRAPyTcSqSKdiRALifiVqb4GyQINzAaSaMaaaRceaWicqZidaWqbacMYyccnqfwEAA
+        return `export type ${getTypeGetPayloadName(table)}<S extends { ${keyFields}?: ${getTypeFieldsName(table)} } | boolean, U = keyof S> = S extends true ? ${getTypeReturnName(table)} : S extends { ${keyFields}?: ${getTypeFieldsName(table)}, [k: string]: any } ?  "${keyFields}" extends U ? S["${keyFields}"] extends undefined ? ${getTypeReturnName(table)} : { [P in TrueKeys<S["${keyFields}"]>]: ${tableArtifacts.fields
+            .reduce((acc, x) => {
+            if (x.kind !== "object") {
+                return acc;
+            }
+            let str = `P extends "${x.name}" ? ${getTypeGetPayloadName(x.type)}<S["${keyFields}"][P]>`;
+            if (x.isList) {
+                str += "[]";
+            }
+            if (x.nullable) {
+                str += " | null";
+            }
+            str += " : ";
+            acc.push(str);
+            return acc;
+        }, [])
+            .join("")} ${tableArtifacts.fields
+            .reduce((acc, x) => {
+            if (x.kind === "scalar" && x.mapped) {
+                let type = x.type;
+                if (x.nullable) {
+                    type += " | null";
+                }
+                const str = `P extends "${x.name}" ? ${type} : `;
+                acc.push(str);
+            }
+            return acc;
+        }, [])
+            .join("")} P extends keyof ${getTypeReturnName(table)} ? ${getTypeReturnName(table)}[P] : never } : ${getTypeReturnName(table)} : ${getTypeReturnName(table)}`;
+    })
+        .join(";\n\n")}
+
+  // Utils
+
+  type Pick2<T, K extends keyof T> = { [P in K]: T[P]; };
+  
+  type RequiredKeys<T> = {
+    [K in keyof T]-?: {} extends Pick2<T, K> ? never : K;
+  }[keyof T];
+  
+  type TruthyKeys<T> = {
+    [key in keyof T]: T[key] extends false | undefined | null ? never : key;
+  }[keyof T];
+  
+  type TrueKeys<T> = TruthyKeys<Pick2<T, RequiredKeys<T>>>;
+  
+  type SelectSubset<T, U> = {
+    [key in keyof T]: key extends keyof U ? T[key] : never;
+  }
+
+  type HasSelect = { ${keyFields}: any; };
+
+  type CheckSelect<T, S, U> =  T extends HasSelect ? U : S;
   `;
     return prettier.format(src, { parser: "typescript" });
 }
@@ -394,18 +475,19 @@ async function getFindOnes(x, specialCaseUuidColumn) {
     return findOnes;
 }
 function getMethodSourceGetOne(x, findOnes, isTransaction) {
-    return `async ${x.methodName}(
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
     param1: ${findOnes
         .map((findOne) => `{ ${findOne.name}: ${findOne.type}${findOne.nullable ? " | null" : ""} }`)
         .join(" | ")}, 
-    param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }
-  ): Promise<${x.typeReturnBaseName}> {
+    param2?: SelectSubset<T, ${param2}>
+  ): Promise<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>> {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
     {
       resource: "${x.table}",
       action: "${mapKindToAction(x.kind)}",
       args: { $where: param1 },
-      fields: param2?.fields,
+      fields: param2?.$fields as any,
       artifacts,
       context: param2?.context,
       skipCache: param2?.skipCache,
@@ -415,16 +497,17 @@ function getMethodSourceGetOne(x, findOnes, isTransaction) {
 }`;
 }
 function getMethodSourceGetList(x, isTransaction) {
-    return `async ${x.methodName}(
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
     param1: { $where?: ${x.typeWhereName}, $orderBy?: ${x.typeOrderByName}, $limit?: number },
-    param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }
-  ): Promise<Array<${x.typeReturnBaseName}>> {
+    param2?: SelectSubset<T, ${param2}>
+  ): Promise<Array<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>>> {
     return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
       {
         resource: "${x.table}",
         action: "${mapKindToAction(x.kind)}",
         args: param1,
-        fields: param2?.fields,
+        fields: param2?.$fields as any,
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
@@ -434,16 +517,17 @@ function getMethodSourceGetList(x, isTransaction) {
   }`;
 }
 function getMethodSourceGetListPaginated(x, isTransaction) {
-    return `async ${x.methodName}(
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
     param1: { $where?: ${x.typeWhereName}, $orderBy?: ${x.typeOrderByName}, $paginate: Paginate },
-    param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, skipCache?: boolean, context?: TContext }
-  ): Promise<ListPaginated<${x.typeReturnBaseName}>> {
+    param2?: SelectSubset<T, ${param2}>
+  ): Promise<ListPaginated<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>>> {
     return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
       {
         resource: "${x.table}",
         action: "${mapKindToAction(x.kind)}",
         args: param1,
-        fields: param2?.fields,
+        fields: param2?.$fields as any,
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
@@ -453,54 +537,57 @@ function getMethodSourceGetListPaginated(x, isTransaction) {
   }`;
 }
 function getMethodSourcePostOne(x, specialCaseUuidColumn, isTransaction) {
-    return `async ${x.methodName}(
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
     data: ${x.typeDataName},
-    param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }
-  ): Promise<${x.typeReturnBaseName}> {
+    param2?: SelectSubset<T, ${param2}>
+  ): Promise<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>> {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
     resource: "${x.table}",
     action: "${mapKindToAction(x.kind)}",
     data,
     artifacts,
-    fields: param2?.fields,
+    fields: param2?.$fields as any,
     context: {...param2?.context, specialCaseUuidColumn: ${JSON.stringify(specialCaseUuidColumn)}},
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
 }
 function getMethodSourcePatchOne(x, findOnes, isTransaction) {
-    return `async ${x.methodName}(
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
     param1: ${findOnes
         .map((findOne) => `{ ${findOne.name}: ${findOne.type}${findOne.nullable ? " | null" : ""} }`)
         .join(" | ")},
   data: ${x.typeDataName},
-  param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }
-): Promise<${x.typeReturnBaseName}> {
+  param2?: SelectSubset<T, ${param2}>
+): Promise<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>> {
 return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
   resource: "${x.table}",
   action: "${mapKindToAction(x.kind)}",
   args: { $where: param1 },
   data,
   artifacts,
-  fields: param2?.fields,
+  fields: param2?.$fields as any,
   context: param2?.context,
   ${isTransaction ? "dbCall" : ""}
 });
 }`;
 }
 function getMethodSourcePatchList(x, isTransaction) {
-    return `async ${x.methodName}(
-    param1: { $where?: ${x.typeWhereName} },
+    const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }`;
+    return `async ${x.methodName}<T extends ${param2}>(
+    param1: { $where?: ${x.typeWhereName}, $orderBy?: ${x.typeOrderByName} },
     data: ${x.typeDataName},
-    param2?: { fields?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }
-  ): Promise<Array<${x.typeReturnBaseName}>> {
+    param2?: SelectSubset<T, ${param2}>
+  ): Promise<Array<CheckSelect<T, ${getTypeReturnName(x.table)}, ${getTypeGetPayloadName(x.table)}<T>>>> {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
     resource: "${x.table}",
     action: "${mapKindToAction(x.kind)}",
     args: param1,
     data,
     artifacts,
-    fields: param2?.fields,
+    fields: param2?.$fields as any,
     context: param2?.context,
     ${isTransaction ? "dbCall" : ""}
   });
@@ -565,6 +652,12 @@ function mapKindToAction(kind) {
     }
     throw new Error(`Unhandled kind: ${kind}`);
 }
+function getTypeGetPayloadName(table) {
+    return "GetPayload" + changeCase.pascalCase(table);
+}
+function getTypeReturnName(table) {
+    return changeCase.pascalCase(table);
+}
 function getTypeReturnBaseName(table) {
     return "ReturnBase" + changeCase.pascalCase(table);
 }
@@ -660,6 +753,7 @@ async function getPatchListData(table) {
     const typeReturnBaseName = getTypeReturnBaseName(table);
     const typeWhereName = getTypeWhereName(table);
     const typeDataName = "DataPatch" + changeCase.pascalCase(table);
+    const typeOrderByName = getTypeOrderByName(table);
     return {
         kind: "patchList",
         table,
@@ -667,7 +761,8 @@ async function getPatchListData(table) {
         typeFieldsName,
         typeReturnBaseName,
         typeWhereName,
-        typeDataName
+        typeDataName,
+        typeOrderByName
     };
 }
 function getDeleteOneData(table) {
@@ -1071,8 +1166,8 @@ export type ListPaginated<T> = {
   paginationInfo: {
     hasPreviousPage?: boolean,
     hasNextPage?: boolean,
-    startCursor?: string | number,
-    endCursor?: string | number,
+    startCursor?: string,
+    endCursor?: string,
     totalCount: number,
   },
   results: Array<T>,
@@ -1090,53 +1185,46 @@ async function getTypeFields(table, name, includeMappedFields) {
     const mappedFields = includeMappedFields ? await getMappedFields(table) : [];
     const keyWhere = "$where";
     const keyOrderBy = "$orderBy";
-    const jsonSchemaFields = {
-        type: "array",
-        items: {
-            anyOf: [
-                {
-                    enum: scalarKeys.concat(mappedFields.map((x) => x.as))
-                },
-                ...relations.map((x) => {
-                    const argsProperties = x.type === "many-to-many"
-                        ? {
-                            [keyWhere]: {
-                                type: "object",
-                                properties: {
-                                    [x.table]: { tsType: getTypeWhereName(x.table) },
-                                    [x.junctionTable]: {
-                                        tsType: getTypeWhereName(x.junctionTable)
-                                    }
-                                },
-                                additionalProperties: false
-                            }
+    let properties = {};
+    for (let x of scalarKeys) {
+        properties[x] = { type: "boolean" };
+    }
+    for (let x of mappedFields) {
+        properties[x.as] = { type: "boolean" };
+    }
+    for (let x of relations) {
+        const argsProperties = x.type === "many-to-many"
+            ? {
+                [keyWhere]: {
+                    type: "object",
+                    properties: {
+                        [x.table]: { tsType: getTypeWhereName(x.table) },
+                        [x.junctionTable]: {
+                            tsType: getTypeWhereName(x.junctionTable)
                         }
-                        : { [keyWhere]: { tsType: getTypeWhereName(x.table) } };
-                    // $orderBy only makes sense for a list
-                    if (x.grabMany) {
-                        argsProperties[keyOrderBy] = {
-                            tsType: getTypeOrderByName(x.table)
-                        };
-                    }
-                    return {
-                        type: "object",
-                        properties: {
-                            name: { enum: [x.name] },
-                            as: { type: "string" },
-                            fields: { tsType: getTypeFieldsName(x.table) },
-                            args: {
-                                type: "object",
-                                properties: argsProperties,
-                                additionalProperties: false
-                            },
-                            transform: { tsType: `(x: any) => any` }
-                        },
-                        additionalProperties: false,
-                        required: ["name", "fields"]
-                    };
-                })
-            ]
+                    },
+                    additionalProperties: false
+                }
+            }
+            : { [keyWhere]: { tsType: getTypeWhereName(x.table) } };
+        // $orderBy only makes sense for a list
+        if (x.grabMany) {
+            argsProperties[keyOrderBy] = {
+                tsType: getTypeOrderByName(x.table)
+            };
         }
+        argsProperties[keyFields] = { tsType: getTypeFieldsName(x.table) };
+        const jsonSchemaArgs = {
+            type: "object",
+            properties: argsProperties,
+            additionalProperties: false
+        };
+        properties[x.name] = { enum: [{ type: "boolean" }, jsonSchemaArgs] };
+    }
+    const jsonSchemaFields = {
+        type: "object",
+        additionalProperties: false,
+        properties
     };
     let type = await (0, json_schema_to_typescript_1.compile)(jsonSchemaFields, name, json2TsOpts);
     const fieldImports = _.uniq(relations.filter((x) => x.table !== table).map((x) => getTypeFieldsName(x.table)));
@@ -1285,7 +1373,8 @@ async function getArtifacts(tables, includeMappedFields, specialCaseUuidColumn)
                 name: x.as,
                 nullable: x.nullable,
                 // TODO
-                hasDefaultValue: false
+                hasDefaultValue: false,
+                mapped: true
             });
         }
         for (let x of relationInfo) {
@@ -1293,7 +1382,8 @@ async function getArtifacts(tables, includeMappedFields, specialCaseUuidColumn)
                 kind: "object",
                 type: x.table,
                 name: x.name,
-                isList: x.grabMany
+                isList: x.grabMany,
+                nullable: x.type === "one-to-many__many-to-one" ? x.nullable : false
             });
         }
         return {
@@ -1542,7 +1632,7 @@ const getTableMeta = _.memoize(async function getTableMeta(table) {
     if (dialect === "mysql") {
         return query("DESCRIBE ??", [table]).then((xs) => _.sortBy((x) => x.Field, xs));
     }
-    if (dialect === "mssql" || dialect === "ksql") {
+    if (dialect === "mssql") {
         const primaryColumn = await query(`SELECT columns.name as COLUMN_NAME
           FROM sys.tables tables
           JOIN sys.columns columns
@@ -1746,7 +1836,7 @@ async function getTableNames() {
     if (dialect === "mysql") {
         return query("SHOW TABLES").then((xs) => xs.flatMap((x) => Object.values(x)).sort());
     }
-    if (dialect === "mssql" || dialect === "ksql") {
+    if (dialect === "mssql") {
         return query("SELECT * FROM INFORMATION_SCHEMA.TABLES").then((xs) => xs
             .map((x) => x["TABLE_NAME"])
             .filter((x) => !x.startsWith("dbo_") && !mssqlTableExcludes.has(x))

package/dist/runtime/IRuntime.d.ts

@@ -13,11 +13,11 @@ export declare type TAction = "findUnique" | "findMany" | "findManyPaginated" |
 export declare type TResolveParams = {
     resource: string;
     action: TAction;
-    args?: IArgs | undefined;
+    args?: IArgs;
     data?: any;
     artifacts: IArtifacts;
-    fields?: IField[] | undefined;
-    context?: TContext | undefined;
+    fields?: TSelect;
+    context?: TContext;
     skipCache?: boolean;
     dbCall?: TDbCall;
 };
@@ -25,7 +25,7 @@ export declare type TContext = {
     [k: string]: any;
 };
 export declare type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
-export declare type IDialect = "mysql" | "mssql" | "ksql" | "sqlite";
+export declare type IDialect = "mysql" | "mssql" | "sqlite";
 export declare type TDbCall = (q: string) => Promise<any>;
 export declare type TFormatQuery = (q: string, values: any[]) => string;
 export declare type TBeginTransaction = () => Promise<TBeginTransactionResult>;
@@ -42,12 +42,10 @@ export declare type IOrderBy = {
 export declare type IArgs = {
     [k: string]: any;
 };
-export declare type IField = string | {
-    name: string;
-    as?: string;
-    fields: IField[];
-    args?: IArgs;
-    transform?: (record: any) => any;
+export declare type TSelect = {
+    [k: string]: boolean | {
+        $fields?: TSelect;
+    };
 };
 declare type IWhere = (table: string, args: IArgs) => string | undefined;
 declare type IASTChildColumn = {
@@ -55,14 +53,14 @@ declare type IASTChildColumn = {
     name: string;
     fieldName: string;
     as: string;
-    fromOtherTable?: string | undefined;
+    fromOtherTable?: string;
 };
 declare type IASTChildComposite = {
     type: "composite";
     name: string[];
     fieldName: string;
     as: string;
-    fromOtherTable?: string | undefined;
+    fromOtherTable?: string;
 };
 declare type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
 declare type ISqlBatch = {
@@ -88,7 +86,7 @@ declare type IJunction = {
 export declare type IGetSQLASTInput = {
     table: string;
     fieldName: string;
-    fields: IField[];
+    fields: TSelect;
     args?: IArgs;
     where?: IWhere;
     sqlJoin?: ISqlJoin;
@@ -96,7 +94,7 @@ export declare type IGetSQLASTInput = {
     junction?: IJunction;
     grabMany: boolean;
     getWhere: (table: string, args: any, dialect: IDialect, orderBy?: IOrderBy | undefined, rowWithMatchingCursor?: any) => string | null;
-    orderBy?: IOrderBy | undefined;
+    orderBy?: IOrderBy;
     rowWithMatchingCursor?: any;
     artifacts: IArtifacts;
     dialect: IDialect;
@@ -173,6 +171,7 @@ export declare type TField = {
     name: string;
     nullable: boolean;
     hasDefaultValue: boolean;
+    mapped?: true;
 } | {
     kind: "enum";
     values: unknown[];
@@ -183,5 +182,6 @@ export declare type TField = {
     type: string;
     name: string;
     isList: boolean;
+    nullable: boolean;
 };
 export {};