@take-out/cli 0.0.52 → 0.0.57

package/src/commands/script.ts

@@ -4,20 +4,20 @@
 
 import {
   existsSync,
+  readFileSync,
   readdirSync,
   statSync,
-  readFileSync,
   writeFileSync,
   mkdirSync,
 } from 'node:fs'
-import { homedir } from 'node:os'
-import { join, relative, dirname, basename, extname } from 'node:path'
+import { join, relative, dirname, basename } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import { defineCommand } from 'citty'
 import pc from 'picocolors'
 
 import { listAllScripts, listCategoryScripts } from '../utils/script-listing'
+import { getLocalScriptsDir } from '../utils/script-utils'
 import {
   type FileToSync,
   compareFiles,
@@ -25,20 +25,6 @@ import {
   syncFileWithConfirmation,
 } from '../utils/sync'
 
-// cache configuration
-const CACHE_DIR = join(homedir(), '.takeout')
-const CACHE_FILE = join(CACHE_DIR, 'script-cache.json')
-
-interface ScriptMetadata {
-  description?: string
-  args?: string[]
-  mtime?: number
-}
-
-interface ScriptCache {
-  [path: string]: ScriptMetadata
-}
-
 // find scripts package root using import.meta.resolve
 function findScriptsPackageRoot(): string | null {
   try {
@@ -58,131 +44,6 @@ function findScriptsPackageRoot(): string | null {
   return null
 }
 
-// get local scripts directory
-export function getLocalScriptsDir(): string {
-  return join(process.cwd(), 'scripts')
-}
-
-// extract metadata from script file
-function extractMetadata(filePath: string): ScriptMetadata {
-  try {
-    const content = readFileSync(filePath, 'utf-8')
-    const lines = content.split('\n').slice(0, 20) // check first 20 lines
-
-    const metadata: ScriptMetadata = {}
-
-    for (const line of lines) {
-      // look for @description comment
-      const descMatch = line.match(/@description\s+(.+)/)
-      if (descMatch && descMatch[1]) {
-        metadata.description = descMatch[1].trim()
-      }
-
-      // look for @args comment
-      const argsMatch = line.match(/@args\s+(.+)/)
-      if (argsMatch && argsMatch[1]) {
-        metadata.args = argsMatch[1].split(',').map((a) => a.trim())
-      }
-    }
-
-    // add file modification time
-    const stat = statSync(filePath)
-    metadata.mtime = stat.mtimeMs
-
-    return metadata
-  } catch (err) {
-    return {}
-  }
-}
-
-// load or create cache
-function loadCache(): ScriptCache {
-  try {
-    if (existsSync(CACHE_FILE)) {
-      return JSON.parse(readFileSync(CACHE_FILE, 'utf-8'))
-    }
-  } catch (err) {
-    // ignore cache errors
-  }
-  return {}
-}
-
-// save cache
-function saveCache(cache: ScriptCache) {
-  try {
-    if (!existsSync(CACHE_DIR)) {
-      mkdirSync(CACHE_DIR, { recursive: true })
-    }
-    writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2))
-  } catch (err) {
-    // ignore cache write errors
-  }
-}
-
-// get metadata for a script (with caching)
-export function getScriptMetadata(filePath: string): ScriptMetadata {
-  const cache = loadCache()
-  const stat = statSync(filePath)
-
-  // check if cache is valid
-  if (cache[filePath] && cache[filePath].mtime === stat.mtimeMs) {
-    return cache[filePath]
-  }
-
-  // extract fresh metadata
-  const metadata = extractMetadata(filePath)
-
-  // update cache
-  cache[filePath] = metadata
-  saveCache(cache)
-
-  return metadata
-}
-
-// discover scripts in a directory
-export function discoverScripts(
-  dir: string,
-  baseDir: string = dir,
-  depth: number = 0,
-  maxDepth: number = 1
-): Map<string, string> {
-  const scripts = new Map<string, string>()
-
-  if (!existsSync(dir)) {
-    return scripts
-  }
-
-  try {
-    const entries = readdirSync(dir)
-
-    for (const entry of entries) {
-      const fullPath = join(dir, entry)
-      const stat = statSync(fullPath)
-
-      if (stat.isDirectory()) {
-        // skip helpers directories and limit depth to maxDepth
-        if (entry === 'helpers' || depth >= maxDepth) {
-          continue
-        }
-        // recursively discover in subdirectories
-        const subScripts = discoverScripts(fullPath, baseDir, depth + 1, maxDepth)
-        for (const [name, path] of subScripts) {
-          scripts.set(name, path)
-        }
-      } else if (entry.endsWith('.ts') || entry.endsWith('.js')) {
-        // create script name relative to base, normalize to forward slashes
-        const relativePath = relative(baseDir, fullPath).split('\\').join('/')
-        const scriptName = relativePath.replace(/\.(ts|js)$/, '')
-        scripts.set(scriptName, fullPath)
-      }
-    }
-  } catch (err) {
-    // ignore directory read errors
-  }
-
-  return scripts
-}
-
 // find a script by name (checks both built-in and local)
 export function findScript(name: string): string | null {
   // normalize name: convert colons to slashes for consistency
@@ -275,29 +136,18 @@ const newCommand = defineCommand({
  * @args --verbose, --dry-run
  */
 
-import { parseArgs } from 'node:util'
+import { args } from '@take-out/scripts/helpers/args'
 
-const { values } = parseArgs({
-  args: process.argv.slice(2),
-  options: {
-    verbose: {
-      type: 'boolean',
-      short: 'v',
-    },
-    'dry-run': {
-      type: 'boolean',
-    },
-  },
-})
+const { verbose, dryRun } = args('--verbose boolean --dry-run boolean')
 
 async function main() {
   console.info('Running ${basename(scriptPath)}...')
 
-  if (values.verbose) {
+  if (verbose) {
     console.info('Verbose mode enabled')
   }
 
-  if (values['dry-run']) {
+  if (dryRun) {
     console.info('Dry run mode - no changes will be made')
   }
 

package/src/utils/script-listing.ts

@@ -8,12 +8,7 @@ import { fileURLToPath } from 'node:url'
 
 import pc from 'picocolors'
 
-// re-export needed functions from script command
-import {
-  discoverScripts,
-  getLocalScriptsDir,
-  getScriptMetadata,
-} from '../commands/script'
+import { discoverScripts, getLocalScriptsDir, getScriptMetadata } from './script-utils'
 
 // find scripts package root using import.meta.resolve
 function findScriptsPackageRoot(): string | null {

package/src/utils/script-utils.ts

@@ -0,0 +1,153 @@
+/**
+ * Core utility functions for script discovery and metadata
+ */
+
+import {
+  existsSync,
+  readdirSync,
+  statSync,
+  readFileSync,
+  writeFileSync,
+  mkdirSync,
+} from 'node:fs'
+import { homedir } from 'node:os'
+import { join, relative } from 'node:path'
+
+// cache configuration
+const CACHE_DIR = join(homedir(), '.takeout')
+const CACHE_FILE = join(CACHE_DIR, 'script-cache.json')
+
+interface ScriptMetadata {
+  description?: string
+  args?: string[]
+  mtime?: number
+}
+
+interface ScriptCache {
+  [path: string]: ScriptMetadata
+}
+
+// get local scripts directory
+export function getLocalScriptsDir(): string {
+  return join(process.cwd(), 'scripts')
+}
+
+// extract metadata from script file
+function extractMetadata(filePath: string): ScriptMetadata {
+  try {
+    const content = readFileSync(filePath, 'utf-8')
+    const lines = content.split('\n').slice(0, 20) // check first 20 lines
+
+    const metadata: ScriptMetadata = {}
+
+    for (const line of lines) {
+      // look for @description comment
+      const descMatch = line.match(/@description\s+(.+)/)
+      if (descMatch && descMatch[1]) {
+        metadata.description = descMatch[1].trim()
+      }
+
+      // look for @args comment
+      const argsMatch = line.match(/@args\s+(.+)/)
+      if (argsMatch && argsMatch[1]) {
+        metadata.args = argsMatch[1].split(',').map((a) => a.trim())
+      }
+    }
+
+    // add file modification time
+    const stat = statSync(filePath)
+    metadata.mtime = stat.mtimeMs
+
+    return metadata
+  } catch (err) {
+    return {}
+  }
+}
+
+// load or create cache
+function loadCache(): ScriptCache {
+  try {
+    if (existsSync(CACHE_FILE)) {
+      return JSON.parse(readFileSync(CACHE_FILE, 'utf-8'))
+    }
+  } catch (err) {
+    // ignore cache errors
+  }
+  return {}
+}
+
+// save cache
+function saveCache(cache: ScriptCache) {
+  try {
+    if (!existsSync(CACHE_DIR)) {
+      mkdirSync(CACHE_DIR, { recursive: true })
+    }
+    writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2))
+  } catch (err) {
+    // ignore cache write errors
+  }
+}
+
+// get metadata for a script (with caching)
+export function getScriptMetadata(filePath: string): ScriptMetadata {
+  const cache = loadCache()
+  const stat = statSync(filePath)
+
+  // check if cache is valid
+  if (cache[filePath] && cache[filePath].mtime === stat.mtimeMs) {
+    return cache[filePath]
+  }
+
+  // extract fresh metadata
+  const metadata = extractMetadata(filePath)
+
+  // update cache
+  cache[filePath] = metadata
+  saveCache(cache)
+
+  return metadata
+}
+
+// discover scripts in a directory
+export function discoverScripts(
+  dir: string,
+  baseDir: string = dir,
+  depth: number = 0,
+  maxDepth: number = 1
+): Map<string, string> {
+  const scripts = new Map<string, string>()
+
+  if (!existsSync(dir)) {
+    return scripts
+  }
+
+  try {
+    const entries = readdirSync(dir)
+
+    for (const entry of entries) {
+      const fullPath = join(dir, entry)
+      const stat = statSync(fullPath)
+
+      if (stat.isDirectory()) {
+        // skip helpers directories and limit depth to maxDepth
+        if (entry === 'helpers' || depth >= maxDepth) {
+          continue
+        }
+        // recursively discover in subdirectories
+        const subScripts = discoverScripts(fullPath, baseDir, depth + 1, maxDepth)
+        for (const [name, path] of subScripts) {
+          scripts.set(name, path)
+        }
+      } else if (entry.endsWith('.ts') || entry.endsWith('.js')) {
+        // create script name relative to base, normalize to forward slashes
+        const relativePath = relative(baseDir, fullPath).split('\\').join('/')
+        const scriptName = relativePath.replace(/\.(ts|js)$/, '')
+        scripts.set(scriptName, fullPath)
+      }
+    }
+  } catch (err) {
+    // ignore directory read errors
+  }
+
+  return scripts
+}

package/types/utils/script-utils.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Core utility functions for script discovery and metadata
+ */
+interface ScriptMetadata {
+    description?: string;
+    args?: string[];
+    mtime?: number;
+}
+export declare function getLocalScriptsDir(): string;
+export declare function getScriptMetadata(filePath: string): ScriptMetadata;
+export declare function discoverScripts(dir: string, baseDir?: string, depth?: number, maxDepth?: number): Map<string, string>;
+export {};
+//# sourceMappingURL=script-utils.d.ts.map

package/types/utils/script-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"script-utils.d.ts","sourceRoot":"","sources":["../../src/utils/script-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAiBH,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAOD,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AA2DD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAiBlE;AAGD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAY,EACrB,KAAK,GAAE,MAAU,EACjB,QAAQ,GAAE,MAAU,GACnB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAoCrB"}