Skip to content

Commit f6df644

Browse files
committed
Fix output
1 parent 08f589e commit f6df644

File tree

6 files changed

+329
-320
lines changed

6 files changed

+329
-320
lines changed

packages/prisma-client-types-generator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# prisma-client-types-generator
22

3+
## 0.1.1
4+
5+
### Patch Changes
6+
7+
- format output
8+
39
## 0.1.0
410

511
### Minor Changes

packages/prisma-client-types-generator/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prisma-client-types-generator",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"description": "Generate safe types for the browser and other uses",
55
"main": "./dist/index.js",
66
"module": "./dist/index.mjs",
@@ -14,8 +14,7 @@
1414
"lint": "eslint src --fix",
1515
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
1616
"prepublish": "pnpm test && pnpm build",
17-
"test": "sh ./test/test.sh",
18-
"release": "pnpm changeset && pnpm changeset version"
17+
"test": "sh ./test/test.sh"
1918
},
2019
"files": [
2120
"/dist"

packages/prisma-client-types-generator/src/generateEnum.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ export const generateEnum = (
1313
out += `export const ${name} = {\n`;
1414

1515
for (const value of prismaEnum.values) {
16-
out += ` ${value.name}: '${value.name}',\n`;
16+
out += ` ${value.name}: "${value.name}",\n`;
1717
}
1818

1919
out += `} as const;\n`;
2020
out += "\n";
21-
out += `export type ${name} = (typeof ${name})[keyof typeof ${name}]\n`;
21+
out += `export type ${name} = (typeof ${name})[keyof typeof ${name}];\n`;
2222
out += "\n";
2323

2424
return out;

packages/prisma-client-types-generator/src/generateModel.ts

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ export const generateModel = (
4848
case "scalar":
4949
out += ` ${field.name}: ${prismaTypeMap.get(field.type)}${
5050
field.isList ? "[]" : ""
51-
}${formatNull(field)}\n`;
51+
}${formatNull(field)};\n`;
5252
break;
5353
default:
5454
break;
5555
}
5656
}
5757

58-
out += `}\n`;
58+
out += `};\n`;
5959
out += "\n";
6060

6161
// Create Values type
@@ -70,53 +70,54 @@ export const generateModel = (
7070
out += ` ${field.name}: ${formatEntityName(
7171
field.type,
7272
config
73-
)}${formatNull(field)}\n`;
73+
)}${formatNull(field)};\n`;
7474
break;
7575
case "scalar":
7676
case "unsupported": // Untested
7777
out += ` ${field.name}: ${prismaTypeMap.get(field.type)}${
7878
field.isList ? "[]" : ""
79-
}${formatNull(field)}\n`;
79+
}${formatNull(field)};\n`;
8080
break;
8181
default:
8282
break;
8383
}
8484
}
8585

86-
out += `}\n`;
86+
out += `};\n`;
8787
out += "\n";
8888

8989
// Create Relations type
90-
out += `export type ${modelTypeName}Relations = {\n`;
90+
out += `export type ${modelTypeName}${RELATIONS} = {\n`;
9191

9292
for (const field of model.fields) {
9393
switch (field.kind) {
9494
case "object":
95-
out += ` ${field.name}: ${formatEntityName(field.type, config)}${
96-
field.isList ? "[]" : ""
97-
}${formatNull(field)}\n`;
95+
out += ` ${field.name}: ${formatEntityName(
96+
field.type,
97+
config
98+
)}${EXTENDED}${field.isList ? "[]" : ""}${formatNull(field)};\n`;
9899
break;
99100
default:
100101
break;
101102
}
102103
}
103104

104-
out += `}\n`;
105+
out += `};\n`;
105106
out += "\n";
106107

107108
// Create DB type
108-
out += `export type ${modelTypeName} = ${modelTypeName}Keys & ${modelTypeName}Values\n`;
109+
out += `export type ${modelTypeName} = ${modelTypeName}Keys & ${modelTypeName}Values;\n`;
109110
out += "\n";
110111

111112
// Create Extended type
112-
out += `export type ${modelTypeName}Extended = ${modelTypeName} & ${modelTypeName}Relations\n`;
113+
out += `export type ${modelTypeName}${EXTENDED} = ${modelTypeName} & ${modelTypeName}${RELATIONS};\n`;
113114
out += "\n";
114115

115116
return out;
116117
};
117118

118119
// Examples:
119-
// RELATION
120+
// RELATIONS
120121
// {
121122
// name: 'author',
122123
// kind: 'object',
@@ -134,3 +135,6 @@ export const generateModel = (
134135
// isGenerated: false,
135136
// isUpdatedAt: false
136137
// }
138+
139+
const EXTENDED = "Extended";
140+
const RELATIONS = "Relations";

0 commit comments

Comments
 (0)