asphodelos 0.0.1 → 0.2.1

package/README.md

@@ -250,10 +250,6 @@ export default defineConfig({
 })
 ```
 
-TanStack-family mutations also get a `<operation>MutationOptions()` factory, and SWR queries a
-`useImmutable<Operation>` hook. The generated hooks are compiled and run against the real
-libraries in [`test/`](test/README.md).
-
 ### Infinite Query (`x-pagination`)
 
 Set `x-pagination: true` on a GET operation to generate infinite query hooks.
@@ -511,7 +507,7 @@ name:
 | String      | `x-minLength-message`, `x-maxLength-message`, `x-pattern-message`, `x-length-message`                                                                                                                                                                                                                       |
 | Array       | `x-minItems-message`, `x-maxItems-message`, `x-uniqueItems-message`, `x-contains-message`, `x-minContains-message`, `x-maxContains-message`, `x-prefixItems-message`, `x-items-message`                                                                                                                     |
 | Object      | `x-minProperties-message`, `x-maxProperties-message`, `x-additionalProperties-message`†, `x-propertyNames-message`, `x-patternProperties-message`†, `x-dependentRequired-message`, `x-dependentSchemas-message`, `x-properties-message`†, `x-unevaluatedProperties-message`†, `x-unevaluatedItems-message`† |
-| Combinators | `x-allOf-message`‡, `x-anyOf-message`, `x-oneOf-message`, `x-not-message`, `x-implication-message`                                                                                                                                                                                                          |
+| Composition | `x-allOf-message`‡, `x-anyOf-message`, `x-oneOf-message`, `x-not-message`, `x-implication-message`                                                                                                                                                                                                          |
 | Conditional | `x-if-message`†, `x-then-message`†, `x-else-message`†                                                                                                                                                                                                                                                       |
 
 - † Kept on the schema, but Elysia 1.4 cannot route a 422 to it.
@@ -586,7 +582,7 @@ bun run test:clients   # build, then compile and run the generated hooks under t
 bun run test:pack      # build, pack, and install the tarball with npm into an empty project
 ```
 
-Coding agents: start with [AGENTS.md](AGENTS.md).
+Coding agents: start with [AGENTS.md](https://github.com/nakita628/asphodelos/blob/main/AGENTS.md).
 
 ## License
 

package/dist/cli.mjs

@@ -45,7 +45,7 @@ function runConfigPass(configPath, reload) {
 			import("./index.mjs"),
 			import("./openapi-B4aAnx4P.mjs").then((n) => n.t),
 			import("./format-B0W7HIAg.mjs").then((n) => n.r),
-			import("./shared-CrbXsFUJ.mjs").then((n) => n.a)
+			import("./shared-B-ADz5ww.mjs").then((n) => n.a)
 		]));
 		const config = yield* readConfig(configPath, reload);
 		const jobs = makeJob(yield* parseOpenAPI(config.input), config);
@@ -102,7 +102,7 @@ function awaitChange(configPath, inputDirectory) {
 * not take the watcher down with it.
 *
 * Recursive rather than a loop because the directory to watch comes from the config, and the
-* config is re-read every round: an edit that repoints `input` elsewhere has to move the watcher
+* config is re-read every round: an edit that points `input` somewhere else has to move the watcher
 * with it, which means new streams rather than new values.
 */
 function watchConfig(configPath, inputDirectory) {
@@ -140,7 +140,7 @@ function generate(args) {
 		if (output !== void 0 && input === void 0) return yield* reject("-o <output.ts> requires an <input> document.");
 		if (args.watch && (input !== void 0 || output !== void 0)) return yield* reject("--watch runs a config file, so it cannot be combined with <input> or --output.");
 		if (input !== void 0 && output !== void 0) {
-			const [{ parseOpenAPI }, { elysia }] = yield* Effect.promise(() => Promise.all([import("./openapi-B4aAnx4P.mjs").then((n) => n.t), import("./core-DS3sAabb.mjs").then((n) => n.t)]));
+			const [{ parseOpenAPI }, { elysia }] = yield* Effect.promise(() => Promise.all([import("./openapi-B4aAnx4P.mjs").then((n) => n.t), import("./core-C1NqA5VJ.mjs").then((n) => n.t)]));
 			return yield* Console.log(yield* elysia(yield* parseOpenAPI(input), { output }));
 		}
 		const resolvedConfig = configPath ?? DEFAULT_CONFIG_FILE;

package/dist/{core-DS3sAabb.mjs → core-C1NqA5VJ.mjs}

@@ -385,7 +385,7 @@ function sccSchemas(schemas) {
 	const lowlink = /* @__PURE__ */ new Map();
 	const onStack = /* @__PURE__ */ new Set();
 	const stack = [];
-	const sccs = [];
+	const groups = [];
 	const counter = { value: 0 };
 	const strongconnect = (v) => {
 		index.set(v, counter.value);
@@ -407,11 +407,11 @@ function sccSchemas(schemas) {
 				if (def) group.push(def);
 				if (w === v) break;
 			}
-			sccs.push(group);
+			groups.push(group);
 		}
 	};
 	for (const { name } of schemas) if (!index.has(name)) strongconnect(name);
-	return sccs;
+	return groups;
 }
 const REF_SUFFIX = {
 	schemas: "Schema",
@@ -1666,12 +1666,12 @@ function fileNameOf(group) {
 	return uncapitalize(group.map((g) => g.name).toSorted()[0] ?? "schema");
 }
 function splitSchemaFiles(section, readonly, exportTypes) {
-	const sccs = sccSchemas(Object.entries(section).map(([name, schema]) => ({
+	const groups = sccSchemas(Object.entries(section).map(([name, schema]) => ({
 		name,
 		schema
 	})));
-	const nameToFile = new Map(sccs.flatMap((g) => g.map((s) => [s.name, fileNameOf(g)])));
-	return sccs.map((group) => {
+	const nameToFile = new Map(groups.flatMap((g) => g.map((s) => [s.name, fileNameOf(g)])));
+	return groups.map((group) => {
 		const fileName = fileNameOf(group);
 		const body = schemasCode(Object.fromEntries(group.map((g) => [g.name, g.schema])), readonly, exportTypes);
 		if (body === "") return {
@@ -2248,8 +2248,9 @@ function optionsObjectType(config, optionsType) {
 }
 const QUERY_OMIT_KEYS = `'queryKey' | 'queryFn'`;
 const INFINITE_OMIT_KEYS = `'queryKey' | 'queryFn' | 'initialPageParam' | 'getNextPageParam'`;
-function omitInjectedKeys(config, optionsType, keys) {
-	return `Omit<${config.maybeRefOptions ? `Extract<${optionsType}, { queryKey: unknown }>` : optionsObjectType(config, optionsType)}, ${keys}>`;
+const MUTATION_OMIT_KEYS = `'mutationKey' | 'mutationFn'`;
+function omitInjectedKeys(config, optionsType, keys, marker = "{ queryKey: unknown }") {
+	return `Omit<${config.maybeRefOptions ? `Extract<${optionsType}, ${marker}>` : optionsObjectType(config, optionsType)}, ${keys}>`;
 }
 function makeGetQueryOptionsParam(config, dataT, keyName) {
 	const optType = config.queryOptionsType;
@@ -2260,8 +2261,8 @@ function makeGetQueryOptionsParam(config, dataT, keyName) {
 	return `queryOptions?: ${omit(`${optType}<${dataT}, TError, TData>`)}`;
 }
 function makeMutationOptionsParam(config, dataT, errorT, variablesType) {
-	const optType = `${config.mutationOptionsType}<${dataT}, ${errorT}, ${variablesType}>`;
-	return config.thunkOptionsCall ? `mutationOptions?: () => ${optionsObjectType(config, optType)}` : `mutationOptions?: ${optType}`;
+	const optType = omitInjectedKeys(config, `${config.mutationOptionsType}<${dataT}, ${errorT}, ${variablesType}>`, MUTATION_OMIT_KEYS, "{ mutationKey?: unknown }");
+	return config.thunkOptionsCall ? `mutationOptions?: () => ${optType}` : `mutationOptions?: ${optType}`;
 }
 function makeGetHookBody(config, dataT, keyCall, queryFnBlock) {
 	const inner = `${config.thunkOptionsCall ? "...queryOptions?.()" : "...queryOptions"},queryKey:${keyCall},${queryFnBlock}`;
@@ -3427,7 +3428,7 @@ function delayMiddleware(delay) {
 * test) starts no server.
 *
 * A secured operation that declares a 401 checks for the credential first, and a path parameter
-* with a recognisable "missing" value answers 404 — so a client can drive the unhappy paths the
+* with a recognizable "missing" value answers 404 — so a client can drive the unhappy paths the
 * document promises, not just the happy one.
 */
 function makeMock(spec, options = {}) {

package/dist/{shared-CrbXsFUJ.mjs → shared-B-ADz5ww.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-wcPFST8Q.mjs";
-import { S as unlink, _ as responses, a as hooks, c as mediaTypes, d as links, f as securitySchemes, g as parameters, h as examples, i as mock, l as pathItems, m as requestBodies, n as types, o as elysia, p as headers, r as test, s as eden, u as callbacks, v as schemas, x as readdir, y as components } from "./core-DS3sAabb.mjs";
+import { S as unlink, _ as responses, a as hooks, c as mediaTypes, d as links, f as securitySchemes, g as parameters, h as examples, i as mock, l as pathItems, m as requestBodies, n as types, o as elysia, p as headers, r as test, s as eden, u as callbacks, v as schemas, x as readdir, y as components } from "./core-C1NqA5VJ.mjs";
 import { Effect } from "effect";
 import path, { posix } from "node:path";
 //#region src/shared/index.ts

package/dist/vite-plugin/index.mjs

@@ -1,8 +1,8 @@
 import { parseConfig } from "../index.mjs";
 import { t as FormatOptions } from "../format-B0W7HIAg.mjs";
-import { b as fileSystemLayer } from "../core-DS3sAabb.mjs";
+import { b as fileSystemLayer } from "../core-C1NqA5VJ.mjs";
 import { n as parseOpenAPI } from "../openapi-B4aAnx4P.mjs";
-import { i as makeJob, n as isUserCodeJob, r as jobTargets, t as cleanSplitOutputs } from "../shared-CrbXsFUJ.mjs";
+import { i as makeJob, n as isUserCodeJob, r as jobTargets, t as cleanSplitOutputs } from "../shared-B-ADz5ww.mjs";
 import { Effect, FileSystem, Result } from "effect";
 import path from "node:path";
 import crypto from "node:crypto";
@@ -42,7 +42,7 @@ function messageOf(error) {
 /**
 * Loads and validates the config through Vite's own module loader.
 *
-* `ssrLoadModule` rather than the CLI's `readConfig`: Vite already transpiles TypeScript and
+* `ssrLoadModule` rather than the CLI's `readConfig`: Vite already compiles TypeScript and
 * resolves the config's imports the way the rest of the project sees them, and invalidating the
 * module is how an edit is picked up. Every failure comes back as the sentence to print.
 */
@@ -178,7 +178,7 @@ function removeStaleOutput(output, keep) {
 /**
 * Removes what the previous pass generated and this one no longer does, answering with what went.
 *
-* A config edit that repoints or drops an output, or a document that no longer has a section,
+* A config edit that moves or drops an output, or a document that no longer has a section,
 * would otherwise leave the old file behind, still importing names that are gone. Deliberately
 * narrower than a recursive delete, because a path the config used to name may be shared with the
 * user:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "asphodelos",
-  "version": "0.0.1",
-  "description": "Generate type-safe Elysia code — routes, TypeBox schemas, Eden wrappers, client hooks, tests and a mock server — from OpenAPI or TypeSpec",
+  "version": "0.2.1",
+  "description": "Asphodelos is a code generator from OpenAPI to Elysia",
   "keywords": [
     "elysia",
     "openapi"
@@ -36,22 +36,17 @@
     }
   },
   "scripts": {
-    "dev": "bun run src/index.ts",
     "build": "tsdown",
     "lint": "oxlint",
-    "lint:fix": "oxlint --fix",
     "test": "bun test",
-    "typecheck": "tsc --noEmit",
-    "prepublishOnly": "bun run build",
-    "prepack": "cp ../../README.md ../../LICENSE .",
-    "postpack": "rm -f README.md LICENSE"
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^12.1.0",
     "@effect/platform-node": "4.0.0-rc.112",
     "@effect/platform-node-shared": "4.0.0-rc.112",
-    "@typespec/compiler": "^1.11.0",
-    "@typespec/openapi3": "^1.11.0",
+    "@typespec/compiler": "^1.16.0",
+    "@typespec/openapi3": "^1.16.0",
     "effect": "4.0.0-rc.112",
     "oxfmt": "^0.67.0",
     "ts-morph": "^28.0.0"
@@ -60,9 +55,9 @@
     "@faker-js/faker": "^10.6.0",
     "@sinclair/typebox": "^0.34.49",
     "@types/bun": "latest",
-    "@typespec/http": "^1.11.0",
-    "@typespec/rest": "^0.81.0",
-    "@typespec/versioning": "^0.81.0",
+    "@typespec/http": "^1.16.0",
+    "@typespec/rest": "^0.86.0",
+    "@typespec/versioning": "^0.86.0",
     "elysia": "^1.4.28",
     "oxlint": "^1.82.0",
     "oxlint-tsgolint": "^7.0.2001",