create-warlock 2.0.4 → 2.1.0

package/package.json

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

package/templates/warlock/eslint.config.mjs

@@ -0,0 +1,76 @@
+import { FlatCompat } from "@eslint/eslintrc";
+import js from "@eslint/js";
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+import prettier from "eslint-plugin-prettier";
+import unusedImports from "eslint-plugin-unused-imports";
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  ...compat.extends(
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended",
+  ),
+  {
+    plugins: {
+      "@typescript-eslint": typescriptEslint,
+      prettier,
+      "unused-imports": unusedImports,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+
+      parser: tsParser,
+      ecmaVersion: "latest",
+      sourceType: "module",
+    },
+
+    rules: {
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-unused-vars": "off",
+      "no-unused-vars": "off",
+
+      "unused-imports/no-unused-vars": [
+        "warn",
+        {
+          vars: "all",
+          varsIgnorePattern: "^_",
+          args: "after-used",
+          argsIgnorePattern: "^_",
+        },
+      ],
+
+      "unused-imports/no-unused-imports": "error",
+
+      "@typescript-eslint/explicit-member-accessibility": [
+        "error",
+        {
+          accessibility: "explicit",
+        },
+      ],
+
+      "@typescript-eslint/consistent-type-imports": [
+        "error",
+        {
+          prefer: "type-imports",
+          disallowTypeAnnotations: false,
+        },
+      ],
+    },
+  },
+];

package/templates/warlock/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "app-nme",
+    "name": "app-name",
     "version": "1.0.0",
     "private": true,
     "scripts": {
@@ -14,9 +14,10 @@
         "test": "warlock test.init && vitest",
         "prod.start": "yarn build && yarn prod",
         "serve": "yarn build && nohup warlock start > /dev/null 2>&1",
-        "lint": "npx eslint --fix -c ./.eslintrc.json ./src --max-warnings=0",
+        "lint": "npx eslint --fix ./src --max-warnings=0",
         "format": "npx prettier --write ./src/**/*.{js,jsx,ts,tsx,css,md,json} --config ./.prettierrc.json",
-        "tsc": "npx tsc --noEmit"
+        "tsc": "npx tsc --noEmit",
+        "prepare": "huskier-init && husky install"
     },
     "dependencies": {
         "@mongez/collection": "^1.2.0",
@@ -26,28 +27,29 @@
         "@mongez/localization": "^3.0.0",
         "@mongez/dotenv": "^1.1.9",
         "@mongez/config": "^1.0.26",
-        "@mongez/supportive-is": "^2.0.3",
-        "@warlock.js/auth": "2.0.4",
-        "@warlock.js/cache": "2.0.4",
-        "@warlock.js/cascade": "2.0.4",
-        "@warlock.js/core": "2.0.4",
-        "@warlock.js/logger": "2.0.4",
-        "dayjs": "^1.11.10"
+        "@mongez/supportive-is": "^2.0.4",
+        "@warlock.js/auth": "2.1.0",
+        "@warlock.js/cache": "2.1.0",
+        "@warlock.js/cascade": "2.1.0",
+        "@warlock.js/core": "2.1.0",
+        "@warlock.js/logger": "2.1.0",
+        "dayjs": "^1.11.13"
     },
     "devDependencies": {
-        "eslint": "^8.53.0",
-        "@types/react": "^18.3.3",
-        "@typescript-eslint/eslint-plugin": "^6.11.0",
-        "@typescript-eslint/parser": "^6.11.0",
-        "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-prettier": "^5.0.1",
-        "eslint-plugin-unused-imports": "^3.0.0",
-        "@mongez/huskier": "^2.0.0",
-        "prettier": "^3.2.5",
-        "prettier-plugin-organize-imports": "^3.2.4",
-        "typescript": "^5.4.5",
-        "vite": "^5.2.8",
-        "vitest": "^1.5.0"
+        "eslint": "^9.13.0",
+        "@types/react": "^18.3.11",
+        "@typescript-eslint/eslint-plugin": "^8.10.0",
+        "@typescript-eslint/parser": "^8.10.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "eslint-plugin-unused-imports": "^4.1.4",
+        "@mongez/huskier": "^3.0.0",
+        "prettier": "^3.3.3",
+        "prettier-plugin-organize-imports": "^4.1.0",
+        "typescript": "^5.6.3",
+        "vite": "^5.4.9",
+        "vitest": "^2.1.3",
+        "husky": "^8.0.0"
     },
     "huskier": {
         "hooks": {

package/templates/warlock/src/app/users/controllers/auth/activate-account.ts

@@ -1,6 +1,5 @@
 import type { Request, Response } from "@warlock.js/core";
-import usersRepository from "app/users/repositories/users-repository";
-
+import { usersRepository } from "app/users/repositories/users.repository";
 
 export default async function activateAccount(
   request: Request,

package/templates/warlock/src/app/users/controllers/auth/forget-password.ts

@@ -1,5 +1,5 @@
 import { Random } from "@mongez/reinforcements";
-import { UniqueRule, type Request, type Response } from "@warlock.js/core";
+import { type Request, type Response } from "@warlock.js/core";
 import sendForgetPasswordEmail from "app/users/mail/send-forget-password-email";
 import { User } from "app/users/models/user";
 

package/templates/warlock/src/app/users/controllers/restful-users.ts

@@ -1,7 +1,6 @@
-import type { RouteResource } from "@warlock.js/core";
-import { Restful, UniqueRule } from "@warlock.js/core";
+import { Restful, type RouteResource, UniqueRule } from "@warlock.js/core";
 import { User } from "../models/user";
-import usersRepository from "../repositories/users-repository";
+import { usersRepository } from "../repositories/users.repository";
 
 class RestfulUsers extends Restful<User> implements RouteResource {
   /**

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

@@ -1 +1 @@
-export * from "./user";
+export * from "./user.model";

package/templates/warlock/src/app/users/models/user/{migration.ts → migrations/20-10-2024_07-59-54-user.migration.ts}

@@ -1,5 +1,5 @@
 import { migrationOffice } from "@warlock.js/cascade";
-import { User } from "./user";
+import { User } from "../user.model";
 
 export default migrationOffice.register({
   name: "users",

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

@@ -2,7 +2,7 @@ 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";
+import { UserOutput } from "../../output/user.output";
 
 export class User extends Auth {
   /**

package/templates/warlock/src/app/users/output/{user-output.ts → user.output.ts}

@@ -1,7 +1,7 @@
 import { Output, type FinalOutput } from "@warlock.js/core";
 import { withBaseOutputDetails } from "app/utils/output";
 
-export default class UserOutput extends Output {
+export class UserOutput extends Output {
   /**
    * Output data
    */

package/templates/warlock/src/app/users/repositories/{users-repository.ts → users.repository.ts}

@@ -20,10 +20,8 @@ export class UsersRepository extends RepositoryManager<User> {
   protected filterBy: FilterByOptions = this.withDefaultFilters({
     name: "like",
     isActive: "bool",
-    activationCode: '='
+    activationCode: "=",
   });
 }
 
-const usersRepository = new UsersRepository();
-
-export default usersRepository;
+export const usersRepository = new UsersRepository();

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

@@ -9,7 +9,7 @@ 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";
+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";

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

@@ -1,5 +1,5 @@
 import type { FinalOutput } from "@warlock.js/core";
-import UserOutput from "app/users/output/user-output";
+import { UserOutput } from "app/users/output/user.output";
 
 /**
  * Merge the output with this function will return the base output details

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

@@ -8,6 +8,7 @@ import {
   EmailRule,
   FileRule,
   FloatRule,
+  ImageRule,
   InRule,
   IntRule,
   LengthRule,
@@ -27,7 +28,6 @@ import {
   StringRule,
   UniqueRule,
   UploadableRule,
-  ImageRule,
   UrlRule,
 } from "@warlock.js/core";