Skip to content

Commit

Permalink
Rename resolver parsers (pixijs#8483)
Browse files Browse the repository at this point in the history
  • Loading branch information
Zyie committed Jul 13, 2022
1 parent e619a74 commit a7f477d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions packages/assets/src/Assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { Loader } from './loader/Loader';
import { loadBitmapFont } from './loader/parsers/loadBitmapFont';
import type { PreferOrder, ResolveAsset, ResolverBundle, ResolverManifest, ResolveURLParser } from './resolver';
import { spriteSheetUrlParser, textureUrlParser } from './resolver';
import { resolveSpriteSheetUrl, resolveTextureUrl } from './resolver';
import { Resolver } from './resolver/Resolver';
import { convertToList } from './utils/convertToList';
import { detectAvif } from './utils/detections/detectAvif';
Expand Down Expand Up @@ -803,6 +803,6 @@ extensions.add(
cacheTextureArray,

// resolve extensions
textureUrlParser,
spriteSheetUrlParser
resolveTextureUrl,
resolveSpriteSheetUrl
);
4 changes: 2 additions & 2 deletions packages/assets/src/resolver/parsers/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './spriteSheetUrlParser';
export * from './textureUrlParser';
export * from './resolveSpriteSheetUrl';
export * from './resolveTextureUrl';
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { ResolveAsset, ResolveURLParser } from '../types';

const validImages = ['jpg', 'png', 'jpeg', 'avif', 'webp'];

export const spriteSheetUrlParser = {
export const resolveSpriteSheetUrl = {
extension: ExtensionType.ResolveParser,

test: (value: string): boolean =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { settings } from '@pixi/settings';
import { loadTextures } from '../../loader';
import type { ResolveAsset, ResolveURLParser } from '../types';

export const textureUrlParser = {
export const resolveTextureUrl = {
extension: ExtensionType.ResolveParser,
test: loadTextures.test,
parse: (value: string): ResolveAsset =>
Expand Down
10 changes: 5 additions & 5 deletions packages/assets/test/resolver.tests.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { spriteSheetUrlParser, textureUrlParser } from '@pixi/assets';
import { resolveSpriteSheetUrl, resolveTextureUrl } from '@pixi/assets';
import { Resolver } from '../src/resolver/Resolver';
import { manifest } from './sampleManifest';

Expand Down Expand Up @@ -104,7 +104,7 @@ describe('Resolver', () =>
},
});

resolver.addUrlParser(textureUrlParser);
resolver.addUrlParser(resolveTextureUrl);

resolver.add('test', [
'profile-abel@0.5x.jpg',
Expand Down Expand Up @@ -277,7 +277,7 @@ describe('Resolver', () =>
},
});

resolver.addUrlParser(textureUrlParser);
resolver.addUrlParser(resolveTextureUrl);

resolver.add('test', [
'my-image@4x.webp',
Expand Down Expand Up @@ -452,13 +452,13 @@ describe('Resolver', () =>
},
].forEach((toTest) =>
{
const pass = spriteSheetUrlParser.test(toTest.url);
const pass = resolveSpriteSheetUrl.test(toTest.url);

expect(pass).toBe(toTest.pass);

if (pass)
{
expect(spriteSheetUrlParser.parse(toTest.url)).toEqual(toTest.result);
expect(resolveSpriteSheetUrl.parse(toTest.url)).toEqual(toTest.result);
}
});
});
Expand Down

0 comments on commit a7f477d

Please sign in to comment.