@isograph/react 0.0.0-main-6efaacee → 0.0.0-main-9e2f7149

package/dist/reader.d.ts

@@ -2,17 +2,17 @@
 import { ComponentOrFieldName, IsographEnvironment } from './IsographEnvironment';
 import { RefetchQueryNormalizationArtifact } from './entrypoint';
 import { Arguments } from './util';
-export type TopLevelReaderArtifact<TReadFromStore extends Object, TClientFieldValue, TAdditionalProps extends Record<string, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TAdditionalProps>;
+export type TopLevelReaderArtifact<TReadFromStore extends Object, TClientFieldValue, TComponentProps extends Record<string, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 export type EagerReaderArtifact<TReadFromStore extends Object, TClientFieldValue> = {
     readonly kind: 'EagerReaderArtifact';
     readonly readerAst: ReaderAst<TReadFromStore>;
     readonly resolver: (data: TReadFromStore) => TClientFieldValue;
 };
-export type ComponentReaderArtifact<TReadFromStore extends Object, TAdditionalProps extends Record<string, unknown> = Record<string, never>> = {
+export type ComponentReaderArtifact<TReadFromStore extends Object, TComponentProps extends Record<string, unknown> = Record<string, never>> = {
     readonly kind: 'ComponentReaderArtifact';
     readonly componentName: ComponentOrFieldName;
     readonly readerAst: ReaderAst<TReadFromStore>;
-    readonly resolver: (data: TReadFromStore, runtimeProps: TAdditionalProps) => React.ReactNode;
+    readonly resolver: (data: TReadFromStore, runtimeProps: TComponentProps) => React.ReactNode;
 };
 export type RefetchReaderArtifact = {
     readonly kind: 'RefetchReaderArtifact';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-6efaacee",
+  "version": "0.0.0-main-9e2f7149",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -16,8 +16,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-6efaacee",
-    "@isograph/react-disposable-state": "0.0.0-main-6efaacee",
+    "@isograph/disposable-types": "0.0.0-main-9e2f7149",
+    "@isograph/react-disposable-state": "0.0.0-main-9e2f7149",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/reader.ts

@@ -8,10 +8,10 @@ import { Arguments } from './util';
 export type TopLevelReaderArtifact<
   TReadFromStore extends Object,
   TClientFieldValue,
-  TAdditionalProps extends Record<string, never>,
+  TComponentProps extends Record<string, never>,
 > =
   | EagerReaderArtifact<TReadFromStore, TClientFieldValue>
-  | ComponentReaderArtifact<TReadFromStore, TAdditionalProps>;
+  | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 
 export type EagerReaderArtifact<
   TReadFromStore extends Object,
@@ -24,14 +24,14 @@ export type EagerReaderArtifact<
 
 export type ComponentReaderArtifact<
   TReadFromStore extends Object,
-  TAdditionalProps extends Record<string, unknown> = Record<string, never>,
+  TComponentProps extends Record<string, unknown> = Record<string, never>,
 > = {
   readonly kind: 'ComponentReaderArtifact';
   readonly componentName: ComponentOrFieldName;
   readonly readerAst: ReaderAst<TReadFromStore>;
   readonly resolver: (
     data: TReadFromStore,
-    runtimeProps: TAdditionalProps,
+    runtimeProps: TComponentProps,
   ) => React.ReactNode;
 };
 

package/src/tests/__isograph/iso.ts

@@ -11,19 +11,19 @@ import entrypoint_Query__nodeField from '../__isograph/Query/nodeField/entrypoin
 // the type of the passed-in function, which takes one parameter
 // of type TParam.
 type IdentityWithParam<TParam> = <TClientFieldReturn>(
-  x: (param: TParam) => TClientFieldReturn
+  clientField: (param: TParam) => TClientFieldReturn
 ) => (param: TParam) => TClientFieldReturn;
 
 // This is the type given it to client fields with @component.
 // This means that the type of the exported iso literal is exactly
 // the type of the passed-in function, which takes two parameters.
-// The first has type TParam, and the second has type TAdditionalProps.
+// The first has type TParam, and the second has type TComponentProps.
 //
-// TAdditionalProps becomes the types of the props you must pass
+// TComponentProps becomes the types of the props you must pass
 // whenever the @component field is rendered.
-type IdentityWithParamComponent<TParam> = <TClientFieldReturn, TAdditionalProps = Record<string, never>>(
-  x: (data: TParam, secondParam: TAdditionalProps) => TClientFieldReturn
-) => (data: TParam, secondParam: TAdditionalProps) => TClientFieldReturn;
+type IdentityWithParamComponent<TParam> = <TClientFieldReturn, TComponentProps = Record<string, never>>(
+  clientComponentField: (data: TParam, componentProps: TComponentProps) => TClientFieldReturn
+) => (data: TParam, componentProps: TComponentProps) => TClientFieldReturn;
 
 type WhitespaceCharacter = ' ' | '\t' | '\n';
 type Whitespace<In> = In extends `${WhitespaceCharacter}${infer In}`
@@ -34,7 +34,7 @@ type Whitespace<In> = In extends `${WhitespaceCharacter}${infer In}`
 // start with whitespace, followed by TString. So e.g. if we have
 // ```
 // export function iso<T>(
-//   param: T & MatchesWhitespaceAndString<'field Query.foo', T>
+//   isographLiteralText: T & MatchesWhitespaceAndString<'field Query.foo', T>
 // ): Bar;
 // ```
 // then, when you call