metal-orm 1.0.88 → 1.0.89

package/dist/index.cjs

@@ -7341,6 +7341,7 @@ var extractInputSchema = (table, context, options) => {
   if (options.includeRelations && context.depth < context.maxDepth) {
     for (const [relationName, relation] of Object.entries(table.relations)) {
       properties[relationName] = extractInputRelationSchema(
+        relationName,
         relation,
         { ...context, depth: context.depth + 1 },
         options
@@ -7375,7 +7376,7 @@ var buildPrimaryKeySchema = (table, options) => {
   }
   return mapColumnType(column, options);
 };
-var extractInputRelationSchema = (relation, context, options) => {
+var extractInputRelationSchema = (relationName, relation, context, options) => {
   const { type: relationType, isNullable } = mapRelationType(relation.type);
   const relationMode = options.relationMode ?? "mixed";
   const allowIds = relationMode !== "objects";
@@ -7385,7 +7386,11 @@ var extractInputRelationSchema = (relation, context, options) => {
     variants.push(buildPrimaryKeySchema(relation.target, options));
   }
   if (allowObjects) {
-    const targetSchema = extractInputSchema(relation.target, context, options);
+    let targetSchema = extractInputSchema(relation.target, context, options);
+    targetSchema = applyRelationSelection(targetSchema, options.relationSelections?.[relationName]);
+    if (options.excludeRelationForeignKeys && isRelationForeignKeyToParent(relation)) {
+      targetSchema = removeForeignKey(targetSchema, relation.foreignKey);
+    }
     variants.push(targetSchema);
   }
   const itemSchema = variants.length === 1 ? variants[0] : { anyOf: variants };
@@ -7401,6 +7406,43 @@ var extractInputRelationSchema = (relation, context, options) => {
     nullable: isNullable
   };
 };
+var applyRelationSelection = (schema, selection) => {
+  if (!selection || selection.pick === void 0 && selection.omit === void 0) {
+    return schema;
+  }
+  const hasPick = selection.pick !== void 0;
+  const pick = hasPick ? new Set(selection.pick ?? []) : void 0;
+  const omit = selection.omit !== void 0 ? new Set(selection.omit ?? []) : void 0;
+  const properties = Object.entries(schema.properties).reduce(
+    (acc, [key, value]) => {
+      if (pick && !pick.has(key)) return acc;
+      if (omit && omit.has(key)) return acc;
+      acc[key] = value;
+      return acc;
+    },
+    {}
+  );
+  const required = schema.required.filter((name) => properties[name] !== void 0);
+  return {
+    ...schema,
+    properties,
+    required
+  };
+};
+var removeForeignKey = (schema, foreignKey) => {
+  if (!foreignKey || !schema.properties[foreignKey]) return schema;
+  const properties = { ...schema.properties };
+  delete properties[foreignKey];
+  const required = schema.required.filter((name) => name !== foreignKey);
+  return {
+    ...schema,
+    properties,
+    required
+  };
+};
+var isRelationForeignKeyToParent = (relation) => {
+  return relation.type === RelationKinds.HasMany || relation.type === RelationKinds.HasOne;
+};
 
 // src/openapi/schema-extractor-output.ts
 var extractOutputSchema = (table, plan, projectionNodes, context, options) => {
@@ -7700,12 +7742,17 @@ var extractSchema = (table, plan, projectionNodes, options = {}) => {
   if (outputOptions.refMode === "components") {
     outputContext.components = { schemas: {} };
   }
-  const output = extractOutputSchema(table, plan, projectionNodes, outputContext, outputOptions);
+  const outputSchema = extractOutputSchema(table, plan, projectionNodes, outputContext, outputOptions);
+  let output = outputSchema;
   const useSelected = shouldUseSelectedSchema(outputOptions, plan, projectionNodes);
   const hasComputedFields = hasComputedProjection(projectionNodes);
-  if (outputOptions.refMode === "components" && outputContext.components && !hasComputedFields) {
+  const canUseComponents = outputOptions.refMode === "components" && outputContext.components && !hasComputedFields;
+  if (canUseComponents) {
     const componentName = useSelected && plan ? resolveSelectedComponentName(table, plan, outputOptions) : resolveComponentName(table, outputOptions);
-    registerComponentSchema(componentName, output, outputContext);
+    registerComponentSchema(componentName, outputSchema, outputContext);
+    if (outputOptions.outputAsRef) {
+      output = { $ref: `#/components/schemas/${componentName}` };
+    }
   }
   const inputOptions = resolveInputOptions(options);
   if (!inputOptions) {
@@ -7732,7 +7779,8 @@ var resolveOutputOptions = (options) => ({
   maxDepth: options.maxDepth ?? DEFAULT_MAX_DEPTH,
   refMode: options.refMode ?? "inline",
   selectedRefMode: options.selectedRefMode ?? "inline",
-  componentName: options.componentName
+  componentName: options.componentName,
+  outputAsRef: options.outputAsRef ?? false
 });
 var resolveInputOptions = (options) => {
   if (options.input === false) return void 0;
@@ -7750,7 +7798,9 @@ var resolveInputOptions = (options) => {
     maxDepth: input.maxDepth ?? options.maxDepth ?? DEFAULT_MAX_DEPTH,
     omitReadOnly: input.omitReadOnly ?? true,
     excludePrimaryKey: input.excludePrimaryKey ?? false,
-    requirePrimaryKey: input.requirePrimaryKey ?? mode === "update"
+    requirePrimaryKey: input.requirePrimaryKey ?? mode === "update",
+    excludeRelationForeignKeys: input.excludeRelationForeignKeys ?? false,
+    relationSelections: input.relationSelections
   };
 };
 var schemaToJson = (schema, pretty = false) => {