@technicity/data-service-generator 0.11.0-next.2 → 0.11.0

package/README.md

@@ -44,3 +44,10 @@ async function main() {
 | port          | No       | 3306 \| 1433 | Database port. Defaults to 3306 for MySQL, 1433 for SQL Server. |
 | tables        | No       |              | An array of database tables to process (allowlist).             |
 | excludeTables | No       |              | An array of database tables to not process (denylist).          |
+
+### Running Tests
+
+- spin up test environment: `docker-compose up -d`
+- run tests: `docker-compose exec test yarn test`
+
+- `yarn test:prepare`

package/dist/runtime/Cache.d.ts

@@ -16,5 +16,6 @@ declare class Cache {
     insert(key: string, payload: any): Promise<void>;
     read(key: string): Promise<any>;
     purge(...uuids: string[]): Promise<void>;
+    shutdown(): Promise<void>;
 }
 export default Cache;

package/dist/runtime/Cache.js

@@ -91,5 +91,8 @@ class Cache {
             ];
         });
     }
+    async shutdown() {
+        await this.client.disconnect();
+    }
 }
 exports.default = Cache;

package/dist/runtime/RuntimeMySQL.js

@@ -83,6 +83,9 @@ class RuntimeMySQL {
         return (0, shared_1._prepareWhere)(artifacts, table, data, this.dbCall.bind(this), this.formatQuery.bind(this));
     }
     async $shutdown() {
+        if (__classPrivateFieldGet(this, _RuntimeMySQL_clientCache, "f")) {
+            await __classPrivateFieldGet(this, _RuntimeMySQL_clientCache, "f").shutdown();
+        }
         await __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").endPool();
     }
     dbCall(q) {

package/dist/runtime/lib/shared.js

@@ -44,12 +44,13 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
 exports.resolve = resolve;
 function _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache) {
     switch (input.action) {
-        case "findUnique":
         case "findMany":
-        case "findManyPaginated":
             return cache && !input.skipCache ?
                 getCached(input, dbCall, formatQuery, dialect, cache) :
                 getData(input, dbCall, formatQuery, dialect);
+        case "findUnique":
+        case "findManyPaginated":
+            return getData(input, dbCall, formatQuery, dialect);
         case "create":
             return create(input, dbCall, formatQuery, beginTransaction, dialect, context);
         case "update":
@@ -274,11 +275,25 @@ async function getCached(input, dbCall, formatQuery, dialect, cache) {
     if (cached) {
         if (stats)
             done(stats.updateStats, "get_redis");
-        results = cache;
+        results = cached;
     }
     else {
-        ensureUuidSelect(input);
+        const remove = ensureUuidSelect(input);
         results = await getData(input, dbCall, formatQuery, dialect);
+        if (!Array.isArray(results)) {
+            if ("results" in results)
+                results = results.results;
+            else {
+                throw new Error("Bad result returned by getData in SDK.");
+            }
+        }
+        for (const result of results)
+            for (const path of remove) {
+                let data = result;
+                for (const key of path)
+                    data = data[key];
+                // delete data.uuid;
+            }
         cache.insert(request, results);
         if (stats)
             done(stats.updateStats, "get_mysql");
@@ -289,20 +304,25 @@ async function getCached(input, dbCall, formatQuery, dialect, cache) {
 }
 function ensureUuidSelect(input) {
     const { resource, artifacts } = input;
+    const remove = [];
     ensure(resource, input);
-    function ensure(type, input) {
+    function ensure(type, input, path = []) {
         const { scalarFields, relationFields } = artifacts[type];
         if (!scalarFields.includes("uuid"))
             return;
-        const fields = input.fields;
-        if (!fields.includes("uuid"))
+        const fields = input.fields || [];
+        if (!fields.includes("uuid")) {
+            remove.push(path);
             fields.unshift("uuid");
+        }
         for (const field of fields)
             if (typeof field == "object") {
-                const { table } = relationFields[field.name];
-                ensure(table, field);
+                const { name } = field;
+                const { table } = relationFields[name];
+                ensure(table, field, path.concat(name));
             }
     }
+    return remove;
 }
 function wrapListPaginationLimitOffset(data, totalCount) {
     return { paginationInfo: { totalCount }, results: data };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.11.0-next.2",
+  "version": "0.11.0",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -9,10 +9,13 @@
     "compile": "rm -rf dist && tsc",
     "publish:next": "npm version prerelease --preid next",
     "preversion": "npm run compile",
+    "postversion": "npm publish",
+    "reset": "docker-compose rm -svf mysql57 && docker-compose up -d mysql57",
+    "test:docker": "docker-compose exec test yarn test:sdk",
     "generate": "npm run compile && concurrently \"node ./test/mysql/generate.js\" \"node ./test/mysql8/generate.js\"",
     "test": "npm run generate && mocha ./test/addNullFallbacks.test.js && mocha ./test/stringifyWhere.test.js && npm run test:sdk",
     "test:prepare": "docker-compose down --volumes && docker-compose up -d --build",
-    "test:sdk": "mocha ./test/test.js"
+    "test:sdk": "mocha --inspect=0.0.0.0:9229 ./test/test.js"
   },
   "dependencies": {
     "bluebird": "^3.7.2",