diff --git a/src/commands/diff/diff.test.ts b/src/commands/diff/diff.test.ts index e36c6a0d7..b2343aff2 100644 --- a/src/commands/diff/diff.test.ts +++ b/src/commands/diff/diff.test.ts @@ -292,27 +292,6 @@ describe('diff', () => { .it('identifies aliased variables specified in config file', (ctx) => { expect(ctx.stdout).toMatchSnapshot() }) - - test.stdout() - .command([ - 'diff', - '--file', - 'test-utils/fixtures/diff/auto-alias-transform', - '--no-api', - '--repo-config-path', - './test-utils/fixtures/configs/autoAliasConfig.yml', - ]) - .it( - 'resolves aliases from generated types file using key transformation', - (ctx) => { - // Should NOT show "could not be identified" warnings - expect(ctx.stdout).not.toContain('could not be identified') - // Should identify the variables - expect(ctx.stdout).toContain('my-test-variable') - expect(ctx.stdout).toContain('enable-feature') - expect(ctx.stdout).toContain('removed-variable') - }, - ) test.stdout() .command([ 'diff', diff --git a/src/commands/diff/index.ts b/src/commands/diff/index.ts index e29f825b7..e21b5f287 100644 --- a/src/commands/diff/index.ts +++ b/src/commands/diff/index.ts @@ -14,7 +14,6 @@ import VarAliasFlag, { getVariableAliases } from '../../flags/var-alias' import ShowRegexFlag, { showRegex } from '../../flags/show-regex' import { Variable } from '../../api/schemas' import { FileFilters } from '../../utils/FileFilters' -import { keyToConstant } from '../../utils/keyToConstant' const EMOJI = { add: '🟢', @@ -163,11 +162,7 @@ export default class Diff extends Base { Object.values(matchesBySdk).forEach((matches) => { matches.forEach((m) => { const match = { ...m } - // Try to find alias by direct match first, then by transformed constant name - // This handles cases where the generated types file creates constants like MY_VARIABLE - // for a variable key like 'my-variable' - const aliasedName = - aliasMap[match.name] || aliasMap[keyToConstant(match.name)] + const aliasedName = aliasMap[match.name] if (match.isUnknown && aliasedName) { match.alias = match.name match.name = aliasedName diff --git a/src/commands/generate/types.ts b/src/commands/generate/types.ts index 84d704303..18ccd80be 100644 --- a/src/commands/generate/types.ts +++ b/src/commands/generate/types.ts @@ -4,9 +4,9 @@ import { fetchAllVariables } from '../../api/variables' import { Flags } from '@oclif/core' import { Feature, Project, Variable, CustomProperty } from '../../api/schemas' import { OrganizationMember, fetchOrganizationMembers } from '../../api/members' +import { upperCase } from 'lodash' import { createHash } from 'crypto' import path from 'path' -import { keyToConstant } from '../../utils/keyToConstant' import { fetchAllCompletedOrArchivedFeatures, fetchFeatures, @@ -353,7 +353,7 @@ export const ${constantName} = '${hashedKey}' as const` } getVariableGeneratedName(variable: Variable) { - let constantName = keyToConstant(variable.key) + let constantName = upperCase(variable.key).replace(/\s/g, '_') if (this.methodNames[constantName]?.length) { constantName = `${constantName}_${this.methodNames[constantName].length}` diff --git a/src/utils/keyToConstant.ts b/src/utils/keyToConstant.ts deleted file mode 100644 index 695b5c027..000000000 --- a/src/utils/keyToConstant.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { upperCase } from 'lodash' - -/** - * Converts a variable key to its generated constant name format. - * - * Example: 'my-variable' -> 'MY_VARIABLE' - */ -export function keyToConstant(variableKey: string): string { - return upperCase(variableKey).replace(/\s/g, '_') -} diff --git a/test-utils/fixtures/configs/autoAliasConfig.yml b/test-utils/fixtures/configs/autoAliasConfig.yml deleted file mode 100644 index e661ab79d..000000000 --- a/test-utils/fixtures/configs/autoAliasConfig.yml +++ /dev/null @@ -1,13 +0,0 @@ -project: "test-project" -org: - id: "org_test" - name: "test-org" - -typeGenerator: - outputPath: "./test-utils/fixtures/configs/mockTypes.ts" - -codeInsights: - matchPatterns: - ts: - - ":\\s*([a-z][a-z0-9-]*)" - diff --git a/test-utils/fixtures/configs/mockTypes.ts b/test-utils/fixtures/configs/mockTypes.ts deleted file mode 100644 index fc53f9a7f..000000000 --- a/test-utils/fixtures/configs/mockTypes.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Mock generated types file for testing auto-alias resolution -export const MY_TEST_VARIABLE = 'my-test-variable' as const -export const ENABLE_FEATURE = 'enable-feature' as const -export const REMOVED_VARIABLE = 'removed-variable' as const - diff --git a/test-utils/fixtures/diff/auto-alias-transform b/test-utils/fixtures/diff/auto-alias-transform deleted file mode 100644 index fddf67db5..000000000 --- a/test-utils/fixtures/diff/auto-alias-transform +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/test-utils/fixtures/diff/sampleDiff b/test-utils/fixtures/diff/sampleDiff -new file mode 100644 -index 00000000..e69de29b -diff --git a/test-utils/fixtures/diff/sampleDiff.ts b/test-utils/fixtures/diff/sampleDiff.ts -new file mode 100644 -index 00000000..ed8ee4ab ---- /dev/null -+++ b/test-utils/fixtures/diff/sampleDiff.ts -@@ -1,1 +1,21 @@ -+const config = { -+ feature: my-test-variable, -+ beta: enable-feature -+} --const old = { -- feature: removed-variable --} -