@milaboratories/pl-model-common 1.34.0 → 1.35.0

package/src/ref.ts

@@ -60,7 +60,11 @@ export type Option = {
  * @param name - The name of the reference.
  * @param requireEnrichments - Whether the reference requires enrichments.
  */
-export function createPlRef(blockId: string, name: string, requireEnrichments: boolean = false) {
+export function createPlRef(
+  blockId: string,
+  name: string,
+  requireEnrichments: boolean = false,
+): PlRef {
   if (requireEnrichments)
     return {
       __isRef: true,
@@ -97,6 +101,35 @@ export function withEnrichments(ref: PlRef, requireEnrichments: boolean = true):
   }
 }
 
+/** Primary dataset reference with an optional filter. */
+export type PrimaryRef = {
+  readonly __isPrimaryRef: "v1";
+  readonly column: PlRef;
+  readonly filter?: PlRef;
+};
+
+export function isPrimaryRef(value: unknown): value is PrimaryRef {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    (value as { __isPrimaryRef?: unknown }).__isPrimaryRef === "v1" &&
+    "column" in value
+  );
+}
+
+export function createPrimaryRef(column: PlRef, filter?: PlRef): PrimaryRef {
+  if (filter !== undefined) return { __isPrimaryRef: "v1", column, filter };
+  else return { __isPrimaryRef: "v1", column };
+}
+
+/** Block args accept either form — backward compatible. */
+export type DatasetInput = PlRef | PrimaryRef;
+
+/** Dataset option with optional filter choices. */
+export type DatasetOption = Option & {
+  readonly filters?: readonly Option[];
+};
+
 /** Compare two PlRefs and returns true if they are qual */
 export function plRefsEqual(ref1: PlRef, ref2: PlRef, ignoreEnrichments: boolean = false) {
   return (

package/src/services/service_types.ts

@@ -78,28 +78,32 @@ export interface ServiceDispatch {
 // Auto-derived types from the Services const in service_declarations.ts.
 // Adding a service to Services automatically updates all of these.
 
-type SMap = typeof Services;
+type TServices = typeof Services;
 
 type ExtractServiceName<T> = T extends Branded<infer N extends string, any> ? N : never;
 
 /** Model-side service interfaces keyed by service name literal. */
 export type ModelServices = {
-  [K in keyof SMap as ExtractServiceName<SMap[K]>]: InferServiceModel<ServiceBrand<SMap[K]>>;
+  [K in keyof TServices as ExtractServiceName<TServices[K]>]: InferServiceModel<
+    ServiceBrand<TServices[K]>
+  >;
 };
 
 /** UI-side service interfaces keyed by service name literal. */
 export type UiServices = {
-  [K in keyof SMap as ExtractServiceName<SMap[K]>]: InferServiceUi<ServiceBrand<SMap[K]>>;
+  [K in keyof TServices as ExtractServiceName<TServices[K]>]: InferServiceUi<
+    ServiceBrand<TServices[K]>
+  >;
 };
 
 /** Map from Services keys to their unbranded string name literals. */
 export type ServiceNameLiterals = {
-  [K in keyof SMap]: ExtractServiceName<SMap[K]>;
+  [K in keyof TServices]: ExtractServiceName<TServices[K]>;
 };
 
 /** Auto-derived requires* feature flags from Services keys. */
 export type ServiceRequireFlags = {
-  [K in keyof SMap as `requires${K & string}`]?: boolean;
+  [K in keyof TServices as `requires${K & string}`]?: boolean;
 };
 
 export type RequireServices<T extends ServiceName> = UnionToIntersection<