xpine 0.0.24 → 0.0.27

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

@@ -11,12 +11,146 @@ import chokidar from "chokidar";
 import path5 from "path";
 import fs5 from "fs-extra";
 import { build } from "esbuild";
-import ts3 from "typescript";
 
 // src/build/typescript-builder.ts
 import ts from "typescript";
 import fs from "fs-extra";
+import path2 from "path";
+
+// src/util/get-config.ts
 import path from "path";
+
+// src/util/require.ts
+import { createRequire } from "module";
+var require_default = createRequire(import.meta.url);
+
+// src/util/get-config.ts
+var rootDir = process.cwd();
+function fromRoot(pathName) {
+  if (!pathName) return rootDir;
+  return path.join(rootDir, pathName);
+}
+var userConfig = require_default(path.join(process.cwd(), "./xpine.config.mjs")).default;
+var configDefaults = {
+  rootDir: fromRoot(),
+  srcDir: fromRoot("./src"),
+  distDir: fromRoot("./dist"),
+  packageJsonPath: fromRoot("package.json"),
+  // We need to use getters here in the event someone wants to change folders, such as the dist folder
+  get distPublicDir() {
+    return path.join(this.distDir, "./public");
+  },
+  get distPublicScriptsDir() {
+    return path.join(this.distPublicDir, "./scripts");
+  },
+  get distTempFolder() {
+    return path.join(this.distDir, "./temp");
+  },
+  get clientJSBundlePath() {
+    return path.join(this.distPublicScriptsDir, "./app.js");
+  },
+  get alpineDataPath() {
+    return path.join(this.distTempFolder, "./alpine-data.ts");
+  },
+  get serverDistDir() {
+    return path.join(this.distDir, "./server");
+  },
+  get serverDistAppPath() {
+    return path.join(this.serverDistDir, "./app.js");
+  },
+  // Important dirs/paths
+  get pagesDir() {
+    return path.join(this.srcDir, "./pages");
+  },
+  get distPagesDir() {
+    return path.join(this.distDir, "./pages");
+  },
+  get publicDir() {
+    return path.join(this.srcDir, "./public");
+  },
+  get serverDir() {
+    return path.join(this.srcDir, "./server");
+  },
+  get runDir() {
+    return path.join(this.serverDir, "./run");
+  },
+  get serverAppPath() {
+    return path.join(this.serverDir, "./app.ts");
+  },
+  get globalCSSFile() {
+    return path.join(this.publicDir, "./styles/global.css");
+  }
+};
+var config = {
+  ...configDefaults,
+  ...userConfig
+};
+
+// src/context.ts
+function createContext(value) {
+  let stateValue = value;
+  let arrayQueue = {};
+  return {
+    get(id) {
+      const val = stateValue[id];
+      if (Array.isArray(val)) return val.filter((item) => item !== void 0);
+      return val;
+    },
+    set(id, callback, defaultValue) {
+      if (!stateValue[id]) stateValue[id] = defaultValue ?? null;
+      stateValue[id] = callback(stateValue[id]);
+    },
+    clear() {
+      stateValue = {};
+    },
+    getAll() {
+      return stateValue;
+    },
+    getArrayQueue() {
+      return arrayQueue;
+    },
+    addToArray(id, value2, position) {
+      const output = {
+        id,
+        value: addToContextArray(value2, position),
+        position
+      };
+      if (!arrayQueue[id]) {
+        arrayQueue[id] = [output];
+      } else {
+        arrayQueue[id].push(output);
+      }
+    },
+    runArrayQueue() {
+      Object.keys(arrayQueue).forEach((key) => {
+        arrayQueue[key].sort((a, b) => {
+          return (a?.position ?? Infinity) - (b.position ?? Infinity);
+        });
+        for (const item of arrayQueue[key]) {
+          this.set(key, item.value, []);
+        }
+      });
+      arrayQueue = {};
+    }
+  };
+}
+var context = createContext({});
+function addToContextArray(newValue, position) {
+  return function(currentValue) {
+    if (!currentValue) return [newValue];
+    if (typeof position === "number") {
+      if (position > currentValue?.length) {
+        const output = [...currentValue, ...new Array(position + 1 - currentValue.length)];
+        return output.toSpliced(position, 0, newValue);
+      }
+      if (currentValue?.[position] === void 0) return currentValue.toSpliced(position, 1, newValue);
+      return currentValue.toSpliced(position, 0, newValue);
+    }
+    return [...currentValue, newValue];
+  };
+}
+
+// src/build/typescript-builder.ts
 function findDataAttributesAndFunctions(node, sourceFile, foundDataAttributes = [], foundFunctions = []) {
   if (node.kind === ts.SyntaxKind.JsxAttribute) {
     const attribute = getAttributeValuePair(node, sourceFile);
@@ -88,18 +222,7 @@ function removeClientScriptInTSXFile(pathName, source) {
     }
     if (child.kind === ts.SyntaxKind.ImportDeclaration && child.pos >= clientDataStart) {
       const text = child.getText(source);
-      child.forEachChild((child2) => {
-        if (child2.kind === ts.SyntaxKind.StringLiteral) {
-          const text2 = child2.getText(source);
-          const importPath = text2.replace(/[\"\']/g, "");
-          const isRelativeImport = importPath.startsWith(".") || importPath.startsWith("/");
-          if (!isRelativeImport) return;
-          clientImportsToReplace.push({
-            old: importPath,
-            new: path.join(path.dirname(pathName), importPath)
-          });
-        }
-      });
+      clientImportsToReplace.push(...getImportsToAbsolutePaths(child, source, pathName));
       clientImportsToHoist.push(text);
     }
   });
@@ -115,18 +238,58 @@ function removeClientScriptInTSXFile(pathName, source) {
     clientDataStart
   };
 }
+function getImportsToAbsolutePaths(child, source, pathName) {
+  const output = [];
+  child.forEachChild((child2) => {
+    if (child2.kind === ts.SyntaxKind.StringLiteral) {
+      const text = child2.getText(source);
+      const importPath = text.replace(/[\"\']/g, "");
+      const isRelativeImport = importPath.startsWith(".") || importPath.startsWith("/");
+      if (!isRelativeImport) return;
+      output.push({
+        old: importPath,
+        new: path2.join(path2.dirname(pathName), importPath)
+      });
+    }
+  });
+  return output;
+}
+function getXpineOnLoadFunction(pathName, source, onLoadFileResult) {
+  const value = {
+    imports: "",
+    fn: ""
+  };
+  source.forEachChild((child) => {
+    if (child.kind == ts.SyntaxKind.ImportDeclaration) {
+      let importText = child.getText(source);
+      const importOutput = getImportsToAbsolutePaths(child, source, pathName);
+      for (const importItem of importOutput) {
+        importText = importText.replace(importItem.old, importItem.new);
+      }
+      value.imports = importText + "\n" + value.imports;
+    }
+    if ([ts.SyntaxKind.FirstStatement, ts.SyntaxKind.FunctionDeclaration].includes(child.kind)) {
+      let text = child.getText(source);
+      if (text.includes("xpineOnLoad")) {
+        const body = child?.body?.getText(source) || "";
+        value.fn = value.fn + "\n" + body ? `(function() ${body})();` : "";
+      }
+    }
+  });
+  return value;
+}
+async function triggerXPineOnLoad(noCache = false) {
+  context.clear();
+  const xpineOnLoad = (await import(path2.join(config.distDir, `./__xpineOnLoad.js${noCache ? `?cache=${Date.now()}` : ""}`)))?.default;
+  if (xpineOnLoad) await xpineOnLoad();
+}
 
 // src/scripts/build.ts
 import { globSync } from "glob";
 import postcss from "postcss";
 import tailwindPostcss from "@tailwindcss/postcss";
 
-// src/util/get-config.ts
-import path2 from "path";
-
-// src/util/require.ts
-import { createRequire } from "module";
-var require_default = createRequire(import.meta.url);
+// src/util/paths.ts
 function getXPineDistDir() {
   const dir = import.meta.dirname;
   const splitDir = dir.split("/xpine/dist");
@@ -137,68 +300,6 @@ function getXPineDistDir() {
   return splitDir[0] + "/xpine/dist";
 }
 
-// src/util/get-config.ts
-var rootDir = process.cwd();
-function fromRoot(pathName) {
-  if (!pathName) return rootDir;
-  return path2.join(rootDir, pathName);
-}
-var userConfig = require_default(path2.join(process.cwd(), "./xpine.config.mjs")).default;
-var configDefaults = {
-  rootDir: fromRoot(),
-  srcDir: fromRoot("./src"),
-  distDir: fromRoot("./dist"),
-  packageJsonPath: fromRoot("package.json"),
-  // We need to use getters here in the event someone wants to change folders, such as the dist folder
-  get distPublicDir() {
-    return path2.join(this.distDir, "./public");
-  },
-  get distPublicScriptsDir() {
-    return path2.join(this.distPublicDir, "./scripts");
-  },
-  get distTempFolder() {
-    return path2.join(this.distDir, "./temp");
-  },
-  get clientJSBundlePath() {
-    return path2.join(this.distPublicScriptsDir, "./app.js");
-  },
-  get alpineDataPath() {
-    return path2.join(this.distTempFolder, "./alpine-data.ts");
-  },
-  get serverDistDir() {
-    return path2.join(this.distDir, "./server");
-  },
-  get serverDistAppPath() {
-    return path2.join(this.serverDistDir, "./app.js");
-  },
-  // Important dirs/paths
-  get pagesDir() {
-    return path2.join(this.srcDir, "./pages");
-  },
-  get distPagesDir() {
-    return path2.join(this.distDir, "./pages");
-  },
-  get publicDir() {
-    return path2.join(this.srcDir, "./public");
-  },
-  get serverDir() {
-    return path2.join(this.srcDir, "./server");
-  },
-  get runDir() {
-    return path2.join(this.serverDir, "./run");
-  },
-  get serverAppPath() {
-    return path2.join(this.serverDir, "./app.ts");
-  },
-  get globalCSSFile() {
-    return path2.join(this.publicDir, "./styles/global.css");
-  }
-};
-var config = {
-  ...configDefaults,
-  ...userConfig
-};
-
 // src/util/postcss/remove-layers.ts
 var plugin = (opts = {}) => {
   return {
@@ -272,13 +373,16 @@ function transformTSXFiles(componentData, pageConfigFiles) {
           ts2.ScriptTarget.Latest
         );
         const cleanedContent = removeClientScriptInTSXFile(args.path, source);
-        const htmlImportStart = "import { html } from 'xpine';\n";
-        const newContent = `${htmlImportStart}${cleanedContent.content}`;
+        const htmlImportStart = [
+          "import { html } from 'xpine';"
+        ];
+        const newContent = `${htmlImportStart.join("\n")}${cleanedContent.content}`;
         componentData.push({
           ...args,
           contents: `${htmlImportStart}${cleanedContent.fullContent}`,
           clientContent: cleanedContent.clientContent,
-          configFiles: isAConfigFile(args?.path) ? null : getConfigFiles(args.path, pageConfigFiles)
+          configFiles: isAConfigFile(args?.path) ? null : getConfigFiles(args.path, pageConfigFiles),
+          source
         });
         return {
           contents: newContent,
@@ -348,7 +452,10 @@ var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
-async function buildApp(isDev = false, removePreviousBuild = false) {
+async function buildApp(args) {
+  const isDev = args?.isDev || false;
+  const removePreviousBuild = args?.removePreviousBuild || false;
+  const disableTailwind = args?.disableTailwind || false;
   try {
     if (removePreviousBuild) fs5.removeSync(config.distDir);
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
@@ -356,9 +463,12 @@ async function buildApp(isDev = false, removePreviousBuild = false) {
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
     await buildClientSideFiles([alpineDataFile], isDev);
     fs5.removeSync(config.distTempFolder);
-    await buildCSS();
+    await buildCSS(disableTailwind);
     await buildPublicFolderSymlinks();
+    await buildOnLoadFile(componentData, isDev);
+    if (!isDev) await triggerXPineOnLoad();
     if (!isDev) await buildFilesWithConfigs(componentData);
+    if (!isDev) context.clear();
   } catch (err) {
     console.error("Build failed");
     console.error(err);
@@ -452,12 +562,7 @@ async function buildAlpineDataFile(componentData, dataFiles) {
   };
   const componentsAndDataFiles = componentData.concat(dataFiles);
   for (const component of componentsAndDataFiles) {
-    const sourceFile = ts3.createSourceFile(
-      component.path,
-      component.contents,
-      ts3.ScriptTarget.Latest
-    );
-    const dataFunctionResult = findDataAttributesAndFunctions(sourceFile, sourceFile);
+    const dataFunctionResult = findDataAttributesAndFunctions(component.source, component.source);
     dataFunctionResults.foundDataAttributes.push(...dataFunctionResult.foundDataAttributes);
     const foundFunctionsWithPath = dataFunctionResult.foundFunctions.map((item) => {
       return {
@@ -481,11 +586,11 @@ async function buildAlpineDataFile(componentData, dataFiles) {
   fs5.writeFileSync(config.alpineDataPath, result);
   return config.alpineDataPath;
 }
-async function buildCSS() {
+async function buildCSS(disableTailwind) {
   const cssFiles = globSync(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
     const fileContents = fs5.readFileSync(file, "utf-8");
-    const result = await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
+    const result = disableTailwind ? fileContents : await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
     fs5.ensureFileSync(newPath);
     fs5.writeFileSync(newPath, result.css);
@@ -547,6 +652,7 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
   }
   const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
   const componentFn = componentImport.default;
+  if (componentImport?.onInit) await componentImport.onInit();
   const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
     return total.replace(`/[${current}]`, "");
   }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
@@ -596,6 +702,53 @@ function getComponentDynamicPaths(componentPath) {
   }
   return output;
 }
+async function buildOnLoadFile(componentData, isDev) {
+  const onLoadFiles = [];
+  const onLoadFileResult = {
+    imports: "",
+    fn: ""
+  };
+  for (const component of componentData) {
+    if (component.contents.includes("xpineOnLoad")) {
+      onLoadFiles.push({
+        path: sourcePathToDistPath(component.path),
+        source: component.source
+      });
+    }
+  }
+  onLoadFiles.sort((a, b) => {
+    return a.path.localeCompare(b.path);
+  });
+  for (const file of onLoadFiles) {
+    const result = getXpineOnLoadFunction(file.path, file.source, onLoadFileResult);
+    onLoadFileResult.fn += result.fn;
+    onLoadFileResult.imports += result.imports;
+  }
+  const output = `
+    ${onLoadFileResult.imports}
+    import { context } from "xpine";
+    export default async function triggerOnLoad() {
+      ${onLoadFileResult.fn}
+      context.runArrayQueue();
+    }
+  `;
+  const onLoadFilePath = path5.join(config.distDir, "./__xpineOnLoad.ts");
+  fs5.writeFileSync(onLoadFilePath, output);
+  await build({
+    entryPoints: [onLoadFilePath],
+    format: "esm",
+    platform: "node",
+    outdir: config.distDir,
+    bundle: true,
+    sourcemap: isDev ? "inline" : false,
+    external: allPackages,
+    jsx: "transform",
+    minify: !isDev,
+    plugins: [
+      addDotJS(allPackages, extensions, isDev)
+    ]
+  });
+}
 
 // src/runDevServer.ts
 import path7 from "path";
@@ -636,7 +789,7 @@ await setupEnv();
 async function runDevServer() {
   process.env.NODE_ENV = "development";
   const rebuildEmitter = createRebuildEmitter();
-  await buildApp(true);
+  await buildApp({ isDev: true });
   const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   let appServer = await startServer();
   const watcher = chokidar.watch(config.srcDir, {
@@ -651,14 +804,14 @@ async function runDevServer() {
       rebuildEmitter.emit("rebuild-server");
       return;
     }
-    await buildApp(true);
+    await buildApp({ isDev: true });
     refreshEmitter.emit("refresh");
   });
   rebuildEmitter.on("done", async () => {
     await rebuildServer();
   });
   async function rebuildServer() {
-    await buildApp(true);
+    await buildApp({ isDev: true });
     const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
     appServer = await startServer2();
   }

package/dist/src/util/hooks/onInit.d.ts

@@ -0,0 +1,3 @@
+import { ConfigFile } from "../../../types";
+export default function createOnInit(onInit: ConfigFile['onInit']): () => Promise<void>;
+//# sourceMappingURL=onInit.d.ts.map

package/dist/src/util/hooks/onInit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onInit.d.ts","sourceRoot":"","sources":["../../../../src/util/hooks/onInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,uBAOhE"}

package/dist/src/util/paths.d.ts

@@ -0,0 +1,2 @@
+export declare function getXPineDistDir(): string;
+//# sourceMappingURL=paths.d.ts.map

package/dist/src/util/paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/util/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,WAS9B"}

package/dist/src/util/require.d.ts

@@ -1,4 +1,3 @@
 declare const _default: NodeJS.Require;
 export default _default;
-export declare function getXPineDistDir(): string;
 //# sourceMappingURL=require.d.ts.map

package/dist/src/util/require.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":";AAEA,wBAA8C;AAE9C,wBAAgB,eAAe,WAS9B"}
+{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":";AAEA,wBAA8C"}

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from 'express';
+import ts from 'typescript';
 export type XPineConfig = {
     [key: string]: any;
 };
@@ -37,5 +38,6 @@ export type ComponentData = {
     contents: string;
     clientContent: string;
     configFiles: string[];
+    source: ts.SourceFile;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC;CACvB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",
@@ -33,6 +33,7 @@
     "test:dev": "cd ./tests && npm run dev",
     "test:start": "cd ./tests && npm run build && npm start",
     "test:build": "cd ./tests && npm run build",
+    "test:build:dev": "cd ./tests && npm run build:dev",
     "lint": "npx eslint",
     "fix": "npx eslint --fix",
     "release:patch": "npm run build && npm version patch && npm publish"
@@ -45,12 +46,14 @@
   "type": "module",
   "devDependencies": {
     "@eslint/js": "^9.24.0",
+    "@tailwindcss/oxide-darwin-arm64": "^4.1.3",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.5",
     "@types/request-ip": "^0.0.41",
     "@types/shelljs": "^0.8.15",
     "@types/yargs": "^17.0.33",
     "axios": "^1.8.4",
+    "lightningcss-darwin-arm64": "^1.29.3",
     "typescript-eslint": "^8.29.0"
   }
 }

package/types.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from 'express';
+import ts from 'typescript';
 
 export type XPineConfig = {
   [key: string]: any;
@@ -22,7 +23,7 @@ export type WrapperProps = {
 }
 
 export type ConfigFile = {
-  staticPaths?: boolean | (() => Promise<{ [key: string]: string}[]>);
+  staticPaths?: boolean | (() => Promise<{ [key: string]: string }[]>);
   wrapper?: (props: WrapperProps) => Promise<any>;
   data?: (req: ServerRequest) => Promise<any>;
 }
@@ -43,4 +44,5 @@ export type ComponentData = {
   contents: string;
   clientContent: string;
   configFiles: string[];
+  source: ts.SourceFile;
 }

package/tests/e2e/alpine.spec.ts

@@ -1,14 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { url } from '../playwright.config';
-
-test('pathD button changes color on button click', async ({ page }) => {
-  await page.goto(url + '/my-path-a2/my-path-b2/my-path-c2/2');
-  const button = page.getByTestId('path-d-button');
-  const initialStyle = await button.getAttribute('style');
-  expect(initialStyle).toEqual('background-color: red');
-  await test.step('click button', async () => {
-    await button.click();
-    const newStyle = await button.getAttribute('style');
-    expect(newStyle).toEqual('background-color: blue');
-  });
-});

package/tests/e2e/app-build.spec.ts

@@ -1,73 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { config } from 'xpine';
-import fs from 'fs-extra';
-import path from 'path';
-import { url } from '../playwright.config';
-
-test('app builds', async ({ page }) => {
-  await page.goto(url);
-  await expect(page.getByTestId('hello-world')).toHaveText('Hello world');
-});
-
-test('home page uses same file wrapper', async ({ page }) => {
-  await page.goto(url);
-  await expect(page.getByTestId('home-page-wrapper')).toBeAttached();
-  expect(await page.getByTestId('base-config').count()).toEqual(0);
-  const title = await page.title();
-  expect(title).toEqual('Home page');
-});
-
-test('same dir +config uses config', async ({ page }) => {
-  await page.goto(url + '/with-same-dir-wrapper');
-  await expect(page.getByTestId('base-config')).toBeAttached();
-  const title = await page.title();
-  expect(title).toEqual('Default title');
-});
-
-test('dynamic paths with data in +config - path c', async ({ page }) => {
-  const result = await page.goto(url + '/my-path-a/my-path-b/1');
-  await expect(page.getByTestId('path-c-data')).toHaveText('sunt aut facere repellat provident occaecati excepturi optio reprehenderit');
-  await expect(page.getByTestId('path-c-patha')).toHaveText('my-path-a');
-  await expect(page.getByTestId('path-c-pathb')).toHaveText('my-path-b');
-  await expect(page.getByTestId('base-config')).toBeAttached();
-  const body = (await result.body()).toString();
-  expect(body).toContain('<!-- static -->');
-});
-
-test('dynamic inner paths with config in the component - path d', async ({ page }) => {
-  const result = await page.goto(url + '/my-path-a2/my-path-b2/my-path-c2/2');
-  await expect(page.getByTestId('path-d-data')).toHaveText('qui est esse');
-  await expect(page.getByTestId('path-d-patha')).toHaveText('my-path-a2');
-  await expect(page.getByTestId('path-d-pathb')).toHaveText('my-path-b2');
-  await expect(page.getByTestId('path-d-pathc')).toHaveText('my-path-c2');
-  await expect(page.getByTestId('base-config')).toBeAttached();
-  const body = (await result.body()).toString();
-  expect(body).toContain('<!-- static -->');
-});
-
-test('static paths exist for dynamic page', async () => {
-  expect(fs.existsSync(path.join(config.distDir, './pages/my-path-a2/my-path-b2/my-path-c2/2/index.html'))).toEqual(true);
-});
-
-test('boolean static path', async ({ page }) => {
-  const result = await page.goto(url + '/boolean-static-path');
-  const body = (await result.body()).toString();
-  expect(body).toContain('<!-- static -->');
-
-  expect(fs.existsSync(path.join(config.distDir, './pages/boolean-static-path/index.html'))).toEqual(true);
-});
-
-test('inner static path override', async ({ page }) => {
-  expect(fs.existsSync(path.join(config.distDir, './pages/base-static-path/index.html'))).toEqual(true);
-  expect(fs.existsSync(path.join(config.distDir, './pages/base-static-path/non-static-path/index.html'))).toEqual(false);
-
-  const staticResult = await page.goto(url + '/base-static-path');
-  await expect(page.getByTestId('base-static-path')).toHaveText('My title');
-  const staticBody = (await staticResult.body()).toString();
-  expect(staticBody).toContain('<!-- static -->');
-
-  const nonStaticResult = await page.goto(url + '/base-static-path/non-static-path');
-  await expect(page.getByTestId('non-static-path')).toHaveText('My title');
-  const nonStaticBody = (await nonStaticResult.body()).toString();
-  expect(nonStaticBody).not.toContain('<!-- static -->');
-});

package/tests/e2e/spa.spec.ts

@@ -1,23 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { url } from '../playwright.config';
-
-
-test('sticky nav creates request for page contents and does not reload page', async ({ page }) => {
-  await page.goto(url);
-  const link = page.getByTestId('navbar-boolean-static-path');
-  const navbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
-  await link.click();
-  await page.waitForURL('**/boolean-static-path');
-  const newNavbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
-  expect(navbarNow).toEqual(newNavbarNow);
-});
-
-test('non-spa request for page contents reloads page', async ({ page }) => {
-  await page.goto(url);
-  const link = page.getByTestId('navbar-non-static-path-non-spa');
-  const navbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
-  await link.click();
-  await page.waitForURL('**/base-static-path/non-static-path');
-  const newNavbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
-  expect(navbarNow).not.toEqual(newNavbarNow);
-});