@isograph/react 0.0.0-main-ad45b5a6 → 0.0.0-main-e22dda26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/cache.d.ts.map +1 -1
- package/dist/core/cache.js +2 -1
- package/dist/core/entrypoint.d.ts +7 -4
- package/dist/core/entrypoint.d.ts.map +1 -1
- package/dist/core/makeNetworkRequest.d.ts.map +1 -1
- package/dist/core/makeNetworkRequest.js +4 -4
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/core/cache.ts +3 -1
- package/src/core/entrypoint.ts +7 -4
- package/src/core/makeNetworkRequest.ts +8 -4
- package/src/index.ts +1 -0
- package/src/tests/__isograph/Query/meName/entrypoint.ts +5 -2
- package/src/tests/__isograph/Query/meNameSuccessor/entrypoint.ts +5 -2
- package/src/tests/__isograph/Query/nodeField/entrypoint.ts +5 -2
- package/src/tests/garbageCollection.test.ts +1 -1
- package/src/tests/meNameSuccessor.ts +2 -1
- package/src/tests/nodeQuery.ts +1 -1
package/dist/core/cache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,WAAW,EACZ,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,MAAM,EACN,IAAI,EAGJ,KAAK,mBAAmB,EAIzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAEhB,wBAAwB,EACxB,wBAAwB,EACxB,wCAAwC,EACzC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAwB,MAAM,QAAQ,CAAC;AACtE,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAA8B,YAAY,EAAE,MAAM,SAAS,CAAC;AAInE,wBAAgB,8BAA8B,CAC5C,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,iBAAiB,EAEjB,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,GACrE,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAanE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAezC;AAED,wBAAgB,2BAA2B,CACzC,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,iBAAiB,EAEjB,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,CAAC,EACjE,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,YAAY,CAAC,EAAE,YAAY,GAC1B,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,WAAW,EACZ,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,MAAM,EACN,IAAI,EAGJ,KAAK,mBAAmB,EAIzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAEhB,wBAAwB,EACxB,wBAAwB,EACxB,wCAAwC,EACzC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAwB,MAAM,QAAQ,CAAC;AACtE,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAA8B,YAAY,EAAE,MAAM,SAAS,CAAC;AAInE,wBAAgB,8BAA8B,CAC5C,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,iBAAiB,EAEjB,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,GACrE,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAanE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAezC;AAED,wBAAgB,2BAA2B,CACzC,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,iBAAiB,EAEjB,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,CAAC,EACjE,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,YAAY,CAAC,EAAE,YAAY,GAC1B,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAiCnE;AAED,KAAK,0BAA0B,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAC5D,KAAK,oBAAoB,GACrB,0BAA0B,GAC1B,IAAI,GACJ,qBAAqB,GACrB,CAAC,qBAAqB,GAAG,IAAI,CAAC,EAAE,GAChC,CAAC,0BAA0B,GAAG,IAAI,CAAC,EAAE,CAAC;AAE1C,MAAM,MAAM,qBAAqB,GAAG;IAGlC,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,oBAAoB,CAAC;IAClD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAgB,aAAa,CAC3B,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,EAAE,qBAAqB,EACtC,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,wCAAwC,EAAE,GAC/D,GAAG,CAAC,MAAM,CAAC,CA4Bb;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,MAAM,IAAI,GACnB,MAAM,IAAI,CAOZ;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,MAAM,IAAI,GACnB,MAAM,IAAI,CAQZ;AAGD,wBAAgB,SAAS,CACvB,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAE3D,WAAW,EAAE,mBAAmB,EAChC,yBAAyB,EAAE,sBAAsB,CAAC,cAAc,CAAC,EACjE,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,GAAG,CAAC,EACzD,QAAQ,EAAE,CACR,4BAA4B,EAAE,sBAAsB,CAAC,cAAc,CAAC,KACjE,IAAI,EACT,SAAS,EAAE,SAAS,CAAC,cAAc,CAAC,GACnC,MAAM,IAAI,CAUZ;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAWf;AAsYD,wBAAgB,kBAAkB,CAChC,OAAO,EACH,wBAAwB,GACxB,wBAAwB,GACxB,iBAAiB,GACjB,iBAAiB,EACrB,SAAS,EAAE,SAAS,GACnB,MAAM,CAUR;AA0ED,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,gBAAgB,QAAQ,CAAC"}
|
package/dist/core/cache.js
CHANGED
|
@@ -54,7 +54,8 @@ function stableCopy(value) {
|
|
|
54
54
|
return stable;
|
|
55
55
|
}
|
|
56
56
|
function getOrCreateCacheForArtifact(environment, entrypoint, variables, fetchOptions) {
|
|
57
|
-
const cacheKey = entrypoint.queryText +
|
|
57
|
+
const cacheKey = entrypoint.networkRequestInfo.queryText +
|
|
58
|
+
JSON.stringify(stableCopy(variables));
|
|
58
59
|
const factory = () => {
|
|
59
60
|
var _a;
|
|
60
61
|
const shouldFetch = (_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.shouldFetch) !== null && _a !== void 0 ? _a : check_1.DEFAULT_SHOULD_FETCH_VALUE;
|
|
@@ -9,13 +9,17 @@ export type ReaderWithRefetchQueries<TReadFromStore extends {
|
|
|
9
9
|
readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
|
|
10
10
|
readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
|
|
11
11
|
};
|
|
12
|
+
export type NetworkRequestInfo = {
|
|
13
|
+
readonly kind: 'NetworkRequestInfo';
|
|
14
|
+
readonly queryText: string;
|
|
15
|
+
readonly normalizationAst: NormalizationAst;
|
|
16
|
+
};
|
|
12
17
|
export type IsographEntrypoint<TReadFromStore extends {
|
|
13
18
|
parameters: object;
|
|
14
19
|
data: object;
|
|
15
20
|
}, TClientFieldValue> = {
|
|
16
21
|
readonly kind: 'Entrypoint';
|
|
17
|
-
readonly
|
|
18
|
-
readonly normalizationAst: NormalizationAst;
|
|
22
|
+
readonly networkRequestInfo: NetworkRequestInfo;
|
|
19
23
|
readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>;
|
|
20
24
|
};
|
|
21
25
|
export type IsographEntrypointLoader<TReadFromStore extends {
|
|
@@ -47,8 +51,7 @@ export type NormalizationInlineFragment = {
|
|
|
47
51
|
};
|
|
48
52
|
export type RefetchQueryNormalizationArtifact = {
|
|
49
53
|
readonly kind: 'RefetchQuery';
|
|
50
|
-
readonly
|
|
51
|
-
readonly normalizationAst: NormalizationAst;
|
|
54
|
+
readonly networkRequestInfo: NetworkRequestInfo;
|
|
52
55
|
};
|
|
53
56
|
export type RefetchQueryNormalizationArtifactWrapper = {
|
|
54
57
|
readonly artifact: RefetchQueryNormalizationArtifact;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/core/entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,MAAM,wBAAwB,CAClC,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,iBAAiB,IACf;IACF,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAC7C,cAAc,EACd,iBAAiB,EAEjB,GAAG,CACJ,CAAC;IACF,QAAQ,CAAC,oBAAoB,EAAE,wCAAwC,EAAE,CAAC;CAC3E,CAAC;
|
|
1
|
+
{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/core/entrypoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeNetworkRequest.d.ts","sourceRoot":"","sources":["../../src/core/makeNetworkRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAClB,iCAAiC,EAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,QAAQ,EACR,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAS,WAAW,EAAE,MAAM,SAAS,CAAC;AAI7C,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,iCAAiC,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1E,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,GACvB,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"makeNetworkRequest.d.ts","sourceRoot":"","sources":["../../src/core/makeNetworkRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAClB,iCAAiC,EAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,QAAQ,EACR,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAS,WAAW,EAAE,MAAM,SAAS,CAAC;AAI7C,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,iCAAiC,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1E,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,GACvB,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAqBjD;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,iCAAiC,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1E,SAAS,EAAE,SAAS,GACnB,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CA0EjD"}
|
|
@@ -17,7 +17,7 @@ function maybeMakeNetworkRequest(environment, artifact, variables, shouldFetch)
|
|
|
17
17
|
return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
|
|
18
18
|
}
|
|
19
19
|
case 'IfNecessary': {
|
|
20
|
-
const result = (0, check_1.check)(environment, artifact.normalizationAst, variables);
|
|
20
|
+
const result = (0, check_1.check)(environment, artifact.networkRequestInfo.normalizationAst, variables);
|
|
21
21
|
if (result.kind === 'EnoughData') {
|
|
22
22
|
return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
|
|
23
23
|
}
|
|
@@ -42,7 +42,7 @@ function makeNetworkRequest(environment, artifact, variables) {
|
|
|
42
42
|
};
|
|
43
43
|
// This should be an observable, not a promise
|
|
44
44
|
const promise = environment
|
|
45
|
-
.networkFunction(artifact.queryText, variables)
|
|
45
|
+
.networkFunction(artifact.networkRequestInfo.queryText, variables)
|
|
46
46
|
.then((networkResponse) => {
|
|
47
47
|
var _a;
|
|
48
48
|
(0, logging_1.logMessage)(environment, {
|
|
@@ -57,11 +57,11 @@ function makeNetworkRequest(environment, artifact, variables) {
|
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
if (status.kind === 'UndisposedIncomplete') {
|
|
60
|
-
(0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
|
|
60
|
+
(0, cache_1.normalizeData)(environment, artifact.networkRequestInfo.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
|
|
61
61
|
? artifact.readerWithRefetchQueries.nestedRefetchQueries
|
|
62
62
|
: []);
|
|
63
63
|
const retainedQuery = {
|
|
64
|
-
normalizationAst: artifact.normalizationAst,
|
|
64
|
+
normalizationAst: artifact.networkRequestInfo.normalizationAst,
|
|
65
65
|
variables,
|
|
66
66
|
};
|
|
67
67
|
status = {
|
package/dist/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export { subscribe, normalizeData } from './core/cache';
|
|
|
4
4
|
export { makeNetworkRequest } from './core/makeNetworkRequest';
|
|
5
5
|
export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, defaultMissingFieldHandler, } from './core/IsographEnvironment';
|
|
6
6
|
export { type EagerReaderArtifact, type ComponentReaderArtifact, type RefetchReaderArtifact, type ReaderAst, type ReaderAstNode, type ReaderLinkedField, type ReaderNonLoadableResolverField, type ReaderScalarField, type TopLevelReaderArtifact, type LoadableField, type ResolverFirstParameter, } from './core/reader';
|
|
7
|
-
export { type NormalizationAst, type NormalizationAstNode, type NormalizationLinkedField, type NormalizationScalarField, type IsographEntrypoint, assertIsEntrypoint, type RefetchQueryNormalizationArtifact, type RefetchQueryNormalizationArtifactWrapper, type ExtractProps, type ExtractReadFromStore, type ExtractResolverResult, } from './core/entrypoint';
|
|
7
|
+
export { type NormalizationAst, type NormalizationAstNode, type NormalizationLinkedField, type NormalizationScalarField, type IsographEntrypoint, assertIsEntrypoint, type RefetchQueryNormalizationArtifact, type RefetchQueryNormalizationArtifactWrapper, type ExtractProps, type ExtractReadFromStore, type ExtractResolverResult, type NetworkRequestInfo, } from './core/entrypoint';
|
|
8
8
|
export { readButDoNotEvaluate } from './core/read';
|
|
9
9
|
export { type ExtractSecondParam, type CombineWithIntrinsicAttributes, type Argument, type ArgumentName, type ArgumentValue, type Arguments, } from './core/util';
|
|
10
10
|
export { type FragmentReference, type Variables, type ExtractParameters, type ExtractData, stableIdForFragmentReference, } from './core/FragmentReference';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,cAAc,EACnB,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,aAAa,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,8BAA8B,EACnC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,KAAK,iCAAiC,EACtC,KAAK,wCAAwC,EAC7C,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,cAAc,EACnB,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,aAAa,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,8BAA8B,EACnC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,KAAK,iCAAiC,EACtC,KAAK,wCAAwC,EAC7C,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,SAAS,GACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,UAAU,EACV,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,EACtB,KAAK,gCAAgC,GACtC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@isograph/react",
|
|
3
|
-
"version": "0.0.0-main-
|
|
3
|
+
"version": "0.0.0-main-e22dda26",
|
|
4
4
|
"description": "Use Isograph with React",
|
|
5
5
|
"homepage": "https://isograph.dev",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
"iso-watch": "../../target/debug/isograph_cli --config ./isograph.config.json --watch"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@isograph/disposable-types": "0.0.0-main-
|
|
23
|
-
"@isograph/react-disposable-state": "0.0.0-main-
|
|
24
|
-
"@isograph/reference-counted-pointer": "0.0.0-main-
|
|
22
|
+
"@isograph/disposable-types": "0.0.0-main-e22dda26",
|
|
23
|
+
"@isograph/react-disposable-state": "0.0.0-main-e22dda26",
|
|
24
|
+
"@isograph/reference-counted-pointer": "0.0.0-main-e22dda26"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"react": "18.3.1"
|
package/src/core/cache.ts
CHANGED
|
@@ -90,7 +90,9 @@ export function getOrCreateCacheForArtifact<
|
|
|
90
90
|
variables: ExtractParameters<TReadFromStore>,
|
|
91
91
|
fetchOptions?: FetchOptions,
|
|
92
92
|
): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>> {
|
|
93
|
-
const cacheKey =
|
|
93
|
+
const cacheKey =
|
|
94
|
+
entrypoint.networkRequestInfo.queryText +
|
|
95
|
+
JSON.stringify(stableCopy(variables));
|
|
94
96
|
const factory = () => {
|
|
95
97
|
const shouldFetch = fetchOptions?.shouldFetch ?? DEFAULT_SHOULD_FETCH_VALUE;
|
|
96
98
|
const [networkRequest, disposeNetworkRequest] = maybeMakeNetworkRequest(
|
package/src/core/entrypoint.ts
CHANGED
|
@@ -16,14 +16,18 @@ export type ReaderWithRefetchQueries<
|
|
|
16
16
|
readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
|
|
17
17
|
};
|
|
18
18
|
|
|
19
|
+
export type NetworkRequestInfo = {
|
|
20
|
+
readonly kind: 'NetworkRequestInfo';
|
|
21
|
+
readonly queryText: string;
|
|
22
|
+
readonly normalizationAst: NormalizationAst;
|
|
23
|
+
};
|
|
19
24
|
// This type should be treated as an opaque type.
|
|
20
25
|
export type IsographEntrypoint<
|
|
21
26
|
TReadFromStore extends { parameters: object; data: object },
|
|
22
27
|
TClientFieldValue,
|
|
23
28
|
> = {
|
|
24
29
|
readonly kind: 'Entrypoint';
|
|
25
|
-
readonly
|
|
26
|
-
readonly normalizationAst: NormalizationAst;
|
|
30
|
+
readonly networkRequestInfo: NetworkRequestInfo;
|
|
27
31
|
readonly readerWithRefetchQueries: ReaderWithRefetchQueries<
|
|
28
32
|
TReadFromStore,
|
|
29
33
|
TClientFieldValue
|
|
@@ -70,8 +74,7 @@ export type NormalizationInlineFragment = {
|
|
|
70
74
|
// This is more like an entrypoint, but one specifically for a refetch query/mutation
|
|
71
75
|
export type RefetchQueryNormalizationArtifact = {
|
|
72
76
|
readonly kind: 'RefetchQuery';
|
|
73
|
-
readonly
|
|
74
|
-
readonly normalizationAst: NormalizationAst;
|
|
77
|
+
readonly networkRequestInfo: NetworkRequestInfo;
|
|
75
78
|
};
|
|
76
79
|
|
|
77
80
|
// TODO rename
|
|
@@ -37,7 +37,11 @@ export function maybeMakeNetworkRequest(
|
|
|
37
37
|
return [wrapResolvedValue(undefined), () => {}];
|
|
38
38
|
}
|
|
39
39
|
case 'IfNecessary': {
|
|
40
|
-
const result = check(
|
|
40
|
+
const result = check(
|
|
41
|
+
environment,
|
|
42
|
+
artifact.networkRequestInfo.normalizationAst,
|
|
43
|
+
variables,
|
|
44
|
+
);
|
|
41
45
|
if (result.kind === 'EnoughData') {
|
|
42
46
|
return [wrapResolvedValue(undefined), () => {}];
|
|
43
47
|
} else {
|
|
@@ -68,7 +72,7 @@ export function makeNetworkRequest(
|
|
|
68
72
|
};
|
|
69
73
|
// This should be an observable, not a promise
|
|
70
74
|
const promise = environment
|
|
71
|
-
.networkFunction(artifact.queryText, variables)
|
|
75
|
+
.networkFunction(artifact.networkRequestInfo.queryText, variables)
|
|
72
76
|
.then((networkResponse) => {
|
|
73
77
|
logMessage(environment, {
|
|
74
78
|
kind: 'ReceivedNetworkResponse',
|
|
@@ -86,7 +90,7 @@ export function makeNetworkRequest(
|
|
|
86
90
|
if (status.kind === 'UndisposedIncomplete') {
|
|
87
91
|
normalizeData(
|
|
88
92
|
environment,
|
|
89
|
-
artifact.normalizationAst,
|
|
93
|
+
artifact.networkRequestInfo.normalizationAst,
|
|
90
94
|
networkResponse.data ?? {},
|
|
91
95
|
variables,
|
|
92
96
|
artifact.kind === 'Entrypoint'
|
|
@@ -94,7 +98,7 @@ export function makeNetworkRequest(
|
|
|
94
98
|
: [],
|
|
95
99
|
);
|
|
96
100
|
const retainedQuery = {
|
|
97
|
-
normalizationAst: artifact.normalizationAst,
|
|
101
|
+
normalizationAst: artifact.networkRequestInfo.normalizationAst,
|
|
98
102
|
variables,
|
|
99
103
|
};
|
|
100
104
|
status = {
|
package/src/index.ts
CHANGED
|
@@ -36,8 +36,11 @@ const artifact: IsographEntrypoint<
|
|
|
36
36
|
Query__meName__output_type
|
|
37
37
|
> = {
|
|
38
38
|
kind: "Entrypoint",
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
networkRequestInfo: {
|
|
40
|
+
kind: "NetworkRequestInfo",
|
|
41
|
+
queryText,
|
|
42
|
+
normalizationAst,
|
|
43
|
+
},
|
|
41
44
|
readerWithRefetchQueries: {
|
|
42
45
|
kind: "ReaderWithRefetchQueries",
|
|
43
46
|
nestedRefetchQueries,
|
|
@@ -74,8 +74,11 @@ const artifact: IsographEntrypoint<
|
|
|
74
74
|
Query__meNameSuccessor__output_type
|
|
75
75
|
> = {
|
|
76
76
|
kind: "Entrypoint",
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
networkRequestInfo: {
|
|
78
|
+
kind: "NetworkRequestInfo",
|
|
79
|
+
queryText,
|
|
80
|
+
normalizationAst,
|
|
81
|
+
},
|
|
79
82
|
readerWithRefetchQueries: {
|
|
80
83
|
kind: "ReaderWithRefetchQueries",
|
|
81
84
|
nestedRefetchQueries,
|
|
@@ -41,8 +41,11 @@ const artifact: IsographEntrypoint<
|
|
|
41
41
|
Query__nodeField__output_type
|
|
42
42
|
> = {
|
|
43
43
|
kind: "Entrypoint",
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
networkRequestInfo: {
|
|
45
|
+
kind: "NetworkRequestInfo",
|
|
46
|
+
queryText,
|
|
47
|
+
normalizationAst,
|
|
48
|
+
},
|
|
46
49
|
readerWithRefetchQueries: {
|
|
47
50
|
kind: "ReaderWithRefetchQueries",
|
|
48
51
|
nestedRefetchQueries,
|
|
@@ -49,7 +49,7 @@ export const meNameField = iso(`
|
|
|
49
49
|
import { meNameSuccessorRetainedQuery } from './meNameSuccessor';
|
|
50
50
|
const meNameEntrypoint = iso(`entrypoint Query.meName`);
|
|
51
51
|
const meNameRetainedQuery = {
|
|
52
|
-
normalizationAst: meNameEntrypoint.normalizationAst,
|
|
52
|
+
normalizationAst: meNameEntrypoint.networkRequestInfo.normalizationAst,
|
|
53
53
|
variables: {},
|
|
54
54
|
};
|
|
55
55
|
|
|
@@ -14,6 +14,7 @@ export const meNameField = iso(`
|
|
|
14
14
|
`)(() => {});
|
|
15
15
|
const meNameSuccessorEntrypoint = iso(`entrypoint Query.meNameSuccessor`);
|
|
16
16
|
export const meNameSuccessorRetainedQuery = {
|
|
17
|
-
normalizationAst:
|
|
17
|
+
normalizationAst:
|
|
18
|
+
meNameSuccessorEntrypoint.networkRequestInfo.normalizationAst,
|
|
18
19
|
variables: {},
|
|
19
20
|
};
|
package/src/tests/nodeQuery.ts
CHANGED
|
@@ -12,6 +12,6 @@ export const nodeField = iso(`
|
|
|
12
12
|
`)(() => {});
|
|
13
13
|
const nodeFieldEntrypoint = iso(`entrypoint Query.nodeField`);
|
|
14
14
|
export const nodeFieldRetainedQuery: RetainedQuery = {
|
|
15
|
-
normalizationAst: nodeFieldEntrypoint.normalizationAst,
|
|
15
|
+
normalizationAst: nodeFieldEntrypoint.networkRequestInfo.normalizationAst,
|
|
16
16
|
variables: { id: 0 },
|
|
17
17
|
};
|