xpine 0.0.58 → 0.0.60

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

@@ -328,6 +328,9 @@ var regex_default = {
   configFile: /\+config\.[tj]sx?/g,
   dynamicRoutes: /(\[)(.*?)(\])/g,
   isDynamicRoute: /\[(.*)\]/g,
+  // Multi-segment (slash-containing) dynamic route, e.g. [...slug]
+  spreadRoute: /\[\.\.\.(.*?)\]/g,
+  isSpreadRoute: /\[\.\.\..*?\]/,
   endsWithTSX: /\.tsx$/,
   endsWithJSX: /\.jsx$/,
   endsWithJs: /\.js$/,
@@ -898,7 +901,7 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
 function determineOutputPathForStaticPath(builtComponentPath, componentDynamicPaths) {
   if (componentDynamicPaths?.length) {
     return componentDynamicPaths.reduce((total, current) => {
-      return total.replace(`/[${current}]`, "");
+      return total.replace(`/[...${current}]`, "").replace(`/[${current}]`, "");
     }, path5.dirname(builtComponentPath));
   } else {
     if (builtComponentPath?.match(regex_default.endsWithIndex)) {
@@ -914,7 +917,8 @@ function getComponentDynamicPaths(componentPath) {
   if (!matches?.length) return null;
   const output = [];
   for (const match of matches) {
-    output.push(match[2]);
+    if (!match[2]) continue;
+    output.push(match[2].replace(/^\.\.\./, ""));
   }
   return output;
 }
@@ -1096,9 +1100,9 @@ async function runDevServer() {
   });
 }
 function asyncServerClose(server) {
-  return new Promise((resolve, reject) => {
-    server.close();
-    resolve(true);
+  return new Promise((resolve) => {
+    server.close(() => resolve(true));
+    server.closeAllConnections?.();
   });
 }
 function createRebuildEmitter(delay = 500) {
@@ -1106,24 +1110,14 @@ function createRebuildEmitter(delay = 500) {
   }
   ;
   const rebuildEmitter = new RebuildEmitter();
-  let start = 0;
-  let hasEmitted = false;
+  let timeout = null;
   rebuildEmitter.on("rebuild-server", () => {
-    hasEmitted = false;
-    trigger();
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      timeout = null;
+      rebuildEmitter.emit("done");
+    }, delay);
   });
-  function trigger() {
-    start = Date.now();
-    const interval = setInterval(() => {
-      if (hasEmitted) return;
-      const now = Date.now();
-      if (now - start >= delay) {
-        rebuildEmitter.emit("done");
-        clearInterval(interval);
-        hasEmitted = true;
-      }
-    }, 100);
-  }
   return rebuildEmitter;
 }
 

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

@@ -1,6 +1,14 @@
+export declare class RawHtml {
+    value: string;
+    constructor(value: string);
+    toString(): string;
+}
+export declare function escapeHtml(value: unknown): string;
+export declare function raw(value: string): RawHtml;
 export declare class html {
+    static raw: typeof raw;
     static attributeObjectToString(props: any): string;
-    static fragment(props: any): Promise<string>;
+    static fragment(props: any): Promise<RawHtml>;
     static createElement(type: any, props: any, ...children: any[]): Promise<any>;
 }
 export declare function JSXRuntime(): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/util/html.ts"],"names":[],"mappings":"AAAA,qBAAa,IAAI;IAEf,MAAM,CAAC,uBAAuB,CAAC,KAAK,KAAA;WAWvB,QAAQ,CAAC,KAAK,KAAA;WAKd,aAAa,CAAC,IAAI,KAAA,EAAE,KAAK,KAAA,EAAE,GAAG,QAAQ,OAAA;CASpD;AAED,wBAAgB,UAAU,YAEzB"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/util/html.ts"],"names":[],"mappings":"AAGA,qBAAa,OAAO;IACC,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;IAChC,QAAQ;CACT;AAKD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOjD;AAID,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE1C;AAUD,qBAAa,IAAI;IACf,MAAM,CAAC,GAAG,aAAO;IAEjB,MAAM,CAAC,uBAAuB,CAAC,KAAK,KAAA;WAYvB,QAAQ,CAAC,KAAK,KAAA;WAKd,aAAa,CAAC,IAAI,KAAA,EAAE,KAAK,KAAA,EAAE,GAAG,QAAQ,OAAA;CAWpD;AAED,wBAAgB,UAAU,YAEzB"}

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

@@ -4,6 +4,8 @@ declare const _default: {
     configFile: RegExp;
     dynamicRoutes: RegExp;
     isDynamicRoute: RegExp;
+    spreadRoute: RegExp;
+    isSpreadRoute: RegExp;
     endsWithTSX: RegExp;
     endsWithJSX: RegExp;
     endsWithJs: RegExp;

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

@@ -1 +1 @@
-{"version":3,"file":"regex.d.ts","sourceRoot":"","sources":["../../../src/util/regex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,wBAiBE"}
+{"version":3,"file":"regex.d.ts","sourceRoot":"","sources":["../../../src/util/regex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wBAoBE"}

package/dist/types.d.ts

@@ -21,10 +21,13 @@ export type WrapperProps = {
 export type ConfigFile = {
     staticPaths?: boolean | (() => Promise<{
         [key: string]: string;
-    }[]>);
+    }[]> | {
+        [key: string]: string;
+    }[]);
     wrapper?: (props: WrapperProps) => Promise<any>;
     data?: (req: ServerRequest) => Promise<any>;
     routeMiddleware?: (req: ServerRequest, res: Response, next: NextFunction) => void;
+    isValid?: (slug: string, req: ServerRequest) => boolean | Promise<boolean>;
 };
 export type PageProps = {
     req: ServerRequest;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,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;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,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;IAC5C,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CACnF,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;CACnB,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,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;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,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,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACnG,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;IAC5C,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAIlF,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5E,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;CACnB,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/eslint.config.mjs

@@ -22,6 +22,6 @@ export default tseslint.config(
     files: ["src/**/*.{js,mjs,ts,tsx,jsx}"],
   },
   {
-    ignores: ["dist/", "cdk.out/", "tests/dist/", "tests/playwright-report/"]
+    ignores: ["dist/", "cdk.out/", "tests/dist/", "tests/playwright-report/", "create-xpine-app/"]
   }
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",

package/types.ts

@@ -24,10 +24,14 @@ export type WrapperProps = {
 }
 
 export type ConfigFile = {
-  staticPaths?: boolean | (() => Promise<{ [key: string]: string }[]>);
+  staticPaths?: boolean | (() => Promise<{ [key: string]: string }[]> | { [key: string]: string }[]);
   wrapper?: (props: WrapperProps) => Promise<any>;
   data?: (req: ServerRequest) => Promise<any>;
   routeMiddleware?: (req: ServerRequest, res: Response, next: NextFunction) => void;
+  // For multi-segment dynamic routes ([...slug]): validate a slug that was not
+  // generated at build time so it can be resolved safely at request time.
+  // Return false (the default for unknown slugs) to fall through to the 404 handler.
+  isValid?: (slug: string, req: ServerRequest) => boolean | Promise<boolean>;
 }
 
 export type PageProps = {