Skip to content

Commit 09722e6

Browse files
pantharshit00pantharshit00
authored
Merge pull request #43 from pantharshit00/degueba/master
2 parents fb5b099 + c48d6f6 commit 09722e6

File tree

5 files changed

+1209
-1276
lines changed

5 files changed

+1209
-1276
lines changed

‎package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@
3030
"url": "https://github.com/pantharshit00/prisma-docs-generator/issues"
3131
},
3232
"dependencies": {
33-
"@prisma/generator-helper": "^2.21.0",
34-
"@prisma/sdk": "^2.21.0",
33+
"@prisma/generator-helper": "^3.1.1",
34+
"@prisma/sdk": "^3.1.1",
3535
"express": "^4.17.1",
3636
"indent-string": "^4.0.0",
3737
"kleur": "^4.1.4",
3838
"meow": "^9.0.0",
3939
"pluralize": "^8.0.0",
40-
"prismjs": "^1.23.0"
40+
"prismjs": "^1.25.0"
4141
},
4242
"devDependencies": {
43-
"@prisma/client": "^2.21.0",
44-
"@types/express": "4.17.11",
45-
"@types/jest": "^26.0.22",
46-
"@types/node": "^14.14.37",
47-
"@types/prismjs": "^1.16.5",
43+
"@prisma/client": "^3.1.1",
44+
"@types/express": "4.17.10",
45+
"@types/jest": "^27.0.2",
46+
"@types/node": "^16.9.6",
47+
"@types/prismjs": "^1.16.6",
4848
"cpy-cli": "^3.1.1",
49-
"jest": "^26.6.3",
50-
"prettier": "^2.2.1",
51-
"prisma": "^2.21.0",
49+
"jest": "^27.2.1",
50+
"prettier": "^2.4.1",
51+
"prisma": "^3.1.1",
5252
"rimraf": "^3.0.2",
53-
"ts-jest": "^26.5.4",
54-
"ts-node": "^9.1.1",
55-
"typescript": "^4.2.4"
53+
"ts-jest": "^27.0.5",
54+
"ts-node": "^10.2.1",
55+
"typescript": "^4.4.3"
5656
},
5757
"scripts": {
5858
"start": "ts-node main.ts",

‎src/generator/model.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type MGModel = {
1818

1919
type MGModelDirective = {
2020
name: string;
21-
values: string[];
21+
values: any[];
2222
};
2323

2424
type MGModelField = {
@@ -69,7 +69,8 @@ let fieldDirectiveMap = new Map<string, string>([
6969
]);
7070

7171
export default class ModelGenerator
72-
implements Generatable<ModelGeneratorStructure> {
72+
implements Generatable<ModelGeneratorStructure>
73+
{
7374
data: ModelGeneratorStructure;
7475

7576
constructor(d: DMMFDocument) {
@@ -271,9 +272,8 @@ export default class ModelGenerator
271272
getModelDirective(model: DMMF.Model): MGModelDirective[] {
272273
let directiveValue: MGModelDirective[] = [];
273274

274-
if (model.idFields.length > 0) {
275-
directiveValue.push({ name: '@@id', values: model.idFields });
276-
}
275+
if (model.primaryKey)
276+
directiveValue.push({ name: '@@id', values: model.primaryKey.fields });
277277

278278
if (model.uniqueFields.length > 0) {
279279
model.uniqueFields.forEach((uniqueField) => {

‎src/tests/__snapshots__/toc.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ exports[`TOC renders on toHTML 1`] = `
6464
<a href=\\"#input-types\\">Input Types</a>
6565
</div>
6666
<ul class=\\"pl-3 ml-1 border-l-2 border-gray-400\\">
67-
<li><a href=\\"#type-inputType-PostWhereInput\\">PostWhereInput</a></li><li><a href=\\"#type-inputType-PostOrderByInput\\">PostOrderByInput</a></li><li><a href=\\"#type-inputType-PostWhereUniqueInput\\">PostWhereUniqueInput</a></li><li><a href=\\"#type-inputType-PostScalarWhereWithAggregatesInput\\">PostScalarWhereWithAggregatesInput</a></li><li><a href=\\"#type-inputType-UserWhereInput\\">UserWhereInput</a></li><li><a href=\\"#type-inputType-UserOrderByInput\\">UserOrderByInput</a></li><li><a href=\\"#type-inputType-UserWhereUniqueInput\\">UserWhereUniqueInput</a></li><li><a href=\\"#type-inputType-UserScalarWhereWithAggregatesInput\\">UserScalarWhereWithAggregatesInput</a></li><li><a href=\\"#type-inputType-PostCreateInput\\">PostCreateInput</a></li><li><a href=\\"#type-inputType-PostUncheckedCreateInput\\">PostUncheckedCreateInput</a></li><li><a href=\\"#type-inputType-PostUpdateInput\\">PostUpdateInput</a></li><li><a href=\\"#type-inputType-PostUncheckedUpdateInput\\">PostUncheckedUpdateInput</a></li><li><a href=\\"#type-inputType-PostUpdateManyMutationInput\\">PostUpdateManyMutationInput</a></li><li><a href=\\"#type-inputType-PostUncheckedUpdateManyInput\\">PostUncheckedUpdateManyInput</a></li><li><a href=\\"#type-inputType-UserCreateInput\\">UserCreateInput</a></li><li><a href=\\"#type-inputType-UserUncheckedCreateInput\\">UserUncheckedCreateInput</a></li><li><a href=\\"#type-inputType-UserUpdateInput\\">UserUpdateInput</a></li><li><a href=\\"#type-inputType-UserUncheckedUpdateInput\\">UserUncheckedUpdateInput</a></li><li><a href=\\"#type-inputType-UserUpdateManyMutationInput\\">UserUpdateManyMutationInput</a></li><li><a href=\\"#type-inputType-UserUncheckedUpdateManyInput\\">UserUncheckedUpdateManyInput</a></li><li><a href=\\"#type-inputType-StringFilter\\">StringFilter</a></li><li><a href=\\"#type-inputType-StringWithAggregatesFilter\\">StringWithAggregatesFilter</a></li><li><a href=\\"#type-inputType-StringFieldUpdateOperationsInput\\">StringFieldUpdateOperationsInput</a></li><li><a href=\\"#type-inputType-NestedStringFilter\\">NestedStringFilter</a></li><li><a href=\\"#type-inputType-NestedStringWithAggregatesFilter\\">NestedStringWithAggregatesFilter</a></li><li><a href=\\"#type-inputType-NestedIntFilter\\">NestedIntFilter</a></li>
67+
<li><a href=\\"#type-inputType-PostWhereInput\\">PostWhereInput</a></li><li><a href=\\"#type-inputType-PostOrderByWithRelationInput\\">PostOrderByWithRelationInput</a></li><li><a href=\\"#type-inputType-PostWhereUniqueInput\\">PostWhereUniqueInput</a></li><li><a href=\\"#type-inputType-PostOrderByWithAggregationInput\\">PostOrderByWithAggregationInput</a></li><li><a href=\\"#type-inputType-PostScalarWhereWithAggregatesInput\\">PostScalarWhereWithAggregatesInput</a></li><li><a href=\\"#type-inputType-UserWhereInput\\">UserWhereInput</a></li><li><a href=\\"#type-inputType-UserOrderByWithRelationInput\\">UserOrderByWithRelationInput</a></li><li><a href=\\"#type-inputType-UserWhereUniqueInput\\">UserWhereUniqueInput</a></li><li><a href=\\"#type-inputType-UserOrderByWithAggregationInput\\">UserOrderByWithAggregationInput</a></li><li><a href=\\"#type-inputType-UserScalarWhereWithAggregatesInput\\">UserScalarWhereWithAggregatesInput</a></li><li><a href=\\"#type-inputType-PostCreateInput\\">PostCreateInput</a></li><li><a href=\\"#type-inputType-PostUncheckedCreateInput\\">PostUncheckedCreateInput</a></li><li><a href=\\"#type-inputType-PostUpdateInput\\">PostUpdateInput</a></li><li><a href=\\"#type-inputType-PostUncheckedUpdateInput\\">PostUncheckedUpdateInput</a></li><li><a href=\\"#type-inputType-PostUpdateManyMutationInput\\">PostUpdateManyMutationInput</a></li><li><a href=\\"#type-inputType-PostUncheckedUpdateManyInput\\">PostUncheckedUpdateManyInput</a></li><li><a href=\\"#type-inputType-UserCreateInput\\">UserCreateInput</a></li><li><a href=\\"#type-inputType-UserUncheckedCreateInput\\">UserUncheckedCreateInput</a></li><li><a href=\\"#type-inputType-UserUpdateInput\\">UserUpdateInput</a></li><li><a href=\\"#type-inputType-UserUncheckedUpdateInput\\">UserUncheckedUpdateInput</a></li><li><a href=\\"#type-inputType-UserUpdateManyMutationInput\\">UserUpdateManyMutationInput</a></li><li><a href=\\"#type-inputType-UserUncheckedUpdateManyInput\\">UserUncheckedUpdateManyInput</a></li><li><a href=\\"#type-inputType-StringFilter\\">StringFilter</a></li><li><a href=\\"#type-inputType-PostCountOrderByAggregateInput\\">PostCountOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-PostMaxOrderByAggregateInput\\">PostMaxOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-PostMinOrderByAggregateInput\\">PostMinOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-StringWithAggregatesFilter\\">StringWithAggregatesFilter</a></li><li><a href=\\"#type-inputType-UserCountOrderByAggregateInput\\">UserCountOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-UserMaxOrderByAggregateInput\\">UserMaxOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-UserMinOrderByAggregateInput\\">UserMinOrderByAggregateInput</a></li><li><a href=\\"#type-inputType-StringFieldUpdateOperationsInput\\">StringFieldUpdateOperationsInput</a></li><li><a href=\\"#type-inputType-NestedStringFilter\\">NestedStringFilter</a></li><li><a href=\\"#type-inputType-NestedStringWithAggregatesFilter\\">NestedStringWithAggregatesFilter</a></li><li><a href=\\"#type-inputType-NestedIntFilter\\">NestedIntFilter</a></li>
6868
</ul>
6969
</li>
7070
<li class=\\"mb-4\\">

‎src/tests/model.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import ModelGenerator from '../generator/model';
22
import transformDMMF from '../generator/transformDMMF';
3+
//@ts-ignore
34
import { getDMMF } from '@prisma/sdk';
45

56
describe('model generator', () => {

0 commit comments

Comments
 (0)