@newlogic-digital/cli 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",
@@ -14,7 +14,8 @@
     "prompts": "^2.4.2",
     "fs-extra": "^10.1.0",
     "picocolors": "^1.0.0",
-    "fast-glob": "^3.2.11"
+    "fast-glob": "^3.2.11",
+    "dedent": "^0.7.0"
   },
   "devDependencies": {
     "eslint": "^8.23.0",

package/src/commands/cms/prepare.mjs

@@ -2,9 +2,9 @@ import FastGlob from 'fast-glob'
 import { join, relative, extname } from 'path'
 import fs from 'fs'
 import fse from 'fs-extra'
-import { stripIndent } from '../../utils.mjs'
 import pc from 'picocolors'
 import lodash from 'lodash'
+import dedent from 'dedent'
 
 let sectionsCount = 0
 let sectionsFactoryCount = 0
@@ -107,21 +107,31 @@ export default function prepare(options) {
 
                     Object.keys(controls).forEach(control => {
                         if (control !== 'src') {
-                            const type = typeof controls[control] === 'number' ? 'int' : typeof controls[control]
+                            const type = typeof controls[control]
                             const value = typeof controls[control] === 'object' ? JSON.stringify(controls[control]) : controls[control]
 
+                            let phpType = type;
+
+                            if (type === 'object' && Array.isArray(controls[control])) {
+                                phpType = 'array'
+                            } else if (type === 'boolean') {
+                                phpType = 'bool'
+                            } else if (type === 'number') {
+                                phpType = 'int'
+                            }
+
                             annotations.push(`
                                 /**
                                  * @field ${getField(control, type)}
                                  * @title ${getTitle(control)}
                                  * @value ${value}
                                  */
-                                public ${type} $${control};
+                                public ${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ""};
                             `)
 
                             if (type === 'object') {
                                 objects.push(`
-                                    $this->${control} = json_decode('${value}', true);
+                                    $this->${control} = json_decode('${value}', false);
                                 `)
                             }
                         }
@@ -140,10 +150,10 @@ export default function prepare(options) {
                     }
 
                     fs.writeFileSync(join(options.path.app.sections, `${name}.php`),
-                        stripIndent(`
+                        dedent`
                             <?php
         
-                            namespace App\\Sections;
+                            namespace App\Sections;
                             
                             class ${name} extends BaseSection
                             {
@@ -154,7 +164,7 @@ export default function prepare(options) {
                                     $this->getTemplate()->render(TEMPLATES_DIR . '/${path}');
                                 }
                             }
-                        `).replace(/^\s*\n/g, '')
+                        `
                     )
 
                     sectionsCount += 1
@@ -165,18 +175,18 @@ export default function prepare(options) {
             if (!name.match(/(Ui)/)) {
                 if (!fs.existsSync(join(options.path.app.sectionsFactory, `${name}Factory.php`)) || force) {
                     fs.writeFileSync(join(options.path.app.sectionsFactory, `${name}Factory.php`),
-                        stripIndent(`
+                        dedent`
                             <?php
                             
-                            namespace App\\Sections\\Factory;
+                            namespace App\Sections\Factory;
                             
-                            use App\\Sections\\${name};
+                            use App\Sections\${name};
                             
                             interface ${name}Factory
                             {
                                 public function create(): ${name};
                             }
-                        `).replace(/^\s*\n/g, '')
+                        `
                     )
 
                     sectionsFactoryCount += 1