Merge pull request #167 from alithya-oss:fix/repo-tools

fjudith · web-flow · commit 16d656e2b260 · 2025-05-30T00:28:17.000-04:00
Fixed repo-tools
diff --git a/.gitignore b/.gitignore
@@ -58,10 +58,5 @@ site
 
 # vscode database functionality support files
 *.session.sql.tmp
-scripts
-.tmp
-scripts
-.tmp
-scripts
 .tmp
 scripts
diff --git a/scripts/ci/check-if-release.js b/scripts/ci/check-if-release.js
@@ -1,22 +1,7 @@
-/*
- * Copyright 2025 The Alithya Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+#!/usr/bin/env node
 /* eslint-disable @backstage/no-undeclared-imports */
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2025 The Alithya Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/scripts/ci/create-tag.js b/scripts/ci/create-tag.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import { Octokit } from '@octokit/rest';
 import { resolve as resolvePath } from 'path';
 import fs from 'fs-extra';
diff --git a/scripts/ci/generate-bump-changesets.js b/scripts/ci/generate-bump-changesets.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import { promisify } from 'util';
 import { exec as execOriginal } from 'child_process';
 import fs from 'fs/promises';
diff --git a/scripts/ci/generate-knip-report.js b/scripts/ci/generate-knip-report.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import { resolve as resolvePath } from 'path';
 import { promises as fs } from 'fs';
 import { exec } from 'child_process';
diff --git a/scripts/ci/generate-version-bump-changeset.js b/scripts/ci/generate-version-bump-changeset.js
@@ -1,22 +1,7 @@
-/*
- * Copyright 2025 The Alithya Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+#!/usr/bin/env node
 /* eslint-disable @backstage/no-undeclared-imports */
 /*
- * Copyright 2025 The Backstage Authors
+ * Copyright 2025 The Alithya Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/scripts/ci/list-workspaces-with-changes.js b/scripts/ci/list-workspaces-with-changes.js
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { execFile as execFileCb } from 'child_process';
 import { promises as fs } from 'fs';
 import { promisify } from 'util';
diff --git a/scripts/ci/set-release-name.js b/scripts/ci/set-release-name.js
@@ -1,22 +1,7 @@
-/*
- * Copyright 2025 The Alithya Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+#!/usr/bin/env node
 /* eslint-disable @backstage/no-undeclared-imports */
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2025 The Alithya Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/scripts/ci/verify-changesets.js b/scripts/ci/verify-changesets.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import { join } from "path";
 import fs from "fs/promises";
 import { default as parseChangeset } from "@changesets/parse";
diff --git a/scripts/ci/verify-lockfile-duplicates.js b/scripts/ci/verify-lockfile-duplicates.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /* eslint-disable @backstage/no-undeclared-imports */
 
 import { execFile as execFileCb } from "child_process";
diff --git a/scripts/list-backend-feature.js b/scripts/list-backend-feature.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import fs from 'fs-extra';
 import { getPackages } from '@manypkg/get-packages';
 import { resolve, join } from 'path';
diff --git a/scripts/list-compatibility.js b/scripts/list-compatibility.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import arrayToTable from 'array-to-table';
 import { listWorkspaces } from './list-workspaces.js';
 
diff --git a/scripts/list-frontend-feature.js b/scripts/list-frontend-feature.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import fs from 'fs-extra';
 import { getPackages } from '@manypkg/get-packages';
 import { resolve, join } from 'path';
diff --git a/scripts/list-workspaces-for-docs.js b/scripts/list-workspaces-for-docs.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2025 The Alithya Authors
  *
@@ -14,22 +15,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 // import fs from 'fs-extra';
 import { getPackages } from '@manypkg/get-packages';
 import { resolve } from 'path';
diff --git a/workspaces/repo-tools/packages/cli/src/commands/index.ts b/workspaces/repo-tools/packages/cli/src/commands/index.ts
@@ -18,13 +18,25 @@ import { Command } from 'commander';
 import { exitWithError } from '../lib/errors';
 import { assertError } from '@backstage/errors';
 
+type ActionFunc = (...args: any[]) => Promise<void>;
+type ActionExports<TModule extends object> = {
+  [KName in keyof TModule as TModule[KName] extends ActionFunc
+    ? KName
+    : never]: TModule[KName];
+};
+
 // Wraps an action function so that it always exits and handles errors
-function lazy(
-  getActionFunc: () => Promise<(...args: any[]) => Promise<void>>,
+export function lazy<TModule extends object>(
+  moduleLoader: () => Promise<TModule>,
+  exportName: keyof ActionExports<TModule>,
 ): (...args: any[]) => Promise<never> {
   return async (...args: any[]) => {
     try {
-      const actionFunc = await getActionFunc();
+      const mod = await moduleLoader();
+      const actualModule = (
+        mod as unknown as { default: ActionExports<TModule> }
+      ).default;
+      const actionFunc = actualModule[exportName] as ActionFunc;
       await actionFunc(...args);
 
       process.exit(0);
@@ -46,12 +58,12 @@ export const registerCommands = (program: Command) => {
     )
     .option('--branch [branch]', 'use a branch for deprecation commits')
     .option('--force', 'Overwrite existing workspace', false)
-    .action(lazy(() => import('./plugin/migrate').then(m => m.default)));
+    .action(lazy(() => import('./plugin/migrate'), 'default'));
 
   program
     .command('workspace')
     .command('create')
-    .action(lazy(() => import('./workspace/create').then(m => m.default)));
+    .action(lazy(() => import('./workspace/create'), 'default'));
 
   const lintCommand = program
     .command('lint [command]')
@@ -61,9 +73,5 @@ export const registerCommands = (program: Command) => {
     .description(
       'Lint backend plugin packages for legacy exports and make sure it conforms to the new export pattern',
     )
-    .action(
-      lazy(() =>
-        import('./lint/lint-legacy-backend-exports').then(m => m.lint),
-      ),
-    );
+    .action(lazy(() => import('./lint/lint-legacy-backend-exports'), 'lint'));
 };
