Add support for both GENERATED ALWAYS and GENERATED BY DEFAULT in kan…

…el and kanel-kysely (#452)
kristiandupont · Aug 19, 2023 · 1409a20 · 1409a20
1 parent 5a3a619
commit 1409a20
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/kanel-kysely/src/processFile.ts b/packages/kanel-kysely/src/processFile.ts
@@ -100,18 +100,21 @@ const processFile = (
           }
 
           let initializerType = 'never';
-          if (canInitialize) {
+          if (canInitialize && column.generated !== 'ALWAYS') {
             if (baseType === 'Date') {
               baseType += ' | string';
             }
             initializerType =
-              column.isNullable || column.defaultValue || column.isIdentity
+              column.isNullable ||
+              column.defaultValue ||
+              column.isIdentity ||
+              column.generated === 'BY DEFAULT'
                 ? `${baseType} | null`
                 : baseType;
           }
 
           let mutatorType = 'never';
-          if (canMutate) {
+          if (canMutate && column.generated !== 'ALWAYS') {
             mutatorType = `${baseType} | null`;
           }
 

diff --git a/packages/kanel/src/generators/generateProperties.ts b/packages/kanel/src/generators/generateProperties.ts
@@ -26,8 +26,9 @@ const generateProperties = <D extends CompositeDetails>(
     ? R.sort(config.propertySortFunction, ps as any)
     : ps;
 
-  const result: InterfacePropertyDeclaration[] = sortedPs.map(
-    (p: CompositeProperty): InterfacePropertyDeclaration => {
+  const result: InterfacePropertyDeclaration[] = sortedPs
+    .filter((p) => generateFor === 'selector' || p.generated !== 'ALWAYS')
+    .map((p: CompositeProperty): InterfacePropertyDeclaration => {
       // If this is a (materialized or not) view column, we need to check
       // the source table to see if the column is nullable.
       if ((p as ViewColumn | MaterializedViewColumn).source) {
@@ -58,7 +59,10 @@ const generateProperties = <D extends CompositeDetails>(
       } = config.getPropertyMetadata(p, details, generateFor, config);
 
       const canBeOptional: boolean =
-        p.isNullable || p.defaultValue || p.isIdentity;
+        p.isNullable ||
+        p.defaultValue ||
+        p.isIdentity ||
+        p.generated === 'BY DEFAULT';
 
       const t = typeOverride ?? resolveType(p, details, config);
 
@@ -107,8 +111,7 @@ const generateProperties = <D extends CompositeDetails>(
         typeName,
         typeImports,
       };
-    },
-  );
+    });
   return result;
 };