nextpress-core 3.1.4 → 3.2.1

package/cli/index.js

@@ -8,4 +8,5 @@ program
     .command('run', 'Run Nextpress')
     .command('down', 'Terminate Nextpress')
     .command('log', 'Log Nextpress in production')
+    .command('gen', 'Generate Template')
     .parse(process.argv);

package/cli/np-down.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import path from 'path';
 import { runCommand } from './run-command.js';
 import { containerLibPath } from './start-composer.js';

package/cli/np-gen-component.js

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+
+import path from 'path';
+import fs from 'fs';
+
+function main() {
+    const componentName = process.argv.slice(2).join(' ');;
+    if (!componentName) {
+        console.error('Please provide a component name.');
+        process.exit(1);
+    }
+
+    const underscored = componentName.replace(/[- ]/g, '_').toLowerCase();
+
+    const hyphenated = underscored.replaceAll('_', '-');
+
+    const capitalized = underscored.replace(/(^|_)([a-z])/g, (match, p1, p2) => p2.toUpperCase());
+
+    const dir = path.join(process.cwd(), 'next-js/src/app/_templates/components', hyphenated);
+
+    const template =
+    `import { defineLayout } from '@nextpress/acf-functions/services/define-layout';
+import { FieldProps } from '@nextpress/acf-functions/types/components/field-props';
+
+export const layout = defineLayout({
+    name: '${underscored}',
+    label: '${componentName}',
+    display: 'block',
+    sub_fields: [
+        {
+            name: 'heading',
+            label: 'Heading',
+            type: 'text',
+        },
+    ]
+});
+
+export default async function ${capitalized}({ heading }: FieldProps<typeof layout>) {
+    return (
+        <div className='container mx-auto'>
+        </div>
+    )
+}`;
+
+    try {
+        const filename = `${hyphenated}.tsx`;
+
+        if (fs.existsSync(path.join(dir, filename))) {
+            throw new Error('Component already exists');
+        } else {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+
+        fs.writeFileSync(path.join(dir, filename), template);
+
+        console.log(`Successfully generated component ${componentName} at ${dir}`);
+    } catch (error) {
+        console.error('Failed to generate component:', error.message);
+    }
+}
+
+main();

package/cli/np-gen.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+import { Command } from 'commander';
+const program = new Command();
+
+program
+    .name('np gen')
+    .command('component', 'Create component from template')
+    .parse(process.argv);

package/cli/np-log.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import path from 'path';
 import { runCommand } from './run-command.js';
 import { containerLibPath } from './start-composer.js';

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

@@ -5,12 +5,15 @@ import { NextpressLayout, ACFLayout } from "../types/acf-layout";
 /**
  * Class representing ACF builder.
  */
-export class ACFBuilder
-{
+export class ACFBuilder {
     /** Array of ACF field groups. */
     private fieldGroups: ACFFieldGroup[] = [];
 
-    public constructor() {};
+    private fieldKeyMap: Map<string, string>;
+
+    public constructor() {
+        this.fieldKeyMap = new Map();
+    };
 
     /**
      * Gets built field groups.
@@ -37,11 +40,16 @@ export class ACFBuilder
      * @returns {this} Current instance.
      */
     public registerFieldGroups(fieldGroups: NextpressFieldGroup[]): this {
-        const keyedFieldGroups: ACFFieldGroup[] = fieldGroups.map(fieldGroup => ({
-            ...fieldGroup,
-            key: `group_${this.formatKeySuffix(fieldGroup.title)}`,
-            fields: this.setFieldKeys(fieldGroup.fields, fieldGroup.title),
-        }));
+        let keyedFieldGroups: ACFFieldGroup[] = [];
+
+        // Run twice to double check conditionals
+        for (let i = 0; i < 2; i++) {
+            keyedFieldGroups = fieldGroups.map(fieldGroup => ({
+                ...fieldGroup,
+                key: `group_${this.formatKeySuffix(fieldGroup.title)}`,
+                fields: this.setFieldKeys(fieldGroup.fields, fieldGroup.title),
+            }));
+        }
 
         this.fieldGroups = [...this.fieldGroups, ...keyedFieldGroups];
 
@@ -67,12 +75,30 @@ export class ACFBuilder
                 ? this.setLayoutKeys(field.layouts, keySuffix)
                 : undefined;
 
+            const key = `field_${keySuffix}`;
+
+            this.fieldKeyMap.set(field.name, key);
+
+            if (field.conditional_logic) {
+                field.conditional_logic = field.conditional_logic.map((group) => {
+                    return group.map((cl) => {
+                        const resolvedKey = this.fieldKeyMap.get(cl.field);
+
+                        return {
+                            ...cl,
+                            field: resolvedKey !== undefined ? resolvedKey : cl.field
+                        };
+                    });
+                });
+            }
+
             return {
                 ...field,
-                key: `field_${keySuffix}`,
+                key,
                 sub_fields: childFields,
-                layouts: childLayouts
-            }});
+                layouts: childLayouts,
+            }
+        });
     }
 
     /**
@@ -94,7 +120,8 @@ export class ACFBuilder
                 ...layout,
                 key: `layout_${keySuffix}`,
                 sub_fields: childFields || [],
-        }})
+            }
+        })
     }
 
     /**

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

@@ -61,13 +61,13 @@ export async function mapField(field: NextpressField, rawValues: ACFRawValues):
         case 'oembed':
         case 'wysiwyg':
         case 'file':
-        case 'image':
             return rawValues.get(field.name);
 
         /**
          * Numeric fields.
          * Casts the raw string from the database into a strict JavaScript Number.
          */
+        case 'image':
         case 'number':
         case 'range':
             return Number(rawValues.get(field.name));
@@ -146,13 +146,13 @@ export async function mapField(field: NextpressField, rawValues: ACFRawValues):
 
         /**
          * Gallery field.
-         * Deserializes the PHP array of image IDs or objects.
+         * Deserializes the PHP array of image IDs.
          */
         case 'gallery':
             const galleryValues = parsePhp(rawValues.get(field.name));
             if (!Array.isArray(galleryValues)) return;
 
-            return galleryValues;
+            return galleryValues.map(image => Number(image)).filter(Boolean);
 
         /**
          * Flexible Content field.

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

@@ -47,7 +47,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -131,7 +131,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -204,7 +204,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -277,7 +277,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -356,7 +356,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -445,7 +445,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -516,7 +516,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -583,7 +583,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -662,7 +662,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -728,7 +728,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -807,7 +807,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -875,7 +875,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -943,7 +943,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1008,7 +1008,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1079,7 +1079,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1161,7 +1161,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1237,7 +1237,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1322,7 +1322,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1405,7 +1405,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1473,7 +1473,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1552,7 +1552,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1625,7 +1625,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1696,7 +1696,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1776,7 +1776,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1847,7 +1847,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1926,7 +1926,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -1994,7 +1994,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2069,7 +2069,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2152,7 +2152,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2215,7 +2215,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2287,7 +2287,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2354,7 +2354,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2425,7 +2425,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2501,7 +2501,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2581,7 +2581,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2671,7 +2671,7 @@ export type ACFField =
         /**
          * Conditional logic rules for field visibility. False/0/empty string to disable, or array of rule groups.
          */
-        conditional_logic?: boolean | number | string | unknown[]
+        conditional_logic?: ConditionalLogic
         /**
          * Wrapper element settings
          */
@@ -2851,3 +2851,11 @@ type TaxonomyFilter = unknown[]
  * Target fields for bidirectional relationships
  */
 type BidirectionalTarget = unknown[]
+/**
+ * Target fields for bidirectional relationships
+ */
+type ConditionalLogic = {
+    field: string,
+    operator: '==' | '!=' | '>' |'<' | '>=' | '<='
+    value: string
+}[][];

package/package.json

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