@questpie/openapi 3.0.25 → 3.0.26

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { a as openApiRoute, i as openApiModule, n as generateOpenApiSpec, o as server_default, r as openApiConfig, t as docsRoute } from "./server-DD4ci13b.mjs";
+import { a as openApiRoute, i as openApiModule, n as generateOpenApiSpec, o as server_default, r as openApiConfig, t as docsRoute } from "./server-IiX4cD55.mjs";
 
 export { server_default as default, docsRoute, generateOpenApiSpec, openApiConfig, openApiModule, openApiRoute };

package/dist/modules/openapi.mjs

@@ -1,3 +1,3 @@
-import { i as openApiModule } from "../server-DD4ci13b.mjs";
+import { i as openApiModule } from "../server-IiX4cD55.mjs";
 
 export { openApiModule };

package/dist/{server-DD4ci13b.mjs → server-IiX4cD55.mjs}

@@ -296,6 +296,82 @@ function generateAuthPaths(config) {
 	};
 }
 
+//#endregion
+//#region src/generator/field-schema-flags.ts
+function buildFieldDefinitionSchemas(fieldDefinitions) {
+	if (!fieldDefinitions || typeof fieldDefinitions !== "object") return null;
+	const inputShape = {};
+	const responseShape = {};
+	for (const [fieldName, fieldDefinition] of Object.entries(fieldDefinitions)) {
+		const fd = fieldDefinition;
+		if (typeof fd.toZodSchema !== "function") continue;
+		try {
+			const schema = fd.toZodSchema();
+			if (!schema || typeof schema !== "object" || !("_def" in schema)) continue;
+			if (fd._state?.input !== false) inputShape[fieldName] = schema;
+			if (fd._state?.output !== false) responseShape[fieldName] = schema;
+		} catch {}
+	}
+	if (Object.keys(inputShape).length === 0 && Object.keys(responseShape).length === 0) return null;
+	const insertJsonSchema = z.toJSONSchema(z.object(inputShape), { unrepresentable: "any" });
+	const updateJsonSchema = z.toJSONSchema(z.object(inputShape).partial(), { unrepresentable: "any" });
+	const responseJsonSchema = z.toJSONSchema(z.object(responseShape), { unrepresentable: "any" });
+	applyRequestFieldFlags(insertJsonSchema, fieldDefinitions);
+	applyRequestFieldFlags(updateJsonSchema, fieldDefinitions);
+	applyResponseFieldFlags(responseJsonSchema, fieldDefinitions);
+	return {
+		insert: insertJsonSchema,
+		update: updateJsonSchema,
+		response: responseJsonSchema
+	};
+}
+function applyRequestFieldFlags(schema, fieldDefinitions) {
+	applyFieldFlags(schema, fieldDefinitions, "request");
+}
+function applyResponseFieldFlags(schema, fieldDefinitions) {
+	applyFieldFlags(schema, fieldDefinitions, "response");
+}
+function applyFieldFlags(schema, fieldDefinitions, mode) {
+	if (!schema || typeof schema !== "object") return;
+	if (!fieldDefinitions || typeof fieldDefinitions !== "object") return;
+	for (const [fieldName, fieldDefinition] of Object.entries(fieldDefinitions)) {
+		const state = fieldDefinition._state;
+		if (!state) continue;
+		if (mode === "request" && state.input === false) {
+			removeProperty(schema, fieldName);
+			continue;
+		}
+		if (mode === "response" && state.output === false) {
+			removeProperty(schema, fieldName);
+			continue;
+		}
+		if (mode === "request" && state.output === false) markProperty(schema, fieldName, "writeOnly");
+		if (mode === "response" && state.input === false) markProperty(schema, fieldName, "readOnly");
+		const propertySchema = getProperty(schema, fieldName);
+		if (propertySchema && state.nestedFields) applyFieldFlags(propertySchema, state.nestedFields, mode);
+	}
+}
+function getProperty(schema, fieldName) {
+	if (!schema || typeof schema !== "object") return void 0;
+	return schema.properties?.[fieldName];
+}
+function removeProperty(schema, fieldName) {
+	if (!schema || typeof schema !== "object") return;
+	const schemaObject = schema;
+	if (!schemaObject.properties?.[fieldName]) return;
+	delete schemaObject.properties[fieldName];
+	if (Array.isArray(schemaObject.required)) schemaObject.required = schemaObject.required.filter((field) => field !== fieldName);
+}
+function markProperty(schema, fieldName, flag) {
+	if (!schema || typeof schema !== "object") return;
+	const properties = schema.properties;
+	if (!properties?.[fieldName] || typeof properties[fieldName] !== "object") return;
+	properties[fieldName] = {
+		...properties[fieldName],
+		[flag]: true
+	};
+}
+
 //#endregion
 //#region src/generator/collections.ts
 /**
@@ -321,9 +397,11 @@ function generateCollectionPaths(app, config) {
 		const documentSchemaName = `${pascalName}Document`;
 		const insertSchemaName = `${pascalName}Insert`;
 		const updateSchemaName = `${pascalName}Update`;
-		const fieldDefinitionSchema = buildSchemaFromFieldDefinitions(state.fieldDefinitions);
+		const fieldDefinitionSchema = buildFieldDefinitionSchemas(state.fieldDefinitions);
 		if (state.validation?.insertSchema) try {
-			schemas[insertSchemaName] = z.toJSONSchema(state.validation.insertSchema, { unrepresentable: "any" });
+			const insertSchema = z.toJSONSchema(state.validation.insertSchema, { unrepresentable: "any" });
+			applyRequestFieldFlags(insertSchema, state.fieldDefinitions);
+			schemas[insertSchemaName] = insertSchema;
 		} catch {
 			schemas[insertSchemaName] = {
 				type: "object",
@@ -336,7 +414,9 @@ function generateCollectionPaths(app, config) {
 			description: `Insert schema for ${name}`
 		};
 		if (state.validation?.updateSchema) try {
-			schemas[updateSchemaName] = z.toJSONSchema(state.validation.updateSchema, { unrepresentable: "any" });
+			const updateSchema = z.toJSONSchema(state.validation.updateSchema, { unrepresentable: "any" });
+			applyRequestFieldFlags(updateSchema, state.fieldDefinitions);
+			schemas[updateSchemaName] = updateSchema;
 		} catch {
 			schemas[updateSchemaName] = {
 				type: "object",
@@ -348,7 +428,7 @@ function generateCollectionPaths(app, config) {
 			type: "object",
 			description: `Update schema for ${name}`
 		};
-		schemas[documentSchemaName] = buildDocumentSchema(name, state, insertSchemaName);
+		schemas[documentSchemaName] = buildDocumentSchema(name, state, insertSchemaName, fieldDefinitionSchema?.response);
 		const prefix = `${basePath}/${name}`;
 		paths[prefix] = {
 			get: {
@@ -543,7 +623,7 @@ function generateCollectionPaths(app, config) {
 * Build a document response schema that extends the insert schema with
 * standard fields (id, timestamps).
 */
-function buildDocumentSchema(name, state, insertSchemaName) {
+function buildDocumentSchema(name, state, insertSchemaName, documentFieldsSchema) {
 	const properties = { id: { type: "string" } };
 	if (state.options?.timestamps !== false) {
 		properties.createdAt = {
@@ -564,32 +644,13 @@ function buildDocumentSchema(name, state, insertSchemaName) {
 			type: "object",
 			properties,
 			required: ["id"]
-		}, ref(insertSchemaName)],
+		}, documentFieldsSchema ?? ref(insertSchemaName)],
 		description: `${name} document`
 	};
 }
 function toPascalCase$1(str) {
 	return str.replace(/[-_](.)/g, (_, c) => c.toUpperCase()).replace(/^(.)/, (_, c) => c.toUpperCase());
 }
-function buildSchemaFromFieldDefinitions(fieldDefinitions) {
-	if (!fieldDefinitions || typeof fieldDefinitions !== "object") return null;
-	const shape = {};
-	for (const [fieldName, fieldDefinition] of Object.entries(fieldDefinitions)) {
-		const fd = fieldDefinition;
-		if (typeof fd.toZodSchema !== "function") continue;
-		try {
-			const schema = fd.toZodSchema();
-			if (schema && typeof schema === "object" && "_def" in schema) shape[fieldName] = schema;
-		} catch {}
-	}
-	if (Object.keys(shape).length === 0) return null;
-	const insertSchema = z.object(shape);
-	const updateSchema = insertSchema.partial();
-	return {
-		insert: z.toJSONSchema(insertSchema, { unrepresentable: "any" }),
-		update: z.toJSONSchema(updateSchema, { unrepresentable: "any" })
-	};
-}
 
 //#endregion
 //#region src/generator/globals.ts
@@ -615,16 +676,18 @@ function generateGlobalPaths(app, config) {
 		const pascalName = toPascalCase(name);
 		const valueSchemaName = `${pascalName}Global`;
 		const updateSchemaName = `${pascalName}GlobalUpdate`;
-		const fieldDefinitionSchema = buildGlobalSchemaFromFieldDefinitions(state.fieldDefinitions);
+		const fieldDefinitionSchema = buildFieldDefinitionSchemas(state.fieldDefinitions);
 		if (state.validation?.updateSchema) try {
-			schemas[updateSchemaName] = z.toJSONSchema(state.validation.updateSchema, { unrepresentable: "any" });
+			const updateSchema = z.toJSONSchema(state.validation.updateSchema, { unrepresentable: "any" });
+			applyRequestFieldFlags(updateSchema, state.fieldDefinitions);
+			schemas[updateSchemaName] = updateSchema;
 		} catch {
 			schemas[updateSchemaName] = {
 				type: "object",
 				description: `Update schema for ${name} global`
 			};
 		}
-		else if (fieldDefinitionSchema != null) schemas[updateSchemaName] = fieldDefinitionSchema;
+		else if (fieldDefinitionSchema != null) schemas[updateSchemaName] = fieldDefinitionSchema.update;
 		else schemas[updateSchemaName] = {
 			type: "object",
 			description: `Update schema for ${name} global`
@@ -645,7 +708,7 @@ function generateGlobalPaths(app, config) {
 				type: "object",
 				properties,
 				required: ["id"]
-			}, ref(updateSchemaName)],
+			}, fieldDefinitionSchema?.response ?? ref(updateSchemaName)],
 			description: `${name} global value`
 		};
 		const prefix = `${basePath}/globals/${name}`;
@@ -762,20 +825,6 @@ function generateGlobalPaths(app, config) {
 function toPascalCase(str) {
 	return str.replace(/[-_](.)/g, (_, c) => c.toUpperCase()).replace(/^(.)/, (_, c) => c.toUpperCase());
 }
-function buildGlobalSchemaFromFieldDefinitions(fieldDefinitions) {
-	if (!fieldDefinitions || typeof fieldDefinitions !== "object") return null;
-	const shape = {};
-	for (const [fieldName, fieldDefinition] of Object.entries(fieldDefinitions)) {
-		const fd = fieldDefinition;
-		if (typeof fd.toZodSchema !== "function") continue;
-		try {
-			const schema = fd.toZodSchema();
-			if (schema && typeof schema === "object" && "_def" in schema) shape[fieldName] = schema;
-		} catch {}
-	}
-	if (Object.keys(shape).length === 0) return null;
-	return z.toJSONSchema(z.object(shape).partial(), { unrepresentable: "any" });
-}
 
 //#endregion
 //#region src/generator/routes.ts

package/dist/server.mjs

@@ -1,3 +1,3 @@
-import { a as openApiRoute, i as openApiModule, n as generateOpenApiSpec, o as server_default, r as openApiConfig, t as docsRoute } from "./server-DD4ci13b.mjs";
+import { a as openApiRoute, i as openApiModule, n as generateOpenApiSpec, o as server_default, r as openApiConfig, t as docsRoute } from "./server-IiX4cD55.mjs";
 
 export { server_default as default, docsRoute, generateOpenApiSpec, openApiConfig, openApiModule, openApiRoute };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@questpie/openapi",
-	"version": "3.0.25",
+	"version": "3.0.26",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/questpie/questpie.git",
@@ -66,7 +66,7 @@
 		"check-types": "tsc --noEmit"
 	},
 	"dependencies": {
-		"questpie": "^3.5.3",
+		"questpie": "^3.5.4",
 		"zod": "^4.2.1"
 	},
 	"devDependencies": {