docs: list enum members in jsdoc (graphql-nexus#92)

chore: update roadmap docs: update to nexus@^1.1 api (graphql-nexus#95) chore(docs): tweak scalar writing feat: add support for Decimal scalar Update readme Fix syntax of example in readme feat: add support for BigInt scalar (graphql-nexus#56) Co-authored-by: Jason Kuhrt <jasonkuhrt@me.com> Update src/entrypoints/scalars.ts Issue comments Update src/scalars/Decimal.ts Co-authored-by: Jason Kuhrt <jasonkuhrt@me.com> Do not use Decimal in seed in e2e
iddan · Jul 27, 2021 · fc26f1b · fc26f1b
1 parent 98a2267
commit fc26f1b
Show file tree

Hide file tree

Showing 26 changed files with 1,005 additions and 444 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,11 @@
 {
-  "gitdoc.enabled": false
+  "search.exclude": {
+    "**/dist-cjs": true,
+    "**/dist-esm": true,
+    "**/__snapshots__": true,
+    "yarn.lock": true
+  },
+  "gitdoc.enabled": false,
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
 }
diff --git a/README.md b/README.md
@@ -38,7 +38,10 @@ Official Prisma plugin for Nexus.
   - [Project relation with custom resolver logic](#project-relation-with-custom-resolver-logic)
   - [Supply custom custom scalars to your GraphQL schema](#supply-custom-custom-scalars-to-your-graphql-schema)
 - [Notes](#notes)
-- [Supported Versions Of Node & Prisma](#supported-versions-of-node--prisma)
+  - [For users of `nexus-prisma@=<0.20`](#for-users-of-nexus-prisma020)
+  - [For users of `prisma@=<2.17`](#for-users-of-prisma217)
+  - [For users of `nexus@=<1.0`](#for-users-of-nexus10)
+  - [Supported Versions Of Node & Prisma](#supported-versions-of-node--prisma)
 
 <!-- tocstop -->
 
@@ -47,15 +50,17 @@ Official Prisma plugin for Nexus.
 1. Install dependencies
 
    ```
-   npm add nexus-prisma graphql @prisma/client
+   npm add nexus-prisma nexus graphql @prisma/client
    npm add --dev prisma
    ```
 
-   > `graphql` and `@prisma/client` are peer dependencies. `prisma` is for the Prisma CLI which you'll probably want during development.
+   > `nexus` `graphql` and `@prisma/client` are peer dependencies. `prisma` is for the Prisma CLI which you'll probably want during development.
+
+   > If you use `nexus@=<1.0` then you must use `t.field(<NAME>, <CONFIG>)` instead of `t.field(<CONFIG>)`. The Nexus Prisma docs assume the latter form.
 
 1. Add a `nexus-prisma` generator block to your Prisma Schema.
 
-   > If you are using `prisma@=<2.17.x` then you must use the Nexus Prisma Prisma generator name of `nexus_prisma` instead of `nexus-prisma`. See [notes](#notes) for more detail.
+   > If you are using `prisma@=<2.17` then you must use the Nexus Prisma Prisma generator name of `nexus_prisma` instead of `nexus-prisma`. See [notes](#notes) for more detail.
 
 1. Run `prisma generate` in your terminal.
 
@@ -71,7 +76,7 @@ generator client {
 
 generator nexusPrisma {
    provider = "nexus-prisma"
-// provider = "nexus_prisma" <-- For prisma@=<2.17.x users
+// provider = "nexus_prisma"    <-- For prisma@=<2.17 users
 }
 
 /// This is a user!
@@ -95,7 +100,8 @@ export const schema = makeSchema({
       name: User.$name
       description: User.$description
       definition(t) {
-        t.field(User.id.name, User.id)
+        t.field(User.id)
+     // t.field(User.id.name, User.id)    <-- For nexus@=<1.0 users
       }
     })
   ]
@@ -112,17 +118,21 @@ export const schema = makeSchema({
 - [x] ([#25](https://github.com/prisma/nexus-prisma/pull/25), [#36](https://github.com/prisma/nexus-prisma/issues/36)) Basic support for Prisma Model field types relating to other Models 1:1
 - [x] ([#38](https://github.com/prisma/nexus-prisma/pull/38)) Basic support for Prisma Model field types relating to other Models 1:n
 - [x] ([#43](https://github.com/prisma/nexus-prisma/issues/43)) Support for runtime and gentime settings
+- [x] ([#61](https://github.com/prisma/nexus-prisma/issues/61)) JSDoc for settings/$settings
+- [x] ([#68](https://github.com/prisma/nexus-prisma/issues/68)) Support for Prisma Model field type `Bytes`
 
 ##### Shortterm
 
+- [x] ([#94](https://github.com/prisma/nexus-prisma/issues/94)) Support for Prisma Model field type `Decimal`
+- [x] ([#59](https://github.com/prisma/nexus-prisma/issues/59)) Support for Prisma Model field type `BigInt`
 - [ ] Improved JSDoc for relation 1:1 & 1:n fields
-- [ ] Improved JSDoc for settings
 
 ##### Midterm
 
-- [ ] Support for Prisma Model field types of remaining scalars (`Decimal`, etc.)
 - [ ] Support for Prisma Model field types relating to other Models n:n
 - [ ] Support for relation field ordering parameters
+- [ ] ([#83](https://github.com/prisma/nexus-prisma/issues/83)) Support for relation field filtering parameters
+- [ ] Support for relation field pagination parameters
 
 ##### Longterm
 
@@ -163,7 +173,7 @@ objectType({
   name: User.$name
   description: User.$description
   definition(t) {
-    t.field(User.id.name, {
+    t.field({
       type: User.id.type,
       description: User.id.description
     })
@@ -209,19 +219,24 @@ Like GraphQL, [Prisma has the concept of scalar types](https://www.prisma.io/doc
 
 However some of the Prisma scalars do not have a natural standard representation in GraphQL. For these cases Nexus Prisma generates code that references type names matching those scalar names in Prisma. Then, you are expected to define those custom scalar types in your GraphQL API. Nexus Prisma ships with pre-defined mappings in `nexus-prisma/scalars` you _can_ use for convenience. The mapping is as follows:
 
-**Prisma Standard Scalar to GraphQL Custom Scalar Mapping**
+**Prisma Standard-Scalar to GraphQL Custom-Scalar Mapping**
+
+| Prisma     | GraphQL    | Nexus `t` Helper | GraphQL Scalar Implementation                                         | Additional Info                                                                                              |
+| ---------- | ---------- | ---------------- | --------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+| `Json`     | `Json`     | `json`           | [JsonObject](https://www.graphql-scalars.dev/docs/scalars/jsonobject) |                                                                                                              |
+| `DateTime` | `DateTime` | `dateTime`       | [DateTime](https://www.graphql-scalars.dev/docs/scalars/datetime)     |                                                                                                              |
+| `Decimal`  | `Decimal`  | `decimal`        |                                                                       |                                                                                                              |
+| `BigInt`   | `BigInt`   | `bigInt`         | [BigInt](https://www.graphql-scalars.dev/docs/scalars/big-int)        | [JavaScript BigInt](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt) |
+| `Bytes`    | `Bytes`    | `bytes`          | [Byte](https://www.graphql-scalars.dev/docs/scalars/byte/)            | [Node.js Buffer](https://nodejs.org/api/buffer.html#buffer_buffer)                                           |
+| `Decimal`  | `Decimal`  | `decimal`        | (internal)                                                            | Uses [Decimal.js](https://github.com/MikeMcl/decimal.js)                                                     |
 
-| Prisma     | GraphQL    | Nexus `t` Helper | GraphQL Scalar Implementation                                     |
-| ---------- | ---------- | ---------------- | ----------------------------------------------------------------- |
-| `Json`     | `Json`     | `json`           | [JsonObject](https://github.com/Urigo/graphql-scalars#jsonobject) |
-| `DateTime` | `DateTime` | `dateTime`       | [DateTime](https://github.com/Urigo/graphql-scalars#datetime)     |
-| `Bytes`    | `Bytes`    | `bytes`          | [Bytes](https://www.graphql-scalars.dev/docs/scalars/byte/)       |
+> **Note:** Not all Prisma scalar mappings are implemented yet: `Unsupported`
 
-> **Note:** Not all Prisma scalar mappings are implemented yet: `BigInt`, `Decimal`, `Unsupported`
+> **Note:** BigInt is supported in Node.js since version [10.4.0](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#browser_compatibility) however to support BigInt in `JSON.parse`/`JSON.stringify` you must use [`json-bigint-patch`](https://github.com/ardatan/json-bigint-patch) otherwise BigInt values will be serialized as strings.
 
-While you are not required to use the implementations supplied by Nexus Prisma, you _are required to define custom scalars whose name matches the above mapping_.
+You can use your own GraphQL Scalar Implementation, however, you _must adhear to the above Prisma/GraphQL name mapping defined above_.
 
-Here is an example using the Nexus Prisma pre-defined custom scalars:
+Here is an example using Nexus Prisma's pre-defined GraphQL custom scalars:
 
 ```ts
 import NexusPrismaScalars from 'nexus-prisma/scalars'
@@ -308,15 +323,15 @@ queryType({
 objectType({
   name: User.$name,
   definition(t) {
-    t.field(User.id.name, User.id)
-    t.field(User.profile.name, User.profile)
+    t.field(User.id)
+    t.field(User.profile)
   },
 })
 
 objectType({
   name: Profile.$name,
   definition(t) {
-    t.field(Profile.id.name, Profile.id)
+    t.field(Profile.id)
   },
 })
 ```
@@ -406,16 +421,16 @@ import { User, Profile } from 'nexus-prisma'
 objectType({
   name: User.$name,
   definition(t) {
-    t.field(User.id.name, User.id)
-    t.field(User.profile.name, User.profile)
+    t.field(User.id)
+    t.field(User.profile)
   },
 })
 
 objectType({
   name: Profile.$name,
   definition(t) {
-    t.field(Profile.id.name, Profile.id)
-    t.field(User.profile.name, User.profile)
+    t.field(Profile.id)
+    t.field(User.profile)
   },
 })
 ```
@@ -438,8 +453,8 @@ This limitation may be a problem for your API. There is an [issue track this tha
 objectType({
   name: Profile.$name,
   definition(t) {
-    t.field(Profile.id.name, Profile.id)
-    t.field(User.profile.name, {
+    t.field(Profile.id)
+    t.field({
       ...User.profile,
       type: nonNull(User.profile.type),
     })
@@ -494,15 +509,15 @@ queryType({
 objectType({
   name: User.$name,
   definition(t) {
-    t.field(User.id.name, User.id)
-    t.field(User.posts.name, User.posts)
+    t.field(User.id)
+    t.field(User.posts)
   },
 })
 
 objectType({
   name: Post.$name,
   definition(t) {
-    t.field(Post.id.name, Post.id)
+    t.field(Post.id)
   },
 })
 ```
@@ -708,7 +723,7 @@ objectType({
   name: User.$name
   description: User.$description
   definition(t) {
-    t.field(User.id.name, User.id)
+    t.field(User.id)
   }
 })
 ```
@@ -742,7 +757,7 @@ objectType({
   name: User.$name
   description: User.$description
   definition(t) {
-    t.field(User.id.name, User.id)
+    t.field(User.id)
   }
 })
 ```
@@ -761,6 +776,8 @@ type User {
 
 #### As JSDoc
 
+Can be disabled in [gentime settings](https://pris.ly/nexus-prisma/docs/settings/gentime).
+
 ```prisma
 /// A user.
 model User {
@@ -780,9 +797,10 @@ User.id // JSDoc: A stable identifier to find users by.
 
 These are finer points that aren't perhaps worth a top-level point but none the less add up toward a thoughtful developer experience.
 
-##### Default JSDoc
+##### JSDoc
 
-Fields and models that you do not document will result in a helpful default JSDoc that teaches you about this.
+- Generated Nexus configuration for fields and models that you _have not_ documented in your PSL get default JSDoc that teaches you how to do so.
+- JSDoc for Enums have their members embedded
 
 ##### Default Runtime
 
@@ -815,8 +833,8 @@ Nexus Prisma generates default GraphQL resolvers for your model _relation fields
    objectType({
      name: User.$name,
      definition(t) {
-       t.field(User.id.name, User.id)
-       t.field(User.posts.name, {
+       t.field(User.id)
+       t.field({
          ...User.posts,
          async resolve(...args) {
            // Your custom before-logic here
@@ -835,8 +853,8 @@ Nexus Prisma generates default GraphQL resolvers for your model _relation fields
    objectType({
      name: User.$name,
      definition(t) {
-       t.field(User.id.name, User.id)
-       t.field(User.posts.name, {
+       t.field(User.id)
+       t.field({
          ...User.posts,
          async resolve(...args) {
            // Your custom logic here
@@ -870,11 +888,37 @@ makeSchema({
 
 ## Notes
 
-- Versions of `nexus-prisma` package prior to `0.20` were a completely different version of the API, and had also become deprecated at one point to migrate to `nexus-plugin-prisma` when Nexus Framework was being worked on. All of that is history.
+### For users of `nexus-prisma@=<0.20`
+
+Versions of `nexus-prisma` package prior to `0.20` were a completely different version of the API, and had also become deprecated at one point to migrate to `nexus-plugin-prisma` when Nexus Framework was being worked on. All of that is history.
+
+### For users of `prisma@=<2.17`
+
+If you are using `prisma@=<2.17` then you must use the Nexus Prisma Prisma generator name of `nexus_prisma` instead of `nexus-prisma`. This is because prior to `prisma@2.18` there was a hardcode check for `nexus-prisma` that would fail with an error message about a now-old migration.
+
+### For users of `nexus@=<1.0`
+
+The [release of Nexus 1.1](https://github.com/graphql-nexus/nexus/releases/tag/1.0.0) introduced an overload to `t.field` allowing improved usage of Nexus Prisma. The difference is as follows. Note if you prefer the older way that is and always will be supported too.
+
+```diff ts
+import { User } from 'nexus-prisma'
+import { makeSchema, objectType } from 'nexus'
 
-- If you are using `prisma@=<2.17.x` then you must use the Nexus Prisma Prisma generator name of `nexus_prisma` instead of `nexus-prisma`. This is because prior to `prisma@2.18.x` there was a hardcode check for `nexus-prisma` that would fail with an error message about a now-old migration.
+export const schema = makeSchema({
+  types: [
+    objectType({
+      name: User.$name
+      description: User.$description
+      definition(t) {
++        t.field(User.id) //                 <-- for nexus@>=1.1 users
+-        t.field(User.id.name, User.id) //   <-- For nexus@=<1.0 users
+      }
+    })
+  ]
+})
+```
 
-## Supported Versions Of Node & Prisma
+### Supported Versions Of Node & Prisma
 
 We only officially support what we test.
 

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "jest-watch-typeahead": "0.6.4",
     "lodash": "^4.17.21",
     "markdown-toc": "^1.2.0",
-    "nexus": "^1.0.0",
+    "nexus": "^1.1.0",
     "nodemon": "^2.0.7",
     "prettier": "2.3.1",
     "prisma": "2.25.0",
@@ -87,6 +87,7 @@
   "dependencies": {
     "@prisma/generator-helper": "^2.25.0",
     "debug": "^4.3.1",
+    "decimal.js": "^10.3.1",
     "dindist": "^1.0.2",
     "fs-jetpack": "^4.1.0",
     "graphql-scalars": "^1.10.0",

diff --git a/src/entrypoints/scalars.ts b/src/entrypoints/scalars.ts
@@ -1,19 +1,24 @@
+import { BigInt } from '../scalars/BigInt'
+import { Bytes } from '../scalars/Bytes'
 import { DateTime } from '../scalars/DateTime'
 import { Json } from '../scalars/Json'
-import { Bytes } from '../scalars/Bytes'
+import { Decimal } from '../scalars/Decimal'
 
 /**
  * Predefined Nexus scalar type definitions to satisfy all custom scalars needed in GraphQL to map to the
  * native scalars in Prisma. The mapping is as follows:
  *
- * | Prisma | GraphQL | Nexus `t` Helper | GraphQL Scalar Implementation |
- * | ---------- | ---------- | ---- | ----------------------------------------------------------------- |
- * | `Json` | `Json` | `json` | [JsonObject](https://github.com/Urigo/graphql-scalars#jsonobject) |
- * | `DateTime` | `DateTime` | `datetime` | [DateTime](https://github.com/Urigo/graphql-scalars#datetime) |.
+ * | Prisma     | GraphQL    | Nexus `t` Helper | GraphQL Scalar Implementation                                         | Additional Info                                                                                              |
+ * | ---------- | ---------- | ---------------- | --------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+ * | `Json`     | `Json`     | `json`           | [JsonObject](https://www.graphql-scalars.dev/docs/scalars/jsonobject) |                                                                                                              |
+ * | `DateTime` | `DateTime` | `dateTime`       | [DateTime](https://www.graphql-scalars.dev/docs/scalars/datetime)     |                                                                                                              |
+ * | `Decimal`  | `Decimal`  | `decimal`        | (internal)                                                            | Uses [Decimal.js](https://github.com/MikeMcl/decimal.js)                                                     |
+ * | `BigInt`   | `BigInt`   | `bigInt`         | [BigInt](https://www.graphql-scalars.dev/docs/scalars/big-int)        | [JavaScript BigInt](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt) |
+ * | `Bytes`    | `Bytes`    | `bytes`          | [Byte](https://www.graphql-scalars.dev/docs/scalars/byte/)            | [Node.js Buffer](https://nodejs.org/api/buffer.html#buffer_buffer)                                           |
  *
  * @example
  *
- *   // Use this defualt export
+ *   // Use this default export
  *
  *   import { makeSchema, objectType } from 'nexus'
  *   import NexusPrismaScalars from 'nexus-prisma/scalars'
@@ -35,7 +40,7 @@ import { Bytes } from '../scalars/Bytes'
  *
  * @example
  *
- *   // Use only select precefined custom scalars
+ *   // Use only select predefined custom scalars
  *
  *   import { makeSchema, objectType } from 'nexus'
  *   import { Json } from 'nexus-prisma/scalars'
@@ -70,11 +75,13 @@ import { Bytes } from '../scalars/Bytes'
  *          API. For convenience you can use these ones.
  */
 const NexusPrismaScalars = {
+  BigInt,
   Bytes,
   DateTime,
+  Decimal,
   Json,
 }
 
 export default NexusPrismaScalars
 
-export { Bytes, DateTime, Json }
+export { Bytes, BigInt, DateTime, Decimal, Json }