@modern-js/plugin-data-loader 2.69.5 → 3.0.0-alpha.0

package/dist/cjs/cli/createRequest.js

@@ -1,152 +1,133 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createRequest_exports = {};
-__export(createRequest_exports, {
-  createActionRequest: () => createActionRequest,
-  createRequest: () => createRequest,
-  getRequestUrl: () => getRequestUrl
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createActionRequest: ()=>createActionRequest,
+    getRequestUrl: ()=>getRequestUrl,
+    createRequest: ()=>createRequest
 });
-module.exports = __toCommonJS(createRequest_exports);
-var import_router = require("@modern-js/runtime-utils/router");
-var import_path_to_regexp = require("path-to-regexp");
-var import_constants = require("../common/constants");
-var import_data = require("./data");
-const getRequestUrl = ({ params, request, routeId }) => {
-  const url = new URL(request.url);
-  const toPath = (0, import_path_to_regexp.compile)(url.pathname, {
-    encode: encodeURIComponent
-  });
-  const newPathName = toPath(params);
-  url.pathname = newPathName;
-  url.searchParams.append(import_constants.LOADER_ID_PARAM, routeId);
-  url.searchParams.append(import_constants.DIRECT_PARAM, "true");
-  return url;
-};
-const handleRedirectResponse = (res) => {
-  const { headers } = res;
-  const location = headers.get("X-Modernjs-Redirect");
-  if (location) {
-    throw (0, import_router.redirect)(location);
-  }
-  return res;
-};
-const isDeferredResponse = (res) => {
-  var _res_headers_get;
-  return ((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(import_constants.CONTENT_TYPE_DEFERRED)) && res.body;
-};
-const isRedirectResponse = (res) => {
-  return res.headers.get("X-Modernjs-Redirect") != null;
+const router_namespaceObject = require("@modern-js/runtime-utils/router");
+const external_path_to_regexp_namespaceObject = require("path-to-regexp");
+const constants_js_namespaceObject = require("../common/constants.js");
+const external_data_js_namespaceObject = require("./data.js");
+const getRequestUrl = ({ params, request, routeId })=>{
+    const url = new URL(request.url);
+    const toPath = (0, external_path_to_regexp_namespaceObject.compile)(url.pathname, {
+        encode: encodeURIComponent
+    });
+    const newPathName = toPath(params);
+    url.pathname = newPathName;
+    url.searchParams.append(constants_js_namespaceObject.LOADER_ID_PARAM, routeId);
+    url.searchParams.append(constants_js_namespaceObject.DIRECT_PARAM, 'true');
+    return url;
 };
-const isErrorResponse = (res) => {
-  return res.headers.get("X-Modernjs-Error") != null;
+const handleRedirectResponse = (res)=>{
+    const { headers } = res;
+    const location = headers.get('X-Modernjs-Redirect');
+    if (location) throw (0, router_namespaceObject.redirect)(location);
+    return res;
 };
+const isDeferredResponse = (res)=>res.headers.get('Content-Type')?.match(constants_js_namespaceObject.CONTENT_TYPE_DEFERRED) && res.body;
+const isRedirectResponse = (res)=>null != res.headers.get('X-Modernjs-Redirect');
+const isErrorResponse = (res)=>null != res.headers.get('X-Modernjs-Error');
 function isOtherErrorResponse(res) {
-  return res.status >= 400 && res.headers.get("X-Modernjs-Error") == null && res.headers.get("X-Modernjs-Catch") == null && res.headers.get("X-Modernjs-Response") == null;
+    return res.status >= 400 && null == res.headers.get('X-Modernjs-Error') && null == res.headers.get('X-Modernjs-Catch') && null == res.headers.get('X-Modernjs-Response');
 }
-const isCatchResponse = (res) => {
-  return res.headers.get("X-Modernjs-Catch") != null;
-};
-const handleErrorResponse = async (res) => {
-  const data = await res.json();
-  const error = new Error(data.message);
-  error.stack = data.stack;
-  throw error;
+const isCatchResponse = (res)=>null != res.headers.get('X-Modernjs-Catch');
+const handleErrorResponse = async (res)=>{
+    const data = await res.json();
+    const error = new Error(data.message);
+    error.stack = data.stack;
+    throw error;
 };
-const handleNetworkErrorResponse = async (res) => {
-  const text = await res.text();
-  const error = new Error(text);
-  error.stack = void 0;
-  throw error;
+const handleNetworkErrorResponse = async (res)=>{
+    const text = await res.text();
+    const error = new Error(text);
+    error.stack = void 0;
+    throw error;
 };
-const createRequest = (routeId, method = "get") => {
-  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
-  return async ({ params, request }) => {
-    const url = getRequestUrl({
-      params,
-      request,
-      routeId
-    });
-    let res;
-    res = await fetch(url, {
-      method,
-      signal: request.signal
-    }).catch((error) => {
-      throw error;
-    });
-    if (isRedirectResponse(res)) {
-      return handleRedirectResponse(res);
-    }
-    if (isErrorResponse(res)) {
-      return await handleErrorResponse(res);
-    }
-    if (isCatchResponse(res)) {
-      throw res;
-    }
-    if (isDeferredResponse(res)) {
-      const deferredData = await (0, import_data.parseDeferredReadableStream)(res.body);
-      return isRouterV7 ? deferredData.data : deferredData;
-    }
-    if (isOtherErrorResponse(res)) {
-      return await handleNetworkErrorResponse(res);
-    }
-    return res;
-  };
-};
-const createActionRequest = (routeId) => {
-  return async ({ params, request }) => {
-    const url = getRequestUrl({
-      params,
-      request,
-      routeId
-    });
-    const init = {
-      signal: request.signal
+const createRequest = (routeId, method = 'get')=>async ({ params, request })=>{
+        const url = getRequestUrl({
+            params,
+            request,
+            routeId
+        });
+        let res;
+        res = await fetch(url, {
+            method,
+            signal: request.signal
+        }).catch((error)=>{
+            throw error;
+        });
+        if (isRedirectResponse(res)) return handleRedirectResponse(res);
+        if (isErrorResponse(res)) return await handleErrorResponse(res);
+        if (isCatchResponse(res)) throw res;
+        if (isDeferredResponse(res)) {
+            const deferredData = await (0, external_data_js_namespaceObject.parseDeferredReadableStream)(res.body);
+            return deferredData.data;
+        }
+        if (isOtherErrorResponse(res)) return await handleNetworkErrorResponse(res);
+        return res;
     };
-    if (request.method !== "GET") {
-      init.method = request.method;
-      const contentType = request.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        init.headers = {
-          "Content-Type": contentType
+const createActionRequest = (routeId)=>async ({ params, request })=>{
+        const url = getRequestUrl({
+            params,
+            request,
+            routeId
+        });
+        const init = {
+            signal: request.signal
         };
-        init.body = JSON.stringify(await request.json());
-      } else if (contentType && /\btext\/plain\b/.test(contentType)) {
-        init.headers = {
-          "Content-Type": contentType
-        };
-        init.body = await request.text();
-      } else if (contentType && /\bapplication\/x-www-form-urlencoded\b/.test(contentType)) {
-        init.body = new URLSearchParams(await request.text());
-      } else {
-        init.body = await request.formData();
-      }
-    }
-    const res = await fetch(url, init);
-    if (!res.ok) {
-      throw res;
-    }
-    return res;
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createActionRequest,
-  createRequest,
-  getRequestUrl
+        if ('GET' !== request.method) {
+            init.method = request.method;
+            const contentType = request.headers.get('Content-Type');
+            if (contentType && /\bapplication\/json\b/.test(contentType)) {
+                init.headers = {
+                    'Content-Type': contentType
+                };
+                init.body = JSON.stringify(await request.json());
+            } else if (contentType && /\btext\/plain\b/.test(contentType)) {
+                init.headers = {
+                    'Content-Type': contentType
+                };
+                init.body = await request.text();
+            } else if (contentType && /\bapplication\/x-www-form-urlencoded\b/.test(contentType)) init.body = new URLSearchParams(await request.text());
+            else init.body = await request.formData();
+        }
+        const res = await fetch(url, init);
+        if (!res.ok) throw res;
+        return res;
+    };
+exports.createActionRequest = __webpack_exports__.createActionRequest;
+exports.createRequest = __webpack_exports__.createRequest;
+exports.getRequestUrl = __webpack_exports__.getRequestUrl;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createActionRequest",
+    "createRequest",
+    "getRequestUrl"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/cli/data.js

@@ -1,164 +1,145 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var data_exports = {};
-__export(data_exports, {
-  parseDeferredReadableStream: () => parseDeferredReadableStream
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    parseDeferredReadableStream: ()=>parseDeferredReadableStream
 });
-module.exports = __toCommonJS(data_exports);
-var import_browser = require("@modern-js/runtime-utils/browser");
-const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
+const browser_namespaceObject = require("@modern-js/runtime-utils/browser");
+const DEFERRED_VALUE_PLACEHOLDER_PREFIX = '__deferred_promise:';
 async function parseDeferredReadableStream(stream) {
-  if (!stream) {
-    throw new Error("parseDeferredReadableStream requires stream argument");
-  }
-  let deferredData;
-  const deferredResolvers = {};
-  try {
-    const sectionReader = readStreamSections(stream);
-    const initialSectionResult = await sectionReader.next();
-    const initialSection = initialSectionResult.value;
-    if (!initialSection) {
-      throw new Error("no critical data");
-    }
-    const criticalData = JSON.parse(initialSection);
-    if (typeof criticalData === "object" && criticalData !== null) {
-      for (const [eventKey, value] of Object.entries(criticalData)) {
-        if (typeof value !== "string" || !value.startsWith(DEFERRED_VALUE_PLACEHOLDER_PREFIX)) {
-          continue;
+    if (!stream) throw new Error('parseDeferredReadableStream requires stream argument');
+    let deferredData;
+    const deferredResolvers = {};
+    try {
+        const sectionReader = readStreamSections(stream);
+        const initialSectionResult = await sectionReader.next();
+        const initialSection = initialSectionResult.value;
+        if (!initialSection) throw new Error('no critical data');
+        const criticalData = JSON.parse(initialSection);
+        if ('object' == typeof criticalData && null !== criticalData) {
+            for (const [eventKey, value] of Object.entries(criticalData))if ('string' == typeof value && value.startsWith(DEFERRED_VALUE_PLACEHOLDER_PREFIX)) {
+                deferredData = deferredData || {};
+                deferredData[eventKey] = new Promise((resolve, reject)=>{
+                    deferredResolvers[eventKey] = {
+                        resolve: (value)=>{
+                            resolve(value);
+                            delete deferredResolvers[eventKey];
+                        },
+                        reject: (error)=>{
+                            reject(error);
+                            delete deferredResolvers[eventKey];
+                        }
+                    };
+                });
+            }
         }
-        deferredData = deferredData || {};
-        deferredData[eventKey] = new Promise((resolve, reject) => {
-          deferredResolvers[eventKey] = {
-            resolve: (value2) => {
-              resolve(value2);
-              delete deferredResolvers[eventKey];
-            },
-            reject: (error) => {
-              reject(error);
-              delete deferredResolvers[eventKey];
+        (async ()=>{
+            try {
+                for await (const section of sectionReader){
+                    const [event, ...sectionDataStrings] = section.split(':');
+                    const sectionDataString = sectionDataStrings.join(':');
+                    const data = JSON.parse(sectionDataString);
+                    if ('data' === event) {
+                        for (const [key, value] of Object.entries(data))if (deferredResolvers[key]) deferredResolvers[key].resolve(value);
+                    } else if ('error' === event) for (const [key, value] of Object.entries(data)){
+                        const err = new Error(value.message);
+                        err.stack = value.stack;
+                        if (deferredResolvers[key]) deferredResolvers[key].reject(err);
+                    }
+                }
+                for (const [key, resolver] of Object.entries(deferredResolvers))resolver.reject(new browser_namespaceObject.AbortedDeferredError(`Deferred ${key} will never resolved`));
+            } catch (error) {
+                for (const resolver of Object.values(deferredResolvers))resolver.reject(error);
             }
-          };
+        })();
+        return new browser_namespaceObject.DeferredData({
+            ...criticalData,
+            ...deferredData
         });
-      }
+    } catch (error) {
+        for (const resolver of Object.values(deferredResolvers))resolver.reject(error);
+        throw error;
     }
-    (async () => {
-      try {
-        for await (const section of sectionReader) {
-          const [event, ...sectionDataStrings] = section.split(":");
-          const sectionDataString = sectionDataStrings.join(":");
-          const data = JSON.parse(sectionDataString);
-          if (event === "data") {
-            for (const [key, value] of Object.entries(data)) {
-              if (deferredResolvers[key]) {
-                deferredResolvers[key].resolve(value);
-              }
-            }
-          } else if (event === "error") {
-            for (const [key, value] of Object.entries(data)) {
-              const err = new Error(value.message);
-              err.stack = value.stack;
-              if (deferredResolvers[key]) {
-                deferredResolvers[key].reject(err);
-              }
-            }
-          }
-        }
-        for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new import_browser.AbortedDeferredError(`Deferred ${key} will never resolved`));
-        }
-      } catch (error) {
-        for (const resolver of Object.values(deferredResolvers)) {
-          resolver.reject(error);
-        }
-      }
-    })();
-    return new import_browser.DeferredData({
-      ...criticalData,
-      ...deferredData
-    });
-  } catch (error) {
-    for (const resolver of Object.values(deferredResolvers)) {
-      resolver.reject(error);
-    }
-    throw error;
-  }
 }
 async function* readStreamSections(stream) {
-  const reader = stream.getReader();
-  let buffer = [];
-  let sections = [];
-  let closed = false;
-  const encoder = new TextEncoder();
-  const decoder = new TextDecoder();
-  const readStreamSection = async () => {
-    if (sections.length > 0) {
-      return sections.shift();
-    }
-    while (!closed && sections.length === 0) {
-      const chunk = await reader.read();
-      if (chunk.done) {
-        closed = true;
-        break;
-      }
-      buffer.push(chunk.value);
-      try {
-        const bufferedString = decoder.decode(mergeArrays(...buffer));
-        const splitSections = bufferedString.split("\n\n");
-        if (splitSections.length >= 2) {
-          sections.push(...splitSections.slice(0, -1));
-          buffer = [
-            encoder.encode(splitSections.slice(-1).join("\n\n"))
-          ];
+    const reader = stream.getReader();
+    let buffer = [];
+    let sections = [];
+    let closed = false;
+    const encoder = new TextEncoder();
+    const decoder = new TextDecoder();
+    const readStreamSection = async ()=>{
+        if (sections.length > 0) return sections.shift();
+        while(!closed && 0 === sections.length){
+            const chunk = await reader.read();
+            if (chunk.done) {
+                closed = true;
+                break;
+            }
+            buffer.push(chunk.value);
+            try {
+                const bufferedString = decoder.decode(mergeArrays(...buffer));
+                const splitSections = bufferedString.split('\n\n');
+                if (splitSections.length >= 2) {
+                    sections.push(...splitSections.slice(0, -1));
+                    buffer = [
+                        encoder.encode(splitSections.slice(-1).join('\n\n'))
+                    ];
+                }
+                if (sections.length > 0) break;
+            } catch  {
+                continue;
+            }
         }
-        if (sections.length > 0) {
-          break;
+        if (sections.length > 0) return sections.shift();
+        if (buffer.length > 0) {
+            const bufferedString = decoder.decode(mergeArrays(...buffer));
+            sections = bufferedString.split('\n\n').filter((s)=>s);
+            buffer = [];
         }
-      } catch {
-        continue;
-      }
-    }
-    if (sections.length > 0) {
-      return sections.shift();
+        return sections.shift();
+    };
+    let section = await readStreamSection();
+    while(section){
+        yield section;
+        section = await readStreamSection();
     }
-    if (buffer.length > 0) {
-      const bufferedString = decoder.decode(mergeArrays(...buffer));
-      sections = bufferedString.split("\n\n").filter((s) => s);
-      buffer = [];
-    }
-    return sections.shift();
-  };
-  let section = await readStreamSection();
-  while (section) {
-    yield section;
-    section = await readStreamSection();
-  }
 }
 function mergeArrays(...arrays) {
-  const out = new Uint8Array(arrays.reduce((total, arr) => total + arr.length, 0));
-  let offset = 0;
-  for (const arr of arrays) {
-    out.set(arr, offset);
-    offset += arr.length;
-  }
-  return out;
+    const out = new Uint8Array(arrays.reduce((total, arr)=>total + arr.length, 0));
+    let offset = 0;
+    for (const arr of arrays){
+        out.set(arr, offset);
+        offset += arr.length;
+    }
+    return out;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  parseDeferredReadableStream
+exports.parseDeferredReadableStream = __webpack_exports__.parseDeferredReadableStream;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "parseDeferredReadableStream"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });