@sohcah/openapi-generator 0.2.0 → 0.2.2

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { generateToFile } from "./src-CjChjKnL.js";
+import { generateToFile } from "./src-BhVleMDu.js";
 import "./helpers-CqzmoMek.js";
 import { Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";

package/dist/config.d.ts

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

package/dist/generators/index.d.ts

@@ -1,4 +1,4 @@
-import { DocumentContext, HttpMethod, ImportReference, NotImplementedError, OpenApiClientGenerator, OpenApiGenerator, OpenApiParametersSchema, OpenApiResponseSchema, OpenApiSchemaGenerator, OperationKey, OperationObject, SchemaGeneratorOptions, SchemaObject, createSchemaGenerator, helpers_d_exports } from "../types-DMB5w9Tt.js";
+import { DocumentContext, HttpMethod, ImportReference, NotImplementedError, OpenApiClientGenerator, OpenApiGenerator, OpenApiParametersSchema, OpenApiResponseSchema, OpenApiSchemaGenerator, OperationKey, OperationObject, SchemaGeneratorOptions, SchemaObject, createSchemaGenerator, helpers_d_exports } from "../types-CHhQKnbs.js";
 import { Effect } from "effect";
 import * as t from "@babel/types";
 
@@ -10,7 +10,7 @@ declare const createEffectSchemaGenerator: (options: SchemaGeneratorOptions) =>
   ensureParametersSchema: (operationKey: OperationKey, operation: OperationObject, path: string) => Effect.Effect<OpenApiParametersSchema, NotImplementedError, DocumentContext>;
   ensureResponseSchema: (operationKey: OperationKey, operation: OperationObject) => Effect.Effect<OpenApiResponseSchema, NotImplementedError, DocumentContext>;
   schemaType: t.TSEntityName;
-  processSchema?: (schema: SchemaObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
+  processSchema: (schema: SchemaObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
   processOperation?: (operationKey: OperationKey, path: string, method: HttpMethod, operation: OperationObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
 };
 //#endregion
@@ -29,7 +29,7 @@ declare const createZodSchemaGenerator: ({
   ensureParametersSchema: (operationKey: OperationKey, operation: OperationObject, path: string) => Effect.Effect<OpenApiParametersSchema, NotImplementedError, DocumentContext>;
   ensureResponseSchema: (operationKey: OperationKey, operation: OperationObject) => Effect.Effect<OpenApiResponseSchema, NotImplementedError, DocumentContext>;
   schemaType: t.TSEntityName;
-  processSchema?: (schema: SchemaObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
+  processSchema: (schema: SchemaObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
   processOperation?: (operationKey: OperationKey, path: string, method: HttpMethod, operation: OperationObject) => Effect.Effect<void, NotImplementedError, DocumentContext>;
 };
 //#endregion

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

@@ -1 +1 @@
-{"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,cCIpB,wBDJoB,EAAA,CAAA;EAAA,IAAA;EAAA,GAAA;AAAA,CAAA,ECO9B,yBDP8B,EAAA,GAAA;+CCOL,eAAA;;;;;;;;;;;UCNX,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,gBAwOX,CAAA,IAAA,EAAA,KAAA,EAvO+B,eAAA,CAuO/B;EAAA,cAAA,EAAA,CAAA,MAAA,cAAA,EAAA,QAAA,cAAA,EAAA,gBAAA,aAAA,CAAA;EAAA,gBAvOS,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;EAwOX,IAAA,CAAA,EAAA,OAAA;;AAvO+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

@@ -287,6 +287,26 @@ function createSchemaGenerator(options) {
 					objectTypeDecoded.members.push(decodedMember);
 					objectTypeEncoded.members.push(encodedMember);
 				}
+				if (schema.additionalProperties) {
+					const valueSchema = yield* ensureSchema(schema.additionalProperties === true ? { type: void 0 } : schema.additionalProperties);
+					if (object.properties.length === 0) return {
+						expression: options.schema.record(options.schema.string, valueSchema.expression),
+						typeDecoded: import_lib$3.tsTypeReference(import_lib$3.identifier("Record"), import_lib$3.tsTypeParameterInstantiation([import_lib$3.tsStringKeyword(), valueSchema.typeDecoded])),
+						typeEncoded: import_lib$3.tsTypeReference(import_lib$3.identifier("Record"), import_lib$3.tsTypeParameterInstantiation([import_lib$3.tsStringKeyword(), valueSchema.typeEncoded])),
+						typeMeta
+					};
+					const expression = options.schema.catchall(import_lib$3.callExpression(options.schema.object, [object]), valueSchema.expression);
+					const keyParam = import_lib$3.identifier("key");
+					keyParam.typeAnnotation = import_lib$3.tsTypeAnnotation(import_lib$3.tsStringKeyword());
+					const indexSignatureDecoded = import_lib$3.tsIndexSignature([keyParam], import_lib$3.tsTypeAnnotation(valueSchema.typeDecoded));
+					const indexSignatureEncoded = import_lib$3.tsIndexSignature([keyParam], import_lib$3.tsTypeAnnotation(valueSchema.typeEncoded));
+					return {
+						expression,
+						typeDecoded: import_lib$3.tsTypeLiteral([...objectTypeDecoded.members, indexSignatureDecoded]),
+						typeEncoded: import_lib$3.tsTypeLiteral([...objectTypeEncoded.members, indexSignatureEncoded]),
+						typeMeta
+					};
+				}
 				return {
 					expression: import_lib$3.callExpression(options.schema.object, [object]),
 					typeDecoded: objectTypeDecoded,
@@ -492,7 +512,7 @@ function createSchemaGenerator(options) {
 		};
 	});
 	const processSchema = Effect.fn(function* (schema) {
-		if (options.includeSchemas ?? true) yield* ensureSchema(schema);
+		if (options.includeSchemas) yield* ensureSchema(schema);
 	});
 	const processOperation = Effect.fn(function* (operationKey, path, _method, operation) {
 		if (options.includeOperations) {
@@ -540,6 +560,7 @@ 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)])]),
+			catchall: (object, value) => import_lib$2.callExpression(import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("extend")), [object, 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"), import_lib$2.memberExpression(import_lib$2.identifier("Schema"), import_lib$2.identifier("String"))), 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])),
@@ -591,8 +612,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({
@@ -612,9 +637,10 @@ 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]),
+				catchall: (object, value) => import_lib$1.callExpression(import_lib$1.memberExpression(mini ? z : object, import_lib$1.identifier("catchall")), [...mini ? [object] : [], 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] : [], 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")), []),
@@ -680,6 +706,10 @@ function createReactQueryClientGenerator(options) {
 			yield* ensureApi();
 			if (options.schema.initialize) yield* options.schema.initialize();
 		}),
+		processSchema: Effect.fn(function* (schema) {
+			yield* ensureApi();
+			yield* options.schema.processSchema(schema);
+		}),
 		processOperation: Effect.fn(function* (operationKey, path, method, operation) {
 			const parametersSchema = yield* options.schema.ensureParametersSchema(operationKey, operation, path);
 			const responseSchema = yield* options.schema.ensureResponseSchema(operationKey, operation);