Merge branch 'actions-same' into rewrite

This commit is contained in:
Yanick Champoux 2022-08-26 15:30:10 -04:00
commit 34acc63bef
2 changed files with 57 additions and 5 deletions

View File

@ -1,6 +1,10 @@
import R from 'remeda'; import R from 'remeda';
import { Action, ActionGenerator } from './actions.js'; import { action } from './actions.js';
function isActionGen(action) {
return typeof action === 'function' && action.type;
}
export class Updux { export class Updux {
#localInitial = {}; #localInitial = {};
@ -14,10 +18,25 @@ export class Updux {
this.#localInitial = config.initial ?? {}; this.#localInitial = config.initial ?? {};
this.#subduxes = config.subduxes ?? {}; this.#subduxes = config.subduxes ?? {};
this.#actions = R.mergeAll([ this.#actions = R.mapValues(config.actions ?? {}, (arg, name) =>
config.actions ?? {}, isActionGen(arg) ? arg : action(name, arg),
...Object.values(this.#subduxes).map(R.prop('actions')), );
]); Object.entries(this.#subduxes).forEach(([slice, sub]) =>
this.#addSubduxActions(slice, sub),
);
}
#addSubduxActions(_slice, subdux) {
if (!subdux.actions) return;
// TODO action 'blah' defined multiple times: <where>
Object.entries(subdux.actions).forEach(([action, gen]) => {
if (this.#actions[action]) {
if (this.#actions[action] === gen) return;
throw new Error(`action '${action}' already defined`);
}
this.#actions[action] = gen;
});
} }
get actions() { get actions() {

View File

@ -51,3 +51,36 @@ test('subduxes actions', () => {
expect(foo.actions).toHaveProperty('foo'); expect(foo.actions).toHaveProperty('foo');
expect(foo.actions).toHaveProperty('bar'); expect(foo.actions).toHaveProperty('bar');
}); });
test('throw if double action', () => {
expect(
() =>
new Updux({
actions: {
foo: action('foo'),
},
subduxes: {
beta: {
actions: {
foo: action('foo'),
},
},
},
}),
).toThrow(/action 'foo' already defined/);
});
test('action definition shortcut', () => {
const foo = new Updux({
actions: {
foo: null,
bar: (x) => ({ x }),
},
});
expect(foo.actions.foo('hello')).toEqual({ type: 'foo', payload: 'hello' });
expect(foo.actions.bar('hello')).toEqual({
type: 'bar',
payload: { x: 'hello' },
});
});