@remix-run/cli 0.3.3 → 0.4.0

package/src/lib/errors.ts

@@ -28,6 +28,16 @@ export const CLI_ERROR_DEFINITIONS = {
     title: 'Could not determine an app name',
     fix: 'Pass --app-name or choose a target directory name that can become an app name.',
   },
+  dbConfigRequired: {
+    code: 'RMX_DB_CONFIG_REQUIRED',
+    title: 'Database configuration is required',
+    fix: 'Add a db configuration to remix.json.',
+  },
+  dbForceRequired: {
+    code: 'RMX_DB_FORCE_REQUIRED',
+    title: 'Destructive database command requires --force',
+    fix: 'Re-run with --force to confirm.',
+  },
   remixVersionUnavailable: {
     code: 'RMX_REMIX_VERSION_UNAVAILABLE',
     title: 'Could not determine the Remix version',
@@ -55,6 +65,16 @@ export const CLI_ERROR_DEFINITIONS = {
     title: 'Could not derive a valid package name',
     fix: 'Choose an app name that can be normalized into a valid npm package name.',
   },
+  invalidOptionValue: {
+    code: 'RMX_INVALID_OPTION_VALUE',
+    title: 'Invalid option value',
+    fix: 'Check the command help for the supported option syntax.',
+  },
+  invalidRemixConfig: {
+    code: 'RMX_INVALID_CONFIG',
+    title: 'Invalid Remix configuration',
+    fix: 'Correct the configuration file and try again.',
+  },
   missingOptionValue: {
     code: 'RMX_MISSING_OPTION_VALUE',
     title: 'Missing option value',
@@ -70,6 +90,11 @@ export const CLI_ERROR_DEFINITIONS = {
     title: 'Could not find a project root',
     fix: 'Run this command inside a Remix project.',
   },
+  remixConfigNotFound: {
+    code: 'RMX_CONFIG_NOT_FOUND',
+    title: 'Remix configuration not found',
+    fix: 'Check the --config path and try again.',
+  },
   remoteSkillDataMissing: {
     code: 'RMX_REMOTE_SKILL_DATA_MISSING',
     title: 'Could not find remote Remix skill data',
@@ -169,6 +194,20 @@ export function appNameUnavailable(targetDir?: string): UsageError {
   })
 }
 
+export function dbConfigRequired(filePath: string): CliError {
+  return createCliError(CLI_ERROR_DEFINITIONS.dbConfigRequired, {
+    context: { filePath },
+    message: `Database configuration is missing from ${filePath}.`,
+  })
+}
+
+export function dbForceRequired(command: string): UsageError {
+  return createUsageError(CLI_ERROR_DEFINITIONS.dbForceRequired, {
+    context: { command },
+    message: `\`remix db ${command}\` destroys data in the current app database.`,
+  })
+}
+
 export function remixVersionUnavailable(): CliError {
   return createCliError(CLI_ERROR_DEFINITIONS.remixVersionUnavailable, {
     message: 'Could not determine the current Remix version.',
@@ -201,6 +240,25 @@ export function invalidPackageName(input: string): UsageError {
   })
 }
 
+export function invalidOptionValue(details: string): UsageError {
+  return createUsageError(CLI_ERROR_DEFINITIONS.invalidOptionValue, {
+    context: { details },
+    message: details,
+  })
+}
+
+export function invalidRemixConfig(
+  filePath: string,
+  details: string,
+  line: number,
+  column: number,
+): CliError {
+  return createCliError(CLI_ERROR_DEFINITIONS.invalidRemixConfig, {
+    context: { column, filePath, line },
+    message: `${filePath}:${line}:${column}: ${details}`,
+  })
+}
+
 export function missingOptionValue(option: string): UsageError {
   return createUsageError(CLI_ERROR_DEFINITIONS.missingOptionValue, {
     context: { option },
@@ -221,6 +279,13 @@ export function projectRootNotFound(startDir?: string): CliError {
   })
 }
 
+export function remixConfigNotFound(filePath: string): CliError {
+  return createCliError(CLI_ERROR_DEFINITIONS.remixConfigNotFound, {
+    context: { filePath },
+    message: `Could not find Remix configuration file: ${filePath}`,
+  })
+}
+
 export function remoteSkillDataMissing(name: string): CliError {
   return createCliError(CLI_ERROR_DEFINITIONS.remoteSkillDataMissing, {
     context: { name },

package/src/lib/parse-args.ts

@@ -49,17 +49,33 @@ export function parseArgs<const definitions extends ParseArgsOptionDefinitions>(
 
   for (let index = 0; index < argv.length; index++) {
     let arg = argv[index]!
-    let resolved = specsByFlag.get(arg)
+    let equalsIndex = arg.indexOf('=')
+    let flag = equalsIndex === -1 ? arg : arg.slice(0, equalsIndex)
+    let inlineValue = equalsIndex === -1 ? undefined : arg.slice(equalsIndex + 1)
+    let resolved = specsByFlag.get(flag)
 
     if (resolved != null) {
       if (resolved.spec.type === 'boolean') {
+        if (inlineValue !== undefined) {
+          throw unknownArgument(arg)
+        }
+
         values[resolved.key] = true as ParsedArgsValues<definitions>[typeof resolved.key]
         continue
       }
 
+      if (inlineValue !== undefined) {
+        if (inlineValue.length === 0) {
+          throw missingOptionValue(flag)
+        }
+
+        values[resolved.key] = inlineValue as ParsedArgsValues<definitions>[typeof resolved.key]
+        continue
+      }
+
       let next = argv[index + 1]
-      if (next == null || next.startsWith('-')) {
-        throw missingOptionValue(arg)
+      if (next == null || next.length === 0 || next.startsWith('-')) {
+        throw missingOptionValue(flag)
       }
 
       values[resolved.key] = next as ParsedArgsValues<definitions>[typeof resolved.key]