Skip to content

Commit e395a96

Browse files
Fix for collection name (#280)
* dont export modes in name if only one mode is set * fix collection removed from name if prefix in name false
1 parent f0fc19f commit e395a96

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/utilities/getVariables.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const extractVariable = (variable, value) => {
2525

2626
// this is being stored so we can properly update the design tokens later to account for all
2727
// modes when using aliases
28-
aliasName: collection.name,
28+
aliasCollectionName: collection.name,
2929
aliasModes: collection.modes
3030
}
3131
}
@@ -71,19 +71,19 @@ const processAliasModes = (variables) => {
7171
return collector
7272
}
7373

74-
const { aliasModes, aliasName } = variable
74+
const { aliasModes, aliasCollectionName } = variable
7575

7676
// this was only added for this function to process that data so before we return the variables, we can remove it
7777
delete variable.aliasModes
78-
delete variable.selfCollectionName
78+
delete variable.aliasCollectionName
7979

8080
for (let i = 0; i < aliasModes.length; i++) {
8181
const modeBasedVariable = { ...variable }
8282
const nameParts = modeBasedVariable.name.split('/');
8383

8484
nameParts.splice(1, 0, aliasModes[i].name)
8585

86-
modeBasedVariable.values = modeBasedVariable.values.replace(`{${aliasName}.`, `{${aliasName}.${aliasModes[i].name}.`)
86+
modeBasedVariable.values = modeBasedVariable.values.replace(`{${aliasCollectionName}.`, `{${aliasCollectionName}.${aliasModes[i].name}.`)
8787
modeBasedVariable.name = nameParts.join('/')
8888

8989
collector.push(modeBasedVariable)
@@ -97,7 +97,6 @@ export const getVariables = (figma: PluginAPI, settings: Settings) => {
9797
const excludedCollectionIds = figma.variables.getLocalVariableCollections().filter(collection => !['.', '_', ...settings.exclusionPrefix.split(',')].includes(collection.name.charAt(0))).map(collection => collection.id);
9898
// get collections
9999
const collections = Object.fromEntries(figma.variables.getLocalVariableCollections().map((collection) => [collection.id, collection]))
100-
101100
// get variables
102101
const variables = figma.variables.getLocalVariables().filter(variable => excludedCollectionIds.includes(variable.variableCollectionId)).map((variable) => {
103102
// get collection name and modes
@@ -125,6 +124,5 @@ export const getVariables = (figma: PluginAPI, settings: Settings) => {
125124
}
126125
})
127126
})
128-
129127
return settings.modeReference ? processAliasModes(variables.flat()) : variables.flat();
130128
}

src/utilities/prefixTokenName.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const prefixTokenName = (tokenArray: OriginalFormatTokenInterface[] | Sta
1717
// nest tokens into object with hierarchy defined by name using /
1818
return tokenArray.map(token => {
1919
// remove top level prefix from name if desired
20-
if (userSettings.prefixInName === false) {
20+
if (userSettings.prefixInName === false && token.exportKey !== 'variables') {
2121
token.name = token.name.substr(token.name.indexOf('/') + 1).trim().trimLeft()
2222
} else {
2323
if (token.extensions?.[config.key.extensionPluginData]?.alias !== undefined) {

0 commit comments

Comments
 (0)