@apso/cli 0.35.0 → 0.37.0

package/dist/lib/templates/go/utils/types.eta

@@ -13,6 +13,9 @@ type ParsedFilter struct {
 type ParsedSort struct {
 	Field     string
 	Direction string // "ASC" or "DESC"
+	// Nulls is the optional PostgREST null-ordering hint: "" (default),
+	// "NULLS FIRST", or "NULLS LAST". Only populated by the PostgREST dialect.
+	Nulls string
 }
 
 // ParsedJoin represents a relation to eager-load.
@@ -21,6 +24,28 @@ type ParsedJoin struct {
 	Fields   []string // nil means load all fields
 }
 
+// FilterGroup is a nested boolean combination of conditions, used by the
+// PostgREST dialect to model ?or=(...) / ?and=(...) logical combinators
+// (apso #56). Conjunction is "OR" or "AND". A branch is either a leaf
+// ParsedFilter or a nested FilterGroup; exactly one is set per branch.
+type FilterGroup struct {
+	Conjunction string // "OR" or "AND"
+	Filters     []ParsedFilter
+	Groups      []FilterGroup
+}
+
+// Dialect identifies which query-param convention a request used.
+type Dialect string
+
+const (
+	// DialectNestjsx is the incumbent nestjsx/crud dialect
+	// (fields/filter/join/sort/s/or/per_page).
+	DialectNestjsx Dialect = "nestjsx"
+	// DialectPostgrest is the PostgREST/Supabase dialect
+	// (select/order, col=op.value, or=()/and=()).
+	DialectPostgrest Dialect = "postgrest"
+)
+
 // QueryOptions holds the parsed query parameters for list endpoints.
 type QueryOptions struct {
 	Filters   []ParsedFilter
@@ -30,6 +55,24 @@ type QueryOptions struct {
 	Joins     []ParsedJoin
 	Limit     int
 	Page      int
+
+	// Dialect is the detected request dialect. Defaults to DialectNestjsx so
+	// existing (nestjsx) requests are byte-identical.
+	Dialect Dialect
+
+	// Groups holds PostgREST ?or=()/?and=() logical combinators (apso #56).
+	// Each group is ANDed with the flat Filters. Only used by the PostgREST
+	// dialect.
+	Groups []FilterGroup
+
+	// Offset is the PostgREST ?offset= row skip. -1 means "not supplied".
+	// The nestjsx dialect derives its offset from Page instead.
+	Offset int
+
+	// Bare requests a bare JSON array response (no {data,count,...} envelope).
+	// The PostgREST dialect always returns a bare array (apso #58); nestjsx
+	// keeps its envelope.
+	Bare bool
 }
 
 // PaginatedResult is the standard paginated response envelope.
@@ -44,7 +87,9 @@ type PaginatedResult struct {
 // DefaultQueryOptions returns options with default pagination values.
 func DefaultQueryOptions() QueryOptions {
 	return QueryOptions{
-		Limit: 25,
-		Page:  1,
+		Limit:   25,
+		Page:    1,
+		Dialect: DialectNestjsx,
+		Offset:  -1,
 	}
 }

package/dist/lib/templates/python/routers/router.eta

@@ -1,7 +1,9 @@
 <%~ includeFile('../header.eta', it) %>
 
-from typing import List, Optional
-from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
+from typing import List, Optional, Union
+from fastapi import APIRouter, Depends, Header, HTTPException, Query, Request, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import JSONResponse
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.database import get_db
@@ -14,7 +16,7 @@ from ..schemas.<%= it.entityName.toLowerCase() %> import (
     <%= it.entityName %>List,
 )
 from ..services.<%= it.entityName.toLowerCase() %> import <%= it.entityName %>Service
-from ..utils.query import parse_query_params
+from ..utils.query import parse_query_params, QueryParseError
 
 router = APIRouter(
     prefix="/<%= it.pluralEntityName.toLowerCase() %>",
@@ -24,27 +26,67 @@ router = APIRouter(
 
 @router.get(
     "",
-    response_model=<%= it.entityName %>List,
     summary="Retrieve multiple <%= it.pluralEntityName %>",
+    response_model=Union[<%= it.entityName %>List, List[<%= it.entityName %>Schema]],
 )
 async def get_many(
     request: Request,
     db: AsyncSession = Depends(get_db),
-) -> <%= it.entityName %>List:
+    x_crud_dialect: Optional[str] = Header(default=None, alias="X-Crud-Dialect"),
+):
     """
-    Retrieve a paginated list of <%= it.pluralEntityName %>.
+    Retrieve <%= it.pluralEntityName %> under either query dialect.
 
-    Supports query parameters:
+    Dialect is chosen by the `X-Crud-Dialect` header (postgrest|nestjsx), else
+    inferred from the param shape (parity with the TypeScript services).
+
+    nestjsx (default) — envelope response {data,count,total,page,pageCount}:
     - filter=field||$operator||value (repeatable)
     - or=field||$operator||value (repeatable)
     - sort=field,ASC (repeatable)
     - fields=field1,field2
     - join=relation (repeatable)
     - limit=25&page=1
+
+    postgrest — bare JSON array response:
+    - select=col,alias:col,rel(cols)
+    - col=op.value filters (eq/neq/gt/gte/lt/lte/like/ilike/in/is, not.<op>)
+    - or=(...) / and=(...) logical groups
+    - order=col.asc|desc[.nullsfirst|nullslast]
+    - limit=..&offset=.. (windows the bare array)
     """
     service = <%= it.entityName %>Service(db)
-    options = parse_query_params(request.query_params)
-    result = await service.get_many(options)
+    try:
+        options = parse_query_params(request.query_params, x_crud_dialect)
+    except QueryParseError as exc:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(exc),
+        )
+
+    if options.dialect == "postgrest":
+        # PostgREST always returns a bare JSON array (never the envelope), even
+        # when limit/offset are present.
+        try:
+            rows = await service.get_many_list(options)
+        except QueryParseError as exc:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=str(exc),
+            )
+        payload = [
+            r if isinstance(r, dict) else <%= it.entityName %>Schema.model_validate(r)
+            for r in rows
+        ]
+        return JSONResponse(content=jsonable_encoder(payload))
+
+    try:
+        result = await service.get_many(options)
+    except QueryParseError as exc:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(exc),
+        )
 
     return <%= it.entityName %>List(
         data=result.data,

package/dist/lib/templates/python/services/service.eta

@@ -21,9 +21,16 @@ class <%= it.entityName %>Service:
     async def get_many(self, options: QueryOptions) -> PaginatedResult:
         """
         Retrieve a paginated list of <%= it.pluralEntityName %> with filtering, sorting, and joins.
+        (nestjsx dialect — {data,count,total,page,pageCount} envelope.)
         """
         return await self._qb.get_many(options)
 
+    async def get_many_list(self, options: QueryOptions) -> List[Any]:
+        """
+        Retrieve <%= it.pluralEntityName %> as a bare list (PostgREST dialect).
+        """
+        return await self._qb.get_many_list(options)
+
     async def get_one(
         self,
         id: Any,

package/dist/lib/templates/python/utils/init.eta

@@ -2,8 +2,13 @@
 
 from .query import (
     parse_query_params,
+    parse_nestjsx_params,
+    parse_postgrest_params,
+    detect_dialect,
     QueryBuilder,
     QueryOptions,
+    QueryGroup,
+    QueryParseError,
     PaginatedResult,
     ParsedFilter,
     ParsedSort,
@@ -12,8 +17,13 @@ from .query import (
 
 __all__ = [
     "parse_query_params",
+    "parse_nestjsx_params",
+    "parse_postgrest_params",
+    "detect_dialect",
     "QueryBuilder",
     "QueryOptions",
+    "QueryGroup",
+    "QueryParseError",
     "PaginatedResult",
     "ParsedFilter",
     "ParsedSort",