@sprawlify/primitives 0.1.6 → 0.1.8

package/dist/{types-DUM9rzfD.d.mts → types-u-LWCSDE.d.cts}

@@ -105,14 +105,26 @@ interface Params<T extends Dict> {
   guard: (key: T["guard"] | GuardFn<T>) => boolean | undefined;
 }
 type GuardFn<T extends Dict> = (params: Params<T>) => boolean;
-interface Transition<T extends Dict> {
-  target?: T["state"] | undefined;
+type TopLevelState<S extends string> = S extends `${infer Top}.${string}` ? Top : S;
+type ChildStateKey<S extends string, Parent extends string> = S extends `${Parent}.${infer Rest}` ? Rest extends `${infer Child}.${string}` ? Child : Rest : never;
+type ParentPath<S extends string> = S extends `${infer Parent}.${string}` ? Parent : never;
+type AncestorPaths<S extends string> = S | (ParentPath<S> extends never ? never : AncestorPaths<ParentPath<S>>);
+type RelativeStateTarget<S extends string, Source extends string> = ChildStateKey<S, AncestorPaths<Source>>;
+type StateIdTarget = `#${string}`;
+interface Transition<T extends Dict, Source extends string | undefined = string | undefined> {
+  target?: T["state"] | StateIdTarget | (Source extends string ? RelativeStateTarget<T["state"], Source> : never) | undefined;
   actions?: T["action"][] | undefined;
   guard?: T["guard"] | GuardFn<T> | undefined;
   reenter?: boolean | undefined;
 }
+type TransitionSet<T extends Dict> = Transition<T> | Transition<T>[] | undefined;
+type TransitionMap<T extends Dict> = Record<string, TransitionSet<T>>;
+type TransitionMatch<T extends Dict> = {
+  transitions: TransitionSet<T>;
+  source: string | undefined;
+};
 type MaybeArray<T> = T | T[];
-type ChooseFn<T extends Dict> = (transitions: MaybeArray<Omit<Transition<T>, "target">>) => Transition<T> | undefined;
+type ChooseFn<T extends Dict> = (transitions: MaybeArray<Omit<Transition<T, string>, "target">> | null | undefined) => Transition<T> | undefined;
 interface PropsParams<T extends Dict> {
   props: Partial<T["props"]>;
   scope: Scope;
@@ -123,6 +135,16 @@ interface RefsParams<T extends Dict> {
 }
 type ActionsOrFn<T extends Dict> = T["action"][] | ((params: Params<T>) => T["action"][] | undefined);
 type EffectsOrFn<T extends Dict> = T["effect"][] | ((params: Params<T>) => T["effect"][] | undefined);
+interface MachineState<T extends Dict, Parent extends string = string> {
+  id?: string | undefined;
+  tags?: T["tag"][] | undefined;
+  entry?: ActionsOrFn<T> | undefined;
+  exit?: ActionsOrFn<T> | undefined;
+  effects?: EffectsOrFn<T> | undefined;
+  initial?: ChildStateKey<T["state"], Parent> | undefined;
+  states?: { [K in ChildStateKey<T["state"], Parent>]?: MachineState<T, `${Parent}.${K}`> } | undefined;
+  on?: { [E in T["event"]["type"]]?: Transition<T, Parent> | Array<Transition<T, Parent>> } | undefined;
+}
 interface Machine<T extends Dict> {
   debug?: boolean | undefined;
   props?: ((params: PropsParams<T>) => T["props"]) | undefined;
@@ -136,14 +158,8 @@ interface Machine<T extends Dict> {
   effects?: EffectsOrFn<T> | undefined;
   refs?: ((params: RefsParams<T>) => T["refs"]) | undefined;
   watch?: ((params: Params<T>) => void) | undefined;
-  on?: { [E in T["event"]["type"]]?: Transition<T> | Array<Transition<T>> } | undefined;
-  states: { [K in T["state"]]: {
-    tags?: T["tag"][] | undefined;
-    entry?: ActionsOrFn<T> | undefined;
-    exit?: ActionsOrFn<T> | undefined;
-    effects?: EffectsOrFn<T> | undefined;
-    on?: { [E in T["event"]["type"]]?: Transition<T> | Array<Transition<T>> } | undefined;
-  } };
+  on?: { [E in T["event"]["type"]]?: Transition<T, undefined> | Array<Transition<T, undefined>> } | undefined;
+  states: { [K in TopLevelState<T["state"]>]: MachineState<T, K> };
   implementations?: {
     guards?: { [K in T["guard"]]: (params: Params<T>) => boolean } | undefined;
     actions?: { [K in T["action"]]: (params: Params<T>) => void } | undefined;
@@ -198,4 +214,4 @@ declare enum MachineStatus {
 }
 declare const INIT_STATE = "__init__";
 //#endregion
-export { PropFn as _, BindableParams as a, Transition as b, ComputedFn as c, GuardFn as d, INIT_STATE as f, Params as g, MachineStatus as h, BindableFn as i, EffectsOrFn as l, MachineSchema as m, Bindable as n, BindableRefs as o, Machine as p, BindableContext as r, ChooseFn as s, ActionsOrFn as t, EventObject as u, Scope as v, ValueOrFn as x, Service as y };
+export { TransitionMatch as C, TransitionMap as S, ValueOrFn as T, Params as _, BindableParams as a, Service as b, ComputedFn as c, GuardFn as d, INIT_STATE as f, MachineStatus as g, MachineState as h, BindableFn as i, EffectsOrFn as l, MachineSchema as m, Bindable as n, BindableRefs as o, Machine as p, BindableContext as r, ChooseFn as s, ActionsOrFn as t, EventObject as u, PropFn as v, TransitionSet as w, Transition as x, Scope as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprawlify/primitives",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "A set of primitive components for building user interfaces.",
   "license": "MIT",
   "author": "sprawlify <npm@sprawlify.com>",

package/dist/core-Ci9Yu6QI.mjs

@@ -1,123 +0,0 @@
-import { en as getActiveElement, sn as isActiveElement, tn as getDocument } from "./dom-query-BFuRs3l4.mjs";
-import { W as callAll, dt as isString, ft as isEqual } from "./utils-VVoZ_v29.mjs";
-//#region src/shared/core/merge-props.ts
-const clsx = (...args) => args.map((str) => str?.trim?.()).filter(Boolean).join(" ");
-const CSS_REGEX = /((?:--)?(?:\w+-?)+)\s*:\s*([^;]*)/g;
-const serialize = (style) => {
-	const res = {};
-	let match;
-	while (match = CSS_REGEX.exec(style)) res[match[1]] = match[2];
-	return res;
-};
-const css = (a, b) => {
-	if (isString(a)) {
-		if (isString(b)) return `${a};${b}`;
-		a = serialize(a);
-	} else if (isString(b)) b = serialize(b);
-	return Object.assign({}, a ?? {}, b ?? {});
-};
-function mergeProps(...args) {
-	let result = {};
-	for (let props of args) {
-		if (!props) continue;
-		for (let key in result) {
-			if (key.startsWith("on") && typeof result[key] === "function" && typeof props[key] === "function") {
-				result[key] = callAll(props[key], result[key]);
-				continue;
-			}
-			if (key === "className" || key === "class") {
-				result[key] = clsx(result[key], props[key]);
-				continue;
-			}
-			if (key === "style") {
-				result[key] = css(result[key], props[key]);
-				continue;
-			}
-			result[key] = props[key] !== void 0 ? props[key] : result[key];
-		}
-		for (let key in props) if (result[key] === void 0) result[key] = props[key];
-		const symbols = Object.getOwnPropertySymbols(props);
-		for (let symbol of symbols) result[symbol] = props[symbol];
-	}
-	return result;
-}
-//#endregion
-//#region src/shared/core/memo.ts
-function memo(getDeps, fn, opts) {
-	let deps = [];
-	let result;
-	return (depArgs) => {
-		const newDeps = getDeps(depArgs);
-		if (!(newDeps.length !== deps.length || newDeps.some((dep, index) => !isEqual(deps[index], dep)))) return result;
-		deps = newDeps;
-		result = fn(newDeps, depArgs);
-		opts?.onChange?.(result);
-		return result;
-	};
-}
-//#endregion
-//#region src/shared/core/create-machine.ts
-function createGuards() {
-	return {
-		and: (...guards) => {
-			return function andGuard(params) {
-				return guards.every((str) => params.guard(str));
-			};
-		},
-		or: (...guards) => {
-			return function orGuard(params) {
-				return guards.some((str) => params.guard(str));
-			};
-		},
-		not: (guard) => {
-			return function notGuard(params) {
-				return !params.guard(guard);
-			};
-		}
-	};
-}
-function createMachine(config) {
-	return config;
-}
-function setup() {
-	return {
-		guards: createGuards(),
-		createMachine: (config) => {
-			return createMachine(config);
-		},
-		choose: (transitions) => {
-			return function chooseFn({ choose }) {
-				return choose(transitions)?.actions;
-			};
-		}
-	};
-}
-//#endregion
-//#region src/shared/core/types.ts
-let MachineStatus = /* @__PURE__ */ function(MachineStatus) {
-	MachineStatus["NotStarted"] = "Not Started";
-	MachineStatus["Started"] = "Started";
-	MachineStatus["Stopped"] = "Stopped";
-	return MachineStatus;
-}({});
-const INIT_STATE = "__init__";
-//#endregion
-//#region src/shared/core/scope.ts
-function createScope(props) {
-	const getRootNode = () => props.getRootNode?.() ?? document;
-	const getDoc = () => getDocument(getRootNode());
-	const getWin = () => getDoc().defaultView ?? window;
-	const getActiveElementFn = () => getActiveElement(getRootNode());
-	const getById = (id) => getRootNode().getElementById(id);
-	return {
-		...props,
-		getRootNode,
-		getDoc,
-		getWin,
-		getActiveElement: getActiveElementFn,
-		isActiveElement,
-		getById
-	};
-}
-//#endregion
-export { createMachine as a, mergeProps as c, createGuards as i, INIT_STATE as n, setup as o, MachineStatus as r, memo as s, createScope as t };

package/dist/core-DwdPztGA.cjs

@@ -1,170 +0,0 @@
-const require_dom_query = require("./dom-query-BUO7rGsg.cjs");
-const require_utils = require("./utils-ByNiZU8f.cjs");
-//#region src/shared/core/merge-props.ts
-const clsx = (...args) => args.map((str) => str?.trim?.()).filter(Boolean).join(" ");
-const CSS_REGEX = /((?:--)?(?:\w+-?)+)\s*:\s*([^;]*)/g;
-const serialize = (style) => {
-	const res = {};
-	let match;
-	while (match = CSS_REGEX.exec(style)) res[match[1]] = match[2];
-	return res;
-};
-const css = (a, b) => {
-	if (require_utils.isString(a)) {
-		if (require_utils.isString(b)) return `${a};${b}`;
-		a = serialize(a);
-	} else if (require_utils.isString(b)) b = serialize(b);
-	return Object.assign({}, a ?? {}, b ?? {});
-};
-function mergeProps(...args) {
-	let result = {};
-	for (let props of args) {
-		if (!props) continue;
-		for (let key in result) {
-			if (key.startsWith("on") && typeof result[key] === "function" && typeof props[key] === "function") {
-				result[key] = require_utils.callAll(props[key], result[key]);
-				continue;
-			}
-			if (key === "className" || key === "class") {
-				result[key] = clsx(result[key], props[key]);
-				continue;
-			}
-			if (key === "style") {
-				result[key] = css(result[key], props[key]);
-				continue;
-			}
-			result[key] = props[key] !== void 0 ? props[key] : result[key];
-		}
-		for (let key in props) if (result[key] === void 0) result[key] = props[key];
-		const symbols = Object.getOwnPropertySymbols(props);
-		for (let symbol of symbols) result[symbol] = props[symbol];
-	}
-	return result;
-}
-//#endregion
-//#region src/shared/core/memo.ts
-function memo(getDeps, fn, opts) {
-	let deps = [];
-	let result;
-	return (depArgs) => {
-		const newDeps = getDeps(depArgs);
-		if (!(newDeps.length !== deps.length || newDeps.some((dep, index) => !require_utils.isEqual(deps[index], dep)))) return result;
-		deps = newDeps;
-		result = fn(newDeps, depArgs);
-		opts?.onChange?.(result);
-		return result;
-	};
-}
-//#endregion
-//#region src/shared/core/create-machine.ts
-function createGuards() {
-	return {
-		and: (...guards) => {
-			return function andGuard(params) {
-				return guards.every((str) => params.guard(str));
-			};
-		},
-		or: (...guards) => {
-			return function orGuard(params) {
-				return guards.some((str) => params.guard(str));
-			};
-		},
-		not: (guard) => {
-			return function notGuard(params) {
-				return !params.guard(guard);
-			};
-		}
-	};
-}
-function createMachine(config) {
-	return config;
-}
-function setup() {
-	return {
-		guards: createGuards(),
-		createMachine: (config) => {
-			return createMachine(config);
-		},
-		choose: (transitions) => {
-			return function chooseFn({ choose }) {
-				return choose(transitions)?.actions;
-			};
-		}
-	};
-}
-//#endregion
-//#region src/shared/core/types.ts
-let MachineStatus = /* @__PURE__ */ function(MachineStatus) {
-	MachineStatus["NotStarted"] = "Not Started";
-	MachineStatus["Started"] = "Started";
-	MachineStatus["Stopped"] = "Stopped";
-	return MachineStatus;
-}({});
-const INIT_STATE = "__init__";
-//#endregion
-//#region src/shared/core/scope.ts
-function createScope(props) {
-	const getRootNode = () => props.getRootNode?.() ?? document;
-	const getDoc = () => require_dom_query.getDocument(getRootNode());
-	const getWin = () => getDoc().defaultView ?? window;
-	const getActiveElementFn = () => require_dom_query.getActiveElement(getRootNode());
-	const getById = (id) => getRootNode().getElementById(id);
-	return {
-		...props,
-		getRootNode,
-		getDoc,
-		getWin,
-		getActiveElement: getActiveElementFn,
-		isActiveElement: require_dom_query.isActiveElement,
-		getById
-	};
-}
-//#endregion
-Object.defineProperty(exports, "INIT_STATE", {
-	enumerable: true,
-	get: function() {
-		return INIT_STATE;
-	}
-});
-Object.defineProperty(exports, "MachineStatus", {
-	enumerable: true,
-	get: function() {
-		return MachineStatus;
-	}
-});
-Object.defineProperty(exports, "createGuards", {
-	enumerable: true,
-	get: function() {
-		return createGuards;
-	}
-});
-Object.defineProperty(exports, "createMachine", {
-	enumerable: true,
-	get: function() {
-		return createMachine;
-	}
-});
-Object.defineProperty(exports, "createScope", {
-	enumerable: true,
-	get: function() {
-		return createScope;
-	}
-});
-Object.defineProperty(exports, "memo", {
-	enumerable: true,
-	get: function() {
-		return memo;
-	}
-});
-Object.defineProperty(exports, "mergeProps", {
-	enumerable: true,
-	get: function() {
-		return mergeProps;
-	}
-});
-Object.defineProperty(exports, "setup", {
-	enumerable: true,
-	get: function() {
-		return setup;
-	}
-});