@evitcastudio/kit 1.2.0 → 1.3.1

package/lib/bundle/cli/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 /*!
- * @evitcastudio/kit@1.2.0 git+https://github.com/EvitcaStudio/Kit.git
- * Compiled Wed, 01 Jan 2025 09:48:35 UTC
+ * @evitcastudio/kit@1.3.1 git+https://github.com/EvitcaStudio/Kit.git
+ * Compiled Sat, 04 Jan 2025 15:50:23 UTC
  * Copyright (c) 2025 Jared Bates, Evitca Studio, "doubleactii"
  *
  * @evitcastudio/kit is licensed under the MIT License.
@@ -2491,14 +2491,14 @@ function isValidExtension(pExtension) {
 }
 async function processAllFiles() {
   try {
-    await clearResourceTypeDirectories(`${resourceOutDirectory}/resources`, RESOURCE_TYPES);
+    await clearResourceTypeDirectories(`${resourceOutDirectory}/resources`);
     const copyOperations = resourcesToProcess.map(({ filePath, type }) => {
       const fileName = basename(filePath);
       const resource = resourceJSON[type].find((res) => res.fileName === fileName);
       if (!resource) {
         throw new Error(`Resource not found for file: ${fileName}`);
       }
-      const destination = join(resourceOutDirectory, "resources", type);
+      const destination = join(resourceOutDirectory, "resources");
       return copyFile(filePath, destination, resource.resourceIdentifier);
     });
     await Promise.all(copyOperations);
@@ -2508,17 +2508,14 @@ async function processAllFiles() {
     logError(`[Error] Processing files in batch: ${pError.message}`);
   }
 }
-async function clearResourceTypeDirectories(pBaseDirectory, pDirectoriesToRemove) {
+async function clearResourceTypeDirectories(pBaseDirectory) {
   try {
-    for (const directory of pDirectoriesToRemove) {
-      const directoryPath = join(pBaseDirectory, directory);
-      const directoryExists = await fs.stat(directoryPath).then((stat) => stat.isDirectory()).catch(() => false);
-      if (directoryExists) {
-        await fs.rm(directoryPath, { recursive: true });
-      }
+    const directoryExists = await fs.stat(pBaseDirectory).then((stat) => stat.isDirectory()).catch(() => false);
+    if (directoryExists) {
+      await fs.rm(pBaseDirectory, { recursive: true });
     }
   } catch (pError) {
-    log(`${error(`[Error]`)} clearing directories: ${pError}`);
+    log(`${error(`[Error]`)} clearing resource directory: ${pError}`);
   }
 }
 async function copyFile(pSource, pDestinationDir, pNewName) {
@@ -2530,7 +2527,7 @@ async function copyFile(pSource, pDestinationDir, pNewName) {
   }
 }
 async function saveResourceJSON() {
-  const filePath = join(resourceOutDirectory, "resource.json");
+  const filePath = join(resourceOutDirectory, "resources", "resource.json");
   try {
     await fs.writeFile(filePath, JSON.stringify(resourceJSON, null, 2));
   } catch (pError) {
@@ -2575,7 +2572,7 @@ class KitCLI {
 // package.json
 var package_default = {
   name: "@evitcastudio/kit",
-  version: "1.2.0",
+  version: "1.3.1",
   author: "doubleactii 56242467+doubleactii@users.noreply.github.com (https://evitcastudio.com)",
   main: "./lib/index.js",
   types: "./lib/index.d.ts",
@@ -2606,7 +2603,7 @@ var package_default = {
     pack: "bun pm pack --dry-run",
     "build-types": "bun tsc",
     build: "bun bun-build.ts",
-    "build-docs": "bun typedoc ./src/index.ts ./src/types/shared-types.ts",
+    "build-docs": "bun typedoc ./src/index.ts",
     "build-all": "bun run build-types && bun run build && bun run build-docs"
   },
   bin: {

package/lib/kit.d.ts

@@ -54,7 +54,7 @@ export declare class Kit {
     static off(pPluginName: string, pEventName: string, pListener: (pData: EmitterEvent) => void): void;
     /**
      * Sets the resource locator for the engine to reference the files we have in the resources folder. interface | map | icon | macro | sound are checked for.
-     * @param pData - An array of each file that was found in the resources folder
+     * @param pData - An array of each file that was found in the resources folder.
      */
     private static setResource;
     /**

package/lib/kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kit.d.ts","sourceRoot":"","sources":["../src/kit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAgB,QAAQ,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAevG,qBAAa,GAAG;IACZ;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO,CAAiC;IACvD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAmC;IAC1D;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,MAAM,CAAuC;IAE5D,OAAO;IAIP;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAM3E;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,IAAI;IAkBlF;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAInE;;OAEG;IACH,MAAM,CAAC,UAAU,IAAI,MAAM,EAAE;IAI7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI;IAWlB;;;;;MAKE;IACH,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI;IAQ7E;;;;;OAKG;IACH,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI;IAOnG;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAiB1B;;OAEG;WACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B7C"}
+{"version":3,"file":"kit.d.ts","sourceRoot":"","sources":["../src/kit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAgB,QAAQ,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAevG,qBAAa,GAAG;IACZ;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO,CAAiC;IACvD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAmC;IAC1D;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,MAAM,CAAuC;IAE5D,OAAO;IAIP;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAM3E;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,IAAI;IAkBlF;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAInE;;OAEG;IACH,MAAM,CAAC,UAAU,IAAI,MAAM,EAAE;IAI7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI;IAWlB;;;;;MAKE;IACH,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI;IAQ7E;;;;;OAKG;IACH,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI;IAOnG;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAiB1B;;OAEG;WACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CA4C7C"}

package/lib/kit.js

@@ -105,7 +105,7 @@ export class Kit {
     }
     /**
      * Sets the resource locator for the engine to reference the files we have in the resources folder. interface | map | icon | macro | sound are checked for.
-     * @param pData - An array of each file that was found in the resources folder
+     * @param pData - An array of each file that was found in the resources folder.
      */
     static setResource(pData) {
         pData.forEach((pResource) => {
@@ -116,7 +116,7 @@ export class Kit {
                 const fileNameWithoutExtension = fileNameWithoutExtensionMatch[0];
                 const resourceType = extensionToPath[extension];
                 if (resourceType) {
-                    globalThis.VYLO.Resource.setResource(resourceType, fileNameWithoutExtension, `resources/${resourceType}/${pResource.resourceIdentifier}`, true);
+                    globalThis.VYLO.Resource.setResource(resourceType, fileNameWithoutExtension, `${pResource.resourceIdentifier}`);
                 }
             }
         });
@@ -128,24 +128,39 @@ export class Kit {
         if (!globalThis.VYLO) {
             throw new Error('[Kit] VYLO is not defined. Please ensure the VYLO variable is available in the global namespace.');
         }
-        const resourcePath = './resource.json';
-        // Load the resource json and set the resources found
-        try {
-            const response = await fetch(resourcePath);
-            if (!response.ok) {
-                throw new Error(`[Kit] HTTP error! Status: ${response.status}`);
+        let resourcePath = './resources/resource.json';
+        let resourceJson;
+        // Server environment (we do not use fetch as the file:// protocol is not supported atm)
+        if (!globalThis.window) {
+            const [fsPromises, path] = await Promise.all([
+                import('fs/promises'),
+                import('path')
+            ]);
+            const { readFile } = fsPromises;
+            resourcePath = path.resolve('resources', 'resource.json');
+            const data = await readFile(resourcePath, 'utf-8');
+            resourceJson = JSON.parse(data);
+            // Client environment
+        }
+        else {
+            // Load the resource json and set the resources found
+            try {
+                const response = await fetch(resourcePath);
+                if (!response.ok) {
+                    throw new Error(`[Kit] HTTP error! Status: ${response.status}`);
+                }
+                resourceJson = await response.json();
             }
-            const resourceJSON = await response.json();
-            if (resourceJSON) {
-                const resources = Object.values(resourceJSON);
-                // Group all data from separate arrays in object to one unified array of all resource data
-                const consolidatedData = resources.flat();
-                // Set all the resources
-                this.setResource(consolidatedData);
+            catch (pError) {
+                console.error(`[Kit] error reading ${resourcePath}`, pError);
             }
         }
-        catch (pError) {
-            console.error(`[Kit] error reading ${resourcePath}`, pError);
+        if (resourceJson) {
+            const resources = Object.values(resourceJson);
+            // Group all data from separate arrays in object to one unified array of all resource data
+            const consolidatedData = resources.flat();
+            // Set all the resources
+            this.setResource(consolidatedData);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evitcastudio/kit",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "author": "doubleactii 56242467+doubleactii@users.noreply.github.com (https://evitcastudio.com)",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -31,7 +31,7 @@
     "pack": "bun pm pack --dry-run",
     "build-types": "bun tsc",
     "build": "bun bun-build.ts",
-    "build-docs": "bun typedoc ./src/index.ts ./src/types/shared-types.ts",
+    "build-docs": "bun typedoc ./src/index.ts",
     "build-all": "bun run build-types && bun run build && bun run build-docs"
   },
   "bin": {