nextpress-core 3.2.1 → 3.3.0

package/cli/np-run-dev.js

@@ -17,7 +17,7 @@ const composeBaseArgs = [
 async function startDev() {
     await startComposer(composeBaseArgs,
         async () => {
-            console.log('Running Nextpress in development mode');
+            console.log('Running Nextpress in development mode (This can take a while)');
             const dockerArgs = [
                 ...composeBaseArgs,
                 'up',

package/cli/np-run-start.js

@@ -17,7 +17,7 @@ const composeBaseArgs = [
 async function start() {
     await startComposer(composeBaseArgs,
         async () => {
-            console.log('Running Nextpress in production mode');
+            console.log('Running Nextpress in production mode (This can take a while)');
             const dockerArgs = [
                 ...composeBaseArgs,
                 'up',

package/lib/nextjs-lib/acf-functions/core/acf-builder.ts

@@ -40,15 +40,16 @@ export class ACFBuilder {
      * @returns {this} Current instance.
      */
     public registerFieldGroups(fieldGroups: NextpressFieldGroup[]): this {
-        let keyedFieldGroups: ACFFieldGroup[] = [];
+        const keyedFieldGroups: ACFFieldGroup[] = [];
 
-        // Run twice to double check conditionals
-        for (let i = 0; i < 2; i++) {
-            keyedFieldGroups = fieldGroups.map(fieldGroup => ({
+        for (const fieldGroup of fieldGroups) {
+            keyedFieldGroups.push({
                 ...fieldGroup,
                 key: `group_${this.formatKeySuffix(fieldGroup.title)}`,
                 fields: this.setFieldKeys(fieldGroup.fields, fieldGroup.title),
-            }));
+            });
+
+            this.fieldKeyMap.clear();
         }
 
         this.fieldGroups = [...this.fieldGroups, ...keyedFieldGroups];
@@ -64,7 +65,9 @@ export class ACFBuilder {
      * @returns {ACFField[]} Array of fields with generated keys.
      */
     private setFieldKeys(fields: NextpressField[], parentName: string): ACFField[] {
-        return fields.map(field => {
+        const fieldsResult: ACFField[] = [];
+
+        for (const field of fields) {
             const keySuffix = this.formatKeySuffix(`${parentName}_${field.name}`);
 
             const childFields = field.sub_fields
@@ -79,8 +82,8 @@ export class ACFBuilder {
 
             this.fieldKeyMap.set(field.name, key);
 
-            if (field.conditional_logic) {
-                field.conditional_logic = field.conditional_logic.map((group) => {
+            const conditionalLogic = field.conditional_logic
+                ? field.conditional_logic.map((group) => {
                     return group.map((cl) => {
                         const resolvedKey = this.fieldKeyMap.get(cl.field);
 
@@ -89,16 +92,19 @@ export class ACFBuilder {
                             field: resolvedKey !== undefined ? resolvedKey : cl.field
                         };
                     });
-                });
-            }
+                })
+                : undefined;
 
-            return {
+            fieldsResult.push({
                 ...field,
                 key,
                 sub_fields: childFields,
                 layouts: childLayouts,
-            }
-        });
+                ...(conditionalLogic && { conditional_logic: conditionalLogic }),
+            } as any);
+        }
+
+        return fieldsResult;
     }
 
     /**
@@ -109,19 +115,23 @@ export class ACFBuilder {
      * @returns {ACFLayout[]} Array of layouts with generated keys.
      */
     private setLayoutKeys(layouts: NextpressLayout[], parentName: string): ACFLayout[] {
-        return layouts.map(layout => {
+        const layoutResults: ACFLayout[] = [];
+
+        for (const layout of layouts) {
             const keySuffix = this.formatKeySuffix(`${parentName}_${layout.name}`);
 
             const childFields = layout.sub_fields
                 ? this.setFieldKeys(layout.sub_fields, `${parentName}_${layout.name}`)
                 : undefined;
 
-            return {
+            layoutResults.push({
                 ...layout,
                 key: `layout_${keySuffix}`,
                 sub_fields: childFields || [],
-            }
-        })
+            })
+        }
+
+        return layoutResults;
     }
 
     /**

package/lib/nextjs-lib/acf-functions/services/define-field-group.ts

@@ -3,7 +3,6 @@ import { NextpressFieldGroup } from "../types/acf-field-group";
 /**
  * Defines field group configuration and applies typing.
  *
- * @template T - Field group type extending NextpressFieldGroup.
  * @param {T} layout - Field group configuration object.
  * @returns {T} Passed field group configuration object.
  */

package/lib/nextjs-lib/acf-functions/services/define-field.ts

@@ -0,0 +1,11 @@
+import { NextpressField } from "../types/acf-field";
+
+/**
+ * Defines layout configuration and applies typing.
+ *
+ * @param {T} field - Field configuration object.
+ * @returns {T} Passed layout configuration object.
+ */
+export function defineField<const T extends NextpressField>(field: T): T {
+    return field;
+}

package/lib/nextjs-lib/acf-functions/services/define-layout.ts

@@ -3,7 +3,6 @@ import { NextpressLayout } from "../types/acf-layout";
 /**
  * Defines layout configuration and applies typing.
  *
- * @template T - Layout type extending NextpressLayout.
  * @param {T} layout - Layout configuration object.
  * @returns {T} Passed layout configuration object.
  */

package/lib/nextjs-lib/acf-functions/services/map-fields/map-fields.ts

@@ -16,7 +16,7 @@ const components = await acfComponentAutoloader();
  * @returns {unknown[] | { [key: string]: unknown }} Parsed object or array.
  */
 function parsePhp(string?: string): unknown[] | { [key: string]: unknown } {
-    return unserialize(string ?? 'a:0:{}') ?? [];
+    return unserialize(string || 'a:0:{}') ?? [];
 }
 
 /**
@@ -348,6 +348,7 @@ export async function mapField(field: NextpressField, rawValues: ACFRawValues):
  * @returns {Promise<{ [key: string]: any }>} Promise resolving to layout values object.
  */
 export async function mapLayout(layout: NextpressLayout, rawValues: ACFRawValues)  {
+    if (!layout) return;
     const values: { [key: string]: any } = {};
 
     for (const subField of layout.sub_fields) {

package/package.json

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