@mearie/core 0.3.0 → 0.4.0

package/dist/index.cjs

@@ -501,18 +501,6 @@ const mergeFields = (target, source) => {
 const makeFieldKeyFromArgs = (field, args) => {
 	return `${field}@${args && Object.keys(args).length > 0 ? stringify(args) : "{}"}`;
 };
-/**
-* Converts an EntityId to an EntityKey.
-* @internal
-* @param typename - The GraphQL typename of the entity.
-* @param id - The entity identifier (string, number, or composite key record).
-* @param keyFields - Optional ordered list of key field names for composite keys.
-* @returns An EntityKey.
-*/
-const resolveEntityKey = (typename, id, keyFields) => {
-	if (typeof id === "string" || typeof id === "number") return makeEntityKey(typename, [id]);
-	return makeEntityKey(typename, keyFields ? keyFields.map((f) => id[f]) : Object.values(id));
-};
 
 //#endregion
 //#region src/cache/normalize.ts
@@ -762,8 +750,8 @@ var Cache = class {
 	*/
 	invalidate(...targets) {
 		const subscriptions = /* @__PURE__ */ new Set();
-		for (const target of targets) if (target.__typename === "Query") if ("field" in target) {
-			const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
+		for (const target of targets) if (target.__typename === "Query") if ("$field" in target) {
+			const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
 			const depKey = makeDependencyKey(RootFieldKey, fieldKey);
 			this.#stale.add(depKey);
 			this.#collectSubscriptions(RootFieldKey, fieldKey, subscriptions);
@@ -771,32 +759,39 @@ var Cache = class {
 			this.#stale.add(RootFieldKey);
 			this.#collectSubscriptions(RootFieldKey, void 0, subscriptions);
 		}
-		else if ("id" in target) {
-			const entityKey = resolveEntityKey(target.__typename, target.id, this.#schemaMeta.entities[target.__typename]?.keyFields);
-			if ("field" in target) {
-				const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
-				this.#stale.add(makeDependencyKey(entityKey, fieldKey));
-				this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
-			} else {
-				this.#stale.add(entityKey);
-				this.#collectSubscriptions(entityKey, void 0, subscriptions);
-			}
-		} else {
-			const prefix = `${target.__typename}:`;
-			for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
-				const entityKey = key;
-				if ("field" in target) {
-					const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
+		else {
+			const keyFields = this.#schemaMeta.entities[target.__typename]?.keyFields;
+			if (keyFields && this.#hasKeyFields(target, keyFields)) {
+				const keyValues = keyFields.map((f) => target[f]);
+				const entityKey = makeEntityKey(target.__typename, keyValues);
+				if ("$field" in target) {
+					const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
 					this.#stale.add(makeDependencyKey(entityKey, fieldKey));
 					this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
 				} else {
 					this.#stale.add(entityKey);
 					this.#collectSubscriptions(entityKey, void 0, subscriptions);
 				}
+			} else {
+				const prefix = `${target.__typename}:`;
+				for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
+					const entityKey = key;
+					if ("$field" in target) {
+						const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
+						this.#stale.add(makeDependencyKey(entityKey, fieldKey));
+						this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
+					} else {
+						this.#stale.add(entityKey);
+						this.#collectSubscriptions(entityKey, void 0, subscriptions);
+					}
+				}
 			}
 		}
 		for (const subscription of subscriptions) subscription.listener();
 	}
+	#hasKeyFields(target, keyFields) {
+		return keyFields.every((f) => f in target);
+	}
 	#collectSubscriptions(storageKey, fieldKey, out) {
 		if (fieldKey === void 0) {
 			const prefix = `${storageKey}.`;

package/dist/index.d.cts

@@ -106,9 +106,9 @@ declare class Client<TMeta extends SchemaMeta$1 = SchemaMeta$1> {
    * @param name - The exchange name.
    * @returns The extension object provided by the exchange.
    */
-  extension<TName extends keyof ExchangeExtensionMap>(name: TName): ExchangeExtensionMap[TName];
+  extension<TName extends keyof ExchangeExtensionMap<TMeta>>(name: TName): ExchangeExtensionMap<TMeta>[TName];
   extension(name: string): unknown;
-  maybeExtension<TName extends keyof ExchangeExtensionMap>(name: TName): ExchangeExtensionMap[TName] | undefined;
+  maybeExtension<TName extends keyof ExchangeExtensionMap<TMeta>>(name: TName): ExchangeExtensionMap<TMeta>[TName] | undefined;
   maybeExtension(name: string): unknown;
   dispose(): void;
 }
@@ -143,14 +143,14 @@ type ExchangeInput<TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   client: Client<TMeta>;
 };
 type ExchangeIO = (operations: Source<Operation>) => Source<OperationResult>;
-interface ExchangeExtensionMap {}
-type ExchangeResult<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = {
+interface ExchangeExtensionMap<TMeta extends SchemaMeta$1 = SchemaMeta$1> {}
+type ExchangeResult<TName extends keyof ExchangeExtensionMap | (string & {}) = string, TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   name: TName;
   io: ExchangeIO;
-} & (TName extends keyof ExchangeExtensionMap ? {
-  extension: ExchangeExtensionMap[TName];
+} & (TName extends keyof ExchangeExtensionMap<TMeta> ? {
+  extension: ExchangeExtensionMap<TMeta>[TName];
 } : {});
-type Exchange<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = <TMeta extends SchemaMeta$1 = SchemaMeta$1>(input: ExchangeInput<TMeta>) => ExchangeResult<TName>;
+type Exchange<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = <TMeta extends SchemaMeta$1 = SchemaMeta$1>(input: ExchangeInput<TMeta>) => ExchangeResult<TName, TMeta>;
 //#endregion
 //#region src/exchanges/http.d.ts
 declare module '@mearie/core' {
@@ -195,34 +195,38 @@ declare module '@mearie/core' {
 declare const dedupExchange: () => Exchange;
 //#endregion
 //#region src/cache/types.d.ts
-/**
- * Identifier for a single entity, supporting simple or composite keys.
- */
-type EntityId = string | number | Record<string, string | number>;
-/**
- * Target specification for cache invalidation operations.
- */
-type InvalidateTarget = {
-  __typename: string;
-  id: EntityId;
-} | {
-  __typename: string;
-  id: EntityId;
-  field: string;
-  args?: Record<string, unknown>;
-} | {
+type EntityTypes<TMeta extends SchemaMeta$1> = NonNullable<TMeta[' $entityTypes']>;
+type QueryFields<TMeta extends SchemaMeta$1> = NonNullable<TMeta[' $queryFields']>;
+type KeyFieldsOf<E> = E extends {
+  keyFields: infer KF;
+} ? KF : Record<string, unknown>;
+type FieldsOf<E> = E extends {
+  fields: infer F extends string;
+} ? F : string;
+type EntityInvalidateTarget<Entities> = { [K in keyof Entities & string]: {
+  __typename: K;
+} | ({
+  __typename: K;
+} & KeyFieldsOf<Entities[K]>) | {
+  __typename: K;
+  $field: FieldsOf<Entities[K]>;
+  $args?: Record<string, unknown>;
+} | ({
+  __typename: K;
+  $field: FieldsOf<Entities[K]>;
+  $args?: Record<string, unknown>;
+} & KeyFieldsOf<Entities[K]>) }[keyof Entities & string];
+type QueryInvalidateTarget<QF extends string> = {
   __typename: 'Query';
 } | {
   __typename: 'Query';
-  field: string;
-  args?: Record<string, unknown>;
-} | {
-  __typename: string;
-} | {
-  __typename: string;
-  field: string;
-  args?: Record<string, unknown>;
+  $field: QF;
+  $args?: Record<string, unknown>;
 };
+/**
+ * Target specification for cache invalidation operations.
+ */
+type InvalidateTarget<TMeta extends SchemaMeta$1 = SchemaMeta$1> = EntityInvalidateTarget<EntityTypes<TMeta>> | QueryInvalidateTarget<QueryFields<TMeta>>;
 /**
  * Opaque type representing a serializable cache snapshot.
  */
@@ -232,17 +236,17 @@ type CacheSnapshot = {
 /**
  * Operations available for programmatic cache manipulation.
  */
-type CacheOperations = {
+type CacheOperations<TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   extract(): CacheSnapshot;
   hydrate(data: CacheSnapshot): void;
-  invalidate(...targets: InvalidateTarget[]): void;
+  invalidate(...targets: InvalidateTarget<TMeta>[]): void;
   clear(): void;
 };
 //#endregion
 //#region src/exchanges/cache.d.ts
 declare module '@mearie/core' {
-  interface ExchangeExtensionMap {
-    cache: CacheOperations;
+  interface ExchangeExtensionMap<TMeta extends SchemaMeta$1> {
+    cache: CacheOperations<TMeta>;
   }
   interface OperationResultMetadataMap {
     cache?: {
@@ -351,4 +355,4 @@ declare class RequiredFieldError extends Error {
  */
 declare const stringify: (value: unknown) => string;
 //#endregion
-export { AggregatedError, type Artifact, type ArtifactKind, type CacheOptions, type CacheSnapshot, Client, type ClientOptions, type DataOf, type Exchange, ExchangeError, type ExchangeErrorExtensionsMap, type ExchangeExtensionMap, type ExchangeIO, type ExchangeResult, type FragmentOptions, type FragmentRefs, GraphQLError, type HttpOptions, type MutationOptions, type Operation, type OperationError, type OperationMetadata, type OperationMetadataMap, type OperationResult, type OperationResultMetadataMap, type QueryOptions, type RequiredAction, RequiredFieldError, type RetryOptions, type SchemaMeta, type SubscriptionClient, type SubscriptionExchangeOptions, type SubscriptionOptions, type VariablesOf, cacheExchange, createClient, dedupExchange, fragmentExchange, httpExchange, isAggregatedError, isExchangeError, isGraphQLError, requiredExchange, retryExchange, stringify, subscriptionExchange };
+export { AggregatedError, type Artifact, type ArtifactKind, type CacheOperations, type CacheOptions, type CacheSnapshot, Client, type ClientOptions, type DataOf, type Exchange, ExchangeError, type ExchangeErrorExtensionsMap, type ExchangeExtensionMap, type ExchangeIO, type ExchangeResult, type FragmentOptions, type FragmentRefs, GraphQLError, type HttpOptions, type InvalidateTarget, type MutationOptions, type Operation, type OperationError, type OperationMetadata, type OperationMetadataMap, type OperationResult, type OperationResultMetadataMap, type QueryOptions, type RequiredAction, RequiredFieldError, type RetryOptions, type SchemaMeta, type SubscriptionClient, type SubscriptionExchangeOptions, type SubscriptionOptions, type VariablesOf, cacheExchange, createClient, dedupExchange, fragmentExchange, httpExchange, isAggregatedError, isExchangeError, isGraphQLError, requiredExchange, retryExchange, stringify, subscriptionExchange };

package/dist/index.d.mts

@@ -106,9 +106,9 @@ declare class Client<TMeta extends SchemaMeta$1 = SchemaMeta$1> {
    * @param name - The exchange name.
    * @returns The extension object provided by the exchange.
    */
-  extension<TName extends keyof ExchangeExtensionMap>(name: TName): ExchangeExtensionMap[TName];
+  extension<TName extends keyof ExchangeExtensionMap<TMeta>>(name: TName): ExchangeExtensionMap<TMeta>[TName];
   extension(name: string): unknown;
-  maybeExtension<TName extends keyof ExchangeExtensionMap>(name: TName): ExchangeExtensionMap[TName] | undefined;
+  maybeExtension<TName extends keyof ExchangeExtensionMap<TMeta>>(name: TName): ExchangeExtensionMap<TMeta>[TName] | undefined;
   maybeExtension(name: string): unknown;
   dispose(): void;
 }
@@ -143,14 +143,14 @@ type ExchangeInput<TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   client: Client<TMeta>;
 };
 type ExchangeIO = (operations: Source<Operation>) => Source<OperationResult>;
-interface ExchangeExtensionMap {}
-type ExchangeResult<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = {
+interface ExchangeExtensionMap<TMeta extends SchemaMeta$1 = SchemaMeta$1> {}
+type ExchangeResult<TName extends keyof ExchangeExtensionMap | (string & {}) = string, TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   name: TName;
   io: ExchangeIO;
-} & (TName extends keyof ExchangeExtensionMap ? {
-  extension: ExchangeExtensionMap[TName];
+} & (TName extends keyof ExchangeExtensionMap<TMeta> ? {
+  extension: ExchangeExtensionMap<TMeta>[TName];
 } : {});
-type Exchange<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = <TMeta extends SchemaMeta$1 = SchemaMeta$1>(input: ExchangeInput<TMeta>) => ExchangeResult<TName>;
+type Exchange<TName extends keyof ExchangeExtensionMap | (string & {}) = string> = <TMeta extends SchemaMeta$1 = SchemaMeta$1>(input: ExchangeInput<TMeta>) => ExchangeResult<TName, TMeta>;
 //#endregion
 //#region src/exchanges/http.d.ts
 declare module '@mearie/core' {
@@ -195,34 +195,38 @@ declare module '@mearie/core' {
 declare const dedupExchange: () => Exchange;
 //#endregion
 //#region src/cache/types.d.ts
-/**
- * Identifier for a single entity, supporting simple or composite keys.
- */
-type EntityId = string | number | Record<string, string | number>;
-/**
- * Target specification for cache invalidation operations.
- */
-type InvalidateTarget = {
-  __typename: string;
-  id: EntityId;
-} | {
-  __typename: string;
-  id: EntityId;
-  field: string;
-  args?: Record<string, unknown>;
-} | {
+type EntityTypes<TMeta extends SchemaMeta$1> = NonNullable<TMeta[' $entityTypes']>;
+type QueryFields<TMeta extends SchemaMeta$1> = NonNullable<TMeta[' $queryFields']>;
+type KeyFieldsOf<E> = E extends {
+  keyFields: infer KF;
+} ? KF : Record<string, unknown>;
+type FieldsOf<E> = E extends {
+  fields: infer F extends string;
+} ? F : string;
+type EntityInvalidateTarget<Entities> = { [K in keyof Entities & string]: {
+  __typename: K;
+} | ({
+  __typename: K;
+} & KeyFieldsOf<Entities[K]>) | {
+  __typename: K;
+  $field: FieldsOf<Entities[K]>;
+  $args?: Record<string, unknown>;
+} | ({
+  __typename: K;
+  $field: FieldsOf<Entities[K]>;
+  $args?: Record<string, unknown>;
+} & KeyFieldsOf<Entities[K]>) }[keyof Entities & string];
+type QueryInvalidateTarget<QF extends string> = {
   __typename: 'Query';
 } | {
   __typename: 'Query';
-  field: string;
-  args?: Record<string, unknown>;
-} | {
-  __typename: string;
-} | {
-  __typename: string;
-  field: string;
-  args?: Record<string, unknown>;
+  $field: QF;
+  $args?: Record<string, unknown>;
 };
+/**
+ * Target specification for cache invalidation operations.
+ */
+type InvalidateTarget<TMeta extends SchemaMeta$1 = SchemaMeta$1> = EntityInvalidateTarget<EntityTypes<TMeta>> | QueryInvalidateTarget<QueryFields<TMeta>>;
 /**
  * Opaque type representing a serializable cache snapshot.
  */
@@ -232,17 +236,17 @@ type CacheSnapshot = {
 /**
  * Operations available for programmatic cache manipulation.
  */
-type CacheOperations = {
+type CacheOperations<TMeta extends SchemaMeta$1 = SchemaMeta$1> = {
   extract(): CacheSnapshot;
   hydrate(data: CacheSnapshot): void;
-  invalidate(...targets: InvalidateTarget[]): void;
+  invalidate(...targets: InvalidateTarget<TMeta>[]): void;
   clear(): void;
 };
 //#endregion
 //#region src/exchanges/cache.d.ts
 declare module '@mearie/core' {
-  interface ExchangeExtensionMap {
-    cache: CacheOperations;
+  interface ExchangeExtensionMap<TMeta extends SchemaMeta$1> {
+    cache: CacheOperations<TMeta>;
   }
   interface OperationResultMetadataMap {
     cache?: {
@@ -351,4 +355,4 @@ declare class RequiredFieldError extends Error {
  */
 declare const stringify: (value: unknown) => string;
 //#endregion
-export { AggregatedError, type Artifact, type ArtifactKind, type CacheOptions, type CacheSnapshot, Client, type ClientOptions, type DataOf, type Exchange, ExchangeError, type ExchangeErrorExtensionsMap, type ExchangeExtensionMap, type ExchangeIO, type ExchangeResult, type FragmentOptions, type FragmentRefs, GraphQLError, type HttpOptions, type MutationOptions, type Operation, type OperationError, type OperationMetadata, type OperationMetadataMap, type OperationResult, type OperationResultMetadataMap, type QueryOptions, type RequiredAction, RequiredFieldError, type RetryOptions, type SchemaMeta, type SubscriptionClient, type SubscriptionExchangeOptions, type SubscriptionOptions, type VariablesOf, cacheExchange, createClient, dedupExchange, fragmentExchange, httpExchange, isAggregatedError, isExchangeError, isGraphQLError, requiredExchange, retryExchange, stringify, subscriptionExchange };
+export { AggregatedError, type Artifact, type ArtifactKind, type CacheOperations, type CacheOptions, type CacheSnapshot, Client, type ClientOptions, type DataOf, type Exchange, ExchangeError, type ExchangeErrorExtensionsMap, type ExchangeExtensionMap, type ExchangeIO, type ExchangeResult, type FragmentOptions, type FragmentRefs, GraphQLError, type HttpOptions, type InvalidateTarget, type MutationOptions, type Operation, type OperationError, type OperationMetadata, type OperationMetadataMap, type OperationResult, type OperationResultMetadataMap, type QueryOptions, type RequiredAction, RequiredFieldError, type RetryOptions, type SchemaMeta, type SubscriptionClient, type SubscriptionExchangeOptions, type SubscriptionOptions, type VariablesOf, cacheExchange, createClient, dedupExchange, fragmentExchange, httpExchange, isAggregatedError, isExchangeError, isGraphQLError, requiredExchange, retryExchange, stringify, subscriptionExchange };

package/dist/index.mjs

@@ -500,18 +500,6 @@ const mergeFields = (target, source) => {
 const makeFieldKeyFromArgs = (field, args) => {
 	return `${field}@${args && Object.keys(args).length > 0 ? stringify(args) : "{}"}`;
 };
-/**
-* Converts an EntityId to an EntityKey.
-* @internal
-* @param typename - The GraphQL typename of the entity.
-* @param id - The entity identifier (string, number, or composite key record).
-* @param keyFields - Optional ordered list of key field names for composite keys.
-* @returns An EntityKey.
-*/
-const resolveEntityKey = (typename, id, keyFields) => {
-	if (typeof id === "string" || typeof id === "number") return makeEntityKey(typename, [id]);
-	return makeEntityKey(typename, keyFields ? keyFields.map((f) => id[f]) : Object.values(id));
-};
 
 //#endregion
 //#region src/cache/normalize.ts
@@ -761,8 +749,8 @@ var Cache = class {
 	*/
 	invalidate(...targets) {
 		const subscriptions = /* @__PURE__ */ new Set();
-		for (const target of targets) if (target.__typename === "Query") if ("field" in target) {
-			const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
+		for (const target of targets) if (target.__typename === "Query") if ("$field" in target) {
+			const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
 			const depKey = makeDependencyKey(RootFieldKey, fieldKey);
 			this.#stale.add(depKey);
 			this.#collectSubscriptions(RootFieldKey, fieldKey, subscriptions);
@@ -770,32 +758,39 @@ var Cache = class {
 			this.#stale.add(RootFieldKey);
 			this.#collectSubscriptions(RootFieldKey, void 0, subscriptions);
 		}
-		else if ("id" in target) {
-			const entityKey = resolveEntityKey(target.__typename, target.id, this.#schemaMeta.entities[target.__typename]?.keyFields);
-			if ("field" in target) {
-				const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
-				this.#stale.add(makeDependencyKey(entityKey, fieldKey));
-				this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
-			} else {
-				this.#stale.add(entityKey);
-				this.#collectSubscriptions(entityKey, void 0, subscriptions);
-			}
-		} else {
-			const prefix = `${target.__typename}:`;
-			for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
-				const entityKey = key;
-				if ("field" in target) {
-					const fieldKey = makeFieldKeyFromArgs(target.field, target.args);
+		else {
+			const keyFields = this.#schemaMeta.entities[target.__typename]?.keyFields;
+			if (keyFields && this.#hasKeyFields(target, keyFields)) {
+				const keyValues = keyFields.map((f) => target[f]);
+				const entityKey = makeEntityKey(target.__typename, keyValues);
+				if ("$field" in target) {
+					const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
 					this.#stale.add(makeDependencyKey(entityKey, fieldKey));
 					this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
 				} else {
 					this.#stale.add(entityKey);
 					this.#collectSubscriptions(entityKey, void 0, subscriptions);
 				}
+			} else {
+				const prefix = `${target.__typename}:`;
+				for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
+					const entityKey = key;
+					if ("$field" in target) {
+						const fieldKey = makeFieldKeyFromArgs(target.$field, target.$args);
+						this.#stale.add(makeDependencyKey(entityKey, fieldKey));
+						this.#collectSubscriptions(entityKey, fieldKey, subscriptions);
+					} else {
+						this.#stale.add(entityKey);
+						this.#collectSubscriptions(entityKey, void 0, subscriptions);
+					}
+				}
 			}
 		}
 		for (const subscription of subscriptions) subscription.listener();
 	}
+	#hasKeyFields(target, keyFields) {
+		return keyFields.every((f) => f in target);
+	}
 	#collectSubscriptions(storageKey, fieldKey, out) {
 		if (fieldKey === void 0) {
 			const prefix = `${storageKey}.`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearie/core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",
@@ -62,7 +62,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@mearie/shared": "0.2.2"
+    "@mearie/shared": "0.3.0"
   },
   "devDependencies": {
     "tsdown": "^0.20.3",