@take-out/scripts 0.0.35 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "type": "module",
   "main": "./src/index.ts",
   "sideEffects": false,
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.35"
+    "@take-out/helpers": "0.0.37"
   },
   "devDependencies": {
     "vxrn": "*"

package/src/clean.ts

@@ -4,12 +4,26 @@
  * @description Clean build artifacts and temporary files
  */
 
-import { execSync } from 'node:child_process'
-
-try {
-  execSync('rm -rf dist types .tamagui .vite node_modules/.cache', { stdio: 'inherit' })
-  console.info('Cleanup complete!')
-} catch (error) {
-  console.error('Error cleaning up')
-  throw error
+import { $ } from 'bun'
+
+const full = process.argv.includes('--full')
+const modules = full || process.argv.includes('--modules')
+const native = full || process.argv.includes('--native')
+
+await $`rm -rf dist types .tamagui .vite node_modules/.cache`
+
+if (modules) {
+  console.info('removing all node_modules...')
+  await $`find . -name 'node_modules' -type d -prune -exec rm -rf {} +`
+}
+
+if (native) {
+  console.info('removing ios and android folders...')
+  await $`rm -rf ios android`
+}
+
+console.info('cleanup complete!')
+
+if (!full) {
+  console.info('use --modules, --native, or --full for deeper cleaning')
 }

package/src/ensure-port.ts

@@ -0,0 +1,97 @@
+#!/usr/bin/env bun
+
+/**
+ * @description Ensure a port is available, exit with error if in use
+ * @args --auto-kill <prefix>
+ */
+
+import { execSync } from 'node:child_process'
+import { parseArgs } from 'node:util'
+
+const { values, positionals } = parseArgs({
+  args: process.argv.slice(2),
+  options: {
+    'auto-kill': {
+      type: 'string',
+      short: 'k',
+    },
+  },
+  allowPositionals: true,
+})
+
+const port = positionals[0]
+
+if (!port) {
+  console.error('usage: bun tko ensure-port <port> [--auto-kill <prefix>]')
+  process.exit(1)
+}
+
+const portNum = Number.parseInt(port, 10)
+
+if (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {
+  console.error(`invalid port: ${port}`)
+  process.exit(1)
+}
+
+function getListeningProcess(p: number): { pid?: number; command?: string } {
+  try {
+    // use -sTCP:LISTEN to only find processes LISTENING on the port (servers)
+    // not clients connected to it
+    const output = execSync(`lsof -i :${p} -sTCP:LISTEN -t`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'ignore'],
+    }).trim()
+
+    if (!output) return {}
+
+    const pid = Number.parseInt(output.split('\n')[0] || '', 10)
+    if (Number.isNaN(pid)) return {}
+
+    // get command name
+    const ps = execSync(`ps -p ${pid} -o comm=`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'ignore'],
+    }).trim()
+
+    return { pid, command: ps }
+  } catch {
+    return {}
+  }
+}
+
+function killProcess(pid: number): boolean {
+  try {
+    execSync(`kill ${pid}`, { stdio: 'ignore' })
+    return true
+  } catch {
+    return false
+  }
+}
+
+const { pid, command } = getListeningProcess(portNum)
+
+if (pid) {
+  const autoKillPrefix = values['auto-kill']
+
+  // check if we should auto-kill this process
+  if (autoKillPrefix && command?.startsWith(autoKillPrefix)) {
+    console.info(`killing ${command} (pid ${pid}) on port ${portNum}`)
+    if (killProcess(pid)) {
+      // give it a moment to release the port
+      Bun.sleepSync(100)
+      // verify it's gone
+      const check = getListeningProcess(portNum)
+      if (!check.pid) {
+        process.exit(0)
+      }
+      console.error(`failed to free port ${portNum}`)
+      process.exit(1)
+    }
+    console.error(`failed to kill pid ${pid}`)
+    process.exit(1)
+  }
+
+  console.error(`port ${portNum} in use by ${command || 'unknown'} (pid ${pid})`)
+  console.error(`run: kill ${pid}`)
+  process.exit(1)
+}

package/src/helpers/get-test-env.ts

@@ -10,17 +10,26 @@ export async function getTestEnv() {
   const dockerHost = getDockerHost()
   const serverEnvFallback = await import(join(process.cwd(), 'src/server/env-server'))
 
+  // explicit URLs required since vxrn loadEnv doesn't override existing env vars
+  const dockerDbBase = `postgresql://user:password@127.0.0.1:5433`
+
   return {
     ...serverEnvFallback,
     ...devEnv,
-    CI: 'true', // Ensure CI flag is set for test environment
+    CI: 'true',
     ...(!process.env.DEBUG_BACKEND && {
       ZERO_LOG_LEVEL: 'warn',
     }),
     DO_NOT_TRACK: '1',
     ZERO_VERSION: zeroVersion,
-    ZERO_AUTH_JWKS_URL: `http://${dockerHost}:8081/api/auth/jwks`,
-    ZERO_PUSH_URL: `http://${dockerHost}:8081/api/zero/push`,
-    ZERO_GET_QUERIES_URL: `http://${dockerHost}:8081/api/zero/pull`,
+    ZERO_MUTATE_URL: `http://${dockerHost}:8081/api/zero/push`,
+    ZERO_QUERY_URL: `http://${dockerHost}:8081/api/zero/pull`,
+    ZERO_UPSTREAM_DB: `${dockerDbBase}/postgres`,
+    ZERO_CVR_DB: `${dockerDbBase}/zero_cvr`,
+    ZERO_CHANGE_DB: `${dockerDbBase}/zero_cdb`,
+    CLOUDFLARE_R2_ENDPOINT: 'http://127.0.0.1:9200',
+    CLOUDFLARE_R2_PUBLIC_URL: 'http://127.0.0.1:9200',
+    CLOUDFLARE_R2_ACCESS_KEY: 'minio',
+    CLOUDFLARE_R2_SECRET_KEY: 'minio_password',
   }
 }

package/src/run.ts

@@ -137,8 +137,10 @@ async function findWorkspaceDirectories(): Promise<string[]> {
 
   const allPackageDirs = await findPackageJsonDirs('.')
 
-  const normalizePattern = (pattern: string): string => {
-    return pattern.startsWith('./') ? pattern.substring(2) : pattern
+  // normalize path separators to forward slashes for cross-platform support
+  const normalizePath = (path: string): string => {
+    let normalized = path.replace(/\\/g, '/')
+    return normalized.startsWith('./') ? normalized.substring(2) : normalized
   }
 
   const workspaceDirs = allPackageDirs.filter((dir) => {
@@ -146,8 +148,8 @@ async function findWorkspaceDirectories(): Promise<string[]> {
 
     const relativePath = relative('.', dir)
     return patterns.some((pattern) => {
-      const normalizedPattern = normalizePattern(pattern)
-      const normalizedPath = normalizePattern(relativePath)
+      const normalizedPattern = normalizePath(pattern)
+      const normalizedPath = normalizePath(relativePath)
 
       if (normalizedPattern.endsWith('/*')) {
         const prefix = normalizedPattern.slice(0, -1)

package/src/typecheck.ts

@@ -18,5 +18,5 @@ if (process.env.LAZY_TYPECHECK) {
 if (useTsgo) {
   await run(`bun tsgo --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
 } else {
-  await run(`bun x tsc --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
+  await run(`bun tsc --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
 }

package/tsconfig.json

@@ -1,7 +1,8 @@
 {
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "moduleDetection": "force"
   },
   "include": ["./src/**/*"],
   "exclude": ["**/test", "**/__tests__", "dist", "node_modules"]