@technicity/data-service-generator 0.6.0 → 0.6.1

package/dist/runtime/RuntimeKSQL.d.ts

@@ -5,6 +5,8 @@ export declare class RuntimeKSQL implements IRuntime {
     #private;
     constructor(clientOpts: ConstructorParameters<typeof KSQL>[0], otherOpts: {
         getBaseTableName: TGetTableName;
+        getMaterializedViewName: TGetTableName;
+        doNotUseMaterializedViews?: boolean;
         _dbCall: TDbCall;
     }, artifacts: IArtifacts);
     resolve(input: TResolveParams): Promise<any>;

package/dist/runtime/RuntimeKSQL.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _RuntimeKSQL_ksql, _RuntimeKSQL_middlewareHandler, _RuntimeKSQL_dbCall, _RuntimeKSQL_formatQuery, _RuntimeKSQL_getBaseTableName;
+var _RuntimeKSQL_ksql, _RuntimeKSQL_middlewareHandler, _RuntimeKSQL_dbCall, _RuntimeKSQL_formatQuery, _RuntimeKSQL_getBaseTableName, _RuntimeKSQL_getMaterializedViewName, _RuntimeKSQL_doNotUseMaterializedViews;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeKSQL = void 0;
 const SqlString = require("sqlstring");
@@ -30,14 +30,20 @@ class RuntimeKSQL {
         _RuntimeKSQL_dbCall.set(this, void 0);
         _RuntimeKSQL_formatQuery.set(this, void 0);
         _RuntimeKSQL_getBaseTableName.set(this, void 0);
+        _RuntimeKSQL_getMaterializedViewName.set(this, void 0);
+        _RuntimeKSQL_doNotUseMaterializedViews.set(this, void 0);
         __classPrivateFieldSet(this, _RuntimeKSQL_ksql, new ksql_1.KSQL(clientOpts ?? {}), "f");
         __classPrivateFieldSet(this, _RuntimeKSQL_middlewareHandler, new shared_1.MiddlewareHandler(), "f");
-        __classPrivateFieldSet(this, _RuntimeKSQL_dbCall, otherOpts._dbCall ?? __classPrivateFieldGet(this, _RuntimeKSQL_ksql, "f").streamQuery.bind(__classPrivateFieldGet(this, _RuntimeKSQL_ksql, "f")), "f");
+        __classPrivateFieldSet(this, _RuntimeKSQL_dbCall, typeof otherOpts._dbCall === "function"
+            ? (q) => otherOpts._dbCall(q).then(mapResult)
+            : (q) => __classPrivateFieldGet(this, _RuntimeKSQL_ksql, "f").streamQuery(q).then(mapResult), "f");
         __classPrivateFieldSet(this, _RuntimeKSQL_getBaseTableName, otherOpts.getBaseTableName, "f");
+        __classPrivateFieldSet(this, _RuntimeKSQL_getMaterializedViewName, otherOpts.getMaterializedViewName, "f");
+        __classPrivateFieldSet(this, _RuntimeKSQL_doNotUseMaterializedViews, otherOpts.doNotUseMaterializedViews ?? false, "f");
         __classPrivateFieldSet(this, _RuntimeKSQL_formatQuery, SqlString.format.bind(SqlString), "f");
     }
     async resolve(input) {
-        return resolve(input, __classPrivateFieldGet(this, _RuntimeKSQL_dbCall, "f").bind(this), __classPrivateFieldGet(this, _RuntimeKSQL_formatQuery, "f").bind(this), __classPrivateFieldGet(this, _RuntimeKSQL_middlewareHandler, "f"), __classPrivateFieldGet(this, _RuntimeKSQL_getBaseTableName, "f"));
+        return resolve(input, __classPrivateFieldGet(this, _RuntimeKSQL_dbCall, "f").bind(this), __classPrivateFieldGet(this, _RuntimeKSQL_formatQuery, "f").bind(this), __classPrivateFieldGet(this, _RuntimeKSQL_middlewareHandler, "f"), __classPrivateFieldGet(this, _RuntimeKSQL_getBaseTableName, "f"), __classPrivateFieldGet(this, _RuntimeKSQL_getMaterializedViewName, "f"), __classPrivateFieldGet(this, _RuntimeKSQL_doNotUseMaterializedViews, "f"));
     }
     async $queryRaw(sql, values) {
         return __classPrivateFieldGet(this, _RuntimeKSQL_dbCall, "f").call(this, SqlString.format(sql, values ?? []));
@@ -53,8 +59,8 @@ class RuntimeKSQL {
     }
 }
 exports.RuntimeKSQL = RuntimeKSQL;
-_RuntimeKSQL_ksql = new WeakMap(), _RuntimeKSQL_middlewareHandler = new WeakMap(), _RuntimeKSQL_dbCall = new WeakMap(), _RuntimeKSQL_formatQuery = new WeakMap(), _RuntimeKSQL_getBaseTableName = new WeakMap();
-async function resolve(input, dbCall, formatQuery, middlewareHandler, getBaseTableName) {
+_RuntimeKSQL_ksql = new WeakMap(), _RuntimeKSQL_middlewareHandler = new WeakMap(), _RuntimeKSQL_dbCall = new WeakMap(), _RuntimeKSQL_formatQuery = new WeakMap(), _RuntimeKSQL_getBaseTableName = new WeakMap(), _RuntimeKSQL_getMaterializedViewName = new WeakMap(), _RuntimeKSQL_doNotUseMaterializedViews = new WeakMap();
+async function resolve(input, dbCall, formatQuery, middlewareHandler, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews) {
     // https://github.com/prisma/prisma/blob/822198e5ba21535364d20c86901b8c3778ebf6a3/packages/client/src/runtime/getPrismaClient.ts#L1087
     let index = -1;
     if (middlewareHandler.length() > 0) {
@@ -66,21 +72,21 @@ async function resolve(input, dbCall, formatQuery, middlewareHandler, getBaseTab
                 return nextMiddleware(paramsMaybeMutated, consumer);
             }
             const paramsChanged = { ...input, ...params };
-            return _resolve(paramsChanged, dbCall, formatQuery, getBaseTableName);
+            return _resolve(paramsChanged, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
         };
         return resource.runInAsyncScope(() => consumer(params));
     }
-    return _resolve(input, dbCall, formatQuery, getBaseTableName);
+    return _resolve(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
 }
-function _resolve(input, dbCall, formatQuery, getBaseTableName) {
+function _resolve(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews) {
     if (input.action === "findUnique") {
-        return getData(input, dbCall, formatQuery, getBaseTableName);
+        return getData(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
     }
     if (input.action === "findMany") {
-        return getData(input, dbCall, formatQuery, getBaseTableName);
+        return getData(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
     }
     if (input.action === "findManyPaginated") {
-        return getData(input, dbCall, formatQuery, getBaseTableName);
+        return getData(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
     }
     if (input.action === "create") {
         throw new Error("Not implemented.");
@@ -99,34 +105,46 @@ function _resolve(input, dbCall, formatQuery, getBaseTableName) {
     }
     throw new Error("Invalid action: " + input.action);
 }
-async function getData(input, dbCall, formatQuery, getBaseTableName) {
+async function getData(input, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews) {
     const { action } = input;
     const grabMany = action === "findMany" ||
         action === "findManyPaginated" ||
         action === "updateMany" ||
         action === "deleteMany";
-    const data = await _getData(input, grabMany, dbCall, formatQuery, getBaseTableName);
+    const data = await _getData(input, grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews);
     if (data == null && !grabMany) {
         throw new SDKNotFoundError_1.SDKNotFoundError();
     }
-    // We only need to remove extra keys if input.fields isn't
-    // specified, since otherwise there wouldn't be extra keys
-    const shouldRemoveExtraKeys = input.fields != null;
+    const scalarFields = input.artifacts[input.resource].scalarFields;
     if (action === "findManyPaginated" && data?.results != null) {
-        (0, shared_1.postProcess)(data.results, input.fields ?? [], shouldRemoveExtraKeys);
+        (0, shared_1.postProcess)(data.results, input.fields ?? scalarFields, true);
     }
     else {
-        (0, shared_1.postProcess)(data, input.fields ?? [], shouldRemoveExtraKeys);
+        (0, shared_1.postProcess)(data, input.fields ?? scalarFields, true);
     }
     return data;
 }
-async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName) {
+async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews) {
     const { resource: table, artifacts, args, action } = input;
     const tableArtifacts = artifacts[table];
+    const isInputFieldAnArray = Array.isArray(input.fields);
     let fields = input.fields;
     if (!Array.isArray(fields)) {
         fields = tableArtifacts.scalarFields;
     }
+    let useMaterializedView = !doNotUseMaterializedViews &&
+        // If fields isn't an array, we're only getting scalar fields,
+        // so no point using the materialized view.
+        isInputFieldAnArray &&
+        // We're getting relation fields
+        fields.some((x) => typeof x === "object") &&
+        Object.values(tableArtifacts.relationFields).filter((x) => x.type === "one-to-many__many-to-one" && x.kind === "many-to-one").length > 0 &&
+        !Object.values(tableArtifacts.relationFields).some((x) => x.type === "one-to-many__many-to-one" &&
+            x.kind === "many-to-one" &&
+            x.nullable === true);
+    const getTableName = useMaterializedView
+        ? getMaterializedViewName
+        : getBaseTableName;
     let where = undefined;
     if (args?.$where != null) {
         let argsMapped = args;
@@ -136,7 +154,7 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName)
         }
         const whereResult = (0, stringifyWhere_1.stringifyWhere)({
             where: argsMapped.$where,
-            table: escapeId(getBaseTableName(table)),
+            table: escapeId(getTableName(table)),
             dialect: "mysql",
             args: argsMapped,
         });
@@ -161,15 +179,19 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName)
             }
         }
         else {
-            relationFields.push(x);
             const relationField = tableArtifacts.relationFields?.[x.name];
-            if (relationField != null) {
-                if (relationField.type === "one-to-many__many-to-one" &&
-                    !columns.includes(relationField.relation.foreignKey)) {
+            if (relationField == null) {
+                throw new Error(`Invalid relation field: ${x.name}`);
+            }
+            if (relationField.type === "one-to-many__many-to-one") {
+                relationFields.push(x);
+                if (!columns.includes(relationField.relation.foreignKey)) {
                     columns.push(relationField.relation.foreignKey);
                 }
-                else if (relationField.type === "many-to-many" &&
-                    !columns.includes(relationField.relations[0].referencedKey)) {
+            }
+            else if (relationField.type === "many-to-many") {
+                relationFields.push(x);
+                if (!columns.includes(relationField.relations[0].referencedKey)) {
                     columns.push(relationField.relations[0].referencedKey);
                 }
             }
@@ -181,7 +203,25 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName)
             columns.push(tableArtifacts.primaryKey);
         }
     }
-    let s = formatQuery(`SELECT ?? FROM ??`, [columns, getBaseTableName(table)]);
+    if (useMaterializedView) {
+        relationFields = relationFields.filter((x) => {
+            if (typeof x === "string") {
+                return true;
+            }
+            const relationField = tableArtifacts.relationFields?.[x.name];
+            if (relationField == null) {
+                throw new Error(`Invalid relation field: ${x.name}`);
+            }
+            // Since we're going to use the materialized view,
+            // filter out non-nullable many-to-one relations.
+            return !(relationField.type === "one-to-many__many-to-one" &&
+                relationField.kind === "many-to-one" &&
+                relationField.nullable === false);
+        });
+    }
+    let s = useMaterializedView
+        ? formatQuery(`SELECT * FROM ??`, [getTableName(table)])
+        : formatQuery(`SELECT ?? FROM ??`, [columns, getTableName(table)]);
     if (where) {
         s += ` WHERE ${where}`;
     }
@@ -215,7 +255,7 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName)
             result = _.orderBy(result, orderBy.map((x) => x.column), orderBy.map((x) => x.direction));
             if (action === "findManyPaginated") {
                 result = paginate(result, args, tableArtifacts.primaryKey, action);
-                return Promise.all(result.results.map((x) => resolveDependentFields(table, x, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName).then((xx) => mergeSubResults(x, xx)))).then((xx) => {
+                return Promise.all(result.results.map((x) => resolveDependentFields(table, x, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => mergeSubResults(x, xx)))).then((xx) => {
                     result.results = xx;
                     return result;
                 });
@@ -224,12 +264,12 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName)
             if (typeof limit === "number") {
                 result = result.slice(0, limit);
             }
-            return Promise.all(result.map((x) => resolveDependentFields(table, x, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName).then((xx) => mergeSubResults(x, xx))));
+            return Promise.all(result.map((x) => resolveDependentFields(table, x, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => mergeSubResults(x, xx))));
         }
-        return resolveDependentFields(table, result, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName).then((xx) => mergeSubResults(result, xx));
+        return resolveDependentFields(table, result, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => mergeSubResults(result, xx));
     });
 }
-async function resolveDependentFields(table, parentData, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName) {
+async function resolveDependentFields(table, parentData, mappedFields, relationFields, artifacts, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews) {
     const tableArtifacts = artifacts[table];
     return Promise.all([]
         .concat(mappedFields.map((x) => {
@@ -305,7 +345,7 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                     fields: x.fields,
                     artifacts,
                     action: relationField.grabMany ? "findMany" : "findUnique",
-                }, relationField.grabMany, dbCall, formatQuery, getBaseTableName).then((xx) => ({ [x.as ?? x.name]: xx }));
+                }, relationField.grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => ({ [x.as ?? x.name]: xx }));
             });
         }
         if (relationField.type === "one-to-many__many-to-one") {
@@ -328,7 +368,7 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                 fields: x.fields,
                 artifacts,
                 action: relationField.grabMany ? "findMany" : "findUnique",
-            }, relationField.grabMany, dbCall, formatQuery, getBaseTableName).then((xx) => ({ [x.as ?? x.name]: xx }));
+            }, relationField.grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => ({ [x.as ?? x.name]: xx }));
         }
         throw new Error(`Invalid relationField.type`);
     })));
@@ -386,3 +426,13 @@ function paginate(data, args, primaryKey, action) {
     }
     throw new Error(`Invalid pagination action: ${action}`);
 }
+function mapResult(data) {
+    return data.map((x) => {
+        for (let k of Object.keys(x)) {
+            if (typeof x[k] === "string" && (k === "uuid" || k.endsWith("Uuid"))) {
+                x[k] = x[k].toLocaleLowerCase();
+            }
+        }
+        return x;
+    });
+}

package/package.json

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