[union] Preserve MergeableStore compatibility

Author: jamesgpearce

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

@@ -244,11 +244,17 @@ export interface MergeableStore<
   setTablesSchema<const TS extends TablesSchema>(
     tablesSchema: TS & ValidTablesSchema<TS>,
   ): MergeableStore<[TS, Schemas[1]]>;
+  setTablesSchema<const TS extends TablesSchema>(
+    tablesSchema: TS & ValidTablesSchema<TS>,
+  ): Store<[TS, Schemas[1]]>;
 
   /// Store.setValuesSchema
   setValuesSchema<const VS extends ValuesSchema>(
     valuesSchema: VS & ValidValuesSchema<VS>,
   ): MergeableStore<[Schemas[0], VS]>;
+  setValuesSchema<const VS extends ValuesSchema>(
+    valuesSchema: VS & ValidValuesSchema<VS>,
+  ): Store<[Schemas[0], VS]>;
 
   /// Store.setSchema
   setSchema<const TS extends TablesSchema, const VS extends ValuesSchema>(
@@ -262,6 +268,17 @@ export interface MergeableStore<
         : VS,
     ]
   >;
+  setSchema<const TS extends TablesSchema, const VS extends ValuesSchema>(
+    tablesSchema: TS & ValidTablesSchema<TS>,
+    valuesSchema?: VS & ValidValuesSchema<VS>,
+  ): Store<
+    [
+      TS,
+      Exclude<ValuesSchema, typeof valuesSchema> extends never
+        ? NoValuesSchema
+        : VS,
+    ]
+  >;
 
   /// Store.delTablesSchema
   delTablesSchema<

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

@@ -1,4 +1,4 @@
-import type {Store} from 'tinybase';
+import type {Store, TablesSchema} from 'tinybase';
 import {createStore} from 'tinybase';
 import {beforeEach, describe, expect, test} from 'vitest';
 
@@ -161,7 +161,7 @@ describe('Null with schemas', () => {
       t1: {
         c1: {type: 'string', default: null},
       },
-    });
+    } as TablesSchema);
 
     expect(result).toEqual(store);
     expect(store.getTablesSchemaJson()).toEqual('{}');

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

@@ -8,6 +8,7 @@ import type {
   Tables,
   TablesSchema,
   Value,
+  ValuesSchema,
 } from 'tinybase/with-schemas';
 import {createMergeableStore, createStore} from 'tinybase/with-schemas';
 import {
@@ -250,7 +251,7 @@ describe.each([
     test('Validate enum Cell schemas', () => {
       store.setTablesSchema({
         pets: {status: {enum: ['draft', 'live'], default: 'other'}},
-      });
+      } as TablesSchema);
       expect(JSON.parse(store.getTablesSchemaJson())).toEqual({
         pets: {status: {enum: ['draft', 'live']}},
       });
@@ -567,7 +568,7 @@ describe.each([
     test('Validate enum Value schemas', () => {
       store.setValuesSchema({
         status: {enum: ['draft', 'live'], default: 'other'},
-      });
+      } as ValuesSchema);
       expect(JSON.parse(store.getValuesSchemaJson())).toEqual({
         status: {enum: ['draft', 'live']},
       });
@@ -3282,15 +3283,15 @@ describe.each([
           c4: {type: 'array', default: null, allowNull: true},
         },
       };
-      const valuesSchema = {
-        v1: {type: 'object' as const, default: {a: 1}},
-        v2: {type: 'array' as const, default: [2, 3]},
+      const valuesSchema: ValuesSchema = {
+        v1: {type: 'object', default: {a: 1}},
+        v2: {type: 'array', default: [2, 3]},
         v3: {
-          type: 'object' as const,
+          type: 'object',
           default: null,
           allowNull: true,
         },
-        v4: {type: 'array' as const, default: null, allowNull: true},
+        v4: {type: 'array', default: null, allowNull: true},
       };
       const expectedTablesSchema = structuredClone(tablesSchema);
       const expectedValuesSchema = structuredClone(valuesSchema);

test/unit/core/types/__snapshots__/types.test.tsx.snap

@@ -2358,27 +2358,27 @@ exports[`Types in store.ts > 1961:36 1`] = `"Argument of type 'false' is not ass
 
 exports[`Types in store.ts > 1962:33 1`] = `"Argument of type '{}' is not assignable to parameter of type 'Value<{ readonly name: { readonly type: "string"; readonly allowNull: true; }; readonly profile: { readonly type: "object"; readonly default: null; readonly allowNull: true; }; readonly tags: { readonly type: "array"; readonly default: null; readonly allowNull: true; }; }, "tags", "array", never, null> | MapValue<...>'."`;
 
-exports[`Types in store-schema-defaults.ts > 10:6 1`] = `"Type '{ type: string[]; default: number; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 9:6 1`] = `"Type '{ type: string[]; default: number; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 14:4 1`] = `"Type '{ enum: string[]; default: string; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 13:4 1`] = `"Type '{ enum: string[]; default: string; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 17:12 1`] = `"Type '{ type: string; default: null; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 16:12 1`] = `"Type '{ type: string; default: null; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 25:6 1`] = `"Type '{ enum: string[]; default: string; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 24:6 1`] = `"Type '{ enum: string[]; default: string; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 29:4 1`] = `"Type '{ type: string[]; default: number; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 28:4 1`] = `"Type '{ type: string[]; default: number; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 32:12 1`] = `"Type '{ type: string; default: null; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 31:12 1`] = `"Type '{ type: string; default: null; }' is not assignable to type 'never'."`;
 
-exports[`Types in store-schema-defaults.ts > 44:6 1`] = `"Type '{ type: string[]; default: number; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 43:6 1`] = `"No overload matches this call."`;
 
-exports[`Types in store-schema-defaults.ts > 48:4 1`] = `"Type '{ enum: string[]; default: string; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 47:4 1`] = `"No overload matches this call."`;
 
-exports[`Types in store-schema-defaults.ts > 52:6 1`] = `"Type '{ type: string; default: null; }' is not assignable to type 'never'."`;
+exports[`Types in store-schema-defaults.ts > 51:6 1`] = `"No overload matches this call."`;
 
-exports[`Types in store-schema-defaults.ts > 79:42 1`] = `"Type 'DefaultedCellFromSchema<{ pets: { answer: { type: readonly ["string", "boolean"]; default: 1; }; }; }, "pets", "answer">' does not satisfy the expected type 'string | boolean'."`;
+exports[`Types in store-schema-defaults.ts > 78:42 1`] = `"Type 'DefaultedCellFromSchema<{ pets: { answer: { type: readonly ["string", "boolean"]; default: 1; }; }; }, "pets", "answer">' does not satisfy the expected type 'string | boolean'."`;
 
-exports[`Types in store-schema-defaults.ts > 81:27 1`] = `"Type 'DefaultedValueFromSchema<{ status: { enum: readonly ["draft", "live"]; default: "archived"; }; }, "status">' does not satisfy the expected type '"draft" | "live"'."`;
+exports[`Types in store-schema-defaults.ts > 80:27 1`] = `"Type 'DefaultedValueFromSchema<{ status: { enum: readonly ["draft", "live"]; default: "archived"; }; }, "status">' does not satisfy the expected type '"draft" | "live"'."`;
 
 exports[`Types in ui-react.tsx > 137:31 1`] = `"Property 't2' does not exist on type 'Tables<{ readonly t0: { readonly c0: { readonly type: "number"; }; }; readonly t1: { readonly c1: { readonly type: "number"; }; readonly c1d: { readonly type: "string"; readonly default: ""; }; }; }, false>'."`;
 

test/unit/core/types/store-schema-defaults.ts

@@ -1,4 +1,3 @@
-// Store schema default types
 // NB: an exclamation mark after a line visually indicates an expected TS error
 import {createStore as createStoreWithoutSchemas} from 'tinybase';
 import {createMergeableStore} from 'tinybase/mergeable-store/with-schemas';