nextpress-core 1.1.0 → 2.0.0

package/{dist/template-heirarchy/archive/posttypearchive.js → lib/template-heirarchy/archive/posttypearchive.tsx}

@@ -1,7 +1,9 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { ArchiveMetadata, ArchiveTemplate } from "./archive";
-import { capitalizeFirstLetter } from "@/services/utilities/capitalise-first-letter";
+import { capitalizeFirstLetter } from "nextpress/services/utilities/capitalise-first-letter";
+
 /**
  * Loads the metadata for a Post Type Archive template based on the given post type.
  * Fallback: Archive
@@ -10,10 +12,11 @@ import { capitalizeFirstLetter } from "@/services/utilities/capitalise-first-let
  * @param {string} props.postType - The post type to load the metadata for.
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function PostTypeArchiveMetadata({ postType }) {
+export async function PostTypeArchiveMetadata({postType}: {postType: string}): Promise<Metadata> {
     const metadata = await loadMetadata(capitalizeFirstLetter(postType));
-    return Object.assign(Object.assign({}, (await ArchiveMetadata())), metadata);
+    return {...(await ArchiveMetadata()), ...metadata};
 }
+
 /**
  * Renders a Post Type Archive template. Falls back to the Archive template if not found.
  * Fallback: Archive
@@ -22,9 +25,9 @@ export async function PostTypeArchiveMetadata({ postType }) {
  * @param {string} props.postType - The post type to load the template for.
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function PostTypeArchiveTemplate({ postType }) {
+export async function PostTypeArchiveTemplate({postType}: {postType: string}): Promise<JSX.Element> {
     const PostTypeArchive = await loadTemplate(capitalizeFirstLetter(postType));
-    if (!PostTypeArchive)
-        return _jsx(ArchiveTemplate, {});
-    return _jsx(PostTypeArchive, {});
+    if (!PostTypeArchive) return <ArchiveTemplate/>
+
+    return <PostTypeArchive/>;
 }

package/{dist/template-heirarchy/archive/tag.js → lib/template-heirarchy/archive/tag.tsx}

@@ -1,25 +1,30 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { ArchiveMetadata, ArchiveTemplate } from "./archive";
+
 /**
  * Loads the metadata for the Tag template.
  * Fallback: Archive
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function TagMetadata() {
+export async function TagMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Tag');
-    return Object.assign(Object.assign({}, (await ArchiveMetadata())), metadata);
+    return {...(await ArchiveMetadata()), ...metadata};
 }
+
 /**
  * Renders the Tag template. Falls back to the Archive template if not found.
  * Fallback: Archive
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function TagTemplate() {
+export async function TagTemplate(): Promise<JSX.Element> {
     const Category = await loadTemplate('Tag');
-    if (!Category)
-        return _jsx(ArchiveTemplate, {});
-    return _jsx(Category, {});
+    if (!Category) return <ArchiveTemplate/>
+
+    return <Category/>;
 }
+
+

package/{dist/template-heirarchy/archive/taxonomy.js → lib/template-heirarchy/archive/taxonomy.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { ArchiveMetadata, ArchiveTemplate } from "./archive";
+
 /**
  * Loads the metadata for the Taxonomy template.
  * Fallback: Archive
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function TaxonomyMetadata() {
+export async function TaxonomyMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Taxonomy');
-    return Object.assign(Object.assign({}, (await ArchiveMetadata())), metadata);
+    return {...(await ArchiveMetadata()), ...metadata};
 }
+
 /**
  * Renders the Taxonomy template. Falls back to the Archive template if not found.
  * Fallback: Archive
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function TaxonomyTemplate() {
+export async function TaxonomyTemplate(): Promise<JSX.Element> {
     const Taxonomy = await loadTemplate('Taxonomy');
-    if (!Taxonomy)
-        return _jsx(ArchiveTemplate, {});
-    return _jsx(Taxonomy, {});
+    if (!Taxonomy) return <ArchiveTemplate/>
+
+    return <Taxonomy/>;
 }

package/{dist/template-heirarchy/home/home.js → lib/template-heirarchy/home/home.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { IndexMetadata, IndexTemplate } from "..";
+
 /**
  * Loads the metadata for the Home template.
  * Fallback: Index
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function HomeMetadata() {
+export async function HomeMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Home');
-    return Object.assign(Object.assign({}, (await IndexMetadata())), metadata);
+    return {...(await IndexMetadata()), ...metadata};
 }
+
 /**
  * Renders the Home template. Falls back to the Index template if not found.
  * Fallback: Index
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function HomeTemplate() {
+export async function HomeTemplate(): Promise<JSX.Element> {
     const Home = await loadTemplate('Home');
-    if (!Home)
-        return _jsx(IndexTemplate, {});
-    return _jsx(Home, {});
+    if (!Home) return <IndexTemplate/>
+
+    return <Home/>;
 }

package/{dist/template-heirarchy/index.js → lib/template-heirarchy/index.tsx}

@@ -1,15 +1,18 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "./_autoloader/template-autoloader";
+
 /**
  * Loads the metadata for the Index template.
  * Fallback: None
  *
  * @returns {Promise<Metadata>} The loaded metadata object.
  */
-export async function IndexMetadata() {
+export async function IndexMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Index');
-    return metadata !== null && metadata !== void 0 ? metadata : {};
+    return metadata ?? {};
 }
+
 /**
  * Renders the Index template.
  * Fallback: None
@@ -17,10 +20,11 @@ export async function IndexMetadata() {
  * @throws {Error} Throws if the Index template cannot be found in the _templates directory.
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function IndexTemplate() {
+export async function IndexTemplate(): Promise<JSX.Element> {
     const Index = await loadTemplate('Index');
     if (!Index) {
         throw new Error('Nextpress needs an index.tsx file in the template heirarchy in the _templates directory to function');
     }
-    return _jsx(Index, {});
+
+    return <Index/>;
 }

package/{dist/template-heirarchy/not-found.tsx/not-found.js → lib/template-heirarchy/not-found.tsx/not-found.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { IndexMetadata, IndexTemplate } from "..";
+
 /**
  * Loads the metadata for the NotFound template.
  * Fallback: Index
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function NotFoundMetadata() {
+export async function NotFoundMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('NotFound');
-    return Object.assign(Object.assign({}, (await IndexMetadata())), metadata);
+    return {...(await IndexMetadata()), ...metadata};
 }
+
 /**
  * Renders the NotFound template. Falls back to the Index template if not found.
  * Fallback: Index
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function NotFoundTemplate() {
+export async function NotFoundTemplate(): Promise<JSX.Element> {
     const NotFound = await loadTemplate('NotFound');
-    if (!NotFound)
-        return _jsx(IndexTemplate, {});
-    return _jsx(NotFound, {});
+    if (!NotFound) return <IndexTemplate/>
+
+    return <NotFound/>;
 }

package/{dist/template-heirarchy/page/page.js → lib/template-heirarchy/page/page.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { SingularMetadata, SingularTemplate } from "./singular";
+
 /**
  * Loads the metadata for the Page template.
  * Fallback: Singular
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function PageMetadata() {
+export async function PageMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Page');
-    return Object.assign(Object.assign({}, (await SingularMetadata())), metadata);
+    return {...(await SingularMetadata()), ...metadata};
 }
+
 /**
  * Renders the Page template. Falls back to the Singular template if not found.
  * Fallback: Singular
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function PageTemplate() {
+export async function PageTemplate(): Promise<JSX.Element> {
     const Page = await loadTemplate('Page');
-    if (!Page)
-        return _jsx(SingularTemplate, {});
-    return _jsx(Page, {});
+    if (!Page) return <SingularTemplate/>
+
+    return <Page/>;
 }

package/{dist/template-heirarchy/page/posttype.js → lib/template-heirarchy/page/posttype.tsx}

@@ -1,7 +1,9 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { SingularMetadata, SingularTemplate } from "./singular";
-import { capitalizeFirstLetter } from "@/services/utilities/capitalise-first-letter";
+import { capitalizeFirstLetter } from "nextpress/services/utilities/capitalise-first-letter";
+
 /**
  * Loads the metadata for a Post Type template based on the provided post type string.
  * Fallback: Singular
@@ -10,10 +12,11 @@ import { capitalizeFirstLetter } from "@/services/utilities/capitalise-first-let
  * @param {string} props.postType - The post type to load metadata for.
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function PostTypeMetadata({ postType }) {
+export async function PostTypeMetadata({postType}: {postType: string}): Promise<Metadata> {
     const metadata = await loadMetadata(capitalizeFirstLetter(postType));
-    return Object.assign(Object.assign({}, (await SingularMetadata())), metadata);
+    return {...(await SingularMetadata()), ...metadata};
 }
+
 /**
  * Renders a Post Type template based on the provided post type string. Falls back to Singular template if not found.
  * Fallback: Singular
@@ -22,9 +25,10 @@ export async function PostTypeMetadata({ postType }) {
  * @param {string} props.postType - The post type to load the template for.
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function PostTypeTemplate({ postType }) {
+export async function PostTypeTemplate({postType}: {postType: string}): Promise<JSX.Element> {
     const PostType = await loadTemplate(capitalizeFirstLetter(postType));
-    if (!PostType)
-        return _jsx(SingularTemplate, {});
-    return _jsx(PostType, {});
+    if (!PostType) return <SingularTemplate/>
+
+    return <PostType/>;
 }
+

package/{dist/template-heirarchy/page/single.js → lib/template-heirarchy/page/single.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { SingularMetadata, SingularTemplate } from "./singular";
+
 /**
  * Loads the metadata for the Single template.
  * Fallback: Singular
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function SingleMetadata() {
+export async function SingleMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Single');
-    return Object.assign(Object.assign({}, (await SingularMetadata())), metadata);
+    return {...(await SingularMetadata()), ...metadata};
 }
+
 /**
  * Renders the Single template. Falls back to the Singular template if not found.
  * Fallback: Singular
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function SingleTemplate() {
+export async function SingleTemplate(): Promise<JSX.Element> {
     const Single = await loadTemplate('Single');
-    if (!Single)
-        return _jsx(SingularTemplate, {});
-    return _jsx(Single, {});
+    if (!Single) return <SingularTemplate/>
+
+    return <Single/>;
 }

package/{dist/template-heirarchy/page/singular.js → lib/template-heirarchy/page/singular.tsx}

@@ -1,25 +1,28 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Metadata } from "next";
+import { JSX } from "react";
 import { loadMetadata, loadTemplate } from "../_autoloader/template-autoloader";
 import { IndexMetadata, IndexTemplate } from "..";
+
 /**
  * Loads the metadata for the Singular template.
  * Fallback: Index
  *
  * @returns {Promise<Metadata>} The merged metadata object.
  */
-export async function SingularMetadata() {
+export async function SingularMetadata(): Promise<Metadata> {
     const metadata = await loadMetadata('Singular');
-    return Object.assign(Object.assign({}, (await IndexMetadata())), metadata);
+    return {...(await IndexMetadata()), ...metadata}
 }
+
 /**
  * Renders the Singular template. Falls back to the Index template if not found.
  * Fallback: Index
  *
  * @returns {Promise<JSX.Element>} The rendered template component.
  */
-export async function SingularTemplate() {
+export async function SingularTemplate(): Promise<JSX.Element> {
     const Singular = await loadTemplate('Singular');
-    if (!Singular)
-        return _jsx(IndexTemplate, {});
-    return _jsx(Singular, Object.assign({}, queriedObject));
+    if (!Singular) return <IndexTemplate/>
+
+    return <Singular {...queriedObject} />;
 }

package/lib/ui/render-attachment-image.tsx

@@ -0,0 +1,28 @@
+import Image from "next/image";
+import { ComponentPropsWithoutRef } from "react";
+
+type Props = Omit<ComponentPropsWithoutRef<typeof Image>, "src" | "alt" | "height" | "width"> & {
+    attachmentId: number;
+    className?: string;
+};
+
+/**
+ * Renders a WordPress media attachment using the Next.js Image component.
+ */
+export async function RenderAttachmentImage({ attachmentId, className, ...rest }: Props) {
+    const image = await getPost(attachmentId);
+    if (!image) return;
+
+    const { src, alt, height, width } = image.imageAttributes;
+
+    return (
+        <Image
+            src={src || ''}
+            alt={alt || ''}
+            height={height}
+            width={width}
+            className={className}
+            {...rest}
+        />
+    );
+}

package/lib/ui/render-components.tsx

@@ -0,0 +1,12 @@
+import { ResolvedFlexibleContent } from "../acf-functions/types/components/field-props";
+
+type Props = {
+    layouts: ResolvedFlexibleContent<any>,
+}
+
+/**
+ * Dynamically resolves and renders an array of mapped ACF Layout components from a resolved flexible content field.
+ */
+export async function RenderComponents({ layouts }: Props) {
+    return layouts.map((layout, index) => <layout.Component key={index} {...layout.content}/>)
+}

package/lib/ui/render-the-admin-bar.tsx

@@ -0,0 +1,79 @@
+"use client"
+import { useEffect, useState } from "react";
+import { usePathname } from "next/navigation";
+import Script from "next/script";
+import { ksesPost } from "nextpress/services/utilities/kses-post";
+
+type Props = {
+    loggedInUserId?: number
+}
+
+type AdminBarResponse = {
+    html: string,
+    assets: {
+        css: {
+            admin_bar: string,
+            dashicons: string
+        },
+        js: {
+            admin_bar: string
+        }
+    }
+}
+
+/**
+ * Renders the WordPress admin bar for authenticated administrators browsing the Next.js frontend.
+ */
+export function RenderTheAdminBar({ loggedInUserId }: Props) {
+    const [adminBar, setAdminBar] = useState<AdminBarResponse | null>(null);
+    const [isMounted, setIsMounted] = useState(false);
+
+    const path = usePathname();
+
+    useEffect(() => {
+        fetch(`/api/admin-bar?user_id=${loggedInUserId}&path=${encodeURIComponent(path)}`)
+            .then((request) => {
+                if (!request.ok) {
+                    throw new Error(`Failed to fetch admin bar: ${request.status}`);
+                }
+                return request.json();
+            })
+            .then((response) => {
+                setAdminBar(response);
+                setTimeout(() => setIsMounted(true), 50);
+            })
+            .catch((error) => {
+                console.error("Failed to load admin bar", error.message);
+            })
+    }, [loggedInUserId, path]);
+
+    if (!adminBar) {
+        return null;
+    }
+
+    return (
+        <>
+            <link
+                rel="stylesheet"
+                href={adminBar.assets.css.admin_bar}
+                precedence="high"
+            />
+            <link
+                rel="stylesheet"
+                href={adminBar.assets.css.dashicons}
+                precedence="high"
+            />
+            <Script src={adminBar.assets.js.admin_bar}/>
+
+            <div
+                className={`fixed top-0 left-0 right-0 transform transition-all duration-300 ease-in-out ${
+                    isMounted
+                        ? "scale-y-100"
+                        : "scale-y-0"
+                }`}
+            >
+                {ksesPost(adminBar.html)}
+            </div>
+        </>
+    );
+}

package/lib/ui/render-the-logo.tsx

@@ -0,0 +1,24 @@
+import { getThemeMods } from "nextpress/services/get-theme-mods";
+import { getBlogname } from "nextpress/services/metadata/get-blogname";
+import { RenderAttachmentImage } from "./render-attachment-image";
+
+type Props = {
+    className?: string
+}
+
+/**
+ * Renders the custom site logo defined in the WordPress Customizer.
+ *
+ * Fallback: Renders the text-based Site Title if no custom logo is assigned in WordPress.
+ */
+export async function RenderTheLogo({ className }: Props) {
+    const logoId = Number(await getThemeMods('custom_logo')) ?? 0;
+
+    return (
+        <div className={className}>
+            {logoId ?
+                <RenderAttachmentImage className="h-full w-full object-contain object-center" attachmentId={logoId} sizes="512px"/>
+            : <span className="text-4xl font-bold">{await getBlogname()}</span>}
+        </div>
+    )
+}

package/{dist/wpdb/wpdb.interface.d.ts → lib/wpdb/wpdb.interface.ts}

@@ -2,14 +2,20 @@
  * This file was generated by kysely-codegen.
  * Please do not edit it manually.
  */
+
 import type { ColumnType } from "kysely";
-export type Generated<T> = T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
+
+export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
+    ? ColumnType<S, I | undefined, U>
+    : ColumnType<T, T | undefined, T>;
+
 export interface WpCommentmeta {
     commentId: Generated<number>;
     metaId: Generated<number>;
     metaKey: string | null;
     metaValue: string | null;
 }
+
 export interface WpComment {
     commentAgent: Generated<string>;
     commentApproved: Generated<string>;
@@ -27,6 +33,7 @@ export interface WpComment {
     commentType: Generated<string>;
     userId: Generated<number>;
 }
+
 export interface WpLink {
     linkDescription: Generated<string>;
     linkId: Generated<number>;
@@ -42,30 +49,35 @@ export interface WpLink {
     linkUrl: Generated<string>;
     linkVisible: Generated<string>;
 }
+
 export interface WpNextpressPostmeta {
     metaId: Generated<number>;
     metaKey: string | null;
     metaValue: string | null;
     objectId: Generated<number>;
 }
+
 export interface WpNextpressTermmeta {
     metaId: Generated<number>;
     metaKey: string | null;
     metaValue: string | null;
     objectId: Generated<number>;
 }
+
 export interface WpOption {
     autoload: Generated<string>;
     optionId: Generated<number>;
     optionName: Generated<string>;
     optionValue: string;
 }
+
 export interface WpPostmeta {
     metaId: Generated<number>;
     metaKey: string | null;
     metaValue: string | null;
     postId: Generated<number>;
 }
+
 export interface WpPost {
     commentCount: Generated<number>;
     commentStatus: Generated<string>;
@@ -91,23 +103,27 @@ export interface WpPost {
     postType: Generated<string>;
     toPing: string;
 }
+
 export interface WpTermmeta {
     metaId: Generated<number>;
     metaKey: string | null;
     metaValue: string | null;
     termId: Generated<number>;
 }
+
 export interface WpTermRelationship {
     objectId: Generated<number>;
     termOrder: Generated<number>;
     termTaxonomyId: Generated<number>;
 }
+
 export interface WpTerm {
     name: Generated<string>;
     slug: Generated<string>;
     termGroup: Generated<number>;
     termId: Generated<number>;
 }
+
 export interface WpTermTaxonomy {
     count: Generated<number>;
     description: string;
@@ -116,12 +132,14 @@ export interface WpTermTaxonomy {
     termId: Generated<number>;
     termTaxonomyId: Generated<number>;
 }
+
 export interface WpUsermeta {
     metaKey: string | null;
     metaValue: string | null;
     umetaId: Generated<number>;
     userId: Generated<number>;
 }
+
 export interface WpUser {
     displayName: Generated<string>;
     ID: Generated<number>;
@@ -134,6 +152,7 @@ export interface WpUser {
     userStatus: Generated<number>;
     userUrl: Generated<string>;
 }
+
 export interface DB {
     wpCommentmeta: WpCommentmeta;
     wpComments: WpComment;