Skip to content

Commit

Permalink
Merge pull request #194 from Stephen-Thomson/fix-lint-errors-iteratively
Browse files Browse the repository at this point in the history
Tests and build work.
  • Loading branch information
ty-everett authored Feb 7, 2025
2 parents c8b12e4 + 8e6ed8a commit fc8ab4b
Show file tree
Hide file tree
Showing 190 changed files with 15,550 additions and 32,932 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
node_modules
/dist
/coverage
/coverage

eslint-debug-output.txt
file_list.txt
2 changes: 2 additions & 0 deletions .standardignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/Point.ts
src/primitives/Point.ts
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"standard.engine": "ts-standard"
}
14 changes: 7 additions & 7 deletions docs/swagger/dist/swagger-initializer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
window.onload = function() {
//<editor-fold desc="Changeable Configuration Block">
window.onload = function () {
// <editor-fold desc="Changeable Configuration Block">

// the following lines will be replaced by docker/configurator, when it runs in a docker-container
window.ui = SwaggerUIBundle({
url: "swagger.yaml",
url: 'swagger.yaml',
dom_id: '#swagger-ui',
deepLinking: true,
presets: [
Expand All @@ -13,8 +13,8 @@ window.onload = function() {
plugins: [
SwaggerUIBundle.plugins.DownloadUrl
],
layout: "StandaloneLayout"
});
layout: 'StandaloneLayout'
})

//</editor-fold>
};
// </editor-fold>
}
2 changes: 1 addition & 1 deletion docs/swagger/dist/swagger-ui-bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/swagger/dist/swagger-ui-es-bundle-core.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/swagger/dist/swagger-ui-es-bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/swagger/dist/swagger-ui-standalone-preset.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/swagger/dist/swagger-ui.js

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import globals from 'globals'
import pluginJs from '@eslint/js'
import tseslint from 'typescript-eslint'
import tsStandard from 'ts-standard'
import pluginJest from 'eslint-plugin-jest'

export default [
tsStandard, // ✅ Ensure ESLint loads ts-standard as a base config

{
// Add ignorePatterns at the top level for ESLint
ignorePatterns: ['src/primitives/Point.ts'],

files: ['src/**/*.ts', '**/*.{js,mjs,cjs,ts,jsx,tsx}'], // ✅ Ensure TS files are included
languageOptions: {
globals: {
...globals.browser,
process: 'readonly',
...globals.jest
},
parser: tseslint.parser,
parserOptions: {
project: './tsconfig.json', // ✅ Ensure this file exists
tsconfigRootDir: process.cwd() // ✅ Use process.cwd() instead of import.meta.dirname
}
},
plugins: {
'@typescript-eslint': tseslint.plugin,
jest: pluginJest
},
rules: {
...tseslint.configs.recommended.rules, // ✅ TypeScript ESLint rules
...pluginJs.configs.recommended.rules, // ✅ ESLint recommended rules

// ✅ Jest-specific rules
'jest/no-disabled-tests': 'warn',
'jest/no-focused-tests': 'error',
'jest/no-identical-title': 'error',
'jest/prefer-to-have-length': 'warn',
'jest/valid-expect': 'error'
}
}
]
19,258 changes: 0 additions & 19,258 deletions file_list.txt

This file was deleted.

35 changes: 19 additions & 16 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
/** @type {import('ts-jest').JestConfigWithTsJest} */
export default {
preset: 'ts-jest',
// Use the preset specifically designed for ESM
preset: 'ts-jest/presets/default-esm',

// Use the Node environment for testing
testEnvironment: 'node',

// Ignore compiled output
testPathIgnorePatterns: ['dist/'],
moduleDirectories: ['node_modules', 'src'],
collectCoverageFrom: ['src/**/*.ts'],

// ✅ Ensure Jest can resolve imports correctly
moduleNameMapper: {
'^@primitives/(.*)$': '<rootDir>/src/primitives/$1',
'^@auth/(.*)$': '<rootDir>/src/auth/$1',
'^@transaction/(.*)$': '<rootDir>/src/transaction/$1',
'^@wallet/(.*)$': '<rootDir>/src/wallet/$1',
'^@compat/(.*)$': '<rootDir>/src/compat/$1',
'^@messages/(.*)$': '<rootDir>/src/messages/$1',
'^@overlay-tools/(.*)$': '<rootDir>/src/overlay-tools/$1',
'^@script/(.*)$': '<rootDir>/src/script/$1',
'^@totp/(.*)$': '<rootDir>/src/totp/$1'
// These globals configure ts-jest to output ESM
globals: {
'ts-jest': {
useESM: true
}
},

// ✅ Ensure Jest recognizes TypeScript and resolves `.ts` extensions
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
// Tell Jest that files ending in .ts should be treated as ESM modules
extensionsToTreatAsEsm: ['.ts'],

// Optionally, if you have imports with a .js extension in your source (or tests)
// but your source files are actually TypeScript, this mapper will remove the extension.
moduleNameMapper: {
'^(\\.{1,2}/.*)\\.js$': '$1'
}
}
30 changes: 15 additions & 15 deletions mod.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export * from './src/primitives/index'
export * from './src/script/index'
export * from './src/script/templates/index'
export * from './src/transaction/index'
export * from './src/transaction/fee-models/index'
export * from './src/transaction/broadcasters/index'
export * from './src/transaction/chaintrackers/index'
export * from './src/transaction/http/index'
export * from './src/messages/index'
export * from './src/compat/index'
export * from './src/totp/index'
export * from './src/wallet/index'
export * from './src/wallet/substrates/index'
export * from './src/auth/index'
export * from './src/overlay-tools/index'
export * from './src/primitives/index.js'
export * from './src/script/index.js'
export * from './src/script/templates/index.js'
export * from './src/transaction/index.js'
export * from './src/transaction/fee-models/index.js'
export * from './src/transaction/broadcasters/index.js'
export * from './src/transaction/chaintrackers/index.js'
export * from './src/transaction/http/index.js'
export * from './src/messages/index.js'
export * from './src/compat/index.js'
export * from './src/totp/index.js'
export * from './src/wallet/index.js'
export * from './src/wallet/substrates/index.js'
export * from './src/auth/index.js'
export * from './src/overlay-tools/index.js'
Loading

0 comments on commit fc8ab4b

Please sign in to comment.