@next-core/runtime 1.71.1 → 1.71.3

package/dist/esm/internal/data/resolveData.js

@@ -39,11 +39,11 @@ export async function resolveData(resolveConf, runtimeContext, resolveOptions) {
   } : null;
   const [providerBrick, actualArgs, actualContractConf] = await Promise.all([getProviderBrick(useProvider), asyncComputeRealValue(args, runtimeContext), asyncComputeRealValue(contractConf, runtimeContext)]);
 
-  // `clearResolveCache` maybe cleared during the above promise being
+  // `clearResolveCache` maybe called during the above promise being
   // fulfilled, so we manually mark it as stale for this case.
   const renderId = resolveOptions === null || resolveOptions === void 0 ? void 0 : resolveOptions.renderId;
-  const stale = !!renderId && renderId !== _internalApiGetRenderId();
-  const promise = resolveByProvider(providerBrick, useProvider, method, actualContractConf !== null && actualContractConf !== void 0 && actualContractConf.params ? actualContractConf : actualArgs !== null && actualArgs !== void 0 ? actualArgs : [], resolveOptions, args, stale);
+  const isStale = () => !!renderId && renderId !== _internalApiGetRenderId();
+  const promise = resolveByProvider(providerBrick, useProvider, method, actualContractConf !== null && actualContractConf !== void 0 && actualContractConf.params ? actualContractConf : actualArgs !== null && actualArgs !== void 0 ? actualArgs : [], resolveOptions, args, isStale);
   let {
     transform
   } = resolveConf;
@@ -79,7 +79,7 @@ export async function resolveData(resolveConf, runtimeContext, resolveOptions) {
 export function clearResolveCache() {
   cache.clear();
 }
-export async function resolveByProvider(brick, useProvider, method, args, options, originalArgs, stale) {
+export async function resolveByProvider(brick, useProvider, method, args, options, originalArgs, isStale) {
   let cacheKey;
   try {
     // `args` may contain circular references, which makes
@@ -108,7 +108,7 @@ export async function resolveByProvider(brick, useProvider, method, args, option
       const finalArgs = hooks !== null && hooks !== void 0 && (_hooks$flowApi2 = hooks.flowApi) !== null && _hooks$flowApi2 !== void 0 && _hooks$flowApi2.isFlowApiProvider(useProvider) ? await hooks.flowApi.getArgsOfFlowApi(useProvider, args, method) : args;
       return brick[method](...finalArgs);
     })();
-    if (!stale) {
+    if (!(isStale !== null && isStale !== void 0 && isStale())) {
       cache.set(cacheKey, promise);
     }
   }

package/dist/esm/internal/data/resolveData.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveData.js","names":["asyncComputeRealValue","getProviderBrick","_internalApiGetRenderId","hooks","markAsComputed","get","isStrictMode","warnAboutStrictMode","cache","Map","resolveData","resolveConf","runtimeContext","resolveOptions","_hooks$flowApi","useProvider","method","args","params","options","filename","onReject","provider","legacyProvider","field","legacyField","Error","hasLegacyField","undefined","strict","contractConf","Array","isArray","flowApi","isFlowApiProvider","providerBrick","actualArgs","actualContractConf","Promise","all","renderId","stale","promise","resolveByProvider","transform","data","value","error","isHandleRejectByTransform","clearResolveCache","clear","brick","originalArgs","cacheKey","JSON","stringify","e","_hooks$flowApi2","finalArgs","getArgsOfFlowApi","set"],"sources":["../../../../src/internal/data/resolveData.ts"],"sourcesContent":["import type {\n  HandleReject,\n  HandleRejectByTransform,\n  ResolveConf,\n  UseProviderContractConf,\n} from \"@next-core/types\";\nimport { asyncComputeRealValue } from \"../compute/computeRealValue.js\";\nimport { getProviderBrick } from \"./getProviderBrick.js\";\nimport type { RuntimeContext } from \"../interfaces.js\";\nimport { _internalApiGetRenderId, hooks } from \"../Runtime.js\";\nimport { markAsComputed } from \"../compute/markAsComputed.js\";\nimport { get } from \"lodash\";\nimport { isStrictMode, warnAboutStrictMode } from \"../../isStrictMode.js\";\n\nconst cache = new Map<string, Promise<unknown>>();\n\nexport interface ResolveOptions {\n  /**\n   * Cache mode of resolve.\n   *\n   * See https://developer.mozilla.org/en-US/docs/Web/API/Request/cache\n   *\n   * - `default`: Looks for a matching cache.\n   * - `reload`: Without looking for a matching cache.\n   */\n  cache?: \"default\" | \"reload\";\n  renderId?: string;\n}\n\nexport async function resolveData(\n  resolveConf: ResolveConf,\n  runtimeContext: RuntimeContext,\n  resolveOptions?: ResolveOptions\n) {\n  const {\n    useProvider,\n    method = \"resolve\",\n    args,\n    params,\n    options,\n    filename,\n    onReject,\n  } = resolveConf;\n\n  const { provider: legacyProvider, field: legacyField } = resolveConf as {\n    provider?: string;\n    field?: string | string[];\n  };\n  if (legacyProvider && !useProvider) {\n    throw new Error(\n      `You're using \"provider: ${legacyProvider}\" which is dropped in v3, please use \"useProvider\" instead`\n    );\n  }\n\n  const hasLegacyField = legacyField !== null && legacyField !== undefined;\n  if (hasLegacyField) {\n    const strict = isStrictMode();\n    warnAboutStrictMode(strict, \"`resolve.field`\");\n    // istanbul ignore next\n    if (strict) {\n      throw new Error(\"Using deprecated `resolve.field`\");\n    }\n  }\n\n  const contractConf =\n    !Array.isArray(args) &&\n    params &&\n    hooks?.flowApi?.isFlowApiProvider(useProvider)\n      ? ({ params, options, filename } as UseProviderContractConf)\n      : null;\n\n  const [providerBrick, actualArgs, actualContractConf] = await Promise.all([\n    getProviderBrick(useProvider) as unknown as Promise<\n      Record<string, Function>\n    >,\n    asyncComputeRealValue(args, runtimeContext) as Promise<\n      unknown[] | undefined\n    >,\n    asyncComputeRealValue(\n      contractConf,\n      runtimeContext\n    ) as Promise<UseProviderContractConf | null>,\n  ]);\n\n  // `clearResolveCache` maybe cleared during the above promise being\n  // fulfilled, so we manually mark it as stale for this case.\n  const renderId = resolveOptions?.renderId;\n  const stale = !!renderId && renderId !== _internalApiGetRenderId();\n\n  const promise = resolveByProvider(\n    providerBrick,\n    useProvider,\n    method,\n    actualContractConf?.params ? actualContractConf : (actualArgs ?? []),\n    resolveOptions,\n    args,\n    stale\n  );\n\n  let { transform } = resolveConf;\n  let data: unknown;\n\n  try {\n    const value = await promise;\n    data = hasLegacyField ? get(value, legacyField) : value;\n    // The fetched data and its inner objects should never be *injected* again.\n    markAsComputed(data);\n  } catch (error) {\n    if (isHandleRejectByTransform(onReject)) {\n      transform = onReject.transform;\n      data = error;\n    } else {\n      throw error;\n    }\n  }\n\n  if (!transform) {\n    return data;\n  }\n\n  // Keep backward compatibility of string transform.\n  if (typeof transform === \"string\") {\n    return { [transform]: data };\n  }\n\n  return asyncComputeRealValue(transform, { ...runtimeContext, data });\n}\n\nexport function clearResolveCache() {\n  cache.clear();\n}\n\nexport async function resolveByProvider(\n  brick: Record<string, Function>,\n  useProvider: string,\n  method: string,\n  args: unknown[] | UseProviderContractConf,\n  options?: ResolveOptions,\n  originalArgs?: unknown[],\n  stale?: boolean\n) {\n  let cacheKey: string;\n  try {\n    // `args` may contain circular references, which makes\n    // JSON stringify failed, thus we fallback to original args.\n    cacheKey = JSON.stringify({\n      useProvider,\n      method,\n      args,\n    });\n  } catch (e) {\n    if (!originalArgs) {\n      throw e;\n    }\n    cacheKey = JSON.stringify({\n      useProvider,\n      method,\n      originalArgs,\n    });\n  }\n\n  let promise: Promise<unknown> | undefined;\n  if (options?.cache !== \"reload\") {\n    promise = cache.get(cacheKey);\n  }\n  if (!promise) {\n    promise = (async () => {\n      const finalArgs = hooks?.flowApi?.isFlowApiProvider(useProvider)\n        ? await hooks.flowApi.getArgsOfFlowApi(useProvider, args, method)\n        : (args as unknown[]);\n      return brick[method](...finalArgs);\n    })();\n\n    if (!stale) {\n      cache.set(cacheKey, promise);\n    }\n  }\n\n  return promise;\n}\n\nfunction isHandleRejectByTransform(\n  onReject: HandleReject | undefined\n): onReject is HandleRejectByTransform {\n  return !!(onReject as HandleRejectByTransform)?.transform;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"resolveData.js","names":["asyncComputeRealValue","getProviderBrick","_internalApiGetRenderId","hooks","markAsComputed","get","isStrictMode","warnAboutStrictMode","cache","Map","resolveData","resolveConf","runtimeContext","resolveOptions","_hooks$flowApi","useProvider","method","args","params","options","filename","onReject","provider","legacyProvider","field","legacyField","Error","hasLegacyField","undefined","strict","contractConf","Array","isArray","flowApi","isFlowApiProvider","providerBrick","actualArgs","actualContractConf","Promise","all","renderId","isStale","promise","resolveByProvider","transform","data","value","error","isHandleRejectByTransform","clearResolveCache","clear","brick","originalArgs","cacheKey","JSON","stringify","e","_hooks$flowApi2","finalArgs","getArgsOfFlowApi","set"],"sources":["../../../../src/internal/data/resolveData.ts"],"sourcesContent":["import type {\n  HandleReject,\n  HandleRejectByTransform,\n  ResolveConf,\n  UseProviderContractConf,\n} from \"@next-core/types\";\nimport { asyncComputeRealValue } from \"../compute/computeRealValue.js\";\nimport { getProviderBrick } from \"./getProviderBrick.js\";\nimport type { RuntimeContext } from \"../interfaces.js\";\nimport { _internalApiGetRenderId, hooks } from \"../Runtime.js\";\nimport { markAsComputed } from \"../compute/markAsComputed.js\";\nimport { get } from \"lodash\";\nimport { isStrictMode, warnAboutStrictMode } from \"../../isStrictMode.js\";\n\nconst cache = new Map<string, Promise<unknown>>();\n\nexport interface ResolveOptions {\n  /**\n   * Cache mode of resolve.\n   *\n   * See https://developer.mozilla.org/en-US/docs/Web/API/Request/cache\n   *\n   * - `default`: Looks for a matching cache.\n   * - `reload`: Without looking for a matching cache.\n   */\n  cache?: \"default\" | \"reload\";\n  renderId?: string;\n}\n\nexport async function resolveData(\n  resolveConf: ResolveConf,\n  runtimeContext: RuntimeContext,\n  resolveOptions?: ResolveOptions\n) {\n  const {\n    useProvider,\n    method = \"resolve\",\n    args,\n    params,\n    options,\n    filename,\n    onReject,\n  } = resolveConf;\n\n  const { provider: legacyProvider, field: legacyField } = resolveConf as {\n    provider?: string;\n    field?: string | string[];\n  };\n  if (legacyProvider && !useProvider) {\n    throw new Error(\n      `You're using \"provider: ${legacyProvider}\" which is dropped in v3, please use \"useProvider\" instead`\n    );\n  }\n\n  const hasLegacyField = legacyField !== null && legacyField !== undefined;\n  if (hasLegacyField) {\n    const strict = isStrictMode();\n    warnAboutStrictMode(strict, \"`resolve.field`\");\n    // istanbul ignore next\n    if (strict) {\n      throw new Error(\"Using deprecated `resolve.field`\");\n    }\n  }\n\n  const contractConf =\n    !Array.isArray(args) &&\n    params &&\n    hooks?.flowApi?.isFlowApiProvider(useProvider)\n      ? ({ params, options, filename } as UseProviderContractConf)\n      : null;\n\n  const [providerBrick, actualArgs, actualContractConf] = await Promise.all([\n    getProviderBrick(useProvider) as unknown as Promise<\n      Record<string, Function>\n    >,\n    asyncComputeRealValue(args, runtimeContext) as Promise<\n      unknown[] | undefined\n    >,\n    asyncComputeRealValue(\n      contractConf,\n      runtimeContext\n    ) as Promise<UseProviderContractConf | null>,\n  ]);\n\n  // `clearResolveCache` maybe called during the above promise being\n  // fulfilled, so we manually mark it as stale for this case.\n  const renderId = resolveOptions?.renderId;\n  const isStale = () => !!renderId && renderId !== _internalApiGetRenderId();\n\n  const promise = resolveByProvider(\n    providerBrick,\n    useProvider,\n    method,\n    actualContractConf?.params ? actualContractConf : (actualArgs ?? []),\n    resolveOptions,\n    args,\n    isStale\n  );\n\n  let { transform } = resolveConf;\n  let data: unknown;\n\n  try {\n    const value = await promise;\n    data = hasLegacyField ? get(value, legacyField) : value;\n    // The fetched data and its inner objects should never be *injected* again.\n    markAsComputed(data);\n  } catch (error) {\n    if (isHandleRejectByTransform(onReject)) {\n      transform = onReject.transform;\n      data = error;\n    } else {\n      throw error;\n    }\n  }\n\n  if (!transform) {\n    return data;\n  }\n\n  // Keep backward compatibility of string transform.\n  if (typeof transform === \"string\") {\n    return { [transform]: data };\n  }\n\n  return asyncComputeRealValue(transform, { ...runtimeContext, data });\n}\n\nexport function clearResolveCache() {\n  cache.clear();\n}\n\nexport async function resolveByProvider(\n  brick: Record<string, Function>,\n  useProvider: string,\n  method: string,\n  args: unknown[] | UseProviderContractConf,\n  options?: ResolveOptions,\n  originalArgs?: unknown[],\n  isStale?: () => boolean\n) {\n  let cacheKey: string;\n  try {\n    // `args` may contain circular references, which makes\n    // JSON stringify failed, thus we fallback to original args.\n    cacheKey = JSON.stringify({\n      useProvider,\n      method,\n      args,\n    });\n  } catch (e) {\n    if (!originalArgs) {\n      throw e;\n    }\n    cacheKey = JSON.stringify({\n      useProvider,\n      method,\n      originalArgs,\n    });\n  }\n\n  let promise: Promise<unknown> | undefined;\n  if (options?.cache !== \"reload\") {\n    promise = cache.get(cacheKey);\n  }\n  if (!promise) {\n    promise = (async () => {\n      const finalArgs = hooks?.flowApi?.isFlowApiProvider(useProvider)\n        ? await hooks.flowApi.getArgsOfFlowApi(useProvider, args, method)\n        : (args as unknown[]);\n      return brick[method](...finalArgs);\n    })();\n\n    if (!isStale?.()) {\n      cache.set(cacheKey, promise);\n    }\n  }\n\n  return promise;\n}\n\nfunction isHandleRejectByTransform(\n  onReject: HandleReject | undefined\n): onReject is HandleRejectByTransform {\n  return !!(onReject as HandleRejectByTransform)?.transform;\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/types/internal/data/resolveData.d.ts

@@ -14,4 +14,4 @@ export interface ResolveOptions {
 }
 export declare function resolveData(resolveConf: ResolveConf, runtimeContext: RuntimeContext, resolveOptions?: ResolveOptions): Promise<unknown>;
 export declare function clearResolveCache(): void;
-export declare function resolveByProvider(brick: Record<string, Function>, useProvider: string, method: string, args: unknown[] | UseProviderContractConf, options?: ResolveOptions, originalArgs?: unknown[], stale?: boolean): Promise<unknown>;
+export declare function resolveByProvider(brick: Record<string, Function>, useProvider: string, method: string, args: unknown[] | UseProviderContractConf, options?: ResolveOptions, originalArgs?: unknown[], isStale?: () => boolean): Promise<unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/runtime",
-  "version": "1.71.1",
+  "version": "1.71.3",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/runtime",
   "license": "GPL-3.0",
   "repository": {
@@ -67,5 +67,5 @@
     "@next-core/build-next-libs": "^1.0.25",
     "@next-core/test-next": "^2.0.1"
   },
-  "gitHead": "14446c604ce4566046afc335665ea16254390415"
+  "gitHead": "d61310874c12a1047eff5ac70ea0292b78860abd"
 }