create-warlock 2.6.1 → 2.7.0

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

@@ -1,54 +1,59 @@
-import { Auth, castPassword } from "@warlock.js/auth";
-import type { Casts, Document } from "@warlock.js/cascade";
-import { castEmail, expiresAfter } from "@warlock.js/cascade";
-import { uploadable } from "@warlock.js/core";
-import { UserOutput } from "../../output/user.output";
-
-export class User extends Auth {
-  /**
-   * Collection name
-   */
-  public static collection = "users";
-
-  /**
-   * Output
-   */
-  public static output = UserOutput;
-
-  /**
-   * {@inheritdoc}
-   */
-  public syncWith = [];
-
-  /**
-   * Get user type
-   */
-  public get userType(): string {
-    return "user";
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public defaultValue: Document = {
-    isActive: false,
-  };
-
-  /**
-   * {@inheritDoc}
-   */
-  protected casts: Casts = {
-    name: "string",
-    isActive: "boolean",
-    image: uploadable,
-    email: castEmail,
-    password: castPassword,
-    activationCode: "int",
-    codeExpiresAt: expiresAfter(30, "minutes"),
-  };
-
-  /**
-   * {@inheritdoc}
-   */
-  public embedded = ["id", "name", "email"];
-}
+import { Auth, castPassword } from "@warlock.js/auth";
+import type { Casts, Document, Joinable } from "@warlock.js/cascade";
+import { castEmail, expiresAfter } from "@warlock.js/cascade";
+import { uploadable } from "@warlock.js/core";
+import { Post } from "../../../posts/models";
+import { UserOutput } from "../../output/user.output";
+
+export class User extends Auth {
+  /**
+   * Collection name
+   */
+  public static collection = "users";
+
+  /**
+   * Output
+   */
+  public static output = UserOutput;
+
+  /**
+   * {@inheritdoc}
+   */
+  public syncWith = [];
+
+  public static relations: Record<string, Joinable> = {
+    totalPosts: Post.joinable("id", "author.id"),
+  };
+
+  /**
+   * Get user type
+   */
+  public get userType(): string {
+    return "user";
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public defaultValue: Document = {
+    isActive: false,
+  };
+
+  /**
+   * {@inheritDoc}
+   */
+  protected casts: Casts = {
+    name: "string",
+    isActive: "boolean",
+    image: uploadable,
+    email: castEmail,
+    password: castPassword,
+    activationCode: "int",
+    codeExpiresAt: expiresAfter(30, "minutes"),
+  };
+
+  /**
+   * {@inheritdoc}
+   */
+  public embedded = ["id", "name", "email"];
+}

package/templates/warlock/src/app/users/output/user.output.ts

@@ -1,12 +1,12 @@
-import { Output, type FinalOutput } from "@warlock.js/core";
-import { withBaseOutputDetails } from "app/utils/output";
-
-export class UserOutput extends Output {
-  /**
-   * Output data
-   */
-  protected output: FinalOutput = withBaseOutputDetails({
-    name: "string",
-    email: "string",
-  });
-}
+import { Output, type FinalOutput } from "@warlock.js/core";
+import { withBaseOutputDetails } from "app/utils/output";
+
+export class UserOutput extends Output {
+  /**
+   * Output data
+   */
+  protected output: FinalOutput = withBaseOutputDetails({
+    name: "string",
+    email: "string",
+  });
+}

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

@@ -1,51 +1,51 @@
-import { router } from "@warlock.js/core";
-import {
-  guarded,
-  guardedAdmin,
-  guardedGuest,
-  guardedGuestAdmin,
-} from "app/utils/router";
-import activateAccount from "./controllers/auth/activate-account";
-import adminLogin from "./controllers/auth/admin-login";
-import createAccount from "./controllers/auth/create-account";
-import forgetPassword from "./controllers/auth/forget-password";
-import login from "./controllers/auth/login.request";
-import logout from "./controllers/auth/logout";
-import resendActivationCode from "./controllers/auth/resend-activation-code";
-import resetPassword from "./controllers/auth/reset-password";
-import verifyForgetPasswordCode from "./controllers/auth/verify-forget-password-code";
-import changePassword from "./controllers/profile/change-password";
-import myProfile from "./controllers/profile/my-profile";
-import updateProfile from "./controllers/profile/update-profile";
-import { restfulUsers } from "./controllers/restful-users";
-
-// admin auth
-guardedGuestAdmin(() => {
-  router.post("/login", adminLogin);
-  router.post("/forget-password", forgetPassword);
-  router.post("/reset-password", resetPassword);
-});
-
-guardedAdmin(() => {
-  // REST API for users
-  router.restfulResource("/users", restfulUsers);
-});
-
-// user auth
-guardedGuest(() => {
-  router.post("/login", login);
-  router.post("/register", createAccount);
-  router.post("/register/verify", activateAccount);
-  router.post("/resend-activation-code", resendActivationCode);
-  router.post("/forget-password", forgetPassword);
-  router.post("/forget-password/verify-code", verifyForgetPasswordCode);
-  router.post("/reset-password", resetPassword);
-});
-
-// profile routes
-guarded(() => {
-  router.get("/me", myProfile);
-  router.post("/me", updateProfile);
-  router.post("/logout", logout);
-  router.post("/change-password", changePassword);
-});
+import { router } from "@warlock.js/core";
+import {
+  guarded,
+  guardedAdmin,
+  guardedGuest,
+  guardedGuestAdmin,
+} from "app/utils/router";
+import activateAccount from "./controllers/auth/activate-account";
+import adminLogin from "./controllers/auth/admin-login";
+import forgetPassword from "./controllers/auth/forget-password";
+import { loginRequest } from "./controllers/auth/login.request";
+import logout from "./controllers/auth/logout";
+import { registerRequest } from "./controllers/auth/register.request";
+import resendActivationCode from "./controllers/auth/resend-activation-code";
+import resetPassword from "./controllers/auth/reset-password";
+import verifyForgetPasswordCode from "./controllers/auth/verify-forget-password-code";
+import changePassword from "./controllers/profile/change-password";
+import myProfile from "./controllers/profile/my-profile";
+import updateProfile from "./controllers/profile/update-profile";
+import { restfulUsers } from "./controllers/restful-users";
+
+// admin auth
+guardedGuestAdmin(() => {
+  router.post("/login", adminLogin);
+  router.post("/forget-password", forgetPassword);
+  router.post("/reset-password", resetPassword);
+});
+
+guardedAdmin(() => {
+  // REST API for users
+  router.restfulResource("/users", restfulUsers);
+});
+
+// user auth
+guardedGuest(() => {
+  router.post("/login", loginRequest);
+  router.post("/register", registerRequest);
+  router.post("/register/verify", activateAccount);
+  router.post("/resend-activation-code", resendActivationCode);
+  router.post("/forget-password", forgetPassword);
+  router.post("/forget-password/verify-code", verifyForgetPasswordCode);
+  router.post("/reset-password", resetPassword);
+});
+
+// profile routes
+guarded(() => {
+  router.get("/me", myProfile);
+  router.post("/me", updateProfile);
+  router.post("/logout", logout);
+  router.post("/change-password", changePassword);
+});

package/templates/warlock/src/app/users/utils/locales.ts

@@ -1,16 +1,16 @@
-import { groupedTranslations } from "@mongez/localization";
-
-groupedTranslations("auth", {
-  confirmRegistrationSubject: {
-    en: "Activate your account",
-    ar: "تفعيل حسابك",
-  },
-  invalidCredentials: {
-    en: "Invalid credentials",
-    ar: "بيانات الدخول غير صحيحة",
-  },
-  accountNotActivated: {
-    en: "Your account is not activated",
-    ar: "حسابك غير مفعل",
-  },
-});
+import { groupedTranslations } from "@mongez/localization";
+
+groupedTranslations("auth", {
+  confirmRegistrationSubject: {
+    en: "Activate your account",
+    ar: "تفعيل حسابك",
+  },
+  invalidCredentials: {
+    en: "Invalid credentials",
+    ar: "بيانات الدخول غير صحيحة",
+  },
+  accountNotActivated: {
+    en: "Your account is not activated",
+    ar: "حسابك غير مفعل",
+  },
+});

package/templates/warlock/src/app/utils/output.ts

@@ -1,18 +1,18 @@
-import type { FinalOutput } from "@warlock.js/core";
-import { UserOutput } from "app/users/output/user.output";
-
-/**
- * Merge the output with this function will return the base output details
- * Only and only if any of these keys are present
- */
-export function withBaseOutputDetails(moreOptions: FinalOutput): FinalOutput {
-  return {
-    id: "integer",
-    isActive: "boolean",
-    createdAt: "date",
-    updatedAt: "date",
-    createdBy: UserOutput,
-    updatedBy: UserOutput,
-    ...moreOptions,
-  };
-}
+import type { FinalOutput } from "@warlock.js/core";
+import { UserOutput } from "app/users/output/user.output";
+
+/**
+ * Merge the output with this function will return the base output details
+ * Only and only if any of these keys are present
+ */
+export function withBaseOutputDetails(moreOptions: FinalOutput): FinalOutput {
+  return {
+    id: "integer",
+    isActive: "boolean",
+    createdAt: "date",
+    updatedAt: "date",
+    createdBy: UserOutput,
+    updatedBy: UserOutput,
+    ...moreOptions,
+  };
+}

package/templates/warlock/src/app/utils/router.ts

@@ -1,104 +1,104 @@
-import { authMiddleware } from "@warlock.js/auth";
-import {
-  router,
-  useRequestStore,
-  type Middleware,
-  type RouterGroupCallback,
-} from "@warlock.js/core";
-
-export const adminPath = (path: string) => `/admin${path}`;
-
-/**
- * Check if the current request is for admin
- */
-export const isAdminRequest = () => {
-  const { request } = useRequestStore();
-
-  return request.path.includes("/admin");
-};
-
-/**
- * Add routes Group
- */
-const adminRoutes = (callback: RouterGroupCallback) => {
-  return router.group(
-    {
-      prefix: "/admin",
-      name: "admin",
-    },
-    callback,
-  );
-};
-
-/**
- * Register guarded routes that requires user to be logged in to access them.
- */
-export const guarded = (
-  callback: RouterGroupCallback,
-  moreMiddlewares: Middleware[] = [],
-) => {
-  return router.group(
-    {
-      name: "guarded.user",
-      middleware: [authMiddleware("user"), ...moreMiddlewares],
-    },
-    callback,
-  );
-};
-
-/**
- * Only guests can access these routes.
- */
-export const guardedGuest = (callback: RouterGroupCallback) => {
-  return router.group(
-    {
-      name: "guarded.guest",
-      middleware: [authMiddleware()],
-    },
-    callback,
-  );
-};
-
-/**
- * Guarded guest routes for admin
- */
-export const guardedGuestAdmin = (callback: RouterGroupCallback) => {
-  return adminRoutes(() => {
-    router.group(
-      {
-        name: "guarded.guest",
-        middleware: [authMiddleware()],
-      },
-      callback,
-    );
-  });
-};
-
-/**
- * Only admin can access these routes.
- */
-export const guardedAdmin = (callback: RouterGroupCallback) => {
-  return adminRoutes(() => {
-    router.group(
-      {
-        name: "guarded.user",
-        middleware: [authMiddleware("user")],
-      },
-      callback,
-    );
-  });
-};
-
-/**
- * Public routes that doesn't require user to be logged in to access them.
- * Just requires an access token.
- */
-export const publicRoutes = (callback: RouterGroupCallback) => {
-  return router.group(
-    {
-      name: "public",
-      middleware: [authMiddleware()],
-    },
-    callback,
-  );
-};
+import { authMiddleware } from "@warlock.js/auth";
+import {
+  router,
+  useRequestStore,
+  type Middleware,
+  type RouterGroupCallback,
+} from "@warlock.js/core";
+
+export const adminPath = (path: string) => `/admin${path}`;
+
+/**
+ * Check if the current request is for admin
+ */
+export const isAdminRequest = () => {
+  const { request } = useRequestStore();
+
+  return request.path.includes("/admin");
+};
+
+/**
+ * Add routes Group
+ */
+const adminRoutes = (callback: RouterGroupCallback) => {
+  return router.group(
+    {
+      prefix: "/admin",
+      name: "admin",
+    },
+    callback,
+  );
+};
+
+/**
+ * Register guarded routes that requires user to be logged in to access them.
+ */
+export const guarded = (
+  callback: RouterGroupCallback,
+  moreMiddlewares: Middleware[] = [],
+) => {
+  return router.group(
+    {
+      name: "guarded.user",
+      middleware: [authMiddleware("user"), ...moreMiddlewares],
+    },
+    callback,
+  );
+};
+
+/**
+ * Only guests can access these routes.
+ */
+export const guardedGuest = (callback: RouterGroupCallback) => {
+  return router.group(
+    {
+      name: "guarded.guest",
+      middleware: [authMiddleware()],
+    },
+    callback,
+  );
+};
+
+/**
+ * Guarded guest routes for admin
+ */
+export const guardedGuestAdmin = (callback: RouterGroupCallback) => {
+  return adminRoutes(() => {
+    router.group(
+      {
+        name: "guarded.guest",
+        middleware: [authMiddleware()],
+      },
+      callback,
+    );
+  });
+};
+
+/**
+ * Only admin can access these routes.
+ */
+export const guardedAdmin = (callback: RouterGroupCallback) => {
+  return adminRoutes(() => {
+    router.group(
+      {
+        name: "guarded.user",
+        middleware: [authMiddleware("user")],
+      },
+      callback,
+    );
+  });
+};
+
+/**
+ * Public routes that doesn't require user to be logged in to access them.
+ * Just requires an access token.
+ */
+export const publicRoutes = (callback: RouterGroupCallback) => {
+  return router.group(
+    {
+      name: "public",
+      middleware: [authMiddleware()],
+    },
+    callback,
+  );
+};

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

@@ -9,6 +9,10 @@ const databaseConfigurations: DatabaseConfigurations = {
   database: env("DB_NAME"),
   dbAuth: env("DB_AUTH"),
   url: env("DB_URL"),
+  model: {
+    autoIncrementBy: 1,
+    initialId: 1,
+  },
 };
 
 export default databaseConfigurations;