atom.io 0.40.2 → 0.40.4

package/dist/internal/index.js

@@ -744,7 +744,6 @@ function writeToCache(target, state, value) {
 				writeToCache(target, state, resolved);
 				switch (type) {
 					case `atom`:
-					case `mutable_atom`:
 						evictDownstreamFromAtom(target, state);
 						break;
 					case `readonly_pure_selector`:
@@ -759,7 +758,7 @@ function writeToCache(target, state, value) {
 				});
 			}
 		}).catch((thrown) => {
-			target.logger.error(`💥`, `state`, key, `rejected:`, thrown);
+			target.logger.error(`💥`, state.type, key, `rejected:`, thrown);
 		});
 		return future;
 	}
@@ -828,12 +827,12 @@ function readOrComputeValue(target, state, mut) {
 			target.logger.info(`🧮`, state.type, key, `computing value`);
 			try {
 				val = state.getFrom(target);
-				if (val instanceof Promise) return val.catch((e) => {
-					target.logger.error(`💥`, state.type, key, `rejected:`, e);
+				if (val instanceof Promise) return val.catch((thrown) => {
+					target.logger.error(`💥`, state.type, key, `rejected:`, thrown);
 					if (state.catch) {
-						for (const Class of state.catch) if (e instanceof Class) return writeToCache(target, state, e);
+						for (const Class of state.catch) if (thrown instanceof Class) return thrown;
 					}
-					throw e;
+					throw thrown;
 				});
 			} catch (e) {
 				target.logger.error(`💥`, state.type, key, `rejected:`, e);
@@ -849,15 +848,12 @@ function readOrComputeValue(target, state, mut) {
 			let def;
 			if (isFn(state.default)) try {
 				def = state.default();
-				if (def instanceof Promise) def = def.catch((e) => {
-					target.logger.error(`💥`, state.type, key, `rejected:`, e);
+				if (def instanceof Promise) def = def.catch((thrown) => {
+					target.logger.error(`💥`, state.type, key, `rejected:`, thrown);
 					if (state.catch) {
-						for (const Class of state.catch) if (e instanceof Class) {
-							def = writeToCache(target, state, e);
-							return def;
-						}
+						for (const Class of state.catch) if (thrown instanceof Class) return thrown;
 					}
-					throw e;
+					throw thrown;
 				});
 			} catch (e) {
 				target.logger.error(`💥`, state.type, key, `rejected:`, e);
@@ -909,7 +905,7 @@ function mintInStore(store, family, key, mustCreate) {
 	let token;
 	if (mustCreate === MUST_CREATE) {
 		store.logger.info(`👪`, family.type, family.key, `adds member`, typeof key === `string` ? `\`${key}\`` : key);
-		token = family(key);
+		token = family.create(key);
 		if (molecule) store.moleculeData.set(stringKey, family.key);
 	} else token = mint(family, key);
 	return token;
@@ -2030,7 +2026,7 @@ function createReadonlyPureSelectorFamily(store, options, internalRoles) {
 	const existing = store.families.get(familyKey);
 	if (existing) store.logger.error(`❗`, type, familyKey, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: familyKey,
@@ -2043,10 +2039,11 @@ function createReadonlyPureSelectorFamily(store, options, internalRoles) {
 			get: options.get(key)
 		};
 		if (options.catch) individualOptions.catch = options.catch;
-		const token = createReadonlyPureSelector(target, individualOptions, family);
-		return token;
+		return createReadonlyPureSelector(target, individualOptions, family);
 	};
-	const readonlySelectorFamily = Object.assign(familyFunction, familyToken, {
+	const readonlySelectorFamily = {
+		...familyToken,
+		create,
 		internalRoles,
 		subject,
 		install: (s) => createReadonlyPureSelectorFamily(s, options),
@@ -2057,9 +2054,8 @@ function createReadonlyPureSelectorFamily(store, options, internalRoles) {
 				find: ((...args) => findInStore(store, ...args)),
 				json: (token) => getJsonToken(store, token)
 			});
-		},
-		...options.catch ? { catch: options.catch } : {}
-	});
+		}
+	};
 	store.families.set(familyKey, readonlySelectorFamily);
 	return familyToken;
 }
@@ -2074,7 +2070,7 @@ function createRegularAtomFamily(store, options, internalRoles) {
 	const existing = store.families.get(options.key);
 	if (existing) store.logger.error(`❗`, `atom_family`, options.key, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: options.key,
@@ -2089,17 +2085,16 @@ function createRegularAtomFamily(store, options, internalRoles) {
 		};
 		if (options.effects) individualOptions.effects = options.effects(key);
 		if (options.catch) individualOptions.catch = options.catch;
-		const token = createRegularAtom(target, individualOptions, family);
-		return token;
+		return createRegularAtom(target, individualOptions, family);
 	};
-	const atomFamily$1 = Object.assign(familyFunction, {
+	const atomFamily$1 = {
 		...familyToken,
+		create,
 		default: options.default,
 		subject,
 		install: (s) => createRegularAtomFamily(s, options),
-		internalRoles,
-		...options.catch ? { catch: options.catch } : {}
-	});
+		internalRoles
+	};
 	store.families.set(options.key, atomFamily$1);
 	if (isFn(options.default) === false) store.defaults.set(options.key, options.default);
 	return familyToken;
@@ -2117,7 +2112,7 @@ function createReadonlyHeldSelectorFamily(store, options, internalRoles) {
 	const existing = store.families.get(familyKey);
 	if (existing) store.logger.error(`❗`, type, familyKey, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: familyKey,
@@ -2125,19 +2120,20 @@ function createReadonlyHeldSelectorFamily(store, options, internalRoles) {
 		};
 		const fullKey = `${familyKey}(${subKey})`;
 		const target = newest(store);
-		const token = createReadonlyHeldSelector(target, {
+		return createReadonlyHeldSelector(target, {
 			key: fullKey,
 			const: options.const(key),
 			get: options.get(key)
 		}, family);
-		return token;
 	};
-	const readonlySelectorFamily = Object.assign(familyFunction, familyToken, {
+	const readonlySelectorFamily = {
+		...familyToken,
+		create,
 		internalRoles,
 		subject,
 		install: (s) => createReadonlyHeldSelectorFamily(s, options),
 		default: options.const
-	});
+	};
 	store.families.set(familyKey, readonlySelectorFamily);
 	return familyToken;
 }
@@ -2154,7 +2150,7 @@ function createWritableHeldSelectorFamily(store, options, internalRoles) {
 	const existing = store.families.get(familyKey);
 	if (existing) store.logger.error(`❗`, type, familyKey, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: familyKey,
@@ -2162,20 +2158,21 @@ function createWritableHeldSelectorFamily(store, options, internalRoles) {
 		};
 		const fullKey = `${familyKey}(${subKey})`;
 		const target = newest(store);
-		const token = createWritableHeldSelector(target, {
+		return createWritableHeldSelector(target, {
 			key: fullKey,
 			const: options.const(key),
 			get: options.get(key),
 			set: options.set(key)
 		}, family);
-		return token;
 	};
-	const selectorFamily$1 = Object.assign(familyFunction, familyToken, {
+	const selectorFamily$1 = {
+		...familyToken,
+		create,
 		internalRoles,
 		subject,
 		install: (s) => createWritableHeldSelectorFamily(s, options),
 		default: options.const
-	});
+	};
 	store.families.set(familyKey, selectorFamily$1);
 	return familyToken;
 }
@@ -2192,7 +2189,7 @@ function createWritablePureSelectorFamily(store, options, internalRoles) {
 	const existing = store.families.get(familyKey);
 	if (existing) store.logger.error(`❗`, type, familyKey, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: familyKey,
@@ -2206,10 +2203,11 @@ function createWritablePureSelectorFamily(store, options, internalRoles) {
 			set: options.set(key)
 		};
 		if (options.catch) individualOptions.catch = options.catch;
-		const token = createWritablePureSelector(target, individualOptions, family);
-		return token;
+		return createWritablePureSelector(target, individualOptions, family);
 	};
-	const selectorFamily$1 = Object.assign(familyFunction, familyToken, {
+	const selectorFamily$1 = {
+		...familyToken,
+		create,
 		internalRoles,
 		subject,
 		install: (s) => createWritablePureSelectorFamily(s, options),
@@ -2220,9 +2218,8 @@ function createWritablePureSelectorFamily(store, options, internalRoles) {
 				find: ((...args) => findInStore(store, ...args)),
 				json: (token) => getJsonToken(store, token)
 			});
-		},
-		...options.catch ? { catch: options.catch } : {}
-	});
+		}
+	};
 	store.families.set(familyKey, selectorFamily$1);
 	return familyToken;
 }
@@ -2728,7 +2725,7 @@ function createMutableAtomFamily(store, options, internalRoles) {
 	const existing = store.families.get(options.key);
 	if (existing) store.logger.error(`❗`, `mutable_atom_family`, options.key, `Overwriting an existing ${PRETTY_TOKEN_TYPES[existing.type]} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
 	const subject = new Subject();
-	const familyFunction = (key) => {
+	const create = (key) => {
 		const subKey = stringifyJson(key);
 		const family = {
 			key: options.key,
@@ -2741,15 +2738,16 @@ function createMutableAtomFamily(store, options, internalRoles) {
 			class: options.class
 		};
 		if (options.effects) individualOptions.effects = options.effects(key);
-		const token = createMutableAtom(target, individualOptions, family);
-		return token;
+		return createMutableAtom(target, individualOptions, family);
 	};
-	const atomFamily$1 = Object.assign(familyFunction, familyToken, {
+	const atomFamily$1 = {
+		...familyToken,
+		create,
 		class: options.class,
 		subject,
 		install: (s) => createMutableAtomFamily(s, options),
 		internalRoles
-	});
+	};
 	store.families.set(options.key, atomFamily$1);
 	createWritablePureSelectorFamily(store, {
 		key: `${options.key}:JSON`,