Skip to content

Commit 6777149

Browse files
committed
[objarr] Lint
1 parent e89c7a5 commit 6777149

6 files changed

Lines changed: 42 additions & 38 deletions

File tree

src/@types/store/docs.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2759,7 +2759,10 @@
27592759
* {open: true, employees: 3},
27602760
* ]);
27612761
*
2762-
* store.setContent([{pets: {felix: {species: 'cat', bug: new Date(0)}}}, '']);
2762+
* store.setContent([
2763+
* {pets: {felix: {species: 'cat', bug: new Date(0)}}},
2764+
* '',
2765+
* ]);
27632766
* console.log(store.getTables());
27642767
* // -> {pets: {felix: {species: 'cat'}}}
27652768
* console.log(store.getValues());

src/@types/store/index.d.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
/// store
22
import type {StoreAlias} from '../_internal/store/index.d.ts';
3-
import type {AnyArray, AnyObject, Id, IdOrNull, Ids, Json} from '../common/index.d.ts';
3+
import type {
4+
AnyArray,
5+
AnyObject,
6+
Id,
7+
IdOrNull,
8+
Ids,
9+
Json,
10+
} from '../common/index.d.ts';
411

512
/// TablesSchema
613
export type TablesSchema = {[tableId: Id]: {[cellId: Id]: CellSchema}};

src/@types/store/with-schemas/index.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import type {
1212
ValueIdFromSchema,
1313
} from '../../_internal/store/with-schemas/index.d.ts';
1414
import type {
15+
AnyArray,
16+
AnyObject,
1517
Id,
1618
IdOrNull,
1719
Ids,
1820
Json,
19-
AnyObject,
20-
AnyArray,
2121
} from '../../common/with-schemas/index.d.ts';
2222

2323
/// TablesSchema

src/common/other.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ export const isString = (thing: unknown): thing is string =>
6969
export const isFunction = (thing: unknown): thing is (...args: any[]) => any =>
7070
getTypeOf(thing) == FUNCTION;
7171

72-
export const isArray = (thing: unknown): thing is unknown[] => Array.isArray(thing);
72+
export const isArray = (thing: unknown): thing is unknown[] =>
73+
Array.isArray(thing);
7374

7475
export const slice = <ArrayOrString extends string | any[]>(
7576
arrayOrString: ArrayOrString,

src/ui-react-dom/common/components.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '../../common/cell.ts';
1010
import {jsonParse, jsonString} from '../../common/json.ts';
1111
import {isObject, objToArray} from '../../common/obj.ts';
12-
import {isFalse, isArray, isUndefined} from '../../common/other.ts';
12+
import {isArray, isFalse, isUndefined} from '../../common/other.ts';
1313
import {getProps, useCallback, useState} from '../../common/react.ts';
1414
import {
1515
_VALUE,
@@ -151,9 +151,7 @@ export const EditableThing = <Thing extends Cell | Value>({
151151
const [stringThing, setStringThing] = useState<string>();
152152
const [numberThing, setNumberThing] = useState<number>();
153153
const [booleanThing, setBooleanThing] = useState<boolean>();
154-
const [objectThingJson, setObjectThingJson] = useState<string>(
155-
EMPTY_STRING,
156-
);
154+
const [objectThingJson, setObjectThingJson] = useState<string>(EMPTY_STRING);
157155
const [arrayThingJson, setArrayThingJson] = useState<string>(EMPTY_STRING);
158156

159157
if (currentThing !== thing) {
@@ -194,12 +192,8 @@ export const EditableThing = <Thing extends Cell | Value>({
194192
stringThing,
195193
numberThing,
196194
booleanThing,
197-
(objectThingJson
198-
? jsonParse(objectThingJson)
199-
: {}) as any,
200-
(arrayThingJson
201-
? jsonParse(arrayThingJson)
202-
: []) as any,
195+
(objectThingJson ? jsonParse(objectThingJson) : {}) as any,
196+
(arrayThingJson ? jsonParse(arrayThingJson) : []) as any,
203197
);
204198
setThingType(nextType);
205199
setCurrentThing(thing);
@@ -268,7 +262,7 @@ export const EditableThing = <Thing extends Cell | Value>({
268262
if (isObject(parsed)) {
269263
onThingChange(parsed as Thing);
270264
}
271-
} catch {}
265+
} catch {}
272266
},
273267
[onThingChange],
274268
)}

test/unit/core/store/store-listeners.test.ts

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5117,8 +5117,12 @@ describe.each([
51175117
test('addRow', () => {
51185118
// @ts-ignore
51195119
store.addRow('t2', {c1: new Date(0)});
5120-
expectChanges(listener, 'i:/t*/r*/c1', {t2: {undefined: {c1: [new Date(0)]}}});
5121-
expectChanges(listener, 'i:/t*/r*/c*', {t2: {undefined: {c1: [new Date(0)]}}});
5120+
expectChanges(listener, 'i:/t*/r*/c1', {
5121+
t2: {undefined: {c1: [new Date(0)]}},
5122+
});
5123+
expectChanges(listener, 'i:/t*/r*/c*', {
5124+
t2: {undefined: {c1: [new Date(0)]}},
5125+
});
51225126
expectNoChanges(listener);
51235127
});
51245128

@@ -8209,7 +8213,9 @@ describe.each([
82098213
setMutatorListeners();
82108214
// @ts-ignore
82118215
store.setTables({t1: {r1: {c1: new Date(1)}}});
8212-
expectChanges(listener, 'i:/t1/r1/c1', {t1: {r1: {c1: [new Date(1), new Date(2)]}}});
8216+
expectChanges(listener, 'i:/t1/r1/c1', {
8217+
t1: {r1: {c1: [new Date(1), new Date(2)]}},
8218+
});
82138219
expectChanges(
82148220
listener,
82158221
'i:/t1/r1/c*',
@@ -8271,7 +8277,9 @@ describe.each([
82718277
setMutatorListeners();
82728278
// @ts-ignore
82738279
store.setTable('t1', {r1: {c1: new Date(1)}});
8274-
expectChanges(listener, 'i:/t1/r1/c1', {t1: {r1: {c1: [new Date(1), new Date(2)]}}});
8280+
expectChanges(listener, 'i:/t1/r1/c1', {
8281+
t1: {r1: {c1: [new Date(1), new Date(2)]}},
8282+
});
82758283
expectChanges(
82768284
listener,
82778285
'i:/t1/r1/c*',
@@ -8333,7 +8341,9 @@ describe.each([
83338341
setMutatorListeners();
83348342
// @ts-ignore
83358343
store.setRow('t1', 'r1', {c1: new Date(1)});
8336-
expectChanges(listener, 'i:/t1/r1/c1', {t1: {r1: {c1: [new Date(1), new Date(2)]}}});
8344+
expectChanges(listener, 'i:/t1/r1/c1', {
8345+
t1: {r1: {c1: [new Date(1), new Date(2)]}},
8346+
});
83378347
expectChanges(
83388348
listener,
83398349
'i:/t1/r1/c*',
@@ -8468,7 +8478,9 @@ describe.each([
84688478
setMutatorListeners();
84698479
// @ts-ignore
84708480
store.setCell('t1', 'r1', 'c1', new Date(1));
8471-
expectChanges(listener, 'i:/t1/r1/c1', {t1: {r1: {c1: [new Date(1), new Date(2)]}}});
8481+
expectChanges(listener, 'i:/t1/r1/c1', {
8482+
t1: {r1: {c1: [new Date(1), new Date(2)]}},
8483+
});
84728484
expectChanges(
84738485
listener,
84748486
'i:/t1/r1/c*',
@@ -8774,11 +8786,7 @@ describe.each([
87748786
// @ts-ignore
87758787
store.setValues({v1: new Date(1)});
87768788
expectChanges(listener, '/v1', {v1: [new Date(1)]});
8777-
expectChanges(
8778-
listener,
8779-
'/v*',
8780-
{v1: [new Date(1)]},
8781-
);
8789+
expectChanges(listener, '/v*', {v1: [new Date(1)]});
87828790
expectNoChanges(listener);
87838791
});
87848792

@@ -8788,12 +8796,7 @@ describe.each([
87888796
// @ts-ignore
87898797
store.setPartialValues({v2: new Date(2), v3: undefined});
87908798
expectChanges(listener, '/v2', {v2: [new Date(2)]});
8791-
expectChanges(
8792-
listener,
8793-
'/v*',
8794-
{v2: [new Date(2)]},
8795-
{v3: [undefined]},
8796-
);
8799+
expectChanges(listener, '/v*', {v2: [new Date(2)]}, {v3: [undefined]});
87978800
expectNoChanges(listener);
87988801
});
87998802

@@ -8802,11 +8805,7 @@ describe.each([
88028805
// @ts-ignore
88038806
store.setValue('v1', new Date(1));
88048807
expectChanges(listener, '/v1', {v1: [new Date(1)]});
8805-
expectChanges(
8806-
listener,
8807-
'/v*',
8808-
{v1: [new Date(1)]},
8809-
);
8808+
expectChanges(listener, '/v*', {v1: [new Date(1)]});
88108809
expectNoChanges(listener);
88118810
});
88128811
});

0 commit comments

Comments
 (0)