@postxl/generator 0.27.3 → 0.28.0

package/dist/prisma/parse.js

@@ -117,7 +117,8 @@ function parseModel({ dmmfModel, enums, models, config, }) {
             return Object.assign(Object.assign({ kind: 'relation' }, shared), { relatedModelBacklinkFieldName: refField.name, typeName: Types.toTypeName(dmmfField.type), unbrandedTypeName: getTsTypeForId(dmmfField), relationToModel: refModel });
         }
         if (dmmfField.isId) {
-            return Object.assign(Object.assign({ kind: 'id' }, shared), { isUnique: isUniqueField(dmmfField), isGenerated: isAutoIncrementField(dmmfField) || isUUIDField(dmmfField), unbrandedTypeName: getTsTypeForId(dmmfField), model: core });
+            const isGeneratedField = isAutoIncrementField(dmmfField) || isUUIDField(dmmfField);
+            return Object.assign(Object.assign({ kind: 'id' }, shared), { isUnique: isUniqueField(dmmfField), isGenerated: isGeneratedField, unbrandedTypeName: getTsTypeForId(dmmfField), model: core });
         }
         if (dmmfField.kind === 'scalar') {
             let validation = undefined;
@@ -198,12 +199,28 @@ function validateFields({ fields, model: { name } }) {
     return { idField, defaultField, nameField };
 }
 function isAutoIncrementField(fieldDmmf) {
-    const d = fieldDmmf.default;
-    return d !== undefined && !!d.name && d.name === 'autoincrement';
+    if (fieldDmmf.default === undefined) {
+        return false;
+    }
+    if (Array.isArray(fieldDmmf.default)) {
+        return false;
+    }
+    if (typeof fieldDmmf.default === 'object') {
+        return fieldDmmf.default.name === 'autoincrement';
+    }
+    return false;
 }
 function isUUIDField(fieldDmmf) {
-    const d = fieldDmmf.default;
-    return d !== undefined && !!d.name && d.name === 'cuid';
+    if (fieldDmmf.default === undefined) {
+        return false;
+    }
+    if (Array.isArray(fieldDmmf.default)) {
+        return false;
+    }
+    if (typeof fieldDmmf.default === 'object') {
+        return fieldDmmf.default.name === 'uuid' || fieldDmmf.default.name === 'cuid';
+    }
+    return false;
 }
 function isUniqueField(fieldRaw) {
     return fieldRaw.isUnique && fieldRaw.type === 'String';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.27.3",
+  "version": "0.28.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -22,7 +22,7 @@
     "prettier": "^2.8.7",
     "remeda": "1.9.4",
     "zod": "3.21.4",
-    "@postxl/lock": "0.4.7"
+    "@postxl/lock": "0.4.8"
   },
   "devDependencies": {
     "@prisma/client": "5.1.0",