@newlogic-digital/cli 0.0.10 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",
@@ -10,10 +10,12 @@
     "eslint": "eslint '**/*.mjs' --fix"
   },
   "dependencies": {
+    "lodash": "^4.17.21",
     "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/index.mjs

@@ -1,18 +1,21 @@
 import prepare from './prepare.mjs'
 import pc from 'picocolors'
 import fs from 'fs'
+import fse from 'fs-extra'
 import { join, resolve } from 'path'
 
 export const options = {
     path: {
         src: {
             templates: resolve(process.cwd(), 'src/templates'),
-            sections: resolve(process.cwd(), 'src/templates/Sections')
+            sections: resolve(process.cwd(), 'src/templates/Sections'),
+            views: resolve(process.cwd(), 'src/views')
         },
         app: {
             templates: resolve(process.cwd(), 'app/Templates'),
             sections: resolve(process.cwd(), 'app/Sections'),
-            sectionsFactory: resolve(process.cwd(), 'app/Sections/Factory')
+            sectionsFactory: resolve(process.cwd(), 'app/Sections/Factory'),
+            tempCache: resolve(process.cwd(), 'temp/cache')
         }
     }
 }
@@ -33,6 +36,10 @@ export default async function cms(action, name) {
         prepare(options).writeSection(name)
         prepare(options).writeSectionFactory(nameFormatted)
 
+        if (fs.existsSync(options.path.app.tempCache)) {
+            fse.removeSync(options.path.app.tempCache)
+        }
+
         console.log(`${pc.green('✔')} section ${nameFormatted} created`)
     }
 }

package/src/commands/cms/prepare.mjs

@@ -2,8 +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
@@ -51,20 +52,119 @@ export default function prepare(options) {
 
             if (!name.match(/(Ui)/)) {
                 if (!fs.existsSync(join(options.path.app.sections, `${name}.php`)) || force) {
+                    const schema = this.getSectionsSchema()
+                    const controls = schema[path] ?? {}
+                    let annotations = []
+                    let objects = []
+
+                    const getField = (control, type) => {
+                        if (type === 'number') {
+                            return 'int'
+                        }
+
+                        if (control.startsWith('table')) {
+                            return 'table'
+                        }
+
+                        if (control === 'heading' || control === 'title') {
+                            return 'text'
+                        }
+
+                        if (control === 'content') {
+                            return 'wsw'
+                        }
+
+                        if (type === 'string') {
+                            return 'textarea'
+                        }
+
+                        if (type === 'boolean') {
+                            return type
+                        }
+
+                        return type
+                    }
+
+                    const getTitle = (control) => {
+                        if (control === 'heading') {
+                            return 'Nadpis'
+                        }
+
+                        if (control === 'title') {
+                            return 'Titulek'
+                        }
+
+                        if (control === 'content') {
+                            return 'Obsah'
+                        }
+
+                        if (control === 'text') {
+                            return 'Text'
+                        }
+
+                        return control[0].toUpperCase() + control.slice(1)
+                    }
+
+                    Object.keys(controls).forEach(control => {
+                        if (control !== 'src') {
+                            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 ${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ""};
+                            `)
+
+                            if (type === 'object') {
+                                objects.push(`
+                                    $this->${control} = json_decode('${value}', false);
+                                `)
+                            }
+                        }
+                    })
+
+                    if (annotations.length > 0) {
+                        annotations = annotations.map(item => item).join("");
+                    } else {
+                        annotations = "";
+                    }
+
+                    if (objects.length > 0) {
+                        objects = objects.map(item => item).join("");
+                    } else {
+                        objects = "";
+                    }
+
                     fs.writeFileSync(join(options.path.app.sections, `${name}.php`),
-                        stripIndent(`
+                        dedent`
                             <?php
         
-                            namespace App\\Sections;
+                            namespace App\Sections;
                             
                             class ${name} extends BaseSection
                             {
-                                public function render()
+                                ${annotations}
+                                public function render() : void
                                 {
+                                    ${objects}
                                     $this->getTemplate()->render(TEMPLATES_DIR . '/${path}');
                                 }
                             }
-                        `).replace(/^\s*\n/g, '')
+                        `
                     )
 
                     sectionsCount += 1
@@ -75,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
@@ -116,6 +216,40 @@ export default function prepare(options) {
             }
 
             console.log(`${pc.green('✔')} ${templatesCount} template files copied to app`)
+        },
+        getSectionsSchema() {
+            const views = FastGlob.sync(join(options.path.src.views, '/**/*.json'))
+            const sectionsUnsorted = {}
+            const sectionsSchema = {}
+
+            views.forEach(path => {
+                const json = JSON.parse(fs.readFileSync(path).toString())
+                const sections = [...(json.page.body ?? []), ...(json.page.head ?? []), ...(json.page.foot ?? [])]
+
+                sections.forEach((section) => {
+                    if (section.src) {
+                        if (typeof sectionsUnsorted[section.src] === "undefined") {
+                            sectionsUnsorted[section.src] = []
+                            sectionsUnsorted[section.src].push(section);
+                        } else {
+                            sectionsUnsorted[section.src].push(section);
+                        }
+                    }
+                })
+            })
+
+
+            Object.keys(sectionsUnsorted).forEach(key => {
+                const sortedSection = {}
+
+                sectionsUnsorted[key].forEach(section => {
+                    lodash.merge(sortedSection, section)
+                })
+
+                sectionsSchema[sortedSection.src] = sortedSection
+            })
+
+            return sectionsSchema
         }
     }
 }

package/src/commands/init/cms.mjs

@@ -8,8 +8,8 @@ import prompts from 'prompts'
 
 const tempDir = join(os.tmpdir(), 'newlogic-cms-web')
 
-async function move(path) {
-    await fse.move(join(tempDir, path), resolve(process.cwd(), path)).catch(err => console.log(pc.red(err)))
+async function move(path, options = {}) {
+    await fse.move(join(tempDir, path), resolve(process.cwd(), path), options).catch(err => console.log(`${pc.red(err)} - ${path}` ))
 }
 
 function clone(path, { variant, branch }) {
@@ -45,7 +45,7 @@ async function prepare() {
         {
             type: 'select',
             name: 'install',
-            message: 'Prepare project?',
+            message: 'Prepare project with templates from frontend?',
             choices: [
                 { title: 'yes', value: 'yes' },
                 { title: 'no', value: 'no' }
@@ -79,7 +79,7 @@ export default async function cms(name, { variant, branch }) {
     await move('public/.htaccess')
     await move('public/index.php')
     await move('temp')
-    await move('.gitignore')
+    await move('.gitignore', { overwrite: true })
     await move('.htaccess')
     await move('Makefile')
     await move('composer.json')

package/src/commands/init/index.mjs

@@ -14,7 +14,12 @@ async function init(project, name) {
                 choices: [
                     { title: 'ui', value: 'ui' },
                     { title: 'cms', value: 'cms' }
-                ]
+                ],
+                onState: (state) => {
+                    if (state.aborted) {
+                        process.exit(1)
+                    }
+                }
             }
         ])
 
@@ -30,7 +35,12 @@ async function init(project, name) {
             choices: [
                 { title: 'main', value: 'main' },
                 { title: 'dev', value: 'dev' }
-            ]
+            ],
+            onState: (state) => {
+                if (state.aborted) {
+                    process.exit(1)
+                }
+            }
         }
     ])
 
@@ -47,7 +57,12 @@ async function init(project, name) {
                 choices: [
                     { title: 'cms-web', value: 'cms-web' },
                     { title: 'cms-eshop', value: 'cms-eshop' }
-                ]
+                ],
+                onState: (state) => {
+                    if (state.aborted) {
+                        process.exit(1)
+                    }
+                }
             }
         ])