resonare 0.0.2 → 0.0.4

package/dist/index.d.ts

@@ -22,24 +22,24 @@ type ThemeOption = {
   media?: [string, string, string];
 };
 type ThemeConfig = Record<string, {
-  options: Array<string | ThemeOption> | readonly (string | ThemeOption)[];
+  options: ReadonlyArray<string | ThemeOption>;
   defaultOption?: string;
 }>;
-type Themes<T extends ThemeConfig> = { [K in keyof T]: T[K]['options'] extends Array<infer U> | readonly (infer U)[] ? U extends string ? U : U extends ThemeOption ? U['value'] : never : never };
+type Themes<T extends ThemeConfig> = { [K in keyof T]: T[K]['options'] extends ReadonlyArray<infer U> ? U extends string ? U : U extends ThemeOption ? U['value'] : never : never };
 type Listener<T extends ThemeConfig> = (value: {
   themes: Themes<T>;
   resolvedThemes: Themes<T>;
 }) => void;
-type ThemeKeysWithSystemOption<T extends ThemeConfig> = { [K in keyof T]: T[K]['options'] extends Array<infer U> | readonly (infer U)[] ? U extends {
+type ThemeKeysWithSystemOption<T extends ThemeConfig> = { [K in keyof T]: T[K]['options'] extends ReadonlyArray<infer U> ? U extends {
   media: [string, string, string];
 } ? K : never : never }[keyof T];
-type NonSystemOptionValues<T extends ThemeConfig, K$1 extends keyof T> = T[K$1]['options'] extends Array<infer U> | readonly (infer U)[] ? U extends string ? U : U extends ThemeOption ? U extends {
+type NonSystemOptionValues<T extends ThemeConfig, K$1 extends keyof T> = T[K$1]['options'] extends ReadonlyArray<infer U> ? U extends string ? U : U extends ThemeOption ? U extends {
   media: [string, string, string];
 } ? never : U['value'] : never : never;
 type SystemOptions<T extends ThemeConfig> = { [K in ThemeKeysWithSystemOption<T>]?: [NonSystemOptionValues<T, K>, NonSystemOptionValues<T, K>] };
 type PersistedState<T extends ThemeConfig> = {
   version: 1;
-  themes: Themes<T>;
+  themes: Partial<Themes<T>>;
   systemOptions: SystemOptions<T>;
 };
 type ThemeStoreOptions<T extends ThemeConfig> = {
@@ -48,7 +48,7 @@ type ThemeStoreOptions<T extends ThemeConfig> = {
   initialState?: Partial<PersistedState<T>>;
   storage?: StorageAdapterCreate;
 };
-type ThemeAndOptions<T extends ThemeConfig> = Array<{ [K in keyof T]: [K, Array<T[K]['options'] extends Array<infer U> | readonly (infer U)[] ? U extends string ? U : U extends ThemeOption ? U['value'] : never : never>] }[keyof T]>;
+type ThemeAndOptions<T extends ThemeConfig> = Array<{ [K in keyof T]: [K, Array<T[K]['options'] extends ReadonlyArray<infer U> ? U extends string ? U : U extends ThemeOption ? U['value'] : never : never>] }[keyof T]>;
 declare function getThemesAndOptions<T extends ThemeConfig>(config: T): ThemeAndOptions<T>;
 declare function getDefaultThemes<T extends ThemeConfig>(config: T): Themes<T>;
 declare class ThemeStore<T extends ThemeConfig> {

package/dist/index.js

@@ -57,7 +57,6 @@ const memoryStorageAdapter = () => {
 
 //#endregion
 //#region src/index.ts
-const PACKAGE_NAME = "resonare";
 function getThemesAndOptions(config) {
 	return Object.entries(config).map(([themeKey, { options }]) => {
 		return [themeKey, options.map((option) => typeof option === "string" ? option : option.value)];
@@ -78,7 +77,7 @@ var ThemeStore = class {
 	#listeners = /* @__PURE__ */ new Set();
 	#mediaQueryCache;
 	#abortController = new AbortController();
-	constructor({ key = PACKAGE_NAME, config, initialState = {}, storage = localStorageAdapter() }) {
+	constructor({ key = name, config, initialState = {}, storage = localStorageAdapter() }) {
 		const keyedConfig = {};
 		const systemOptions = { ...initialState.systemOptions };
 		Object.entries(config).forEach(([themeKey, { options }]) => {
@@ -164,7 +163,7 @@ var ThemeStore = class {
 	};
 	sync = () => {
 		if (!this.#storage.watch) {
-			console.warn(`[${PACKAGE_NAME}] No watch method was provided for storage.`);
+			console.warn(`[${name}] No watch method was provided for storage.`);
 			return;
 		}
 		return this.#storage.watch((key, persistedState) => {
@@ -193,7 +192,7 @@ var ThemeStore = class {
 	#resolveThemeOption = ({ themeKey, option }) => {
 		if (!option.media) return option.value;
 		if (!isClient) {
-			console.warn(`[${PACKAGE_NAME}] Option with key "media" cannot be resolved in server environment.`);
+			console.warn(`[${name}] Option with key "media" cannot be resolved in server environment.`);
 			return option.value;
 		}
 		const [mediaQuery] = option.media;
@@ -217,7 +216,7 @@ var ThemeStore = class {
 var Registry = class {
 	#registry = /* @__PURE__ */ new Map();
 	create = (options) => {
-		const storeKey = options.key || PACKAGE_NAME;
+		const storeKey = options.key || name;
 		let themeStore = this.#registry.get(storeKey);
 		if (!themeStore) {
 			themeStore = new ThemeStore(options);
@@ -226,13 +225,13 @@ var Registry = class {
 		return themeStore;
 	};
 	get = (key) => {
-		const storeKey = key || PACKAGE_NAME;
-		if (!this.#registry.has(storeKey)) throw new Error(`[${PACKAGE_NAME}] Theme store with key '${storeKey}' could not be found. Please run \`createThemeStore\` with key '${storeKey}' first.`);
+		const storeKey = key || name;
+		if (!this.#registry.has(storeKey)) throw new Error(`[${name}] Theme store with key '${storeKey}' could not be found. Please run \`createThemeStore\` with key '${storeKey}' first.`);
 		return this.#registry.get(storeKey);
 	};
 	destroy = (key) => {
-		const storeKey = key || PACKAGE_NAME;
-		if (!this.#registry.has(storeKey)) throw new Error(`[${PACKAGE_NAME}] Theme store with key '${storeKey}' could not be found. Please run \`createThemeStore\` with key '${storeKey}' first.`);
+		const storeKey = key || name;
+		if (!this.#registry.has(storeKey)) throw new Error(`[${name}] Theme store with key '${storeKey}' could not be found. Please run \`createThemeStore\` with key '${storeKey}' first.`);
 		this.#registry.get(storeKey).___destroy();
 		this.#registry.delete(storeKey);
 	};

package/dist/react.d.ts

@@ -9,14 +9,14 @@ declare function useResonare<T extends ThemeConfig>(getStore: () => ThemeStore<T
   themes: Themes<T>;
   resolvedThemes: Themes<T>;
   setThemes: (themes: Partial<Themes<T>> | ((currentThemes: Themes<T>) => Partial<Themes<T>>)) => Promise<void>;
-  updateSystemOption: <K extends { [K_1 in keyof T]: T[K_1]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends {
+  updateSystemOption: <K extends { [K_1 in keyof T]: T[K_1]["options"] extends readonly (infer U)[] ? U extends {
     media: [string, string, string];
-  } ? K_1 : never : never }[keyof T]>(themeKey: K, [ifMatch, ifNotMatch]: [T[K]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends string ? U : U extends {
+  } ? K_1 : never : never }[keyof T]>(themeKey: K, [ifMatch, ifNotMatch]: [T[K]["options"] extends readonly (infer U)[] ? U extends string ? U : U extends {
     value: string;
     media?: [string, string, string];
   } ? U extends {
     media: [string, string, string];
-  } ? never : U["value"] : never : never, T[K]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends string ? U : U extends {
+  } ? never : U["value"] : never : never, T[K]["options"] extends readonly (infer U)[] ? U extends string ? U : U extends {
     value: string;
     media?: [string, string, string];
   } ? U extends {
@@ -24,15 +24,15 @@ declare function useResonare<T extends ThemeConfig>(getStore: () => ThemeStore<T
   } ? never : U["value"] : never : never]) => void;
   getStateToPersist: () => {
     version: 1;
-    themes: Themes<T>;
-    systemOptions: { [K_1 in { [K in keyof T]: T[K]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends {
+    themes: Partial<Themes<T>>;
+    systemOptions: { [K_1 in { [K in keyof T]: T[K]["options"] extends readonly (infer U)[] ? U extends {
       media: [string, string, string];
-    } ? K : never : never }[keyof T]]?: [T[K_1]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends string ? U : U extends {
+    } ? K : never : never }[keyof T]]?: [T[K_1]["options"] extends readonly (infer U)[] ? U extends string ? U : U extends {
       value: string;
       media?: [string, string, string];
     } ? U extends {
       media: [string, string, string];
-    } ? never : U["value"] : never : never, T[K_1]["options"] extends (infer U)[] | readonly (infer U)[] ? U extends string ? U : U extends {
+    } ? never : U["value"] : never : never, T[K_1]["options"] extends readonly (infer U)[] ? U extends string ? U : U extends {
       value: string;
       media?: [string, string, string];
     } ? U extends {

package/dist/resonare.iife.min.js

@@ -1,7 +1,7 @@
 /**
-	* resonare v0.0.2
+	* resonare v0.0.4
 	*
 	* This source code is licensed under the MIT license found in the
 	* LICENSE file in the root directory of this source tree.
 	*/
-var resonare=(function(e){var t=`resonare`;let n=({storageType:e=`localStorage`}={})=>({abortController:t})=>({getItem:t=>JSON.parse(window[e].getItem(t)||`null`),setItem:(t,n)=>{window[e].setItem(t,JSON.stringify(n))},watch:n=>{let r=new AbortController;return window.addEventListener(`storage`,t=>{t.storageArea===window[e]&&n(t.key,JSON.parse(t.newValue))},{signal:AbortSignal.any([t.signal,r.signal])}),()=>{r.abort()}}}),r=()=>({abortController:e})=>{let n=new Map,r=new BroadcastChannel(t);return{getItem:e=>n.get(e)||null,setItem:(e,t)=>{n.set(e,t)},broadcast:(e,t)=>{r.postMessage({key:e,value:t})},watch:t=>{let n=new AbortController;return r.addEventListener(`message`,e=>{t(e.data.key,e.data.value)},{signal:AbortSignal.any([e.signal,n.signal])}),()=>{n.abort()}}}},i=`resonare`;function a(e){return Object.entries(e).map(([e,{options:t}])=>[e,t.map(e=>typeof e==`string`?e:e.value)])}function o(e){return Object.fromEntries(Object.entries(e).map(([e,{options:t,defaultOption:n}])=>[e,n??(typeof t[0]==`string`?t[0]:t[0].value)]))}let s=typeof window<`u`&&window.document!==void 0&&window.document.createElement!==void 0;var c=class{#e;#t;#n;#r;#i;#a=new Set;#o;#s=new AbortController;constructor({key:e=i,config:t,initialState:r={},storage:a=n()}){let s={},c={...r.systemOptions};Object.entries(t).forEach(([e,{options:t}])=>{s[e]=s[e]||{},t.forEach(t=>{typeof t==`string`?s[e][t]={value:t}:(t.media&&!Object.hasOwn(c,e)&&(c[e]=[t.media[1],t.media[2]]),s[e][t.value]=t)})}),this.#n={key:e,config:s,storage:a},this.#r=c,this.#e=o(t),this.#t={...this.#e,...r.themes},this.#i=this.#n.storage({abortController:this.#s}),this.#o={}}getThemes=()=>this.#t;getResolvedThemes=()=>this.#l();setThemes=async e=>{let t=typeof e==`function`?e(this.#t):e;this.#c({...this.#t,...t});let n=this.getStateToPersist();await this.#i.setItem(this.#n.key,n),this.#i.broadcast?.(this.#n.key,n)};updateSystemOption=(e,[t,n])=>{this.#r[e]=[t,n],this.setThemes({...this.#t})};getStateToPersist=()=>({version:1,themes:this.#t,systemOptions:this.#r});restore=async()=>{let e=await this.#i.getItem(this.#n.key);if(!e){this.#c({...this.#e});return}Object.hasOwn(e,`version`)||(e={version:1,themes:e,systemOptions:this.#r}),this.#r={...this.#r,...e.systemOptions},this.#c({...this.#e,...e.themes})};subscribe=(e,{immediate:t=!1}={})=>(t&&e({themes:this.#t,resolvedThemes:this.#l()}),this.#a.add(e),()=>{this.#a.delete(e)});sync=()=>{if(!this.#i.watch){console.warn(`[${i}] No watch method was provided for storage.`);return}return this.#i.watch((e,t)=>{e===this.#n.key&&(this.#r=t.systemOptions,this.#c(t.themes))})};___destroy=()=>{this.#a.clear(),this.#s.abort()};#c=e=>{this.#t=e,this.#d()};#l=()=>Object.fromEntries(Object.entries(this.#t).map(([e,t])=>{let n=this.#n.config[e][t];return[e,this.#u({themeKey:e,option:n})]}));#u=({themeKey:e,option:t})=>{if(!t.media)return t.value;if(!s)return console.warn(`[${i}] Option with key "media" cannot be resolved in server environment.`),t.value;let[n]=t.media;if(!this.#o[n]){let r=window.matchMedia(n);this.#o[n]=r,r.addEventListener(`change`,()=>{this.#t[e]===t.value&&this.#c({...this.#t})},{signal:this.#s.signal})}let[r,a]=this.#r[e];return this.#o[n].matches?r:a};#d=()=>{for(let e of this.#a)e({themes:this.#t,resolvedThemes:this.#l()})}};let l=new class{#e=new Map;create=e=>{let t=e.key||i,n=this.#e.get(t);return n||(n=new c(e),this.#e.set(t,n)),n};get=e=>{let t=e||i;if(!this.#e.has(t))throw Error(`[${i}] Theme store with key '${t}' could not be found. Please run \`createThemeStore\` with key '${t}' first.`);return this.#e.get(t)};destroy=e=>{let t=e||i;if(!this.#e.has(t))throw Error(`[${i}] Theme store with key '${t}' could not be found. Please run \`createThemeStore\` with key '${t}' first.`);this.#e.get(t).___destroy(),this.#e.delete(t)}},u=l.create,d=l.get,f=l.destroy;return e.createThemeStore=u,e.destroyThemeStore=f,e.getDefaultThemes=o,e.getThemeStore=d,e.getThemesAndOptions=a,e.localStorageAdapter=n,e.memoryStorageAdapter=r,e})({});
+var resonare=(function(e){var t=`resonare`;let n=({storageType:e=`localStorage`}={})=>({abortController:t})=>({getItem:t=>JSON.parse(window[e].getItem(t)||`null`),setItem:(t,n)=>{window[e].setItem(t,JSON.stringify(n))},watch:n=>{let r=new AbortController;return window.addEventListener(`storage`,t=>{t.storageArea===window[e]&&n(t.key,JSON.parse(t.newValue))},{signal:AbortSignal.any([t.signal,r.signal])}),()=>{r.abort()}}}),r=()=>({abortController:e})=>{let n=new Map,r=new BroadcastChannel(t);return{getItem:e=>n.get(e)||null,setItem:(e,t)=>{n.set(e,t)},broadcast:(e,t)=>{r.postMessage({key:e,value:t})},watch:t=>{let n=new AbortController;return r.addEventListener(`message`,e=>{t(e.data.key,e.data.value)},{signal:AbortSignal.any([e.signal,n.signal])}),()=>{n.abort()}}}};function i(e){return Object.entries(e).map(([e,{options:t}])=>[e,t.map(e=>typeof e==`string`?e:e.value)])}function a(e){return Object.fromEntries(Object.entries(e).map(([e,{options:t,defaultOption:n}])=>[e,n??(typeof t[0]==`string`?t[0]:t[0].value)]))}let o=typeof window<`u`&&window.document!==void 0&&window.document.createElement!==void 0;var s=class{#e;#t;#n;#r;#i;#a=new Set;#o;#s=new AbortController;constructor({key:e=t,config:r,initialState:i={},storage:o=n()}){let s={},c={...i.systemOptions};Object.entries(r).forEach(([e,{options:t}])=>{s[e]=s[e]||{},t.forEach(t=>{typeof t==`string`?s[e][t]={value:t}:(t.media&&!Object.hasOwn(c,e)&&(c[e]=[t.media[1],t.media[2]]),s[e][t.value]=t)})}),this.#n={key:e,config:s,storage:o},this.#r=c,this.#e=a(r),this.#t={...this.#e,...i.themes},this.#i=this.#n.storage({abortController:this.#s}),this.#o={}}getThemes=()=>this.#t;getResolvedThemes=()=>this.#l();setThemes=async e=>{let t=typeof e==`function`?e(this.#t):e;this.#c({...this.#t,...t});let n=this.getStateToPersist();await this.#i.setItem(this.#n.key,n),this.#i.broadcast?.(this.#n.key,n)};updateSystemOption=(e,[t,n])=>{this.#r[e]=[t,n],this.setThemes({...this.#t})};getStateToPersist=()=>({version:1,themes:this.#t,systemOptions:this.#r});restore=async()=>{let e=await this.#i.getItem(this.#n.key);if(!e){this.#c({...this.#e});return}Object.hasOwn(e,`version`)||(e={version:1,themes:e,systemOptions:this.#r}),this.#r={...this.#r,...e.systemOptions},this.#c({...this.#e,...e.themes})};subscribe=(e,{immediate:t=!1}={})=>(t&&e({themes:this.#t,resolvedThemes:this.#l()}),this.#a.add(e),()=>{this.#a.delete(e)});sync=()=>{if(!this.#i.watch){console.warn(`[${t}] No watch method was provided for storage.`);return}return this.#i.watch((e,t)=>{e===this.#n.key&&(this.#r=t.systemOptions,this.#c(t.themes))})};___destroy=()=>{this.#a.clear(),this.#s.abort()};#c=e=>{this.#t=e,this.#d()};#l=()=>Object.fromEntries(Object.entries(this.#t).map(([e,t])=>{let n=this.#n.config[e][t];return[e,this.#u({themeKey:e,option:n})]}));#u=({themeKey:e,option:n})=>{if(!n.media)return n.value;if(!o)return console.warn(`[${t}] Option with key "media" cannot be resolved in server environment.`),n.value;let[r]=n.media;if(!this.#o[r]){let t=window.matchMedia(r);this.#o[r]=t,t.addEventListener(`change`,()=>{this.#t[e]===n.value&&this.#c({...this.#t})},{signal:this.#s.signal})}let[i,a]=this.#r[e];return this.#o[r].matches?i:a};#d=()=>{for(let e of this.#a)e({themes:this.#t,resolvedThemes:this.#l()})}};let c=new class{#e=new Map;create=e=>{let n=e.key||t,r=this.#e.get(n);return r||(r=new s(e),this.#e.set(n,r)),r};get=e=>{let n=e||t;if(!this.#e.has(n))throw Error(`[${t}] Theme store with key '${n}' could not be found. Please run \`createThemeStore\` with key '${n}' first.`);return this.#e.get(n)};destroy=e=>{let n=e||t;if(!this.#e.has(n))throw Error(`[${t}] Theme store with key '${n}' could not be found. Please run \`createThemeStore\` with key '${n}' first.`);this.#e.get(n).___destroy(),this.#e.delete(n)}},l=c.create,u=c.get,d=c.destroy;return e.createThemeStore=l,e.destroyThemeStore=d,e.getDefaultThemes=a,e.getThemeStore=u,e.getThemesAndOptions=i,e.localStorageAdapter=n,e.memoryStorageAdapter=r,e})({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resonare",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Resonare",
   "keywords": [
     "theming"