From 0ea9191cb1ce7f8c63ac690aa66da1ff6a3908a3 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Mon, 7 Aug 2023 22:33:07 +0100 Subject: [PATCH 1/3] 0.23.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe5de04..8468e63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@funfunz/core", - "version": "0.23.0", + "version": "0.23.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@funfunz/core", - "version": "0.23.0", + "version": "0.23.1", "license": "MIT", "dependencies": { "axios": "^1.4.0", diff --git a/package.json b/package.json index 48c22f7..ada82a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@funfunz/core", - "version": "0.23.0", + "version": "0.23.1", "description": "backoffice generator", "exports": { "./lib/index.js": "./lib/index.js" From bc708286aecf7bbe82204f87dbc222383f5181cf Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Mon, 7 Aug 2023 22:42:10 +0100 Subject: [PATCH 2/3] fixes to general types --- src/test/api.test.executable.ts | 3 ++- src/test/api.test.ts | 3 +-- src/test/generatedConfigsMysql/MCsettings.ts | 15 +++++++++++++++ src/test/graphql.test.ts | 3 +-- src/test/utils.ts | 8 -------- src/types/connector.ts | 2 -- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 src/test/generatedConfigsMysql/MCsettings.ts diff --git a/src/test/api.test.executable.ts b/src/test/api.test.executable.ts index e14d256..c600652 100644 --- a/src/test/api.test.executable.ts +++ b/src/test/api.test.executable.ts @@ -38,7 +38,8 @@ const application = new Funfunz({ } } }).middleware -const authApplication = authenticatedServer(application) +const authPort = 4052 +const authApplication = authenticatedServer(application, authPort) let familyTestName = 'TestFamily' diff --git a/src/test/api.test.ts b/src/test/api.test.ts index 57367f9..42dc94f 100644 --- a/src/test/api.test.ts +++ b/src/test/api.test.ts @@ -5,7 +5,7 @@ import { Funfunz } from '../middleware/index.js' import config from './configs/config.js' import entities from './configs/entities.js' import axios from 'axios' -import { authenticatedServer, closeConnections, server, stopDataConnectors } from './utils.js' +import { authenticatedServer, closeConnections, server } from './utils.js' let randomNumberCount = 4 @@ -73,7 +73,6 @@ test('api', async (t) => { t.after(async () => { await new Promise( (res) => { - stopDataConnectors([authFunfunz, simpleFunfunz]) closeConnections([authApplication, application], res) } ) diff --git a/src/test/generatedConfigsMysql/MCsettings.ts b/src/test/generatedConfigsMysql/MCsettings.ts new file mode 100644 index 0000000..645dd89 --- /dev/null +++ b/src/test/generatedConfigsMysql/MCsettings.ts @@ -0,0 +1,15 @@ +import familiesModel from './models/families' +import imagesModel from './models/images' +import productsModel from './models/products' +import rolesModel from './models/roles' +import usersModel from './models/users' +import usersrolesModel from './models/usersroles' + +export default [ + familiesModel, + imagesModel, + productsModel, + rolesModel, + usersModel, + usersrolesModel, +] diff --git a/src/test/graphql.test.ts b/src/test/graphql.test.ts index 1697f88..a4cac68 100644 --- a/src/test/graphql.test.ts +++ b/src/test/graphql.test.ts @@ -3,7 +3,7 @@ import test from 'node:test' import assert from 'node:assert' import config from './configs/config.js' import entities from './configs/entities.js' -import { authenticatedServer, closeConnections, server, stopDataConnectors } from './utils.js' +import { authenticatedServer, closeConnections, server } from './utils.js' import axios from 'axios' let funfunzInstance @@ -36,7 +36,6 @@ test('graphql', async (t) => { t.after(async () => { await new Promise( (res) => { - stopDataConnectors([funfunzInstance]) closeConnections([authApplication, simpleApplication], res) } ) diff --git a/src/test/utils.ts b/src/test/utils.ts index 171732a..b345bac 100644 --- a/src/test/utils.ts +++ b/src/test/utils.ts @@ -30,14 +30,6 @@ export function server(funfunz: Express, port: number): Server { return server.listen(port) } -export function stopDataConnectors(instances: Funfunz[]) { - instances.forEach( - (instance) => { - instance.stopDataConnectors() - } - ) -} - export function closeConnections(servers: Server[], cb: (boolean) => void) { if (servers.length === 0) { return diff --git a/src/types/connector.ts b/src/types/connector.ts index b98d9b2..37112f3 100644 --- a/src/types/connector.ts +++ b/src/types/connector.ts @@ -60,8 +60,6 @@ export abstract class DataConnector { public abstract create(args: ICreateArgs): Promise public abstract remove(args: IRemoveArgs): Promise - - public abstract stop(): void public abstract connection: unknown } From c16c932ad43bef5049195dbbf5d148d3a39d5fba Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Mon, 7 Aug 2023 22:43:32 +0100 Subject: [PATCH 3/3] removed unused functions --- src/middleware/dataConnector/index.ts | 8 -------- src/middleware/index.ts | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/middleware/dataConnector/index.ts b/src/middleware/dataConnector/index.ts index ea72704..277e43f 100644 --- a/src/middleware/dataConnector/index.ts +++ b/src/middleware/dataConnector/index.ts @@ -15,14 +15,6 @@ export const initDataConnectors = (funfunz: Funfunz): void => { ) } -export const stopDataConnectors = (): void => { - Object.entries(connectors).forEach( - ([key]) => { - connectors[key].stop() - } - ) -} - export const query = (connectorName: string, args: IQueryArgs): Promise => { return connectors[connectorName].query(args) } diff --git a/src/middleware/index.ts b/src/middleware/index.ts index 2e57bbb..0719db7 100644 --- a/src/middleware/index.ts +++ b/src/middleware/index.ts @@ -6,7 +6,6 @@ import { IFunfunzConfig } from './types.js' import { execute, ExecutionResult, GraphQLSchema, parse } from 'graphql' import { isPromise } from './utils/index.js' import { SchemaManager } from './graphql/manager.js' -import { stopDataConnectors } from './dataConnector/index.js' export * from './types.js' export class Funfunz { @@ -48,10 +47,6 @@ export class Funfunz { this.middleware = (new ExpressMiddleware(this)).express } - public stopDataConnectors(): void { - stopDataConnectors() - } - public static executeGraphQL(schema: GraphQLSchema, document: string, context?: unknown): Promise { const result = execute({ schema,