=0;--t){var r=this.tryEntries[t];if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),k(r),l}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.tryLoc===e){var n=r.completion;if("throw"===n.type){var o=n.arg;k(r)}return o}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,r){return this.delegate={iterator:L(e),resultName:t,nextLoc:r},"next"===this.method&&(this.arg=void 0),l}},e}(e.exports);try{regeneratorRuntime=t}catch(e){Function("r","regeneratorRuntime = r")(t)}}));function f(e){return e.replace(//g,">")}var p=function(e,r,n){var o="undefined"!=typeof self&&void 0!==self.WorkerGlobalScope||"undefined"!=typeof window&&void 0!==window.document&&"undefined"!=typeof fetch,i="undefined"!=typeof jest,a=o||i?function(e){}:console.error,s=""+n+"
";"object"!=typeof n?(s=String(n),a("### Unexpected error:"),a(n)):n instanceof t.TwoslashError?(s=function(e){return"\n"+f(e.title)+"
\n"+f(e.description).replace(/(?:\r\n|\r|\n)/g,"
")+"
\n"+f(e.recommendation).replace(/(?:\r\n|\r|\n)/g,"
")+"\n"}(n),a("### Twoslash error: "+n.title),a(n.description),a(n.recommendation),a("\n### Code Sample"),a(e)):n instanceof Error&&(s=function(e){return""+e.message.split("## Code")[0]+"
"}(n),a("### Unexpected error:"),a(n));var c="\n Twoslash failure
\n "+s+"
Raising Code:
"+f(e)+"
'+c+"
",r.children=[]},h=new Map;function d(e,t,r,n,o){var a,s={json5:"json"};if(s[t.lang]&&(t.lang=s[t.lang]),"twoslash"===t.lang){if(!t.meta.include||"string"!=typeof t.meta.include)throw new Error("A twoslash code block needs a pragma like 'twoslash include [name]'");!function(e,t,r){var n=[];r.split("\n").forEach((function(r,o){var i=r.trim();if(i.startsWith("// - ")){var a=i.split("// - ")[1].split(" ")[0];e.set(t+"-"+a,n.join("\n"))}else n.push(r)})),e.set(t,n.join("\n"))}(h,t.meta.include,e),a=o.wrapFragments?'':""}else a=r.map((function(r){var a=r.customName.split("/").pop().replace(".json","");return i.renderCodeToHTML(e,t.lang,t.meta,c({themeName:a},o),r,n)})).join("\n"),r.length>1&&o.wrapFragments&&(a=''+a+"
");return a}var v=function(e,t,r){var n=t.lang;if(void 0===r&&(r={}),("undefined"==typeof process||!process.env||!process.env.TWOSLASH_DISABLE)&&t.meta.twoslash)return function(e,t,r){if("undefined"!=typeof self&&void 0!==self.WorkerGlobalScope||"undefined"!=typeof window&&void 0!==window.document&&"undefined"!=typeof fetch)return i.runTwoSlash(e,t,r);return require("./twoslash-cache.js")(e, t, r, i.runTwoSlash);
++}(function(e,t){for(var r,n=/\/\/ @include: (.*)$/gm,o=[];null!==(r=n.exec(t));){r.index===n.lastIndex&&n.lastIndex++;var i=r[1],a=e.get(i);if(!a){var s="Could not find an include with the key: '"+i+"'.\nThere is: "+Array.from(e.keys())+".";throw new Error(s)}o.push([r.index,r[0].length,a])}var c=t.toString();return o.reverse().forEach((function(e){c=c.substring(0,e[0])+e[2]+c.substring(e[0]+e[1])})),c}(h,e),n,r)},m=new Map,g=function(e){return Promise.all((e.themes||(e.theme?[e.theme]:["light-plus"])).map(function(){var t=s(l.mark((function t(r){var n,i;return l.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return n=r.name||r,t.next=3,o.getHighlighter(c({},e,{theme:r,themes:void 0}));case 3:return(i=t.sent).customName=n,t.abrupt("return",i);case 6:case"end":return t.stop()}}),t)})));return function(e){return t.apply(this,arguments)}}()))},y=function(){return h.clear()},w=function(e){var t,r=n.lex(e),o=r[0],i=r.slice(1);if("twoslash"===o){var a=i.indexOf("include");-1!==a&&i.splice(a+1,0,"=")}var s=null!=(t=n.parse(i))?t:{};return{lang:(o||"").toString(),meta:s}},x=function(e,r){return void 0===r&&(r={}),function(n){var o=n.value,i=void 0;try{i=w([n.lang,n.meta].filter(Boolean).join(" "))}catch(e){var a=new t.TwoslashError("Codefence error","Could not parse the codefence for this code sample","It's usually an unclosed string",o);return p(o,n,a)}if(!(Object.keys(i.meta).filter((function(e){return(r.ignoreCodeblocksWithCodefenceMeta||[]).includes(e)})).length>0)){var s;try{s=n.twoslash||v(o,i,r)}catch(e){var c=process&&process.env&&!!process.env.CI,u="undefined"==typeof jest;if(c&&u||r.alwayRaiseForTwoslashExceptions)throw e;return p(o,n,e)}s&&(n.value=s.code,n.lang=s.extension,n.twoslash=s);var l=d(n.value,i,e,s,r);n.type="html",n.value=l,n.children=[]}}},b=function(){var e=s(l.mark((function e(t){return l.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return void 0===t&&(t={}),y(),m.has(t)||m.set(t,g(t)),e.next=5,m.get(t);case 5:return e.abrupt("return",{settings:t,highlighters:e.sent});case 7:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}();exports.default=function(e){return void 0===e&&(e={}),m.has(e)||m.set(e,g(e)),function(){var t=s(l.mark((function t(n){var o;return l.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,m.get(e);case 2:o=t.sent,y(),r(n,"code",x(o,e));case 5:case"end":return t.stop()}}),t)})));return function(e){return t.apply(this,arguments)}}()},exports.highlightersFromSettings=g,exports.remarkVisitor=x,exports.runTwoSlashOnNode=v,exports.setupForFile=b,exports.transformAttributesToHTML=function(e,t,r,n){var o=w(t),i=v(e,o,n);return d(i&&i.code||e,o,r,i,n)};
+ //# sourceMappingURL=remark-shiki-twoslash.cjs.production.min.js.map
+diff --git a/dist/remark-shiki-twoslash.esm.js b/dist/remark-shiki-twoslash.esm.js
+index 7d005c0ae14fff368e1808ffae3ecef5dab756b9..cabf08a27259ac62316f3459c95ecd5bf9ae0082 100644
+--- a/dist/remark-shiki-twoslash.esm.js
++++ b/dist/remark-shiki-twoslash.esm.js
+@@ -802,57 +802,7 @@ var cachedTwoslashCall = function cachedTwoslashCall(code, lang, settings) {
+ return runTwoSlash(code, lang, settings);
+ }
+
+- var _require = require("crypto"),
+- createHash = _require.createHash;
+-
+- var _require2 = require("fs"),
+- readFileSync = _require2.readFileSync,
+- existsSync = _require2.existsSync,
+- mkdirSync = _require2.mkdirSync,
+- writeFileSync = _require2.writeFileSync;
+-
+- var _require3 = require("path"),
+- join = _require3.join;
+-
+- var shikiVersion = require('@typescript/twoslash/package.json').version;
+-
+- var tsVersion = require('typescript/package.json').version;
+-
+- var shasum = createHash("sha1");
+- var codeSha = shasum.update(code + "-" + shikiVersion + "-" + tsVersion).digest("hex");
+-
+- var getNmCache = function getNmCache() {
+- if (__dirname.includes("node_modules")) {
+- return join(__dirname.split("node_modules")[0], "node_modules", ".cache", "twoslash");
+- } else {
+- return join(__dirname, "..", "..", ".cache", "twoslash");
+- }
+- };
+-
+- var getPnpCache = function getPnpCache() {
+- try {
+- var pnp = require("pnpapi");
+-
+- return join(pnp.getPackageInformation(pnp.topLevel).packageLocation, "node_modules", ".cache", "twoslash");
+- } catch (error) {
+- return getNmCache();
+- }
+- };
+-
+- var cacheRoot = process.versions.pnp ? getPnpCache() : getNmCache();
+- var cachePath = join(cacheRoot, codeSha + ".json");
+-
+- if (existsSync(cachePath)) {
+- if (process.env.debug) console.log("Using cached twoslash results from " + cachePath);
+- return JSON.parse(readFileSync(cachePath, "utf8"));
+- } else {
+- var results = runTwoSlash(code, lang, settings);
+- if (!existsSync(cacheRoot)) mkdirSync(cacheRoot, {
+- recursive: true
+- });
+- writeFileSync(cachePath, JSON.stringify(results), "utf8");
+- return results;
+- }
++ return require("./twoslash-cache.js")(code, lang, settings, runTwoSlash);
+ };
+
+ var addIncludes = function addIncludes(map, name, code) {
+diff --git a/dist/twoslash-cache.js b/dist/twoslash-cache.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..7ae5d5ad41e6284ba9eefcfbfb86235800c94a9d
+--- /dev/null
++++ b/dist/twoslash-cache.js
+@@ -0,0 +1,149 @@
++const fs = require("fs")
++const path = require("path")
++const { createHash } = require("crypto")
++const { createRequire } = require("module")
++
++const shikiRequire = createRequire(require.resolve("shiki-twoslash"))
++const twoslashRequire = createRequire(shikiRequire.resolve("@typescript/twoslash"))
++const ts = twoslashRequire("typescript")
++const readTokens = new Map()
++let implementation
++
++const digest = value => createHash("sha1").update(value).digest("hex")
++const portable = filename =>
++ path.isAbsolute(filename) ? path.relative(process.cwd(), filename) : filename
++
++function compilerImplementation() {
++ if (implementation) return implementation
++ const hash = createHash("sha1")
++ hash.update(fs.readFileSync(__filename))
++ for (const [name, resolver] of [
++ ["shiki-twoslash", require],
++ ["@typescript/twoslash", shikiRequire],
++ ["@typescript/vfs", twoslashRequire],
++ ]) {
++ hash.update(name).update(fs.readFileSync(resolver.resolve(name + "/package.json")))
++ const directory = path.join(
++ path.dirname(resolver.resolve(name + "/package.json")),
++ "dist"
++ )
++ for (const filename of fs.readdirSync(directory).filter(f => f.endsWith(".js")).sort()) {
++ hash.update(filename).update(fs.readFileSync(path.join(directory, filename)))
++ }
++ }
++ for (const name of ["typescript", "lz-string"]) {
++ hash.update(name).update(fs.readFileSync(twoslashRequire.resolve(name)))
++ }
++ implementation = hash.digest("hex")
++ return implementation
++}
++
++function rememberRead(filename, contents, stat) {
++ filename = path.resolve(filename)
++ const token = contents === undefined ? null : digest(contents)
++ if (stat) {
++ const signature = [stat.size, stat.mtimeMs, stat.ctimeMs, stat.ino].join(":")
++ readTokens.delete(filename)
++ readTokens.set(filename, { signature, token })
++ if (readTokens.size > 256) readTokens.delete(readTokens.keys().next().value)
++ }
++ return token
++}
++
++function readToken(filename) {
++ filename = path.resolve(filename)
++ const stat = fs.statSync(filename, { throwIfNoEntry: false })
++ if (!stat) return null
++ const signature = [stat.size, stat.mtimeMs, stat.ctimeMs, stat.ino].join(":")
++ const cached = readTokens.get(filename)
++ if (cached && cached.signature === signature) {
++ readTokens.delete(filename)
++ readTokens.set(filename, cached)
++ return cached.token
++ }
++ return rememberRead(filename, ts.sys.readFile(filename), stat)
++}
++
++function inputToken(value) {
++ if (Array.isArray(value)) return JSON.stringify(value.map(portable))
++ if (typeof value === "string") return portable(value)
++ return value
++}
++
++function inputsMatch(inputs) {
++ return inputs.every(input => {
++ const args = input.args.map((arg, i) =>
++ input.undefinedArgs.includes(i) ? undefined : arg
++ )
++ args[0] = path.resolve(args[0])
++ const token = input.method === "readFile"
++ ? readToken(args[0])
++ : inputToken(ts.sys[input.method](...args))
++ return token === input.token
++ })
++}
++
++function compile(code, lang, settings, runTwoSlash) {
++ const inputs = new Map()
++ const sys = { ...ts.sys }
++ // Misses and directory probes matter when new typings become available.
++ for (const method of [
++ "readFile", "fileExists", "directoryExists", "getDirectories",
++ "readDirectory", "realpath", "resolvePath",
++ ]) {
++ if (!ts.sys[method]) continue
++ sys[method] = (...args) => {
++ const value = ts.sys[method](...args)
++ const input = {
++ method,
++ args: args.map((arg, i) => i === 0 ? portable(path.resolve(arg)) : arg),
++ undefinedArgs: args.flatMap((arg, i) => arg === undefined ? [i] : []),
++ }
++ const key = JSON.stringify(input)
++ input.token = method === "readFile"
++ ? rememberRead(args[0], value, fs.statSync(args[0], { throwIfNoEntry: false }))
++ : inputToken(value)
++ inputs.set(key, input)
++ return value
++ }
++ }
++ const options = { ...settings, tsModule: { ...ts, sys } }
++ const results = runTwoSlash(code, lang, options)
++ return { results, inputs: [...inputs.values()] }
++}
++
++function cacheDirectory() {
++ if (process.versions.pnp) {
++ const pnp = require("pnpapi")
++ return path.join(
++ pnp.getPackageInformation(pnp.topLevel).packageLocation,
++ "node_modules", ".cache", "twoslash"
++ )
++ }
++ return __dirname.includes("node_modules")
++ ? path.join(__dirname.split("node_modules")[0], "node_modules", ".cache", "twoslash")
++ : path.join(__dirname, "..", "..", ".cache", "twoslash")
++}
++
++module.exports = function cachedTwoslash(code, lang, settings, runTwoSlash) {
++ if (settings.tsModule || settings.fsMap || settings.customTransformers || settings.lzstringModule) {
++ if (process.env.debug) console.log("Skipping Twoslash cache for custom compiler inputs")
++ return runTwoSlash(code, lang, settings)
++ }
++ const key = digest(JSON.stringify([code, lang, settings, compilerImplementation()]))
++ const directory = cacheDirectory()
++ const filename = path.join(directory, key + ".json")
++ if (fs.existsSync(filename)) {
++ const cached = JSON.parse(fs.readFileSync(filename, "utf8"))
++ if (inputsMatch(cached.inputs)) {
++ if (process.env.debug) console.log("Using cached twoslash results from " + filename)
++ const now = new Date()
++ fs.utimesSync(filename, now, now)
++ return cached.results
++ }
++ }
++ const cached = compile(code, lang, settings, runTwoSlash)
++ fs.mkdirSync(directory, { recursive: true })
++ fs.writeFileSync(filename, JSON.stringify(cached), "utf8")
++ return cached.results
++}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0c8438854935..fa0560b58e97 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,11 @@ overrides:
patchedDependencies:
gatsby-remark-shiki-twoslash@3.0.38:
- hash: 5584d3c994349e1a6796ab8e22811fc912fad257e9ad818930836c458ab23640
+ hash: 3aa0dc2d9c0fd3921986acbadfef7a10df948fb30d02590f86cecab9b91800bf
path: patches/gatsby-remark-shiki-twoslash@3.0.38.patch
+ remark-shiki-twoslash@3.1.3:
+ hash: 5bd6570cdb97b323924ced9d2e68aae4b5f7bea40b13ee9a3ca712e774883c30
+ path: patches/remark-shiki-twoslash@3.1.3.patch
importers:
@@ -81,7 +84,7 @@ importers:
version: 13.0.2
remark-shiki-twoslash:
specifier: ^3.1.3
- version: 3.1.3(typescript@6.0.2)
+ version: 3.1.3(patch_hash=5bd6570cdb97b323924ced9d2e68aae4b5f7bea40b13ee9a3ca712e774883c30)(typescript@6.0.2)
packages/ata:
dependencies:
@@ -395,7 +398,7 @@ importers:
version: 6.16.0(gatsby@5.16.1(babel-eslint@10.1.0(eslint@8.57.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(type-fest@4.41.0)(typescript@6.0.2))
gatsby-remark-shiki-twoslash:
specifier: ^3.0.38
- version: 3.0.38(patch_hash=5584d3c994349e1a6796ab8e22811fc912fad257e9ad818930836c458ab23640)
+ version: 3.0.38(patch_hash=3aa0dc2d9c0fd3921986acbadfef7a10df948fb30d02590f86cecab9b91800bf)
gatsby-remark-smartypants:
specifier: ^6.16.0
version: 6.16.0(gatsby@5.16.1(babel-eslint@10.1.0(eslint@8.57.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(type-fest@4.41.0)(typescript@6.0.2))
@@ -16338,9 +16341,9 @@ snapshots:
lodash: 4.17.23
unist-util-visit: 2.0.3
- gatsby-remark-shiki-twoslash@3.0.38(patch_hash=5584d3c994349e1a6796ab8e22811fc912fad257e9ad818930836c458ab23640):
+ gatsby-remark-shiki-twoslash@3.0.38(patch_hash=3aa0dc2d9c0fd3921986acbadfef7a10df948fb30d02590f86cecab9b91800bf):
dependencies:
- remark-shiki-twoslash: 3.1.3(typescript@6.0.2)
+ remark-shiki-twoslash: 3.1.3(patch_hash=5bd6570cdb97b323924ced9d2e68aae4b5f7bea40b13ee9a3ca712e774883c30)(typescript@6.0.2)
typescript: 6.0.2
unist-util-visit: 2.0.3
@@ -20181,7 +20184,7 @@ snapshots:
dependencies:
mdast-util-to-nlcst: 4.0.1
- remark-shiki-twoslash@3.1.3(typescript@6.0.2):
+ remark-shiki-twoslash@3.1.3(patch_hash=5bd6570cdb97b323924ced9d2e68aae4b5f7bea40b13ee9a3ca712e774883c30)(typescript@6.0.2):
dependencies:
'@types/unist': 2.0.11
'@typescript/twoslash': link:packages/ts-twoslasher
@@ -21433,7 +21436,7 @@ snapshots:
hast-util-to-html: 7.1.3
mdast-util-to-hast: 10.2.0
remark: 13.0.0
- remark-shiki-twoslash: 3.1.3(typescript@6.0.2)
+ remark-shiki-twoslash: 3.1.3(patch_hash=5bd6570cdb97b323924ced9d2e68aae4b5f7bea40b13ee9a3ca712e774883c30)(typescript@6.0.2)
unist-util-visit: 3.1.0
transitivePeerDependencies:
- supports-color