@sohcah/openapi-generator 0.1.2 → 0.2.1

package/dist/{chunk-51aI8Tpl.js → chunk-DYFKRlHt.js}

@@ -1,3 +1,5 @@
+import { createRequire } from "node:module";
+
 //#region rolldown:runtime
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -28,6 +30,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
-export { __commonJS, __export, __toESM };
+export { __commonJS, __export, __require, __toESM };

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import "./helpers-tkoILkcL.js";
-import { generateToFile } from "./src-Di4R7y_C.js";
+import { generateToFile } from "./src-DhXSDR6J.js";
+import "./helpers-CqzmoMek.js";
 import { Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 import { Effect } from "effect";

package/dist/config.d.ts

@@ -1,5 +1,5 @@
-import "./types-DjImZ4S-.js";
-import { OpenapiGenerateToFileOptions } from "./index-BOme2BJ_.js";
+import "./types-DMB5w9Tt.js";
+import { OpenapiGenerateToFileOptions } from "./index-DY2v-Q37.js";
 
 //#region src/config.d.ts
 declare const defineConfig: (config: OpenapiGenerateToFileOptions) => OpenapiGenerateToFileOptions;

package/dist/generators/index.d.ts

@@ -1,67 +1,7 @@
-import { DocumentContext, HttpMethod, ImportReference, NotImplementedError, OpenApiClientGenerator, OpenApiGenerator, OpenApiParametersSchema, OpenApiResponseSchema, OpenApiSchemaGenerator, OperationKey, OperationObject, SchemaObject, helpers_d_exports } from "../types-DjImZ4S-.js";
+import { DocumentContext, HttpMethod, ImportReference, NotImplementedError, OpenApiClientGenerator, OpenApiGenerator, OpenApiParametersSchema, OpenApiResponseSchema, OpenApiSchemaGenerator, OperationKey, OperationObject, SchemaGeneratorOptions, SchemaObject, createSchemaGenerator, helpers_d_exports } from "../types-DMB5w9Tt.js";
 import { Effect } from "effect";
 import * as t from "@babel/types";
 
-//#region src/generators/schema.d.ts
-
-interface SchemaGeneratorOptions {
-  /** @default null */
-  custom?: (schema: SchemaObject) => ImportReference | null;
-  /** @default false */
-  experimental_includeTypes?: boolean;
-  /** @default true */
-  includeSchemas?: boolean;
-  /** @default false */
-  includeOperations?: boolean;
-  /** @default "unknown" */
-  deprecationHandling?: "unknown" | "optional";
-}
-interface DefaultSchemaGeneratorOptions extends SchemaGeneratorOptions {
-  modifiers: {
-    lazy: (expression: t.Expression) => t.Expression;
-    optional: (expression: t.Expression) => t.Expression;
-    regex: (expression: t.Expression, pattern: string) => t.Expression;
-    immutable: (expression: t.Expression) => t.Expression;
-    mutable: (expression: t.Expression) => t.Expression;
-    nullable: (expression: t.Expression) => t.Expression;
-  };
-  types: {
-    schema: t.TSQualifiedName;
-    typeDecoded: t.TSQualifiedName;
-    typeEncoded: t.TSQualifiedName;
-  };
-  schema: {
-    record: (key: t.Expression, value: t.Expression) => t.Expression;
-    union: (expressions: t.Expression[]) => t.Expression;
-    enum: (expressions: t.Expression[]) => t.Expression;
-    instanceOf: t.Expression;
-    boolean: t.Expression;
-    string: t.Expression;
-    number: t.Expression;
-    integer: t.Expression;
-    array: t.Expression;
-    object: t.Expression;
-    null: t.Expression;
-    unknown: t.Expression;
-  };
-  transformer: (options: {
-    encoded: t.Expression;
-    decoded: t.Expression;
-    decode: t.Expression | t.BlockStatement;
-    decodeAsync?: boolean;
-    encode: t.Expression | t.BlockStatement;
-    encodeAsync?: boolean;
-  }) => t.Expression;
-  transformerCatch: (expression: t.Expression) => t.BlockStatement;
-  methods: {
-    encode: (schema: t.Expression, value: t.Expression) => t.Expression;
-    decode: (schema: t.Expression, value: t.Expression) => t.Expression;
-    parse: (schema: t.Expression, value: t.Expression) => t.Expression;
-  };
-  supportsImmutability: boolean;
-}
-declare function createSchemaGenerator(options: DefaultSchemaGeneratorOptions): OpenApiSchemaGenerator;
-//#endregion
 //#region src/generators/effect.d.ts
 declare const createEffectSchemaGenerator: (options: SchemaGeneratorOptions) => {
   initialize: () => Effect.Effect<void, never, DocumentContext>;

package/dist/generators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../../src/generators/schema.ts","../../../src/generators/effect.ts","../../../src/generators/zod.ts","../../../src/generators/client.ts"],"sourcesContent":[],"mappings":";;;;;;AAoBuC,UAAtB,sBAAA,CAAsB;EAAA;EAEP,MAAK,CAAA,EAAA,CAAA,MAAA,EAAjB,YAAiB,EAAA,GAAA,eAAA,GAAA,IAAA;EAAe;EAenC,yBAAA,CAAA,EAAA,OAA8B;EAAA;EAAA,cAEtB,CAAA,EAAA,OAAA;EAAU;EAAiB,iBACvB,CAAA,EAAA,OAAA;EAAU;EAAiB,mBAC9B,CAAA,EAAA,SAAA,GAAA,UAAA;;AACE,UALX,6BAAA,SAAsC,sBAKzB,CAAA;EAAU,SAAO,EAAA;IACrB,IAAE,EAAA,CAAA,UAAA,EAJL,CAAA,CAAE,UAIG,EAAA,GAJY,CAAA,CAAE,UAId;IAAe,QAAE,EAAA,CAAA,UAAA,EAHlB,CAAA,CAAE,UAGgB,EAAA,GAHD,CAAA,CAAE,UAGD;IAClB,KAAE,EAAA,CAAA,UAAA,EAHL,CAAA,CAAE,UAGG,EAAA,OAAA,EAAA,MAAA,EAAA,GAH6B,CAAA,CAAE,UAG/B;IAAe,SAAE,EAAA,CAAA,UAAA,EAFlB,CAAA,CAAE,UAEgB,EAAA,GAFD,CAAA,CAAE,UAED;IAGlC,OAAE,EAAA,CAAA,UAAA,EAJY,CAAA,CAAE,UAId,EAAA,GAJ6B,CAAA,CAAE,UAI/B;IACG,QAAE,EAAA,CAAA,UAAA,EAJQ,CAAA,CAAE,UAIV,EAAA,GAJyB,CAAA,CAAE,UAI3B;EAAe,CAAA;EACA,KAGd,EAAA;IAAmB,MAAE,EAL7B,CAAA,CAAE,eAK2B;IAAe,WAAE,EAJzC,CAAA,CAAE,eAIuC;IACjC,WAAE,EAJV,CAAA,CAAE,eAIQ;EAAU,CAAA;EAAmB,MAC9B,EAAA;IAAiB,MAAE,EAAA,CAAA,GAAA,EAF3B,CAAA,CAAE,UAEyB,EAAA,KAAA,EAFN,CAAA,CAAE,UAEI,EAAA,GAFW,CAAA,CAAE,UAEb;IAC7B,KAAE,EAAA,CAAA,WAAA,EAFO,CAAA,CAAE,UAET,EAAA,EAAA,GAF0B,CAAA,CAAE,UAE5B;IACL,IAAE,EAAA,CAAA,WAAA,EAFS,CAAA,CAAE,UAEX,EAAA,EAAA,GAF4B,CAAA,CAAE,UAE9B;IACH,UAAE,EAFE,CAAA,CAAE,UAEJ;IACF,OAAE,EAFD,CAAA,CAAE,UAED;IACD,MAAE,EAFH,CAAA,CAAE,UAEC;IACJ,MAAE,EAFD,CAAA,CAAE,UAED;IACD,OAAE,EAFD,CAAA,CAAE,UAED;IACJ,KAAE,EAFD,CAAA,CAAE,UAED;IACC,MAAE,EAFH,CAAA,CAAE,UAEC;IAGF,IAAE,EAJL,CAAA,CAAE,UAIG;IACF,OAAE,EAJF,CAAA,CAAE,UAIA;EAAU,CAAA;EACD,WAAK,EAAA,CAAA,OAAA,EAAA;IAEjB,OAAE,EAJD,CAAA,CAAE,UAID;IAAa,OAAE,EAHhB,CAAA,CAAE,UAGc;IAErB,MAAE,EAJE,CAAA,CAAE,UAIJ,GAJiB,CAAA,CAAE,cAInB;IACuB,WAAE,CAAA,EAAA,OAAA;IAAe,MAAE,EAHxC,CAAA,CAAE,UAGsC,GAHzB,CAAA,CAAE,cAGuB;IAE/B,WAAE,CAAA,EAAA,OAAA;EAAU,CAAA,EAAS,GAHlC,CAAA,CAAE,UAGkC;EAAU,gBAAO,EAAA,CAAA,UAAA,EAF5B,CAAA,CAAE,UAE0B,EAAA,GAFX,CAAA,CAAE,cAES;EAAU,OAChD,EAAA;IAAmB,MAAE,EAAA,CAAA,MAAA,EADvB,CAAA,CAAE,UACqB,EAAA,KAAA,EADF,CAAA,CAAE,UACA,EAAA,GADe,CAAA,CAAE,UACjB;IAAe,MAAE,EAAA,CAAA,MAAA,EAAxC,CAAA,CAAE,UAAsC,EAAA,KAAA,EAAnB,CAAA,CAAE,UAAiB,EAAA,GAAF,CAAA,CAAE,UAAA;IACzC,KAAE,EAAA,CAAA,MAAA,EAAF,CAAA,CAAE,UAAA,EAAA,KAAA,EAAmB,CAAA,CAAE,UAArB,EAAA,GAAoC,CAAA,CAAE,UAAtC;EAAU,CAAA;EAAqB,oBAAO,EAAA,OAAA;;AAsE5C,iBAAA,qBAAA,CAAqB,OAAA,EAC1B,6BAD0B,CAAA,EAElC,sBAFkC;;;cC3IxB,uCACF;EDWM,UAAA,EAAA,GAAA,gBAAsB,CAAA,IAAA,EAAA,KAAA,ECXN,eAAA,CDWM;EAAA,cAAA,EAAA,CAAA,MAAA,cAAA,EAAA,QAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAA,gBAEnB,EAAA,CAAA,MAAA,cAAA,EAAA,UAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAY,sBAAK,EAAA,CAAA,YAAA,cAAA,EAAA,SAAA,iBAAA,EAAA,IAAA,EAAA,MAAA,EAAA,gBAAA,+DAAA;EAAe,oBAAA,EAAA,CAAA,YAAA,cAAA,EAAA,SAAA,iBAAA,EAAA,gBAAA,6DAAA;EAenC,UAAA,gBAAA;EAA8B,aAAA,CAAA,EAAA,CAAA,MAAA,cAAA,EAAA,gBAAA,CAAA,IAAA,uCAAA;EAAA,gBAEtB,CAAA,EAAA,CAAA,YAAA,cAAA,EAAA,IAAA,EAAA,MAAA,EAAA,MAAA,YAAA,EAAA,SAAA,iBAAA,EAAA,gBAAA,CAAA,IAAA,uCAAA;CAAU;;;UE/BlB,yBAAA,SAAkC;EFYlC;EAAsB,IAAA,CAAA,EAAA,OAAA;;AAEF,cETxB,wBFSwB,EAAA,CAAA;EAAA,IAAA;EAAA,GAAA;AAAA,CAAA,EENlC,yBFMkC,EAAA,GAAA;EAAe,UAAA,EAAA,GAAA,gBAAA,CAAA,IAAA,EAAA,KAAA,EENxB,eAAA,CFMwB;EAenC,cAAA,EAAA,CAAA,MAAA,cAA8B,EAAA,QAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAA,gBAAA,EAAA,CAAA,MAAA,cAAA,EAAA,UAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAA,sBAEtB,EAAA,CAAA,YAAA,cAAA,EAAA,SAAA,iBAAA,EAAA,IAAA,EAAA,MAAA,EAAA,gBAAA,+DAAA;EAAU,oBAAO,EAAA,CAAA,YAAA,cAAA,EAAA,SAAA,iBAAA,EAAA,gBAAA,6DAAA;EAAU,UACvB,gBAAA;EAAU,aAAO,CAAA,EAAA,CAAA,MAAA,cAAA,EAAA,gBAAA,CAAA,IAAA,uCAAA;EAAU,gBAC9B,CAAA,EAAA,CAAA,YAAA,cAAA,EAAA,IAAA,EAAA,MAAA,EAAA,MAAA,YAAA,EAAA,SAAA,iBAAA,EAAA,gBAAA,CAAA,IAAA,uCAAA;CAAU;;;UG/BnB,6BAAA;UACP;;iBAGM,+BAAA,UACL,gCACR"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../../src/generators/effect.ts","../../../src/generators/zod.ts","../../../src/generators/client.ts"],"sourcesContent":[],"mappings":";;;;;cAQa,uCACF;EADE,UAAA,EAAA,GAAA,gBAqNX,CAAA,IAAA,EAAA,KAAA,EApN+B,eAAA,CAoN/B;EAAA,cAAA,EAAA,CAAA,MAAA,cAAA,EAAA,QAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAA,gBApNS,EAAA,CAAA,MAAA,cAAA,EAAA,UAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAsB,sBAAA,EAAA,CAAA,YAAA,cAAA,EAAA,SAAA,iBAAA,EAAA,IAAA,EAAA,MAAA,EAAA,gBAAA,+DAAA;;;;;;;;UCDhB,yBAAA,SAAkC;EDAtC;EAqNX,IAAA,CAAA,EAAA,OAAA;;AApN+B,cCuBpB,wBDvBoB,EAAA,CAAA;EAAA,IAAA;EAAA,GAAA;AAAA,CAAA,EC0B9B,yBD1B8B,EAAA,GAAA;+CC0BL,eAAA;;;;;;;;;;;UCzBX,6BAAA;UACP;;iBAGM,+BAAA,UACL,gCACR"}

package/dist/generators/index.js

@@ -1,5 +1,5 @@
-import { __toESM } from "../chunk-51aI8Tpl.js";
-import { DocumentContext, NotImplementedError, ensureImport, ensureNamespaceImport, getKey, helpers_exports, notImplementedStatement, require_lib } from "../helpers-tkoILkcL.js";
+import { __toESM } from "../chunk-DYFKRlHt.js";
+import { DocumentContext, NotImplementedError, ensureImport, ensureNamespaceImport, getKey, helpers_exports, notImplementedStatement, require_lib } from "../helpers-CqzmoMek.js";
 import { Context, Effect } from "effect";
 import escapeRegex from "regex-escape";
 
@@ -177,13 +177,14 @@ function createSchemaGenerator(options) {
 				const schemaKeyIdentifier = import_lib$3.identifier(schemaKey.upper);
 				if (options.experimental_includeTypes) schemaKeyIdentifier.typeAnnotation = import_lib$3.tsTypeAnnotation(import_lib$3.tsTypeReference(options.types.schema, import_lib$3.tsTypeParameterInstantiation([schemaExpression.typeDecoded, schemaExpression.typeEncoded])));
 				ctx.schemas.set(schemaName, [import_lib$3.exportNamedDeclaration(import_lib$3.variableDeclaration("const", [import_lib$3.variableDeclarator(schemaKeyIdentifier, schemaExpression.expression)])), import_lib$3.exportNamedDeclaration(import_lib$3.tsTypeAliasDeclaration(import_lib$3.identifier(schemaKey.upper), null, import_lib$3.tsTypeReference(options.types.typeDecoded, import_lib$3.tsTypeParameterInstantiation([import_lib$3.tsTypeQuery(import_lib$3.identifier(schemaKey.upper))]))))]);
+				ctx.schemaTypeMeta.set(schemaName, schemaExpression.typeMeta);
 				ctx.processingSchemas.delete(schemaName);
 			}
 			return {
 				expression: import_lib$3.identifier(schemaKey.upper),
 				typeDecoded: import_lib$3.tsTypeReference(options.types.typeDecoded, import_lib$3.tsTypeParameterInstantiation([import_lib$3.tsTypeQuery(import_lib$3.identifier(schemaKey.upper))])),
 				typeEncoded: import_lib$3.tsTypeReference(options.types.typeEncoded, import_lib$3.tsTypeParameterInstantiation([import_lib$3.tsTypeQuery(import_lib$3.identifier(schemaKey.upper))])),
-				typeMeta
+				typeMeta: ctx.schemaTypeMeta.get(schemaName)
 			};
 		}
 		if (schema.deprecated) if (options.deprecationHandling === "optional") typeMeta.optional = true;
@@ -203,6 +204,23 @@ function createSchemaGenerator(options) {
 				typeMeta
 			};
 		}
+		if (schema.allOf) {
+			const results = yield* Effect.forEach((schema$1) => ensureSchema(schema$1))(schema.allOf);
+			let result;
+			if (results.length === 1) result = results[0];
+			else result = {
+				expression: options.schema[results.every((i) => i.typeMeta.isObject) ? "objectExtend" : "intersection"](results.map((result$1) => result$1.expression)),
+				typeDecoded: import_lib$3.tsIntersectionType(results.map((result$1) => result$1.typeDecoded)),
+				typeEncoded: import_lib$3.tsIntersectionType(results.map((result$1) => result$1.typeEncoded)),
+				typeMeta
+			};
+			if ("nullable" in schema && schema.nullable) {
+				result.expression = options.modifiers.nullable(result.expression);
+				result.typeDecoded = import_lib$3.tsUnionType([result.typeDecoded, import_lib$3.tsNullKeyword()]);
+				result.typeEncoded = import_lib$3.tsUnionType([result.typeEncoded, import_lib$3.tsNullKeyword()]);
+			}
+			return result;
+		}
 		if (schema.enum) {
 			const unsupportedEnumValue = schema.enum.find((i) => typeof i !== "string" && typeof i !== "number" && typeof i !== "boolean" && i !== null);
 			if (unsupportedEnumValue !== void 0) return yield* new NotImplementedError({ message: `Unsupported 'enum' value: ${JSON.stringify(unsupportedEnumValue)}` });
@@ -248,6 +266,7 @@ function createSchemaGenerator(options) {
 				typeMeta
 			};
 			case "object": {
+				typeMeta.isObject = true;
 				const object = import_lib$3.objectExpression([]);
 				const objectTypeDecoded = import_lib$3.tsTypeLiteral([]);
 				const objectTypeEncoded = import_lib$3.tsTypeLiteral([]);
@@ -292,11 +311,13 @@ function createSchemaGenerator(options) {
 					typeMeta
 				};
 			}
-			case "null": return {
-				expression: options.schema.null,
-				...equivalentType(import_lib$3.tsNullKeyword()),
-				typeMeta
-			};
+			case "null":
+				typeMeta.isNull = true;
+				return {
+					expression: options.schema.null,
+					...equivalentType(import_lib$3.tsNullKeyword()),
+					typeMeta
+				};
 			case void 0: return {
 				expression: options.schema.unknown,
 				...equivalentType(import_lib$3.tsUnknownKeyword()),
@@ -310,11 +331,6 @@ function createSchemaGenerator(options) {
 	const applyModifiers = Effect.fn(function* (expression, schema) {
 		if ("$ref" in schema) return expression;
 		const modified = { ...expression };
-		if ("nullable" in schema && schema.nullable) {
-			modified.expression = options.modifiers.nullable(modified.expression);
-			modified.typeDecoded = import_lib$3.tsUnionType([modified.typeDecoded, import_lib$3.tsNullKeyword()]);
-			modified.typeEncoded = import_lib$3.tsUnionType([modified.typeEncoded, import_lib$3.tsNullKeyword()]);
-		}
 		if (options.supportsImmutability) if (schema.readOnly) {
 			modified.expression = options.modifiers.immutable(modified.expression);
 			modified.typeMeta ??= {};
@@ -328,6 +344,7 @@ function createSchemaGenerator(options) {
 			if (schema$1.oneOf) return schema$1.oneOf;
 			return [schema$1];
 		}).flatMap((schema$1) => {
+			if (typeof schema$1 === "boolean") return [];
 			if ("$ref" in schema$1) return [schema$1];
 			if (Array.isArray(schema$1.type)) return schema$1.type.map((type) => ({
 				...schema$1,
@@ -335,15 +352,27 @@ function createSchemaGenerator(options) {
 			}));
 			return [schema$1];
 		});
-		const expressions = [];
+		let expressions = [];
 		for (const schema$1 of schemas) expressions.push(yield* applyModifiers(yield* getBaseEffectSchema(schema$1), schema$1));
-		if (expressions.length !== 1) return {
+		let isNullable = false;
+		if (expressions.some((e) => e.typeMeta?.isNull)) {
+			isNullable = true;
+			expressions = expressions.filter((e) => !e.typeMeta?.isNull);
+		}
+		let result;
+		if (expressions.length === 1) result = expressions[0];
+		else result = {
 			expression: options.schema.union(expressions.map((e) => e.expression)),
 			typeDecoded: import_lib$3.tsUnionType(expressions.map((e) => e.typeDecoded)),
 			typeEncoded: import_lib$3.tsUnionType(expressions.map((e) => e.typeEncoded)),
 			typeMeta: {}
 		};
-		return expressions[0];
+		if (isNullable) {
+			result.expression = options.modifiers.nullable(result.expression);
+			result.typeDecoded = import_lib$3.tsUnionType([result.typeDecoded, import_lib$3.tsNullKeyword()]);
+			result.typeEncoded = import_lib$3.tsUnionType([result.typeEncoded, import_lib$3.tsNullKeyword()]);
+		}
+		return result;
 	});
 	const ensureParametersSchema = Effect.fn(function* (operationKey, method, path) {
 		const ctx = yield* DocumentContext;
@@ -512,6 +541,8 @@ const createEffectSchemaGenerator = (options) => ({
 		schema: {
 			record: (key, value) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("Record")), [import_lib$2.objectExpression([import_lib$2.objectProperty(import_lib$2.identifier("key"), key), import_lib$2.objectProperty(import_lib$2.identifier("value"), value)])]),
 			union: (expressions) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("Union")), expressions),
+			intersection: (expressions) => expressions.reduce((a, b) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("extend")), [a, b])),
+			objectExtend: (expressions) => expressions.reduce((a, b) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("extend")), [a, b])),
 			enum: (expressions) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("Literal")), expressions),
 			instanceOf: import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("instanceOf")),
 			boolean: import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("Boolean")),
@@ -560,8 +591,12 @@ const createEffectSchemaGenerator = (options) => ({
 //#endregion
 //#region src/generators/zod.ts
 var import_lib$1 = /* @__PURE__ */ __toESM(require_lib(), 1);
+const z = import_lib$1.identifier("z");
+function getObjectShape(expression) {
+	if (expression.type === "CallExpression" && expression.callee.type === "MemberExpression" && expression.callee.object.type === "Identifier" && expression.callee.object.name === "z" && expression.callee.property.type === "Identifier" && expression.callee.property.name === "object" && expression.arguments.length === 1 && expression.arguments[0]?.type === "ObjectExpression") return expression.arguments[0];
+	return import_lib$1.memberExpression(expression, import_lib$1.identifier("shape"));
+}
 const createZodSchemaGenerator = ({ mini = false,...options }) => {
-	const z = import_lib$1.identifier("z");
 	const maybeExtension = (expression, extension, args) => mini ? import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier(extension)), [expression, ...args]) : import_lib$1.callExpression(import_lib$1.memberExpression(expression, import_lib$1.identifier(extension)), args);
 	return {
 		...createSchemaGenerator({
@@ -582,6 +617,8 @@ const createZodSchemaGenerator = ({ mini = false,...options }) => {
 			schema: {
 				record: (key, value) => import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier("record")), [key, value]),
 				union: (expressions) => import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier("union")), [import_lib$1.arrayExpression(expressions)]),
+				intersection: (expressions) => expressions.reduce((a, b) => import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier("intersection")), [a, b])),
+				objectExtend: (expressions) => expressions.reduce((a, b) => import_lib$1.callExpression(import_lib$1.memberExpression(mini ? z : a, import_lib$1.identifier("extend")), [...mini ? [a] : [], getObjectShape(b)])),
 				enum: (expressions) => import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier("enum")), [import_lib$1.arrayExpression(expressions)]),
 				instanceOf: import_lib$1.memberExpression(z, import_lib$1.identifier("instanceof")),
 				boolean: import_lib$1.callExpression(import_lib$1.memberExpression(z, import_lib$1.identifier("boolean")), []),