xpine 0.0.20 → 0.0.21

package/dist/src/scripts/xpine-dev.js

@@ -8,11 +8,10 @@ import EventEmitter from "events";
 import chokidar from "chokidar";
 
 // src/scripts/build.ts
-import path3 from "path";
-import fs2 from "fs-extra";
+import path5 from "path";
+import fs5 from "fs-extra";
 import { build } from "esbuild";
-import builtinModules from "builtin-modules";
-import ts2 from "typescript";
+import ts3 from "typescript";
 
 // src/build/typescript-builder.ts
 import ts from "typescript";
@@ -116,17 +115,6 @@ function removeClientScriptInTSXFile(pathName, source) {
     clientDataStart
   };
 }
-function createStaticFile(pathName, source) {
-  source.forEachChild((child) => {
-    if (child.kind === ts.SyntaxKind.ExpressionStatement) {
-      const text = child.getText(source);
-      const cleanedText = text.replace(/["';]/g, "");
-      if (cleanedText === "xpine-static") {
-        console.log("make this file static", pathName);
-      }
-    }
-  });
-}
 
 // src/scripts/build.ts
 import { globSync } from "glob";
@@ -183,6 +171,9 @@ var configDefaults = {
   get pagesDir() {
     return path2.join(this.srcDir, "./pages");
   },
+  get distPagesDir() {
+    return path2.join(this.distDir, "./pages");
+  },
   get publicDir() {
     return path2.join(this.srcDir, "./public");
   },
@@ -218,11 +209,117 @@ var plugin = (opts = {}) => {
 plugin.postcss = true;
 var remove_layers_default = plugin;
 
+// src/build/esbuild/transformTSXFiles.ts
+import fs2 from "fs-extra";
+import ts2 from "typescript";
+import path3 from "path";
+
+// src/util/regex.ts
+var regex_default = {
+  dotTsx: /.tsx/,
+  hasLetters: /[A-Za-z0-9]/g,
+  configFile: /\+config\.[tj]s/g,
+  dynamicRoutes: /(\[)(.*?)(\])/g,
+  isDynamicRoute: /\[(.*)\]/g,
+  endsWithTSX: /\.tsx$/,
+  endsWithJSX: /\.jsx$/
+};
+
+// src/build/esbuild/transformTSXFiles.ts
+function transformTSXFiles(componentData, pageConfigFiles) {
+  return {
+    name: "transform-tsx-files",
+    setup(build2) {
+      build2.onLoad({ filter: regex_default.dotTsx }, (args) => {
+        const configFile = getConfigFile(args.path, pageConfigFiles);
+        const content = fs2.readFileSync(args.path, "utf-8");
+        const source = ts2.createSourceFile(
+          args.path,
+          content,
+          ts2.ScriptTarget.Latest
+        );
+        const cleanedContent = removeClientScriptInTSXFile(args.path, source);
+        const htmlImportStart = "import { html } from 'xpine';\n";
+        const newContent = `${htmlImportStart}${cleanedContent.content}`;
+        componentData.push({
+          ...args,
+          contents: `${htmlImportStart}${cleanedContent.fullContent}`,
+          clientContent: cleanedContent.clientContent,
+          configFile
+        });
+        return {
+          contents: newContent,
+          loader: "tsx"
+        };
+      });
+    }
+  };
+}
+function getConfigFile(pathName, pageConfigFiles) {
+  const configs = [];
+  for (const configFile of pageConfigFiles) {
+    const result = path3.relative(pathName, configFile)?.replace(regex_default.configFile, "");
+    const hasLetters = result.match(regex_default.hasLetters);
+    if (!hasLetters) configs.push(configFile);
+  }
+  const configToUse = configs.sort((a, b) => b.length - a.length)?.[0];
+  return configToUse;
+}
+
+// src/build/esbuild/addDotJS.ts
+import fs3 from "fs-extra";
+import path4 from "path";
+import builtinModules from "builtin-modules";
+function addDotJS(allPackages2, extensions2, isDev) {
+  const allPackagesIncludingNode = allPackages2.concat(builtinModules);
+  return {
+    name: "add-dot-js",
+    setup(build2) {
+      build2.onResolve({ filter: /.*/ }, (args) => {
+        const hasAtSign = args.path.startsWith("@");
+        const isPackage = hasAtSign ? allPackagesIncludingNode.includes(args.path) : allPackagesIncludingNode.includes(args.path.split("/").shift());
+        if (args.importer && !isPackage) {
+          const calculatedDir = path4.join(args.resolveDir, args.path);
+          let existsAsFile = false;
+          for (const extension of extensions2) {
+            const asFile = calculatedDir + extension;
+            const exists = fs3.existsSync(asFile);
+            if (exists) existsAsFile = true;
+          }
+          let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
+          outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
+          return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
+        }
+      });
+    }
+  };
+}
+
+// src/build/esbuild/getDataFiles.ts
+import fs4 from "fs-extra";
+function getDataFiles(dataFiles) {
+  return {
+    name: "get-data-files",
+    setup(build2) {
+      build2.onLoad({ filter: /\.data\.(js|mjs|ts)$/ }, (args) => {
+        const contents = fs4.readFileSync(args.path, "utf-8");
+        dataFiles.push({
+          ...args,
+          contents
+        });
+        return {
+          contents,
+          loader: "ts"
+        };
+      });
+    }
+  };
+}
+
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
-var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
+var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
-var allPackagesIncludingNode = allPackages.concat(builtinModules);
 var xpineDistDir = getXPineDistDir();
 async function buildApp(isDev = false) {
   try {
@@ -230,9 +327,10 @@ async function buildApp(isDev = false) {
     const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
     await buildClientSideFiles([alpineDataFile], isDev);
-    fs2.removeSync(config.distTempFolder);
+    fs5.removeSync(config.distTempFolder);
     await buildCSS();
     await buildPublicFolderSymlinks();
+    if (!isDev) await buildStaticFiles(componentData);
   } catch (err) {
     console.error("Build failed");
     console.error(err);
@@ -241,8 +339,12 @@ async function buildApp(isDev = false) {
 async function buildAppFiles(files, isDev) {
   const componentData = [];
   const dataFiles = [];
+  const pageConfigFiles = files.filter((file) => {
+    const fileName = file.split("/").at(-1).split(".").shift();
+    return fileName === "+config";
+  });
   const backendFiles = files.filter((file) => extensions.find((ext) => file.endsWith(ext))).filter((file) => !file.startsWith(config.publicDir));
-  fs2.ensureDirSync(config.distDir);
+  fs5.ensureDirSync(config.distDir);
   await build({
     entryPoints: backendFiles,
     format: "esm",
@@ -254,69 +356,9 @@ async function buildAppFiles(files, isDev) {
     jsx: "transform",
     minify: !isDev,
     plugins: [
-      {
-        name: "add-dot-js",
-        setup(build2) {
-          build2.onResolve({ filter: /.*/ }, (args) => {
-            const hasAtSign = args.path.startsWith("@");
-            const isPackage = hasAtSign ? allPackagesIncludingNode.includes(args.path) : allPackagesIncludingNode.includes(args.path.split("/").shift());
-            if (args.importer && !isPackage) {
-              const calculatedDir = path3.join(args.resolveDir, args.path);
-              let existsAsFile = false;
-              for (const extension of extensions) {
-                const asFile = calculatedDir + extension;
-                const exists = fs2.existsSync(asFile);
-                if (exists) existsAsFile = true;
-              }
-              let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
-              outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-              return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
-            }
-          });
-        }
-      },
-      {
-        name: "insert-html-banner-and-remove-client-scripts",
-        setup(build2) {
-          build2.onLoad({ filter: /.tsx/ }, (args) => {
-            const content = fs2.readFileSync(args.path, "utf-8");
-            const source = ts2.createSourceFile(
-              args.path,
-              content,
-              ts2.ScriptTarget.Latest
-            );
-            const cleanedContent = removeClientScriptInTSXFile(args.path, source);
-            createStaticFile(args.path, source);
-            const htmlImportStart = "import { html } from 'xpine';\n";
-            const newContent = `${htmlImportStart}${cleanedContent.content}`;
-            componentData.push({
-              ...args,
-              contents: `${htmlImportStart}${cleanedContent.fullContent}`,
-              clientContent: cleanedContent.clientContent
-            });
-            return {
-              contents: newContent,
-              loader: "tsx"
-            };
-          });
-        }
-      },
-      {
-        name: "get-data-files",
-        setup(build2) {
-          build2.onLoad({ filter: /\.data\.(js|mjs|ts)$/ }, (args) => {
-            const contents = fs2.readFileSync(args.path, "utf-8");
-            dataFiles.push({
-              ...args,
-              contents
-            });
-            return {
-              contents,
-              loader: "ts"
-            };
-          });
-        }
-      }
+      addDotJS(allPackages, extensions, isDev),
+      transformTSXFiles(componentData, pageConfigFiles),
+      getDataFiles(dataFiles)
     ]
   });
   await logSize(config.distDir, "app");
@@ -326,8 +368,8 @@ async function buildAppFiles(files, isDev) {
   };
 }
 async function buildClientSideFiles(alpineDataFiles = [], isDev) {
-  const tempFilePath = path3.join(config.distTempFolder, "./app.ts");
-  fs2.ensureFileSync(tempFilePath);
+  const tempFilePath = path5.join(config.distTempFolder, "./app.ts");
+  fs5.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
   const clientFiles = globSync(
     config.publicDir + "/**/*.{js,ts}",
@@ -356,15 +398,15 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
   await logSize(config.distPublicDir, "client");
 }
 function writeDevServerClientSideCode(tempFilePath) {
-  const devServerPath = path3.join(xpineDistDir, "./src/static/dev-server.js");
-  const content = fs2.readFileSync(devServerPath, "utf-8");
-  fs2.appendFileSync(tempFilePath, `
+  const devServerPath = path5.join(xpineDistDir, "./src/static/dev-server.js");
+  const content = fs5.readFileSync(devServerPath, "utf-8");
+  fs5.appendFileSync(tempFilePath, `
 ` + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
-  const spaPath = path3.join(xpineDistDir, "./src/static/spa.js");
-  const content = fs2.readFileSync(spaPath, "utf-8");
-  fs2.appendFileSync(tempFilePath, `
+  const spaPath = path5.join(xpineDistDir, "./src/static/spa.js");
+  const content = fs5.readFileSync(spaPath, "utf-8");
+  fs5.appendFileSync(tempFilePath, `
 ` + content);
 }
 async function buildAlpineDataFile(componentData, dataFiles) {
@@ -384,10 +426,10 @@ async function buildAlpineDataFile(componentData, dataFiles) {
   };
   const componentsAndDataFiles = componentData.concat(dataFiles);
   for (const component of componentsAndDataFiles) {
-    const sourceFile = ts2.createSourceFile(
+    const sourceFile = ts3.createSourceFile(
       component.path,
       component.contents,
-      ts2.ScriptTarget.Latest
+      ts3.ScriptTarget.Latest
     );
     const dataFunctionResult = findDataAttributesAndFunctions(sourceFile, sourceFile);
     dataFunctionResults.foundDataAttributes.push(...dataFunctionResult.foundDataAttributes);
@@ -409,18 +451,18 @@ async function buildAlpineDataFile(componentData, dataFiles) {
     output.code.push(`Alpine.data('${dataFunction.name}', ${dataFunction.name});`);
   }
   const result = output.imports.join("\n") + "\n" + output.code.join("\n") + "\n" + output.end.join("\n");
-  fs2.ensureFileSync(config.alpineDataPath);
-  fs2.writeFileSync(config.alpineDataPath, result);
+  fs5.ensureFileSync(config.alpineDataPath);
+  fs5.writeFileSync(config.alpineDataPath, result);
   return config.alpineDataPath;
 }
 async function buildCSS() {
   const cssFiles = globSync(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
-    const fileContents = fs2.readFileSync(file, "utf-8");
+    const fileContents = fs5.readFileSync(file, "utf-8");
     const result = await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
-    fs2.ensureFileSync(newPath);
-    fs2.writeFileSync(newPath, result.css);
+    fs5.ensureFileSync(newPath);
+    fs5.writeFileSync(newPath, result.css);
   }
   logSize(config.distPublicDir, "css");
 }
@@ -434,8 +476,8 @@ async function buildPublicFolderSymlinks() {
       const splitNewPath = newPath.split("/");
       splitNewPath.pop();
       const newDir = splitNewPath.join("/");
-      fs2.ensureDirSync(newDir);
-      fs2.symlinkSync(file, newPath);
+      fs5.ensureDirSync(newDir);
+      fs5.symlinkSync(file, newPath);
     } catch {
     }
   }
@@ -446,7 +488,7 @@ async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
     if (!validExtensions.find((ext) => file.endsWith(ext))) return false;
     return {
       file,
-      size: fs2.statSync(file).size / (1024 * 1e3)
+      size: fs5.statSync(file).size / (1024 * 1e3)
     };
   }).filter(Boolean);
   const totalSize = fileSizes.reduce((total, current) => {
@@ -454,17 +496,75 @@ async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
   }, 0);
   console.info(`[${totalSize.toFixed(3)} MB] Built ${type}`);
 }
+async function buildStaticFiles(componentData) {
+  const componentsWithConfigs = componentData.filter((item) => item.configFile);
+  for (const component of componentsWithConfigs) {
+    const config2 = (await import(sourcePathToDistPath(component.configFile) + `?cache=${Date.now()}`)).default;
+    const shouldBeStatic = config2?.staticPaths;
+    if (shouldBeStatic) {
+      let componentFileName = component.path.split("/").pop().replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+      const isDynamicRoute = component.path.match(regex_default.isDynamicRoute);
+      if (isDynamicRoute) {
+        componentFileName = component.path.split("/").filter((dir) => dir.match(regex_default.isDynamicRoute)).join("/").replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+      }
+      const builtComponentPath = sourcePathToDistPath(component.path);
+      const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
+      const componentFn = (await import(builtComponentPath + `?cache=${Date.now()}`)).default;
+      const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
+        return total.replace(`/[${current}]`, "");
+      }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
+      if (typeof shouldBeStatic === "boolean") {
+        try {
+          const staticComponentOutput = await componentFn();
+          fs5.writeFileSync(path5.join(outputPath, "./index.html"), staticComponentOutput);
+        } catch (err) {
+          console.error(err);
+          console.log("Could not build static component", component.path);
+        }
+      } else if (typeof shouldBeStatic === "function") {
+        const dynamicPaths = await shouldBeStatic();
+        for (const dynamicPath of dynamicPaths) {
+          try {
+            const staticComponentOutput = await componentFn({
+              params: {
+                ...componentDynamicPaths?.length ? dynamicPath : {}
+              }
+            });
+            const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
+            fs5.ensureDirSync(updatedOutDir);
+            fs5.writeFileSync(path5.join(updatedOutDir, `./index.html`), staticComponentOutput);
+          } catch (err) {
+            console.log("Could not build static component", component.path);
+            console.error(err);
+          }
+        }
+      }
+    }
+  }
+}
+function sourcePathToDistPath(sourcePath) {
+  return sourcePath.replace(config.srcDir, config.distDir).replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js");
+}
+function getComponentDynamicPaths(componentPath) {
+  const matches = [...componentPath.matchAll(regex_default.dynamicRoutes)];
+  if (!matches?.length) return null;
+  const output = [];
+  for (const match of matches) {
+    output.push(match[2]);
+  }
+  return output;
+}
 
 // src/runDevServer.ts
-import path5 from "path";
+import path7 from "path";
 
 // src/util/env.ts
 import dotenv from "dotenv";
-import path4 from "path";
+import path6 from "path";
 import { GetSecretValueCommand, SecretsManagerClient } from "@aws-sdk/client-secrets-manager";
 async function setupEnv() {
   if (process.env.HAS_SETUP_ENV) return;
-  dotenv.config({ path: path4.join(config.rootDir, `./.env.${process.env.STAGE || "dev"}`) });
+  dotenv.config({ path: path6.join(config.rootDir, `./.env.${process.env.STAGE || "dev"}`) });
   await loadSecretsManagerSecrets();
   process.env.HAS_SETUP_ENV = "true";
 }
@@ -493,16 +593,16 @@ async function loadSecretsManagerSecrets() {
 await setupEnv();
 async function runDevServer() {
   process.env.NODE_ENV = "development";
-  const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   await buildApp(true);
+  const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   let appServer = await startServer();
   const watcher = chokidar.watch(config.srcDir, {
     ignoreInitial: true,
     // Ignore map and prisma files
-    ignored: (pathName) => pathName.endsWith(".map") || pathName.startsWith(path5.join(config.serverDir, "./prisma"))
+    ignored: (pathName) => pathName.endsWith(".map") || pathName.startsWith(path7.join(config.serverDir, "./prisma"))
   });
-  watcher.on("all", async (event, path6) => {
-    const shouldReloadServer = path6.startsWith(config.serverDir) && !path6.startsWith(config.runDir) || ["add", "unlink"].includes(event) && path6.startsWith(config.pagesDir);
+  watcher.on("all", async (event, path8) => {
+    const shouldReloadServer = path8.startsWith(config.serverDir) && !path8.startsWith(config.runDir) || ["add", "unlink"].includes(event) && path8.startsWith(config.pagesDir);
     if (shouldReloadServer) {
       await appServer.server.close();
       await buildApp(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",
@@ -13,7 +13,6 @@
     "express-ws": "^5.0.2",
     "fs-extra": "^11.3.0",
     "glob": "^11.0.1",
-    "html": "file:./dist/src/util/html.js",
     "jsonwebtoken": "^9.0.2",
     "postcss": "^8.5.3",
     "request-ip": "^3.3.0",