create-warlock 4.16.0 → 5.0.1

package/esm/ui/report.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.mjs","names":[],"sources":["../../../../../../create-warlock/src/ui/report.ts"],"sourcesContent":["import { colors } from \"@mongez/copper\";\nimport type { CommandResult } from \"../helpers/exec\";\nimport { tail } from \"../helpers/exec\";\n\n/**\n * Failure reporting for the scaffolder.\n *\n * The house rule this module enforces: a step that did not succeed is never\n * described as if it did, and a failure always carries three things — WHAT ran,\n * HOW it ended (exit code), and ENOUGH of its output to act on. \"Something went\n * wrong, add it later\" is not a report.\n */\n\n/** A step that did not do what the user asked for. */\nexport type Problem = {\n  /** The step, e.g. `Dependency install`. */\n  step: string;\n  /** One-line summary of what is now missing / broken. */\n  detail: string;\n  /** The command behind the failure, when there was one. */\n  result?: CommandResult;\n  /** Extra guidance: how to retry, what to check. */\n  hints?: string[];\n};\n\nconst bullet = colors.red(\"✖\");\n\n/**\n * The command line, its exit status, and the tail of what it printed.\n */\nfunction describeCommand(result: CommandResult): string[] {\n  const lines: string[] = [];\n\n  lines.push(`${colors.dim(\"command:\")} ${colors.white(result.command)}`);\n\n  if (result.cwd) {\n    lines.push(`${colors.dim(\"in:\")}      ${colors.white(result.cwd)}`);\n  }\n\n  if (result.error) {\n    lines.push(\n      `${colors.dim(\"failed:\")}  ${colors.white(result.error.message || String(result.error))}`,\n    );\n  } else if (result.signal) {\n    lines.push(`${colors.dim(\"killed:\")}  ${colors.white(result.signal)}`);\n  } else {\n    lines.push(\n      `${colors.dim(\"exited:\")}  ${colors.white(`code ${result.code}`)}`,\n    );\n  }\n\n  const output = tail(result.stderr) || tail(result.stdout);\n\n  if (output) {\n    lines.push(colors.dim(\"output:\"));\n\n    for (const line of output.split(\"\\n\")) {\n      lines.push(`  ${colors.dim(line)}`);\n    }\n  }\n\n  return lines;\n}\n\nfunction printProblem(problem: Problem) {\n  console.log(`  ${bullet} ${colors.bold(colors.red(problem.step))}`);\n  console.log(`     ${colors.white(problem.detail)}`);\n\n  if (problem.result) {\n    for (const line of describeCommand(problem.result)) {\n      console.log(`     ${line}`);\n    }\n  }\n\n  for (const hint of problem.hints ?? []) {\n    console.log(`     ${colors.yellow(\"→\")} ${colors.yellow(hint)}`);\n  }\n\n  console.log();\n}\n\n/**\n * Report a failure the scaffold cannot continue past, and leave the process\n * with a non-zero exit code. Nothing after this point may print a success.\n */\nexport function failFatally(problem: Problem): never {\n  console.log();\n  console.log(colors.bold(colors.red(\"  SCAFFOLD FAILED\")));\n  console.log();\n\n  printProblem(problem);\n\n  console.log(\n    colors.dim(\n      \"  The project directory was left in place so you can inspect it.\",\n    ),\n  );\n  console.log();\n\n  process.exit(1);\n}\n\n/**\n * Report the steps that failed on a scaffold that otherwise completed, and say\n * plainly what the project does NOT have as a result.\n */\nexport function showProblems(problems: Problem[]) {\n  if (problems.length === 0) return;\n\n  console.log();\n  console.log(\n    colors.bold(\n      colors.yellow(\n        `  COMPLETED WITH ${problems.length} PROBLEM${problems.length === 1 ? \"\" : \"S\"}`,\n      ),\n    ),\n  );\n  console.log();\n\n  for (const problem of problems) {\n    printProblem(problem);\n  }\n}\n\n/** Neutral, non-failing information — e.g. which versions got pinned and why. */\nexport function showNotes(notes: string[]) {\n  for (const note of notes) {\n    console.log(`  ${colors.yellow(\"!\")} ${colors.dim(note)}`);\n  }\n\n  if (notes.length > 0) console.log();\n}\n\n/**\n * A scaffold that finished with problems still produced a project, so print the\n * same facts the success screen would — minus the celebration, and listing only\n * what is actually installed.\n */\nexport function showPartialScreen(options: {\n  projectName: string;\n  database: string;\n  features: string[];\n  missingFeatures: string[];\n  packageManager: string;\n}): void {\n  const { projectName, database, features, missingFeatures, packageManager } =\n    options;\n\n  const devCommand =\n    packageManager === \"npm\" ? \"npm run dev\" : `${packageManager} dev`;\n\n  console.log(\n    `  ${colors.bold(colors.yellow(\"⚠ PROJECT CREATED — BUT NOT AS REQUESTED\"))}`,\n  );\n  console.log();\n  console.log(`     ${colors.dim(\"Project:  \")}${colors.white(projectName)}`);\n  console.log(`     ${colors.dim(\"Database: \")}${colors.white(database)}`);\n  console.log(\n    `     ${colors.dim(\"Installed:\")}${colors.white(features.length > 0 ? \" \" + features.join(\", \") : \" none\")}`,\n  );\n\n  if (missingFeatures.length > 0) {\n    console.log(\n      `     ${colors.dim(\"Missing:  \")}${colors.red(missingFeatures.join(\", \"))}`,\n    );\n  }\n\n  console.log();\n  console.log(`  ${colors.dim(\"Fix the problems above, then:\")}`);\n  console.log();\n  console.log(`     ${colors.cyan(\"cd\")} ${projectName}`);\n\n  if (missingFeatures.length > 0) {\n    console.log(\n      `     ${colors.cyan(`npx warlock add ${missingFeatures.join(\" \")}`)}`,\n    );\n  }\n\n  console.log(`     ${colors.cyan(devCommand)}`);\n  console.log();\n}\n\n/**\n * Turn an npm/yarn/pnpm failure into actionable guidance where we can\n * recognise it. `ETARGET` in particular is the signature of a dependency\n * pinned to a version that was never published — the bug this whole reporting\n * path was written for.\n */\nexport function installFailureHints(result: CommandResult | undefined) {\n  const hints = [\n    \"Nothing was installed. Fix the error above, then run the install again inside the project.\",\n  ];\n\n  const output = `${result?.stdout ?? \"\"}${result?.stderr ?? \"\"}`;\n\n  if (/ETARGET|No matching version found/i.test(output)) {\n    hints.push(\n      \"A dependency is pinned to a version that does not exist on the registry — check the @warlock.js/* versions in package.json.\",\n    );\n  }\n\n  if (/ENOTFOUND|ETIMEDOUT|ECONNREFUSED|network/i.test(output)) {\n    hints.push(\"The registry was unreachable — check your network or proxy.\");\n  }\n\n  if (/EACCES|EPERM/i.test(output)) {\n    hints.push(\n      \"Permission denied — check the directory's ownership before retrying.\",\n    );\n  }\n\n  return hints;\n}\n"],"mappings":"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"}

package/esm/ui/spinners.mjs

@@ -1,21 +1,31 @@
 //#region ../create-warlock/src/ui/spinners.ts
 /**
-* Themed spinner messages for the wizard
+* Themed spinner messages for the wizard.
+*
+* Every step has BOTH a success and a failure message, and the orchestrator
+* picks between them from the step's actual result. A spinner that can only
+* stop with a cheerful message is a spinner that lies.
 */
 const spinnerMessages = {
 	installingDeps: "Summoning dependencies...",
 	depsInstalled: "Dependencies materialized!",
+	depsFailed: "Dependencies could not be installed",
 	initializingGit: "Initializing grimoire (git)...",
 	gitInitialized: "Grimoire initialized!",
+	gitFailed: "Git repository was not initialized",
 	generatingJwt: "Forging secret keys...",
 	jwtGenerated: "Secret keys forged!",
+	jwtFailed: "Secret keys were NOT generated",
 	warmingCache: "Charging magical circuits...",
 	cacheWarmed: "Circuits charged!",
+	cacheWarmFailed: "Cache could not be warmed (harmless — it builds on first run)",
 	addingFeatures: "Weaving in your features...",
 	featuresAdded: "Features woven in!",
-	featuresFailed: "Some features could not be added  add them later with`warlock add`",
+	featuresPartial: "Some features were not added",
+	featuresFailed: "No features could be added",
 	copyingTemplate: "Preparing your spellbook...",
-	templateCopied: "Spellbook ready!"
+	templateCopied: "Spellbook ready!",
+	templateFailed: "The project template could not be copied"
 };
 
 //#endregion

package/esm/ui/spinners.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"spinners.mjs","names":[],"sources":["../../../../../../create-warlock/src/ui/spinners.ts"],"sourcesContent":["/**\n * Themed spinner messages for the wizard\n */\nexport const spinnerMessages = {\n  installingDeps: \"Summoning dependencies...\",\n  depsInstalled: \"Dependencies materialized!\",\n\n  initializingGit: \"Initializing grimoire (git)...\",\n  gitInitialized: \"Grimoire initialized!\",\n\n  generatingJwt: \"Forging secret keys...\",\n  jwtGenerated: \"Secret keys forged!\",\n\n  warmingCache: \"Charging magical circuits...\",\n  cacheWarmed: \"Circuits charged!\",\n\n  addingFeatures: \"Weaving in your features...\",\n  featuresAdded: \"Features woven in!\",\n  featuresFailed:\n    \"Some features could not be added  add them later with`warlock add`\",\n\n  copyingTemplate: \"Preparing your spellbook...\",\n  templateCopied: \"Spellbook ready!\",\n} as const;\n"],"mappings":";;;;AAGA,MAAa,kBAAkB;CAC7B,gBAAgB;CAChB,eAAe;CAEf,iBAAiB;CACjB,gBAAgB;CAEhB,eAAe;CACf,cAAc;CAEd,cAAc;CACd,aAAa;CAEb,gBAAgB;CAChB,eAAe;CACf,gBACE;CAEF,iBAAiB;CACjB,gBAAgB;AAClB"}
+{"version":3,"file":"spinners.mjs","names":[],"sources":["../../../../../../create-warlock/src/ui/spinners.ts"],"sourcesContent":["/**\n * Themed spinner messages for the wizard.\n *\n * Every step has BOTH a success and a failure message, and the orchestrator\n * picks between them from the step's actual result. A spinner that can only\n * stop with a cheerful message is a spinner that lies.\n */\nexport const spinnerMessages = {\n  installingDeps: \"Summoning dependencies...\",\n  depsInstalled: \"Dependencies materialized!\",\n  depsFailed: \"Dependencies could not be installed\",\n\n  initializingGit: \"Initializing grimoire (git)...\",\n  gitInitialized: \"Grimoire initialized!\",\n  gitFailed: \"Git repository was not initialized\",\n\n  generatingJwt: \"Forging secret keys...\",\n  jwtGenerated: \"Secret keys forged!\",\n  jwtFailed: \"Secret keys were NOT generated\",\n\n  warmingCache: \"Charging magical circuits...\",\n  cacheWarmed: \"Circuits charged!\",\n  cacheWarmFailed:\n    \"Cache could not be warmed (harmless — it builds on first run)\",\n\n  addingFeatures: \"Weaving in your features...\",\n  featuresAdded: \"Features woven in!\",\n  featuresPartial: \"Some features were not added\",\n  featuresFailed: \"No features could be added\",\n\n  copyingTemplate: \"Preparing your spellbook...\",\n  templateCopied: \"Spellbook ready!\",\n  templateFailed: \"The project template could not be copied\",\n} as const;\n"],"mappings":";;;;;;;;AAOA,MAAa,kBAAkB;CAC7B,gBAAgB;CAChB,eAAe;CACf,YAAY;CAEZ,iBAAiB;CACjB,gBAAgB;CAChB,WAAW;CAEX,eAAe;CACf,cAAc;CACd,WAAW;CAEX,cAAc;CACd,aAAa;CACb,iBACE;CAEF,gBAAgB;CAChB,eAAe;CACf,iBAAiB;CACjB,gBAAgB;CAEhB,iBAAiB;CACjB,gBAAgB;CAChB,gBAAgB;AAClB"}

package/package.json

@@ -12,13 +12,13 @@
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@mongez/copper": "^2.1.2",
-    "@warlock.js/fs": "4.16.0",
+    "@warlock.js/fs": "5.0.1",
     "@mongez/reinforcements": "^4.0.1",
     "cross-spawn": "^7.0.3",
     "rimraf": "^6.0.1",
     "which-pm-runs": "^1.1.0"
   },
-  "version": "4.16.0",
+  "version": "5.0.1",
   "type": "module",
   "main": "./esm/index.mjs",
   "module": "./esm/index.mjs",

package/templates/warlock/src/app/auth/controllers/forgot-password.controller.ts

@@ -1,4 +1,4 @@
-import { t, type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { t, type RequestHandler } from "@warlock.js/core";
 import { v } from "@warlock.js/seal";
 import { forgotPasswordService } from "../services/forgot-password.service";
 
@@ -6,10 +6,7 @@ import { forgotPasswordService } from "../services/forgot-password.service";
  * Forgot password controller
  * POST /auth/forgot-password
  */
-export const forgotPasswordController: RequestHandler = async (
-  request: Request,
-  response: Response,
-) => {
+export const forgotPasswordController: RequestHandler = async ({ request, response }) => {
   const { email } = request.validated();
 
   await forgotPasswordService(email);

package/templates/warlock/src/app/auth/controllers/login.controller.ts

@@ -6,7 +6,10 @@ import { loginService } from "../services/auth.service";
  * Login controller
  * POST /auth/login
  */
-export const loginController: RequestHandler<Request<LoginSchema>> = async (request, response) => {
+export const loginController: RequestHandler<Request<LoginSchema>> = async ({
+  request,
+  response,
+}) => {
   const result = await loginService(request.validated(), {
     userAgent: request.userAgent,
     ip: request.ip,

package/templates/warlock/src/app/auth/controllers/logout-all.controller.ts

@@ -1,11 +1,11 @@
-import { t, type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { t, type RequestHandler } from "@warlock.js/core";
 import { logoutAllService } from "../services/auth.service";
 
 /**
  * Logout from all devices controller
  * POST /auth/logout-all
  */
-export const logoutAllController: RequestHandler = async (request: Request, response: Response) => {
+export const logoutAllController: RequestHandler = async ({ request, response }) => {
   await logoutAllService(request.user);
 
   return response.success({

package/templates/warlock/src/app/auth/controllers/logout.controller.ts

@@ -1,11 +1,11 @@
-import { t, type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { t, type RequestHandler } from "@warlock.js/core";
 import { logoutService } from "../services/auth.service";
 
 /**
  * Logout controller
  * POST /auth/logout
  */
-export const logoutController: RequestHandler = async (request: Request, response: Response) => {
+export const logoutController: RequestHandler = async ({ request, response }) => {
   await logoutService(request.user);
 
   return response.success({

package/templates/warlock/src/app/auth/controllers/me.controller.ts

@@ -1,10 +1,10 @@
-import { type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { type RequestHandler } from "@warlock.js/core";
 
 /**
  * Get current user controller
  * GET /auth/me
  */
-export const meController: RequestHandler = async (request: Request, response: Response) => {
+export const meController: RequestHandler = async ({ request, response }) => {
   return response.success({
     user: request.user,
   });

package/templates/warlock/src/app/auth/controllers/refresh-token.controller.ts

@@ -1,4 +1,4 @@
-import { type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { type RequestHandler } from "@warlock.js/core";
 import { v } from "@warlock.js/seal";
 import { refreshTokensService } from "../services/auth.service";
 
@@ -6,10 +6,7 @@ import { refreshTokensService } from "../services/auth.service";
  * Refresh token controller
  * POST /auth/refresh-token
  */
-export const refreshTokenController: RequestHandler = async (
-  request: Request,
-  response: Response,
-) => {
+export const refreshTokenController: RequestHandler = async ({ request, response }) => {
   const token = request.input("refreshToken");
 
   const result = await refreshTokensService(token, {

package/templates/warlock/src/app/auth/controllers/reset-password.controller.ts

@@ -5,10 +5,10 @@ import { resetPasswordService } from "../services/reset-password.service";
 /**
  * Reset password controller
  */
-export const resetPasswordController: RequestHandler<Request<ResetPasswordSchema>> = async (
+export const resetPasswordController: RequestHandler<Request<ResetPasswordSchema>> = async ({
   request,
   response,
-) => {
+}) => {
   await resetPasswordService(request.validated());
 
   return response.success({

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

@@ -2,10 +2,10 @@ import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { Post } from "../models/post/post.model";
 import { type CreatePostSchema, createPostSchema } from "../schema/create-post.schema";
 
-export const createNewPostController: GuardedRequestHandler<CreatePostSchema> = async (
+export const createNewPostController: GuardedRequestHandler<CreatePostSchema> = async ({
   request,
   response,
-) => {
+}) => {
   const post = await Post.create({
     ...request.validated(),
     authorId: request.user.id,

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

@@ -2,10 +2,10 @@ import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { Post } from "../models/post/post.model";
 import { type UpdatePostSchema, updatePostSchema } from "../schema/update-post.schema";
 
-export const updatePostController: GuardedRequestHandler<UpdatePostSchema> = async (
+export const updatePostController: GuardedRequestHandler<UpdatePostSchema> = async ({
   request,
   response,
-) => {
+}) => {
   const id = request.int("id");
 
   if (!id) {

package/templates/warlock/src/app/shared/controllers/home-page.controller.ts

@@ -7,7 +7,7 @@ import { Application, type RequestHandler } from "@warlock.js/core";
  * page (`home-page.controller.tsx` + `HomePageComponent.tsx`) instead; this
  * plain controller is removed at scaffold time when React is selected.
  */
-export const homePageController: RequestHandler = async (_request, response) => {
+export const homePageController: RequestHandler = async ({ response }) => {
   return response.success({
     message: "Welcome to Warlock 🧙 — your app is up and running!",
     version: Application.version,

package/templates/warlock/src/app/shared/controllers/home-page.controller.tsx

@@ -1,7 +1,7 @@
-import { type Request, type RequestHandler, type Response } from "@warlock.js/core";
+import { type RequestHandler } from "@warlock.js/core";
 import { HomePageComponent } from "../components/HomePageComponent";
 
-export const homePageController: RequestHandler = async (_request: Request, response: Response) => {
+export const homePageController: RequestHandler = async ({ response }) => {
   return response.render(<HomePageComponent />);
 };
 

package/templates/warlock/src/app/uploads/controllers/fetch-uploaded-file.controller.ts

@@ -3,7 +3,7 @@ import { Image, type RequestHandler, storage } from "@warlock.js/core";
 import { fileExistsAsync } from "@warlock.js/fs";
 import { v } from "@warlock.js/seal";
 
-export const fetchUploadedFileController: RequestHandler = async (request, response) => {
+export const fetchUploadedFileController: RequestHandler = async ({ request, response }) => {
   const absolutePath = storage.root(request.input("*"));
 
   const { w: width, h: height } = request.validated();

package/templates/warlock/src/app/users/controllers/create-new-user.controller.ts

@@ -2,10 +2,10 @@ import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { User } from "../models/user";
 import { type CreateUserSchema, createUserSchema } from "../schema/create-user.schema";
 
-export const createNewUserController: GuardedRequestHandler<CreateUserSchema> = async (
+export const createNewUserController: GuardedRequestHandler<CreateUserSchema> = async ({
   request,
   response,
-) => {
+}) => {
   const file = request.file("image")!;
 
   const output = await file.save("images");

package/templates/warlock/src/app/users/controllers/list-users.controller.ts

@@ -1,7 +1,7 @@
 import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { usersRepository } from "../repositories/users.repository";
 
-export const listUsersController: GuardedRequestHandler = async (request, response) => {
+export const listUsersController: GuardedRequestHandler = async ({ request, response }) => {
   const users = await usersRepository.listCached(request.all());
 
   return response.success({

package/templates/warlock/src/app/users/services/login-social.ts

@@ -1,6 +1,14 @@
-import type { Request, Response } from "@warlock.js/core";
+import type { GuardedRequestHandler } from "app/auth/requests/guarded.request";
 
-export default async function loginSocial(request: Request, response: Response) {
+/**
+ * Social login handler.
+ *
+ * Despite living under `services/`, this is a route handler: it consumes the
+ * request and returns a response. It is typed as a `GuardedRequestHandler` so
+ * it can be wired straight into a route, and so `request.user` resolves to the
+ * app's `User` model rather than core's optional `RequestUser`.
+ */
+const loginSocial: GuardedRequestHandler = async ({ request, response }) => {
   const user = request.user;
 
   const auth = await user.generateAccessToken();
@@ -16,4 +24,6 @@ export default async function loginSocial(request: Request, response: Response)
       userType: user.userType,
     },
   });
-}
+};
+
+export default loginSocial;

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

@@ -30,7 +30,10 @@ const globalPrefix = () => {
 };
 
 const cacheConfigurations: CacheConfigurations<"database"> = {
-  default: "redis",
+  // Driven by CACHE_DRIVER so the shipped .env (`memory`) actually wins.
+  // Hardcoding "redis" made a `--no-db` scaffold hang forever retrying a
+  // Redis connection that was never going to exist.
+  default: env("CACHE_DRIVER") || "redis",
   drivers: {
     file: FileCacheDriver,
     memory: MemoryCacheDriver,