@technicity/data-service-generator 0.7.0 → 0.8.0

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
@@ -116,7 +116,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 +138,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,
@@ -882,19 +882,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.0",
+  "version": "0.8.0",
   "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": "apalm/join-monster#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",

package/CHANGELOG.md

@@ -1,166 +0,0 @@
-# 0.7.0 [2022.01.17]
-
-- Add support for MySQL 8
-
-# 0.5.12 [2021.11.18]
-
-- Add `$queryRaw`
-
-```ts
-await sdk.$queryRaw("SELECT * FROM Foo WHERE id = ?", [2]);
-```
-
-Use the `?` character as a placeholder for values that need to be escaped.
-
-# 0.5.12 [2021.11.18]
-
-- Add support for nested creates. All of the specified creates are wrapped in a transaction.
-
-```ts
-await sdk.postFoo({
-  foo: "blah",
-  barList: {
-    $create: [
-      {
-        note: "blah",
-        bazList: { $create: [{ baz: "asdf" }, { baz: "zzz" }] },
-      },
-      { note: "blah 2" },
-    ],
-  },
-});
-```
-
-In the above example, 5 records are created: 1 `Foo` record, 2 `Bar` records, and 2 `Baz` records.
-
-# 0.5.7 [2021.10.12]
-
-- Add `$nlike` operator. Equivalent to SQL's `NOT LIKE` operator.
-
-```ts
-await sdk.getFooList({
-  $where: { bar: { $nlike: "%baz%" } },
-});
-```
-
-# 0.5.5 [2021.10.12]
-
-- Add limit + offset pagination
-
-```ts
-await sdk.getFooListPaginated({
-  $paginate: { limit: 5, offset: 2 },
-});
-```
-
-# 0.5.0 [2021.10.08]
-
-- Add support for middleware
-
-Generated SDKs now have a `$use` method, which takes a single argument: your middleware function.
-
-Example middleware that logs the amount of time an operation took:
-
-```ts
-sdk.$use(async (params, next) => {
-  const start = process.hrtime();
-  const result = await next(params);
-  const end = process.hrtime(start);
-  console.log(`${params.resource}.${params.action} took ${end[1] / 1000000}ms`);
-  return result;
-});
-```
-
-## Migrating from 0.4.x
-
-1. `npm install -S @technicity/data-service-generator@0.5.0`
-2. Regenerate SDK
-
-# 0.4.0 [2021.09.17]
-
-- Implement operations on update for string, number fields
-
-## string
-
-### `$prepend`
-
-Prepend a string to the current value. If the current value is `null`, the value is not updated.
-
-```ts
-await sdk.patchFoo(
-  { id: 1 },
-  { bar: { $prepend: `BAZ_` }
-);
-```
-
-### `$append`
-
-Append a string to the current value. If the current value is `null`, the value is not updated.
-
-```ts
-await sdk.patchFoo(
-  { id: 1 },
-  { bar: { $append: `_BAZ` }
-);
-```
-
-## number
-
-### `$increment`
-
-Increment the current value. If the current value is `null`, the value is not updated.
-
-```ts
-await sdk.patchBar(
-  { id: 1 },
-  { foo: { $increment: 5 }
-);
-```
-
-### `$decrement`
-
-Decrement the current value. If the current value is `null`, the value is not updated.
-
-```ts
-await sdk.patchBar(
-  { id: 1 },
-  { foo: { $decrement: 5 }
-);
-```
-
-## Migrating from 0.3.x
-
-1. `npm install -S @technicity/data-service-generator@0.4.0`
-2. Regenerate SDK
-
-# 0.3.1 [2021.09.09]
-
-- [MSSQL] Allow passing custom `typeCast`
-
-# 0.3.0 [2021.09.08]
-
-- For the generated SDK, instead of specifying a `dialect`, specify a `runtime`. This reduces the need to regenerate SDKs, since updates and bugfixes to the runtime side can be obtained solely by updating the `@technicity/data-service-generator` version, instead of both updating the `@technicity/data-service-generator` version and regenerating the SDK. It also allows for custom runtimes that live outside this package. `@technicity/data-service-generator` ships with 3 runtimes: `RuntimeMySQL`, `RuntimeMSSQL`, `RuntimeKSQL`.
-- Add KSQL support
-- `driverOpts` -> `clientOpts`
-- Add `otherOpts` to allow passing extra runtime-specific options
-
-## Migrating from 0.2.x
-
-1. `npm install -S @technicity/data-service-generator@0.3.0`
-2. Regenerate SDK
-3. Update SDK instantiation:
-
-```diff
-+ import { RuntimeMySQL } from "@technicity/data-service-generator/dist/runtime/RuntimeMySQL";
-
-const sdk = new SDK({
-- dialect: "mysql",
-+ runtime: RuntimeMySQL,
-- driverOpts: {
-+ clientOpts: {
-    database: "MY_DATABASE",
-    user: "MY_USER",
-    password: "MY_PASSWORD",
-  },
-});
-```