From 8555eb194053719153b62350ae4ffd65897ebb44 Mon Sep 17 00:00:00 2001 From: aexol Date: Fri, 12 Jan 2024 11:33:13 +0100 Subject: [PATCH] fixed typings --- README.md | 8 +------- examples/olympus/.graphql.demeter.js | 10 +++++++++- examples/olympus/package.json | 6 +++--- package.json | 4 +++- packages/graphql-demeter-core/package.json | 2 +- packages/graphql-demeter-core/src/MockServer/models.ts | 2 +- packages/graphql-demeter-core/src/index.ts | 2 +- packages/graphql-demeter/package.json | 4 ++-- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d6031b2..35401cc 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,6 @@ Mock server should be running on port 4000 ## Configuration Demeter will automatically create config file on the first start `.graphql.demeter.js`. - -![](./readme.png) - As you can see if you provide type it will autocomplete faker values ```js @@ -40,16 +37,13 @@ const config = { objects: { Card:{ description:{ - type:"values", values:["Very powerful card", "Most fire resistant character", "Good melee fighter"] }, name:{ - type:"values", values:["Zeus", "Athena", "Hera", "Ares", "Kronos"] }, image:{ - type:"faker", - key:"internet.avatar" + fake:"internet.avatar" } } }, diff --git a/examples/olympus/.graphql.demeter.js b/examples/olympus/.graphql.demeter.js index dc2af6b..518b8a7 100644 --- a/examples/olympus/.graphql.demeter.js +++ b/examples/olympus/.graphql.demeter.js @@ -9,8 +9,16 @@ const config = { values:["Zeus", "Athena", "Hera", "Ares", "Kronos"] }, image:{ - key: "image.people" + fake: "image.people" } + }, + S3Object:{ + bucket:{ + fake: "address.country" + }, + region:{ + fake: "address.country" + }, } }, scalars: {}, diff --git a/examples/olympus/package.json b/examples/olympus/package.json index 4c75b7a..502c28c 100644 --- a/examples/olympus/package.json +++ b/examples/olympus/package.json @@ -1,15 +1,15 @@ { "name": "olympus", - "version": "1.1.4", + "version": "1.1.5", "description": "Example of using GraphQL Demeter", "private": true, "main": "index.js", "scripts": { - "start": "node ../../node_modules/.bin/demeter zeus.graphql" + "start": "nodemon --watch .graphql.demeter.js ../../node_modules/graphql-demeter/lib/index.js zeus.graphql" }, "author": "Aexol (http://aexol.com)", "license": "ISC", "dependencies": { - "graphql-demeter": "^1.0.1" + "graphql-demeter": "^1.0.2" } } diff --git a/package.json b/package.json index f8fb920..b2c21db 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "clean-packages": "rimraf packages/**/lib && rimraf packages/**/tsconfig.tsbuildinfo", "build": "npm run clean-packages && npm run build --ws --if-present", "lint": "tspc && eslint \"./packages/**/src/**/*.{ts,js}\" --quiet --fix", - "cli": "node ./packages/graphql-demeter/lib/index.js", + "dev": "npm run build && concurrently \"npm run start -w graphql-demeter-core\" \"npm run start -w graphql-demeter\" \"npm run start -w olympus\" ", "example": "npm run start -w olympus", "run-example": "npm run build && npm run example", "test": "jest" @@ -28,11 +28,13 @@ "@types/node": "^20.10.5", "@typescript-eslint/eslint-plugin": "^6.16.0", "@typescript-eslint/parser": "^6.16.0", + "concurrently": "^8.2.2", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.2", "husky": "^8.0.3", "jest": "^29.7.0", + "nodemon": "^3.0.2", "prettier": "^3.1.1", "rimraf": "^5.0.5", "ts-jest": "^29.1.1", diff --git a/packages/graphql-demeter-core/package.json b/packages/graphql-demeter-core/package.json index b99fec0..6f1d4d6 100644 --- a/packages/graphql-demeter-core/package.json +++ b/packages/graphql-demeter-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-demeter-core", - "version": "1.0.1", + "version": "1.0.2", "private": false, "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/graphql-demeter-core/src/MockServer/models.ts b/packages/graphql-demeter-core/src/MockServer/models.ts index 4a3c131..8cfed4d 100644 --- a/packages/graphql-demeter-core/src/MockServer/models.ts +++ b/packages/graphql-demeter-core/src/MockServer/models.ts @@ -43,7 +43,7 @@ export type FakerConfiguratedField = values: Array; } | { - key: AllowedFakerStrings; + fake: AllowedFakerStrings; }; export type FakerConfig = { diff --git a/packages/graphql-demeter-core/src/index.ts b/packages/graphql-demeter-core/src/index.ts index 8cf174c..7268f2c 100644 --- a/packages/graphql-demeter-core/src/index.ts +++ b/packages/graphql-demeter-core/src/index.ts @@ -61,7 +61,7 @@ export const createFakeResolvers = (schemaString: string, fakerConfig?: FakerCon if ([ScalarTypes.ID, ScalarTypes.String].includes(tName as ScalarTypes)) { return mockValue(a.type.fieldType, () => { const valueFromFaker = - resolverValues && 'key' in resolverValues ? fakeValue(resolverValues.key) : fakeValue(a.name); + resolverValues && 'fake' in resolverValues ? fakeValue(resolverValues.fake) : fakeValue(a.name); if (typeof valueFromFaker !== 'string') { return fakeScalar(tName)(); } diff --git a/packages/graphql-demeter/package.json b/packages/graphql-demeter/package.json index 59943b1..b957d18 100644 --- a/packages/graphql-demeter/package.json +++ b/packages/graphql-demeter/package.json @@ -1,6 +1,6 @@ { "name": "graphql-demeter", - "version": "1.0.1", + "version": "1.0.2", "private": false, "scripts": { "start": "tspc --watch", @@ -26,7 +26,7 @@ "dependencies": { "cross-fetch": "^3.0.4", "graphql": "15.4.0", - "graphql-demeter-core": "^1.0.1", + "graphql-demeter-core": "^1.0.2", "graphql-yoga": "^5.1.1", "yargs": "^16.1.1" },