@titanpl/packet 7.0.5 → 7.0.7

package/js/titan/bundle.js

@@ -159,6 +159,22 @@ export async function bundleFile(options) {
   }
 }
 
+function getFilesRecursively(dir, baseDir = dir) {
+  let results = [];
+  if (!fs.existsSync(dir)) return results;
+  const list = fs.readdirSync(dir);
+  for (const file of list) {
+    const filePath = path.join(dir, file);
+    const stat = fs.statSync(filePath);
+    if (stat && stat.isDirectory()) {
+      results = results.concat(getFilesRecursively(filePath, baseDir));
+    } else {
+      results.push(path.relative(baseDir, filePath));
+    }
+  }
+  return results;
+}
+
 /**
  * Main JS Bundler
  */
@@ -175,12 +191,14 @@ export async function bundle(options = {}) {
 
   if (!fs.existsSync(actionsDir)) return;
 
-  const files = fs.readdirSync(actionsDir).filter(f => f.endsWith('.js'));
+  const files = getFilesRecursively(actionsDir).filter(f => f.endsWith('.js'));
 
   for (const file of files) {
-    const actionName = path.basename(file, path.extname(file));
+    const relativeNoExt = file.replace(/\.js$/, '');
+    const actionName = relativeNoExt.replace(/\\/g, '/');
+    const exportedName = path.basename(file, path.extname(file));
     const entryPoint = path.join(actionsDir, file);
-    const outfile = path.join(bundleDir, actionName + ".jsbundle");
+    const outfile = path.join(bundleDir, relativeNoExt + ".jsbundle");
 
     try {
       await bundleFile({
@@ -190,7 +208,7 @@ export async function bundle(options = {}) {
         footer: {
           js: `
 (function () {
-  const fn = __titan_exports["${actionName}"] || __titan_exports.default;
+  const fn = __titan_exports["${exportedName}"] || __titan_exports.default;
   if (typeof fn !== "function") throw new Error("[TitanPL] Action '${actionName}' not found or not a function");
   globalThis["${actionName}"] = globalThis.defineAction(fn);
 })();`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titanpl/packet",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "description": "The bundler for TitanPl servers.",
   "keywords": [
     "bundler",

package/ts/titan/bundle.js

@@ -203,6 +203,22 @@ export async function bundleFile(options) {
     }
 }
 
+function getFilesRecursively(dir, baseDir = dir) {
+    let results = [];
+    if (!fs.existsSync(dir)) return results;
+    const list = fs.readdirSync(dir);
+    for (const file of list) {
+        const filePath = path.join(dir, file);
+        const stat = fs.statSync(filePath);
+        if (stat && stat.isDirectory()) {
+            results = results.concat(getFilesRecursively(filePath, baseDir));
+        } else {
+            results.push(path.relative(baseDir, filePath));
+        }
+    }
+    return results;
+}
+
 /**
  * Main TS Bundler
  */
@@ -238,12 +254,14 @@ export async function bundle(options = {}) {
 
     if (!fs.existsSync(actionsDir)) return;
 
-    const files = fs.readdirSync(actionsDir).filter(f => (f.endsWith('.ts') || f.endsWith('.js')) && !f.endsWith('.d.ts'));
+    const files = getFilesRecursively(actionsDir).filter(f => (f.endsWith('.ts') || f.endsWith('.js')) && !f.endsWith('.d.ts'));
 
     for (const file of files) {
-        const actionName = path.basename(file, path.extname(file));
+        const relativeNoExt = file.replace(/\.[jt]s$/, '');
+        const actionName = relativeNoExt.replace(/\\/g, '/');
+        const exportedName = path.basename(file, path.extname(file));
         const entryPoint = path.join(actionsDir, file);
-        const outfile = path.join(bundleDir, actionName + ".jsbundle");
+        const outfile = path.join(bundleDir, relativeNoExt + ".jsbundle");
 
         try {
             await bundleFile({
@@ -253,7 +271,7 @@ export async function bundle(options = {}) {
                 footer: {
                     js: `
 (function () {
-  const fn = __titan_exports["${actionName}"] || __titan_exports.default;
+  const fn = __titan_exports["${exportedName}"] || __titan_exports.default;
   if (typeof fn !== "function") throw new Error("[TitanPL] Action '${actionName}' not found or not a function");
   globalThis["${actionName}"] = globalThis.defineAction(fn);
 })();`