@evitcastudio/kit 3.1.1 → 3.2.1

package/lib/cli/resource-builder.d.ts

@@ -2,5 +2,5 @@ import type { ProcessOptions } from './types';
 /**
  * Main entry point for building resources.
  */
-export declare function processResources({ inDirectory, outDirectory, verbose, ignoreSound }: ProcessOptions): Promise<void>;
+export declare function processResources({ inDirectory, outDirectory, manifestPath, watch, verbose, ignoreSound, app, minify, obfuscate, sourcemap, prod }: ProcessOptions): Promise<void>;
 //# sourceMappingURL=resource-builder.d.ts.map

package/lib/cli/resource-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-builder.d.ts","sourceRoot":"","sources":["../../src/cli/resource-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AA8X9C;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BzH"}
+{"version":3,"file":"resource-builder.d.ts","sourceRoot":"","sources":["../../src/cli/resource-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAggB9C;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCvL"}

package/lib/cli/resource-builder.js

@@ -1,8 +1,9 @@
-import { promises as fs } from 'fs';
-import { join, extname, basename } from 'path';
+import { promises as fs, watch as fsWatch, existsSync } from 'fs';
+import { join, extname, basename, resolve } from 'path';
 import chalk from 'chalk';
 import { v4 as uuidv4 } from 'uuid';
 import { VYI } from '../vendor/vyi';
+import { bundleApp } from './app-bundler';
 // Logging helpers
 const log = console.log;
 const info = chalk.hex('#ffa552');
@@ -17,7 +18,9 @@ let isVerbose = false;
 let ignoringSound = false;
 let resourceInDirectory = '';
 let resourceOutDirectory = '';
+let customManifestPath = undefined;
 const resourcesToProcess = [];
+const subdirectoriesToMirror = [];
 /**
  * Initializes the resource JSON structure.
  */
@@ -70,8 +73,16 @@ async function processDirectory(pDirectoryPath) {
         const contents = await fs.readdir(pDirectoryPath);
         for (const item of contents) {
             const itemPath = join(pDirectoryPath, item);
+            // Skip the output directory if it is inside the input directory
+            if (resolve(itemPath) === resourceOutDirectory) {
+                continue;
+            }
             const stats = await fs.stat(itemPath);
             if (stats.isDirectory()) {
+                // If top-level subdirectory inside inDirectory, track for mirroring
+                if (pDirectoryPath === resourceInDirectory) {
+                    subdirectoriesToMirror.push(item);
+                }
                 await processDirectory(itemPath);
             }
             else if (isValidExtension(extname(itemPath).slice(1))) {
@@ -89,6 +100,28 @@ async function processDirectory(pDirectoryPath) {
 function isValidExtension(pExtension) {
     return VALID_EXTENSIONS.includes(pExtension);
 }
+/**
+ * Recursively copies a directory to destination, preserving subdirectories and files.
+ * Ignores engine resource files that are already handled by Vylocity obfuscation.
+ */
+async function mirrorDirectory(pSourceDir, pDestDir) {
+    const entries = await fs.readdir(pSourceDir, { withFileTypes: true });
+    await fs.mkdir(pDestDir, { recursive: true });
+    for (const entry of entries) {
+        const srcPath = join(pSourceDir, entry.name);
+        const destPath = join(pDestDir, entry.name);
+        if (entry.isDirectory()) {
+            await mirrorDirectory(srcPath, destPath);
+        }
+        else {
+            const ext = extname(entry.name).slice(1);
+            // Only copy non-engine files (images, custom JSON, fonts, etc.)
+            if (!isValidExtension(ext)) {
+                await fs.copyFile(srcPath, destPath);
+            }
+        }
+    }
+}
 /**
  * Executes all file copy operations in parallel after preparation.
  */
@@ -108,6 +141,12 @@ async function processAllFiles() {
         });
         // Execute all copy operations concurrently
         await Promise.all(copyOperations);
+        // Mirror subdirectories (images, fonts, emitters, particles, etc.)
+        for (const subDir of subdirectoriesToMirror) {
+            const srcPath = join(resourceInDirectory, subDir);
+            const destPath = join(resourceOutDirectory, 'resources', subDir);
+            await mirrorDirectory(srcPath, destPath);
+        }
         logVerbose(`[Kit CLI] All resources have been processed.`);
         await saveResourceJSON();
         const boundsData = await buildBoundsJSON();
@@ -332,33 +371,29 @@ async function copyFile(pSource, pDestinationDir, pNewName) {
  * Saves the resource JSON to a file.
  */
 async function saveResourceJSON() {
-    const filePath = 'resource.json';
+    const jsonContent = JSON.stringify(resourceJSON, null, 4);
+    const targetPath = customManifestPath || 'resource.json';
     try {
-        await fs.writeFile(filePath, JSON.stringify(resourceJSON, null, 4));
+        await fs.writeFile(targetPath, jsonContent, 'utf8');
     }
     catch (pError) {
-        logError(`[Error] Saving resource JSON: ${pError}`);
+        logError(`[Error] Saving resource JSON to ${targetPath}: ${pError}`);
     }
 }
+let shouldBundleApp = false;
+let projectRootDirectory = '';
+let appBundleOptions = {};
 /**
- * Main entry point for building resources.
+ * Executes a single build pass over the input assets.
  */
-export async function processResources({ inDirectory, outDirectory, verbose, ignoreSound }) {
-    // Initialize state
-    resourceInDirectory = inDirectory;
-    resourceOutDirectory = outDirectory;
-    isVerbose = verbose;
-    ignoringSound = ignoreSound;
+async function runBuild() {
     resourceJSON = initializeResourceJSON();
     resourcesToProcess.length = 0;
-    // Validate inputs
-    if (!resourceInDirectory || !resourceOutDirectory) {
-        logError('[Error] Input and output directories must be specified');
-        return;
+    subdirectoriesToMirror.length = 0;
+    if (existsSync(resourceInDirectory)) {
+        await processDirectory(resourceInDirectory);
     }
-    // Process resources
-    await processDirectory(resourceInDirectory);
-    if (resourcesToProcess.length > 0) {
+    if (resourcesToProcess.length > 0 || subdirectoriesToMirror.length > 0) {
         await processAllFiles();
     }
     else {
@@ -368,6 +403,91 @@ export async function processResources({ inDirectory, outDirectory, verbose, ign
         await saveIconPointsJSON({});
         await saveSizesJSON({});
     }
+    // If app bundling is requested or enabled by default, compile app and copy web assets
+    if (shouldBundleApp && projectRootDirectory) {
+        await bundleApp(projectRootDirectory, resourceOutDirectory, {
+            ...appBundleOptions,
+            verbose: Boolean(isVerbose)
+        });
+    }
+    logVerbose(`[Kit CLI] Resources built successfully.`);
+}
+/**
+ * Watches the input directory for changes and triggers incremental rebuilds.
+ */
+async function runWatch() {
+    await runBuild();
+    console.log(chalk.cyan(`\n👀 Watching for changes in: ${chalk.bold(resourceInDirectory)}`));
+    let debounceTimer = null;
+    const triggerRebuild = (pFilename) => {
+        if (debounceTimer)
+            clearTimeout(debounceTimer);
+        debounceTimer = setTimeout(async () => {
+            console.log(chalk.dim(`\nFile changed: ${pFilename}, rebuilding...`));
+            await runBuild();
+        }, 150);
+    };
+    const watchers = [];
+    if (existsSync(resourceInDirectory)) {
+        const resWatcher = fsWatch(resourceInDirectory, { recursive: true }, (_eventType, pFilename) => {
+            if (pFilename)
+                triggerRebuild(pFilename);
+        });
+        watchers.push(resWatcher);
+    }
+    const srcDir = join(projectRootDirectory, 'src');
+    if (shouldBundleApp && existsSync(srcDir) && srcDir !== resourceInDirectory) {
+        const srcWatcher = fsWatch(srcDir, { recursive: true }, (_eventType, pFilename) => {
+            if (!pFilename)
+                return;
+            // Ignore resources folder if inside src to prevent double triggers
+            if (pFilename.startsWith('resources'))
+                return;
+            triggerRebuild(pFilename);
+        });
+        watchers.push(srcWatcher);
+    }
+    process.on('SIGINT', () => {
+        for (const w of watchers)
+            w.close();
+        process.exit(0);
+    });
+}
+/**
+ * Main entry point for building resources.
+ */
+export async function processResources({ inDirectory, outDirectory, manifestPath, watch, verbose, ignoreSound, app, minify, obfuscate, sourcemap, prod }) {
+    projectRootDirectory = process.cwd();
+    // Smart defaults: ./src/resources -> ./dist
+    const resolvedIn = inDirectory || (existsSync(join(projectRootDirectory, 'src', 'resources')) ? 'src/resources' : '');
+    const resolvedOut = outDirectory || 'dist';
+    resourceInDirectory = resolvedIn ? resolve(resolvedIn) : '';
+    resourceOutDirectory = resolvedOut ? resolve(resolvedOut) : '';
+    customManifestPath = manifestPath;
+    isVerbose = verbose;
+    ignoringSound = ignoreSound;
+    appBundleOptions = {
+        minify,
+        obfuscate,
+        sourcemap,
+        prod
+    };
+    // Enable app bundling if explicitly requested or if app entrypoints exist and app is not false
+    const hasAppEntry = existsSync(join(projectRootDirectory, 'src', 'index.ts')) ||
+        existsSync(join(projectRootDirectory, 'src', 'client', 'index.ts')) ||
+        existsSync(join(projectRootDirectory, 'src', 'server', 'index.ts'));
+    shouldBundleApp = app !== undefined ? app : hasAppEntry;
+    // Validate inputs
+    if (!resourceInDirectory || !resourceOutDirectory) {
+        logError('[Error] Input and output directories must be specified');
+        return;
+    }
+    if (watch) {
+        await runWatch();
+    }
+    else {
+        await runBuild();
+    }
 }
 function logVerbose(pMessage) {
     if (isVerbose)

package/lib/cli/types.d.ts

@@ -1,11 +1,17 @@
 /**
- * ProcessOptions for resource builder.
+ * Options for the resource builder and app build process.
  */
-type ProcessOptions = {
-    inDirectory: string;
-    outDirectory: string;
+export interface ProcessOptions {
+    inDirectory?: string;
+    outDirectory?: string;
+    manifestPath?: string;
     verbose?: boolean;
     ignoreSound?: boolean;
-};
-export type { ProcessOptions };
+    watch?: boolean;
+    app?: boolean;
+    minify?: boolean;
+    obfuscate?: boolean;
+    sourcemap?: 'none' | 'linked' | 'inline' | 'external';
+    prod?: boolean;
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/cli/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,KAAK,cAAc,GAAG;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,YAAY,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;IACtD,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB"}