fixed formatting and typos

CHANGELOG.md

@@ -45,7 +45,7 @@
 
 - **!** Repurposed the Authentik integration as a more generic "OpenID Connect" provider (`oidc`) to support any OIDC provider (Okta, Keycloak, etc.).
   _If you've previously used Authentik, make sure to rename the provider key in your code to `oidc`._
-  _For more than one OIDC provider you can use the additional `oidc2` and `oidc3` settings._
+  _To enable more than one OIDC provider you can use the additional `oidc2` and `oidc3` provider keys._
 
 - **!** Removed the previously deprecated `Dao.Block()` and `Dao.Continue()` helpers in favor of `Dao.NonconcurrentDB()`.
 

daos/base_retry.go

@@ -17,6 +17,7 @@ func execLockRetry(timeout time.Duration, maxRetries int) dbx.ExecHookFunc {
 			cancelCtx, cancel := context.WithTimeout(context.Background(), timeout)
 			defer func() {
 				cancel()
+				//nolint:staticcheck
 				q.WithContext(nil) // reset
 			}()
 			q.WithContext(cancelCtx)

daos/external_auth.go

@@ -12,8 +12,8 @@ func (dao *Dao) ExternalAuthQuery() *dbx.SelectQuery {
 	return dao.ModelQuery(&models.ExternalAuth{})
 }
 
-/// FindAllExternalAuthsByRecord returns all ExternalAuth models
-/// linked to the provided auth record.
+// FindAllExternalAuthsByRecord returns all ExternalAuth models
+// linked to the provided auth record.
 func (dao *Dao) FindAllExternalAuthsByRecord(authRecord *models.Record) ([]*models.ExternalAuth, error) {
 	auths := []*models.ExternalAuth{}
 

forms/record_upsert.go

@@ -429,7 +429,6 @@ func (form *RecordUpsert) LoadData(requestData map[string]any) error {
 		if len(submittedNames) == 0 && len(oldNames) > 0 {
 			form.RemoveFiles(key)
 		} else if len(oldNames) > 0 {
-
 			toDelete := []string{}
 
 			for _, name := range oldNames {
@@ -763,18 +762,6 @@ func (form *RecordUpsert) Submit(interceptors ...InterceptorFunc[*models.Record]
 	}, interceptors...)
 }
 
-func (form *RecordUpsert) getFilesToUploadNames() []string {
-	names := []string{}
-
-	for fieldKey := range form.filesToUpload {
-		for _, file := range form.filesToUpload[fieldKey] {
-			names = append(names, file.Name)
-		}
-	}
-
-	return names
-}
-
 func (form *RecordUpsert) processFilesToUpload() error {
 	if len(form.filesToUpload) == 0 {
 		return nil // no parsed file fields

forms/validators/file.go

@@ -13,6 +13,7 @@ import (
 // size is no more than the provided maxBytes.
 //
 // Example:
+//
 //	validation.Field(&form.File, validation.By(validators.UploadedFileSize(1000)))
 func UploadedFileSize(maxBytes int) validation.RuleFunc {
 	return func(value any) error {
@@ -36,6 +37,7 @@ func UploadedFileSize(maxBytes int) validation.RuleFunc {
 // mimetype is within the provided allowed mime types.
 //
 // Example:
+//
 //	validMimeTypes := []string{"test/plain","image/jpeg"}
 //	validation.Field(&form.File, validation.By(validators.UploadedFileMimeType(validMimeTypes)))
 func UploadedFileMimeType(validTypes []string) validation.RuleFunc {

forms/validators/model.go

@@ -12,6 +12,7 @@ import (
 // Compare checks whether the provided model id exists.
 //
 // Example:
+//
 //	validation.Field(&form.Id, validation.By(validators.UniqueId(form.dao, tableName)))
 func UniqueId(dao *daos.Dao, tableName string) validation.RuleFunc {
 	return func(value any) error {

forms/validators/string.go

@@ -7,6 +7,7 @@ import (
 // Compare checks whether the validated value matches another string.
 //
 // Example:
+//
 //	validation.Field(&form.PasswordConfirm, validation.By(validators.Compare(form.Password)))
 func Compare(valueToCompare string) validation.RuleFunc {
 	return func(value any) error {

models/record.go

@@ -566,7 +566,7 @@ func (m *Record) ReplaceModifers(data map[string]any) map[string]any {
 		}
 
 		// -----------------------------------------------------------
-		// legacy file field modifiers (kept for backward compatability)
+		// legacy file field modifiers (kept for backward compatibility)
 		// -----------------------------------------------------------
 
 		var oldNames []string

models/schema/schema_field.go

@@ -386,8 +386,7 @@ func (f *SchemaField) PrepareValueWithModifier(baseValue any, modifier string, m
 		}
 	case FieldTypeFile:
 		// note: file for now supports only the subtract modifier
-		switch modifier {
-		case FieldValueModifierSubtract:
+		if modifier == FieldValueModifierSubtract {
 			resolvedValue = list.SubtractSlice(
 				list.ToUniqueStringSlice(baseValue),
 				list.ToUniqueStringSlice(modifierValue),

resolvers/record_field_resolver.go

@@ -42,7 +42,9 @@ var _ search.FieldResolver = (*RecordFieldResolver)(nil)
 // RecordFieldResolver defines a custom search resolver struct for
 // managing Record model search fields.
 //
-// Usually used together with `search.Provider`. Example:
+// Usually used together with `search.Provider`.
+// Example:
+//
 //	resolver := resolvers.NewRecordFieldResolver(
 //	    app.Dao(),
 //	    myCollection,

tests/request.go

@@ -10,6 +10,7 @@ import (
 // MockMultipartData creates a mocked multipart/form-data payload.
 //
 // Example
+//
 //	data, mp, err := tests.MockMultipartData(
 //		map[string]string{"title": "new"},
 //		"file1",

tools/search/sort.go

@@ -40,6 +40,7 @@ func (s *SortField) BuildExpr(fieldResolver FieldResolver) (string, error) {
 // into a slice of SortFields.
 //
 // Example:
+//
 //	fields := search.ParseSortFromString("-name,+created")
 func ParseSortFromString(str string) (fields []SortField) {
 	data := strings.Split(str, ",")