@technicity/data-service-generator 0.12.3 → 0.13.25

package/dist/runtime/lib/stringifyWhere.test.js

@@ -0,0 +1,236 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const strict_1 = __importDefault(require("node:assert/strict"));
+const stringifyWhere_1 = require("./stringifyWhere");
+(0, globals_1.describe)("stringifyWhere", () => {
+    const table = "Usr";
+    const dialect = "mysql";
+    const args = {};
+    (0, globals_1.test)("should work", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: 2, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` = 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle empty object", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({ where: {}, table, dialect, args });
+        strict_1.default.deepEqual(result, "");
+    });
+    (0, globals_1.test)("should handle $and", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { $and: [{ valid: true }, { text: "foo" }] },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(Usr.`valid` = 1 AND Usr.`text` = 'foo')");
+    });
+    (0, globals_1.test)("should handle $or", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { $or: [{ valid: true }, { text: "foo" }] },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(Usr.`valid` = 1 OR Usr.`text` = 'foo')");
+    });
+    (0, globals_1.test)("should handle null", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: null },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` IS NULL");
+    });
+    (0, globals_1.test)("should handle $neq", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $neq: 2 }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` != 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $gt", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $gt: 2 }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` > 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $gte", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $gte: 2 }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` >= 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $lt", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $lt: 2 }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` < 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $lte", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $lte: 2 }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` <= 2 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $like", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { text: { $like: "%foo%" } },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`text` LIKE '%foo%'");
+    });
+    (0, globals_1.test)("should handle $nlike", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { text: { $nlike: "%foo%" } },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`text` NOT LIKE '%foo%'");
+    });
+    (0, globals_1.test)("should handle $in", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $in: [1, 2] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` IN (1,2) AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle empty $in", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $in: [] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(1=0) AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $nin", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $nin: [1, 2] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` NOT IN (1,2) AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle empty $nin", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $nin: [] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(1=1) AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $btwn", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $btwn: [1, 20] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` BETWEEN 1 AND 20 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle $nbtwn", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $nbtwn: [1, 20] }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` NOT BETWEEN 1 AND 20 AND Usr.`text` = 'foo'");
+    });
+    (0, globals_1.test)("should handle nested $and and $or", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: {
+                $and: [
+                    { userId: { $gt: 2 } },
+                    { $or: [{ text: { $like: "foo" } }, { text: { $like: "bar" } }] },
+                    { $and: [{ lala: "lala" }, { oioi: "oioi" }] }
+                ]
+            },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(Usr.`userId` > 2 AND (Usr.`text` LIKE 'foo' OR Usr.`text` LIKE 'bar') AND (Usr.`lala` = 'lala' AND Usr.`oioi` = 'oioi'))");
+    });
+    (0, globals_1.test)("should throw on invalid operator", () => {
+        strict_1.default.throws(() => (0, stringifyWhere_1.stringifyWhere)({
+            where: { foo: { $foo: 3 } },
+            table,
+            dialect,
+            args
+        }), (error) => {
+            (0, strict_1.default)(error instanceof Error);
+            (0, strict_1.default)(error.message.startsWith("Invalid operator:"));
+            return true;
+        });
+    });
+    (0, globals_1.test)("should throw on more than 1 key for $and", () => {
+        strict_1.default.throws(() => (0, stringifyWhere_1.stringifyWhere)({
+            where: { $and: [{ foo: "bar" }, { bar: "baz" }], foo: "bar" },
+            table,
+            dialect,
+            args
+        }), (error) => {
+            (0, strict_1.default)(error instanceof Error);
+            (0, strict_1.default)(error.message.startsWith("Must have 1 key:"));
+            return true;
+        });
+    });
+    (0, globals_1.test)("ignores undefined values", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { $or: [{ foo: "bar" }, { bar: null }, { baz: undefined }] },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "(Usr.`foo` = 'bar' OR Usr.`bar` IS NULL)");
+    });
+    (0, globals_1.test)("handles empty $and", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { $and: [] },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "");
+    });
+    (0, globals_1.test)("handles empty $or", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { $or: [] },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "");
+    });
+});

package/dist/runtime/lib/typeCastMSSQL.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeCastMSSQL = void 0;
-const mssql = require("mssql");
+const mssql = __importStar(require("mssql"));
 // TODO: see https://github.com/tediousjs/node-mssql/pull/1171
 function typeCastMSSQL(customTypeCast) {
     return function (result, meta) {

package/dist/traverseFieldArgs.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/traverseFieldArgs.test.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const strict_1 = __importDefault(require("node:assert/strict"));
+const _1 = require(".");
+const addWhereValidTrue_1 = require("../test/addWhereValidTrue");
+(0, globals_1.describe)("traverseFieldArgs", () => {
+    (0, globals_1.test)("should work", () => {
+        const fields = [
+            "id",
+            "uuid",
+            {
+                name: "business",
+                fields: ["id", "uuid", "name"]
+            },
+            {
+                name: "sessionList",
+                fields: ["id", "archived", { name: "fooList", fields: ["id", "uuid"] }],
+                args: {
+                    $where: { archived: false },
+                    $orderBy: { id: "desc" }
+                }
+            },
+            {
+                name: "usrList",
+                fields: ["firstName", "lastName", "password"],
+                args: {
+                    $where: { valid: false, archived: false },
+                    $orderBy: { id: "desc" }
+                }
+            }
+        ];
+        (0, _1.traverseFieldArgs)(fields, addWhereValidTrue_1.addWhereValidTrue);
+        strict_1.default.deepEqual(fields, [
+            "id",
+            "uuid",
+            {
+                name: "business",
+                fields: ["id", "uuid", "name"],
+                args: { $where: { valid: true } }
+            },
+            {
+                name: "sessionList",
+                fields: [
+                    "id",
+                    "archived",
+                    {
+                        name: "fooList",
+                        fields: ["id", "uuid"],
+                        args: { $where: { valid: true } }
+                    }
+                ],
+                args: {
+                    $where: { valid: true, archived: false },
+                    $orderBy: { id: "desc" }
+                }
+            },
+            {
+                name: "usrList",
+                fields: ["firstName", "lastName", "password"],
+                args: {
+                    // Should not be overwritten
+                    $where: { valid: false, archived: false },
+                    $orderBy: { id: "desc" }
+                }
+            }
+        ]);
+    });
+});

package/package.json

@@ -1,22 +1,19 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.12.3",
+  "version": "0.13.25",
   "main": "./dist/index.js",
   "files": [
     "dist"
   ],
   "scripts": {
-    "compile": "rm -rf dist && tsc",
+    "compile": "rm -rf dist && tsc && cp -r dist/src/* dist && rm -rf dist/src && rm -rf dist/test",
     "publish:next": "npm version prerelease --preid next",
     "preversion": "npm run compile",
-    "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 --inspect=0.0.0.0:9229 ./test/test.js"
+    "test": "jest ./test/test.ts",
+    "test:unit": "jest ./src"
   },
   "dependencies": {
+    "better-sqlite3": "^8.1.0",
     "bluebird": "^3.7.2",
     "change-case": "^4.1.1",
     "fs-extra": "10.0.0",
@@ -31,21 +28,25 @@
     "mysql": "^2.18.1",
     "prettier": "^2.1.2",
     "sqlstring": "^2.3.2",
+    "sqlstring-sqlite": "^0.1.1",
     "tsqlstring": "^1.0.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@jest/globals": "^29.4.3",
+    "@swc/core": "^1.3.36",
+    "@swc/jest": "^0.2.24",
+    "@types/better-sqlite3": "^7.6.3",
     "@types/fs-extra": "9.0.13",
     "@types/lodash": "4.14.177",
     "@types/mssql": "^6.0.7",
-    "@types/node": "14.17.9",
+    "@types/node": "^18.14.1",
     "@types/prettier": "^2.1.5",
     "@types/sqlstring": "^2.2.1",
     "@types/uuid": "^8.3.1",
-    "concurrently": "^7.1.0",
-    "env-cmd": "^10.1.0",
-    "mocha": "9.1.3",
+    "jest": "^29.4.3",
     "sinon": "12.0.1",
+    "testcontainers": "^9.1.3",
     "typescript": "4.6.4"
   }
 }

package/dist/getFakeData.d.ts

@@ -1,12 +0,0 @@
-import { type IArtifacts } from "./runtime/IRuntime";
-export declare function getFakeData(input: {
-    model: string;
-    select?: unknown[];
-    isList: boolean;
-    artifacts: IArtifacts;
-    operation: string | null;
-}): {
-    [k: string]: unknown;
-} | {
-    [k: string]: unknown;
-}[];

package/dist/getFakeData.js

@@ -1,90 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFakeData = void 0;
-function getFakeData(input) {
-    const { model, select, isList, artifacts, operation } = input;
-    const tableMeta = artifacts[model];
-    if (tableMeta === void 0) {
-        throw new Error(`Model ${model} not found.`);
-    }
-    const { fields } = tableMeta;
-    let data = {};
-    if (select == null) {
-        data = fields.reduce((acc, x) => {
-            if (x.kind === "scalar") {
-                acc[x.name] = getValue(x.type);
-                return acc;
-            }
-            else if (x.kind === "enum") {
-                acc[x.name] = x.values[0];
-                return acc;
-            }
-            return acc;
-        }, data);
-    }
-    else {
-        for (let x of select) {
-            if (!(typeof x === "string" || (typeof x === "object" && x != null))) {
-                throw new Error(`Invalid select: ${x}`);
-            }
-            const name = typeof x === "string" ? x : x.name;
-            const fieldName = x.as ?? name;
-            const field = fields.find((x) => x.name === name);
-            if (field == null) {
-                throw new Error(`Field not found: ${name}`);
-            }
-            if (field.kind === "scalar") {
-                data[fieldName] = getValue(field.type);
-            }
-            else if (field.kind === "enum") {
-                data[fieldName] = field.values[0];
-            }
-            else if (field.kind === "object") {
-                if (!(typeof x === "object" && x != null)) {
-                    throw new Error(`Invalid select: ${x}`);
-                }
-                data[fieldName] = getFakeData({
-                    model: field.type,
-                    select: x.fields,
-                    artifacts,
-                    isList: field.isList,
-                    // Only relevant at top-level
-                    operation: null
-                });
-            }
-            else {
-                throw new Error(`Unhandled kind: ${field?.kind}`);
-            }
-        }
-    }
-    let out = isList ? [data] : data;
-    if (typeof operation === "string" && operation.endsWith("Paginated")) {
-        out = {
-            paginationInfo: {
-                hasPreviousPage: false,
-                hasNextPage: false,
-                startCursor: "STUB",
-                endCursor: "STUB",
-                totalCount: 1
-            },
-            results: out
-        };
-    }
-    return out;
-}
-exports.getFakeData = getFakeData;
-function getValue(type) {
-    if (type === "boolean") {
-        return true;
-    }
-    if (type === "number") {
-        return 54.9434;
-    }
-    if (type === "integer") {
-        return 4;
-    }
-    if (type === "string") {
-        return "foo";
-    }
-    throw new Error(`Unhandled type: ${type}`);
-}

package/dist/getIsList.d.ts

@@ -1 +0,0 @@
-export declare function getIsList(operation: string): boolean;

package/dist/getIsList.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsList = void 0;
-function getIsList(operation) {
-    return operation.endsWith("Paginated") || operation.endsWith("Many");
-}
-exports.getIsList = getIsList;