@newlogic-digital/cli 0.1.0 → 1.0.0

package/index.mjs

@@ -23,10 +23,13 @@ if (!command) {
         ${pc.green('newlogic init cms')} ${pc.yellow('<directory>')} - Creates a new ${pc.blue('@newlogic-digital/cms')} project in new directory with the name ${pc.yellow('<directory>')}
         
         -- cms --
-        ${pc.green('newlogic cms prepare')} - Copies templates and sections from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')}
-        ${pc.green('newlogic cms prepare templates')} - Copies templates from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
-        ${pc.green('newlogic cms prepare sections')} - Copies sections from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
-        ${pc.green('newlogic cms new-section')} ${pc.yellow('<name>')} - Creates a new ${pc.blue('@newlogic-digital/cms')} section with name ${pc.yellow('<name>')}
+        ${pc.green('newlogic cms prepare')} - Copies templates and components from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')}
+        ${pc.green('newlogic cms prepare views')} - Copies views from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
+        ${pc.green('newlogic cms prepare components')} - Copies components from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
+        ${pc.green('newlogic cms new-component')} ${pc.yellow('<name>')} - Creates a new ${pc.blue('@newlogic-digital/cms')} section with name ${pc.yellow('<name>')}
+        ${pc.red('newlogic cms prepare templates')} - (deprecated) Copies templates from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
+        ${pc.red('newlogic cms prepare sections')} - (deprecated) Copies sections from ${pc.blue('@newlogic-digital/ui')} project to ${pc.blue('@newlogic-digital/cms')} even if they already exists
+        ${pc.red('newlogic cms new-section')} ${pc.yellow('<name>')} - (deprecated) Creates a new ${pc.blue('@newlogic-digital/cms')} section with name ${pc.yellow('<name>')}
     `)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",
@@ -12,14 +12,13 @@
   "dependencies": {
     "lodash": "^4.17.21",
     "prompts": "^2.4.2",
-    "fs-extra": "^11.1.1",
-    "picocolors": "^1.0.0",
-    "fast-glob": "^3.2.12",
-    "dedent": "^0.7.0"
+    "fs-extra": "^11.2.0",
+    "picocolors": "^1.1.1",
+    "fast-glob": "^3.3.2",
+    "dedent": "^1.5.3"
   },
   "devDependencies": {
-    "eslint": "^8.39.0",
-    "eslint-config-standard": "^17.0.0"
+    "eslint-config-standard": "^17.1.0"
   },
   "files": [
     "index.js",

package/src/commands/cms/index.mjs

@@ -8,11 +8,15 @@ export const options = {
     path: {
         src: {
             templates: resolve(process.cwd(), 'src/templates'),
+            components: resolve(process.cwd(), 'src/templates/components'),
             sections: resolve(process.cwd(), 'src/templates/Sections'),
-            views: resolve(process.cwd(), 'src/views')
+            views: resolve(process.cwd(), 'src/views'),
+            pages: resolve(process.cwd(), 'src/pages')
         },
         app: {
             templates: resolve(process.cwd(), 'app/Templates'),
+            components: resolve(process.cwd(), 'app/Components'),
+            componentsFactory: resolve(process.cwd(), 'app/Components/Factory'),
             sections: resolve(process.cwd(), 'app/Sections'),
             sectionsFactory: resolve(process.cwd(), 'app/Sections/Factory'),
             tempCache: resolve(process.cwd(), 'temp/cache')
@@ -25,6 +29,24 @@ export default async function cms(action, name) {
         await prepare(options).copy(name)
     }
 
+    if (action === 'new-component') {
+        const nameFormatted = name.replaceAll('/', '')
+
+        if (fs.existsSync(join(options.path.app.components, `${nameFormatted}.php`))) {
+            console.log(`${pc.red('✖')} section ${nameFormatted} already exists`)
+            process.exit(1)
+        }
+
+        prepare(options).writeComponent(name)
+        prepare(options).writeComponentFactory(nameFormatted)
+
+        if (fs.existsSync(options.path.app.tempCache)) {
+            fse.removeSync(options.path.app.tempCache)
+        }
+
+        console.log(`${pc.green('✔')} component ${nameFormatted} created`)
+    }
+
     if (action === 'new-section') {
         const nameFormatted = name.replaceAll('/', '')
 

package/src/commands/cms/prepare.mjs

@@ -1,5 +1,5 @@
 import FastGlob from 'fast-glob'
-import { join, relative, extname } from 'path'
+import { join, relative, extname, basename } from 'path'
 import fs from 'fs'
 import fse from 'fs-extra'
 import pc from 'picocolors'
@@ -13,7 +13,25 @@ let templatesCount = 0
 export default function prepare(options) {
     return {
         async copy(name) {
-            if (!name || name === 'sections') {
+            if (!name || name === 'components') {
+                if (!fs.existsSync(options.path.src.components)) {
+                    console.log(`${pc.red('✖')} path ${options.path.src.components} doesn't exists`)
+                    process.exit(1)
+                }
+
+                if (!fs.existsSync(options.path.app.components)) {
+                    console.log(`${pc.red('✖')} path ${options.path.app.components} doesn't exists`)
+                    process.exit(1)
+                }
+
+                if (!fs.existsSync(options.path.app.componentsFactory)) {
+                    fs.mkdirSync(options.path.app.componentsFactory)
+                }
+
+                await this.copyComponents(name === 'components')
+            }
+
+            if (name === 'sections') {
                 if (!fs.existsSync(options.path.src.sections)) {
                     console.log(`${pc.red('✖')} path ${options.path.src.sections} doesn't exists`)
                     process.exit(1)
@@ -31,7 +49,20 @@ export default function prepare(options) {
                 await this.copySections(name === 'sections')
             }
 
-            if (!name || name === 'templates') {
+            if (!name || name === 'views') {
+                if (!fs.existsSync(options.path.src.templates)) {
+                    console.log(`${pc.red('✖')} path ${options.path.src.templates} doesn't exists`)
+                    process.exit(1)
+                }
+
+                if (!fs.existsSync(options.path.app.components)) {
+                    fs.mkdirSync(options.path.app.components)
+                }
+
+                await this.copyViews(name === 'views')
+            }
+
+            if (name === 'templates') {
                 if (!fs.existsSync(options.path.src.templates)) {
                     console.log(`${pc.red('✖')} path ${options.path.src.templates} doesn't exists`)
                     process.exit(1)
@@ -59,30 +90,30 @@ export default function prepare(options) {
 
                     const getField = (control, type) => {
                         if (type === 'number') {
-                            return 'int'
+                            return 'INT'
                         }
 
                         if (control.startsWith('table')) {
-                            return 'table'
+                            return 'TABLE'
                         }
 
                         if (control === 'heading' || control === 'title') {
-                            return 'text'
+                            return 'TEXT'
                         }
 
                         if (control === 'content') {
-                            return 'wsw'
+                            return 'WSW'
                         }
 
                         if (type === 'string') {
-                            return 'textarea'
+                            return 'TEXTAREA'
                         }
 
                         if (type === 'boolean') {
-                            return type
+                            return 'BOOLEAN'
                         }
 
-                        return type
+                        return 'OTHER'
                     }
 
                     const getTitle = (control) => {
@@ -121,12 +152,9 @@ export default function prepare(options) {
                             }
 
                             annotations.push(`
-                                /**
-                                 * @field ${getField(control, type)}
-                                 * @title ${getTitle(control)}
-                                 * @value ${value}
-                                 */
-                                public ${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ''};
+                                #[FieldType(FieldType::${getField(control, type)})]
+                                #[FieldName('${getTitle(control)}')]
+                                public ?${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ' = null'};
                             `)
 
                             if (type === 'object') {
@@ -152,16 +180,23 @@ export default function prepare(options) {
                     fs.writeFileSync(join(options.path.app.sections, `${name}.php`),
                         dedent`
                             <?php
-        
+                            
+                            declare(strict_types=1);
+                            
                             namespace App\Sections;
                             
+                            use App\Sections\Attributes\FieldName;
+                            use App\Sections\Attributes\FieldType;
+                            use App\Sections\Attributes\SectionName;
+                            
+                            #[SectionName('${name}')]
                             class ${name} extends BaseSection
                             {
                                 ${annotations}
                                 public function render() : void
                                 {
                                     ${objects}
-                                    $this->getTemplate()->render(TEMPLATES_DIR . '/${path}');
+                                    $this->template->render(TEMPLATES_DIR . '/${path}');
                                 }
                             }
                         `
@@ -177,6 +212,8 @@ export default function prepare(options) {
                     fs.writeFileSync(join(options.path.app.sectionsFactory, `${name}Factory.php`),
                         dedent`
                             <?php
+
+                            declare(strict_types=1);
                             
                             namespace App\Sections\Factory;
                             
@@ -193,6 +230,173 @@ export default function prepare(options) {
                 }
             }
         },
+        writeComponent(name, path, force) {
+            if (!path) {
+                path = name + '.latte'
+                name = name.replaceAll('/', '')
+            }
+
+            if (!name.match(/(Ui)/)) {
+                if (!fs.existsSync(join(options.path.app.components, `${name}.php`)) || force) {
+                    const schema = this.getComponentsSchema()
+                    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 'BOOLEAN'
+                        }
+
+                        return 'OTHER'
+                    }
+
+                    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(`
+                                #[FieldType(FieldType::${getField(control, type)})]
+                                #[FieldName('${getTitle(control)}')]
+                                public ?${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ' = null'};
+                            `)
+
+                            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.components, `${name}.php`),
+                        dedent`
+                            <?php
+                            
+                            declare(strict_types=1);
+                            
+                            namespace App\Components;
+                            
+                            use App\Components\Attributes\FieldName;
+                            use App\Components\Attributes\FieldType;
+                            use App\Components\Attributes\SectionName;
+                            
+                            #[ComponentName('${name}')]
+                            class ${name} extends BaseComponent
+                            {
+                                ${annotations}
+                                public function render() : void
+                                {
+                                    ${objects}
+                                    $this->template->render(TEMPLATES_DIR . '/${path}');
+                                }
+                            }
+                        `
+                    )
+
+                    sectionsCount += 1
+                }
+            }
+        },
+        writeComponentFactory(name, force) {
+            if (!name.match(/(Ui)/)) {
+                if (!fs.existsSync(join(options.path.app.componentsFactory, `${name}Factory.php`)) || force) {
+                    fs.writeFileSync(join(options.path.app.componentsFactory, `${name}Factory.php`),
+                        dedent`
+                            <?php
+
+                            declare(strict_types=1);
+                            
+                            namespace App\SComponents\Factory;
+                            
+                            use ${'App\\Components\\'}${name};
+                            
+                            interface ${name}Factory
+                            {
+                                public function create(): ${name};
+                            }
+                        `
+                    )
+
+                    sectionsFactoryCount += 1
+                }
+            }
+        },
+        async copyComponents(force = false) {
+            const components = FastGlob.sync(join(options.path.src.components, '/**'))
+
+            components.forEach(path => {
+                const name = basename(relative(options.path.src.components, path), extname(relative(options.path.src.components, path)))
+
+                this.writeComponent(name, relative(options.path.src.templates, path), force)
+                this.writeComponentFactory(name, force)
+            })
+
+            console.log(`${pc.green('✔')} ${sectionsCount} components and ${sectionsFactoryCount} factory files copied to app`)
+        },
         async copySections(force = false) {
             const sections = FastGlob.sync(join(options.path.src.sections, '/**'))
 
@@ -205,6 +409,18 @@ export default function prepare(options) {
 
             console.log(`${pc.green('✔')} ${sectionsCount} sections and ${sectionsFactoryCount} factory files copied to app`)
         },
+        async copyViews(force = false) {
+            const templates = FastGlob.sync(join(options.path.src.templates, '/**')).filter(entry => {
+                return !fs.existsSync(join(options.path.src.views, relative(options.path.src.templates, entry))) || force
+            })
+
+            for (const path of templates) {
+                await fse.copy(path, join(options.path.src.views, relative(options.path.src.templates, path)))
+                templatesCount += 1
+            }
+
+            console.log(`${pc.green('✔')} ${templatesCount} views files copied from templates`)
+        },
         async copyTemplates(force = false) {
             const templates = FastGlob.sync(join(options.path.src.templates, '/**')).filter(entry => {
                 return !fs.existsSync(join(options.path.app.templates, relative(options.path.src.templates, entry))) || force
@@ -248,6 +464,39 @@ export default function prepare(options) {
                 sectionsSchema[sortedSection.src] = sortedSection
             })
 
+            return sectionsSchema
+        },
+        getComponentsSchema() {
+            const views = FastGlob.sync(join(options.path.src.pages, '/**/*.json'))
+            const sectionsUnsorted = {}
+            const sectionsSchema = {}
+
+            views.forEach(path => {
+                const json = JSON.parse(fs.readFileSync(path).toString())
+                const sections = [...(json.body ?? []), ...(json.head ?? []), ...(json.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

@@ -76,16 +76,17 @@ export default async function cms(name, { variant, branch }) {
     await move('app')
     await move('config')
     await move('log')
-    await move('public/.htaccess')
     await move('public/index.php')
+    await move('src/views')
     await move('temp')
+    await move('tests')
     await move('.gitignore', { overwrite: true })
-    await move('.htaccess')
-    await move('Makefile')
     await move('composer.json')
     await move('composer.lock')
     await move('docker-compose.yml')
+    await move('Makefile')
     await move('phpstan.neon')
+    await move('phpunit.xml')
     await move('pint.json')
     await move('rector.php')
     await fse.move(join(tempDir, '.gitlab-ci.prod.yml'), resolve(process.cwd(), '.gitlab-ci.yml'), { overwrite: true }).catch(err => console.log(`${pc.red(err)} - .gitlab-ci.yml`))