@technicity/data-service-generator 0.11.5 → 0.11.7

package/dist/generation/generate.d.ts

@@ -1,7 +1,7 @@
 import type { IDialect, ISupplementClientOpts } from "../runtime/IRuntime";
-declare type ISpecialCaseUuidColumn = boolean;
-declare type IIncludeMappedFields = boolean;
-declare type IGenerateInput = {
+type ISpecialCaseUuidColumn = boolean;
+type IIncludeMappedFields = boolean;
+type IGenerateInput = {
     dialect: IDialect;
     database: string;
     user: string;

package/dist/generation/generate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
+exports.generate = generate;
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -136,7 +136,6 @@ async function generate(input) {
     fse.copySync(tmpBuildOutputPath, sdkOutputPath);
     fse.removeSync(tmpDirPath);
 }
-exports.generate = generate;
 function init(input) {
     const { database, user, password, host, port, server } = input;
     if (dialect === "mysql") {

package/dist/ksql.d.ts

@@ -1,4 +1,4 @@
-declare type THeaders = {
+type THeaders = {
     [k: string]: any;
 };
 export declare class KSQL {

package/dist/lib/getDuplicates.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDuplicates = void 0;
+exports.getDuplicates = getDuplicates;
 function getDuplicates(arr) {
     return arr.reduce((agg, col) => {
         agg.filter[col] = agg.filter[col] ? agg.dup.push(col) : 2;
         return agg;
     }, { filter: {}, dup: [] }).dup;
 }
-exports.getDuplicates = getDuplicates;

package/dist/lib/isNotNullOrUndefined.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNullOrUndefined = void 0;
+exports.isNotNullOrUndefined = isNotNullOrUndefined;
 // https://github.com/Microsoft/TypeScript/issues/16069
 function isNotNullOrUndefined(input) {
     return input != null;
 }
-exports.isNotNullOrUndefined = isNotNullOrUndefined;

package/dist/runtime/Cache.d.ts

@@ -1,7 +1,7 @@
 import Redis, { Cluster } from "ioredis";
 import { TResolveParams } from "./IRuntime";
 import Stats from "./Stats";
-export declare type RedisConfig = {
+export type RedisConfig = {
     host: string;
     port: number;
     tls?: boolean;

package/dist/runtime/IRuntime.d.ts

@@ -9,7 +9,7 @@ export interface IRuntime {
         isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE";
     }): Promise<TBeginTransactionResult>;
 }
-export declare type TResolveParams = {
+export type TResolveParams = {
     resource: string;
     action: "findUnique" | "findMany" | "findManyPaginated" | "create" | "update" | "updateMany" | "delete" | "deleteMany";
     args?: IArgs | undefined;
@@ -20,55 +20,55 @@ export declare type TResolveParams = {
     skipCache?: boolean;
     dbCall?: TDbCall;
 };
-export declare type TContext = {
+export type TContext = {
     [k: string]: any;
 };
-export declare type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
-export declare type IDialect = "mysql" | "mssql" | "ksql";
-export declare type TDbCall = (q: string) => Promise<any>;
-export declare type TFormatQuery = (q: string, values: any[]) => string;
-export declare type TBeginTransaction = () => Promise<TBeginTransactionResult>;
-declare type TBeginTransactionResult = {
+export type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
+export type IDialect = "mysql" | "mssql" | "ksql";
+export type TDbCall = (q: string) => Promise<any>;
+export type TFormatQuery = (q: string, values: any[]) => string;
+export type TBeginTransaction = () => Promise<TBeginTransactionResult>;
+type TBeginTransactionResult = {
     dbCall: (q: string) => Promise<any>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
 };
-export declare type ISupplementClientOpts = boolean;
-export declare type IOrderBy = {
+export type ISupplementClientOpts = boolean;
+export type IOrderBy = {
     column: string;
     direction: any;
 }[];
-export declare type IArgs = {
+export type IArgs = {
     [k: string]: any;
 };
-export declare type IField = string | {
+export type IField = string | {
     name: string;
     as?: string;
     fields: IField[];
     args?: IArgs;
     transform?: (record: any) => any;
 };
-declare type IWhere = (table: string, args: IArgs) => string | undefined;
-declare type IASTChildColumn = {
+type IWhere = (table: string, args: IArgs) => string | undefined;
+type IASTChildColumn = {
     type: "column";
     name: string;
     fieldName: string;
     as: string;
     fromOtherTable?: string | undefined;
 };
-declare type IASTChildComposite = {
+type IASTChildComposite = {
     type: "composite";
     name: string[];
     fieldName: string;
     as: string;
     fromOtherTable?: string | undefined;
 };
-declare type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
-declare type ISqlBatch = {
+type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
+type ISqlBatch = {
     thisKey: IASTChildColumn;
     parentKey: IASTChildColumn;
 };
-declare type IJunction = {
+type IJunction = {
     sqlTable: string;
     as: string;
     uniqueKey: string | string[];
@@ -84,7 +84,7 @@ declare type IJunction = {
     where?: IWhere;
     sqlJoins: ISqlJoin[];
 };
-export declare type IGetSQLASTInput = {
+export type IGetSQLASTInput = {
     table: string;
     fieldName: string;
     fields: IField[];
@@ -101,17 +101,17 @@ export declare type IGetSQLASTInput = {
     dialect: IDialect;
     firstChild?: IASTChildColumn | IASTChildComposite;
 };
-export declare type IRelation = {
+export type IRelation = {
     table: string;
     foreignKey: string;
     referencedTable: string;
     referencedKey: string;
     nullable: boolean;
 };
-declare type IOneToManyOrManyToOne = "one-to-many__many-to-one";
-declare type IManyToMany = "many-to-many";
-declare type IRelationKind = "one-to-many" | "many-to-one";
-export declare type IRelationOneToManyOrManyToOne = {
+type IOneToManyOrManyToOne = "one-to-many__many-to-one";
+type IManyToMany = "many-to-many";
+type IRelationKind = "one-to-many" | "many-to-one";
+export type IRelationOneToManyOrManyToOne = {
     type: IOneToManyOrManyToOne;
     kind: IRelationKind;
     grabMany: boolean;
@@ -120,7 +120,7 @@ export declare type IRelationOneToManyOrManyToOne = {
     relation: IRelation;
     nullable: boolean;
 };
-export declare type IRelationManyToMany = {
+export type IRelationManyToMany = {
     type: IManyToMany;
     grabMany: boolean;
     table: string;
@@ -128,8 +128,8 @@ export declare type IRelationManyToMany = {
     name: string;
     relations: IRelation[];
 };
-export declare type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
-export declare type IMappedField = {
+export type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
+export type IMappedField = {
     name: string;
     as: string;
     type: string;
@@ -139,7 +139,7 @@ export declare type IMappedField = {
     referencedTable: string;
     referencedKey: string;
 };
-export declare type IArtifacts = {
+export type IArtifacts = {
     [k: string]: {
         table: string;
         primaryKey: string;

package/dist/runtime/RuntimeKSQL.d.ts

@@ -1,6 +1,6 @@
 import type { IRuntime, TMiddleware, TResolveParams, IArtifacts, TDbCall } from "./IRuntime";
 import { KSQL } from "../ksql";
-declare type TGetTableName = (table: string) => string;
+type TGetTableName = (table: string) => string;
 export declare class RuntimeKSQL implements IRuntime {
     #private;
     constructor(clientOpts: ConstructorParameters<typeof KSQL>[0], otherOpts: {

package/dist/runtime/Stats.d.ts

@@ -4,9 +4,5 @@ declare class Stats {
     constructor(client: Redis | Cluster);
     updateStats: (ms: number, category: string) => Promise<void>;
 }
-declare namespace timer {
-    type Callback = (time: number, ...params: any[]) => void;
-    type Params<T> = T extends (ms: number, ...params: infer U) => any ? U : never;
-}
 export declare function timer(): <T extends timer.Callback>(callback: T, ...args: timer.Params<T>) => void;
 export default Stats;

package/dist/runtime/Stats.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timer = void 0;
+exports.timer = timer;
 const perf_hooks_1 = require("perf_hooks");
 class Stats {
     constructor(client) {
@@ -28,5 +28,4 @@ function timer() {
         callback(perf_hooks_1.performance.now() - start, ...args);
     };
 }
-exports.timer = timer;
 exports.default = Stats;

package/dist/runtime/lib/addNullFallbacks.js

@@ -2,7 +2,7 @@
 // If a many-to-one relation's ID field is null, we want the
 // relation field to be null as well, not undefined.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addNullFallbacks = void 0;
+exports.addNullFallbacks = addNullFallbacks;
 function addNullFallbacks(sqlAST, data) {
     if (data == null) {
         return;
@@ -30,4 +30,3 @@ function addNullFallbacks(sqlAST, data) {
         }
     }
 }
-exports.addNullFallbacks = addNullFallbacks;

package/dist/runtime/lib/cursor.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeCursor = exports.encodeCursor = void 0;
+exports.encodeCursor = encodeCursor;
+exports.decodeCursor = decodeCursor;
 function encodeCursor(cursor) {
     return Buffer.from(JSON.stringify(cursor)).toString("base64");
 }
-exports.encodeCursor = encodeCursor;
 function decodeCursor(cursor) {
     return JSON.parse(Buffer.from(cursor, "base64").toString("utf8"));
 }
-exports.decodeCursor = decodeCursor;

package/dist/runtime/lib/getDateTimeStringMySQL.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDateTimeStringMySQL = void 0;
+exports.getDateTimeStringMySQL = getDateTimeStringMySQL;
 // Assumes input uses zero offset
 function getDateTimeStringMySQL(dateTimeString) {
     return dateTimeString.replace("T", " ").slice(0, 19);
 }
-exports.getDateTimeStringMySQL = getDateTimeStringMySQL;

package/dist/runtime/lib/getOrderBy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderBy = void 0;
+exports.getOrderBy = getOrderBy;
 // https://gist.github.com/pcattori/2bb645d587e45c9fdbcabf5cef7a7106
 function getOrderBy(args, primaryKey) {
     let out = undefined;
@@ -41,7 +41,6 @@ function getOrderBy(args, primaryKey) {
     }
     return { orderBy: out, flip };
 }
-exports.getOrderBy = getOrderBy;
 function getFlip(args) {
     return args?.$paginate?.last != null;
 }

package/dist/runtime/lib/getSqlAst.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSqlAst = void 0;
+exports.getSqlAst = getSqlAst;
 const SqlString = require("sqlstring");
 // @ts-ignore
 const TSqlString = require("tsqlstring");
@@ -183,7 +183,6 @@ function getSqlAst(input) {
         })),
     };
 }
-exports.getSqlAst = getSqlAst;
 function keyToASTChild(key, namespace, fromOtherTable) {
     if (Array.isArray(key)) {
         const clumsyName = toClumsyName(key);

package/dist/runtime/lib/getWhere.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWhere = void 0;
+exports.getWhere = getWhere;
 const stringifyWhere_1 = require("./stringifyWhere");
 function getWhere(
 // Note: `table` is not escaped in getWhere, so it should be escaped beforehand.
@@ -18,4 +18,3 @@ table, args, dialect, orderBy, rowWithMatchingCursor) {
         rowWithMatchingCursor,
     }) || null);
 }
-exports.getWhere = getWhere;

package/dist/runtime/lib/runTransforms.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTransforms = void 0;
+exports.runTransforms = runTransforms;
 function runTransforms(data, fields) {
     if (data == null) {
         return;
@@ -33,4 +33,3 @@ function runTransforms(data, fields) {
         }
     }
 }
-exports.runTransforms = runTransforms;

package/dist/runtime/lib/shared.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._prepareWhere = exports.whereNeedsProcessing = exports.postProcess = exports.MiddlewareHandler = exports.resolve = void 0;
+exports.MiddlewareHandler = void 0;
+exports.resolve = resolve;
+exports.postProcess = postProcess;
+exports.whereNeedsProcessing = whereNeedsProcessing;
+exports._prepareWhere = _prepareWhere;
 // @ts-ignore
 // import * as queryAST from "join-monster/dist/query-ast-to-sql-ast";
 // @ts-ignore
@@ -41,7 +45,6 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
     }
     return _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
 }
-exports.resolve = resolve;
 function _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache) {
     switch (input.action) {
         case "findMany":
@@ -784,7 +787,6 @@ function postProcess(data, fields, shouldRemoveExtraKeys) {
     }
     (0, runTransforms_1.runTransforms)(data, fields);
 }
-exports.postProcess = postProcess;
 function removeExtraKeys(data, fields) {
     if (data == null || (Array.isArray(data) && data[0] == null)) {
         return;
@@ -829,7 +831,6 @@ function removeExtraKeys(data, fields) {
 function whereNeedsProcessing(where) {
     return JSON.stringify(where).includes("Uuid");
 }
-exports.whereNeedsProcessing = whereNeedsProcessing;
 async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
     const mappedFields = artifacts[table].mappedFields;
     let out = {};
@@ -925,7 +926,6 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
     });
     return out;
 }
-exports._prepareWhere = _prepareWhere;
 function getPrepareWhereNotFoundMessage(mappedField, value) {
     return `Not found: unable to map \`${mappedField.referencedTable}\`.\`${mappedField.name}\` to \`${mappedField.referencedTable}\`.\`${mappedField.referencedKey}\` for the value \`${value}\`.`;
 }

package/dist/runtime/lib/stringifyWhere.d.ts

@@ -1,8 +1,8 @@
 import type { IOrderBy, IDialect } from "../IRuntime";
-declare type IWhere = {
+type IWhere = {
     [k: string]: any;
 };
-declare type IArgs = {
+type IArgs = {
     [k: string]: any;
 };
 export declare function stringifyWhere(input: {

package/dist/runtime/lib/stringifyWhere.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEscape = exports.getEscapeId = exports.stringifyWhere = void 0;
+exports.stringifyWhere = stringifyWhere;
+exports.getEscapeId = getEscapeId;
+exports.getEscape = getEscape;
 const _ = require("lodash/fp");
 const MySqlString = require("sqlstring");
 // @ts-ignore
@@ -26,7 +28,6 @@ function stringifyWhere(input) {
     }
     return result;
 }
-exports.stringifyWhere = stringifyWhere;
 function _stringifyWhere(where, table, escapeId, escape, result) {
     if (Object.prototype.hasOwnProperty.call(where, "$and")) {
         if (Object.keys(where).length !== 1) {
@@ -215,7 +216,6 @@ function getEscapeId(dialect) {
     }
     throw new Error("Unsupported dialect: " + dialect);
 }
-exports.getEscapeId = getEscapeId;
 function getEscape(dialect) {
     if (dialect === "mysql") {
         return MySqlString.escape.bind(MySqlString);
@@ -225,4 +225,3 @@ function getEscape(dialect) {
     }
     throw new Error("Unsupported dialect: " + dialect);
 }
-exports.getEscape = getEscape;

package/dist/runtime/lib/typeCastMSSQL.d.ts

@@ -1,3 +1,3 @@
-declare type TValueCast = (value: any) => any;
+type TValueCast = (value: any) => any;
 export declare function typeCastMSSQL(customTypeCast?: (meta: any, mssql: any) => TValueCast): (result: any, meta: any) => any;
 export {};

package/dist/runtime/lib/typeCastMSSQL.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typeCastMSSQL = void 0;
+exports.typeCastMSSQL = typeCastMSSQL;
 const mssql = require("mssql");
 // TODO: see https://github.com/tediousjs/node-mssql/pull/1171
 function typeCastMSSQL(customTypeCast) {
@@ -37,4 +37,3 @@ function typeCastMSSQL(customTypeCast) {
         });
     };
 }
-exports.typeCastMSSQL = typeCastMSSQL;

package/dist/runtime/lib/utility.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flatten = exports.mapAsync = void 0;
+exports.mapAsync = mapAsync;
+exports.flatten = flatten;
 /**
  * Eagerly resolve and map input values then concatinate.
  */
@@ -8,8 +9,6 @@ async function mapAsync(source, mapFunction) {
     const output = (await source).map(mapFunction);
     return Promise.all(flatten(output)).then(flatten);
 }
-exports.mapAsync = mapAsync;
 function flatten(array) {
     return [].concat(...array);
 }
-exports.flatten = flatten;

package/dist/traverseFieldArgs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseFieldArgs = void 0;
+exports.traverseFieldArgs = traverseFieldArgs;
 function traverseFieldArgs(fields, cb) {
     for (let x of fields) {
         if (typeof x !== "object") {
@@ -10,4 +10,3 @@ function traverseFieldArgs(fields, cb) {
         traverseFieldArgs(x.fields, cb);
     }
 }
-exports.traverseFieldArgs = traverseFieldArgs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -9,7 +9,6 @@
     "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\"",
@@ -47,6 +46,6 @@
     "env-cmd": "^10.1.0",
     "mocha": "9.1.3",
     "sinon": "12.0.1",
-    "typescript": "4.6.4"
+    "typescript": "5.5.2"
   }
 }