Merge branch 'release/0.6.3'

Cauen · Nov 9, 2023 · 78e22e3 · 78e22e3
2 parents 4f64024 + 91cf1b8
commit 78e22e3
Show file tree

Hide file tree

Showing 62 changed files with 3,156 additions and 2,976 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,17 +1,27 @@
 {
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier",
-    "plugin:prettier/recommended",
-    "plugin:import/recommended",
-    "plugin:import/typescript"
-  ],
+  "extends": ["standard", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
   "env": {
-    "node": true,
+    "node": true
   },
   "ignorePatterns": ["examples/*"],
   "rules": {
+    "prettier/prettier": [
+      "error",
+      {
+        "semi": false,
+        "printWidth": 120,
+        "tabWidth": 2,
+        "tabs": false,
+        "singleQuote": true,
+        "quoteProps": "consistent",
+        "jsxSingleQuote": false,
+        "trailingComma": "all",
+        "bracketSpacing": true,
+        "bracketSameLine": false,
+        "arrowParens": "always",
+        "endOfLine": "auto"
+      }
+    ],
     "@typescript-eslint/no-unused-vars": [
       "warn",
       { 
@@ -28,5 +38,11 @@
         "caseInsensitive": true
       }
     }]
+  },
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
   }
 }
diff --git a/.prettierrc b/.prettierrc
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
     "files.eol": "\n",
+    "typescript.tsdk": "node_modules/typescript/lib",
 }
diff --git a/README.md b/README.md
@@ -183,6 +183,8 @@ module.exports = {
       exportEverythingInObjectsDotTs?: boolean;
       /** Map all Prisma fields with "@id" attribute to Graphql "ID" Scalar. Default: 'Objects' */
       mapIdFieldsToGraphqlId?: false | 'Objects';
+      /** Change the generated variables from object.base.ts from something like `UserName` to `User_Name`. This avoids generated duplicated names in some cases. See [issue #58](https://github.com/Cauen/prisma-generator-pothos-codegen/issues/58). Default: false */
+      underscoreBetweenObjectVariableNames?: false | 'Objects';
     };
     /** Global config */
     global?: {

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,16 @@
 # Changelog
 
+# 0.6.3
+
+- [x] Upgrade: Update prisma to latest version
+ - Remove distinct from count https://github.com/prisma/prisma/issues/4228
+- [x] Improve: Remove tokenizr dep
+ - Add tests for comments parser
+- [x] Upgrade: Update dependancies and peerDependancies
+- [x] Improve: Update prettier and eslint (to remove some conflicts)
+- [x] Chore: Eslint remove semicolon
+- [x] Feature: New option `config.crud.underscoreBetweenObjectVariableNames` change the generated variables from object.base.ts from something like `UserName` to `User_Name`. This avoids generated duplicated names in some cases. Fixes #58
+
 # 0.6.2
 
 - [x] Fix: The builder path is incorrect in Windows #55

diff --git a/examples/inputs-simple-sqlite/package.json b/examples/inputs-simple-sqlite/package.json
@@ -21,13 +21,13 @@
   "dependencies": {
     "@pothos/core": "^3.23.0",
     "@pothos/plugin-prisma": "^3.57.0",
-    "@prisma/client": "^5.1.1",
+    "@prisma/client": "^5.5.2",
     "@swc-node/register": "^1.5.1",
     "@swc/core": "^1.3.24",
     "apollo-server": "^3.9.0",
     "graphql": "^16.6.0",
-    "prisma": "^5.1.1",
+    "prisma": "^5.5.2",
     "ts-node": "^10.8.2",
-    "typescript": "^4.9.4"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/...prisma/migrations/20231109185946_userlast_model_for_checking_new_constraint/migration.sql b/...prisma/migrations/20231109185946_userlast_model_for_checking_new_constraint/migration.sql
@@ -0,0 +1,5 @@
+-- CreateTable
+CREATE TABLE "UserLast" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL
+);
diff --git a/examples/inputs-simple-sqlite/prisma/schema.prisma b/examples/inputs-simple-sqlite/prisma/schema.prisma
@@ -42,6 +42,12 @@ model User {
   Following Follow[]  @relation("following")
 }
 
+/// Its for check for duplicating User.LastName and UserLast.Name
+model UserLast {
+  id   Int    @id @default(autoincrement())
+  name String
+}
+
 model Post {
   id       Int       @id @default(autoincrement())
   title    String

diff --git a/examples/inputs-simple-sqlite/src/generated/objects.d.ts b/examples/inputs-simple-sqlite/src/generated/objects.d.ts
@@ -1,5 +1,5 @@
 /* eslint-disable */
-import type { Prisma, User, Post, ExtraModal, Comment, Profile, Follow, Unrelated, IdOnly, WithoutID, WithScalars } from ".prisma/client";
+import type { Prisma, User, UserLast, Post, ExtraModal, Comment, Profile, Follow, Unrelated, IdOnly, WithoutID, WithScalars } from ".prisma/client";
 export default interface PrismaTypes {
     User: {
         Name: "User";
@@ -36,6 +36,20 @@ export default interface PrismaTypes {
             };
         };
     };
+    UserLast: {
+        Name: "UserLast";
+        Shape: UserLast;
+        Include: never;
+        Select: Prisma.UserLastSelect;
+        OrderBy: Prisma.UserLastOrderByWithRelationInput;
+        WhereUnique: Prisma.UserLastWhereUniqueInput;
+        Where: Prisma.UserLastWhereInput;
+        Create: {};
+        Update: {};
+        RelationName: never;
+        ListRelations: never;
+        Relations: {};
+    };
     Post: {
         Name: "Post";
         Shape: Post;

diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/Comment/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/Comment/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/ExtraModal/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/ExtraModal/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/Follow/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/Follow/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/IdOnly/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/IdOnly/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/Post/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/Post/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/Profile/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/Profile/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/Unrelated/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/Unrelated/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/UserLast/index.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/UserLast/index.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/UserLast/object.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/UserLast/object.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/WithScalars/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/WithScalars/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/WithoutID/queries/count.base.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/WithoutID/queries/count.base.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/autocrud.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/autocrud.ts
diff --git a/examples/inputs-simple-sqlite/src/schema/__generated__/inputs.ts b/examples/inputs-simple-sqlite/src/schema/__generated__/inputs.ts