Codemod fix (#1218)

geldata · Feb 26, 2025 · d221695 · d221695
1 parent 8b854bd
commit d221695
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 27 deletions.
diff --git a/packages/codemod/__tests__/__snapshots__/edgeql-to-gel-toml-file-update.spec.ts.snap b/packages/codemod/__tests__/__snapshots__/edgeql-to-gel-toml-file-update.spec.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`rename-toml transform should rename edgedb.toml file to gel.toml 1`] = `
-"[gel]
+"[instance]
 version = "x""
 `;
diff --git a/packages/codemod/__tests__/esdl-to-gel-file-extension-update.spec.ts b/packages/codemod/__tests__/esdl-to-gel-file-extension-update.spec.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs/promises';
 import * as glob from 'glob';
-import { findAndUpdateFileExtensions } from '../scripts/esdledgeql-to-gel-file-extensions-update';
+import { findAndUpdateFileExtensions } from '../scripts/esdl-to-gel-file-extensions-update';
 
 jest.mock('fs/promises');
 jest.mock('glob');
@@ -20,7 +20,7 @@ describe('ESDL to GEL Extension Update Script', () => {
 
     await findAndUpdateFileExtensions('/root');
 
-    expect(mockGlob.sync).toHaveBeenCalledWith('**/*.{esdl,edgeql}', {
+    expect(mockGlob.sync).toHaveBeenCalledWith('**/*.esdl', {
       cwd: '/root',
       ignore: ['**/node_modules/**'],
       absolute: true
@@ -31,23 +31,6 @@ describe('ESDL to GEL Extension Update Script', () => {
     expect(mockFs.rename).toHaveBeenCalledWith('/path/to/types.esdl', '/path/to/types.gel');
   });
 
-  it('should rename .edgeql files to .gel', async () => {
-    mockGlob.sync.mockReturnValue(['/path/to/schema.esdl', '/path/to/types.edgeql']);
-    mockFs.rename.mockResolvedValue(undefined);
-
-    await findAndUpdateFileExtensions('/root');
-
-    expect(mockGlob.sync).toHaveBeenCalledWith('**/*.{esdl,edgeql}', {
-      cwd: '/root',
-      ignore: ['**/node_modules/**'],
-      absolute: true
-    });
-
-    expect(mockFs.rename).toHaveBeenCalledTimes(2);
-    expect(mockFs.rename).toHaveBeenCalledWith('/path/to/schema.esdl', '/path/to/schema.gel');
-    expect(mockFs.rename).toHaveBeenCalledWith('/path/to/types.edgeql', '/path/to/types.gel');
-  });
-
   it('should handle file rename errors', async () => {
     const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
 

diff --git a/packages/codemod/cli.ts b/packages/codemod/cli.ts
@@ -5,7 +5,7 @@ import pc from "picocolors";
 import * as glob from "glob";
 import path from "node:path";
 import { run } from "jscodeshift/src/Runner.js";
-import { findAndUpdateFileExtensions } from "./scripts/esdledgeql-to-gel-file-extensions-update.js";
+import { findAndUpdateFileExtensions } from "./scripts/esdl-to-gel-file-extensions-update.js";
 import { findAndUpdatePackageJson } from "./scripts/package-json-update.js";
 import { findAndUpdateToml } from "./scripts/edgeql-to-gel-toml-file-update.js";
 

diff --git a/packages/codemod/package.json b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gel/codemod",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Upgrade EdgeDB code to Gel",
   "homepage": "https://edgedb.com/docs",
   "author": "EdgeDB <info@edgedb.com>",

diff --git a/packages/codemod/scripts/edgeql-to-gel-toml-file-update.ts b/packages/codemod/scripts/edgeql-to-gel-toml-file-update.ts
@@ -4,7 +4,7 @@ import * as glob from 'glob';
 
 async function updateTomlContent(content: string): Promise<string> {
   return content
-    .replace(/\[edgedb\]/g, '[gel]');
+    .replace(/\[edgedb\]/g, '[instance]');
 }
 
 async function processTomlFile(filePath: string): Promise<string[]> {

diff --git a/...dledgeql-to-gel-file-extensions-update.ts → ...pts/esdl-to-gel-file-extensions-update.ts b/...dledgeql-to-gel-file-extensions-update.ts → ...pts/esdl-to-gel-file-extensions-update.ts
@@ -5,8 +5,8 @@ async function updateEsdlToGelExt(filePath: string): Promise<string[]> {
   const changes: string[] = [];
 
   try {
-    await fs.rename(filePath, filePath.replace(/\.(esdl|edgeql)$/, '.gel'));
-    changes.push(`Updated file extension from .esdl and .edgeql to .gel`);
+    await fs.rename(filePath, filePath.replace(/\.(esdl)$/, '.gel'));
+    changes.push(`Updated file extension from .esdl to .gel`);
 
     return changes;
   }
@@ -18,14 +18,14 @@ async function updateEsdlToGelExt(filePath: string): Promise<string[]> {
 
 export async function findAndUpdateFileExtensions(rootDir: string) {
   try {
-    const files = glob.sync('**/*.{esdl,edgeql}', {
+    const files = glob.sync('**/*.esdl', {
       cwd: rootDir,
       ignore: ['**/node_modules/**'],
       absolute: true
     });
 
     console.log(`Found ${files.length} ${files.length === 1 ? 'file' : 'files'
-      } with .esdl/.edgeql extension`);
+      } with .esdl extension`);
 
     for (const file of files) {
       console.log(`Processing ${file}...`);