@appweaver/cli 1.4.0 → 1.5.0

package/generate/generate-schema.js

@@ -90,8 +90,11 @@ async function generateSchema(models, schemaPath, clientPath, quiet = false) {
                 scalars: createScalarsSchema(name, schema.config.scalars),
                 relations: createRelationsSchema(name, schema.config.relations, idColumnOf),
                 files: createFilesSchema(name, schema.config.files, idColumnOf('File')),
-                audit: createAuditSchema(name, authModel, schema.config.audit),
-                index: createIndexSchema(schema.config.index),
+                audit: createAuditSchema(name, authModel, schema.config.audit, (0, common_1.hasSoftDelete)(schema.config)),
+                index: [
+                    ...createIndexSchema(schema.config.index),
+                    ...createIndexSchema(schema.config.unique, '@@unique')
+                ],
                 tableName: schema.config.tableName
             };
             for (const [fieldName, scalar] of Object.entries(schema.config.scalars ?? {})) {
@@ -102,6 +105,7 @@ async function generateSchema(models, schemaPath, clientPath, quiet = false) {
         }
         // Resolve model relations to match Prisma schema relationship convention
         const createdByAuthUser = [];
+        const deletedByAuthUser = [];
         const fileFields = [];
         for (const [name, model] of Object.entries(prismaModels)) {
             const modelSchema = Object.entries(models).find(([key]) => key === name)?.[1];
@@ -173,7 +177,8 @@ async function generateSchema(models, schemaPath, clientPath, quiet = false) {
                                     ...(relationConfig.type === 'oneToOne' ? ['@unique'] : []),
                                     ...nativeTypeAttributes(idColumn.nativeType)
                                 ],
-                                foreignKey: true
+                                foreignKey: true,
+                                skipIndex: relationConfig.index === false
                             });
                         }
                     }
@@ -188,6 +193,14 @@ async function generateSchema(models, schemaPath, clientPath, quiet = false) {
                         attributes: [`@relation("${referenceName}")`]
                     });
                 }
+                if (auditField.name === 'deletedBy') {
+                    const referenceName = auditField.attributes?.[0].split('"')[1];
+                    deletedByAuthUser.push({
+                        name: `deleted${(0, common_1.plural)(name)}`,
+                        type: `${name}[]`,
+                        attributes: [`@relation("${referenceName}")`]
+                    });
+                }
             }
             for (const fileField of model.files) {
                 const referenceName = fileField.attributes?.[0].split('"')[1];
@@ -200,11 +213,26 @@ async function generateSchema(models, schemaPath, clientPath, quiet = false) {
                 }
             }
         }
+        // Index the foreign key columns, which PostgreSQL and SQLite leave
+        // unindexed, so relation lookups and referential actions avoid table scans
+        for (const [name, model] of Object.entries(prismaModels)) {
+            const indexed = leadingIndexFields(models[name].config);
+            for (const field of [...model.relations, ...model.audit]) {
+                if (field.foreignKey &&
+                    !field.skipIndex &&
+                    !field.attributes?.includes('@unique') &&
+                    !indexed.has(field.name)) {
+                    indexed.add(field.name);
+                    model.index.push(`@@index([${field.name}])`);
+                }
+            }
+        }
         // Add auth model ownership relations
         const authUserModel = prismaModels[authModel?.name ?? ''];
         if (authUserModel) {
             authUserModel.extra = {
-                'Ownership models referenced with createdById column': createdByAuthUser
+                'Ownership models referenced with createdById column': createdByAuthUser,
+                'Soft deleted models referenced with deletedById column': deletedByAuthUser
             };
         }
         // Add file fields relations
@@ -509,6 +537,7 @@ function validateRelations(models) {
             }
         }
     }
+    errors.push(...(0, common_1.softDeleteCascadeErrors)(models));
     return errors;
 }
 function createRelationsSchema(modelName, relations = {}, idColumnOf = defaultIdColumn) {
@@ -565,7 +594,8 @@ function createRelationSchema(name, modelName, relation, relationIdColumn = defa
                 ...(relation.type === 'oneToOne' ? ['@unique'] : []),
                 ...nativeTypeAttributes(relationIdColumn.nativeType)
             ],
-            foreignKey: true
+            foreignKey: true,
+            skipIndex: relation.index === false
         });
     }
     return relationFields;
@@ -605,7 +635,7 @@ function createFileSchema(name, modelName, file, fileIdColumn = defaultIdColumn(
     }
     return fileFields;
 }
-function createAuditSchema(modelName, authModel, audit = {}) {
+function createAuditSchema(modelName, authModel, audit = {}, softDelete = false) {
     const defaultAudit = {
         updatedAt: true,
         createdAt: true,
@@ -643,9 +673,30 @@ function createAuditSchema(modelName, authModel, audit = {}) {
             foreignKey: true
         });
     }
+    if (softDelete) {
+        fields.push({
+            name: 'deletedAt',
+            type: 'DateTime?'
+        });
+        if (authModelName) {
+            fields.push({
+                name: 'deletedBy',
+                type: `${authModelName}?`,
+                attributes: [
+                    `@relation("${modelName}DeletedBy${authModelName}", fields: [deletedById], references: [id])`
+                ]
+            });
+            fields.push({
+                name: 'deletedById',
+                type: `${prismaIdType(authModel?.config.id)}?`,
+                attributes: nativeTypeAttributes(idNativeType(authModel?.config.id)),
+                foreignKey: true
+            });
+        }
+    }
     return fields;
 }
-function createIndexSchema(index) {
+function createIndexSchema(index, attribute = '@@index') {
     const indexes = [];
     if (!index || index.length === 0) {
         return indexes;
@@ -654,13 +705,23 @@ function createIndexSchema(index) {
         const indexValue = (0, common_1.isArray)(idx)
             ? `[${idx.map(indexFieldSchema).join(', ')}]`
             : indexFieldSchema(idx);
-        const indexExpression = `@@index(${indexValue})`;
+        const indexExpression = `${attribute}(${indexValue})`;
         if (!indexes.includes(indexExpression)) {
             indexes.push(indexExpression);
         }
     }
     return indexes;
 }
+function leadingIndexFields(config) {
+    const fields = new Set();
+    for (const idx of [...(config.index ?? []), ...(config.unique ?? [])]) {
+        const field = (0, common_1.isArray)(idx) ? idx[0] : idx;
+        if (field) {
+            fields.add(INDEX_SORT_PREFIXES[field.charAt(0)] ? field.slice(1) : field);
+        }
+    }
+    return fields;
+}
 function indexFieldSchema(field) {
     const sort = INDEX_SORT_PREFIXES[field.charAt(0)];
     if (!sort || field.length < 2) {

package/generate/generate-types.js

@@ -106,6 +106,13 @@ function transformUnsafeTypes(schema) {
         if (field.nullable === true) {
             properties[name] = (0, common_1.NullType)(properties[name]);
         }
+        // A nullable model reference points at the nullable variant of that model,
+        // a schema of its own the response serializer can expand once. The type is
+        // written as the union it stands for instead.
+        const nullableRef = field.$ref?.match(/^(.+Single)Nullable$/)?.[1];
+        if (nullableRef) {
+            properties[name] = (0, common_1.NullType)(typebox_1.Type.Ref(nullableRef));
+        }
     }
     return typebox_1.Type.Object(properties, { ...schema });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appweaver/cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Appweaver - the backend framework for AI-first development (@cli)",
   "author": "Luka Matosevic",
   "license": "MIT",