add deploy environment support

Author: hazelnutcloud

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.4.9
+- chore: add environment flag to deploy command
+
 # v0.4.8
 - fix: small bug in `arkiver deploy` where it was incorrectly uploading the name string as the arkiver
 

cli.ts

@@ -14,7 +14,7 @@ import {
 } from './cli/mod.ts'
 import 'https://deno.land/std@0.179.0/dotenv/load.ts'
 
-export const version = 'v0.4.8'
+export const version = 'v0.4.9'
 
 const command = new Command()
 	.name('arkiver')
@@ -50,6 +50,7 @@ command
 	.command('deploy', 'Deploy arkive')
 	.option('--public', 'Make arkive public')
 	.option('--major', 'Deploy as major version')
+	.option('--env <env:string>', 'Environment to deploy to')
 	.arguments('<dir:string>')
 	.action(async (opts, ...args) => {
 		await checkVersion(version)

cli/deploy/mod.ts

@@ -4,10 +4,10 @@ import { pkg } from './pkg.ts'
 import { upload } from './upload.ts'
 
 export const action = async (
-	options: { public?: true; major?: true },
+	options: { public?: true; major?: true, env?: string },
 	directory: string,
 ) => {
-	const dev = Deno.env.get('DEV') !== undefined
+	const dev = options.env?.toLowerCase() === 'dev'
 
 	if (dev) return deployDev(options, directory)
 

cli/deploy/upload.ts

@@ -7,7 +7,7 @@ export const upload = async (
 	pkgName: string,
 	tempPath: string,
 	manifest: ArkiveManifest,
-	options: { public?: true; major?: true },
+	options: { public?: true; major?: true, env?: string },
 ) => {
 	const supabase = getSupabaseClient()
 	const sessionRes = await supabase.auth.getSession()
@@ -39,6 +39,9 @@ export const upload = async (
 	} else {
 		formData.append('update', 'minor')
 	}
+	if (options.env) {
+		formData.append('env', options.env)
+	}
 
 	const headers = new Headers()
 	headers.append(

deno.lock

@@ -82,15 +82,15 @@ export type EventHandlerFor<
 	TEventName extends ExtractAbiEventNames<TAbi>,
 > = EventHandler<ExtractAbiEvent<TAbi, TEventName>, TEventName, TAbi>
 
-type OneDeepNonNullable<T> = {
-	[K in keyof T]: NonNullable<T[K]>
-}
+type RecursiveNonNullable<T> = T extends {} ? {
+	[K in keyof T]-?: RecursiveNonNullable<T[K]>
+} : NonNullable<T>
 
-export type SafeLog<TAbiEvent extends AbiEvent> = OneDeepNonNullable<
+export type SafeLog<TAbiEvent extends AbiEvent> = RecursiveNonNullable<
 	Log<bigint, bigint, TAbiEvent, [TAbiEvent], string>
 >
 
-export type SafeRpcLog = OneDeepNonNullable<RpcLog>
+export type SafeRpcLog = RecursiveNonNullable<RpcLog>
 
 export interface EventHandlerContext<
 	TAbiEvent extends AbiEvent,
@@ -112,7 +112,7 @@ export interface BlockHandlerContext {
 	logger: log.Logger
 }
 
-export type SafeBlock = OneDeepNonNullable<Block>
+export type SafeBlock = RecursiveNonNullable<Block>
 
 export type EventHandler<
 	TAbiEvent extends AbiEvent,
@@ -164,19 +164,19 @@ type ValidNameChars =
 
 export type CheckManifestName<Name extends string, FullName extends string> =
 	Name extends `${infer First}${infer Rest}`
-		? First extends ValidNameChars | Capitalize<ValidNameChars>
-			? CheckManifestName<Rest, FullName>
-		: `Invalid character in manifest name: ${First}`
-		: FullName
+	? First extends ValidNameChars | Capitalize<ValidNameChars>
+	? CheckManifestName<Rest, FullName>
+	: `Invalid character in manifest name: ${First}`
+	: FullName
 
 export type HexString<Str extends string, Length extends number> = Str extends
 	`0x${infer Rest}`
 	? InnerHexStr<Rest, Length> extends number
-		? InnerHexStr<Rest, Length> extends Length ? Str
-		: `Invalid hex string length. Expected ${Length}, got ${InnerHexStr<
-			Rest,
-			Length
-		>}`
+	? InnerHexStr<Rest, Length> extends Length ? Str
+	: `Invalid hex string length. Expected ${Length}, got ${InnerHexStr<
+		Rest,
+		Length
+	>}`
 	: `Invalid hex character in string: ${InnerHexStr<Rest, Length>}`
 	: 'Missing 0x prefix'
 
@@ -186,7 +186,7 @@ type InnerHexStr<
 	LengthStore extends never[] = [],
 > = Str extends `${infer First}${infer Rest}`
 	? First extends HexChars | Capitalize<HexChars>
-		? InnerHexStr<Rest, Length, [...LengthStore, never]>
+	? InnerHexStr<Rest, Length, [...LengthStore, never]>
 	: First
 	: LengthStore['length'] extends Length ? Length
 	: LengthStore['length']
@@ -211,9 +211,9 @@ type HexChars =
 
 export type ValidateSourcesObject<Sources extends Record<string, bigint>> =
 	keyof Sources extends string
-		? keyof Sources extends HexString<keyof Sources, 40> | '*'
-			? keyof Sources extends '*' ? Sources
-			: keyof Sources extends HexString<keyof Sources, 40> ? Sources
-			: 'Can\'t mix wildcard and specific addresses'
-		: HexString<keyof Sources, 40>
-		: `Source addresses must be strings`
+	? keyof Sources extends HexString<keyof Sources, 40> | '*'
+	? keyof Sources extends '*' ? Sources
+	: keyof Sources extends HexString<keyof Sources, 40> ? Sources
+	: 'Can\'t mix wildcard and specific addresses'
+	: HexString<keyof Sources, 40>
+	: `Source addresses must be strings`

src/arkiver/types.ts

@@ -11,6 +11,7 @@ export {
 	type Log,
 	type PublicClient,
 	type RpcLog,
+	type DecodeEventLogReturnType
 } from 'npm:viem'
 export {
 	type Abi,