@newlogic-digital/cli 1.0.3 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",

package/src/commands/cms/prepare.mjs

@@ -10,6 +10,128 @@ let sectionsCount = 0
 let sectionsFactoryCount = 0
 let templatesCount = 0
 
+function generatePhpType(control, controlValue) {
+    const type = typeof controlValue
+    let phpType = type
+
+    if (type === 'object' && Array.isArray(controlValue)) {
+        phpType = 'array'
+    } else if (type === 'boolean') {
+        phpType = 'bool'
+    } else if (type === 'number') {
+        phpType = 'int'
+    }
+    return phpType
+}
+function getFieldType(control, controlValue) {
+    const type = typeof controlValue
+    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') {
+        if (controlValue.startsWith('https://') || controlValue.startsWith('http://') || controlValue.trim().endsWith('.html')) {
+            return 'LINK'
+        }
+        if (controlValue.trim().startsWith('<') && controlValue.trim().endsWith('/>')) {
+            return 'WSW'
+        }
+        return 'TEXTAREA'
+    }
+
+    if (type === 'boolean') {
+        return 'BOOLEAN'
+    }
+
+    if (type === 'object') {
+        return 'REPEATER'
+    }
+    return 'OTHER'
+}
+function 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)
+}
+
+function buildAttributeInternals(control, controlValue) {
+    const type = getFieldType(control, controlValue)
+    const name = getTitle(control)
+    let subfields = ''
+    let phpType = generatePhpType(control, controlValue)
+    if (type === 'REPEATER') {
+        subfields = ', subfields: [\n'
+        phpType = 'list<object{'
+        if (Array.isArray(controlValue)) {
+            const visited = {}
+            for (const object in controlValue) {
+                if (typeof controlValue[object] !== 'object') {
+                    const key = 'SomethingIsWrongHere'
+                    if (visited[key]) {
+                        continue
+                    }
+                    visited[key] = true
+                    const [attribute, type] = buildAttributeInternals('SomethingIsWrongHere', controlValue[object])
+                    subfields += `'SomethingIsWrongHere' => new ${attribute},\n`
+                    phpType += `SomethingIsWrongHere: ${type}, `
+                    continue
+                }
+                for (const key in controlValue[object]) {
+                    if (visited[key]) {
+                        continue
+                    }
+                    visited[key] = true
+                    const [attribute, type] = buildAttributeInternals(key, controlValue[object][key])
+                    subfields += `'${key}' => new ${attribute},\n`
+                    phpType += `${key}: ${type}, `
+                }
+            }
+        } else {
+            for (const key in controlValue) {
+                const [attribute, type] = buildAttributeInternals(key, controlValue[key])
+                subfields += `'${key}' => new ${attribute},\n`
+                phpType += `${key}: ${type}, `
+            }
+        }
+        subfields += ']'
+        phpType = phpType.slice(0, -2) + '}>'
+    }
+    return [`FieldConfig(type: FieldTypeEnum::${type}, name: '${name}'${subfields})`, phpType]
+}
+function buildAttribute(control, controlValue) {
+    const [attribute, type] = buildAttributeInternals(control, controlValue)
+    if (type.startsWith('list')) {
+        return `/** @var null|${type} */\n#[${attribute}]`
+    }
+    return `#[${attribute}]`
+}
+
 export default function prepare(options) {
     return {
         async copy(name) {
@@ -243,73 +365,16 @@ export default function prepare(options) {
                     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'
-                            }
+                            const phpType = generatePhpType(control, controls[control])
 
                             annotations.push(`
-                                #[FieldType(FieldType::${getField(control, type)})]
-                                #[FieldName('${getTitle(control)}')]
-                                public ?${phpType} $${control}${type === 'string' ? " = '" + value + "'" : ' = null'};
+                                ${buildAttribute(control, controls[control])}
+                                public ?${phpType} $${control} = null;
                             `)
 
                             if (type === 'object') {
@@ -341,8 +406,8 @@ export default function prepare(options) {
                             namespace App\Components;
                             
                             use App\Components\Attributes\ComponentName;
-                            use App\Components\Attributes\FieldName;
-                            use App\Components\Attributes\FieldType;
+                            use App\Components\Attributes\FieldTypeEnum;
+                            use App\Components\Attributes\FieldConfig;
                             
                             #[ComponentName('${name}')]
                             class ${name} extends BaseComponent
@@ -415,7 +480,26 @@ export default function prepare(options) {
             })
 
             for (const path of templates) {
-                await fse.copy(path, join(options.path.src.views, relative(options.path.src.templates, path)))
+                const copyAppend = async function(source) {
+                    const dest = join(options.path.src.views, relative(options.path.src.templates, path))
+                    fse.copy(source, dest).then(
+                        () => {
+                            // Prepend data
+                            const data = fs.readFileSync(dest)
+                            const fd = fs.openSync(dest, 'w+')
+                            const base = basename(dest, '.latte')
+                            const componentNameFinal = base.charAt(0).toUpperCase() + base.slice(1)
+                            const insert = Buffer.from(`{varType App\\Components\\${componentNameFinal} $control}\n`)
+                            fs.writeSync(fd, insert, 0, insert.length, 0)
+                            fs.writeSync(fd, data, 0, data.length, insert.length)
+                            fs.close(fd, (err) => {
+                                if (err) throw err
+                            })
+                        }
+                    )
+                }
+
+                await copyAppend(path)
                 templatesCount += 1
             }
 

package/src/commands/init/cms.mjs

@@ -36,7 +36,53 @@ async function install(name, branch) {
     ])
 
     if (install === 'yes') {
-        execSync(`cd ${name || '.'} && make install ${branch || ''}`)
+        execSync(`cd ${name || '.'} && composer install`)
+
+        if (fs.existsSync(resolve(process.cwd(), 'Makefile'))) {
+            execSync(`cd ${name || '.'} && make install ${branch || ''}`)
+        } else {
+            execSync(`cd ${name || '.'} && composer install-${branch || ''}`)
+        }
+
+        if (fs.existsSync(resolve(process.cwd(), 'package.json'))) {
+            execSync(`cd ${name || '.'} && npm i && npx vite build`)
+        }
+    }
+}
+
+async function dev(name) {
+    const { install } = await prompts([
+        {
+            type: 'select',
+            name: 'install',
+            message: 'Start dev server?',
+            choices: [
+                { title: 'yes', value: 'yes' },
+                { title: 'no', value: 'no' }
+            ]
+        }
+    ])
+
+    if (install === 'yes') {
+        execSync(`cd ${name || '.'} && composer dev-headless`)
+    }
+}
+
+async function migrations(name) {
+    const { install } = await prompts([
+        {
+            type: 'select',
+            name: 'install',
+            message: 'Init phinx migrations?',
+            choices: [
+                { title: 'yes', value: 'yes' },
+                { title: 'no', value: 'no' }
+            ]
+        }
+    ])
+
+    if (install === 'yes') {
+        execSync(`cd ${name || '.'} && composer phinx-init`)
     }
 }
 
@@ -63,6 +109,8 @@ export default async function cms(name, { variant, branch }) {
         clone(name, { variant, branch })
         await install(name, branch)
         await prepare()
+        await dev()
+        await migrations()
         return
     }
 
@@ -79,6 +127,7 @@ export default async function cms(name, { variant, branch }) {
     await move('log')
     await move('public/index.php')
     await move('src/views')
+    await move('storage')
     await move('temp')
     await move('tests')
     await move('.gitignore', { overwrite: true })
@@ -86,7 +135,7 @@ export default async function cms(name, { variant, branch }) {
     await move('composer.json')
     await move('composer.lock')
     await move('docker-compose.yml')
-    await move('Makefile')
+    await move('Makefile') // deprecated
     await move('phpstan.neon')
     await move('phpunit.xml')
     await move('pint.json')