nextpress-core 2.0.2 → 2.1.0

package/lib/acf-functions/core/acf-component-autoloader.ts

@@ -3,30 +3,39 @@ import path from 'path';
 import { NextpressComponent } from '../types/components/nextpress-component';
 
 /**
- * Autoloads ACF components dynamically from the templates directory.
+ * Autoloads ACF components dynamically from nested directories within the templates directory.
  * * **Requirements for it to work:**
- * Each `.tsx` file within the `src/app/_templates/components/` directory MUST export the following:
- * 1. `layout` (Named Export): The configuration for the ACF layout, typically defined using the `defineLayout` function.
- * 2. `default` (Default Export): The React component (JSX/TSX function) that renders the layout.
+ * Each `.tsx` file within `src/app/_templates/components/{any-dir}/` MUST export the following:
+ * 1. `layout` (Named Export): The configuration for the ACF layout.
+ * 2. `default` (Default Export): The React component that renders the layout.
  *
  * @returns {Promise<NextpressComponent[]>} A promise resolving to an array of mapped layout configurations and their respective components.
  */
 export async function acfComponentAutoloader(): Promise<NextpressComponent[]> {
-    const absolutePath = path.join(process.cwd(), 'src', 'app', '_templates', 'components');
-    const files = fs.readdirSync(absolutePath);
-
+    const basePath = path.join(process.cwd(), 'src', 'app', '_templates', 'components');
     const layouts: NextpressComponent[] = [];
 
-    for (const file of files) {
-        if (!file.endsWith('.tsx')) continue;
+    const items = fs.readdirSync(basePath, { withFileTypes: true });
+
+    for (const item of items) {
+        if (!item.isDirectory()) continue;
+
+        const dirName = item.name;
+        const dirPath = path.join(basePath, dirName);
+        const files = fs.readdirSync(dirPath);
+
+        for (const file of files) {
+            if (!file.endsWith('.tsx')) continue;
+
+            const imported = await import(`@/app/_templates/components/${dirName}/${file}`);
 
-        const imported = await import(`@/app/_templates/components/${file}`);
+            const layout = imported.layout;
+            const component = imported.default;
 
-        const layout = imported.layout;
-        const component = imported.default;
-        if (!layout || !component) continue;
+            if (!layout || !component) continue;
 
-        layouts.push({layout, Component: component});
+            layouts.push({ layout, Component: component });
+        }
     }
 
     return layouts;

package/lib/acf-functions/core/acf-field-group-autoloader.ts

@@ -11,7 +11,7 @@ import { NextpressFieldGroup } from '../types/acf-field-group';
  * @returns {Promise<NextpressFieldGroup[]>} A promise resolving to an array of loaded ACF field group configurations.
  */
 export async function acfFieldGroupAutoloader(): Promise<NextpressFieldGroup[]> {
-    const absolutePath = path.join(process.cwd(), 'src', 'app', '_templates', 'components', 'field-groups');
+    const absolutePath = path.join(process.cwd(), 'src', 'app', '_templates', 'field-groups');
     const files = fs.readdirSync(absolutePath);
 
     const fieldGroups: NextpressFieldGroup[] = [];
@@ -19,7 +19,7 @@ export async function acfFieldGroupAutoloader(): Promise<NextpressFieldGroup[]>
     for (const file of files) {
         if (!file.endsWith('.ts')) continue;
 
-        const imported = await import(`@/app/_templates/components/field-groups/${file}`);
+        const imported = await import(`@/app/_templates/field-groups/${file}`);
         const fieldGroup = imported.default;
 
         fieldGroups.push(fieldGroup);

package/lib/acf-functions/types/acf-field.ts

@@ -2760,7 +2760,7 @@ type NewLines = "wpautop" | "br" | ""
 type Choices =
     | Record<string, string>;
 /**
- * Value returned (value, label, or both as array)
+ * Value returned (value or label and value as array)
  */
 type ReturnFormatChoice = "value" | "label" | "array"
 /**

package/lib/acf-functions/types/components/field-props.ts

@@ -74,26 +74,26 @@ type MapFieldType<Field> =
         ? string | null
     : Field extends { type: 'textarea' }
         ? string | null
-    : Field extends { type: 'button_group' }
+    : Field extends { type: 'button_group' } & { choices: Record<string, string>}
         ? Field extends { return_format: 'array' }
-            ? ACFChoiceObject | null
-        : string | null
-    : Field extends { type: 'checkbox' }
+            ? ACFChoiceObject<Field> | null
+        : keyof Field['choices'] | null
+    : Field extends { type: 'checkbox' } & { choices: Record<string, string>}
         ? Field extends { return_format: 'array' }
-            ? ACFChoiceObject[]
-        : string[]
-    : Field extends { type: 'radio' }
+            ? ACFChoiceObject<Field>[]
+        : (keyof Field['choices'])[]
+    : Field extends { type: 'radio' } & { choices: Record<string, string>}
         ? Field extends { return_format: 'array' }
-            ? ACFChoiceObject | null
-        : string | null
-    : Field extends { type: 'select' }
+            ? ACFChoiceObject<Field> | null
+        : keyof Field['choices'] | null
+    : Field extends { type: 'select' } & { choices: Record<string, string>}
         ? Field extends { multiple: 1 }
             ? Field extends { return_format: 'array' }
-                ? ACFChoiceObject[]
-            : string[]
+                ? ACFChoiceObject<Field>[]
+            : (keyof Field['choices'])[]
         : Field extends { return_format: 'array' }
-            ? ACFChoiceObject | null
-        : string | null
+            ? ACFChoiceObject<Field> | null
+        : keyof Field['choices'] | null
     : Field extends { type: 'true_false' }
         ? boolean
     : Field extends { type: 'file' }
@@ -165,9 +165,9 @@ export type ACFLinkObject = {
     target: string
 }
 
-export type ACFChoiceObject = {
-    label?: string
-    value?: string,
+export type ACFChoiceObject<T extends {choices: Record<string, string>}> = {
+    label: T['choices'][keyof T['choices']] | null,
+    value: keyof T['choices'] | null
 }
 
 export type ACFGoogleMapsObject = {

package/lib/router/nextpress-layout.tsx

@@ -1,5 +1,4 @@
 import "@nextpress/globals/globals";
-import "@/app/_css/globals.css";
 import { LayoutTemplate } from "@/app/_templates/layout";
 import { cookies, draftMode } from "next/headers";
 import fonts from "@/fonts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextpress-core",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Nextpress Core",
   "keywords": [],
   "bin": {