zuro-cli 0.0.2-beta.15 → 0.0.2-beta.16

package/dist/index.js

@@ -1793,27 +1793,15 @@ var UPLOAD_PRESETS = {
     mimeTypes: ["video/mp4", "video/quicktime", "video/webm"],
     maxFileSize: 100 * 1024 * 1024,
     maxFiles: 1
-  },
-  mixed: {
-    mimeTypes: [
-      "image/jpeg",
-      "image/png",
-      "image/webp",
-      "application/pdf",
-      "text/plain",
-      "video/mp4"
-    ],
-    maxFileSize: 25 * 1024 * 1024,
-    maxFiles: 5
   }
 };
 function getUploadEnvSchemaFields(provider) {
   const shared = [
     { name: "UPLOAD_PROVIDER", schema: `z.enum(["s3", "r2", "cloudinary"])` },
     { name: "UPLOAD_MODE", schema: `z.enum(["proxy", "direct", "large"])` },
-    { name: "UPLOAD_AUTH_MODE", schema: `z.enum(["required", "optional", "none"])` },
+    { name: "UPLOAD_AUTH_MODE", schema: `z.enum(["required", "none"])` },
     { name: "UPLOAD_FILE_ACCESS", schema: `z.enum(["private", "public"])` },
-    { name: "UPLOAD_FILE_PRESET", schema: `z.enum(["image", "document", "video", "mixed"])` },
+    { name: "UPLOAD_FILE_PRESET", schema: `z.enum(["image", "document", "video"])` },
     { name: "UPLOAD_KEY_PREFIX", schema: "z.string().min(1)" },
     { name: "UPLOAD_ALLOWED_MIME", schema: "z.string().min(1)" },
     { name: "UPLOAD_MAX_FILE_SIZE", schema: "z.coerce.number().positive()" },
@@ -1848,103 +1836,24 @@ async function isAuthInstalled(projectRoot, srcDir) {
 function hasDrizzleDatabase(config) {
   return config?.database?.orm === "drizzle";
 }
-async function promptCredentials(provider) {
-  console.log(import_chalk7.default.dim("  Tip: Leave fields blank to use placeholders and configure later.\n"));
+function getProviderEnvDefaults(provider) {
   if (provider === "cloudinary") {
-    const response2 = await (0, import_prompts5.default)([
-      {
-        type: "text",
-        name: "cloudName",
-        message: "Cloudinary cloud name",
-        initial: ""
-      },
-      {
-        type: "text",
-        name: "apiKey",
-        message: "Cloudinary API key",
-        initial: ""
-      },
-      {
-        type: "password",
-        name: "apiSecret",
-        message: "Cloudinary API secret"
-      },
-      {
-        type: "text",
-        name: "folder",
-        message: "Cloudinary folder",
-        initial: "uploads"
-      },
-      {
-        type: "text",
-        name: "uploadPreset",
-        message: "Cloudinary upload preset (optional)",
-        initial: ""
-      }
-    ]);
-    if (response2.cloudName === void 0) {
-      console.log(import_chalk7.default.yellow("Operation cancelled."));
-      return null;
-    }
-    const values2 = {
-      CLOUDINARY_CLOUD_NAME: response2.cloudName?.trim() || "your-cloud-name",
-      CLOUDINARY_API_KEY: response2.apiKey?.trim() || "your-api-key",
-      CLOUDINARY_API_SECRET: response2.apiSecret?.trim() || "your-api-secret",
-      CLOUDINARY_FOLDER: response2.folder?.trim() || "uploads",
-      CLOUDINARY_UPLOAD_PRESET: response2.uploadPreset?.trim() || ""
+    return {
+      CLOUDINARY_CLOUD_NAME: "your-cloud-name",
+      CLOUDINARY_API_KEY: "your-api-key",
+      CLOUDINARY_API_SECRET: "your-api-secret",
+      CLOUDINARY_FOLDER: "uploads",
+      CLOUDINARY_UPLOAD_PRESET: ""
     };
-    return values2;
   }
-  const response = await (0, import_prompts5.default)([
-    {
-      type: "text",
-      name: "bucket",
-      message: `${provider.toUpperCase()} bucket name`,
-      initial: ""
-    },
-    {
-      type: "text",
-      name: "region",
-      message: `${provider.toUpperCase()} region`,
-      initial: provider === "r2" ? "auto" : "us-east-1"
-    },
-    {
-      type: "text",
-      name: "endpoint",
-      message: provider === "r2" ? "R2 S3 endpoint" : "Custom S3 endpoint (optional)",
-      initial: provider === "r2" ? "https://<account-id>.r2.cloudflarestorage.com" : ""
-    },
-    {
-      type: "text",
-      name: "accessKeyId",
-      message: "Access key ID",
-      initial: ""
-    },
-    {
-      type: "password",
-      name: "secretAccessKey",
-      message: "Secret access key"
-    },
-    {
-      type: "text",
-      name: "publicBaseUrl",
-      message: "Public base URL (optional)",
-      initial: ""
-    }
-  ]);
-  if (response.bucket === void 0) {
-    console.log(import_chalk7.default.yellow("Operation cancelled."));
-    return null;
-  }
-  const values = {
-    UPLOAD_BUCKET: response.bucket?.trim() || `your-${provider}-bucket`,
-    UPLOAD_REGION: response.region?.trim() || (provider === "r2" ? "auto" : "us-east-1"),
-    UPLOAD_ENDPOINT: response.endpoint?.trim() || (provider === "r2" ? "https://<account-id>.r2.cloudflarestorage.com" : ""),
-    UPLOAD_ACCESS_KEY_ID: response.accessKeyId?.trim() || "your-access-key-id",
-    UPLOAD_SECRET_ACCESS_KEY: response.secretAccessKey?.trim() || "your-secret-access-key",
-    UPLOAD_PUBLIC_BASE_URL: response.publicBaseUrl?.trim() || ""
+  return {
+    UPLOAD_BUCKET: `your-${provider}-bucket`,
+    UPLOAD_REGION: provider === "r2" ? "auto" : "us-east-1",
+    UPLOAD_ENDPOINT: provider === "r2" ? "https://<account-id>.r2.cloudflarestorage.com" : "",
+    UPLOAD_ACCESS_KEY_ID: "your-access-key-id",
+    UPLOAD_SECRET_ACCESS_KEY: "your-secret-access-key",
+    UPLOAD_PUBLIC_BASE_URL: ""
   };
-  return values;
 }
 function buildSharedEnvVars(provider, mode, authMode, access, preset, maxFileSize, maxFiles) {
   return {
@@ -1995,10 +1904,9 @@ async function promptUploadsConfig(projectRoot, srcDir) {
       message: "Who can upload?",
       choices: [
         { title: "Authenticated only", value: "required" },
-        { title: "Optional auth", value: "optional" },
         { title: "Public", value: "none" }
       ],
-      initial: authInstalled ? 0 : 2
+      initial: authInstalled ? 0 : 1
     },
     {
       type: "select",
@@ -2017,16 +1925,9 @@ async function promptUploadsConfig(projectRoot, srcDir) {
       choices: [
         { title: "Image", value: "image" },
         { title: "Document", value: "document" },
-        { title: "Video", value: "video" },
-        { title: "Mixed", value: "mixed" }
+        { title: "Video", value: "video" }
       ],
       initial: 0
-    },
-    {
-      type: "confirm",
-      name: "useDefaults",
-      message: "Use recommended upload limits for this preset?",
-      initial: true
     }
   ]);
   if (initial.provider === void 0) {
@@ -2043,7 +1944,7 @@ async function promptUploadsConfig(projectRoot, srcDir) {
     console.log(import_chalk7.default.yellow("Use S3 or R2 for large uploads, or pick Proxy/Direct for Cloudinary.\n"));
     return null;
   }
-  if (provider === "cloudinary" && (preset === "document" || preset === "mixed")) {
+  if (provider === "cloudinary" && preset === "document") {
     const warning = await (0, import_prompts5.default)({
       type: "confirm",
       name: "continue",
@@ -2056,50 +1957,19 @@ async function promptUploadsConfig(projectRoot, srcDir) {
     }
   }
   const presetDefaults = UPLOAD_PRESETS[preset];
-  let maxFileSize = presetDefaults.maxFileSize;
-  let maxFiles = presetDefaults.maxFiles;
-  if (!initial.useDefaults) {
-    const custom = await (0, import_prompts5.default)([
-      {
-        type: "number",
-        name: "maxFileSizeMb",
-        message: "Max file size (MB)",
-        initial: Math.max(1, Math.round(presetDefaults.maxFileSize / (1024 * 1024))),
-        min: 1
-      },
-      {
-        type: "number",
-        name: "maxFiles",
-        message: "Max files per request",
-        initial: presetDefaults.maxFiles,
-        min: 1,
-        max: 20
-      }
-    ]);
-    if (custom.maxFileSizeMb === void 0) {
-      console.log(import_chalk7.default.yellow("Operation cancelled."));
-      return null;
-    }
-    maxFileSize = Number(custom.maxFileSizeMb) * 1024 * 1024;
-    maxFiles = Number(custom.maxFiles);
-  }
   let useDatabaseMetadata = false;
   let shouldInstallDatabase = false;
   const metadataPrompt = await (0, import_prompts5.default)({
-    type: "select",
+    type: "confirm",
     name: "metadata",
-    message: "Upload metadata storage?",
-    choices: [
-      { title: drizzleInstalled ? "Database" : "Install database + track uploads", value: "db" },
-      { title: "No metadata", value: "none" }
-    ],
-    initial: 0
+    message: drizzleInstalled ? "Store upload metadata in your database?" : "Install database and store upload metadata?",
+    initial: true
   });
   if (metadataPrompt.metadata === void 0) {
     console.log(import_chalk7.default.yellow("Operation cancelled."));
     return null;
   }
-  if (metadataPrompt.metadata === "db") {
+  if (metadataPrompt.metadata === true) {
     useDatabaseMetadata = true;
     if (!projectConfig?.database) {
       shouldInstallDatabase = true;
@@ -2135,10 +2005,6 @@ async function promptUploadsConfig(projectRoot, srcDir) {
     }
     shouldInstallAuth = true;
   }
-  const providerEnv = await promptCredentials(provider);
-  if (!providerEnv) {
-    return null;
-  }
   return {
     provider,
     mode,
@@ -2149,8 +2015,8 @@ async function promptUploadsConfig(projectRoot, srcDir) {
     shouldInstallAuth,
     shouldInstallDatabase,
     envVars: {
-      ...buildSharedEnvVars(provider, mode, authMode, access, preset, maxFileSize, maxFiles),
-      ...providerEnv
+      ...buildSharedEnvVars(provider, mode, authMode, access, preset, presetDefaults.maxFileSize, presetDefaults.maxFiles),
+      ...getProviderEnvDefaults(provider)
     }
   };
 }
@@ -2386,6 +2252,7 @@ ${moduleDocsEndMarker}`);
 function printUploadHints(result) {
   console.log(import_chalk7.default.yellow("\u2139 Upload routes are mounted at: /api/uploads"));
   console.log(import_chalk7.default.yellow(`\u2139 Provider: ${result.provider} \xB7 Mode: ${result.mode} \xB7 Access: ${result.access}`));
+  console.log(import_chalk7.default.yellow("\u2139 Fill the generated upload env vars in .env before testing uploads."));
   if (result.mode === "proxy") {
     console.log(import_chalk7.default.yellow("\u2139 Reuse uploadSingle()/uploadArray() from src/lib/uploads/proxy.ts in your own form + file routes."));
   }
@@ -2508,6 +2375,11 @@ var add = async (moduleName, options = {}) => {
     currentStep = "module dependency resolution";
     await resolveDependencies(moduleDeps, projectRoot);
     if (resolvedModuleName === "uploads" && uploadConfig) {
+      const errorHandlerInstalled = import_fs_extra12.default.existsSync(import_path13.default.join(projectRoot, srcDir, "lib", "errors.ts"));
+      if (!errorHandlerInstalled) {
+        console.log(import_chalk8.default.blue("\n\u2139 Uploads needs the error-handler module. Installing error-handler..."));
+        await add("error-handler");
+      }
       if (uploadConfig.shouldInstallDatabase) {
         console.log(import_chalk8.default.blue("\n\u2139 Upload metadata needs a Drizzle database. Installing database module..."));
         await add("database");