begin fix for valtyr#107

alii · Sep 28, 2024 · 27cbafa · 27cbafa
1 parent 0a5be44
commit 27cbafa
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 5 deletions.
diff --git a/src/helpers/generateFile.ts b/src/helpers/generateFile.ts
@@ -25,7 +25,9 @@ export const generateFile = (
 export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
   ? ColumnType<S, I | undefined, U>
   : ColumnType<T, T | undefined, T>;
-export type Timestamp = ColumnType<Date, Date | string, Date | string>;`;
+export type Timestamp = ColumnType<Date, Date | string, Date | string>;
+export type EnumArrayInner<T extends string, All extends string> = T extends infer Single extends string ? T | \`\${Single},\${Exclude<All, Single>}\` : never
+export type EnumArray<T extends string> = \`{\${EnumArrayInner<T, T>}}\`;`;
 
   if (withEnumImport) {
     const enumImportStatement = `import type { ${withEnumImport.names.join(

diff --git a/src/helpers/generateModel.test.ts b/src/helpers/generateModel.test.ts
@@ -165,3 +165,42 @@ test("it respects camelCase option", () => {
     userName: string | null;
 };`);
 });
+
+test("it respects enum array values", () => {
+  const model = generateModel(
+    {
+      name: "User",
+      fields: [
+        {
+          name: "permissions",
+          isId: false,
+          isGenerated: false,
+          kind: "enum",
+          type: "UserPermissions",
+          hasDefaultValue: true,
+          isList: true,
+          isReadOnly: false,
+          isRequired: true,
+          isUnique: false,
+        },
+      ],
+      primaryKey: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+      dbName: null,
+    },
+    {
+      databaseProvider: "postgresql",
+      fileName: "env(DATABASE_URL)",
+      enumFileName: "",
+      camelCase: true,
+      readOnlyIds: false,
+    }
+  );
+
+  const source = stringifyTsNode(model.definition);
+
+  expect(source).toEqual(`export type User = {
+    permissions: EnumArray<UserPermissions>;
+};`);
+});
diff --git a/src/helpers/generateModel.ts b/src/helpers/generateModel.ts
@@ -36,10 +36,20 @@ export const generateModel = (model: DMMF.Model, config: Config) => {
       return generateField({
         isId: field.isId,
         name: normalizeCase(dbName || field.name, config),
-        type: ts.factory.createTypeReferenceNode(
-          ts.factory.createIdentifier(field.type),
-          undefined
-        ),
+        type: field.isList
+          ? ts.factory.createTypeReferenceNode(
+              ts.factory.createIdentifier("EnumArray"),
+              [
+                ts.factory.createTypeReferenceNode(
+                  ts.factory.createIdentifier(field.type),
+                  undefined
+                ),
+              ]
+            )
+          : ts.factory.createTypeReferenceNode(
+              ts.factory.createIdentifier(field.type),
+              undefined
+            ),
         nullable: !field.isRequired,
         generated: isGenerated,
         list: field.isList,