Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: unwrap Either immediately after inspection #973

Merged
merged 1 commit into from
Dec 23, 2024
Merged

refactor: unwrap Either immediately after inspection #973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions packages/openapi-generator/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,14 @@ const app = command({
knownImports = { ...knownImports, ...customCodecs };
}

const project = await new Project({}, knownImports).parseEntryPoint(filePath);
if (E.isLeft(project)) {
logError(`${project.left}`);
const projectE = await new Project({}, knownImports).parseEntryPoint(filePath);
if (E.isLeft(projectE)) {
logError(`${projectE.left}`);
process.exit(1);
}
const project = projectE.right;

const entryPoint = project.right.get(filePath);
const entryPoint = project.get(filePath);
if (entryPoint === undefined) {
logError(`Could not find entry point ${filePath}`);
process.exit(1);
Expand All @@ -128,7 +129,7 @@ const app = command({
logInfo(`Found API spec in ${symbol.name}`);

const result = parseApiSpec(
project.right,
project,
entryPoint,
symbol.init.arguments[0]!.expression,
);
Expand Down Expand Up @@ -158,18 +159,18 @@ const app = command({
});
let schema: Schema | undefined;
while (((schema = queue.pop()), schema !== undefined)) {
const refs = getRefs(schema, project.right.getTypes());
const refs = getRefs(schema, project.getTypes());
for (const ref of refs) {
if (components[ref.name] !== undefined) {
continue;
}
const sourceFile = project.right.get(ref.location);
const sourceFile = project.get(ref.location);
if (sourceFile === undefined) {
logError(`Could not find '${ref.name}' from '${ref.location}'`);
process.exit(1);
}

const initE = findSymbolInitializer(project.right, sourceFile, ref.name);
const initE = findSymbolInitializer(project, sourceFile, ref.name);
if (E.isLeft(initE)) {
logError(
`Could not find symbol '${ref.name}' in '${ref.location}': ${initE.left}`,
Expand All @@ -178,7 +179,7 @@ const app = command({
}
const [newSourceFile, init, comment] = initE.right;

const codecE = parseCodecInitializer(project.right, newSourceFile, init);
const codecE = parseCodecInitializer(project, newSourceFile, init);
if (E.isLeft(codecE)) {
logError(
`Could not parse codec '${ref.name}' in '${ref.location}': ${codecE.left}`,
Expand Down
Loading