@webitel/ui-datalist 1.1.52 → 1.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/ui-datalist",
-	"version": "1.1.52",
+	"version": "1.1.54",
 	"description": "Toolkit for building data lists in webitel ui system",
 	"scripts": {
 		"build:types": "vue-tsc -b tsconfig.build.json",

package/src/index.ts

@@ -1,3 +1,5 @@
 import { createTableStore } from './modules/table/createTableStore.store';
+import type { DatalistTableHeader } from './modules/types/tableStore.types';
 
+export type { DatalistTableHeader };
 export { createTableStore };

package/src/modules/_shared/createDatalistStore.ts

@@ -61,10 +61,8 @@ export const createDatalistStore = <
 	}
 
 	if (thisStoreType === DatalistStoreProvider.Pinia) {
-		// TODO(types): a Pinia StoreDefinition is a valid store factory (callable,
-		// returns a store exposing `$patch`), but its generic-extracted shape does
-		// not structurally match PatchableStoreFactory. Reconcile the two factory
-		// types instead of asserting here.
+		// Pinia StoreDefinition is a valid PatchableStoreFactory at runtime;
+		// PatchableStore includes StoreGeneric so consumers can use storeToRefs.
 		return definePiniaStore(namespace, () =>
 			storeBody({
 				...config,

package/src/modules/filter-presets/stores/createFilterPresetsStore.ts

@@ -1,12 +1,26 @@
 import { ref } from 'vue';
 import type { EnginePresetQuery } from 'webitel-sdk';
 
+import { createDatalistStore } from '../../_shared/createDatalistStore';
 import { PersistedStorageType } from '../../persist/PersistedStorage.types';
 import { usePersistedStorage } from '../../persist/usePersistedStorage';
 import { tableStoreBody } from '../../table/createTableStore.store';
+import type { PatchableStoreFactory } from '../../types/createDatalistStore.types';
 import PresetQueryAPI from '../api/PresetQuery';
 import { headers } from './headers/headers';
 
+const presetsTableConfig = {
+	/* PresetQueryAPI's add/update take preset-specific params, so only the
+	   ApiModule-conforming methods the table store actually calls go in */
+	apiModule: {
+		getList: PresetQueryAPI.getList,
+		get: PresetQueryAPI.get,
+		delete: PresetQueryAPI.delete,
+	},
+	headers,
+	disablePersistence: true as const,
+};
+
 export const filterPresetsStoreBody = (namespace = 'presets') => {
 	const presetsNamespace = namespace.endsWith('presets')
 		? namespace
@@ -40,17 +54,10 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 		await restorePreset();
 	};
 
-	const tableStore = tableStoreBody<EnginePresetQuery>(presetsNamespace, {
-		/* PresetQueryAPI's add/update take preset-specific params, so only the
-		   ApiModule-conforming methods the table store actually calls go in */
-		apiModule: {
-			getList: PresetQueryAPI.getList,
-			get: PresetQueryAPI.get,
-			delete: PresetQueryAPI.delete,
-		},
-		headers,
-		disablePersistence: true,
-	});
+	const tableStore = tableStoreBody<EnginePresetQuery>(
+		presetsNamespace,
+		presetsTableConfig,
+	);
 
 	const resetPreset = () => {
 		presetId.value = null;
@@ -65,6 +72,23 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 	};
 };
 
-export const createFilterPresetsStore = (namespace: string) => {
-	return () => filterPresetsStoreBody(namespace);
+export type FilterPresetsStore = ReturnType<typeof filterPresetsStoreBody>;
+
+/**
+ * Pinia store factory (via createDatalistStore), same pattern as createTableStore.
+ * Previously returned a plain object factory — that broke storeToRefs / props typed
+ * as `() => StoreGeneric` and forced app-level asPiniaStoreFactory casts.
+ */
+export const createFilterPresetsStore = (
+	namespace: string,
+): PatchableStoreFactory<FilterPresetsStore> => {
+	const presetsNamespace = namespace.endsWith('presets')
+		? namespace
+		: `${namespace}/presets`;
+
+	return createDatalistStore<FilterPresetsStore, EnginePresetQuery>({
+		namespace: presetsNamespace,
+		config: presetsTableConfig,
+		storeBody: () => filterPresetsStoreBody(namespace),
+	});
 };

package/src/modules/types/createDatalistStore.types.ts

@@ -1,3 +1,4 @@
+import type { StoreGeneric } from 'pinia';
 import type { Ref } from 'vue';
 
 import type { useTableStoreConfig } from './tableStore.types';
@@ -32,10 +33,15 @@ export interface CreateDatalistStoreParams<
 }
 
 /**
- * PatchableStore is needed to indicate that the store we are using also has a storePatch method (previously $patch)
- * */
-export type PatchableStore<T extends StoreInstance> = T & {
-	$patch: (val: Patch) => void;
-};
+ * PatchableStore is needed to indicate that the store we are using also has a storePatch method (previously $patch).
+ *
+ * Intersects StoreGeneric so pinia helpers (`storeToRefs`) and props typed as
+ * `() => StoreGeneric` accept the factory result — runtime pinia stores already
+ * satisfy StoreGeneric; the previous plain-record shape forced app-level casts.
+ */
+export type PatchableStore<T extends StoreInstance> = T &
+	StoreGeneric & {
+		$patch: (val: Patch) => void;
+	};
 export type PatchableStoreFactory<T extends StoreInstance> =
 	() => PatchableStore<T>;