@comet/upgrade 1.41.0 → 1.43.0

package/lib/index.js

@@ -7,12 +7,13 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const execute_command_util_1 = require("./util/execute-command.util");
+const get_latest_package_version_1 = require("./util/get-latest-package-version");
 const microservices = ["api", "admin", "site"];
 function microserviceExists(microservice) {
     return fs_1.default.existsSync(`${microservice}/package.json`);
 }
 async function main() {
-    const targetVersionArg = process.argv[2];
+    let targetVersionArg = process.argv[2];
     if (targetVersionArg === undefined) {
         console.error("Missing target version! Usage: npx @comet/upgrade <version>");
         process.exit(-1);
@@ -36,6 +37,9 @@ async function main() {
         }
         return;
     }
+    if (!targetVersionArg.includes(".")) {
+        targetVersionArg = await (0, get_latest_package_version_1.getLatestPackageVersion)("@comet/admin", semver_1.default.coerce(targetVersionArg)?.major);
+    }
     const targetVersion = semver_1.default.coerce(targetVersionArg, { includePrerelease: true });
     if (!targetVersion) {
         console.error("Can't parse version number. Example usage: npx @comet/upgrade v4");

package/lib/util/get-latest-package-version.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLatestPackageVersion = void 0;
+const semver_1 = __importDefault(require("semver"));
+async function getLatestPackageVersion(packageName, majorVersion) {
+    const url = `https://registry.npmjs.org/${packageName}`;
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`Failed to fetch package info: ${response.status} ${response.statusText}`);
+        }
+        const packageInfo = (await response.json());
+        if (!majorVersion) {
+            return packageInfo.version;
+        }
+        const versions = Object.keys(packageInfo.versions);
+        const latestForMajor = versions.filter((version) => semver_1.default.satisfies(version, `^${majorVersion}.0.0`)).sort(semver_1.default.rcompare)[0];
+        return latestForMajor;
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch package info for ${packageName}: ${error}`);
+    }
+}
+exports.getLatestPackageVersion = getLatestPackageVersion;

package/lib/v7/use-graphql-scalars.js

@@ -15,14 +15,23 @@ async function useGraphqlScalars() {
     await (0, execute_command_util_1.executeCommand)("npm", ["uninstall", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-type-json"]);
     await (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-scalars"]);
     // replace graphql-type-json with graphql-scalars in all api files
-    // before: import { GraphQLJSONObject } from "graphql-type-json";
-    // after: import { GraphQLJSONObject } from "graphql-scalars";
+    // before: import { <GraphQLJSON|GraphQLJSONObject> } from "graphql-type-json"; or import <ImportedName> from "graphql-type-json";
+    // after: import { <GraphQLJSON|GraphQLJSONObject> } from "graphql-scalars";
     const files = glob_1.glob.sync(["api/src/**/*.ts"]);
     for (const filePath of files) {
         let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
         if (!fileContent.includes("graphql-type-json")) {
             continue;
         }
+        // replace default imports (which is GraphQLJSON) from graphql-type-json. Because of the default import, the name can be anything.
+        const defaultImportMatches = fileContent.match(/import ([a-zA-Z]+) from "graphql-type-json";/);
+        if (defaultImportMatches) {
+            // replace default import
+            fileContent = fileContent.replace(new RegExp(`import ${defaultImportMatches[1]} from "graphql-type-json";`, "g"), `import { GraphQLJSON } from "graphql-scalars";`);
+            // replace all usages of the default import
+            fileContent = fileContent.replace(new RegExp(`${defaultImportMatches[1]}`, "g"), "GraphQLJSON");
+        }
+        // replace the rest
         fileContent = fileContent.replace(/graphql-type-json/g, "graphql-scalars");
         await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.41.0",
+    "version": "1.43.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {