Skip to content

Commit

Permalink
fix: relax any type validation (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
fabien0102 committed Jun 27, 2023
1 parent 226681d commit 7e75f90
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/core/validateGeneratedTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
import ts from "typescript";
import { join } from "path";
import { resolveDefaultProperties } from "../utils/resolveDefaultProperties";
import { fixOptionalAny } from "../utils/fixOptionalAny";
interface File {
sourceText: string;
relativePath: string;
Expand Down Expand Up @@ -37,12 +38,13 @@ export function validateGeneratedTypes({
target: compilerOptions.target,
});
const projectRoot = process.cwd();
fsMap.set(
getPath(sourceTypes),
const src = fixOptionalAny(
skipParseJSDoc
? sourceTypes.sourceText
: resolveDefaultProperties(sourceTypes.sourceText)
);

fsMap.set(getPath(sourceTypes), src);
fsMap.set(getPath(zodSchemas), zodSchemas.sourceText);
fsMap.set(getPath(integrationTests), integrationTests.sourceText);

Expand Down
41 changes: 41 additions & 0 deletions src/utils/fixOptionalAny.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import ts, { factory as f } from "typescript";

/**
* Add optional property to `any` to workaround comparaison issue.
*
* ref: https://github.com/fabien0102/ts-to-zod/issues/140
*/
export function fixOptionalAny(sourceText: string) {
const sourceFile = ts.createSourceFile(
"index.ts",
sourceText,
ts.ScriptTarget.Latest
);
const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });

const markAnyAsOptional: ts.TransformerFactory<ts.SourceFile> = (context) => {
const visit: ts.Visitor = (node) => {
node = ts.visitEachChild(node, visit, context);

if (
ts.isPropertySignature(node) &&
node.type?.kind === ts.SyntaxKind.AnyKeyword
) {
return ts.factory.createPropertySignature(
node.modifiers,
node.name,
f.createToken(ts.SyntaxKind.QuestionToken), // Add `questionToken`
node.type
);
}

return node;
};

return (node) => ts.visitNode(node, visit);
};

const outputFile = ts.transform(sourceFile, [markAnyAsOptional]);

return printer.printFile(outputFile.transformed[0]);
}

0 comments on commit 7e75f90

Please sign in to comment.