create-warlock 4.0.93 → 4.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-warlock",
-    "version": "4.0.93",
+    "version": "4.0.95",
     "main": "./esm/index.js",
     "license": "MIT",
     "type": "module",

package/templates/warlock/package.json

@@ -24,13 +24,13 @@
         "@mongez/reinforcements": "^2.3.17",
         "@mongez/localization": "^3.2.1",
         "@mongez/supportive-is": "^2.0.4",
-        "@warlock.js/auth": "4.0.93",
-        "@warlock.js/cache": "4.0.93",
-        "@warlock.js/cascade": "4.0.93",
-        "@warlock.js/scheduler": "4.0.93",
-        "@warlock.js/core": "4.0.93",
-        "@warlock.js/logger": "4.0.93",
-        "@warlock.js/seal": "4.0.93",
+        "@warlock.js/auth": "4.0.95",
+        "@warlock.js/cache": "4.0.95",
+        "@warlock.js/cascade": "4.0.95",
+        "@warlock.js/scheduler": "4.0.95",
+        "@warlock.js/core": "4.0.95",
+        "@warlock.js/logger": "4.0.95",
+        "@warlock.js/seal": "4.0.95",
         "dayjs": "^1.11.19"
     },
     "devDependencies": {

package/templates/warlock/src/app/auth/models/otp/migrations/22-12-2025_10-30-20.otp-migration.ts

@@ -3,17 +3,45 @@ import { OTP } from "../otp.model";
 
 export default migrate(OTP, {
   name: "otp",
-  createdAt: "2025-12-22T10:30:20", // ISO Date
+  createdAt: "2025-12-22T10:30:20",
   up() {
+    // Create table
+    this.createTableIfNotExists();
+
+    // Primary key
+    this.id();
+
+    // OTP fields
+    this.string("code", 20);
+    this.string("type", 50);
+    this.string("target", 255);
+    this.string("channel", 50);
+    this.integer("userId");
+    this.string("userType", 50);
+    this.timestamp("expiresAt");
+    this.timestamp("usedAt").nullable();
+    this.integer("attempts").default(0);
+    this.integer("maxAttempts").default(5);
+    this.json("metadata").nullable();
+
+    // Status
+    this.boolean("isActive").default(true);
+
+    // Embedded user references (JSONB)
+    this.json("createdBy").nullable();
+    this.json("updatedBy").nullable();
+    this.json("deletedBy").nullable();
+
+    // Timestamps
+    this.timestamps();
+
+    // Indexes for common queries
     this.index("code");
     this.index(["target", "type"]);
     this.index("expiresAt");
     this.index("userId");
   },
   down() {
-    this.dropIndex("code");
-    this.dropIndex(["target", "type"]);
-    this.dropIndex("expiresAt");
-    this.dropIndex("userId");
+    this.dropTableIfExists();
   },
 });

package/templates/warlock/src/app/posts/controllers/create-new-post.controller.ts

@@ -4,6 +4,7 @@ import { Post } from "../models/post/psot.model";
 export const createNewPostController: RequestHandler = async (request, response) => {
   const post = await Post.create({
     ...request.validated(),
+    authorId: request.user.id,
   });
 
   return response.success({

package/templates/warlock/src/app/posts/models/post/migrations/09-01-2026_02-07-51-post.migration.ts

@@ -0,0 +1,36 @@
+import { Migration } from "@warlock.js/cascade";
+import { Post } from "../psot.model";
+
+export default class PostsMigration extends Migration.for(Post) {
+  public up() {
+    // Create table
+    this.createTableIfNotExists();
+
+    // Primary key
+    this.id();
+
+    // Post fields
+    this.string("title", 255);
+    this.text("description");
+    this.string("slug", 255).unique();
+    this.string("image", 500).nullable();
+
+    // Status
+    this.boolean("isActive").default(true);
+
+    this.int("authorId").notNullable();
+
+    // Embedded user references (JSONB for PostgreSQL)
+    this.json("createdBy").nullable();
+    this.json("updatedBy").nullable();
+    this.json("deletedBy").nullable();
+
+    // Timestamps
+    this.timestamps();
+    this.timestamp("deletedAt").nullable();
+  }
+
+  public down() {
+    this.dropTableIfExists();
+  }
+}

package/templates/warlock/src/app/posts/models/post/psot.model.ts

@@ -1,13 +1,15 @@
-import { Model, RegisterModel } from "@warlock.js/cascade";
+import { belongsTo, Model, RegisterModel } from "@warlock.js/cascade";
 import { defineResource, useComputedSlug } from "@warlock.js/core";
 import { type Infer, v } from "@warlock.js/seal";
 import { globalColumnsSchema } from "app/shared/utils/global-columns-schema";
+import { type User } from "app/users/models/user";
 
 export const postSchema = globalColumnsSchema.extend({
   title: v.string().required(),
   description: v.string().required(),
   slug: v.computed(useComputedSlug()),
   image: v.string().required(),
+  authorId: v.int().required(),
 });
 
 export type PostSchema = Infer<typeof postSchema>;
@@ -18,6 +20,12 @@ export class Post extends Model<PostSchema> {
 
   public static schema = postSchema;
 
+  public author?: User;
+
+  public static relations = {
+    author: belongsTo("User"),
+  };
+
   public static resource = defineResource({
     schema: {
       id: "number",
@@ -25,6 +33,7 @@ export class Post extends Model<PostSchema> {
       title: "string",
       description: "string",
       image: "storageUrl",
+      authorId: "number",
       createdBy: "object",
       updatedBy: "object",
       isActive: "boolean",

package/templates/warlock/src/app/posts/routes.ts

@@ -1,11 +1,8 @@
 import { router } from "@warlock.js/core";
-import { cloudUpload, guarded } from "app/utils/router";
+import { guarded } from "app/utils/router";
 import { createNewPostController } from "./controllers/create-new-post.controller";
 import { updatePostController } from "./controllers/update-post.controller";
 
 guarded(() => {
-  cloudUpload(() => {
-    router.post("/posts", createNewPostController);
-  });
-  router.put("/posts/:id", updatePostController);
+  router.route("/posts").create(createNewPostController).update(updatePostController);
 });

package/templates/warlock/src/app/users/events/sync.ts

@@ -2,4 +2,4 @@ import { modelSync } from "@warlock.js/cascade";
 import { Post } from "app/posts/models/post/psot.model";
 import { User } from "../models/user";
 
-modelSync.sync(User, Post, "createdBy");
+export const cleanup = [modelSync.sync(User, Post, "createdBy")];

package/templates/warlock/src/app/users/main.ts

@@ -1,5 +1,24 @@
 import { onceConnected } from "@warlock.js/cascade";
+import { Post } from "app/posts/models/post/psot.model";
 
 onceConnected(async () => {
   // TODO: Review cloud storage deleteDirectory not working as expected
+
+  // // Lazy loading
+  // const user = (await User.first())!;
+  // await user.load("posts");
+
+  // console.log(user.posts!.length);
+
+  // // Eager loading
+  // const user2 = await User.with("posts").first();
+
+  // console.log(user2?.posts?.length);
+
+  // const post = await Post.with("author").first();
+
+  // console.log(post?.author);
+  const post = await Post.joinWith("author").first();
+  console.log(post?.data); // { id, title, authorId, ... } - no author
+  console.log(post?.author); // User model instance
 });

package/templates/warlock/src/app/users/models/user/migrations/11-12-2025_23-58-03-user.migration.ts

@@ -3,12 +3,33 @@ import { User } from "../user.model";
 
 export default class UsersMigration extends Migration.for(User) {
   public up() {
-    this.int("id").unique().autoIncrement();
-    this.unique("email");
+    // Create table
+    this.createTableIfNotExists();
+
+    // Primary key
+    this.id(); // Creates "id" SERIAL PRIMARY KEY
+
+    // User fields
+    this.string("name", 255);
+    this.string("email", 255).unique();
+    this.string("password", 255);
+    this.string("image", 500).nullable();
+    this.json("imageMetadata").nullable();
+
+    // Status
+    this.boolean("isActive").default(true);
+
+    // Embedded user references (JSONB for PostgreSQL)
+    this.json("createdBy").nullable();
+    this.json("updatedBy").nullable();
+    this.json("deletedBy").nullable();
+
+    // Timestamps (auto-managed by the model)
+    this.timestamps(); // Creates createdAt and updatedAt
+    this.timestamp("deletedAt").nullable(); // Soft deletes
   }
 
   public down() {
-    this.dropIndex("id");
-    this.dropUnique("email");
+    this.dropTableIfExists();
   }
 }

package/templates/warlock/src/app/users/models/user/user.model.ts

@@ -1,7 +1,8 @@
 import { Auth } from "@warlock.js/auth";
-import { RegisterModel } from "@warlock.js/cascade";
+import { hasMany, RegisterModel } from "@warlock.js/cascade";
 import { defineResource, uploadedFileMetadataSchema, useHashedPassword } from "@warlock.js/core";
 import { type Infer, v } from "@warlock.js/seal";
+import { type Post } from "app/posts/models/post/psot.model";
 import { globalColumnsSchema } from "app/shared/utils/global-columns-schema";
 
 const UserResource = defineResource({
@@ -19,7 +20,7 @@ const UserResource = defineResource({
 
 export const userSchema = globalColumnsSchema.extend({
   name: v.string().required().trim(),
-  email: v.email().requiredIfEmpty("id"),
+  email: v.email().requiredIfEmpty("id").unique("User"),
   image: v.string(),
   imageMetadata: uploadedFileMetadataSchema,
   password: v.string().min(6).requiredIfEmpty("id").addTransformer(useHashedPassword()),
@@ -39,6 +40,12 @@ export class User extends Auth<UserSchema> {
    */
   public static schema = userSchema;
 
+  public static relations = {
+    posts: hasMany("Post", { foreignKey: "authorId" }),
+  };
+
+  public posts?: Post[];
+
   /**
    * Embed fields when saving in another model
    */
@@ -69,5 +76,9 @@ export class User extends Auth<UserSchema> {
     this.addScope("verified", (query) => {
       query.where("emailVerified", true);
     });
+
+    // this.addGlobalScope("active", (query) => {
+    //   query.where("isActive", true);
+    // });
   }
 }

package/templates/warlock/src/app/users/routes.ts

@@ -3,8 +3,6 @@ import { guarded } from "app/utils/router";
 import { createNewUserController } from "./controllers/create-new-user.controller";
 import { getUsersController } from "./controllers/get-users.controller";
 
-router.post("/users", createNewUserController);
-
 guarded(() => {
-  router.get("/users", getUsersController);
+  router.route("/users").get(getUsersController).post(createNewUserController);
 });

package/templates/warlock/src/app/utils/cloud-upload.middleware.ts

@@ -10,5 +10,5 @@ export async function cloudUploadMiddleware(request: Request, _response: Respons
   });
 
   // Example 2: Or just set prefix for same driver
-  // storageDriverContext.setPrefix(`tenant-${request.user?.id}`);
+  storageDriverContext.setPrefix(`tenant-${request.user?.id}`);
 }

package/templates/warlock/src/config/database.ts

@@ -6,7 +6,7 @@ import type {
 } from "@warlock.js/cascade";
 
 const databaseConfigurations: ConnectionOptions<MongoDriverOptions, MongoClientOptions> = {
-  driver: "mongodb",
+  driver: "postgres",
   name: "default",
   database: env("DB_NAME"),
   host: env("DB_HOST", "localhost"),
@@ -21,15 +21,44 @@ const databaseConfigurations: ConnectionOptions<MongoDriverOptions, MongoClientO
     counterCollection: "counters",
   },
 
-  defaultDeleteStrategy: "trash",
+  defaultDeleteStrategy: "permanent",
 
   clientOptions: {
     replicaSet: env("DB_REPLICA_SET"),
   },
 
+  // ============================================================================
+  // Model Defaults Configuration
+  // ============================================================================
+  // These settings override driver defaults and apply to all models.
+  // Individual models can override these by setting static properties.
+  //
+  // Configuration hierarchy (highest to lowest):
+  // 1. Model static property (e.g., User.createdAtColumn = "creation_date")
+  // 2. modelOptions (below) - Database-wide overrides
+  // 3. Driver defaults (PostgreSQL: snake_case, MongoDB: camelCase)
+  // 4. Framework defaults
+  // ============================================================================
   modelOptions: {
+    // ID Generation (for MongoDB)
     randomIncrement: true,
     initialId: 1,
+
+    // Timestamps - PostgreSQL driver already defaults to snake_case
+    // (created_at, updated_at) so these are optional unless overriding
+    timestamps: true,
+    // createdAtColumn: "created_at", // Already driver default
+    // updatedAtColumn: "updated_at", // Already driver default
+
+    // Deletion Strategy
+    // deleteStrategy: "soft", // Uncomment to enable soft deletes globally
+    // deletedAtColumn: "deleted_at", // Already driver default
+
+    // Validation
+    strictMode: "strip",
+
+    // Naming Convention
+    // namingConvention: "snake_case", // Already driver default for PostgreSQL
   },
 };
 

package/templates/warlock/warlock.config.ts

@@ -1,8 +1,15 @@
-import { registerAuthCleanupCommand, registerJWTSecretGeneratorCommand } from "@warlock.js/auth";
+import {
+  authMigrations,
+  registerAuthCleanupCommand,
+  registerJWTSecretGeneratorCommand,
+} from "@warlock.js/auth";
 import { defineConfig } from "@warlock.js/core";
 
 export default defineConfig({
   cli: {
     commands: [registerJWTSecretGeneratorCommand(), registerAuthCleanupCommand()],
   },
+  database: {
+    migrations: authMigrations,
+  },
 });