diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 9e953ad..0000000 --- a/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('ts-jest').JestConfigWithTsJest} */ -// const { jsWithTs: tsjPreset } = require('ts-jest/presets') - -module.exports = { - preset: 'ts-jest/presets/default-esm', - moduleNameMapper: { - '^(\\.{1,2}/.*)\\.js$': '$1', // Redirect .js imports to .ts files - }, -} diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 0000000..32104f4 --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,202 @@ +/** + * For a detailed explanation regarding each configuration property, visit: + * https://jestjs.io/docs/configuration + */ + +import type { Config } from 'jest' + +const config: Config = { + preset: 'ts-jest/presets/default-esm', + // All imported modules in your tests should be mocked automatically + // automock: false, + + // Stop running tests after `n` failures + // bail: 0, + + // The directory where Jest should store its cached dependency information + // cacheDirectory: "/tmp/jest_rs", + + // Automatically clear mock calls, instances, contexts and results before every test + // clearMocks: false, + + // Indicates whether the coverage information should be collected while executing the test + collectCoverage: true, + + // An array of glob patterns indicating a set of files for which coverage information should be collected + // collectCoverageFrom: undefined, + + // The directory where Jest should output its coverage files + coverageDirectory: 'coverage', + + // An array of regexp pattern strings used to skip coverage collection + // coveragePathIgnorePatterns: [ + // "/node_modules/" + // ], + + // Indicates which provider should be used to instrument code for coverage + coverageProvider: 'v8', + + // A list of reporter names that Jest uses when writing coverage reports + // coverageReporters: [ + // "json", + // "text", + // "lcov", + // "clover" + // ], + + // An object that configures minimum threshold enforcement for coverage results + // coverageThreshold: undefined, + + // A path to a custom dependency extractor + // dependencyExtractor: undefined, + + // Make calling deprecated APIs throw helpful error messages + // errorOnDeprecated: false, + + // The default configuration for fake timers + // fakeTimers: { + // "enableGlobally": false + // }, + + // Force coverage collection from ignored files using an array of glob patterns + // forceCoverageMatch: [], + + // A path to a module which exports an async function that is triggered once before all test suites + // globalSetup: undefined, + + // A path to a module which exports an async function that is triggered once after all test suites + // globalTeardown: undefined, + + // A set of global variables that need to be available in all test environments + // globals: {}, + + // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers. + // maxWorkers: "50%", + + // An array of directory names to be searched recursively up from the requiring module's location + // moduleDirectories: [ + // "node_modules" + // ], + + // An array of file extensions your modules use + // moduleFileExtensions: [ + // "js", + // "mjs", + // "cjs", + // "jsx", + // "ts", + // "tsx", + // "json", + // "node" + // ], + + // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', // Redirect .js imports to .ts files + }, + + // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader + // modulePathIgnorePatterns: [], + + // Activates notifications for test results + // notify: false, + + // An enum that specifies notification mode. Requires { notify: true } + // notifyMode: "failure-change", + + // A preset that is used as a base for Jest's configuration + // preset: undefined, + + // Run tests from one or more projects + // projects: undefined, + + // Use this configuration option to add custom reporters to Jest + // reporters: undefined, + + // Automatically reset mock state before every test + // resetMocks: false, + + // Reset the module registry before running each individual test + // resetModules: false, + + // A path to a custom resolver + // resolver: undefined, + + // Automatically restore mock state and implementation before every test + // restoreMocks: false, + + // The root directory that Jest should scan for tests and modules within + // rootDir: undefined, + + // A list of paths to directories that Jest should use to search for files in + // roots: [ + // "" + // ], + + // Allows you to use a custom runner instead of Jest's default test runner + // runner: "jest-runner", + + // The paths to modules that run some code to configure or set up the testing environment before each test + // setupFiles: [], + + // A list of paths to modules that run some code to configure or set up the testing framework before each test + // setupFilesAfterEnv: [], + + // The number of seconds after which a test is considered as slow and reported as such in the results. + // slowTestThreshold: 5, + + // A list of paths to snapshot serializer modules Jest should use for snapshot testing + // snapshotSerializers: [], + + // The test environment that will be used for testing + // testEnvironment: "jest-environment-node", + + // Options that will be passed to the testEnvironment + // testEnvironmentOptions: {}, + + // Adds a location field to test results + // testLocationInResults: false, + + // The glob patterns Jest uses to detect test files + // testMatch: [ + // "**/__tests__/**/*.[jt]s?(x)", + // "**/?(*.)+(spec|test).[tj]s?(x)" + // ], + + // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped + // testPathIgnorePatterns: [ + // "/node_modules/" + // ], + + // The regexp pattern or array of patterns that Jest uses to detect test files + // testRegex: [], + + // This option allows the use of a custom results processor + // testResultsProcessor: undefined, + + // This option allows use of a custom test runner + // testRunner: "jest-circus/runner", + + // A map from regular expressions to paths to transformers + // transform: undefined, + + // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation + // transformIgnorePatterns: [ + // "/node_modules/", + // "\\.pnp\\.[^\\/]+$" + // ], + + // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them + // unmockedModulePathPatterns: undefined, + + // Indicates whether each individual test should be reported during the run + // verbose: undefined, + + // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode + // watchPathIgnorePatterns: [], + + // Whether to use watchman for file crawling + // watchman: true, +} + +export default config diff --git a/packages/analytics/tsconfig.json b/packages/analytics/tsconfig.json index bf649ac..4e7db43 100644 --- a/packages/analytics/tsconfig.json +++ b/packages/analytics/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "allowJs": true, "rootDir": "src", "outDir": "./dist" }, diff --git a/packages/file-graph/tests/fileGraph.test.js b/packages/file-graph/tests/fileGraph.test.ts similarity index 95% rename from packages/file-graph/tests/fileGraph.test.js rename to packages/file-graph/tests/fileGraph.test.ts index b1966c3..fd21202 100644 --- a/packages/file-graph/tests/fileGraph.test.js +++ b/packages/file-graph/tests/fileGraph.test.ts @@ -1,8 +1,8 @@ -import FileGraph from '../src/fileGraph' -import FileNode from '../src/fileNode' +import FileGraph from '../src/fileGraph.js' +import FileNode from '../src/fileNode.js' describe('FileGraph', () => { - let root + let root: FileNode beforeEach(() => { root = new FileNode({ @@ -66,10 +66,12 @@ describe('FileGraph', () => { { path: '/home/user/folder1/file1.txt', type: 'folder', + discovered: true, }, { path: '/home/user/folder2', type: 'folder', + discovered: true, }, ] diff --git a/packages/file-graph/tests/fileNode.test.js b/packages/file-graph/tests/fileNode.test.ts similarity index 64% rename from packages/file-graph/tests/fileNode.test.js rename to packages/file-graph/tests/fileNode.test.ts index 2938845..3ccb3e1 100644 --- a/packages/file-graph/tests/fileNode.test.js +++ b/packages/file-graph/tests/fileNode.test.ts @@ -1,13 +1,18 @@ -import { DuplicateItemError, ParentNotExistsError } from '../src/errors' -import FileNode from '../src/fileNode' +import { DuplicateItemError, ParentNotExistsError } from '../src/errors.js' +import FileNode from '../src/fileNode.js' +import { FileObject } from '../src/file.js' -function createNodeFromFiles(files) { +function createNodeFromFiles(files: FileObject[]) { const node = new FileNode(files[0]) files.slice(1).forEach((file) => node.addChild(file)) return node } -function mergeTest(files1, files2, expectedFiles) { +function mergeTest( + files1: FileObject[], + files2: FileObject[], + expectedFiles: FileObject[] +) { const node1 = createNodeFromFiles(files1) const node2 = createNodeFromFiles(files2) const expectedNode = createNodeFromFiles(expectedFiles) @@ -17,7 +22,11 @@ function mergeTest(files1, files2, expectedFiles) { expect(node1.toString()).toBe(expectedNode.toString()) } -function removeChildTest(files, fileToRemove, expectedFiles) { +function removeChildTest( + files: FileObject[], + fileToRemove: FileObject, + expectedFiles: FileObject[] +) { const node = createNodeFromFiles(files) const expectedNode = createNodeFromFiles(expectedFiles) @@ -27,7 +36,7 @@ function removeChildTest(files, fileToRemove, expectedFiles) { } describe('FileNode', () => { - let rootNode + let rootNode: FileNode beforeEach(() => { rootNode = new FileNode({ @@ -41,8 +50,8 @@ describe('FileNode', () => { test('should throw error when adding duplicate item', () => { const child = { path: '/home/rudeus/test', - name: 'test', type: 'folder', + discovered: true, } // Adding the child for the first time @@ -61,6 +70,7 @@ describe('FileNode', () => { path: '/home/rudeus/alphabet/test', name: 'test', type: 'folder', + discovered: true, } // Trying to add to a nonexistent parent should throw an error @@ -75,13 +85,13 @@ describe('FileNode', () => { path: '/home/rudeus/forgotten_scroll.txt', name: 'forgotten_scroll.txt', type: 'file', - discovered: 'test', + discovered: true, }, { path: '/home/rudeus/test', name: 'test', type: 'folder', - discovered: 'test', + discovered: true, }, { path: '/home/rudeus/test/a', @@ -121,30 +131,31 @@ describe('FileNode', () => { const root = { path: '/', type: 'folder', + discovered: true, } const files1 = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/d', type: 'file' }, - { path: '/b/c/f', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/d', type: 'file', discovered: true }, + { path: '/b/c/f', type: 'file', discovered: true }, ] const files2 = [ - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/e', type: 'file' }, - { path: '/b/c/g', type: 'file' }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/e', type: 'file', discovered: true }, + { path: '/b/c/g', type: 'file', discovered: true }, ] const expected = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/e', type: 'file' }, - { path: '/b/c/g', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/e', type: 'file', discovered: true }, + { path: '/b/c/g', type: 'file', discovered: true }, ] mergeTest(files1, files2, expected) @@ -157,29 +168,30 @@ describe('FileNode', () => { const root = { path: '/', type: 'folder', + discovered: true, } const files1 = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/d', type: 'file' }, - { path: '/b/c/f', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/d', type: 'file', discovered: true }, + { path: '/b/c/f', type: 'file', discovered: true }, ] const files2 = [ - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/e', type: 'file' }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/e', type: 'file', discovered: true }, ] const expected = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/e', type: 'file' }, - { path: '/b/c/f', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/e', type: 'file', discovered: true }, + { path: '/b/c/f', type: 'file', discovered: true }, ] mergeTest(files1, files2, expected) @@ -189,6 +201,7 @@ describe('FileNode', () => { const root = { path: '/', type: 'folder', + discovered: true, } const files1 = [ root, @@ -218,23 +231,24 @@ describe('FileNode', () => { const root = { path: '/', type: 'folder', + discovered: true, } const files = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/c', type: 'folder' }, - { path: '/b/d', type: 'file' }, - { path: '/b/c/f', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/c', type: 'folder', discovered: true }, + { path: '/b/d', type: 'file', discovered: true }, + { path: '/b/c/f', type: 'file', discovered: true }, ] - const fileToRemove = { path: '/b/c', type: 'folder' } + const fileToRemove = { path: '/b/c', type: 'folder', discovered: true } const expected = [ root, - { path: '/a', type: 'file' }, - { path: '/b', type: 'folder' }, - { path: '/b/d', type: 'file' }, + { path: '/a', type: 'file', discovered: true }, + { path: '/b', type: 'folder', discovered: true }, + { path: '/b/d', type: 'file', discovered: true }, ] removeChildTest(files, fileToRemove, expected) @@ -245,22 +259,27 @@ test('load nested fileNode', () => { const data = { path: '/', type: 'folder', + discovered: true, children: [ { path: '/a', type: 'file', + discovered: true, }, { path: '/b', type: 'folder', + discovered: true, children: [ { path: '/b/c', type: 'folder', + discovered: true, children: [ { path: '/b/c/d', type: 'file', + discovered: true, }, ], }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 5ad69b0..633f7b0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -9,8 +9,5 @@ "scripts": { "build": "tsc", "dev": "tsc -w" - }, - "dependencies": { - "@linux-odyssey/models": "workspace:^" } } diff --git a/packages/utils/src/commands.ts b/packages/utils/src/commands.ts index 92f0533..d309b60 100644 --- a/packages/utils/src/commands.ts +++ b/packages/utils/src/commands.ts @@ -1,4 +1,7 @@ -import type { IFileCondition } from '@linux-odyssey/models' +export interface File { + path: string + type: string +} const fileTypes = new Map([ ['file', '-f'], @@ -11,7 +14,7 @@ function sanitizePath(path: string): string { return path.replace(/[^a-zA-Z0-9._/-]/g, '') } -export function buildFileCheckCmd(file: IFileCondition): string[] { +export function buildFileCheckCmd(file: File): string[] { const { path, type } = file return ['test', fileTypes.get(type) || '-e', sanitizePath(path)] } diff --git a/packages/utils/tests/auth.test.ts b/packages/utils/tests/auth.test.ts index 8d617a9..28593f7 100644 --- a/packages/utils/tests/auth.test.ts +++ b/packages/utils/tests/auth.test.ts @@ -1,4 +1,4 @@ -import { isValidEmail, isValidUsername } from '../src/auth' +import { isValidEmail, isValidUsername } from '../src/auth.js' test('check valid username', () => { const valid = ['alex', 'alex123', 'john_doe', 'john-doe', 'rudeus'] diff --git a/packages/utils/tests/commands.test.ts b/packages/utils/tests/commands.test.ts index e1888ca..7730678 100644 --- a/packages/utils/tests/commands.test.ts +++ b/packages/utils/tests/commands.test.ts @@ -1,4 +1,4 @@ -import { buildFileCheckCmd, File } from '../src/commands' +import { buildFileCheckCmd, File } from '../src/commands.js' describe('buildFileCheckCmd function', () => { it('builds the file check command correctly', () => { diff --git a/packages/utils/tests/dag.test.ts b/packages/utils/tests/dag.test.ts index 0f4201c..ff631c0 100644 --- a/packages/utils/tests/dag.test.ts +++ b/packages/utils/tests/dag.test.ts @@ -1,4 +1,4 @@ -import DAG from '../src/dag' +import DAG from '../src/dag.js' describe('dag layers', () => { it('two layer', () => { diff --git a/tsconfig.json b/tsconfig.json index 3deb233..2cd1c93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,11 +4,9 @@ "module": "NodeNext", // 要編譯成的 module "moduleResolution": "NodeNext", // module 解析方式, default "classic" "esModuleInterop": true, // module 兼容, 會影響 build 方式 - "allowJs": true, "forceConsistentCasingInFileNames": true, "strict": true, "skipLibCheck": true, - "outDir": "dist", "sourceMap": true, "declaration": true } diff --git a/yarn.lock b/yarn.lock index f42df08..19d994e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1110,7 +1110,7 @@ __metadata: languageName: unknown linkType: soft -"@linux-odyssey/models@npm:*, @linux-odyssey/models@workspace:^, @linux-odyssey/models@workspace:packages/models": +"@linux-odyssey/models@npm:*, @linux-odyssey/models@workspace:packages/models": version: 0.0.0-use.local resolution: "@linux-odyssey/models@workspace:packages/models" dependencies: @@ -1122,8 +1122,6 @@ __metadata: "@linux-odyssey/utils@npm:*, @linux-odyssey/utils@workspace:packages/utils": version: 0.0.0-use.local resolution: "@linux-odyssey/utils@workspace:packages/utils" - dependencies: - "@linux-odyssey/models": "workspace:^" languageName: unknown linkType: soft