feat: support collections of primitives as data source parameters

docs/modeling/model-components/data-sources.md

@@ -96,7 +96,7 @@ All methods on `IDataSource<T>` take a parameter that contains all the client-sp
 
 ## Custom Parameters
 
-On any data source that you create, you may add additional properties annotated with `[Coalesce]` that will then be exposed as parameters to the client. These property parameters are currently restricted to primitives (numeric types, strings) and dates (DateTime, DateTimeOffset). Property parameter primitives may be expanded to allow for more types in the future.
+On any data source that you create, you may add additional properties annotated with `[Coalesce]` that will then be exposed as parameters to the client. These property parameters can be primitives (numeric types, strings, enums), dates (DateTime, DateTimeOffset, DateOnly, TimeOnly), and collections of the preceding types.
 
 ``` c#
 [Coalesce]

playground/Coalesce.Domain/Person.cs

@@ -366,11 +366,14 @@ public class NamesStartingWithAWithCases : StandardDataSource<Person, AppDbConte
     {
         public NamesStartingWithAWithCases(CrudContext<AppDbContext> context) : base(context) { }
 
+        [Coalesce]
+        public List<Case.Statuses> AllowedStatuses { get; set; }
+
         public override IQueryable<Person> GetQuery(IDataSourceParameters parameters)
         {
             Db.Cases
                 .Include(c => c.CaseProducts).ThenInclude(cp => cp.Product)
-                .Where(c => c.Status == Case.Statuses.Open || c.Status == Case.Statuses.InProgress)
+                .Where(c => AllowedStatuses.Contains(c.Status))
                 .Load();
 
             return Db.People

playground/Coalesce.Web.Vue3/src/components/test.vue

@@ -84,7 +84,7 @@ import {
   PersonListViewModel,
 } from "../viewmodels.g";
 import { CaseApiClient, PersonApiClient } from "../api-clients.g";
-import { Person } from "../models.g";
+import { Person, Statuses } from "../models.g";
 
 @Component({
   components: {},
@@ -101,7 +101,12 @@ export default class Test extends Base {
   caseVm = new CaseViewModel();
 
   async created() {
+    this.personList.$dataSource =
+      new Person.DataSources.NamesStartingWithAWithCases({
+        allowedStatuses: [Statuses.Open, Statuses.InProgress],
+      });
     this.personList.$params.noCount = true;
+    this.personList.$load();
 
     await this.caseVm.$load(15);
     await this.caseVm.downloadImage();

src/IntelliTect.Coalesce.CodeGeneration.Vue/Generators/Scripts/TsMetadata.cs

@@ -605,27 +605,6 @@ private void WriteDataSourcesMetadata(TypeScriptCodeBuilder b, ClassViewModel mo
                 {
                     WriteDataSourceMetadata(b, model, source);
                 }
-
-                // Not sure we need to explicitly declare the default source.
-                // We can just use the absense of a data source to represent the default.
-                /*
-                var defaultSource = dataSources.SingleOrDefault(s => s.IsDefaultDataSource);
-                if (defaultSource != null)
-                {
-                    var name = defaultSource.ClientTypeName.ToCamelCase();
-                    b.Line($"get default() {{ return this.{name} }},");
-                }
-                else
-                {
-                    using (b.Block($"default:", ','))
-                    {
-                        b.StringProp("type", "dataSource");
-                        b.StringProp("name", "default");
-                        b.StringProp("displayName", "Default");
-                        b.Line("params: {}");
-                    }
-                }
-                */
             }
         }
 
@@ -634,8 +613,6 @@ private void WriteDataSourcesMetadata(TypeScriptCodeBuilder b, ClassViewModel mo
         /// </summary>
         private void WriteDataSourceMetadata(TypeScriptCodeBuilder b, ClassViewModel model, ClassViewModel source)
         {
-            // TODO: Should we be camel-casing the names of data sources in the metadata?
-            // TODO: OR, should we be not camel casing the members we place on the domain[key: string] objects?
             using (b.Block($"{source.ClientTypeName.ToCamelCase()}:", ','))
             {
                 b.StringProp("type", "dataSource");

src/IntelliTect.Coalesce.Tests/TargetClasses/TestDbContext/Person.cs

@@ -225,11 +225,14 @@ public class NamesStartingWithAWithCases : StandardDataSource<Person, AppDbConte
     {
         public NamesStartingWithAWithCases(CrudContext<AppDbContext> context) : base(context) { }
 
+        [Coalesce]
+        public List<Case.Statuses> AllowedStatuses { get; set; }
+
         public override IQueryable<Person> GetQuery(IDataSourceParameters parameters)
         {
             Db.Cases
                 .Include(c => c.CaseProducts).ThenInclude(cp => cp.Product)
-                .Where(c => c.Status == Case.Statuses.Open || c.Status == Case.Statuses.InProgress)
+                .Where(c => AllowedStatuses.Contains(c.Status))
                 .Load();
 
             return Db.People

src/IntelliTect.Coalesce/TypeDefinition/ClassViewModel.cs

@@ -183,7 +183,7 @@ internal IReadOnlyCollection<PropertyViewModel> Properties
             .Where(p =>
                 !p.IsInternalUse && p.HasPublicSetter && p.HasAttribute<CoalesceAttribute>()
                 // These are the only supported types, for now
-                && (p.Type.IsPrimitive || p.Type.IsDateOrTime)
+                && (p.PureType.IsPrimitive || p.PureType.IsDateOrTime)
             );
 
         /// <summary>

src/coalesce-vue/src/api-client.ts

@@ -406,6 +406,7 @@ export type ApiResultPromise<T> = Promise<
 /** Axios instance to be used by all Coalesce API requests. Can be configured as needed. */
 export const AxiosClient = axios.create();
 AxiosClient.defaults.baseURL = "/api";
+AxiosClient.defaults.paramsSerializer = objectToQueryString;
 
 // Set X-Requested-With: XmlHttpRequest to prevent aspnetcore from serving HTML and redirects to API requests.
 // https://github.com/dotnet/aspnetcore/blob/c440ebcf49badd49f0e2cdde1b0a74992af04158/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs#L107-L111

src/coalesce-vue/src/metadata.ts

@@ -153,7 +153,13 @@ export interface DataSourceType extends Metadata {
    * Stored as `props` so it can be treated like a ModelType/ObjectType in many cases.
    */
   readonly props: {
-    [paramName in string]: PrimitiveProperty | DateProperty | EnumProperty;
+    [paramName in string]:
+      | PrimitiveProperty
+      | DateProperty
+      | EnumProperty
+      | (BasicCollectionProperty & {
+          itemType: PrimitiveValue | DateValue | EnumValue;
+        });
   };
   // NOTE: this union is the currently supported set of data source parameters.
   // When we support more types in the future (e.g. objects), adjust accordingly.

src/coalesce-vue/test/api-client.spec.ts

@@ -24,6 +24,8 @@ import { Student as StudentMeta } from "./targets.metadata";
 import { Student, Advisor } from "./targets.models";
 
 import { ComplexModelApiClient } from "../../test-targets/api-clients.g";
+import { PersonListViewModel } from "@test-targets/viewmodels.g";
+import { Person, Statuses } from "@test-targets/models.g";
 
 function makeAdapterMock(result?: any) {
   return makeEndpointMock<AxiosRequestConfig>(result);
@@ -361,6 +363,30 @@ describe("$invoke", () => {
 
     expect(mock.mock.calls[0][0].data).toBe("name=bob&studentAdvisorId=");
   });
+
+  test("data source collection parameter", async () => {
+    const mock = mockEndpoint(
+      "/Person/list",
+      vitest.fn((req: AxiosRequestConfig) => {
+        return {
+          wasSuccessful: true,
+          list: [],
+        };
+      })
+    );
+
+    const personList = new PersonListViewModel();
+    personList.$dataSource = new Person.DataSources.NamesStartingWithAWithCases(
+      {
+        allowedStatuses: [Statuses.Open, Statuses.InProgress],
+      }
+    );
+    await personList.$load();
+
+    expect(AxiosClient.getUri(mock.mock.lastCall![0])).toBe(
+      "/api/Person/list?page=1&pageSize=10&dataSource=NamesStartingWithAWithCases&dataSource.allowedStatuses=0&dataSource.allowedStatuses=1"
+    );
+  });
 });
 
 describe("$makeCaller", () => {