From 8efbf00d1b32762104b570a7495d76f71dfc92ff Mon Sep 17 00:00:00 2001 From: Timothy Atapagra Date: Sat, 9 Aug 2025 18:18:50 -0400 Subject: [PATCH] chore: add base tsconfig and restructure api imports --- packages/api/src/jobs/ai/create_digest.ts | 2 +- packages/api/src/jobs/email/inbound_emails.ts | 2 +- packages/api/src/jobs/trigger_rule.ts | 2 +- packages/api/src/routers/ai_summary_router.ts | 2 +- packages/api/src/routers/article_router.ts | 2 +- packages/api/src/services/digest.ts | 2 +- packages/api/src/services/library_item.ts | 2 +- packages/api/src/utils/parser.ts | 2 +- packages/api/src/utils/search.ts | 2 +- packages/api/tsconfig.json | 6 ++++-- tsconfig.base.json | 15 +++++++++++++++ tsconfig.json | 15 ++------------- 12 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 tsconfig.base.json diff --git a/packages/api/src/jobs/ai/create_digest.ts b/packages/api/src/jobs/ai/create_digest.ts index 79006f7dd..77b3636a1 100644 --- a/packages/api/src/jobs/ai/create_digest.ts +++ b/packages/api/src/jobs/ai/create_digest.ts @@ -6,7 +6,7 @@ import { htmlToSpeechFile, SpeechFile, SSMLOptions, -} from '../../../../text-to-speech/src/htmlToSsml' +} from '@omnivore/text-to-speech-handler/build/src/htmlToSsml' import axios from 'axios' import { truncate } from 'lodash' import { v4 as uuid } from 'uuid' diff --git a/packages/api/src/jobs/email/inbound_emails.ts b/packages/api/src/jobs/email/inbound_emails.ts index 0d74e161a..12528e884 100644 --- a/packages/api/src/jobs/email/inbound_emails.ts +++ b/packages/api/src/jobs/email/inbound_emails.ts @@ -1,4 +1,4 @@ -import { handleNewsletter } from '../../../../content-handler/src/index' +import { handleNewsletter } from '@omnivore/content-handler' import { Converter } from 'showdown' import { ContentReaderType, LibraryItemState } from '../../entity/library_item' import { SubscriptionStatus } from '../../entity/subscription' diff --git a/packages/api/src/jobs/trigger_rule.ts b/packages/api/src/jobs/trigger_rule.ts index cea107a70..1033c7e47 100644 --- a/packages/api/src/jobs/trigger_rule.ts +++ b/packages/api/src/jobs/trigger_rule.ts @@ -1,4 +1,4 @@ -import { LiqeQuery } from '../../../liqe/src/Liqe' +import { LiqeQuery } from '@omnivore/liqe' import axios from 'axios' import { Any } from 'typeorm' import { ReadingProgressDataSource } from '../datasources/reading_progress_data_source' diff --git a/packages/api/src/routers/ai_summary_router.ts b/packages/api/src/routers/ai_summary_router.ts index 87f3a5769..a48504e26 100644 --- a/packages/api/src/routers/ai_summary_router.ts +++ b/packages/api/src/routers/ai_summary_router.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { htmlToSpeechFile } from '../../../text-to-speech/src/htmlToSsml' +import { htmlToSpeechFile } from '@omnivore/text-to-speech-handler/build/src/htmlToSsml' import cors from 'cors' import express from 'express' import { userRepository } from '../repository/user' diff --git a/packages/api/src/routers/article_router.ts b/packages/api/src/routers/article_router.ts index 1f45eae22..97e2ade64 100644 --- a/packages/api/src/routers/article_router.ts +++ b/packages/api/src/routers/article_router.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { htmlToSpeechFile } from '../../../text-to-speech/src/htmlToSsml' +import { htmlToSpeechFile } from '@omnivore/text-to-speech-handler/build/src/htmlToSsml' import cors from 'cors' import express from 'express' import * as jwt from 'jsonwebtoken' diff --git a/packages/api/src/services/digest.ts b/packages/api/src/services/digest.ts index 944884951..f7ebae0ba 100644 --- a/packages/api/src/services/digest.ts +++ b/packages/api/src/services/digest.ts @@ -1,4 +1,4 @@ -import { SpeechFile } from '../../../text-to-speech/src/htmlToSsml' +import { SpeechFile } from '@omnivore/text-to-speech-handler/build/src/htmlToSsml' import { TaskState } from '../generated/graphql' import { redisDataSource } from '../redis_data_source' import { logger } from '../utils/logger' diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 32fbe50dd..05866fa1b 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -1,4 +1,4 @@ -import { ExpressionToken, LiqeQuery } from '../../../liqe/src/Liqe' +import { ExpressionToken, LiqeQuery } from '@omnivore/liqe' import { camelCase } from 'lodash' import { DateTime } from 'luxon' import { diff --git a/packages/api/src/utils/parser.ts b/packages/api/src/utils/parser.ts index 1d3f927fc..318a19e07 100644 --- a/packages/api/src/utils/parser.ts +++ b/packages/api/src/utils/parser.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable @typescript-eslint/no-base-to-string */ -import { preParseContent } from '../../../content-handler/src/index' +import { preParseContent } from '@omnivore/content-handler' import { Readability } from '@omnivore/readability' import addressparser from 'addressparser' import axios from 'axios' diff --git a/packages/api/src/utils/search.ts b/packages/api/src/utils/search.ts index cb1a868ca..1fcbf7f11 100644 --- a/packages/api/src/utils/search.ts +++ b/packages/api/src/utils/search.ts @@ -1,4 +1,4 @@ -import { LiqeQuery, parse } from '../../../liqe/src/Liqe' +import { LiqeQuery, parse } from '@omnivore/liqe' export const parseSearchQuery = (query: string): LiqeQuery => { let searchQuery = query diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index f33f2eac2..a329e8994 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "outDir": "./dist", "rootDir": "./src", @@ -10,7 +10,9 @@ "strict": false, "lib": ["ES2020"], "allowJs": true, - "isolatedModules": true + "isolatedModules": true, + "composite": true, + "declaration": true }, "include": [ "src/**/*.ts", diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 000000000..9e833a858 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + + "compilerOptions": { + "lib": ["es2020", "dom"], + "module": "commonjs", + "target": "es2020", + + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, + "experimentalDecorators": true + } +} diff --git a/tsconfig.json b/tsconfig.json index 9e833a858..76003e4fd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,15 +1,4 @@ { - "$schema": "https://json.schemastore.org/tsconfig", - - "compilerOptions": { - "lib": ["es2020", "dom"], - "module": "commonjs", - "target": "es2020", - - "strict": true, - "esModuleInterop": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true, - "experimentalDecorators": true - } + "files": [], + "references": [{ "path": "./packages/api" }] }