Merge pull request #344 from Uconnect-Technologies/remove-v1

Remove v1 process

Author: ilyaskarim

README.md

@@ -34,7 +34,7 @@ npm install wertik-js
 To start wertik-js server you need to import wertik and start it:
 
 ```js
-import wertik from "wertik-js/lib/next"
+import wertik from "wertik-js/lib/"
 
 weritk({
   port: 1200,

changelog.md

@@ -5,3 +5,10 @@
 - When sending emails fails, also throws errors in console
 - When taking backup and provides invalid table/module name, the backup process failes with an error.
 - Added `extendFields` to `useModule` to extend `sequelize.model` table fields.
+
+### 3.3.1 
+
+- Removed support old legacy wertik framework.
+- Now wertik can be import from `wertik-js/lib` instead of `wertik-js/lib/ndex`
+- Added more types support.
+- Change the way mysql is initalized so that it can open doors for postgres and mongoose in future.

docs/v3/cronJobs.md

@@ -3,7 +3,7 @@
 Wertik JS allows you to creating Cron Jobs that runs on interval. To use a Cron JOB you need to use `useCronJob`.
 
 ```js
-import wertik, { useCronJob } from "wertik-js/lib/next";
+import wertik, { useCronJob } from "wertik-js/lib/";
 
 wertik({
   port: 1200,

docs/v3/database.md

@@ -3,7 +3,7 @@
 As of today 28 November 2021, Wertik-js only supports MySQL database. Wertik JS provides a function called `useMysqlDatabase` you can use to connect to a database.
 
 ```js
-import wertik, { useMysqlDatabase } from "wertik-js/lib/next";
+import wertik, { useMysqlDatabase } from "wertik-js/lib/";
 weritk({
   port: 1200,
   database: {

docs/v3/graphql.md

@@ -3,7 +3,7 @@
 For GraphQL, Wertik JS uses Apollo GraphQL under the hood. We choose Apollo GraphQL because it is well managed and bug-free. To set up Graphql Wertik JS provides a function called `useGraphql` to use Graphql in your app.
 
 ```javascript
-import wertik, { useGraphql } from "wertik-js/lib/next";
+import wertik, { useGraphql } from "wertik-js/lib/";
 wertik({
   port: 1200,
   graphql: useGraphql(useGraphqlProps),

docs/v3/index.md

@@ -33,7 +33,7 @@ npm install wertik-js
 To start wertik-js server you need to import wertik and start it:
 
 ```js
-import wertik from "wertik-js/lib/next";
+import wertik from "wertik-js/lib/";
 
 weritk({
   port: 1200,

docs/v3/logger.md

@@ -3,7 +3,7 @@
 Wertik JS allows using logger for logging purpose. Wertik JS uses `winston` for logging purpose. We choose `winston` because of its popularity. To setup logger, you need to import `useLogger`and `useWinstonTransport` from wertik.
 
 ```javascript
-import wertik, { useLogger, useWinstonTransport } from "wertik-js/lib/next"
+import wertik, { useLogger, useWinstonTransport } from "wertik-js/lib/"
 const devIlyas = async () => {
   wertik({
     port: 1200,
@@ -32,7 +32,7 @@ import wertik, {
   useModule,
   useLogger,
   useWinstonTransport,
-} from "wertik-js/lib/next"
+} from "wertik-js/lib/"
 
 const devIlyas = async () => {
   wertik({

docs/v3/mailer.md

@@ -3,7 +3,7 @@
 To send emails. Wertik-js uses Node Mailer for sending emails. To setup emails Wertik JS provides a function called `useMailer` as argument you need to pass Node Mailer Configuration.
 
 ```js
-import wertik, { useMysqlDatabase, useMailer } from "wertik-js/lib/next";
+import wertik, { useMysqlDatabase, useMailer } from "wertik-js/lib/"
 weritk({
   port: 1200,
   database: {
@@ -18,7 +18,7 @@ weritk({
   mailer: {
     default: useMailer(),
   },
-});
+})
 ```
 
 `useMailer` will ask for node mailer configuration. The configuration passed through `useMailer` will be used here:
@@ -27,17 +27,17 @@ weritk({
 
 ### Sending Emails
 
-Once you set up at least one mail. In context, wertik will pass `sendEmail(mailer: string, options: emailSendProps)` method that will send email using a different email. Send Email API: `sendEmail(mailer: string, options: emailSendProps)`. The mailer will be `default` here. And the options include:
+Once you set up at least one mail. In context, wertik will pass `sendEmail(mailer: string, options: SendEmailProps)` method that will send email using a different email. Send Email API: `sendEmail(mailer: string, options: SendEmailProps)`. The mailer will be `default` here. And the options include:
 
 ```typescript
-export interface emailSendProps {
-  template: string;
+export interface SendEmailProps {
+  template: string
   variables: {
-    [key: string]: any;
-  };
-  from: string;
-  to: string;
-  subject: string;
+    [key: string]: any
+  }
+  from: string
+  to: string
+  subject: string
 }
 ```
 

docs/v3/modules.md

@@ -8,7 +8,7 @@ import wertik, {
   useMailer,
   useModule,
   useGraphql,
-} from "wertik-js/lib/next";
+} from "wertik-js/lib/";
 
 weritk({
   port: 1200,
@@ -48,7 +48,7 @@ When you provide `useMysqlDatabase: true`, `table` and `database`, Wertik JS aut
 You have to initialize its module in this way:
 
 ```js
-import wertik, { useModule, useMysqlDatabase, useGraphql } from "wertik-js/lib/next";
+import wertik, { useModule, useMysqlDatabase, useGraphql } from "wertik-js/lib/";
 wertik({
   port: 1200,
   graphql: useGraphql(),
@@ -219,7 +219,7 @@ When events are running you get access to Apollo GraphQL Resolver arguments wher
 Example:
 
 ```js
-import wertik, { useMysqlDatabase, useModule } from "wertik-js/lib/next";
+import wertik, { useMysqlDatabase, useModule } from "wertik-js/lib/";
 
 wertik({
   port: 1200,
@@ -271,7 +271,7 @@ When using Wertik JS modules. `useModule` has a function called `on` which can b
 Example:
 
 ```js
-import wertik, { useModule } from "wertik-js/lib/next";
+import wertik, { useModule } from "wertik-js/lib/";
 wertik({
   port: 1200,
   modules: {

docs/v3/queue.md

@@ -9,7 +9,7 @@ When handling requests from API clients, We might run into a situation where a r
 It is considered the elegant way of scaling and solving performance challenges in common applications.
 
 ```js
-import wertik, { useQueue } from "wertik-js/lib/next"
+import wertik, { useQueue } from "wertik-js/lib/"
 
 wertik({
   port: 1200,
@@ -77,7 +77,7 @@ export interface useQueueProps {
 As of today(Friday 7 Jan 2022), Wertik JS provides [Bull Board UI](https://github.com/felixmosh/bull-board) for monitoring Jobs.
 
 ```javascript
-import wertik, { useQueue } from "wertik-js/lib/next"
+import wertik, { useQueue } from "wertik-js/lib/"
 wertik({
   port: 1200,
   queue: {

docs/v3/redis.md

@@ -15,7 +15,7 @@ Where rest of the options will be part of redis `createClient` options. For `cre
 
 
 ```javascript
-import wertik, { useRedis } from "wertik-js/lib/next";
+import wertik, { useRedis } from "wertik-js/lib/";
 wertik({
 port: 1200,
     redis: {

docs/v3/sockets.md

@@ -7,7 +7,7 @@ Wertik JS allows using both Socket.IO and WebSockets on the same HTTP server as
 useWebSockets allows you to creating a websockets server on current http server.
 
 ```js
-import wertik, { useWebSockets } from "wertik-js/lib/next";
+import wertik, { useWebSockets } from "wertik-js/lib/";
 
 wertik({
   port: 1200,
@@ -33,7 +33,7 @@ Your Web Sockets server is up an running at ws://localhost:1200/websockets.
 useIndependentWebSocketsServer allows you creating a websockets server that runs on different port.
 
 ```js
-import wertik, { useIndependentWebSocketsServer } from "wertik-js/lib/next";
+import wertik, { useIndependentWebSocketsServer } from "wertik-js/lib/";
 
 wertik({
   port: 1200,
@@ -57,7 +57,7 @@ Wertik JS app listening at http://localhost:1200
 useSocketIO allows you creating a Socket IO server that runs on same http server.
 
 ```js
-import wertik, { useSocketIO } from "wertik-js/lib/next";
+import wertik, { useSocketIO } from "wertik-js/lib/";
 
 wertik({
   port: 1200,

docs/v3/storage.md

@@ -3,7 +3,7 @@
 Wertik JS allows adding support for third party Storage services to your app. As of today 28 November 2021, Wertik JS supports `digitalocean` and `dropbox`. To use storage services you need to use `useStorage` function from wertik-js.
 
 ```js
-import wertik, { useStorage } from "wertik-js/lib/next";
+import wertik, { useStorage } from "wertik-js/lib/";
 
 wertik({
   port: 1200,
@@ -49,7 +49,7 @@ Wertik JS provides a builtin module to take backups of your database called Back
 To use it You can import it from Wertik JS:
 
 ```js
-import wertik, { WertikBackupModule } from "wertik-js/lib/next";
+import wertik, { WertikBackupModule } from "wertik-js/lib/";
 wertik({
   port: 1200,
   modules: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wertik-js",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "main": "lib/main.js",
   "types": "lib/types.d.ts",
   "repository": "https://github.com/Uconnect-Technologies/wertik-js.git",
@@ -25,11 +25,8 @@
   "author": "Ilyas Karim <ilyas.datoo@gmail.com> ",
   "license": "MIT",
   "scripts": {
-    "dev-old": "concurrently -n TS,DevServer  \"npm run watch-ts\"  \"nodemon lib/devServer.js\" ",
-    "dev": "concurrently -n TS,DevServer  \"npm run watch-ts\"  \"nodemon lib/next/devServer.js\" ",
+    "dev": "tsc-watch --onSuccess \"node lib/devServer.js\"",
     "build": "yarn prettier && yarn tsc && yarn test",
-    "production": "node lib/devServer.js",
-    "watch-ts": "tsc -w",
     "prettier": "prettier --write src package.json index.js",
     "test": "cross-env TEST_MODE=true jest --runInBand --forceExit --detectOpenHandles"
   },
@@ -64,6 +61,7 @@
     "redis": "^4.0.1",
     "sequelize": "^6.3.5",
     "socket.io": "^4.1.3",
+    "tsc-watch": "^5.0.3",
     "winston": "^3.1.0",
     "ws": "^8.0.0"
   },

src/next/cronJobs/index.ts renamed to src/cronJobs/index.ts

@@ -1,5 +1,5 @@
 import { get } from "lodash"
-import convertFiltersIntoSequalizeObject from "./../../framework/database/helpers/convertFiltersIntoSequalizeObject"
+import convertFiltersIntoSequalizeObject from "../utils/convertFiltersIntoSequalizeObject"
 
 export const paginate = async (arg, tableInstance) => {
   let page = get(arg, "pagination.page", 1)

src/next/crud/index.ts renamed to src/crud/index.ts

@@ -1,52 +1,7 @@
-import { Sequelize } from "sequelize"
-import { databaseDefaultOptions } from "../framework/defaults/options"
 import { get } from "lodash"
-import { paginate } from "./crud/index"
-import { Store } from "./types"
-import { WertikApp } from "./types"
-import { useDatabaseProps } from "./types/database"
-
-export const getAllRelationships = (dbName: String) => {
-  return `
-    SELECT *
-    FROM information_schema.KEY_COLUMN_USAGE
-    WHERE CONSTRAINT_SCHEMA = '${dbName}'
-      AND REFERENCED_TABLE_SCHEMA IS NOT NULL
-      AND REFERENCED_TABLE_NAME IS NOT NULL
-      AND REFERENCED_COLUMN_NAME IS NOT NULL
-  `
-}
-
-export const useMysqlDatabase = function (obj: useDatabaseProps) {
-  return async () => {
-    try {
-      let sequelize = new Sequelize(obj.name, obj.username, obj.password, {
-        host: obj.host,
-        dialect: "mysql",
-        logging: false,
-        ...get(obj, "options", {}),
-        ...(databaseDefaultOptions as any).sql.dbInitializeOptions,
-      })
-      await sequelize.authenticate()
-      console.log(`[DB] Succcessfully connected to database ${obj.name}`)
-      ;(sequelize as any).relationships = await sequelize.query(
-        getAllRelationships(obj.name)
-      )
-      return {
-        credentials: obj,
-        instance: sequelize,
-      }
-    } catch (e) {
-      console.log(`[DB] Connecting failed to datbase ${obj.name}`)
-      console.log(e.message)
-    }
-  }
-}
-
-/**
- * @deprecated use useMysqlDatabase, useDatabase is deprecated and will be removed in 3.5.0 version.
- */
-export const useDatabase = useMysqlDatabase
+import { paginate } from "../crud/index"
+import { Store } from "../types"
+import { WertikApp } from "../types"
 
 export const applyRelationshipsFromStoreToDatabase = async (
   store: Store,

src/next/database.ts renamed to src/database/database.ts

@@ -0,0 +1,76 @@
+import { MysqlColumnInfoDescribeTable } from "src/types/database"
+import { capitalizeFirstLetter } from "../utils/capitalizeFirstLetter"
+import {
+  numberTypes,
+  dateTypes,
+  stringTypes,
+  enumTypes,
+  jsonTypes,
+} from "./mysql/getTableInfo"
+
+export const convertDatabaseTypeIntoGraphqlType = (
+  columnInfo: MysqlColumnInfoDescribeTable,
+  tableName: string
+) => {
+  var isPrimary = columnInfo.Key === "PRI"
+  var limit = columnInfo.Type.match(/\d+/g)
+  var isRequiredIndicator = columnInfo.Null === "NO" ? "!" : ""
+  if (limit) limit[0]
+
+  if (columnInfo.Type.toLowerCase() === "tinyint(1)") {
+    return {
+      graphqlType: `Boolean`,
+      graphqlCreateInputType: `Boolean${isRequiredIndicator}`,
+      graphqlUpdateInputType: `Boolean${isRequiredIndicator}`,
+      databaseType: "INTEGER",
+    }
+  } else if (numberTypes.find((c) => columnInfo.Type.includes(c))) {
+    return {
+      graphqlType: `Int`,
+      graphqlCreateInputType: `Int`,
+      graphqlUpdateInputType: `Int${isPrimary ? "!" : ""}`,
+      databaseType: "INTEGER",
+    }
+  } else if (jsonTypes.find((c) => columnInfo.Type.includes(c))) {
+    return {
+      graphqlType: `JSON`,
+      graphqlCreateInputType: `String${isRequiredIndicator}`,
+      graphqlUpdateInputType: `String${isRequiredIndicator}`,
+      databaseType: "STRING",
+    }
+  } else if (stringTypes.find((c) => columnInfo.Type.includes(c))) {
+    return {
+      graphqlType: `String`,
+      graphqlCreateInputType: `String${isRequiredIndicator}`,
+      graphqlUpdateInputType: `String${isRequiredIndicator}`,
+      databaseType: "STRING",
+    }
+  } else if (dateTypes.find((c) => columnInfo.Type.includes(c))) {
+    return {
+      graphqlType: `String`,
+      graphqlCreateInputType: `String${isRequiredIndicator}`,
+      graphqlUpdateInputType: `String${isRequiredIndicator}`,
+      databaseType: "STRING",
+      isDateColumn: true,
+    }
+  } else if (enumTypes.find((c) => columnInfo.Type.includes(c))) {
+    return {
+      graphqlType: `${capitalizeFirstLetter(tableName)}${capitalizeFirstLetter(
+        columnInfo.Field
+      )}Enum`,
+      graphqlCreateInputType: `${capitalizeFirstLetter(
+        tableName
+      )}${capitalizeFirstLetter(columnInfo.Field)}Enum${isRequiredIndicator}`,
+      graphqlUpdateInputType: `${capitalizeFirstLetter(
+        tableName
+      )}${capitalizeFirstLetter(columnInfo.Field)}Enum${isRequiredIndicator}`,
+      databaseType: "ENUM",
+      isEnum: true,
+      enumValues: columnInfo.Type.replace("enum(", "")
+        .replace("ENUM(", "")
+        .replace(")", "")
+        .replace(/'/g, "")
+        .split(","),
+    }
+  }
+}