fix(rules): rename some to prepare for nested rule

src/common/techs.ts

@@ -8,7 +8,7 @@ export const list: TechItem[] = [
   { key: 'auth0', name: 'Auth0', type: 'sass' },
   { key: 'aws', name: 'AWS', type: 'hosting' },
   { key: 'azure', name: 'Azure', type: 'hosting' },
-  { key: 'azureci', name: 'AzureCi', type: 'ci' },
+  { key: 'azure.ci', name: 'AzureCi', type: 'ci' },
   { key: 'bash', name: 'Bash', type: 'language' },
   { key: 'bootstrap', name: 'Bootstrap', type: 'tool' },
   { key: 'browserstack', name: 'Browserstack', type: 'ci' },
@@ -47,8 +47,8 @@ export const list: TechItem[] = [
   { key: 'gcp.gce', name: 'Compute Engine', type: 'hosting' },
   { key: 'gitlabci', name: 'Gitlab CI', type: 'ci' },
   { key: 'github', name: 'Github', type: 'tool' },
-  { key: 'githubactions', name: 'Github Actions', type: 'ci' },
-  { key: 'githubpages', name: 'Github Pages', type: 'hosting' },
+  { key: 'github.actions', name: 'Github Actions', type: 'ci' },
+  { key: 'github.pages', name: 'Github Pages', type: 'hosting' },
   { key: 'golang', name: 'Go', type: 'language' },
   { key: 'helm', name: 'Helm', type: 'tool' },
   { key: 'heroku', name: 'Heroku', type: 'hosting' },

src/rules/ci.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';
 
 import { analyser } from '../analyser/index.js';
 import { listIndexed } from '../common/techs.js';
+import type { AllowedKeys } from '../index.js';
 import { FakeProvider } from '../provider/fake.js';
 import { rawList } from '../rules.js';
 import './index.js';
@@ -29,16 +30,16 @@ describe('ci', () => {
         files: {},
       }),
     });
-    expect(res.toJson('').techs).toStrictEqual([
+    const match: AllowedKeys[] = [
       'appveyor',
-      'azureci',
+      'azure.ci',
       'browserstack',
       'circleci',
       'cirrusci',
       'codesandboxci',
       'cypressci',
       'dependabot',
-      'githubactions',
+      'github.actions',
       'gitlabci',
       'javascript',
       'jenkins',
@@ -47,7 +48,8 @@ describe('ci', () => {
       'styleci',
       'teamcity',
       'travisci',
-    ]);
+    ];
+    expect(res.toJson('').techs).toStrictEqual(match);
   });
 
   it('enforce that we match .github', async () => {
@@ -63,6 +65,7 @@ describe('ci', () => {
         },
       }),
     });
-    expect(res.toJson('').techs).toStrictEqual(['github', 'githubactions']);
+    const match: AllowedKeys[] = ['github', 'github.actions'];
+    expect(res.toJson('').techs).toStrictEqual(match);
   });
 });

src/rules/ci/azureci.ts → src/rules/ci/azure.ci.ts

@@ -1,6 +1,6 @@
 import { register } from '../../rules.js';
 
 register({
-  tech: 'azureci',
+  tech: 'azure.ci',
   files: ['azure-pipelines.yml'],
 });

src/rules/ci/githubactions.ts → src/rules/ci/github.actions.ts

@@ -1,7 +1,7 @@
 import { register } from '../../rules.js';
 
 register({
-  tech: 'githubactions',
+  tech: 'github.actions',
   matchFullPath: true,
   files: /.github\/workflows\/.+\.yml/,
   example: '.github/workflows/ci.yml',

src/rules/ci/index.ts

@@ -1,12 +1,12 @@
 import './appveyor.js';
-import './azureci.js';
+import './azure.ci.js';
 import './browserstack.js';
 import './circleci.js';
 import './cirrusci.js';
 import './codesandboxci.js';
 import './cypressci.js';
 import './dependabot.js';
-import './githubactions.js';
+import './github.actions.js';
 import './gitlabci.js';
 import './jenkins.js';
 import './relativeci.js';

src/rules/hosting.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';
 
 import { analyser } from '../analyser/index.js';
 import { listIndexed } from '../common/techs.js';
+import type { AllowedKeys } from '../index.js';
 import { FakeProvider } from '../provider/fake.js';
 import { rawList } from '../rules.js';
 import './index.js';
@@ -29,15 +30,16 @@ describe('hosting', () => {
         files: {},
       }),
     });
-    expect(res.toJson('').techs).toStrictEqual([
+    const match: AllowedKeys[] = [
       'expodev',
       'flyio',
-      'githubpages',
+      'github.pages',
       'heroku',
       'netlify',
       'platformsh',
       'render',
       'vercel',
-    ]);
+    ];
+    expect(res.toJson('').techs).toStrictEqual(match);
   });
 });

src/rules/hosting/githubpages.ts → src/rules/hosting/github.pages.ts

@@ -1,6 +1,6 @@
 import { register } from '../../rules.js';
 
 register({
-  tech: 'githubpages',
+  tech: 'github.pages',
   files: ['_config.yml'],
 });

src/rules/hosting/index.ts

@@ -7,7 +7,7 @@ import './flyio.js';
 import './gcp.js';
 import './gcp.cloudrun.js';
 import './gcp.gce.js';
-import './githubpages.js';
+import './github.pages.js';
 import './heroku.js';
 import './kubernetes.js';
 import './mongodbatlas.js';

src/rules/spec/docker/dependencies.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
 import { analyser } from '../../../analyser/index.js';
+import type { AllowedKeys } from '../../../index.js';
 import { flatten } from '../../../payload/helpers.js';
 import { FakeProvider } from '../../../provider/fake.js';
 import { rawList } from '../../../rules.js';
@@ -36,9 +37,7 @@ describe('docker', () => {
       }),
     });
 
-    expect(
-      Array.from(flatten(res, { merge: true }).techs).sort()
-    ).toStrictEqual([
+    const match: AllowedKeys[] = [
       'caddy',
       'cassandra',
       'couchbase',
@@ -64,6 +63,9 @@ describe('docker', () => {
       'strapi',
       'vault',
       'zookeeper',
-    ]);
+    ];
+    expect(
+      Array.from(flatten(res, { merge: true }).techs).sort()
+    ).toStrictEqual(match);
   });
 });

src/rules/spec/nodejs/dependencies.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
 import { analyser } from '../../../analyser/index.js';
+import type { AllowedKeys } from '../../../index.js';
 import { flatten } from '../../../payload/helpers.js';
 import { FakeProvider } from '../../../provider/fake.js';
 import { rawList } from '../../../rules.js';
@@ -30,9 +31,7 @@ describe('npm', () => {
         },
       }),
     });
-    expect(
-      Array.from(flatten(res, { merge: true }).techs).sort()
-    ).toStrictEqual([
+    const match: AllowedKeys[] = [
       'algolia',
       'angular',
       'auth0',
@@ -89,6 +88,9 @@ describe('npm', () => {
       'vite',
       'vue',
       'webpack',
-    ]);
+    ];
+    expect(
+      Array.from(flatten(res, { merge: true }).techs).sort()
+    ).toStrictEqual(match);
   });
 });

src/rules/spec/terraform/dependencies.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
 import { analyser } from '../../../analyser/index.js';
+import type { AllowedKeys } from '../../../index.js';
 import { flatten } from '../../../payload/helpers.js';
 import { FakeProvider } from '../../../provider/fake.js';
 import { rawList } from '../../../rules.js';
@@ -33,28 +34,29 @@ describe('terraform (lockfile)', () => {
       }),
     });
 
-    expect(flatten(res, { merge: true }).techs).toStrictEqual(
-      new Set([
-        'alibabacloud',
-        'auth0',
-        'aws',
-        'azure',
-        'datadog',
-        'elasticsearch',
-        'elasticstack',
-        'flyio',
-        'gcp',
-        'github',
-        'helm',
-        'kubernetes',
-        'mongodbatlas',
-        'newrelic',
-        'oraclecloud',
-        'terraform',
-        'vault',
-        'vercel',
-      ])
-    );
+    const match: AllowedKeys[] = [
+      'alibabacloud',
+      'auth0',
+      'aws',
+      'azure',
+      'datadog',
+      'elasticsearch',
+      'elasticstack',
+      'flyio',
+      'gcp',
+      'github',
+      'helm',
+      'kubernetes',
+      'mongodbatlas',
+      'newrelic',
+      'oraclecloud',
+      'terraform',
+      'vault',
+      'vercel',
+    ];
+    expect(
+      Array.from(flatten(res, { merge: true }).techs).sort()
+    ).toStrictEqual(match);
   });
 });
 
@@ -89,8 +91,14 @@ describe('terraform (resource)', () => {
       }),
     });
 
+    const match: AllowedKeys[] = [
+      'gcp.cloudrun',
+      'gcp.gce',
+      'gcp.pubsub',
+      'terraform',
+    ];
     expect(
       Array.from(flatten(res, { merge: true }).techs).sort()
-    ).toStrictEqual(['gcp.cloudrun', 'gcp.gce', 'gcp.pubsub', 'terraform']);
+    ).toStrictEqual(match);
   });
 });

src/types/techs.ts

@@ -16,8 +16,8 @@ export type AllowedKeys =
   | 'appveyor'
   | 'auth0'
   | 'aws'
+  | 'azure.ci'
   | 'azure'
-  | 'azureci'
   | 'bash'
   | 'bootstrap'
   | 'browserstack'
@@ -54,9 +54,9 @@ export type AllowedKeys =
   | 'gcp.gce'
   | 'gcp.pubsub'
   | 'gcp'
+  | 'github.actions'
+  | 'github.pages'
   | 'github'
-  | 'githubactions'
-  | 'githubpages'
   | 'gitlabci'
   | 'golang'
   | 'helm'