fix: remove bad prisma client on ctx check & export $settings (#60)

fix: remove back prisma client ctx check
fix: Export $settings from nexus-prisma package
fix: Tweak settings import from nexus-prisma/generator to not return anything, thus not leaking internal Setset API.
improve: trailing newline on generated .d.ts file

README.md

@@ -627,6 +627,7 @@ query {
   $settings({
     prismaClientImportId: '@my/custom/thing',
   })
+  ```
 
 ### Generator Settings
 

src/generator/gentime/settingsSingleton.ts

@@ -8,7 +8,7 @@ export namespace Gentime {
      * @default 'Int'
      */
     projectIdIntToGraphQL?: 'ID' | 'Int'
-	// TODO add some examples
+    // TODO add some examples
     /**
      * Should Prisma Schema docs propagate as docs?
      *
@@ -82,7 +82,7 @@ export namespace Gentime {
     },
   })
 
-  export function changeSettings(input: Setset.UserInput<SettingsInput>): Settings {
-    return settings.change(input)
+  export function changeSettings(input: Setset.UserInput<SettingsInput>): void {
+    settings.change(input)
   }
 }

src/generator/models/declaration.ts

@@ -1,5 +1,6 @@
 import { DMMF } from '@prisma/generator-helper'
 import dedent from 'dindist'
+import * as OS from 'os'
 import { LiteralUnion } from 'type-fest'
 import { StandardGraphQLScalarType, StandardgraphQLScalarTypes } from '../../helpers/graphql'
 import { PrismaScalarType } from '../../helpers/prisma'
@@ -32,7 +33,8 @@ export function renderTypeScriptDeclarationForDocumentModels(
   const models = dmmf.datamodel.models
   const enums = dmmf.datamodel.enums
 
-  return dedent`
+  return (
+    dedent`
     import * as Nexus from 'nexus'
     import * as NexusCore from 'nexus/dist/core'
 
@@ -116,7 +118,21 @@ export function renderTypeScriptDeclarationForDocumentModels(
             })
             .join('\n\n')
     }
-  `
+
+    //
+    //
+    // EXPORTS: OTHER
+    // EXPORTS: OTHER
+    // EXPORTS: OTHER
+    // EXPORTS: OTHER
+    //
+    //
+
+    import { Runtime } from '../generator/runtime/settingsSingleton'
+
+    export const $settings: typeof Runtime.changeSettings
+  ` + OS.EOL
+  )
 }
 
 function renderTypeScriptDeclarationForEnum(enum_: DMMF.DatamodelEnum, settings: Gentime.Settings): string {

src/generator/models/javascript.ts

@@ -66,7 +66,12 @@ export function createModuleSpec(gentimeSettings: Gentime.Settings): ModuleSpec
         }
       })
 
-      module.exports = models
+      const moduleExports = {
+        ...models,
+        $settings: Runtime.settings.change,
+      }
+
+      module.exports = moduleExports
     `,
   }
 }
@@ -170,13 +175,6 @@ export function prismaFieldToNexusResolver(
   }
 
   return (root: RecordUnknown, _args: RecordUnknown, ctx: RecordUnknown): MaybePromise<unknown> => {
-    if (!ctx.prisma) {
-      // TODO rich errors
-      throw new Error(
-        'Prisma client not found in context. Set a Prisma client instance to `prisma` field of Nexus context'
-      )
-    }
-
     const uniqueIdentifiers = resolveUniqueIdentifiers(model)
     const missingIdentifiers = findMissingUniqueIdentifiers(root, uniqueIdentifiers)
 

src/generator/runtime/settingsSingleton.ts

@@ -24,7 +24,7 @@ export namespace Runtime {
     },
   })
 
-  export function changeSettings(input: Setset.UserInput<SettingsInput>): Settings {
-    return settings.change(input)
+  export function changeSettings(input: Setset.UserInput<SettingsInput>): void {
+    settings.change(input)
   }
 }

tests/e2e/e2e.test.ts

@@ -172,9 +172,12 @@ it('When bundled custom scalars are used the project type checks and generates e
         require('dotenv').config()
 
         import { makeSchema, objectType, enumType, queryType } from 'nexus'
-        import { Bar, Foo, SomeEnumA } from 'nexus-prisma'
+        import { Bar, Foo, SomeEnumA, $settings } from 'nexus-prisma'
         import * as customScalars from 'nexus-prisma/scalars'
         import * as Path from 'path'
+
+        // Show that we can import and call settings as a NOOP
+        $settings({})
         
         const types = [
           customScalars,
@@ -294,6 +297,9 @@ it('When bundled custom scalars are used the project type checks and generates e
 
   expect(results.runFirstBuild.exitCode).toBe(2)
 
+  expect(stripAnsi(results.runFirstBuild.stdout)).toMatch(
+    /.*error TS2305: Module '"nexus-prisma"' has no exported member '\$settings'.*/
+  )
   expect(stripAnsi(results.runFirstBuild.stdout)).toMatch(
     /.*error TS2305: Module '"nexus-prisma"' has no exported member 'Bar'.*/
   )

tests/unit/typescriptDeclarationFile/__snapshots__/enum.test.ts.snap

@@ -107,7 +107,21 @@ declare namespace $Types {
   *
   * enumType(Foo)
   */
-export const Foo: $Types.Foo"
+export const Foo: $Types.Foo
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;
 
 exports[`When prisma enum has documentation then it is used for JSDoc and GraphQL enum description: index.d.ts 1`] = `
@@ -191,5 +205,19 @@ declare namespace $Types {
   *
   * enumType(Foo)
   */
-export const Foo: $Types.Foo"
+export const Foo: $Types.Foo
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;

tests/unit/typescriptDeclarationFile/__snapshots__/enumDoc.test.ts.snap

@@ -81,7 +81,21 @@ declare namespace $Types {
   *
   * enumType(Foo)
   */
-export const Foo: $Types.Foo"
+export const Foo: $Types.Foo
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;
 
 exports[`When an enum has no documentation comment, then it gets the default JSDoc and its description field is null: index.d.ts 1`] = `
@@ -191,5 +205,19 @@ declare namespace $Types {
   *
   * enumType(Foo)
   */
-export const Foo: $Types.Foo"
+export const Foo: $Types.Foo
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;

tests/unit/typescriptDeclarationFile/__snapshots__/modelDocumentation.test.ts.snap

@@ -157,7 +157,21 @@ export const SomeModel: $Types.SomeModel
 //
 //
 
-// N/A –– You have not defined any models in your Prisma schema file."
+// N/A –– You have not defined any models in your Prisma schema file.
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;
 
 exports[`When a model field has no documentation comment, then it gets the default JSDoc and its description field is null: index.d.ts 1`] = `
@@ -329,7 +343,21 @@ export const SomeModel: $Types.SomeModel
 //
 //
 
-// N/A –– You have not defined any models in your Prisma schema file."
+// N/A –– You have not defined any models in your Prisma schema file.
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;
 
 exports[`When a model has a documentation comment, then it is used for the JSDoc of that model and its $description field: index.d.ts 1`] = `
@@ -475,7 +503,21 @@ export const SomeModel: $Types.SomeModel
 //
 //
 
-// N/A –– You have not defined any models in your Prisma schema file."
+// N/A –– You have not defined any models in your Prisma schema file.
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;
 
 exports[`When a model has no documentation comment, then it gets the default JSDoc and its description field is null: index.d.ts 1`] = `
@@ -647,5 +689,19 @@ export const SomeModel: $Types.SomeModel
 //
 //
 
-// N/A –– You have not defined any models in your Prisma schema file."
+// N/A –– You have not defined any models in your Prisma schema file.
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;

tests/unit/typescriptDeclarationFile/__snapshots__/modelRelationFields.test.ts.snap

@@ -442,5 +442,19 @@ export const Post: $Types.Post
 //
 //
 
-// N/A –– You have not defined any models in your Prisma schema file."
+// N/A –– You have not defined any models in your Prisma schema file.
+
+//
+//
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+// EXPORTS: OTHER
+//
+//
+
+import { Runtime } from '../generator/runtime/settingsSingleton'
+
+export const $settings: typeof Runtime.changeSettings
+"
 `;