@technicity/data-service-generator 0.7.1 → 0.8.1

package/dist/generation/generate.js

@@ -15,7 +15,7 @@ const TSqlString = require("tsqlstring");
 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 MySQL_1 = require("../runtime/lib/MySQL");
 // 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
@@ -108,6 +108,7 @@ async function generate(input) {
             fs.writeFileSync(path.join(typesDirPath, x.typeDataName + ".ts"), x.typeData);
         }
     }
+    fs.writeFileSync(path.join(typesDirPath, "index.ts"), getTypeTypesIndex(data));
     fs.writeFileSync(path.join(tmpDirPath, "package.json"), JSON.stringify(packageJSON, null, 2));
     fs.writeFileSync(path.join(tmpDirPath, "tsconfig.json"), JSON.stringify(tsConfigJSON, null, 2));
     fse.copySync(__dirname, path.join(tmpDirPath, "src"));
@@ -116,7 +117,7 @@ async function generate(input) {
     const sdkOutputPath = path.join(outdir, "sdk-ts");
     const nccVersion = "^0.33.0";
     child_process.execSync("npm i", { cwd: tmpDirPath, stdio: "inherit" });
-    child_process.execSync(`npx -p @vercel/ncc@${nccVersion} ncc build ./${sdkFilename} -o ${tmpBuildOutputPath} -e ./artifacts`, { cwd: tmpDirPath, stdio: "inherit" });
+    child_process.execSync(`npx --yes -p @vercel/ncc@${nccVersion} ncc build ./${sdkFilename} -o ${tmpBuildOutputPath} -e ./artifacts`, { cwd: tmpDirPath, stdio: "inherit" });
     // TODO: workaround for artifacts.js not being output by ncc
     fs.writeFileSync(path.join(tmpBuildOutputPath, "artifacts.js"), artifactsSource
         .replace("export const artifacts: IArtifacts = ", "module.exports.artifacts = ")
@@ -138,7 +139,7 @@ exports.generate = generate;
 function init(input) {
     const { database, user, password, host, port, server } = input;
     if (dialect === "mysql") {
-        let mysql = new mysql_1.MySQL({
+        let mysql = new MySQL_1.MySQL({
             user,
             password,
             host,
@@ -169,26 +170,30 @@ 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) {
+    function getTypeImports() {
+        let set = new Set();
+        for (let d of input) {
+            for (let k of [
+                "typeFieldsName",
+                "typeReturnBaseName",
+                "typeWhereName",
+                "typeOrderByName",
+                "typeDataName",
+            ]) {
+                const str = d[k];
+                if (str) {
+                    set.add(str);
+                }
+            }
+        }
+        return `import type { ${["Paginate", "ListPaginated"]
+            .concat(Array.from(set).sort())
+            .join(",\n")} } from "./types";`;
+    }
     const src = `import type { IRuntime, TMiddleware, TContext } from "./IRuntime"
   import { artifacts } from "./artifacts";
-  import type { Paginate, ListPaginated } from "./types/_shared";
-  ${input.reduce((acc, x) => {
-        if (x.kind === "getOne") {
-            acc += `import type { ${x.typeReturnBaseName} } from "./types/${x.typeReturnBaseName}";`;
-            acc += `import type { ${x.typeFieldsName} } from "./types/${x.typeFieldsName}";`;
-        }
-        if (x.kind === "getList") {
-            acc += `import type { ${x.typeWhereName} } from "./types/${x.typeWhereName}";`;
-            acc += `import type { ${x.typeOrderByName} } from "./types/${x.typeOrderByName}";`;
-        }
-        if (x.kind === "postOne") {
-            acc += `import type { ${x.typeDataName} } from "./types/${x.typeDataName}";`;
-        }
-        if (x.kind === "patchOne") {
-            acc += `import type { ${x.typeDataName} } from "./types/${x.typeDataName}";`;
-        }
-        return acc;
-    }, "")}
+
+  ${getTypeImports()}
 
   export class SDK {
     runtime: IRuntime;
@@ -834,6 +839,37 @@ async function getJSONSchemaOrderBy(table, name) {
         oneOf: [_schema, { type: "array", items: _schema }],
     };
 }
+function getTypeTypesIndex(data) {
+    function getExport(name) {
+        return `export type { ${name} } from "./${name}";`;
+    }
+    let set = new Set();
+    for (let d of data) {
+        for (let k of [
+            "typeFieldsName",
+            "typeReturnBaseName",
+            "typeWhereName",
+            "typeOrderByName",
+            "typeDataName",
+        ]) {
+            const str = d[k];
+            if (str) {
+                set.add(str);
+            }
+        }
+    }
+    let src = `export type { ${[
+        "Paginate",
+        "ListPaginated",
+        "TUpdateOperationsString",
+        "TUpdateOperationsNumber",
+    ].join(",")} } from "./_shared";\n\n`;
+    let arr = Array.from(set).sort();
+    for (let x of arr) {
+        src += getExport(x);
+    }
+    return prettier.format(src, { parser: "typescript" });
+}
 function getTypeShared() {
     const src = `export type Paginate = {
     first: number;
@@ -882,19 +918,14 @@ async function getTypeFields(table, name, includeMappedFields) {
                     const argsProperties = x.type === "many-to-many"
                         ? {
                             [keyWhere]: {
-                                oneOf: [
-                                    { tsType: getTypeWhereName(x.table) },
-                                    {
-                                        type: "array",
-                                        items: [
-                                            { tsType: getTypeWhereName(x.table) },
-                                            { tsType: getTypeWhereName(x.junctionTable) },
-                                        ],
-                                        additionalItems: false,
-                                        minItems: 2,
-                                        maxItems: 2,
+                                type: "object",
+                                properties: {
+                                    [x.table]: { tsType: getTypeWhereName(x.table) },
+                                    [x.junctionTable]: {
+                                        tsType: getTypeWhereName(x.junctionTable),
                                     },
-                                ],
+                                },
+                                additionalProperties: false,
                             },
                         }
                         : { [keyWhere]: { tsType: getTypeWhereName(x.table) } };

package/dist/runtime/RuntimeKSQL.js

@@ -148,9 +148,10 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName,
     let where = undefined;
     if (args?.$where != null) {
         let argsMapped = args;
-        if (Array.isArray(argsMapped?.$where)) {
+        if (typeof argsMapped.$where === "object" &&
+            argsMapped.$where[table] != null) {
             argsMapped = _.cloneDeep(argsMapped);
-            argsMapped.$where = argsMapped.$where[0];
+            argsMapped.$where = argsMapped.$where[table];
         }
         const whereResult = (0, stringifyWhere_1.stringifyWhere)({
             where: argsMapped.$where,
@@ -304,8 +305,10 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
             if (junctionKeyValue == null) {
                 return { [x.as ?? x.name]: [] };
             }
-            let whereJunction = x.args != null && Array.isArray(x.args.$where)
-                ? _.cloneDeep(x.args.$where[1])
+            let whereJunction = typeof x?.args?.$where === "object" &&
+                x.args.$where != null &&
+                x.args.$where[relationField.junctionTable] != null
+                ? _.cloneDeep(x.args.$where[relationField.junctionTable])
                 : {};
             whereJunction = {
                 $and: [
@@ -328,9 +331,11 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                     [relationField.relations[1].referencedKey]: { $in: keys },
                 };
                 const argsMapped = x.args == null ? {} : _.cloneDeep(x.args);
-                if (Array.isArray(argsMapped.$where)) {
+                if (typeof argsMapped?.$where === "object" &&
+                    argsMapped.$where != null &&
+                    argsMapped.$where[relationField.table] != null) {
                     argsMapped.$where = {
-                        $and: [whereDest, argsMapped.$where[0]],
+                        $and: [whereDest, argsMapped.$where[relationField.table]],
                     };
                 }
                 else if (argsMapped.$where != null) {

package/dist/runtime/lib/getSqlAst.js

@@ -21,9 +21,12 @@ function getSqlAst(input) {
     if (input.where == null) {
         where = (table, args) => {
             let argsMapped = args;
-            if (junction != null && Array.isArray(argsMapped?.$where)) {
+            if (junction != null &&
+                typeof argsMapped?.$where === "object" &&
+                argsMapped.$where != null &&
+                argsMapped.$where[input.table] != null) {
                 argsMapped = _.cloneDeep(argsMapped);
-                argsMapped.$where = argsMapped.$where[0];
+                argsMapped.$where = argsMapped.$where[input.table];
             }
             const whereResult = getWhere(
             // table is escaped already
@@ -109,11 +112,14 @@ function getSqlAst(input) {
                         as: asJunction,
                         uniqueKey,
                         where: (table, args) => {
-                            if (!Array.isArray(args?.$where)) {
+                            if (typeof args?.$where !== "object" ||
+                                typeof args?.$where == null ||
+                                args.$where[relationField.junctionTable] == null) {
                                 return undefined;
                             }
                             const argsMapped = _.cloneDeep(args);
-                            argsMapped.$where = argsMapped.$where[1];
+                            argsMapped.$where =
+                                argsMapped.$where[relationField.junctionTable];
                             const whereResult = getWhere(
                             // table is escaped already
                             table, argsMapped, dialect, orderBy, rowWithMatchingCursor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -17,7 +17,7 @@
     "fs-extra": "10.0.0",
     "graphql": "15.8.0",
     "graphql-relay": "^0.9.0",
-    "join-monster": "git+https://github.com/apalm/join-monster.git#340bcad96da4c268e874d07552d564c98ecf39ea",
+    "join-monster": "git+https://github.com/apalm/join-monster.git#3e93d7028ccbf50f728577b2290b5f2638b639cb",
     "json-schema-to-typescript": "10.1.5",
     "lodash": "^4.17.20",
     "mssql": "^6.3.1",