Skip to content

Commit a47a6e3

Browse files
futuristfuturist
committed
CHANGE: API map to mapSel, map2 to mapClass
1 parent 555dde9 commit a47a6e3

7 files changed

+49
-49
lines changed

‎dist/cssobj-plugin-selector-localize.amd.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ define('cssobj_plugin_selector_localize', function () { 'use strict';
3030
: prefix + name)
3131
}
3232

33-
var map = function(str, isClassList) {
33+
var mapSel = function(str, isClassList) {
3434
return str.replace(reClass, replacer)
3535
}
3636

37-
var map2 = function(str) {
38-
return map((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
37+
var mapClass = function(str) {
38+
return mapSel((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
3939
}
4040

4141
return function localizeName (sel, node, result) {
4242
// don't touch at rule's selText
4343
// it's copied from parent, which already localized
4444
if(node.at) return sel
45-
if(!result.map) result.map = map, result.map2 = map2
46-
return map(sel)
45+
if(!result.mapSel) result.mapSel = mapSel, result.mapClass = mapClass
46+
return mapSel(sel)
4747
}
4848
}
4949

‎dist/cssobj-plugin-selector-localize.cjs.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ function cssobj_plugin_selector_localize(prefix, localNames) {
3030
: prefix + name)
3131
}
3232

33-
var map = function(str, isClassList) {
33+
var mapSel = function(str, isClassList) {
3434
return str.replace(reClass, replacer)
3535
}
3636

37-
var map2 = function(str) {
38-
return map((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
37+
var mapClass = function(str) {
38+
return mapSel((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
3939
}
4040

4141
return function localizeName (sel, node, result) {
4242
// don't touch at rule's selText
4343
// it's copied from parent, which already localized
4444
if(node.at) return sel
45-
if(!result.map) result.map = map, result.map2 = map2
46-
return map(sel)
45+
if(!result.mapSel) result.mapSel = mapSel, result.mapClass = mapClass
46+
return mapSel(sel)
4747
}
4848
}
4949

‎dist/cssobj-plugin-selector-localize.es.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ function cssobj_plugin_selector_localize(prefix, localNames) {
2828
: prefix + name)
2929
}
3030

31-
var map = function(str, isClassList) {
31+
var mapSel = function(str, isClassList) {
3232
return str.replace(reClass, replacer)
3333
}
3434

35-
var map2 = function(str) {
36-
return map((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
35+
var mapClass = function(str) {
36+
return mapSel((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
3737
}
3838

3939
return function localizeName (sel, node, result) {
4040
// don't touch at rule's selText
4141
// it's copied from parent, which already localized
4242
if(node.at) return sel
43-
if(!result.map) result.map = map, result.map2 = map2
44-
return map(sel)
43+
if(!result.mapSel) result.mapSel = mapSel, result.mapClass = mapClass
44+
return mapSel(sel)
4545
}
4646
}
4747

‎dist/cssobj-plugin-selector-localize.iife.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ var cssobj_plugin_selector_localize = (function () {
3131
: prefix + name)
3232
}
3333

34-
var map = function(str, isClassList) {
34+
var mapSel = function(str, isClassList) {
3535
return str.replace(reClass, replacer)
3636
}
3737

38-
var map2 = function(str) {
39-
return map((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
38+
var mapClass = function(str) {
39+
return mapSel((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
4040
}
4141

4242
return function localizeName (sel, node, result) {
4343
// don't touch at rule's selText
4444
// it's copied from parent, which already localized
4545
if(node.at) return sel
46-
if(!result.map) result.map = map, result.map2 = map2
47-
return map(sel)
46+
if(!result.mapSel) result.mapSel = mapSel, result.mapClass = mapClass
47+
return mapSel(sel)
4848
}
4949
}
5050

‎dist/cssobj-plugin-selector-localize.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/cssobj-plugin-selector-localize.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ export default function cssobj_plugin_selector_localize(prefix, localNames) {
2323
: prefix + name)
2424
}
2525

26-
var map = function(str, isClassList) {
26+
var mapSel = function(str, isClassList) {
2727
return str.replace(reClass, replacer)
2828
}
2929

30-
var map2 = function(str) {
31-
return map((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
30+
var mapClass = function(str) {
31+
return mapSel((' '+str).replace(/\s+\.?/g, '.')).replace(/\./g, ' ')
3232
}
3333

3434
return function localizeName (sel, node, result) {
3535
// don't touch at rule's selText
3636
// it's copied from parent, which already localized
3737
if(node.at) return sel
38-
if(!result.map) result.map = map, result.map2 = map2
39-
return map(sel)
38+
if(!result.mapSel) result.mapSel = mapSel, result.mapClass = mapClass
39+
return mapSel(sel)
4040
}
4141
}
4242

‎test/test.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ describe('Test plugin selector localize', function() {
3030
var ret = loc('body .nav .item', {}, result)
3131
expect(ret).match(/body ._custom_nav ._\w+\d_item/)
3232

33-
expect(result.map('.nav')).equal('._custom_nav')
33+
expect(result.mapSel('.nav')).equal('._custom_nav')
3434

35-
expect(result.map('.item')).match(/\._\w+\d_item/)
36-
expect(result.map('.item .nav')).match(/_\w+\d_item \._custom_nav/)
35+
expect(result.mapSel('.item')).match(/\._\w+\d_item/)
36+
expect(result.mapSel('.item .nav')).match(/_\w+\d_item \._custom_nav/)
3737

3838
})
3939

@@ -46,9 +46,9 @@ describe('Test plugin selector localize', function() {
4646

4747
expect(ret).match(/body ._prefix_nav ._prefix_item/)
4848

49-
expect(result.map('.nav')).equal('._prefix_nav')
49+
expect(result.mapSel('.nav')).equal('._prefix_nav')
5050

51-
expect(result.map('.item')).equal('._prefix_item')
51+
expect(result.mapSel('.item')).equal('._prefix_item')
5252

5353
})
5454

@@ -60,7 +60,7 @@ describe('Test plugin selector localize', function() {
6060
var ret = loc('body .nav .item', {}, result)
6161
expect(ret).match(/body ._custom_nav ._prefix_item/)
6262

63-
expect(result.map('.nav.item')).equal('._custom_nav._prefix_item')
63+
expect(result.mapSel('.nav.item')).equal('._custom_nav._prefix_item')
6464

6565
})
6666

@@ -74,9 +74,9 @@ describe('Test plugin selector localize', function() {
7474

7575

7676
// will return localized event there's not in string
77-
expect(result.map('.xyz')).equal('._prefix_xyz')
77+
expect(result.mapSel('.xyz')).equal('._prefix_xyz')
7878

79-
expect(result.map('.nav.xyz')).equal('._prefix_nav._prefix_xyz')
79+
expect(result.mapSel('.nav.xyz')).equal('._prefix_nav._prefix_xyz')
8080

8181
})
8282

@@ -88,7 +88,7 @@ describe('Test plugin selector localize', function() {
8888
var ret = loc('body .nav .item', {}, result)
8989
expect(ret).match(/body .nav .item/)
9090

91-
expect(result.map('.xyz')).equal('.xyz')
91+
expect(result.mapSel('.xyz')).equal('.xyz')
9292

9393
})
9494

@@ -115,7 +115,7 @@ describe('Test plugin selector localize', function() {
115115
var ret = loc('body:global( .nav .item).xyz', {}, result)
116116
expect(ret).equal('body .nav .item._prefix_xyz')
117117

118-
expect(result.map('body .nav :global(.xyz)')).equal('body ._prefix_nav .xyz')
118+
expect(result.mapSel('body .nav :global(.xyz)')).equal('body ._prefix_nav .xyz')
119119

120120
})
121121

@@ -126,7 +126,7 @@ describe('Test plugin selector localize', function() {
126126
var ret = loc('body.!nav .!item .xyz', {}, result)
127127
expect(ret).equal('body.nav .item ._prefix_xyz')
128128

129-
expect(result.map('.nav.!item')).equal('._prefix_nav.item')
129+
expect(result.mapSel('.nav.!item')).equal('._prefix_nav.item')
130130
})
131131

132132
it('should work right with ! symbol and localNames', function() {
@@ -135,7 +135,7 @@ describe('Test plugin selector localize', function() {
135135

136136
var ret = loc('body.!nav .!item .xyz', {}, result)
137137
expect(ret).equal('body.nav .item .abc')
138-
expect(result.map('.item.!xyz')).equal('.cde.xyz')
138+
expect(result.mapSel('.item.!xyz')).equal('.cde.xyz')
139139

140140
})
141141

@@ -148,31 +148,31 @@ describe('Test plugin selector localize', function() {
148148

149149
})
150150

151-
it('should return class list with map2', function() {
151+
it('should return class list with mapClass', function() {
152152

153153
var loc = lib('_prefix_')
154154
var result = {}
155155

156156
var ret = loc('body .nav .item', {}, result)
157157
expect(ret).equal('body ._prefix_nav ._prefix_item')
158158

159-
expect(result.map2('item nav')).equal(' _prefix_item _prefix_nav')
159+
expect(result.mapClass('item nav')).equal(' _prefix_item _prefix_nav')
160160

161161
// also accept with .class
162-
expect(result.map2('.item.nav')).equal(' _prefix_item _prefix_nav')
163-
expect(result.map2('.item .nav')).equal(' _prefix_item _prefix_nav')
164-
expect(result.map2(' .item .nav')).equal(' _prefix_item _prefix_nav')
162+
expect(result.mapClass('.item.nav')).equal(' _prefix_item _prefix_nav')
163+
expect(result.mapClass('.item .nav')).equal(' _prefix_item _prefix_nav')
164+
expect(result.mapClass(' .item .nav')).equal(' _prefix_item _prefix_nav')
165165

166166
// multiple space in end will into 1
167-
expect(result.map2(' item nav ')).equal(' _prefix_item _prefix_nav ')
167+
expect(result.mapClass(' item nav ')).equal(' _prefix_item _prefix_nav ')
168168
// with ! escape
169-
expect(result.map2(' item !nav ')).equal(' _prefix_item nav ')
170-
expect(result.map2(' item')).equal(' _prefix_item')
171-
expect(result.map2('item')).equal(' _prefix_item')
172-
expect(result.map2('item ')).equal(' _prefix_item ')
169+
expect(result.mapClass(' item !nav ')).equal(' _prefix_item nav ')
170+
expect(result.mapClass(' item')).equal(' _prefix_item')
171+
expect(result.mapClass('item')).equal(' _prefix_item')
172+
expect(result.mapClass('item ')).equal(' _prefix_item ')
173173

174174
// global will generate 2 space, have to with .class
175-
expect(result.map2(':global(.item.nav) abc')).equal(' item nav _prefix_abc')
175+
expect(result.mapClass(':global(.item.nav) abc')).equal(' item nav _prefix_abc')
176176

177177
})
178178

0 commit comments

Comments
 (0)