Quellcode durchsuchen

Correct auto-casing

Alan Colon vor 7 Jahren
Ursprung
Commit
f0215cca54
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 5 5
      lib/crud/defaults.js

+ 5 - 5
lib/crud/defaults.js

@@ -37,22 +37,22 @@ const defaults = (opts) => {
   if (!opts.pascalName) opts.pascalName = pascal(opts.titleName || opts.camelName || opts.paramName || (opts.Type && opts.Type.name) || '')
   if (!opts.pascalName) throw new Error('pascalName is required')
   if (opts.pascalName !== pascal(opts.pascalName)) throw new Error('pascalName should be PascalCased')
-  if (!opts.pascalPlural) opts.pascalPlural = pascal(plural(opts.pascalName))
+  if (!opts.pascalPlural) opts.pascalPlural = pascal(opts.titlePlural || opts.camelPlural || opts.paramPlural || plural(opts.pascalName))
   if (opts.pascalPlural !== pascal(opts.pascalPlural)) throw new Error('pascalPlural should be PascalCased')
   if (!opts.titleName) opts.titleName = title(opts.pascalName)
-  if (!opts.titlePlural) opts.titlePlural = title(plural(opts.titleName))
+  if (!opts.titlePlural) opts.titlePlural = title(opts.pascalPlural || plural(opts.titleName))
   if (!opts.camelName) opts.camelName = camel(opts.pascalName)
   if (opts.camelName !== camel(opts.camelName)) throw new Error('camelName should be camelCased')
-  if (!opts.camelPlural) opts.camelPlural = camel(plural(opts.camelName))
+  if (!opts.camelPlural) opts.camelPlural = camel(opts.pascalPlural || plural(opts.camelName))
   if (opts.camelPlural !== camel(opts.camelPlural)) throw new Error('camelPlural should be camelCased')
   if (!opts.paramName) opts.paramName = param(opts.pascalName)
   if (opts.paramName !== param(opts.paramName)) throw new Error('paramName should be param-cased')
-  if (!opts.paramPlural) opts.paramPlural = param(plural(opts.paramName))
+  if (!opts.paramPlural) opts.paramPlural = param(opts.pascalPlural || plural(opts.paramName))
   if (opts.paramPlural !== param(opts.paramPlural)) throw new Error('paramPlural should be param-cased')
 
   if (!opts.constantName) opts.constantName = constant(opts.pascalName)
   if (opts.constantName !== constant(opts.constantName)) throw new Error('constantName should be constant-cased')
-  if (!opts.constantPlural) opts.constantPlural = constant(plural(opts.constantName))
+  if (!opts.constantPlural) opts.constantPlural = constant(opts.pascalPlural || plural(opts.constantName))
   if (opts.constantPlural !== constant(opts.constantPlural)) throw new Error('constantPlural should be constant-cased')
 
   if (!opts.apiPrefix) opts.apiPrefix = `/api/${opts.paramPlural}`