Reorganize linters and fixers (#22650)

* Reorganize linters and fixers * Fix import * Fix commands in package.json
mdn · Mar 28, 2024 · 4d6bfff · 4d6bfff
1 parent 09a858f
commit 4d6bfff
Show file tree

Hide file tree

Showing 48 changed files with 30 additions and 30 deletions.
diff --git a/scripts/fix/index.ts → lint/fix.ts b/scripts/fix/index.ts → lint/fix.ts
@@ -9,14 +9,14 @@ import { fileURLToPath } from 'node:url';
 import esMain from 'es-main';
 import chalk from 'chalk-template';
 
-import fixBrowserOrder from './browser-order.js';
-import fixFeatureOrder from './feature-order.js';
-import fixPropertyOrder from './property-order.js';
-import fixStatementOrder from './statement-order.js';
-import fixFlags from './flags.js';
-import fixLinks from './links.js';
-import fixStatus from './status.js';
-import fixMirror from './mirror.js';
+import fixBrowserOrder from './fixer/browser-order.js';
+import fixFeatureOrder from './fixer/feature-order.js';
+import fixPropertyOrder from './fixer/property-order.js';
+import fixStatementOrder from './fixer/statement-order.js';
+import fixFlags from './fixer/flags.js';
+import fixLinks from './fixer/links.js';
+import fixStatus from './fixer/status.js';
+import fixMirror from './fixer/mirror.js';
 
 const dirname = fileURLToPath(new URL('.', import.meta.url));
 

diff --git a/scripts/fix/browser-order.ts → lint/fixer/browser-order.ts b/scripts/fix/browser-order.ts → lint/fixer/browser-order.ts
@@ -8,7 +8,7 @@ import {
   CompatStatement,
   SupportBlock,
 } from '../../types/types.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import { IS_WINDOWS } from '../utils.js';
 
 /**
  * Return a new "support_block" object whose first-level properties

diff --git a/scripts/fix/feature-order.ts → lint/fixer/feature-order.ts b/scripts/fix/feature-order.ts → lint/fixer/feature-order.ts
@@ -4,8 +4,8 @@
 import fs from 'node:fs';
 
 import { Identifier } from '../../types/types.js';
-import compareFeatures from '../lib/compare-features.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import compareFeatures from '../../scripts/lib/compare-features.js';
+import { IS_WINDOWS } from '../utils.js';
 
 /**
  * Return a new feature object whose first-level properties have been

diff --git a/scripts/fix/flags.test.ts → lint/fixer/flags.test.ts b/scripts/fix/flags.test.ts → lint/fixer/flags.test.ts
diff --git a/scripts/fix/flags.ts → lint/fixer/flags.ts b/scripts/fix/flags.ts → lint/fixer/flags.ts
@@ -8,11 +8,11 @@ import {
   SupportStatement,
   SimpleSupportStatement,
 } from '../../types/types.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import { IS_WINDOWS } from '../utils.js';
 import testFlags, {
   isIrrelevantFlagData,
   getBasicSupportStatement,
-} from '../../test/linter/test-flags.js';
+} from '../linter/test-flags.js';
 import walk from '../../utils/walk.js';
 
 /**

diff --git a/scripts/fix/links.ts → lint/fixer/links.ts b/scripts/fix/links.ts → lint/fixer/links.ts
@@ -3,8 +3,8 @@
 
 import fs from 'node:fs';
 
-import { IS_WINDOWS } from '../../test/utils.js';
-import { processData } from '../../test/linter/test-links.js';
+import { IS_WINDOWS } from '../utils.js';
+import { processData } from '../linter/test-links.js';
 
 /**
  * Fix issues with links throughout the BCD files

diff --git a/scripts/fix/mirror.ts → lint/fixer/mirror.ts b/scripts/fix/mirror.ts → lint/fixer/mirror.ts
@@ -12,7 +12,7 @@ import {
 } from '../../types/index.js';
 import bcd from '../../index.js';
 import { walk } from '../../utils/index.js';
-import mirrorSupport from '../build/mirror.js';
+import mirrorSupport from '../../scripts/build/mirror.js';
 
 const downstreamBrowsers = (
   Object.keys(bcd.browsers) as (keyof typeof bcd.browsers)[]

diff --git a/scripts/fix/property-order.ts → lint/fixer/property-order.ts b/scripts/fix/property-order.ts → lint/fixer/property-order.ts
@@ -3,8 +3,8 @@
 
 import fs from 'node:fs';
 
-import { IS_WINDOWS } from '../../test/utils.js';
-import stringifyAndOrderProperties from '../lib/stringify-and-order-properties.js';
+import { IS_WINDOWS } from '../utils.js';
+import stringifyAndOrderProperties from '../../scripts/lib/stringify-and-order-properties.js';
 
 /**
  * Fix issues with the property order throughout the BCD files

diff --git a/scripts/fix/statement-order.ts → lint/fixer/statement-order.ts b/scripts/fix/statement-order.ts → lint/fixer/statement-order.ts
@@ -4,8 +4,8 @@
 import fs from 'node:fs';
 
 import { BrowserName, CompatStatement } from '../../types/types.js';
-import { IS_WINDOWS } from '../../test/utils.js';
-import compareStatements from '../lib/compare-statements.js';
+import { IS_WINDOWS } from '../utils.js';
+import compareStatements from '../../scripts/lib/compare-statements.js';
 
 /**
  * Return a new "support_block" object whose support statements have

diff --git a/scripts/fix/status.ts → lint/fixer/status.ts b/scripts/fix/status.ts → lint/fixer/status.ts
@@ -4,8 +4,8 @@
 import fs from 'node:fs';
 
 import { Identifier } from '../../types/types.js';
-import { checkExperimental } from '../../test/linter/test-status.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import { checkExperimental } from '../linter/test-status.js';
+import { IS_WINDOWS } from '../utils.js';
 
 /**
  * Fix the status values

diff --git a/test/lint.ts → lint/lint.ts b/test/lint.ts → lint/lint.ts
diff --git a/test/linter/index.ts → lint/linter/index.ts b/test/linter/index.ts → lint/linter/index.ts
diff --git a/test/linter/test-browsers-data.test.ts → lint/linter/test-browsers-data.test.ts b/test/linter/test-browsers-data.test.ts → lint/linter/test-browsers-data.test.ts
diff --git a/test/linter/test-browsers-data.ts → lint/linter/test-browsers-data.ts b/test/linter/test-browsers-data.ts → lint/linter/test-browsers-data.ts
diff --git a/test/linter/test-browsers-presence.test.ts → lint/linter/test-browsers-presence.test.ts b/test/linter/test-browsers-presence.test.ts → lint/linter/test-browsers-presence.test.ts
diff --git a/test/linter/test-browsers-presence.ts → lint/linter/test-browsers-presence.ts b/test/linter/test-browsers-presence.ts → lint/linter/test-browsers-presence.ts
diff --git a/test/linter/test-consistency.test.ts → lint/linter/test-consistency.test.ts b/test/linter/test-consistency.test.ts → lint/linter/test-consistency.test.ts
diff --git a/test/linter/test-consistency.ts → lint/linter/test-consistency.ts b/test/linter/test-consistency.ts → lint/linter/test-consistency.ts
diff --git a/test/linter/test-descriptions.test.ts → lint/linter/test-descriptions.test.ts b/test/linter/test-descriptions.test.ts → lint/linter/test-descriptions.test.ts
diff --git a/test/linter/test-descriptions.ts → lint/linter/test-descriptions.ts b/test/linter/test-descriptions.ts → lint/linter/test-descriptions.ts
diff --git a/test/linter/test-filename.test.ts → lint/linter/test-filename.test.ts b/test/linter/test-filename.test.ts → lint/linter/test-filename.test.ts
diff --git a/test/linter/test-filename.ts → lint/linter/test-filename.ts b/test/linter/test-filename.ts → lint/linter/test-filename.ts
diff --git a/test/linter/test-flags.ts → lint/linter/test-flags.ts b/test/linter/test-flags.ts → lint/linter/test-flags.ts
diff --git a/test/linter/test-links.test.ts → lint/linter/test-links.test.ts b/test/linter/test-links.test.ts → lint/linter/test-links.test.ts
diff --git a/test/linter/test-links.ts → lint/linter/test-links.ts b/test/linter/test-links.ts → lint/linter/test-links.ts
diff --git a/test/linter/test-mirror.test.ts → lint/linter/test-mirror.test.ts b/test/linter/test-mirror.test.ts → lint/linter/test-mirror.test.ts
diff --git a/test/linter/test-mirror.ts → lint/linter/test-mirror.ts b/test/linter/test-mirror.ts → lint/linter/test-mirror.ts
@@ -8,7 +8,7 @@ import { BrowserName } from '../../types/types.js';
 import { InternalSupportBlock } from '../../types/index';
 import bcd from '../../index.js';
 const { browsers } = bcd;
-import { isMirrorEquivalent } from '../../scripts/fix/mirror.js';
+import { isMirrorEquivalent } from '../fixer/mirror.js';
 
 /**
  * Check the data to ensure all statements that should use `mirror` do

diff --git a/test/linter/test-multiple-statements.test.ts → lint/linter/test-multiple-statements.test.ts b/test/linter/test-multiple-statements.test.ts → lint/linter/test-multiple-statements.test.ts
diff --git a/test/linter/test-multiple-statements.ts → lint/linter/test-multiple-statements.ts b/test/linter/test-multiple-statements.ts → lint/linter/test-multiple-statements.ts
diff --git a/test/linter/test-notes.ts → lint/linter/test-notes.ts b/test/linter/test-notes.ts → lint/linter/test-notes.ts
diff --git a/test/linter/test-obsolete.test.ts → lint/linter/test-obsolete.test.ts b/test/linter/test-obsolete.test.ts → lint/linter/test-obsolete.test.ts
diff --git a/test/linter/test-obsolete.ts → lint/linter/test-obsolete.ts b/test/linter/test-obsolete.ts → lint/linter/test-obsolete.ts
diff --git a/test/linter/test-prefix.test.ts → lint/linter/test-prefix.test.ts b/test/linter/test-prefix.test.ts → lint/linter/test-prefix.test.ts
diff --git a/test/linter/test-prefix.ts → lint/linter/test-prefix.ts b/test/linter/test-prefix.ts → lint/linter/test-prefix.ts
diff --git a/test/linter/test-schema.ts → lint/linter/test-schema.ts b/test/linter/test-schema.ts → lint/linter/test-schema.ts
diff --git a/test/linter/test-spec-urls.ts → lint/linter/test-spec-urls.ts b/test/linter/test-spec-urls.ts → lint/linter/test-spec-urls.ts
diff --git a/test/linter/test-status.test.ts → lint/linter/test-status.test.ts b/test/linter/test-status.test.ts → lint/linter/test-status.test.ts
diff --git a/test/linter/test-status.ts → lint/linter/test-status.ts b/test/linter/test-status.ts → lint/linter/test-status.ts
diff --git a/test/linter/test-style.ts → lint/linter/test-style.ts b/test/linter/test-style.ts → lint/linter/test-style.ts
@@ -11,9 +11,9 @@ import {
   indexToPos,
   jsonDiff,
 } from '../utils.js';
-import { orderSupportBlock } from '../../scripts/fix/browser-order.js';
-import { orderFeatures } from '../../scripts/fix/feature-order.js';
-import { orderStatements } from '../../scripts/fix/statement-order.js';
+import { orderSupportBlock } from '../fixer//browser-order.js';
+import { orderFeatures } from '../fixer//feature-order.js';
+import { orderStatements } from '../fixer//statement-order.js';
 import stringifyAndOrderProperties from '../../scripts/lib/stringify-and-order-properties.js';
 
 /**

diff --git a/test/linter/test-tags.test.ts → lint/linter/test-tags.test.ts b/test/linter/test-tags.test.ts → lint/linter/test-tags.test.ts
diff --git a/test/linter/test-tags.ts → lint/linter/test-tags.ts b/test/linter/test-tags.ts → lint/linter/test-tags.ts
diff --git a/test/linter/test-versions.test.ts → lint/linter/test-versions.test.ts b/test/linter/test-versions.test.ts → lint/linter/test-versions.test.ts
diff --git a/test/linter/test-versions.ts → lint/linter/test-versions.ts b/test/linter/test-versions.ts → lint/linter/test-versions.ts
diff --git a/test/utils.test.ts → lint/utils.test.ts b/test/utils.test.ts → lint/utils.test.ts
diff --git a/test/utils.ts → lint/utils.ts b/test/utils.ts → lint/utils.ts
diff --git a/package.json b/package.json
@@ -100,8 +100,8 @@
     "coverage": "c8 report -r lcov && open-cli coverage/lcov-report/index.html",
     "format": "eslint . && prettier --check .",
     "format:fix": "eslint --quiet --fix . && prettier --write .",
-    "lint": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning test/lint.ts",
-    "lint:fix": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning scripts/fix/index.ts",
+    "lint": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning lint/lint.ts",
+    "lint:fix": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning lint/fix.ts",
     "fix": "npm run format:fix && npm run lint:fix",
     "stats": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning scripts/statistics.ts",
     "build": "node --loader=ts-node/esm --no-warnings=ExperimentalWarning scripts/build/index.ts",

diff --git a/scripts/migrations/002-remove-webview-flags.ts b/scripts/migrations/002-remove-webview-flags.ts
@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url';
 import esMain from 'es-main';
 
 import { CompatStatement, SimpleSupportStatement } from '../../types/types.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import { IS_WINDOWS } from '../../lint/utils.js';
 
 const dirname = fileURLToPath(new URL('.', import.meta.url));
 

diff --git a/scripts/migrations/010-set-oculus-to-mirror.ts b/scripts/migrations/010-set-oculus-to-mirror.ts
@@ -9,7 +9,7 @@ import esMain from 'es-main';
 
 import { InternalSupportStatement } from '../../types/index.js';
 import { CompatStatement } from '../../types/types.js';
-import { IS_WINDOWS } from '../../test/utils.js';
+import { IS_WINDOWS } from '../../lint/utils.js';
 
 const dirname = fileURLToPath(new URL('.', import.meta.url));