Moved script.cache to top level

Author: adamlui

utils/bump/chatbots.mjs

@@ -2,7 +2,7 @@
 
 // Bumps @version in chatbot userscripts
 
-// NOTE: Pass --cache to use script.cache.paths.chatbots for faster init
+// NOTE: Pass --cache to use cache.paths.chatbots for faster init
 // NOTE: Pass <--commit-msg|-m> "msg" to commit w/ msg
 // NOTE: Pass <--no-push|-np> to skip git push
 
@@ -11,9 +11,7 @@ import fs from 'fs'
 import path from 'path'
 
 const args = process.argv.slice(2)
-
 const script = {
-    cache: { paths: { root: '.cache' }, refs: {} },
     chatbots: ['amazongpt', 'bravegpt', 'duckduckgpt', 'googlegpt'],
     config: {
         cache: args.some(arg => arg.startsWith('--cache')),
@@ -25,8 +23,9 @@ const script = {
     },
     urls: { bumpmjs: 'https://cdn.jsdelivr.net/gh/adamlui/ai-web-extensions@c664f09/utils/bump/lib/bump.min.mjs' }
 }
-script.cache.paths.bumpmjs = path.join(process.cwd(), `${script.cache.paths.root}/bump.min.mjs`)
-script.cache.paths.chatbots = path.join(process.cwd(), `${script.cache.paths.root}/chatbots.json`)
+const cache = { paths: { root: '.cache' }}
+cache.paths.bumpmjs = path.join(process.cwd(), `${cache.paths.root}/bump.min.mjs`)
+cache.paths.chatbots = path.join(process.cwd(), `${cache.paths.root}/chatbots.json`)
 const { cache: { paths: cachePaths }} = script
 const gitCmd = process.platform == 'win32' ? 'git' : '/usr/bin/git'   // same as your ext script
 

utils/bump/userscript-requires.mjs

@@ -3,15 +3,14 @@
 // Bumps @require'd jsDelivr URLs in userscript
 
 // NOTE: Doesn't git commit to allow script editing from breaking changes
-// NOTE: Pass --cache to use script.cache.paths.userscripts for faster init
+// NOTE: Pass --cache to use cache.paths.userscripts for faster init
 // NOTE: Pass --suffix to override file suffix (default: .user.js)
 
 import fs from 'fs'
 import path from 'path'
 
 const args = process.argv.slice(2)
 const script = {
-    cache: { paths: { root: '.cache' }, refs: {} },
     modes: { cache: args.some(arg => arg.startsWith('--cache')) },
     regex: {
         hash: { commit: { full: /^[a-f\d]{40}$/i, inline: /(@|\?v=)([^/#]+)/ }, sri: /[^#]+$/ },
@@ -31,31 +30,32 @@ const script = {
     },
     userscriptName: args.find(arg => arg.startsWith('--suffix='))?.split('=')[1] || '.user.js'
 }
-script.cache.paths.bumpmjs = path.join(process.cwd(), `${script.cache.paths.root}/bump.min.mjs`)
-script.cache.paths.userscripts = path.join(process.cwd(), `${script.cache.paths.root}/userscripts.json`)
-const { cache: { paths: cachePaths }, regex: re } = script
+const { regex: re } = script
+const cache = { paths: { root: '.cache' }, refs: {} }
+cache.paths.bumpmjs = path.join(process.cwd(), `${cache.paths.root}/bump.min.mjs`)
+cache.paths.userscripts = path.join(process.cwd(), `${cache.paths.root}/userscripts.json`)
 
 // Import bump.mjs
-fs.mkdirSync(path.dirname(cachePaths.bumpmjs), { recursive: true })
-fs.writeFileSync(cachePaths.bumpmjs, (await (await fetch(script.urls.bumpmjs)).text()))
-const bump = await import(`file://${cachePaths.bumpmjs}`)
-fs.unlinkSync(cachePaths.bumpmjs)
+fs.mkdirSync(path.dirname(cache.paths.bumpmjs), { recursive: true })
+fs.writeFileSync(cache.paths.bumpmjs, (await (await fetch(script.urls.bumpmjs)).text()))
+const bump = await import(`file://${cache.paths.bumpmjs}`)
+fs.unlinkSync(cache.paths.bumpmjs)
 const { bumpVersion, findFileBySuffix, generateSRIhash, getLatestCommitHash, isValidResource, log } = bump
 
 log.working(`\n${ script.modes.cache ? 'Collecting' : 'Searching for' } userscripts...\n`)
 let userscripts
 if (script.modes.cache) {
     try { // create missing cache file
-        fs.mkdirSync(path.dirname(cachePaths.userscripts), { recursive: true })
-        const fd = fs.openSync(cachePaths.userscripts,
+        fs.mkdirSync(path.dirname(cache.paths.userscripts), { recursive: true })
+        const fd = fs.openSync(cache.paths.userscripts,
             fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_RDWR)
-        log.info(`Cache file missing. Generating ${cachePaths.userscripts}...\n`)
+        log.info(`Cache file missing. Generating ${cache.paths.userscripts}...\n`)
         userscripts = await findFileBySuffix({ suffix: script.userscriptName })
         log.break()
         fs.writeFileSync(fd, JSON.stringify(userscripts, undefined, 2), 'utf-8')
-        log.success(`\nCache file created @ ${cachePaths.userscripts}`)
+        log.success(`\nCache file created @ ${cache.paths.userscripts}`)
     } catch (err) {
-        userscripts = JSON.parse(fs.readFileSync(cachePaths.userscripts, 'utf-8'))
+        userscripts = JSON.parse(fs.readFileSync(cache.paths.userscripts, 'utf-8'))
         console.log(userscripts)
         log.break()
     }
@@ -97,24 +97,24 @@ for (const scriptPath of Object.keys(urlMap)) {
         let resLatestRef
         if (re.verTag.test(currentCommit)) { // get latest release tag
             const apiURL = `${script.urls.apis.github.repos}/${targetRepo}/releases/latest`
-            resLatestRef = script.cache.refs[targetRepo] ??= (await (await fetch(apiURL, {
+            resLatestRef = cache.refs[targetRepo] ??= (await (await fetch(apiURL, {
                 headers: { 'User-Agent': 'bump-script' }})).json()).tag_name
         } else if (targetRepo.endsWith(repoName) && resURL.includes('firefox/extension/')) {
-            if (!script.cache.refs.ff) {
+            if (!cache.refs.ff) {
                 console.log('Fetching latest commit hash for firefox/extension...')
-                script.cache.refs.ff = await getLatestCommitHash({
+                cache.refs.ff = await getLatestCommitHash({
                     repo: targetRepo, path: 'firefox/extension' })
             }
-            resLatestRef = script.cache.refs.ff
+            resLatestRef = cache.refs.ff
         } else if (targetRepo.endsWith(repoName) && resURL.includes('chromium/extension/')) {
-            if (!script.cache.refs.chromium) {
+            if (!cache.refs.chromium) {
                 console.log('Fetching latest commit hash for chromium/extension...')
-                script.cache.refs.chromium = await getLatestCommitHash({
+                cache.refs.chromium = await getLatestCommitHash({
                     repo: targetRepo, path: 'chromium/extension' })
             }
-            resLatestRef = script.cache.refs.chromium
+            resLatestRef = cache.refs.chromium
         } else // get latest commit hash
-            resLatestRef = script.cache.refs[targetRepo] ??= await getLatestCommitHash({ repo: targetRepo })
+            resLatestRef = cache.refs[targetRepo] ??= await getLatestCommitHash({ repo: targetRepo })
         if (resLatestRef.startsWith(currentCommit)) {
             console.log(`${resName} already up-to-date!`) ; log.endedWithLineBreak = false
             continue