roar

client/packages/admin/src/index.ts

@@ -45,6 +45,8 @@ import {
   type InstaQLEntity,
   type InstaQLResult,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 } from "@instantdb/core";
 
 import version from "./version";
@@ -951,4 +953,6 @@ export {
   type InstaQLEntity,
   type InstaQLResult,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 };

client/packages/core/src/index.ts

@@ -62,6 +62,8 @@ import type {
   ValueTypes,
   InstantUnknownSchema,
   BackwardsCompatibleSchema,
+  UpdateParams,
+  LinkParams,
 } from "./schemaTypes";
 
 const defaultOpenDevtool = true;
@@ -730,4 +732,6 @@ export {
   type IInstantDatabase,
   type BackwardsCompatibleSchema,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 };

client/packages/core/src/instatx.ts

@@ -1,8 +1,6 @@
 import type {
-  DataAttrDef,
   IContainEntitiesAndLinks,
-  InstantGraph,
-  LinkAttrDef,
+  LinkParams,
   UpdateParams,
 } from "./schemaTypes";
 
@@ -14,20 +12,6 @@ type LookupRef = [string, any];
 type Lookup = string;
 export type Op = [Action, EType, Id | LookupRef, Args];
 
-type LinkParams<
-  Schema extends IContainEntitiesAndLinks<any, any>,
-  EntityName extends keyof Schema["entities"],
-> = {
-  [LinkName in keyof Schema["entities"][EntityName]["links"]]?: Schema["entities"][EntityName]["links"][LinkName] extends LinkAttrDef<
-    infer Cardinality,
-    any
-  >
-    ? Cardinality extends "one"
-      ? string
-      : string | string[]
-    : never;
-} & (Schema extends InstantGraph<any, any> ? {} : { [attribute: string]: any });
-
 export interface TransactionChunk<
   Schema extends IContainEntitiesAndLinks<any, any>,
   EntityName extends keyof Schema["entities"],

client/packages/core/src/schemaTypes.ts

@@ -466,3 +466,17 @@ export type UpdateParams<
     Schema["entities"][EntityName]["attrs"][AttrName]
   >;
 };
+
+export type LinkParams<
+  Schema extends IContainEntitiesAndLinks<any, any>,
+  EntityName extends keyof Schema["entities"],
+> = {
+  [LinkName in keyof Schema["entities"][EntityName]["links"]]?: Schema["entities"][EntityName]["links"][LinkName] extends LinkAttrDef<
+    infer Cardinality,
+    any
+  >
+    ? Cardinality extends "one"
+      ? string
+      : string | string[]
+    : never;
+};

client/packages/react-native/src/index.ts

@@ -51,6 +51,8 @@ import {
   type InstantSchemaDef,
   type InstantUnknownSchema,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 } from "@instantdb/core";
 
 /**
@@ -147,4 +149,6 @@ export {
   type InstantUnknownSchema,
   type BackwardsCompatibleSchema,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 };

client/packages/react/src/index.ts

@@ -40,6 +40,8 @@ import {
   type InstantSchemaDef,
   type BackwardsCompatibleSchema,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 } from "@instantdb/core";
 
 import InstantReactAbstractDatabase from "./InstantReactAbstractDatabase";
@@ -95,4 +97,6 @@ export {
   type InstantSchemaDef,
   type BackwardsCompatibleSchema,
   type InstantRules,
+  type UpdateParams,
+  type LinkParams,
 };

client/sandbox/strong-init-vite/src/typescript_test_abstract.tsx

@@ -1,4 +1,4 @@
-import { i, id, init, InstaQLEntity } from "@instantdb/admin";
+import { i, id, init, InstaQLEntity, UpdateParams } from "@instantdb/admin";
 
 const _schema = i.schema({ entities: { users: i.entity({ email: i.string() }) } });
 type _AppSchema = typeof _schema; 
@@ -13,22 +13,27 @@ const db = init({
 
 type Collection = keyof typeof schema.entities;
 
-type Entity<T extends Collection> = InstaQLEntity<typeof schema, T, {}>;
+type EntityUpdate<T extends Collection> = UpdateParams<typeof schema, T>;
 
 export const newEntity = async <T extends Collection>(
   type: T,
-  props: Omit<Entity<T>, "id">,
+  props: EntityUpdate<T>,
 ) => {
   const theId = id();
   await db.transact(db.tx[type][theId].update(props));
   return theId;
 };
 
 // seems good
-const alice = await newEntity("users", { email: "[email protected]" });
+const existing_attr_works = await newEntity("users", { email: "[email protected]" });
 
-// Should be a typing error but is not
-const bob = await newEntity("users", { blabla: "[email protected]" });
+// @ts-expect-error
+const non_existing_attr_errors = await newEntity("users", { blabla: "[email protected]" });
 
-// Should be a typing error but is not
-const eve = await newEntity("users", { email: 123 });
+// @ts-expect-error
+const wrong_type_errors = await newEntity("users", { email: 123 });
+
+// to silence ts warnings
+existing_attr_works;
+non_existing_attr_errors;
+wrong_type_errors;