@remvst/asset-catalog 1.0.2 → 1.0.4

package/README.md

@@ -1,2 +1,10 @@
 # asset-catalog
 
+Utilities to generate asset catalogs for Webpack.
+
+## Test
+
+```sh
+mkdir -p testOut
+npm t
+```

package/lib/generate-image-catalog.js

@@ -30,7 +30,8 @@ function generatedTemplateInterface(tree, name, indent = '') {
             generated += indent + `    ${(0, utils_1.lowerCamelize)(subname)}: ${generatedSub}`;
         }
         else {
-            generated += indent + `    ${(0, utils_1.lowerCamelize)(subname)}: T,\n`;
+            const withoutExt = (0, path_1.basename)(subname, (0, path_1.extname)(subname));
+            generated += indent + `    ${(0, utils_1.lowerCamelize)(withoutExt)}: T,\n`;
         }
     }
     generated += indent + '}\n';
@@ -47,7 +48,8 @@ async function generatedCreateCatalogFunction(assetDir, tree) {
             else {
                 const dimensions = (0, image_size_1.default)(item);
                 const stats = await fs_1.promises.stat(item);
-                generated += indent + `    ${(0, utils_1.lowerCamelize)(subname)}: createItem({
+                const withoutExt = (0, path_1.basename)(subname, (0, path_1.extname)(subname));
+                generated += indent + `    ${(0, utils_1.lowerCamelize)(withoutExt)}: createItem({
                     path: ${importName(assetDir, item)},
                     width: ${dimensions.width},
                     height: ${dimensions.height},

package/lib/generate-sound-catalog.js

@@ -95,7 +95,7 @@ async function main() {
             let totalFileSize = 0;
             for (const soundFile of files) {
                 const importName = (0, utils_1.sanitize)(soundFile);
-                imports.push(`import ${importName} from '${(0, path_1.relative)((0, path_1.dirname)(argv.outFile), soundFile)}';`);
+                imports.push(`import ${importName} from '${(0, path_1.relative)((0, path_1.dirname)(argv.outFile), soundFile).replace(/\\/g, '/')}';`);
                 func += `                ${importName},\n`;
                 const stats = await fs_1.promises.stat(soundFile);
                 totalFileSize += stats.size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remvst/asset-catalog",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "bin": {
     "generate-image-catalog": "./lib/generate-image-catalog.js",

package/src/generate-image-catalog.ts

@@ -3,7 +3,7 @@
 import { promises as fs } from 'fs';
 import sizeOf from 'image-size';
 import { sanitize, allFiles, lowerCamelize } from './utils';
-import { resolve, relative, dirname, extname } from 'path';
+import { resolve, relative, dirname, extname, basename } from 'path';
 import yargs from 'yargs/yargs';
 import { hideBin } from 'yargs/helpers';
 import { Tree, generateTree } from './tree';
@@ -29,7 +29,8 @@ function generatedTemplateInterface(tree: Tree, name: string, indent: string = '
             const generatedSub = generatedTemplateInterface(item, subname, indent + '    ');
             generated += indent + `    ${lowerCamelize(subname)}: ${generatedSub}`;
         } else {
-            generated += indent + `    ${lowerCamelize(subname)}: T,\n`;
+            const withoutExt = basename(subname, extname(subname));
+            generated += indent + `    ${lowerCamelize(withoutExt)}: T,\n`;
         }
     }
     generated += indent + '}\n';
@@ -46,7 +47,8 @@ async function generatedCreateCatalogFunction(assetDir: string, tree: Tree): Pro
             } else {
                 const dimensions = sizeOf(item);
                 const stats = await fs.stat(item);
-                generated += indent + `    ${lowerCamelize(subname)}: createItem({
+                const withoutExt = basename(subname, extname(subname));
+                generated += indent + `    ${lowerCamelize(withoutExt)}: createItem({
                     path: ${importName(assetDir, item)},
                     width: ${dimensions.width},
                     height: ${dimensions.height},

package/src/generate-sound-catalog.ts

@@ -9,31 +9,31 @@ import { dirname, extname, basename, relative } from 'path';
 async function main() {
     const argv = await yargs(hideBin(process.argv))
         .options({
-            'outFile': { 
-                type: 'string', 
-                default: '.', 
-                alias: 'o', 
+            'outFile': {
+                type: 'string',
+                default: '.',
+                alias: 'o',
                 describe: 'Directory to generate the files into',
             },
-            'assetDir': { 
-                type: 'string', 
-                default: './package.json', 
-                alias: 'a', 
+            'assetDir': {
+                type: 'string',
+                default: './package.json',
+                alias: 'a',
                 describe: 'package.json file to use for the version',
             },
-            'wav': { 
-                type: 'boolean', 
-                default: false, 
+            'wav': {
+                type: 'boolean',
+                default: false,
                 describe: 'Include .wav files',
             },
-            'ogg': { 
-                type: 'boolean', 
-                default: true, 
+            'ogg': {
+                type: 'boolean',
+                default: true,
                 describe: 'Include .ogg files',
             },
-            'mp3': { 
-                type: 'boolean', 
-                default: true, 
+            'mp3': {
+                type: 'boolean',
+                default: true,
                 describe: 'Include .mp3 files',
             },
         })
@@ -103,7 +103,7 @@ async function main() {
             let totalFileSize = 0;
             for (const soundFile of files) {
                 const importName = sanitize(soundFile);
-                imports.push(`import ${importName} from '${relative(dirname(argv.outFile), soundFile)}';`);
+                imports.push(`import ${importName} from '${relative(dirname(argv.outFile), soundFile).replace(/\\/g, '/')}';`);
                 func += `                ${importName},\n`;
                 const stats = await fs.stat(soundFile);
                 totalFileSize += stats.size;

package/src/utils.ts

@@ -22,7 +22,7 @@ export async function allFiles(path: string): Promise<string[]> {
 }
 
 export function sanitize(string: string): string {
-    return string.replace(/[^a-zA-Z0-9]/g, '_');   
+    return string.replace(/[^a-zA-Z0-9]/g, '_');
 }
 
 export function camelize(str: string) {
@@ -34,7 +34,6 @@ export function lowerCamelize(str: string): string {
     return camelized.slice(0, 1).toLowerCase() + camelized.slice(1);
 }
 
-
 export function categoryPath(assetDir: string, png: string): string[] {
     const dir = dirname(png);
     const trimmedDir = relative(assetDir, dir);

package/testOut/images.ts

@@ -0,0 +1,38 @@
+import _directions_left_png from './../testData/directions/left.png';
+import _directions_up_png from './../testData/directions/up.png';
+import _fire_png from './../testData/fire.png';
+
+export type TextureCatalog<T> = {
+    directions: {
+        left: T,
+        up: T,
+    }
+    fire: T,
+}
+
+
+
+export function createTextureCatalog<T>(createItem: (opts: {path: string, width: number, height: number, size: number}) => T): TextureCatalog<T> {
+    return {
+       directions: {
+           left: createItem({
+                    path: _directions_left_png,
+                    width: 100,
+                    height: 100,
+                    size: 4424,
+                }),
+           up: createItem({
+                    path: _directions_up_png,
+                    width: 100,
+                    height: 100,
+                    size: 601,
+                }),
+       },
+       fire: createItem({
+                    path: _fire_png,
+                    width: 384,
+                    height: 384,
+                    size: 10908,
+                }),
+   };
+}

package/testOut/sounds.ts

@@ -0,0 +1,45 @@
+import __testData_sounds_click_UI_Click_Metallic_mono_ogg from '../testData/sounds/click/UI_Click_Metallic_mono.ogg';
+import __testData_sounds_click_UI_Click_Metallic_mono_mp3 from '../testData/sounds/click/UI_Click_Metallic_mono.mp3';
+import __testData_sounds_jump_jump2_ogg from '../testData/sounds/jump/jump2.ogg';
+import __testData_sounds_jump_xhGkA9Px_mp3 from '../testData/sounds/jump/xhGkA9Px.mp3';
+
+export class SoundDefinition {
+    constructor(
+        readonly basename: string,
+        readonly files: string[],
+        readonly averageFileSize: number,
+    ) {}
+}
+
+
+export function sound_click(): SoundDefinition[] {
+   return [
+        new SoundDefinition(
+            'UI_Click_Metallic_mono',
+            [
+                __testData_sounds_click_UI_Click_Metallic_mono_ogg,
+                __testData_sounds_click_UI_Click_Metallic_mono_mp3,
+            ],
+            2836,
+        ),
+   ];
+}
+
+export function sound_jump(): SoundDefinition[] {
+   return [
+        new SoundDefinition(
+            'jump2',
+            [
+                __testData_sounds_jump_jump2_ogg,
+            ],
+            5631,
+        ),
+        new SoundDefinition(
+            'xhGkA9Px',
+            [
+                __testData_sounds_jump_xhGkA9Px_mp3,
+            ],
+            2106,
+        ),
+   ];
+}