@take-out/scripts 0.0.93 → 0.0.95

package/src/helpers/args.ts

@@ -2,10 +2,10 @@
  * ultra simple typed arg parsing
  *
  * @example
- * const { port, verbose, _ } = args`--port number --verbose boolean`
+ * const { port, verbose, rest } = args`--port number --verbose boolean`
  * // port: number | undefined
  * // verbose: boolean
- * // _: string[]
+ * // rest: string[] - positional args that don't match any flag
  */
 
 type ParseType<T extends string> = T extends 'number'
@@ -52,7 +52,7 @@ type ParseFlags<S extends string> =
 // flatten intersection into single object for nice hover display
 type Prettify<T> = { [K in keyof T]: T[K] } & {}
 
-type Args<S extends string> = Prettify<ParseFlags<S> & { _: string[] }>
+export type Args<S extends string> = Prettify<ParseFlags<S> & { rest: string[] }>
 
 export function args<const S extends string>(spec: S): Args<S>
 export function args<const S extends string>(strings: TemplateStringsArray | S): Args<S> {
@@ -91,5 +91,5 @@ export function args<const S extends string>(strings: TemplateStringsArray | S):
     }
   }
 
-  return { ...result, _: rest } as Args<S>
+  return { ...result, rest } as Args<S>
 }

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

@@ -9,9 +9,11 @@ export async function getTestEnv() {
   const zeroVersion = getZeroVersion()
   const dockerHost = getDockerHost()
   const devEnv = await loadEnv('development')
-  const envPath = ['src/constants/env-server', 'src/server/env-server']
-    .map((p) => join(process.cwd(), p))
-    .find((p) => existsSync(p + '.ts')) || join(process.cwd(), 'src/constants/env-server')
+  const envPath =
+    ['src/constants/env-server', 'src/server/env-server']
+      .map((p) => join(process.cwd(), p))
+      .find((p) => existsSync(p + '.ts')) ||
+    join(process.cwd(), 'src/constants/env-server')
   const serverEnvFallback = await import(envPath)
 
   // ports come from VITE_PORT_* in .env.development (loaded by loadEnv)

package/src/node-version-check.ts

@@ -1,13 +1,15 @@
 #!/usr/bin/env bun
 
-import fs from 'node:fs/promises'
-import path from 'node:path'
+import { cmd } from './cmd'
 
 function getCurrentNodeVersion() {
   return process.version
 }
 
 async function getRequiredNodeVersion() {
+  const fs = await import('node:fs/promises')
+  const path = await import('node:path')
+
   // try .node-version file first
   try {
     const nodeVersionContent = await fs.readFile(
@@ -42,8 +44,10 @@ export async function checkNodeVersion() {
 }
 
 if (import.meta.main) {
-  checkNodeVersion().catch((e: any) => {
-    console.error(e.message)
-    process.exit(1)
+  await cmd`verify node version matches project requirements`.run(async () => {
+    checkNodeVersion().catch((e: any) => {
+      console.error(e.message)
+      process.exit(1)
+    })
   })
 }