@comet/upgrade 1.46.0 → 1.48.0

package/lib/v7/replace-exception-interceptor-with-exception-filter.js

@@ -1,19 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const promises_1 = require("fs/promises");
-const format_code_util_1 = require("../util/format-code.util");
+const ts_morph_1 = require("ts-morph");
 /**
  * Replaces the old ExceptionInterceptor with the new ExceptionFilter
  */
 async function replaceExceptionInterceptorWithExceptionFilter() {
-    const filePath = "api/src/main.ts";
-    let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
-    if (!fileContent.includes("ExceptionInterceptor")) {
-        console.log("ExceptionInterceptor not found in main.ts. Make sure that you use the new ExceptionFilter.");
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const sourceFile = project.getSourceFile("api/src/main.ts");
+    if (!sourceFile) {
         return;
     }
-    fileContent = fileContent.replace("app.useGlobalInterceptors(new ExceptionInterceptor(config.debug));", "app.useGlobalFilters(new ExceptionFilter(config.debug));");
-    fileContent = fileContent.replace("ExceptionInterceptor", "ExceptionFilter");
-    await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    const cmsApiImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue() === "@comet/cms-api");
+    if (!cmsApiImport) {
+        return;
+    }
+    const exceptionInterceptorImport = cmsApiImport.getNamedImports().find((namedImport) => namedImport.getName() === "ExceptionInterceptor");
+    if (!exceptionInterceptorImport) {
+        return;
+    }
+    const bootstrap = sourceFile.getFirstDescendantByKind(ts_morph_1.SyntaxKind.FunctionDeclaration);
+    if (!bootstrap) {
+        return;
+    }
+    const useGlobalInterceptors = sourceFile
+        .getDescendantsOfKind(ts_morph_1.SyntaxKind.ExpressionStatement)
+        .find((node) => node.getText().includes("useGlobalInterceptors"));
+    if (!useGlobalInterceptors) {
+        return;
+    }
+    bootstrap.insertStatements(useGlobalInterceptors.getChildIndex() + 1, "app.useGlobalFilters(new ExceptionFilter(config.debug));");
+    const exceptionInterceptor = useGlobalInterceptors
+        .getDescendantsOfKind(ts_morph_1.SyntaxKind.NewExpression)
+        .find((node) => node.getText().includes("ExceptionInterceptor"));
+    if (exceptionInterceptor) {
+        useGlobalInterceptors.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.CallExpression).removeArgument(exceptionInterceptor);
+        if (useGlobalInterceptors.getDescendantsOfKind(ts_morph_1.SyntaxKind.NewExpression).length === 0) {
+            useGlobalInterceptors.remove();
+        }
+    }
+    exceptionInterceptorImport.remove();
+    cmsApiImport.addNamedImport("ExceptionFilter");
+    await sourceFile.save();
 }
 exports.default = replaceExceptionInterceptorWithExceptionFilter;

package/lib/v8/clipboard-helpers.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+/**
+ * readClipboard -> readClipboardText
+ * writeClipboard -> writeClipboardText
+ */
+async function updateClipboardHelpers() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const files = glob_1.glob.sync(["admin/src/**/*.ts", "admin/src/**/*.tsx"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            throw new Error(`Can't get source file for ${filePath}`);
+        }
+        const blocksAdminImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@comet/blocks-admin"));
+        if (!blocksAdminImport) {
+            continue;
+        }
+        const cometAdminImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue() === "@comet/admin");
+        const readClipboardImport = blocksAdminImport.getNamedImports().find((namedImport) => namedImport.getText() === "readClipboard");
+        if (readClipboardImport) {
+            // Remove old import
+            readClipboardImport.remove();
+            // Add new import
+            if (cometAdminImport) {
+                cometAdminImport.addNamedImports(["readClipboardText"]);
+            }
+            else {
+                sourceFile.addImportDeclaration({
+                    namedImports: ["readClipboardText"],
+                    moduleSpecifier: "@comet/admin",
+                });
+            }
+            // Update usages
+            sourceFile
+                .getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
+                .filter((node) => node.getText() === "readClipboard")
+                .forEach((node) => node.replaceWithText("readClipboardText"));
+        }
+        const writeClipboardImport = blocksAdminImport.getNamedImports().find((namedImport) => namedImport.getText() === "writeClipboard");
+        if (writeClipboardImport) {
+            // Remove old import
+            writeClipboardImport.remove();
+            // Add new import
+            if (cometAdminImport) {
+                cometAdminImport.addNamedImports(["writeClipboardText"]);
+            }
+            else {
+                sourceFile.addImportDeclaration({
+                    namedImports: ["writeClipboardText"],
+                    moduleSpecifier: "@comet/admin",
+                });
+            }
+            // Update usages
+            sourceFile
+                .getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
+                .filter((node) => node.getText() === "writeClipboard")
+                .forEach((node) => node.replaceWithText("writeClipboardText"));
+        }
+        if (blocksAdminImport.getNamedImports().length === 0) {
+            blocksAdminImport.remove();
+        }
+        await sourceFile.save();
+    }
+}
+exports.default = updateClipboardHelpers;

package/lib/v8/merge-blocks-admin-into-cms-admin.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+const renamedExports = {
+    createCompositeSetting: "createCompositeBlockField",
+    createCompositeSettings: "createCompositeBlockFields",
+    IPreviewContext: "BlockPreviewContext",
+    PreviewStateInterface: "BlockPreviewStateInterface",
+    AdminComponentPart: "BlockAdminComponentPart",
+    AdminComponentButton: "BlockAdminComponentButton",
+    AdminComponentNestedButton: "BlockAdminComponentNestedButton",
+    AdminComponentPaper: "BlockAdminComponentPaper",
+    useAdminComponentPaper: "useBlockAdminComponentPaper",
+    AdminComponentRoot: "BlockAdminComponentRoot",
+    AdminComponentSection: "BlockAdminComponentSection",
+    AdminComponentSectionGroup: "BlockAdminComponentSectionGroup",
+    AdminTabLabel: "BlockAdminTabLabel",
+    AdminTabsProps: "BlockAdminTabsProps",
+    AdminTabs: "BlockAdminTabs",
+};
+async function mergeBlocksAdminIntoCmsAdmin() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const files = glob_1.glob.sync(["admin/src/**/*.ts", "admin/src/**/*.tsx"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            throw new Error(`Can't get source file for ${filePath}`);
+        }
+        const blocksAdminImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@comet/blocks-admin"));
+        if (!blocksAdminImport) {
+            continue;
+        }
+        const blocksAdminImports = blocksAdminImport.getNamedImports().map((namedImport) => namedImport.getText());
+        const importsToRename = Object.entries(renamedExports).filter(([oldExport]) => blocksAdminImports.includes(oldExport));
+        blocksAdminImport.remove();
+        const cmsAdminImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@comet/cms-admin"));
+        if (cmsAdminImport) {
+            cmsAdminImport.addNamedImports(blocksAdminImports);
+        }
+        else {
+            sourceFile.addImportDeclaration({
+                namedImports: blocksAdminImports,
+                moduleSpecifier: "@comet/cms-admin",
+            });
+        }
+        await sourceFile.save();
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        for (const [oldExport, newExport] of importsToRename) {
+            fileContent = fileContent.replaceAll(oldExport, newExport);
+        }
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = mergeBlocksAdminIntoCmsAdmin;

package/lib/v8/remove-blocks-packages.js

@@ -2,13 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stage = void 0;
 const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
+const package_json_util_1 = require("../util/package-json.util");
 exports.stage = "before-install";
 async function removeBlocksPackages() {
     if ((0, fs_1.existsSync)("api/package.json")) {
-        let fileContent = (await (0, promises_1.readFile)("api/package.json")).toString();
-        fileContent = fileContent.replace(/\n\s*"@comet\/blocks-api".*$/m, "");
-        await (0, promises_1.writeFile)("api/package.json", fileContent);
+        const packageJson = new package_json_util_1.PackageJson("api/package.json");
+        packageJson.removeDependency("@comet/blocks-api");
+        packageJson.save();
+    }
+    if ((0, fs_1.existsSync)("admin/package.json")) {
+        const packageJson = new package_json_util_1.PackageJson("admin/package.json");
+        packageJson.removeDependency("@comet/blocks-admin");
+        packageJson.save();
     }
 }
 exports.default = removeBlocksPackages;

package/lib/v8/replace-nestjs-console-with-nest-commander.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const node_fs_1 = require("node:fs");
+const package_json_util_1 = require("../util/package-json.util");
+exports.stage = "before-install";
+/**
+ * Replace the nestjs-console package with nest-commander
+ */
+async function ReplaceNestJsConsoleWithNestCommander() {
+    if (!(0, node_fs_1.existsSync)("api/package.json")) {
+        return;
+    }
+    const packageJson = new package_json_util_1.PackageJson("api/package.json");
+    packageJson.removeDependency("nestjs-console");
+    packageJson.addDependency("nest-commander", "^3.16.0");
+    packageJson.addDependency("@types/inquirer", "^8.1.3", true);
+    packageJson.save();
+}
+exports.default = ReplaceNestJsConsoleWithNestCommander;

package/lib/v8/update-nest-dependencies.js

@@ -18,7 +18,6 @@ async function updateNestDependencies() {
     packageJson.updateDependency("@nestjs/graphql", "^12.0.0");
     packageJson.updateDependency("@nestjs/platform-express", "^10.0.0");
     packageJson.updateDependency("graphql", "^16.6.0");
-    packageJson.updateDependency("nestjs-console", "^9.0.0");
     packageJson.updateDependency("@golevelup/nestjs-discovery", "^4.0.0");
     packageJson.updateDependency("@nestjs/cli", "^10.0.0");
     packageJson.updateDependency("@nestjs/schematics", "^10.0.0");

package/package.json

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