@cyberskill/shared 2.15.0 → 2.16.0

package/dist/react/apollo-client/apollo-client.util.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@apollo/client/core"),p=require("@apollo/client/link"),w=require("@apollo/client/link/error"),h=require("@apollo/client/link/remove-typename"),y=require("@apollo/client/link/subscriptions"),_=require("apollo-upload-client/createUploadLink.mjs"),q=require("graphql"),b=require("graphql-ws"),c=require("react"),v=require("rxjs"),m=require("./apollo-client.constant.cjs"),E=require("../apollo-error/apollo-error.util.cjs"),l=require("../log/log.util.cjs"),f=require("react-hot-toast");var P=Object.defineProperty,g=Object.getOwnPropertySymbols,A=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable,L=(e,r,o)=>r in e?P(e,r,{enumerable:!0,configurable:!0,writable:!0,value:o}):e[r]=o,T=(e,r)=>{for(var o in r||(r={}))A.call(r,o)&&L(e,o,r[o]);if(g)for(var o of g(r))O.call(r,o)&&L(e,o,r[o]);return e};const C=new p.ApolloLink((e,r)=>(e.setContext({start:new Date}),r(e).pipe(v.tap(()=>{const o=new Date().getTime()-e.getContext().start;l.log.info(`Operation ${e.operationName} took ${o}ms to complete`)})))),S=new w.ErrorLink(({error:e,operation:r})=>{const o=(r==null?void 0:r.operationName)||"Unknown";let t="";a.CombinedGraphQLErrors.is(e)?e.errors.forEach(({message:n,locations:i,path:s},u)=>{u===0&&(t=n),l.log.error(`[GraphQL error] ${o}: ${n}, Location: ${JSON.stringify(i,null,4)}, Path: ${s}`)}):a.CombinedProtocolErrors.is(e)?e.errors.forEach(({message:n,extensions:i},s)=>{s===0&&(t=n),l.log.error(`[Protocol error]: ${n}, Extensions: ${JSON.stringify(i,null,4)}`)}):a.ServerError.is(e)?(t=e.message,l.log.error(`[Server error]: ${e.message}`)):(t=e.message,l.log.error(`[Network error]: ${e.message}`)),e&&t&&typeof window!="undefined"&&f.toast.error(n=>c.createElement(c.Fragment,null,t," ",c.createElement("button",{type:"button",className:"text-blue-500 hover:text-blue-700",onClick:()=>{setTimeout(()=>{E.showGlobalApolloError(e)},0),f.toast.dismiss(n.id)}},"Show Details")))});function k(e){const{uri:r,wsUrl:o,customLinks:t}=e,n=new h.RemoveTypenameFromVariablesLink;r||l.log.warn(`[Apollo] No GraphQL URI provided — using "${m.GRAPHQL_URI_DEFAULT}" as default`);const i=_({uri:r!=null?r:m.GRAPHQL_URI_DEFAULT,credentials:"include",headers:{"apollo-require-preflight":"true"}}),s=o?new y.GraphQLWsLink(b.createClient({url:o})):p.ApolloLink.empty(),u=o?p.ApolloLink.split(({operationType:d})=>d===q.OperationTypeNode.SUBSCRIPTION,s,i):i;return o&&u===i&&l.log.warn("[Apollo] WS URL is set, but subscriptions fallback to HTTP. Check your wsLink config."),[C,S,n,...t!=null?t:[],u]}function $(e){const r=p.ApolloLink.from(k(e));return new a.ApolloClient(T({link:r,cache:new a.InMemoryCache},e))}exports.createApolloLinks=k;exports.getClient=$;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@apollo/client/core"),p=require("@apollo/client/link"),w=require("@apollo/client/link/error"),h=require("@apollo/client/link/remove-typename"),y=require("@apollo/client/link/subscriptions"),_=require("graphql"),q=require("graphql-ws"),c=require("react"),b=require("rxjs"),m=require("./apollo-client.constant.cjs"),v=require("./links/upload.cjs"),E=require("../apollo-error/apollo-error.util.cjs"),l=require("../log/log.util.cjs"),f=require("react-hot-toast");var P=Object.defineProperty,g=Object.getOwnPropertySymbols,A=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable,L=(e,r,o)=>r in e?P(e,r,{enumerable:!0,configurable:!0,writable:!0,value:o}):e[r]=o,T=(e,r)=>{for(var o in r||(r={}))A.call(r,o)&&L(e,o,r[o]);if(g)for(var o of g(r))O.call(r,o)&&L(e,o,r[o]);return e};const C=new p.ApolloLink((e,r)=>(e.setContext({start:new Date}),r(e).pipe(b.tap(()=>{const o=new Date().getTime()-e.getContext().start;l.log.info(`Operation ${e.operationName} took ${o}ms to complete`)})))),S=new w.ErrorLink(({error:e,operation:r})=>{const o=(r==null?void 0:r.operationName)||"Unknown";let t="";a.CombinedGraphQLErrors.is(e)?e.errors.forEach(({message:n,locations:i,path:s},u)=>{u===0&&(t=n),l.log.error(`[GraphQL error] ${o}: ${n}, Location: ${JSON.stringify(i,null,4)}, Path: ${s}`)}):a.CombinedProtocolErrors.is(e)?e.errors.forEach(({message:n,extensions:i},s)=>{s===0&&(t=n),l.log.error(`[Protocol error]: ${n}, Extensions: ${JSON.stringify(i,null,4)}`)}):a.ServerError.is(e)?(t=e.message,l.log.error(`[Server error]: ${e.message}`)):(t=e.message,l.log.error(`[Network error]: ${e.message}`)),e&&t&&typeof window!="undefined"&&f.toast.error(n=>c.createElement(c.Fragment,null,t," ",c.createElement("button",{type:"button",className:"text-blue-500 hover:text-blue-700",onClick:()=>{setTimeout(()=>{E.showGlobalApolloError(e)},0),f.toast.dismiss(n.id)}},"Show Details")))});function d(e){const{uri:r,wsUrl:o,customLinks:t}=e,n=new h.RemoveTypenameFromVariablesLink;r||l.log.warn(`[Apollo] No GraphQL URI provided — using "${m.GRAPHQL_URI_DEFAULT}" as default`);const i=v.createUploadLink({uri:r!=null?r:m.GRAPHQL_URI_DEFAULT,credentials:"include",headers:{"apollo-require-preflight":"true"}}),s=o?new y.GraphQLWsLink(q.createClient({url:o})):p.ApolloLink.empty(),u=o?p.ApolloLink.split(({operationType:k})=>k===_.OperationTypeNode.SUBSCRIPTION,s,i):i;return o&&u===i&&l.log.warn("[Apollo] WS URL is set, but subscriptions fallback to HTTP. Check your wsLink config."),[C,S,n,...t!=null?t:[],u]}function $(e){const r=p.ApolloLink.from(d(e));return new a.ApolloClient(T({link:r,cache:new a.InMemoryCache},e))}exports.createApolloLinks=d;exports.getClient=$;

package/dist/react/apollo-client/apollo-client.util.js

@@ -3,12 +3,12 @@ import { ApolloLink as m } from "@apollo/client/link";
 import { ErrorLink as v } from "@apollo/client/link/error";
 import { RemoveTypenameFromVariablesLink as _ } from "@apollo/client/link/remove-typename";
 import { GraphQLWsLink as b } from "@apollo/client/link/subscriptions";
-import E from "apollo-upload-client/createUploadLink.mjs";
-import { OperationTypeNode as O } from "graphql";
-import { createClient as P } from "graphql-ws";
+import { OperationTypeNode as E } from "graphql";
+import { createClient as O } from "graphql-ws";
 import p from "react";
-import { tap as C } from "rxjs";
+import { tap as P } from "rxjs";
 import { GRAPHQL_URI_DEFAULT as f } from "./apollo-client.constant.js";
+import { createUploadLink as C } from "./links/upload.js";
 import { showGlobalApolloError as N } from "../apollo-error/apollo-error.util.js";
 import { log as l } from "../log/log.util.js";
 import { toast as c } from "react-hot-toast";
@@ -21,7 +21,7 @@ var $ = Object.defineProperty, u = Object.getOwnPropertySymbols, S = Object.prot
   return r;
 };
 const U = new m((r, e) => (r.setContext({ start: /* @__PURE__ */ new Date() }), e(r).pipe(
-  C(() => {
+  P(() => {
     const o = (/* @__PURE__ */ new Date()).getTime() - r.getContext().start;
     l.info(`Operation ${r.operationName} took ${o}ms to complete`);
   })
@@ -53,14 +53,14 @@ const U = new m((r, e) => (r.setContext({ start: /* @__PURE__ */ new Date() }),
 function R(r) {
   const { uri: e, wsUrl: o, customLinks: t } = r, n = new _();
   e || l.warn(`[Apollo] No GraphQL URI provided — using "${f}" as default`);
-  const i = E({
+  const i = C({
     uri: e != null ? e : f,
     credentials: "include",
     headers: {
       "apollo-require-preflight": "true"
     }
-  }), s = o ? new b(P({ url: o })) : m.empty(), a = o ? m.split(
-    ({ operationType: d }) => d === O.SUBSCRIPTION,
+  }), s = o ? new b(O({ url: o })) : m.empty(), a = o ? m.split(
+    ({ operationType: d }) => d === E.SUBSCRIPTION,
     s,
     i
   ) : i;

package/dist/react/apollo-client/links/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./upload.cjs");exports.createUploadLink=e.createUploadLink;

package/dist/react/apollo-client/links/index.d.ts

@@ -0,0 +1 @@
+export * from './upload.js';

package/dist/react/apollo-client/links/index.js

@@ -0,0 +1,4 @@
+import { createUploadLink as r } from "./upload.js";
+export {
+  r as createUploadLink
+};

package/dist/react/apollo-client/links/upload.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("@apollo/client/link"),c=require("@apollo/client/link/http"),w=require("@apollo/client/utilities"),T=require("extract-files/extractFiles.mjs"),j=require("extract-files/isExtractableFile.mjs");var G=Object.defineProperty,_=Object.getOwnPropertySymbols,H=Object.prototype.hasOwnProperty,J=Object.prototype.propertyIsEnumerable,E=(n,e,t)=>e in n?G(n,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):n[e]=t,h=(n,e)=>{for(var t in e||(e={}))H.call(e,t)&&E(n,t,e[t]);if(_)for(var t of _(e))J.call(e,t)&&E(n,t,e[t]);return n};function N(){if(typeof AbortController=="undefined")return{controller:!1,signal:!1};const n=new AbortController,e=n.signal;return{controller:n,signal:e}}function z(n,e,t){"name"in t?n.append(e,t,t.name):n.append(e,t)}function B({uri:n="/graphql",useGETForQueries:e,isExtractableFile:t=j,FormData:v,formDataAppendFile:F=z,print:S=c.defaultPrinter,fetch:q,fetchOptions:x,credentials:P,headers:A,includeExtensions:C}={}){const I={http:{includeExtensions:C},options:x,credentials:P,headers:A};return new L.ApolloLink(l=>{const p=l.getContext(),{clientAwareness:{name:g,version:m}={},headers:k}=p,U={http:p.http,options:p.fetchOptions,credentials:p.credentials,headers:h(h(h({},g&&{"apollographql-client-name":g}),m&&{"apollographql-client-version":m}),k)},{options:o,body:b}=c.selectHttpOptionsAndBodyInternal(l,S,c.fallbackHttpConfig,I,U),{clone:y,files:f}=T(b,t,"");let u=c.selectURI(l,n);if(f.size){o.headers&&delete o.headers["content-type"];const a=v||FormData,i=new a;i.append("operations",JSON.stringify(y));const r={};let d=0;f.forEach(O=>{r[++d]=O}),i.append("map",JSON.stringify(r)),d=0,f.forEach((O,R)=>{F(i,String(++d),R)}),o.body=i}else if(e&&!l.query.definitions.some(a=>a.kind==="OperationDefinition"&&a.operation==="mutation")&&(o.method="GET"),o.method==="GET"){const{newURI:a,parseError:i}=c.rewriteURIForGET(u,b);if(i)return new w.Observable(r=>{r.error(i)});u=a}else o.body=JSON.stringify(y);const{controller:s}=N();typeof s!="boolean"&&(o.signal&&(o.signal.aborted?s.abort():o.signal.addEventListener("abort",()=>{s.abort()},{once:!0})),o.signal=s.signal);const D=q||fetch;return new w.Observable(a=>{let i;return D(u,o).then(r=>(l.setContext({response:r}),r)).then(c.parseAndCheckHttpResponse(l)).then(r=>{a.next(r),a.complete()}).catch(r=>{i||(r.result&&r.result.errors&&r.result.data&&a.next(r.result),a.error(r))}),()=>{i=!0,typeof s!="boolean"&&s.abort()}})})}exports.createUploadLink=B;

package/dist/react/apollo-client/links/upload.d.ts

@@ -0,0 +1,76 @@
+import { BaseHttpLink } from '@apollo/client/link/http';
+import { ExtractableFile } from 'extract-files/isExtractableFile.mjs';
+import { ApolloLink } from '@apollo/client/link';
+/**
+ * Creates a
+ * [terminating Apollo Link](https://www.apollographql.com/docs/react/api/link/introduction/#the-terminating-link)
+ * for [Apollo Client](https://www.apollographql.com/docs/react) that fetches a
+ * [GraphQL multipart request](https://github.com/jaydenseric/graphql-multipart-request-spec)
+ * if the GraphQL variables contain files (by default
+ * [`FileList`](https://developer.mozilla.org/en-US/docs/Web/API/FileList),
+ * [`File`](https://developer.mozilla.org/en-US/docs/Web/API/File), or
+ * [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) instances),
+ * or else fetches a regular
+ * [GraphQL POST or GET request](https://www.apollographql.com/docs/apollo-server/workflow/requests)
+ * (depending on the config and GraphQL operation).
+ *
+ * Some of the options are similar to the
+ * [`createHttpLink` options](https://www.apollographql.com/docs/react/api/link/apollo-link-http/#httplink-constructor-options).
+ * @see [GraphQL multipart request spec](https://github.com/jaydenseric/graphql-multipart-request-spec).
+ * @param {object} options Options.
+ * @param {Parameters<typeof selectURI>[1]} [options.uri] GraphQL endpoint URI.
+ *   Defaults to `"/graphql"`.
+ * @param {boolean} [options.useGETForQueries] Should GET be used to fetch
+ *   queries, if there are no files to upload.
+ * @param {ExtractableFileMatcher} [options.isExtractableFile] Matches
+ *   extractable files in the GraphQL operation. Defaults to
+ *   {@linkcode isExtractableFile}.
+ * @param {typeof FormData} [options.FormData]
+ *   [`FormData`](https://developer.mozilla.org/en-US/docs/Web/API/FormData)
+ *   class. Defaults to the {@linkcode FormData} global.
+ * @param {FormDataFileAppender} [options.formDataAppendFile]
+ *   Customizes how extracted files are appended to the
+ *   [`FormData`](https://developer.mozilla.org/en-US/docs/Web/API/FormData)
+ *   instance. Defaults to {@linkcode formDataAppendFile}.
+ * @param {import("@apollo/client/link/http/selectHttpOptionsAndBody.js").Printer} [options.print]
+ *   Prints the GraphQL query or mutation AST to a string for transport.
+ *   Defaults to {@linkcode defaultPrinter}.
+ * @param {typeof fetch} [options.fetch] [`fetch`](https://fetch.spec.whatwg.org)
+ *   implementation. Defaults to the {@linkcode fetch} global.
+ * @param {RequestInit} [options.fetchOptions] `fetch` options; overridden by
+ *   upload requirements.
+ * @param {string} [options.credentials] Overrides
+ *   {@linkcode RequestInit.credentials credentials} in
+ *   {@linkcode fetchOptions}.
+ * @param {{ [headerName: string]: string }} [options.headers] Merges with and
+ *   overrides {@linkcode RequestInit.headers headers} in
+ *   {@linkcode fetchOptions}.
+ * @param {boolean} [options.includeExtensions] Toggles sending `extensions`
+ *   fields to the GraphQL server. Defaults to `false`.
+ * @returns A [terminating Apollo Link](https://www.apollographql.com/docs/react/api/link/introduction/#the-terminating-link).
+ * @example
+ * A basic Apollo Client setup:
+ *
+ * ```js
+ * import { ApolloClient, InMemoryCache } from "@apollo/client";
+ * import createUploadLink from "apollo-upload-client/createUploadLink.mjs";
+ *
+ * const client = new ApolloClient({
+ *   cache: new InMemoryCache(),
+ *   link: createUploadLink(),
+ * });
+ * ```
+ */
+export declare function createUploadLink({ uri: fetchUri, useGETForQueries, isExtractableFile: customIsExtractableFile, FormData: CustomFormData, formDataAppendFile: customFormDataAppendFile, print, fetch: customFetch, fetchOptions, credentials, headers, includeExtensions, }?: {
+    uri?: string;
+    useGETForQueries?: boolean;
+    isExtractableFile?: (value: unknown) => value is ExtractableFile;
+    FormData?: typeof FormData;
+    formDataAppendFile?: (formData: FormData, fieldName: string, file: ExtractableFile) => void;
+    print?: BaseHttpLink.Printer;
+    fetch?: typeof fetch;
+    fetchOptions?: RequestInit;
+    credentials?: RequestCredentials;
+    headers?: Record<string, string>;
+    includeExtensions?: boolean;
+}): ApolloLink;

package/dist/react/apollo-client/links/upload.js

@@ -0,0 +1,111 @@
+import { ApolloLink as q } from "@apollo/client/link";
+import { selectHttpOptionsAndBodyInternal as G, defaultPrinter as H, fallbackHttpConfig as J, selectURI as L, rewriteURIForGET as N, parseAndCheckHttpResponse as T } from "@apollo/client/link/http";
+import { Observable as O } from "@apollo/client/utilities";
+import j from "extract-files/extractFiles.mjs";
+import z from "extract-files/isExtractableFile.mjs";
+var B = Object.defineProperty, w = Object.getOwnPropertySymbols, V = Object.prototype.hasOwnProperty, K = Object.prototype.propertyIsEnumerable, _ = (n, t, e) => t in n ? B(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e, m = (n, t) => {
+  for (var e in t || (t = {}))
+    V.call(t, e) && _(n, e, t[e]);
+  if (w)
+    for (var e of w(t))
+      K.call(t, e) && _(n, e, t[e]);
+  return n;
+};
+function M() {
+  if (typeof AbortController == "undefined")
+    return { controller: !1, signal: !1 };
+  const n = new AbortController(), t = n.signal;
+  return { controller: n, signal: t };
+}
+function Q(n, t, e) {
+  "name" in e ? n.append(t, e, e.name) : n.append(t, e);
+}
+function tt({
+  uri: n = "/graphql",
+  useGETForQueries: t,
+  isExtractableFile: e = z,
+  FormData: E,
+  formDataAppendFile: x = Q,
+  print: F = H,
+  fetch: v,
+  fetchOptions: A,
+  credentials: C,
+  headers: P,
+  includeExtensions: S
+} = {}) {
+  const I = {
+    http: { includeExtensions: S },
+    options: A,
+    credentials: C,
+    headers: P
+  };
+  return new q((l) => {
+    const p = l.getContext(), {
+      // Apollo Studio client awareness `name` and `version` can be configured
+      // via `ApolloClient` constructor options:
+      // https://www.apollographql.com/docs/graphos/metrics/client-awareness/#setup
+      clientAwareness: { name: u, version: h } = {},
+      headers: D
+    } = p, R = {
+      http: p.http,
+      options: p.fetchOptions,
+      credentials: p.credentials,
+      headers: m(m(m({}, u && { "apollographql-client-name": u }), h && { "apollographql-client-version": h }), D)
+    }, { options: o, body: g } = G(
+      l,
+      F,
+      J,
+      I,
+      R
+    ), { clone: y, files: c } = j(g, e, "");
+    let f = L(l, n);
+    if (c.size) {
+      o.headers && delete o.headers["content-type"];
+      const a = E || FormData, i = new a();
+      i.append("operations", JSON.stringify(y));
+      const r = {};
+      let d = 0;
+      c.forEach((b) => {
+        r[++d] = b;
+      }), i.append("map", JSON.stringify(r)), d = 0, c.forEach((b, k) => {
+        x(i, String(++d), k);
+      }), o.body = i;
+    } else if (t && !l.query.definitions.some(
+      (a) => a.kind === "OperationDefinition" && a.operation === "mutation"
+    ) && (o.method = "GET"), o.method === "GET") {
+      const { newURI: a, parseError: i } = N(f, g);
+      if (i)
+        return new O((r) => {
+          r.error(i);
+        });
+      f = a;
+    } else
+      o.body = JSON.stringify(y);
+    const { controller: s } = M();
+    typeof s != "boolean" && (o.signal && (o.signal.aborted ? s.abort() : o.signal.addEventListener(
+      "abort",
+      () => {
+        s.abort();
+      },
+      {
+        // Prevent a memory leak if the user configured abort controller
+        // is long lasting, or controls multiple things.
+        once: !0
+      }
+    )), o.signal = s.signal);
+    const U = v || fetch;
+    return new O((a) => {
+      let i;
+      return U(f, o).then((r) => (l.setContext({ response: r }), r)).then(T(l)).then((r) => {
+        a.next(r), a.complete();
+      }).catch((r) => {
+        i || (r.result && r.result.errors && r.result.data && a.next(r.result), a.error(r));
+      }), () => {
+        i = !0, typeof s != "boolean" && s.abort();
+      };
+    });
+  });
+}
+export {
+  tt as createUploadLink
+};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@cyberskill/shared",
     "type": "module",
-    "version": "2.15.0",
+    "version": "2.16.0",
     "description": "CyberSkill Shared",
     "author": "Stephen Cheng",
     "license": "MIT",
@@ -221,7 +221,6 @@
         "@nestjs/core": "11.1.6",
         "@userback/widget": "0.3.11",
         "@vitejs/plugin-react-swc": "4.0.1",
-        "apollo-upload-client": "18.0.1",
         "body-parser": "2.2.0",
         "chalk": "5.6.0",
         "clsx": "2.1.1",
@@ -238,6 +237,7 @@
         "express": "5.1.0",
         "express-session": "1.18.2",
         "express-useragent": "1.0.15",
+        "extract-files": "13.0.0",
         "fs-extra": "11.3.1",
         "globals": "16.3.0",
         "graphql": "16.11.0",
@@ -275,7 +275,6 @@
         "@next/eslint-plugin-next": "15.5.0",
         "@testing-library/jest-dom": "6.8.0",
         "@testing-library/react": "16.3.0",
-        "@types/apollo-upload-client": "18.0.0",
         "@types/body-parser": "1.19.6",
         "@types/compression": "1.8.1",
         "@types/cookie-parser": "1.4.9",
@@ -284,6 +283,7 @@
         "@types/express": "5.0.3",
         "@types/express-session": "1.18.2",
         "@types/express-useragent": "1.0.5",
+        "@types/extract-files": "13.0.1",
         "@types/fs-extra": "11.0.4",
         "@types/graphql-upload": "17.0.0",
         "@types/lodash-es": "4.17.12",