@teleporthq/teleport-plugin-next-data-source 0.43.55 → 0.43.57

package/dist/esm/loading-state.js

@@ -1,4 +1,14 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import * as types from '@babel/types';
+import { findCachedFetchNetworkChain } from './cache/ast';
 export function getLoadingStateVars(index) {
     return {
         isFetchingVar: "ds_".concat(index, "_isFetching"),
@@ -56,13 +66,75 @@ dataProvider, vars) {
         return false;
     }
     var fetchArrow = findMemoizedFetchDataArrow(fetchDataAttr);
-    if (!fetchArrow || fetchArrow.body.type !== 'CallExpression') {
+    if (!fetchArrow) {
+        return false;
+    }
+    if (fetchArrow.body.type === 'CallExpression') {
+        fetchArrow.body = buildTrackedFetchBody(fetchArrow.body, vars);
+    }
+    else if (fetchArrow.body.type === 'BlockStatement') {
+        if (!injectTrackingIntoCachedBody(fetchArrow.body, vars)) {
+            return false;
+        }
+    }
+    else {
         return false;
     }
-    fetchArrow.body = buildTrackedFetchBody(fetchArrow.body, vars);
     setPersistDataDuringLoading(attributes, vars);
     return true;
 }
+/**
+ * Adds the in-flight bookkeeping to a CACHED `fetchData` body.
+ *
+ * The body already returns early with `Promise.resolve(hit)` on a cache hit, so
+ * the tracking is attached to the network chain BELOW that — never to the early
+ * return. That is the whole point: a hit must not raise `isFetching`, because
+ * `persistDataDuringLoading={!isFetching}` would then drop the provider into its
+ * loading slot for a frame and produce exactly the skeleton flash the cache
+ * exists to remove.
+ *
+ * Returns `false` when the body is not the shape this module knows how to wrap,
+ * so the caller emits no state declarations rather than half-wiring it.
+ */
+function injectTrackingIntoCachedBody(body, vars) {
+    var _a;
+    // Idempotent: a second pass over the same AST must not double-count.
+    if (containsIdentifier(body, vars.setIsFetchingVar)) {
+        return false;
+    }
+    var networkChain = findCachedFetchNetworkChain(body);
+    if (!networkChain) {
+        return false;
+    }
+    var tracked = buildTrackedFetchBody(networkChain.statement.argument, vars);
+    (_a = body.body).splice.apply(_a, __spreadArray([networkChain.index, 1], tracked.body, false));
+    return true;
+}
+// tslint:disable-next-line:no-any
+function containsIdentifier(node, name) {
+    if (!node || typeof node !== 'object') {
+        return false;
+    }
+    if (node.type === 'Identifier' && node.name === name) {
+        return true;
+    }
+    for (var _i = 0, _a = Object.keys(node); _i < _a.length; _i++) {
+        var key = _a[_i];
+        if (key === 'loc' || key === 'start' || key === 'end') {
+            continue;
+        }
+        var value = node[key];
+        if (Array.isArray(value)) {
+            if (value.some(function (entry) { return containsIdentifier(entry, name); })) {
+                return true;
+            }
+        }
+        else if (value && typeof value === 'object' && containsIdentifier(value, name)) {
+            return true;
+        }
+    }
+    return false;
+}
 // tslint:disable-next-line:no-any
 function findAttribute(attributes, name) {
     return attributes.find(

package/dist/esm/loading-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading-state.js","sourceRoot":"","sources":["../../src/loading-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAsErC,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,OAAO;QACL,aAAa,EAAE,aAAM,KAAK,gBAAa;QACvC,gBAAgB,EAAE,gBAAS,KAAK,gBAAa;QAC7C,cAAc,EAAE,aAAM,KAAK,qBAAkB;KAC9C,CAAA;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAsB;IAClE,OAAO;QACL,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE;YACjC,KAAK,CAAC,kBAAkB,CACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EACrC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5E;SACF,CAAC;QACF,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE;YACjC,KAAK,CAAC,kBAAkB,CACtB,KAAK,CAAC,YAAY,CAAC;gBACjB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC;gBACpC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;aACxC,CAAC,EACF,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAClF;SACF,CAAC;KACH,CAAA;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,+BAA+B;AAC7C,kCAAkC;AAClC,YAAiB,EACjB,IAAsB;;IAEtB,IAAM,UAAU,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAc,0CAAE,UAAU,CAAA;IAC3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC9B,OAAO,KAAK,CAAA;KACb;IAED,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE;QAC/C,OAAO,KAAK,CAAA;KACb;IAED,IAAM,aAAa,GAAG,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;IAC5D,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,KAAK,CAAA;KACb;IAED,IAAM,UAAU,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAA;IAC5D,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QAC5D,OAAO,KAAK,CAAA;KACb;IAED,UAAU,CAAC,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE9D,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAE7C,OAAO,IAAI,CAAA;AACb,CAAC;AAED,kCAAkC;AAClC,SAAS,aAAa,CAAC,UAAiB,EAAE,IAAY;IACpD,OAAO,UAAU,CAAC,IAAI;IACpB,kCAAkC;IAClC,UAAC,IAAS,YAAK,OAAA,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,cAAc,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,IAAI,CAAA,EAAA,CACzE,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAS,0BAA0B,CACjC,SAA6B;;IAE7B,IAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;IAC7B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,EAAE;QACrD,OAAO,SAAS,CAAA;KACjB;IAED,IAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;IACnC,IACE,UAAU,CAAC,IAAI,KAAK,gBAAgB;QACpC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;QACvC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa;QACxC,CAAA,MAAA,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,0CAAE,IAAI,MAAK,yBAAyB,EAC3D;QACA,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,CAAkC,CAAA;AACjE,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,SAAS,qBAAqB,CAC5B,eAAiC,EACjC,IAAsB;IAEtB,IAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAC1C,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EACrC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAC5B,CAAA;IAED,IAAM,aAAa,GAAG,KAAK,CAAC,uBAAuB,CACjD,EAAE,EACF,KAAK,CAAC,cAAc,CAAC;QACnB,KAAK,CAAC,mBAAmB,CACvB,KAAK,CAAC,oBAAoB,CACxB,IAAI,EACJ,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EACpC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CACxB,CACF;QACD,KAAK,CAAC,WAAW,CACf,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAC3F,KAAK,CAAC,cAAc,CAAC;YACnB,KAAK,CAAC,mBAAmB,CACvB,KAAK,CAAC,oBAAoB,CACxB,GAAG,EACH,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EACpC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CACxB,CACF;YACD,KAAK,CAAC,mBAAmB,CACvB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBAC5D,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;aAC5B,CAAC,CACH;SACF,CAAC,CACH;KACF,CAAC,CACH,CAAA;IAED,OAAO,KAAK,CAAC,cAAc,CAAC;QAC1B,KAAK,CAAC,mBAAmB,CACvB,KAAK,CAAC,oBAAoB,CACxB,IAAI,EACJ,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EACpC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CACxB,CACF;QACD,KAAK,CAAC,mBAAmB,CACvB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAC5F;QACD,KAAK,CAAC,eAAe,CACnB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE;YACzF,aAAa;SACd,CAAC,CACH;KACF,CAAC,CAAA;AACJ,CAAC;AAED,mFAAmF;AACnF,kCAAkC;AAClC,SAAS,2BAA2B,CAAC,UAAiB,EAAE,IAAsB;IAC5E,IAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAClC,KAAK,CAAC,aAAa,CAAC,0BAA0B,CAAC,EAC/C,KAAK,CAAC,sBAAsB,CAC1B,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CACvE,CACF,CAAA;IAED,IAAM,aAAa,GAAG,UAAU,CAAC,SAAS;IACxC,kCAAkC;IAClC,UAAC,IAAS,YAAK,OAAA,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,cAAc,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,0BAA0B,CAAA,EAAA,CAC/F,CAAA;IAED,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;QACxB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC1B,OAAM;KACP;IAED,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;AACvC,CAAC"}
+{"version":3,"file":"loading-state.js","sourceRoot":"","sources":["../../src/loading-state.ts"],"names":[],"mappings":"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"}

package/dist/esm/pagination-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagination-plugin.d.ts","sourceRoot":"","sources":["../../src/pagination-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAIvB,MAAM,4BAA4B,CAAA;AA+tBnC,eAAO,MAAM,qCAAqC,EAAE,sBAAsB,CAAC,EAAE,CAy3B5E,CAAA"}
+{"version":3,"file":"pagination-plugin.d.ts","sourceRoot":"","sources":["../../src/pagination-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAGvB,MAAM,4BAA4B,CAAA;AAivBnC,eAAO,MAAM,qCAAqC,EAAE,sBAAsB,CAAC,EAAE,CAi6B5E,CAAA"}

package/dist/esm/pagination-plugin.js

@@ -37,13 +37,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { ChunkType, FileType, } from '@teleporthq/teleport-types';
 import * as types from '@babel/types';
 import { parseExpression } from '@babel/parser';
-import { StringUtils } from '@teleporthq/teleport-shared';
+import { ASTStatementOrder, StringUtils } from '@teleporthq/teleport-shared';
 import { ASTUtils, URLSearchParamSync } from '@teleporthq/teleport-plugin-common';
 import { generateSafeFileName } from './utils';
 import { generateDataSourceFetcherWithCore } from './data-source-fetchers';
+import { buildProductTransformOptions, } from './transformations';
 import { appendSortsParam, extractDynamicSort } from './sort-utils';
 import { appendFiltersParam, pushStateIdsAsDeps, pushPropIdsAsDeps } from './filter-utils';
 import { applyLoadingStateToDataProvider, buildLoadingStateDeclarations, getLoadingStateVars, } from './loading-state';
+import { mergeServerCacheOptions, resolveCacheFromRepeaterContent } from './cache/config';
+import { buildCacheHydrationEffect, buildCacheStoreThen, buildCachedFetchBody, buildCachedParamsDeclarations, registerCacheClientImports, } from './cache/ast';
 // tslint:disable-next-line:no-any
 function parseSearchDefaultValue(raw) {
     if (!raw || typeof raw !== 'object') {
@@ -419,6 +422,7 @@ function buildStateRegistry(uidlNode) {
                     filterStateIds: filterStateIds,
                     filterPropIds: filterPropIds,
                     filterUrlSearchParamKeys: filterUrlSearchParamKeys,
+                    cache: resolveCacheFromRepeaterContent(content.cache, parentDataSource.resourceDef),
                     category: 'plain',
                 };
                 // Determine category
@@ -552,9 +556,9 @@ function pushSearchUrlSyncEffects(effectStatements, usage, vars) {
 // ==================== MAIN PLUGIN ====================
 export var createNextArrayMapperPaginationPlugin = function () {
     var paginationPlugin = function (structure) { return __awaiter(void 0, void 0, void 0, function () {
-        var uidl, chunks, dependencies, options, componentChunk, variableDeclaration, declarator, arrowFunction, blockStatement, registry, getStaticPropsChunk, isPage, stateDeclarations, effectStatements, needsUseRouter, hasRouterDecl, returnIndex, insertIndex, dataProviders, dataProvidersWithRepeaters, usageIndexByDataSourceId, loadingStateDeclarations, dataProvidersWithoutRepeaters, searchInputs, searchEnabledUsages, paginationNodes, paginatedUsages;
-        var _a;
-        return __generator(this, function (_b) {
+        var uidl, chunks, dependencies, options, componentChunk, variableDeclaration, declarator, arrowFunction, blockStatement, registry, getStaticPropsChunk, isPage, stateDeclarations, effectStatements, needsUseRouter, hasRouterDecl, returnIndex, insertIndex, dataProviders, dataProvidersWithRepeaters, usageIndexByDataSourceId, loadingStateDeclarations, cacheDeclarations, sharedOptions, cachedScopes, dataProvidersWithoutRepeaters, searchInputs, searchEnabledUsages, paginationNodes, paginatedUsages;
+        var _a, _b;
+        return __generator(this, function (_c) {
             uidl = structure.uidl, chunks = structure.chunks, dependencies = structure.dependencies, options = structure.options;
             componentChunk = chunks.find(function (chunk) { return chunk.name === 'jsx-component'; });
             if (!componentChunk || componentChunk.type !== ChunkType.AST) {
@@ -916,8 +920,9 @@ export var createNextArrayMapperPaginationPlugin = function () {
             });
             usageIndexByDataSourceId = new Map();
             loadingStateDeclarations = [];
+            cacheDeclarations = [];
             dataProvidersWithRepeaters.forEach(function (dp) {
-                var _a, _b, _c;
+                var _a, _b;
                 var nameAttr = dp.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'name'; });
                 if (!((_b = (_a = nameAttr === null || nameAttr === void 0 ? void 0 : nameAttr.value) === null || _a === void 0 ? void 0 : _a.expression) === null || _b === void 0 ? void 0 : _b.value)) {
                     return;
@@ -935,13 +940,13 @@ export var createNextArrayMapperPaginationPlugin = function () {
                 var fileName = generateSafeFileName(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
                 // Update DataProvider based on category
                 if (usage.category === 'paginated+search') {
-                    updateDataProviderForPaginatedSearch(dp, usage, vars, fileName);
+                    updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDeclarations);
                 }
                 else if (usage.category === 'paginated-only') {
-                    updateDataProviderForPaginationOnly(dp, usage, vars, fileName);
+                    updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations);
                 }
                 else if (usage.category === 'search-only') {
-                    updateDataProviderForSearchOnly(dp, usage, vars, fileName);
+                    updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations);
                 }
                 else if (usage.category === 'plain') {
                     updateDataProviderForPlain(dp, fileName, usage);
@@ -955,12 +960,37 @@ export var createNextArrayMapperPaginationPlugin = function () {
                     loadingStateDeclarations.push.apply(loadingStateDeclarations, buildLoadingStateDeclarations(loadingVars));
                 }
                 // Create API route for all categories (including 'plain' for components)
-                ensureAPIRouteExists(options.extractedResources, usage, options.dataSources, (_c = options.ecommerceSettings) === null || _c === void 0 ? void 0 : _c.categories);
+                ensureAPIRouteExists(options.extractedResources, usage, options.dataSources, buildProductTransformOptions(options));
             });
+            sharedOptions = options;
+            if (!sharedOptions.serverCacheByFile) {
+                sharedOptions.serverCacheByFile = new Map();
+            }
+            applyServerCacheToDataSourceModules(options.extractedResources, registry, options.dataSources, buildProductTransformOptions(options), sharedOptions.serverCacheByFile);
             // Declare the loading-state hooks alongside the other data-source state, at
             // the top of the component body. Unconditional and in a fixed order, so the
             // hook order stays stable across renders.
             loadingStateDeclarations.reverse().forEach(function (s) { return blockStatement.body.unshift(s); });
+            cachedScopes = Array.from(new Set(registry.usages
+                .filter(function (usage) { var _a; return (_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client; })
+                .map(function (usage) { return usage.cache.scope; })));
+            if (cacheDeclarations.length || cachedScopes.length) {
+                // One effect per page covering every scope on it: flips the hydration
+                // latch, then asks once whether any of this page's tables changed while
+                // the visitor was away. Without it a browser serving everything from its
+                // own cache would never learn about a write at all. It has to land
+                // BEFORE the component's `return` — a plain `push` at this point in the
+                // pipeline appends after it, where React never registers the hook.
+                ASTStatementOrder.insertStatementsBeforeReturn(blockStatement, [
+                    buildCacheHydrationEffect(cachedScopes),
+                ]);
+                // `ds_N_params` / `ds_N_cached` read the `ds_N_state` hooks declared
+                // above, so they are placed at the earliest point where everything they
+                // reference is already in scope — never blindly at the top, which is
+                // exactly the `Cannot access 'ds_0_state' before initialization` crash.
+                ASTStatementOrder.insertStatementsAfterDependencies(blockStatement, cacheDeclarations);
+                registerCacheClientImports(dependencies, (_a = uidl.outputOptions) === null || _a === void 0 ? void 0 : _a.folderPath);
+            }
             dataProvidersWithoutRepeaters = dataProviders.filter(function (dp) {
                 var hasRepeater = findArrayMapperRenderPropInDataProvider(dp) !== undefined;
                 return !hasRepeater;
@@ -992,7 +1022,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             });
             // STEP 6: Update getStaticProps if this is a page
             if (isPage) {
-                updateGetStaticProps(chunks, registry, dependencies, (_a = uidl.outputOptions) === null || _a === void 0 ? void 0 : _a.folderPath);
+                updateGetStaticProps(chunks, registry, dependencies, (_b = uidl.outputOptions) === null || _b === void 0 ? void 0 : _b.folderPath);
             }
             return [2 /*return*/, structure];
         });
@@ -1160,7 +1190,40 @@ function findAllPaginationNodesInJSX(blockStatement) {
     traverse(blockStatement);
     return results;
 }
-function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
+/**
+ * Emits the provider's `params` and, for a cached mapper, the peek beside it.
+ *
+ * An uncached mapper keeps the inline `params={useMemo(...)}` it has always had,
+ * byte for byte. A cached one hoists that memo into a component const so the
+ * peek can depend on the same object identity instead of rebuilding it.
+ *
+ * Returns the identifier holding the peeked rows, or `undefined` when this
+ * mapper does not cache.
+ */
+function pushParamsAttribute(
+// tslint:disable-next-line:no-any
+dp, usage, paramsProps, memoDeps, cacheDeclarations) {
+    var _a;
+    var paramsMemo = types.callExpression(types.identifier('useMemo'), [
+        types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
+        types.arrayExpression(memoDeps),
+    ]);
+    // A state-bound sort deliberately suppresses `initialData` (see the comment at
+    // the call site): the prefetch ran without sort params, so reusing anything on
+    // mount would mask the current sort. The cache peek is `initialData` by
+    // another name, so it has to be suppressed for exactly the same reason.
+    var cache = ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) && !usage.dynamicSort ? usage.cache : undefined;
+    if (!cache) {
+        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(paramsMemo)));
+        return undefined;
+    }
+    var hoisted = buildCachedParamsDeclarations({ index: usage.index, paramsMemo: paramsMemo, cache: cache });
+    cacheDeclarations.push.apply(cacheDeclarations, hoisted.declarations);
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.identifier(hoisted.paramsIdentifier))));
+    return hoisted.cachedIdentifier;
+}
+function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDeclarations) {
+    var _a;
     var attrs = dp.openingElement.attributes;
     // Remove existing params, key, initialData, fetchData, persistDataDuringLoading
     dp.openingElement.attributes = attrs.filter(function (attr) {
@@ -1189,10 +1252,7 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
         pushStateIdsAsDeps(memoDeps, seenDeps, usage.dynamicSort.depStateIds);
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
-    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
-        types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
-        types.arrayExpression(memoDeps),
-    ]))));
+    var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. Skip the server-prefetched data entirely when a dynamic
     // state-bound sort is active — the prefetch ran without sort parameters, so
     // reusing it would mask the current sort state AND cause DataProvider to skip
@@ -1201,7 +1261,7 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
     // refetch via the useMemo params dependency chain.
     if (!usage.dynamicSort) {
         var initialDataCondition = wrapInitialDataWithUrlFilterGuard(types.logicalExpression('&&', types.binaryExpression('===', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page')), types.numericLiteral(1)), types.unaryExpression('!', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')), true)), usage);
-        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(initialDataCondition, types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(initialDataCondition, types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), cachedInitialData ? types.identifier(cachedInitialData) : types.identifier('undefined')))));
     }
     // Add key. Sort is intentionally NOT part of the key — a key change would
     // remount the DataProvider, and a fresh mount re-arms the internal
@@ -1220,11 +1280,12 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
         types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')),
     ]))));
     // Add fetchData
-    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName, ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined));
     // Add persistDataDuringLoading
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForPaginationOnly(dp, usage, vars, fileName) {
+function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations) {
+    var _a;
     var attrs = dp.openingElement.attributes;
     dp.openingElement.attributes = attrs.filter(function (attr) {
         var _a;
@@ -1249,14 +1310,11 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName) {
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
     // Add params
-    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
-        types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
-        types.arrayExpression(memoDeps),
-    ]))));
+    var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. See paginated+search updater for why we skip prefetch
     // reuse when a dynamic state-bound sort is active.
     if (!usage.dynamicSort) {
-        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(wrapInitialDataWithUrlFilterGuard(types.binaryExpression('===', types.identifier(vars.pageStateVar), types.numericLiteral(1)), usage), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(wrapInitialDataWithUrlFilterGuard(types.binaryExpression('===', types.identifier(vars.pageStateVar), types.numericLiteral(1)), usage), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), cachedInitialData ? types.identifier(cachedInitialData) : types.identifier('undefined')))));
     }
     // Add key — sort is intentionally NOT included; see paginated+search updater.
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(types.templateLiteral([
@@ -1267,10 +1325,11 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName) {
         types.templateElement({ raw: '', cooked: '' }),
     ], [types.identifier(vars.pageStateVar)]))));
     // Add fetchData
-    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName, ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined));
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
+function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations) {
+    var _a;
     var attrs = dp.openingElement.attributes;
     dp.openingElement.attributes = attrs.filter(function (attr) {
         var _a;
@@ -1296,14 +1355,11 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
         pushStateIdsAsDeps(memoDeps, seenDeps, usage.dynamicSort.depStateIds);
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
-    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
-        types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
-        types.arrayExpression(memoDeps),
-    ]))));
+    var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. See paginated+search updater for why we skip prefetch
     // reuse when a dynamic state-bound sort is active.
     if (!usage.dynamicSort) {
-        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(wrapInitialDataWithUrlFilterGuard(types.unaryExpression('!', types.identifier(vars.debouncedSearchQueryVar), true), usage), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+        dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(wrapInitialDataWithUrlFilterGuard(types.unaryExpression('!', types.identifier(vars.debouncedSearchQueryVar), true), usage), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), cachedInitialData ? types.identifier(cachedInitialData) : types.identifier('undefined')))));
     }
     // Add key — sort is intentionally NOT included; see paginated+search updater.
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(types.templateLiteral([
@@ -1311,16 +1367,23 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
         types.templateElement({ raw: '', cooked: '' }),
     ], [types.identifier(vars.debouncedSearchQueryVar)]))));
     // Add fetchData
-    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName, ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined));
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
 function updateDataProviderForPlain(dp, fileName, usage) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var attrs = dp.openingElement.attributes;
+    var clientCache = ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined;
     // Check if fetchData already exists
     var hasFetchData = attrs.some(function (attr) { var _a; return attr.type === 'JSXAttribute' && ((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name) === 'fetchData'; });
-    // If no fetchData, add it
-    if (!hasFetchData) {
+    if (clientCache) {
+        // A plain provider may already carry the UNMEMOIZED fetcher `utils.ts`
+        // emits. Caching has to replace it rather than skip: the memoized form is
+        // what both the cache peek and the in-flight tracking are attached to.
+        dp.openingElement.attributes = attrs.filter(function (attr) { var _a; return !(attr.type === 'JSXAttribute' && ((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name) === 'fetchData'); });
+        dp.openingElement.attributes.push(createFetchDataAttribute(fileName, clientCache));
+    }
+    else if (!hasFetchData) {
         attrs.push(createFetchDataAttribute(fileName));
     }
     // Check if persistDataDuringLoading already exists
@@ -1336,14 +1399,14 @@ function updateDataProviderForPlain(dp, fileName, usage) {
     }
     var paramsAttr = attrs[paramsAttrIndex];
     // Check if params is already wrapped in useMemo
-    if (((_a = paramsAttr.value) === null || _a === void 0 ? void 0 : _a.type) === 'JSXExpressionContainer' &&
+    if (((_b = paramsAttr.value) === null || _b === void 0 ? void 0 : _b.type) === 'JSXExpressionContainer' &&
         paramsAttr.value.expression.type === 'CallExpression' &&
-        ((_b = paramsAttr.value.expression.callee) === null || _b === void 0 ? void 0 : _b.name) === 'useMemo') {
+        ((_c = paramsAttr.value.expression.callee) === null || _c === void 0 ? void 0 : _c.name) === 'useMemo') {
         return;
     }
     // Get the current params value expression
     var paramsExpression = null;
-    if (((_c = paramsAttr.value) === null || _c === void 0 ? void 0 : _c.type) === 'JSXExpressionContainer') {
+    if (((_d = paramsAttr.value) === null || _d === void 0 ? void 0 : _d.type) === 'JSXExpressionContainer') {
         paramsExpression = paramsAttr.value.expression;
     }
     if (!paramsExpression) {
@@ -1395,32 +1458,32 @@ function stabilizeDataProviderWithoutRepeater(dp) {
     // Replace the params attribute
     attrs[paramsAttrIndex] = types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(memoizedParams));
 }
-function createFetchDataAttribute(fileName) {
-    return types.jsxAttribute(types.jsxIdentifier('fetchData'), types.jsxExpressionContainer(types.callExpression(types.identifier('useCallback'), [
-        types.arrowFunctionExpression([types.identifier('params')], types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
-            types.templateLiteral([
-                types.templateElement({
-                    raw: "/api/".concat(fileName, "?"),
-                    cooked: "/api/".concat(fileName, "?"),
-                }),
-                types.templateElement({ raw: '', cooked: '' }),
-            ], [
-                types.newExpression(types.identifier('URLSearchParams'), [
-                    types.identifier('params'),
-                ]),
-            ]),
-            types.objectExpression([
-                types.objectProperty(types.identifier('headers'), types.objectExpression([
-                    types.objectProperty(types.stringLiteral('Content-Type'), types.stringLiteral('application/json')),
-                ])),
-            ]),
-        ]), types.identifier('then')), [
-            types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
-        ]), types.identifier('then')), [
-            types.arrowFunctionExpression([types.identifier('response')], types.optionalMemberExpression(types.identifier('response'), types.identifier('data'), false, true)),
-        ])),
-        types.arrayExpression([]),
-    ])));
+function createFetchDataAttribute(fileName, cache) {
+    var fetchCall = types.callExpression(types.identifier('fetch'), [
+        types.templateLiteral([
+            types.templateElement({
+                raw: "/api/".concat(fileName, "?"),
+                cooked: "/api/".concat(fileName, "?"),
+            }),
+            types.templateElement({ raw: '', cooked: '' }),
+        ], [types.newExpression(types.identifier('URLSearchParams'), [types.identifier('params')])]),
+        types.objectExpression([
+            types.objectProperty(types.identifier('headers'), types.objectExpression([
+                types.objectProperty(types.stringLiteral('Content-Type'), types.stringLiteral('application/json')),
+            ])),
+        ]),
+    ]);
+    var parsedJson = types.callExpression(types.memberExpression(fetchCall, types.identifier('then')), [
+        types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
+    ]);
+    // The uncached tail is left exactly as it has always been emitted, so a
+    // project that does not cache produces byte-identical output.
+    var uncachedTail = types.arrowFunctionExpression([types.identifier('response')], types.optionalMemberExpression(types.identifier('response'), types.identifier('data'), false, true));
+    var networkChain = types.callExpression(types.memberExpression(parsedJson, types.identifier('then')), [cache ? buildCacheStoreThen(cache) : uncachedTail]);
+    var arrow = cache
+        ? types.arrowFunctionExpression([types.identifier('params')], buildCachedFetchBody(networkChain, cache))
+        : types.arrowFunctionExpression([types.identifier('params')], networkChain);
+    return types.jsxAttribute(types.jsxIdentifier('fetchData'), types.jsxExpressionContainer(types.callExpression(types.identifier('useCallback'), [arrow, types.arrayExpression([])])));
 }
 function wireSearchInput(inputNode, vars) {
     // Remove existing onChange and value
@@ -1527,7 +1590,84 @@ function wirePaginationButtons(paginationNode, usage, vars) {
         }
     }
 }
-function ensureAPIRouteExists(extractedResources, usage, dataSources, categories) {
+/**
+ * Applies the SERVER cache to the generated data-source modules, once, after
+ * every provider has been visited.
+ *
+ * A post-pass rather than a parameter to `ensureAPIRouteExists` because four
+ * different places race to create `utils/data-sources/<file>.js` — the
+ * getStaticProps path, the component path, the client-API path and this plugin —
+ * and whichever wins would otherwise decide whether the file is cached. Since
+ * the generator is deterministic, regenerating the winner with the cache options
+ * is order-independent and cannot half-apply.
+ *
+ * The config is merged per FILE, not per mapper: one module serves every mapper
+ * reading that `(type, table, dataSourceId)` triple, so two mappers on two pages
+ * have to agree — and the fresher one wins (see `mergeServerCacheOptions`).
+ */
+function applyServerCacheToDataSourceModules(
+// tslint:disable-next-line:no-any
+extractedResources, registry, 
+// tslint:disable-next-line:no-any
+dataSources, transformOptions, 
+// Accumulated across every page/component this generation has processed. The
+// module is shared project-wide, so merging only the CURRENT page's usages
+// would let page ORDER decide the TTL: a page asking for 300s processed after
+// one asking for 60s would widen the window the second page was configured
+// with. Carried on the shared options object so the merge stays global.
+accumulator) {
+    if (transformOptions === void 0) { transformOptions = {}; }
+    var byFileName = accumulator !== null && accumulator !== void 0 ? accumulator : new Map();
+    registry.usages.forEach(function (usage) {
+        var _a;
+        if (!((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.server)) {
+            return;
+        }
+        var fileName = generateSafeFileName(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
+        var bucket = byFileName.get(fileName) || { usage: usage, entries: [] };
+        bucket.entries.push({
+            scope: usage.cache.scope,
+            ttlSeconds: usage.cache.ttlSeconds,
+            sMaxAge: usage.cache.sMaxAge,
+            staleWhileRevalidate: usage.cache.staleWhileRevalidate,
+        });
+        byFileName.set(fileName, bucket);
+    });
+    byFileName.forEach(function (bucket, fileName) {
+        var cacheOptions = mergeServerCacheOptions(bucket.entries);
+        if (!cacheOptions) {
+            return;
+        }
+        var dataSource = dataSources[bucket.usage.resourceDefinition.dataSourceId];
+        if (!dataSource) {
+            return;
+        }
+        var tableName = bucket.usage.resourceDefinition.tableName || 'data';
+        var utilsKey = "utils/".concat(fileName);
+        var apiKey = "api/".concat(fileName);
+        try {
+            if (extractedResources[utilsKey]) {
+                extractedResources[utilsKey].content = generateDataSourceFetcherWithCore(dataSource, tableName, false, transformOptions, cacheOptions);
+                return;
+            }
+            // The variant that inlines the whole fetcher straight into `pages/api`
+            // instead of re-exporting a utils module. Detected by content rather than
+            // by which code path produced it, so a future fifth emitter is covered too.
+            var apiEntry = extractedResources[apiKey];
+            if (apiEntry &&
+                typeof apiEntry.content === 'string' &&
+                apiEntry.content.includes('async function handler')) {
+                apiEntry.content = generateDataSourceFetcherWithCore(dataSource, tableName, true, transformOptions, cacheOptions);
+            }
+        }
+        catch (error) {
+            // Caching must never be the reason a project fails to generate; the
+            // uncached module that is already in place stays exactly as it was.
+        }
+    });
+}
+function ensureAPIRouteExists(extractedResources, usage, dataSources, transformOptions) {
+    if (transformOptions === void 0) { transformOptions = {}; }
     // Generate file name for the API route
     var fileName = generateSafeFileName(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
     // Check if the utils data source file exists - if not, create it
@@ -1537,7 +1677,7 @@ function ensureAPIRouteExists(extractedResources, usage, dataSources, categories
         if (dataSource) {
             try {
                 // Generate the utils file with fetchData, fetchCount, handler, and getCount
-                var fetcherCode = generateDataSourceFetcherWithCore(dataSource, usage.resourceDefinition.tableName || 'data', false, categories);
+                var fetcherCode = generateDataSourceFetcherWithCore(dataSource, usage.resourceDefinition.tableName || 'data', false, transformOptions);
                 extractedResources["utils/".concat(fileName)] = {
                     fileName: fileName,
                     fileType: FileType.JS,