From 373d9ec700c0097a22cf665a8e33cf48998d1dc2 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Mon, 2 Jun 2025 11:14:52 -0700 Subject: Minor things --- u/deno.json | 3 +- u/fn/either.ts | 2 +- u/process/argv.ts | 65 +++++++++++++++++++++++++++++++++++++++++ u/process/mod.ts | 1 + u/server/activity/fourohfour.ts | 12 +++----- u/server/request.ts | 9 +++--- 6 files changed, 76 insertions(+), 16 deletions(-) create mode 100644 u/process/argv.ts (limited to 'u') diff --git a/u/deno.json b/u/deno.json index 26b08bf..b277873 100644 --- a/u/deno.json +++ b/u/deno.json @@ -1,6 +1,5 @@ { "name": "@emprespresso/pengueno", "version": "0.1.0", - "exports": "./mod.ts", - "workspace": ["./*"] + "exports": "./mod.ts" } diff --git a/u/fn/either.ts b/u/fn/either.ts index 8b233bf..b228af2 100644 --- a/u/fn/either.ts +++ b/u/fn/either.ts @@ -10,7 +10,7 @@ export interface IEither { errBranch: Mapper, okBranch: Mapper, ) => IEither; - fold: (folder: BiMapper) => Tt; + fold: (folder: (err: E | undefined, val: T | undefined) => Tt) => Tt; //BiMapper) => Tt;; moveRight: (t: Tt) => IEither; mapRight: (mapper: Mapper) => IEither; mapLeft: (mapper: Mapper) => IEither; diff --git a/u/process/argv.ts b/u/process/argv.ts new file mode 100644 index 0000000..657c9a7 --- /dev/null +++ b/u/process/argv.ts @@ -0,0 +1,65 @@ +import { Either, type IEither } from "@emprespresso/pengueno"; + +export const isArgKey = (k: string): k is K => + k.startsWith("--"); + +export const getArg = ( + arg: K, + args: Array, +): IEither => { + const result = args.findIndex((_arg) => _arg.startsWith(arg)); + if (result < 0) return Either.left(new Error("no argument found for " + arg)); + const [resultArg, next]: Array = [ + args[result], + args.at(result + 1), + ]; + if (resultArg && resultArg.includes("=")) { + return Either.right(resultArg.split("=")[1] as V); + } + if (typeof next === "undefined") + return Either.left(new Error("no value specified for " + arg)); + if (isArgKey(next)) + return Either.left( + new Error("next value for arg " + arg + " is another arg " + next), + ); + return Either.right(next as V); +}; + +type ObjectFromList, V = string> = { + [K in T extends ReadonlyArray ? U : never]: V; +}; +export const argv = ( + args: ReadonlyArray, + defaultArgs?: Partial>, + argv = Deno.args, +) => { + return args + .map((arg) => [arg, getArg(arg, argv)] as [K, IEither]) + .map(([arg, specified]): [K, IEither] => [ + arg, + specified.fold((e, val) => { + const hasDefaultVal = e && defaultArgs && arg in defaultArgs; + if (hasDefaultVal) { + return Either.right(defaultArgs[arg]!); + } else if (!val || e) { + return Either.left(e ?? new Error("unknown")); + } + return Either.right(val); + }), + ]) + .reduce( + ( + acc: IEither>, + x: [K, IEither], + ): IEither> => { + const [arg, eitherVal] = x; + return acc.flatMap((args) => { + return eitherVal.mapRight((envValue) => ({ + ...args, + [arg]: envValue, + })); + }); + }, + Either.right({} as ObjectFromList), + ); +}; diff --git a/u/process/mod.ts b/u/process/mod.ts index 3f02d46..211e9a7 100644 --- a/u/process/mod.ts +++ b/u/process/mod.ts @@ -1,3 +1,4 @@ export * from "./env.ts"; export * from "./run.ts"; export * from "./validate_identifier.ts"; +export * from "./argv.ts"; diff --git a/u/server/activity/fourohfour.ts b/u/server/activity/fourohfour.ts index c09aef6..ed8c7eb 100644 --- a/u/server/activity/fourohfour.ts +++ b/u/server/activity/fourohfour.ts @@ -7,14 +7,10 @@ import { } from "@emprespresso/pengueno"; const messages = [ - "(≧ω≦)ゞ Oopsie! This endpoint has gone a-404-dable!", - "。゚(。ノωヽ。)゚。 Meow-t found! Your API call ran away!", - "404-bidden! But like...in a cute way (・`ω´・) !", - "(=①ω①=) This endpoint is hiss-terically missing!", - "┐(´∀`)┌ Whoopsie fluff! No API here!", - "(つ≧▽≦)つ Your data went on a paw-sible vacation!", - "(ꈍᴗꈍ) Uwu~ not found, but found our hearts instead!", - "ヽ(;▽;)ノ Eep! This route has ghosted you~", + "D: Meow-t found! Your API call ran away!", + "404-bidden! But like...in a cute way >:3 !", + ":o Your data went on a paw-sible vacation!", + "uwu~ not found, but found our hearts instead!", ]; const randomFourOhFour = () => messages[Math.random() * messages.length]; diff --git a/u/server/request.ts b/u/server/request.ts index 480ee69..c857f88 100644 --- a/u/server/request.ts +++ b/u/server/request.ts @@ -2,11 +2,10 @@ import { LogMetricTraceable } from "@emprespresso/pengueno"; const greetings = [ "hewwo :D", - "hiya cutie (✿◠‿◠)", - "boop! ૮・ᴥ・ა", - "sending virtual hugs! (づ。◕‿‿◕。)づ", - "stay pawsitive ₍^..^₎⟆", - "⋆。‧˚❆🐧❆˚‧。⋆", + "hiya cutie", + "boop!", + "sending virtual hugs!", + "stay pawsitive", ]; const penguenoGreeting = () => greetings[Math.floor(Math.random() * greetings.length)]; -- cgit v1.2.3-70-g09d2