xpine 0.0.6 → 0.0.7

package/README.md

@@ -14,9 +14,7 @@ export default {}
 
 ### Build
 
-`import { buildApp } from 'xpine';`
-
-- Used for building production app
+`xpine-build`
 
 ## Auth
 
@@ -24,7 +22,7 @@ export default {}
 
 ## Dev server
 
-`import { runDevServer } from 'xpine';`
+`xpine-dev`
 
 ## Config
 
@@ -36,4 +34,26 @@ export default {}
 
 ## Router
 
-`import { createXPineRouter } from 'xpine';`
+`import { createXPineRouter } from 'xpine';`
+
+
+### SPA interactivity
+
+- data-spa="true"
+  - transforms link into client side URL update
+- data-persistent="id"
+  - makes element persistent across pages that include the same persistent data-persistent tag
+- data-spa-crossorigin="true"
+  - enables cross-origin spa navigation requests (untested)
+
+#### Custom events
+  - spa:updatePageContent
+    - sent when the page content has update
+  - spa:updatePageURL
+    - send when the page URL has update
+
+#### Custom scripts for certain pages
+
+1. Add script to src/public/scripts/pages/your_script.ts
+2. Import script into page HTML (e.g. <script src="/scripts/pages/your_script.ts">)
+3. To unload event listeners, use `window.addEventListener('spa:updatePageURL', () => { remove event listeners here})` in the code

package/TODO

@@ -1,2 +1 @@
-- npx create-xpine-app
-- xpine-dev
+- npx create-xpine-app

package/dist/lib/index.d.ts

@@ -0,0 +1,8 @@
+export * from './src/runDevServer.ts';
+export * from './src/express.ts';
+export * from './src/util/env.ts';
+export * from './src/util/get-config.ts';
+export * from './src/scripts/build.ts';
+export * from './src/auth.ts';
+export * from './src/util/html.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/dist/lib/types.d.ts

@@ -0,0 +1,12 @@
+import { Request } from 'express';
+export type XPineConfig = {
+    [key: string]: string;
+};
+export type TokenUser = {
+    email?: string;
+    username?: string;
+};
+export type ServerRequest = Request & {
+    user?: TokenUser;
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,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;CAClB,CAAA"}

package/index.ts

@@ -1,7 +1,7 @@
-export * from './src/runDevServer';
-export * from './src/express';
-export * from './src/util/env';
-export * from './src/util/get-config';
-export * from './src/scripts/build';
+export * from './src/runDevServer.ts';
+export * from './src/express.ts';
+export * from './src/util/env.ts';
+export * from './src/util/get-config.ts';
+export * from './src/scripts/build.ts';
 export * from './src/auth.ts';
-export * from './src/util/html';
+export * from './src/util/html.ts';

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "xpine",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "dist/index.js",
   "dependencies": {
+    "@aws-sdk/client-secrets-manager": "^3.758.0",
     "@tailwindcss/postcss": "^4.0.8",
     "builtin-modules": "^4.0.0",
     "chokidar": "^4.0.3",
@@ -19,13 +20,19 @@
     "tsx": "^4.19.3",
     "typescript": "^5.7.3"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/dan-caldwell/xpine.git"
+  },
   "scripts": {
-    "build": "tsx ./src/scripts/build-module.ts"
+    "build": "tsx ./src/scripts/build-module.ts && npm run build:types",
+    "build:types": "npx tsc --declaration index.ts --declarationDir dist/lib --emitDeclarationOnly --declarationMap --skipLibCheck --esModuleInterop --allowImportingTsExtensions --target esnext --moduleResolution NodeNext --module NodeNext"
   },
   "bin": {
     "xpine-build": "dist/src/scripts/xpine-build.js",
     "xpine-dev": "dist/src/scripts/xpine-dev.js"
   },
+  "types": "dist/lib/index.d.ts",
   "type": "module",
   "devDependencies": {
     "@types/express": "^5.0.0",

package/tsconfig.json

@@ -21,29 +21,24 @@
     "isolatedModules": true,
     "jsxImportSource": "xpine",
     "incremental": true,
-    "allowImportingTsExtensions": true
+    "allowImportingTsExtensions": true,
+    // Generate d.ts files
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "dist",
+    "declarationMap": true,
+    "types": []
   },
   "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    "postcss.config.mjs",
-    "tailwind.config.js",
-    "eslint.config.mjs",
-    "index.ts",
-    "src/runDevServer.ts",
-    "src/express.ts",
-    "src/scripts/build.ts",
-    "src/auth.ts",
-    "src/util/require.ts",
-    "src/util/get-config.ts",
-    "src/util/env.ts",
-    "src/scripts/xpine-dev.ts",
-    "src/scripts/xpine-build.ts",
-    "src/build/typescript-builder.ts"
+    "src/**/*.ts",
+    "index.ts"
   ],
   "exclude": [
     "node_modules",
-    "dist-frontend",
+    "./node_modules",
+    "./node_modules/*",
+    "./node_modules/@types/node/index.d.ts",
+    "dist",
     "**/*.js"
   ],
 }

package/types.d.ts

@@ -0,0 +1,11 @@
+import { Request } from 'express';
+export type XPineConfig = {
+    [key: string]: string;
+};
+export type TokenUser = {
+    email?: string;
+    username?: string;
+};
+export type ServerRequest = Request & {
+    user?: TokenUser;
+};

package/dist/src/build/dev-server.js

@@ -1,10 +0,0 @@
-// src/build/dev-server.mjs
-var socketProtocol = "ws:";
-var echoSocketUrl = socketProtocol + "//" + window.location.hostname + ":3001/dev-server/";
-var socket = new WebSocket(echoSocketUrl);
-socket.addEventListener("message", async (msg) => {
-  if (msg.data === "refresh:client") {
-    window.location.reload();
-  }
-});
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2J1aWxkL2Rldi1zZXJ2ZXIubWpzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBzb2NrZXRQcm90b2NvbCA9ICd3czonO1xuY29uc3QgZWNob1NvY2tldFVybCA9IHNvY2tldFByb3RvY29sICsgJy8vJyArIHdpbmRvdy5sb2NhdGlvbi5ob3N0bmFtZSArICc6MzAwMS9kZXYtc2VydmVyLyc7XG5jb25zdCBzb2NrZXQgPSBuZXcgV2ViU29ja2V0KGVjaG9Tb2NrZXRVcmwpO1xuXG5zb2NrZXQuYWRkRXZlbnRMaXN0ZW5lcignbWVzc2FnZScsIGFzeW5jIChtc2cpID0+IHtcbiAgaWYgKG1zZy5kYXRhID09PSAncmVmcmVzaDpjbGllbnQnKSB7XG4gICAgd2luZG93LmxvY2F0aW9uLnJlbG9hZCgpO1xuICB9XG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBQSxJQUFNLGlCQUFpQjtBQUN2QixJQUFNLGdCQUFnQixpQkFBaUIsT0FBTyxPQUFPLFNBQVMsV0FBVztBQUN6RSxJQUFNLFNBQVMsSUFBSSxVQUFVLGFBQWE7QUFFMUMsT0FBTyxpQkFBaUIsV0FBVyxPQUFPLFFBQVE7QUFDaEQsTUFBSSxJQUFJLFNBQVMsa0JBQWtCO0FBQ2pDLFdBQU8sU0FBUyxPQUFPO0FBQUEsRUFDekI7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/src/build/spa.js

@@ -1,152 +0,0 @@
-// src/build/spa.mjs
-async function replaceDocumentContentsWithLinkResponse() {
-  const links = [...document.querySelectorAll("[data-spa]")];
-  for (const link of links) {
-    link.addEventListener("click", updatePageOnLinkClick);
-  }
-}
-async function updatePageOnLinkClick(e) {
-  const targetHref = e?.target?.getAttribute("href");
-  if (!targetHref) return;
-  if (isExternalURL(targetHref) && !e?.target?.getAttribute("data-spa-crossorigin")) return;
-  e.preventDefault();
-  try {
-    await getNewPageContent(targetHref);
-    if (targetHref === window.location.pathname) return;
-    window.history.pushState(
-      {
-        type: "link-click",
-        targetHref
-      },
-      "",
-      targetHref
-    );
-    const event = new CustomEvent("spa:updatePageURL", {
-      detail: {
-        href: targetHref
-      }
-    });
-    window.dispatchEvent(event);
-  } catch (err) {
-    console.error(err);
-  }
-}
-async function getNewPageContent(href) {
-  try {
-    const res = await fetch(href);
-    const text = await res.text();
-    const parser = new DOMParser();
-    const dom = parser.parseFromString(text, "text/html");
-    diffHead(dom);
-    const newScripts = removeBodyScripts(dom);
-    const clonedPersistentNodes = getPersistentNodesFromDocument(dom);
-    const body = dom.body.innerHTML;
-    document.body.innerHTML = body;
-    for (const clonedNode of clonedPersistentNodes) {
-      const newNode = document.body.querySelector(`[data-persistent="${clonedNode?.getAttribute("data-persistent")}"]`);
-      newNode.replaceWith(clonedNode);
-    }
-    replaceAttributesOnDocumentBody(dom);
-    replaceDocumentContentsWithLinkResponse();
-    for (const script of newScripts) document.body.appendChild(script);
-    const event = new CustomEvent("spa:updatePageContent", {
-      detail: {
-        href
-      }
-    });
-    window.dispatchEvent(event);
-  } catch (err) {
-    console.error(err);
-    console.error("Error getting link", href);
-  }
-}
-function diffHead(dom) {
-  const domHeadChildren = [...dom.head.children];
-  const currentHeadChildren = [...document.head.children];
-  const result = {
-    childrenToAdd: [],
-    childrenToRemove: []
-  };
-  for (const domChild of domHeadChildren) {
-    const foundInCurrentChildren = currentHeadChildren.find((child) => child.outerHTML === domChild.outerHTML);
-    if (!foundInCurrentChildren) result.childrenToAdd.push(domChild);
-  }
-  for (const currentChild of currentHeadChildren) {
-    const foundInDomChildren = domHeadChildren.find((child) => child.outerHTML === currentChild.outerHTML);
-    if (!foundInDomChildren) result.childrenToRemove.push(currentChild);
-  }
-  applyHeadDiffsToDocument(result);
-}
-function applyHeadDiffsToDocument(diff) {
-  for (const child of diff.childrenToRemove) {
-    document.head.removeChild(child);
-  }
-  for (const child of diff.childrenToAdd) {
-    if (child?.nodeName?.toLowerCase() == "script") {
-      const scriptElement = document.createElement("script");
-      portAttributesToElement(child, scriptElement);
-      scriptElement.innerHTML = child.innerHTML;
-      document.head.appendChild(scriptElement);
-      continue;
-    }
-    document.head.appendChild(child);
-  }
-}
-function removeBodyScripts(dom) {
-  const scripts = [...dom.body.querySelectorAll("script")];
-  const newElements = [];
-  for (const script of scripts) {
-    const element = document.createElement("script");
-    portAttributesToElement(script, element);
-    element.innerHTML = script.innerHTML;
-    dom.body.removeChild(script);
-    newElements.push(element);
-  }
-  return newElements;
-}
-function portAttributesToElement(oldEl, newEl) {
-  for (const attribute of oldEl.attributes) {
-    newEl.setAttribute(attribute.name, attribute.nodeValue);
-  }
-}
-function getPersistentNodesFromDocument(dom) {
-  const persistentNodesFromDom = [...dom.querySelectorAll("[data-persistent]")].map((el) => el.getAttribute("data-persistent"));
-  const persistentNodesFromBody = [...document.body.querySelectorAll("[data-persistent]")];
-  const validPersistentNodes = persistentNodesFromBody.filter((el) => {
-    return persistentNodesFromDom.includes(el.getAttribute("data-persistent"));
-  });
-  return validPersistentNodes.map((el) => el.cloneNode(true));
-}
-function replaceAttributesOnDocumentBody(dom) {
-  while (document.body.attributes.length > 0) {
-    document.body.removeAttribute(document.body.attributes[0].name);
-  }
-  for (const attribute of dom.body.attributes) {
-    document.body.setAttribute(attribute.name, attribute.nodeValue);
-  }
-}
-async function handleBackButton() {
-  await getNewPageContent(window.history.state?.targetHref || window.location.href);
-}
-function isRelativeURL(url) {
-  if (typeof url !== "string") return false;
-  try {
-    new URL(url);
-    return false;
-  } catch (err) {
-    if (url?.startsWith("//")) return false;
-    return true;
-  }
-}
-function isExternalURL(url) {
-  if (isRelativeURL(url)) return false;
-  try {
-    const computedURL = new URL(url);
-    return computedURL?.origin !== window.location?.origin;
-  } catch {
-    return false;
-  }
-}
-window.addEventListener("DOMContentLoaded", replaceDocumentContentsWithLinkResponse);
-window.addEventListener("popstate", handleBackButton);
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/build/spa.mjs"],
  "sourcesContent": ["// Enables SPA like behavior for links\n\nasync function replaceDocumentContentsWithLinkResponse() {\n  const links = [...document.querySelectorAll('[data-spa]')];\n  for (const link of links) {\n    link.addEventListener('click', updatePageOnLinkClick);\n  }\n\n}\n\nasync function updatePageOnLinkClick(e) {\n  const targetHref = e?.target?.getAttribute('href');\n  if (!targetHref) return;\n  if (isExternalURL(targetHref) && !e?.target?.getAttribute('data-spa-crossorigin')) return;\n  e.preventDefault();\n  try {\n    await getNewPageContent(targetHref);\n    if (targetHref === window.location.pathname) return;\n    window.history.pushState(\n      {\n        type: 'link-click',\n        targetHref,\n      },\n      '',\n      targetHref\n    );\n    const event = new CustomEvent('spa:updatePageURL', {\n      detail: {\n        href: targetHref,\n      },\n    });\n    window.dispatchEvent(event);\n  } catch (err) {\n    console.error(err);\n  }\n}\n\nasync function getNewPageContent(href) {\n  try {\n    const res = await fetch(href);\n    const text = await res.text();\n    const parser = new DOMParser();\n    const dom = parser.parseFromString(text, 'text/html');\n    diffHead(dom);\n    const newScripts = removeBodyScripts(dom);\n    const clonedPersistentNodes = getPersistentNodesFromDocument(dom);\n    const body = dom.body.innerHTML;\n    document.body.innerHTML = body;\n    for (const clonedNode of clonedPersistentNodes) {\n      // @ts-ignore\n      const newNode = document.body.querySelector(`[data-persistent=\"${clonedNode?.getAttribute('data-persistent')}\"]`);\n      newNode.replaceWith(clonedNode);\n    }\n    replaceAttributesOnDocumentBody(dom);\n    replaceDocumentContentsWithLinkResponse();\n    for (const script of newScripts) document.body.appendChild(script);\n    // Send an event\n    const event = new CustomEvent('spa:updatePageContent', {\n      detail: {\n        href,\n      },\n    });\n    window.dispatchEvent(event);\n  } catch (err) {\n    console.error(err);\n    console.error('Error getting link', href);\n  }\n}\n\nfunction diffHead(dom) {\n  const domHeadChildren = [...dom.head.children];\n  const currentHeadChildren = [...document.head.children];\n  const result = {\n    childrenToAdd: [],\n    childrenToRemove: [],\n  };\n  for (const domChild of domHeadChildren) {\n    const foundInCurrentChildren = currentHeadChildren.find(child => child.outerHTML === domChild.outerHTML);\n    if (!foundInCurrentChildren) result.childrenToAdd.push(domChild);\n  }\n  for (const currentChild of currentHeadChildren) {\n    const foundInDomChildren = domHeadChildren.find(child => child.outerHTML === currentChild.outerHTML);\n    if (!foundInDomChildren) result.childrenToRemove.push(currentChild);\n  }\n  applyHeadDiffsToDocument(result);\n}\n\nfunction applyHeadDiffsToDocument(diff) {\n  for (const child of diff.childrenToRemove) {\n    // Remove from head\n    document.head.removeChild(child);\n  }\n  for (const child of diff.childrenToAdd) {\n    // Handle script tags\n    if (child?.nodeName?.toLowerCase() == 'script') {\n      const scriptElement = document.createElement('script');\n      portAttributesToElement(child, scriptElement);\n      scriptElement.innerHTML = child.innerHTML;\n      document.head.appendChild(scriptElement);\n      continue;\n    }\n    // Add to the head\n    document.head.appendChild(child);\n  }\n}\n\nfunction removeBodyScripts(dom) {\n  const scripts = [...dom.body.querySelectorAll('script')];\n  const newElements = [];\n  for (const script of scripts) {\n    const element = document.createElement('script');\n    portAttributesToElement(script, element);\n    element.innerHTML = script.innerHTML;\n    dom.body.removeChild(script);\n    newElements.push(element);\n  }\n  return newElements;\n}\n\nfunction portAttributesToElement(oldEl, newEl) {\n  for (const attribute of oldEl.attributes) {\n    newEl.setAttribute(attribute.name, attribute.nodeValue);\n  }\n}\n\nfunction getPersistentNodesFromDocument(dom) {\n  // Find persistent nodes\n  const persistentNodesFromDom = [...dom.querySelectorAll('[data-persistent]')].map(el => el.getAttribute('data-persistent'));\n  const persistentNodesFromBody = [...document.body.querySelectorAll('[data-persistent]')];\n  // Cross match the persistent nodes between current page and new page to find valid ones\n  const validPersistentNodes = persistentNodesFromBody.filter(el => {\n    return persistentNodesFromDom.includes(el.getAttribute('data-persistent'));\n  });\n  // Clone\n  return validPersistentNodes.map(el => el.cloneNode(true));\n}\n\nfunction replaceAttributesOnDocumentBody(dom) {\n  while (document.body.attributes.length > 0) {\n    document.body.removeAttribute(document.body.attributes[0].name);\n  }\n  // Set attributes on the body\n  for (const attribute of dom.body.attributes) {\n    document.body.setAttribute(attribute.name, attribute.nodeValue);\n  }\n}\n\nasync function handleBackButton() {\n  await getNewPageContent(window.history.state?.targetHref || window.location.href);\n}\n\nfunction isRelativeURL(url) {\n  if (typeof url !== 'string') return false;\n  try {\n    new URL(url);\n    return false;\n  } catch (err) {\n    if (url?.startsWith('//')) return false;\n    return true;\n  }\n}\n\nfunction isExternalURL(url) {\n  if (isRelativeURL(url)) return false;\n  try {\n    const computedURL = new URL(url);\n    return computedURL?.origin !== window.location?.origin;\n  } catch {\n    return false; // Not a URL\n  }\n}\n\nwindow.addEventListener('DOMContentLoaded', replaceDocumentContentsWithLinkResponse);\nwindow.addEventListener('popstate', handleBackButton);\n\n"],
  "mappings": "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",
  "names": []
}
