refactor and lint spec

danicc097 · Aug 30, 2024 · 1fb869b · 1fb869b
1 parent 3fa1bd1
commit 1fb869b
Show file tree

Hide file tree

Showing 9 changed files with 268 additions and 274 deletions.
diff --git a/bin/project b/bin/project
@@ -345,9 +345,9 @@ x.gen.pregen() {
     echo "Running generation"
 
     # NOTE: swaggest won't generate for arrays of structs. use a struct with array fields instead.
-    generate_structs_map # structs might have been removed in the meantime
+    generate_structs_map # xo gen will create/update model structs
 
-    go build -o $BUILD_DIR/codegen cmd/codegen/main.go || mark_failed_tool_build # xo gen may create/update models.
+    go build -o $BUILD_DIR/codegen cmd/codegen/main.go || mark_failed_tool_build
 
     local rest_structs=() refs=() spec_schemas=()
     declare -A rest_schema_lookup spec_schema_lookup
@@ -1088,7 +1088,7 @@ x.gen.frontend() {
     mkdir -p frontend/src/types
     rm -rf $FRONTEND_GEN
 
-    yq 'explode(.)' $SPEC_PATH >$exploded_spec # js-lib won't support anchors - used by most gen libs
+    yq 'explode(.)' $SPEC_PATH >$exploded_spec # js-yaml wont support explicit tags - used by most gen libs
 
     {
       node frontend/scripts/generate-client-validator.js
@@ -1162,8 +1162,6 @@ x.gen() {
 
     wait_without_error || err Failed jobs
 
-    x.test.xo
-
     {
       x.gen.pregen
       x.gen.client-server
@@ -1191,7 +1189,9 @@ x.gen() {
 # Build code generation custom tools.
 x.gen.build-tools() {
   { { {
-    generate_structs_map # openapi-go requires structs already compiled
+    # openapi-go via codegen cli requires structs already compiled, but we will rebuild
+    # right before codegen gen-schema since PublicStructs is not used anywhere else inside codegen
+    # generate_structs_map
 
     out_dir=$BUILD_DIR
 

diff --git a/frontend/src/client-validator/gen/dereferenced-schema.json b/frontend/src/client-validator/gen/dereferenced-schema.json
@@ -2704,12 +2704,12 @@
         "firstName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         },
         "lastName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         }
       },
       "type": "object"
@@ -10135,12 +10135,12 @@
         "firstName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         },
         "lastName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         }
       },
       "type": "object"

diff --git a/frontend/src/client-validator/gen/schema.json b/frontend/src/client-validator/gen/schema.json
@@ -1392,12 +1392,12 @@
         "firstName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         },
         "lastName": {
           "description": "originally from auth server but updatable",
           "type": "string",
-          "pattern": "^[\\p{L} '-]+$"
+          "pattern": "^[a-zA-Z \\'-]+$"
         }
       },
       "type": "object"

diff --git a/frontend/src/gen/model/updateUserRequest.ts b/frontend/src/gen/model/updateUserRequest.ts
@@ -13,12 +13,12 @@ import type * as EntityIDs from 'src/gen/entity-ids'
 export interface UpdateUserRequest {
   /**
    * originally from auth server but updatable
-   * @pattern ^[\p{L} '-]+$
+   * @pattern ^[a-zA-Z \'-]+$
    */
   firstName?: string;
   /**
    * originally from auth server but updatable
-   * @pattern ^[\p{L} '-]+$
+   * @pattern ^[a-zA-Z \'-]+$
    */
   lastName?: string;
 }
diff --git a/internal/codegen/codegen.go b/internal/codegen/codegen.go
@@ -196,13 +196,6 @@ func (o *CodeGen) generateOpIDAuthMiddlewares() error {
 
 	funcs := template.FuncMap{
 		"stringsJoin": strings.Join,
-		"stringsJoinSlice": func(elems []string, prefix string, suffix string, sep string) string {
-			for i, e := range elems {
-				elems[i] = prefix + e + suffix
-			}
-
-			return strings.Join(elems, sep)
-		},
 	}
 
 	tmpl := "templates/api_auth_middlewares.tmpl"

diff --git a/internal/codegen/templates/api_auth_middlewares.tmpl b/internal/codegen/templates/api_auth_middlewares.tmpl
@@ -21,9 +21,11 @@ func (h *StrictHandlers) authMiddlewares(opID OperationID) []gin.HandlerFunc {
         {{- if $authInfo.Role }}
         MinimumRole: models.Role("{{$authInfo.Role}}"),
         {{- end }}
-        {{- if $authInfo.Scopes }}
+        {{- if (gt (len $authInfo.Scopes) 0) }}
         RequiredScopes: models.Scopes{
-          {{ stringsJoinSlice $authInfo.Scopes "models.Scope(\"" "\")" ",\n" -}}
+          {{range $authInfo.Scopes -}}
+              models.Scope("{{.}}"),
+          {{end -}}
         },
         {{- end }}
       }),

diff --git a/internal/repos/postgresql/gen/models/openapi_types.gen.go b/internal/repos/postgresql/gen/models/openapi_types.gen.go
diff --git a/internal/rest/openapi_server.gen.go b/internal/rest/openapi_server.gen.go
diff --git a/openapi.yaml b/openapi.yaml
@@ -2196,11 +2196,11 @@ components:
         firstName:
           description: originally from auth server but updatable
           type: string
-          pattern: ^[\p{L} '-]+$
+          pattern: ^[a-zA-Z \'-]+$
         lastName:
           description: originally from auth server but updatable
           type: string
-          pattern: ^[\p{L} '-]+$
+          pattern: ^[a-zA-Z \'-]+$
       type: object
     UpdateUserAuthRequest:
       description: represents User authorization data to update
@@ -2220,7 +2220,6 @@ components:
         - loc
         - msg
         - detail
-        - type
       type: object
       properties:
         loc: