Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b0c8912
renamend createContextModel > createModel; renamed Context-Type > Bui…
lordnox Jul 15, 2019
cbb4520
Merge branch 'master' of https://github.com/lordnox/gram
lordnox Jul 15, 2019
1eb7548
renamed context in most cases
lordnox Jul 15, 2019
ce792fb
renamend inference type Context > BuildMode
lordnox Jul 15, 2019
bd35d11
added basic buildmode generator
lordnox Jul 15, 2019
3877465
cleanup work in new builder module
lordnox Jul 15, 2019
e11b0db
added different ways to add Types
lordnox Jul 15, 2019
6ce8ddf
restructured create-build to own directory
lordnox Jul 15, 2019
6603ea8
more restructuring and refactoring
lordnox Jul 15, 2019
08868d6
foundation for build extensions
lordnox Jul 15, 2019
0f62fa6
added basic model extension
lordnox Jul 15, 2019
ba02986
updated type handling to enable interfaces; fixed broken tests;
lordnox Jul 15, 2019
c361b59
updated addResource to handle configruation objects
lordnox Jul 17, 2019
b89d038
moved all input-types to input-types.ts; updated typing of AddResolvable
lordnox Jul 18, 2019
7ff82b5
changed createInputType
lordnox Jul 18, 2019
df803f4
refactored data-types into one file
lordnox Jul 18, 2019
fc11ff4
found bug that removed all attributes
lordnox Jul 18, 2019
fd9b72f
added order-enum exception
lordnox Jul 19, 2019
486560f
added enum rendering to createBuild
lordnox Jul 19, 2019
1aa4711
moved to handle all types with the FieldType type; user input can be …
lordnox Jul 19, 2019
c123b1f
almost working build extension
lordnox Jul 20, 2019
832aa44
added resolvers from models to build
lordnox Jul 22, 2019
3d6a810
fixed some typings
lordnox Jul 22, 2019
0735d8c
fixed test; updated tests to conform to new Service-context addition
lordnox Jul 22, 2019
a5aead1
updated attributeBuilder:resolve; fixed tests
lordnox Jul 22, 2019
2c48daa
fixed multi interface models
lordnox Jul 22, 2019
6c8205c
removed console.log's
lordnox Jul 22, 2019
c4394bf
fixed typings in utils
lordnox Jul 22, 2019
423f730
update modules
lordnox Jul 22, 2019
91892a3
fixed another typing problem
lordnox Jul 22, 2019
941faab
Merge branch 'master' into redesign-to-enable-typedef-output
lordnox Jul 22, 2019
54cc3f7
removed node 9 from travis
lordnox Jul 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ cache:
notifications:
email: travisci+gram@raynode.de
node_js:
- '9'
- '10'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
102 changes: 80 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,32 +43,33 @@
"@saeris/graphql-scalars": "^1.3.3",
"@types/graphql-type-json": "^0.3.0",
"graphql-subscriptions": "^1.1.0",
"graphql-tools": "^4.0.5",
"graphql-type-json": "^0.3.0",
"inflection": "^1.12.0",
"lodash": "^4.17.11",
"snyk": "^1.189.0"
"lodash": "^4.17.15",
"snyk": "^1.195.1"
},
"peerDependencies": {
"graphql": "^14.3.1"
"graphql": "^14.4.2"
},
"devDependencies": {
"@types/graphql": "^14.2.0",
"@types/graphql": "^14.2.2",
"@types/inflection": "^1.5.28",
"@types/jest": "^24.0.13",
"@types/lodash": "^4.14.134",
"@types/uuid": "^3.4.4",
"coveralls": "^3.0.4",
"graphql": "^14.3.1",
"husky": "^3.0.0",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.136",
"@types/uuid": "^3.4.5",
"coveralls": "^3.0.5",
"graphql": "^14.4.2",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.0.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"typescript": "^3.5.1",
"semantic-release": "^15.13.12"
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"semantic-release": "^15.13.18"
},
"snyk": true
}
22 changes: 19 additions & 3 deletions src/__snapshots__/schemaBuilder.spec.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ exports[`example should add User to the Schema 1`] = `
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -215,7 +214,6 @@ input CreateUserData {
deletedAt: DateTime
}

\\"\\"\\"Use JavaScript Date object for date/time fields.\\"\\"\\"
scalar DateTime

interface List {
Expand DownExpand Up@@ -372,6 +370,24 @@ Object {
`;

exports[`schemaBuilder should render an empty Schema 1`] = `
"type Query
"scalar DateTime

interface List {
page: Page
nodes: [Node!]!
}

interface Node {
id: ID
createdAt: DateTime
updatedAt: DateTime
deletedAt: DateTime
}

type Page {
page: Int
limit: Int
offset: Int
}
"
`;
29 changes: 15 additions & 14 deletions src/attributeBuilder.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import {
GraphQLFieldResolver,
GraphQLNonNull,
GraphQLOutputType,
GraphQLType,
isType,
} from 'graphql'
import { IFieldResolver } from 'graphql-tools'
import {
AttributeBuilder,
ContextFn,
Expand All@@ -16,31 +16,32 @@ import {
import { ATTRIBUTEBUILDER } from './types/constants'
import { toList } from './utils'

export const buildType = <Context>(
attr: AttributeBuilder<Context, any, any>,
context: Wrapped<Context>,
export const buildType = <BuildMode>(
attr: AttributeBuilder<BuildMode, any, any>,
buildMode: Wrapped<BuildMode>,
): GraphQLOutputType => {
const type = attr.field(context)
const gqlType = isType(type) ? type : context.getModel(type.name).getType()
const type = attr.field(buildMode)
const gqlType = isType(type) ? type : buildMode.getModel(type.name).getType()
if (attr.listType) return toList(gqlType) as GraphQLOutputType
if (!attr.nullable) return GraphQLNonNull(gqlType)
return gqlType as GraphQLOutputType
}

export const createAttributeBuilder = <Context, Type, AttributeType>(
export const createAttributeBuilder = <BuildMode, Type, AttributeType>(
name: string,
field: ContextFn<Context, ModelType<Context>>,
): AttributeBuilder<Context, Type, AttributeType> => {
let resolve: GraphQLFieldResolver<Type, Context>
const builder: AttributeBuilder<Context, Type, AttributeType> = {
field: ContextFn<BuildMode, ModelType<BuildMode>>,
): AttributeBuilder<BuildMode, Type, AttributeType> => {
let resolve: IFieldResolver<Type, any>
const builder: AttributeBuilder<BuildMode, Type, AttributeType> = {
name,
field,
nullable: true,
listType: false,
resolve: (resolveFn: GraphQLFieldResolver<Type, Context>) => {
resolve: <Context>(resolveFn: IFieldResolver<Type, Context>) => {
resolve = resolveFn
return builder
},
getResolver: () => resolve,
isList: (isList = true) => {
builder.listType = true
return builder
Expand All@@ -49,8 +50,8 @@ export const createAttributeBuilder = <Context, Type, AttributeType>(
builder.nullable = !isNotNullable
return builder
},
build: context => ({
type: buildType<Context>(builder, context),
build: buildMode => ({
type: buildType<BuildMode>(builder, buildMode),
resolve,
}),
type: ATTRIBUTEBUILDER,
Expand Down
Loading