@40q/40q-cli 1.0.17 → 1.0.18

package/Readme.md

@@ -29,7 +29,8 @@ Codegen generates code for you.
 ```
 
 Supported Types:
-* block: generates code for Gutenberg blocks
+* block: generates code for Gutenberg blocks and allows selecting inner components from block library repo.
+* get: fetches selected block/s, component/s, and utils from block library repo.
 
 Templates are optional, if empty, it creates an example boilerplate for a Gutenberg block.
 

package/dist/src/commands/Codegen/Codegen.command.js

@@ -98,6 +98,18 @@ function handleBlock(template) {
                     message: 'Please enter a name for the block:',
                     default: template || 'section-header',
                 },
+                {
+                    type: 'input',
+                    name: 'category',
+                    message: 'Enter the block category:',
+                    default: '40q',
+                },
+                {
+                    type: 'input',
+                    name: 'icon',
+                    message: 'Enter the icon name (dashicons):',
+                    default: 'block-default',
+                },
                 {
                     type: 'checkbox',
                     name: 'components',
@@ -105,10 +117,10 @@ function handleBlock(template) {
                     choices: componentChoices
                 }
             ]);
-            const { name, components } = answers;
+            const { name, category, icon, components } = answers;
             (0, FetchComponents_1.downloadAndSaveItems)(components, 'component', tempDirs);
             const componentNames = components.map((component) => component.name);
-            const blockGenerator = new GenerateBlock_1.GenerateBlock(template, name, componentNames);
+            const blockGenerator = new GenerateBlock_1.GenerateBlock(template, name, category, icon, componentNames);
             return blockGenerator.run();
         }
         finally {
@@ -123,10 +135,17 @@ function handleGet() {
                 type: 'list',
                 name: 'type',
                 message: 'What do you want to get?',
-                choices: ['block', 'component']
+                choices: ['block', 'component', 'utils']
+            },
+            {
+                type: 'confirm',
+                name: 'overwrite',
+                message: 'Overwrite existing files?',
+                default: false,
             }
         ]);
         const type = answers.type;
+        const overwrite = answers.overwrite;
         const tempDirs = (0, paths_1.tempPaths)(`temp-block-library-${(0, uuid_1.v4)()}`);
         if (fs.existsSync(tempDirs.tempDir))
             (0, child_process_1.execSync)(`rm -rf ${tempDirs.tempDir}`);
@@ -147,9 +166,9 @@ function handleGet() {
                     }
                 ]);
                 const { blocks } = answers;
-                (0, FetchComponents_1.downloadAndSaveItems)(blocks, 'block', tempDirs);
+                (0, FetchComponents_1.downloadAndSaveItems)(blocks, 'block', tempDirs, overwrite);
                 const innerComponents = getInnerComponents(blocks, tempDirs.tempComponentsDir);
-                (0, FetchComponents_1.downloadAndSaveItems)(innerComponents, 'component', tempDirs);
+                (0, FetchComponents_1.downloadAndSaveItems)(innerComponents, 'component', tempDirs, overwrite);
             }
             else if (type === 'component') {
                 const repoComponents = (0, FetchComponents_1.fetchRepoComponents)(tempDirs.tempComponentsDir);
@@ -166,9 +185,12 @@ function handleGet() {
                     }
                 ]);
                 const { components } = answers;
-                (0, FetchComponents_1.downloadAndSaveItems)(components, 'component', tempDirs);
+                (0, FetchComponents_1.downloadAndSaveItems)(components, 'component', tempDirs, overwrite);
+            }
+            else if (type === 'utils') {
+                (0, paths_1.copyDirectory)(tempDirs.tempUtilsDir, paths_1.utilsDir, ['mocks.ts'], overwrite);
             }
-            console.log(`Selected ${type}s have been added to your project.`);
+            console.log(`Selected ${type}${type.endsWith('s') ? '' : 's'} have been added to your project.`);
         }
         finally {
             (0, child_process_1.execSync)(`rm -rf ${tempDirs.tempDir}`);

package/dist/src/commands/Codegen/Generators/FetchComponents.js

@@ -41,7 +41,7 @@ function fetchRepoBlocks(tempBlocksDir) {
     return blockFiles;
 }
 exports.fetchRepoBlocks = fetchRepoBlocks;
-function downloadAndSaveItems(items, type, tempDirs) {
+function downloadAndSaveItems(items, type, tempDirs, overwrite = false) {
     items.forEach(item => {
         const paths = (0, paths_1.getPaths)(item.name, type, tempDirs);
         if (!fs.existsSync(paths.destTsxDir))
@@ -50,10 +50,10 @@ function downloadAndSaveItems(items, type, tempDirs) {
             fs.mkdirSync(paths.destPhpDir, { recursive: true });
         if (!fs.existsSync(paths.destBladeDir))
             fs.mkdirSync(paths.destBladeDir, { recursive: true });
-        (0, utils_1.writeFile)(paths.destTsxPath, fs.readFileSync(paths.sourceTsxPath, 'utf-8'));
-        (0, utils_1.writeFile)(paths.destPhpPath, fs.readFileSync(paths.sourcePhpPath, 'utf-8'));
-        (0, utils_1.writeFile)(paths.destBladePath, fs.readFileSync(paths.sourceBladePath, 'utf-8'));
+        (0, utils_1.writeFile)(paths.destTsxPath, fs.readFileSync(paths.sourceTsxPath, 'utf-8'), overwrite);
+        (0, utils_1.writeFile)(paths.destPhpPath, fs.readFileSync(paths.sourcePhpPath, 'utf-8'), overwrite);
+        (0, utils_1.writeFile)(paths.destBladePath, fs.readFileSync(paths.sourceBladePath, 'utf-8'), overwrite);
     });
-    (0, paths_1.copyDirectory)(tempDirs.tempUtilsDir, paths_1.utilsDir, ['mocks.ts']);
+    (0, paths_1.copyDirectory)(tempDirs.tempUtilsDir, paths_1.utilsDir, ['mocks.ts'], overwrite);
 }
 exports.downloadAndSaveItems = downloadAndSaveItems;

package/dist/src/commands/Codegen/Generators/GenerateBlock.js

@@ -33,14 +33,18 @@ const child_process_1 = require("child_process");
 const cliRoot_1 = require("../../../lib/cliRoot");
 const utils_1 = require("../../../utils/utils");
 class GenerateBlock {
-    constructor(template, name, components) {
+    constructor(template, name, category, icon, components) {
         this.template = 'default';
         this.name = '';
+        this.icon = '';
+        this.category = '';
         this.components = [];
         this.title = '';
         this.pascalCaseName = '';
         this.template = template;
         this.name = name !== null && name !== void 0 ? name : '';
+        this.category = category !== null && category !== void 0 ? category : '';
+        this.icon = icon !== null && icon !== void 0 ? icon : '';
         this.pascalCaseName = (0, utils_1.toPascalCase)(this.name);
         this.title = this.parseName(this.name);
         this.components = components;
@@ -53,7 +57,7 @@ class GenerateBlock {
         (0, child_process_1.execSync)(`mkdir -p resources/scripts/editor/blocks/${this.name}`);
     }
     createBlockFiles() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let imports = '';
         let attributes = '';
         let viewAttributes = '';
@@ -77,7 +81,7 @@ class GenerateBlock {
             if (editMatch) {
                 importStatements.push(`Edit as ${componentNamePascal}Edit`);
                 if (editMatch[1].includes('setAttributes')) {
-                    editComponent = `<${componentNamePascal}Edit attributes={${componentNameCamel} as ${componentNamePascal}Type} setAttributes={setAttributes} />\n`;
+                    editComponent = `<${componentNamePascal}Edit attributes={${componentNameCamel} as ${componentNamePascal}Type} setAttributes={(${componentNameCamel}) => setAttributes({${componentNameCamel}})} />\n`;
                     editProps = '{ attributes, setAttributes }';
                 }
                 else {
@@ -87,7 +91,7 @@ class GenerateBlock {
             if (sidebarMatch) {
                 importStatements.push(`Sidebar as ${componentNamePascal}Sidebar`);
                 if (sidebarMatch[1].includes('setAttributes')) {
-                    sidebarComponent = `<${componentNamePascal}Sidebar attributes={${componentNameCamel} as ${componentNamePascal}Type} setAttributes={setAttributes} />\n`;
+                    sidebarComponent = `<${componentNamePascal}Sidebar attributes={${componentNameCamel} as ${componentNamePascal}Type} setAttributes={(${componentNameCamel}) => setAttributes({${componentNameCamel}})} />\n`;
                 }
                 else {
                     sidebarComponent = `<${componentNamePascal}Sidebar attributes={${componentNameCamel} as ${componentNamePascal}Type} />\n`;
@@ -111,6 +115,8 @@ class GenerateBlock {
         const destructuring = attributeNames.join(', ');
         (0, utils_1.writeFile)(path_1.default.join(process.cwd(), `resources/scripts/editor/blocks/${this.name}/${this.name}.block.tsx`), this.getTemplate('tsx')
             .replace(/{{name}}/g, (_a = this.name) !== null && _a !== void 0 ? _a : '')
+            .replace(/{{category}}/g, (_b = this.category) !== null && _b !== void 0 ? _b : '')
+            .replace(/{{icon}}/g, (_c = this.icon) !== null && _c !== void 0 ? _c : '')
             .replace(/{{title}}/g, this.title)
             .replace(/{{imports}}/g, imports)
             .replace(/{{attributes}}/g, attributes)
@@ -119,7 +125,7 @@ class GenerateBlock {
             .replace(/{{editComponents}}/g, editComponents));
         (0, utils_1.writeFile)(path_1.default.join(process.cwd(), `resources/views/blocks/${this.name}.blade.php`), this.getTemplate('blade'));
         (0, utils_1.writeFile)(path_1.default.join(process.cwd(), `app/Blocks/${this.pascalCaseName}.php`), this.getTemplate('php')
-            .replace(/{{name}}/g, (_b = this.name) !== null && _b !== void 0 ? _b : '')
+            .replace(/{{name}}/g, (_d = this.name) !== null && _d !== void 0 ? _d : '')
             .replace(/{{pascalCaseName}}/g, this.pascalCaseName)
             .replace(/{{viewAttributes}}/g, viewAttributes));
     }

package/dist/src/utils/paths.js

@@ -72,7 +72,7 @@ const getPaths = (name, type, tempDirs) => {
     };
 };
 exports.getPaths = getPaths;
-function copyDirectory(sourceDir, destDir, excludeFiles = []) {
+function copyDirectory(sourceDir, destDir, excludeFiles = [], overwrite = false) {
     if (!fs.existsSync(destDir)) {
         fs.mkdirSync(destDir, { recursive: true });
     }
@@ -83,10 +83,10 @@ function copyDirectory(sourceDir, destDir, excludeFiles = []) {
             return;
         }
         if (fs.lstatSync(sourcePath).isDirectory()) {
-            copyDirectory(sourcePath, destPath, excludeFiles);
+            copyDirectory(sourcePath, destPath, excludeFiles, overwrite);
         }
         else {
-            (0, utils_1.writeFile)(destPath, fs.readFileSync(sourcePath, 'utf-8'));
+            (0, utils_1.writeFile)(destPath, fs.readFileSync(sourcePath, 'utf-8'), overwrite);
         }
     });
 }

package/dist/src/utils/utils.js

@@ -25,13 +25,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPascalCase = exports.toCamelCase = exports.writeFile = void 0;
 const fs = __importStar(require("fs"));
-function writeFile(filePath, content) {
+function writeFile(filePath, content, overwrite = false) {
     const yellow = "\x1b[33m";
     const green = "\x1b[32m";
+    const cyan = "\x1b[36m";
     const reset = "\x1b[0m";
-    if (fs.existsSync(filePath)) {
+    if (fs.existsSync(filePath) && !overwrite) {
         console.log(`${yellow}File ${filePath} already exists. Skipping file creation.${reset}`);
     }
+    else if (fs.existsSync(filePath) && overwrite) {
+        fs.writeFileSync(filePath, content);
+        console.log(`${cyan}File ${filePath} has been overwritten.${reset}`);
+    }
     else {
         fs.writeFileSync(filePath, content);
         console.log(`${green}File ${filePath} has been created.${reset}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@40q/40q-cli",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "40q CLI tool",
     "main": "index.js",
     "bin": {

package/templates/blocks/default/tsx.txt

@@ -19,10 +19,10 @@ export const name = "by40q/{{name}}";
 export const title = __("{{title}}", "40q");
 
 /* Block category */
-export const category = "40q";
+export const category = "{{category}}";
 
 /* Block icon */
-export const icon = "admin-tools";
+export const icon = "{{icon}}";
 
 /* Block attributes */
 export const attributes = {

package/dist/165.index.js

@@ -1 +0,0 @@
-"use strict";exports.id=165,exports.ids=[165],exports.modules={41165:(s,e,r)=>{r.r(e)}};

package/dist/216.index.js

@@ -1 +0,0 @@
-"use strict";exports.id=216,exports.ids=[216,522],exports.modules={32522:(e,t,s)=>{s.r(t),s.d(t,{BlockGenerator:()=>l});var r=s(57147),a=s(71017),i=s.n(a),c=s(32081);class l{constructor(e){this.template="",this.name="",this.title="",this.camelCaseName="",console.log(e),this.template=""===e.template?"default":e.template,this.name=e.name||"default",this.camelCaseName=this.toCamelCase(this.name),this.title=this.parseName(this.name)}run(){this.createBlockFolder(),this.createBlockFiles()}createBlockFolder(){(0,c.execSync)(`mkdir -p resources/scripts/editor/blocks/${this.name}`)}createBlockFiles(){r.writeFileSync(i().join(process.cwd(),`resources/scripts/editor/blocks/${this.name}/${this.name}.block.tsx`),this.getTemplate("tsx").replace(/{{name}}/g,this.name??"").replace(/{{title}}/g,this.title)),r.writeFileSync(i().join(process.cwd(),`resources/views/blocks/${this.name}.blade.php`),this.getTemplate("blade")),r.writeFileSync(i().join(process.cwd(),`app/Blocks/${this.camelCaseName}.php`),this.getTemplate("php").replace(/{{name}}/g,this.name??"").replace(/{{camelCaseName}}/g,this.camelCaseName))}parseName(e){return e.split("-").map((e=>e.charAt(0).toUpperCase()+e.slice(1))).join(" ")}toCamelCase(e){return e.split("-").reduce(((e,t)=>e+t.charAt(0).toUpperCase()+t.slice(1)),"")??""}getTemplate(e){try{const t=function(e){let t=__dirname;for(;t!==a.parse(t).root;){if(r.existsSync(a.join(t,".cliroot")))return t;t=a.dirname(t)}throw new Error("CLI root directory with .cliroot marker not found.")}(),s=`templates/blocks/${this.template}`;return r.readFileSync(i().join(t,`${s}/${e}.txt`),"utf8")}catch(e){return""}}}},34216:(e,t,s)=>{s.r(t),s.d(t,{BlockGenerator:()=>r.BlockGenerator});var r=s(32522)}};

package/dist/284.index.js

@@ -1 +0,0 @@
-"use strict";exports.id=284,exports.ids=[284,350],exports.modules={63350:(e,t,a)=>{a.r(t),a.d(t,{BlockPromptStrategy:()=>o});var m=a(96062),r=a.n(m),s=a(78913);class o{async prompt(){const e=await r().prompt([{type:"list",name:"template",message:"Please select a template:",choices:s.v.templateChoices.block,default:""}]),t=e?.template||"",a=await r().prompt([{type:"input",name:"name",message:"Please enter a name for the block:",default:t||"block-name"}]);return{name:a?.name||"",template:t}}}},79284:(e,t,a)=>{a.r(t),a.d(t,{BlockPromptStrategy:()=>m.BlockPromptStrategy});var m=a(63350)}};

package/dist/350.index.js

@@ -1 +0,0 @@
-"use strict";exports.id=350,exports.ids=[350],exports.modules={63350:(e,t,a)=>{a.r(t),a.d(t,{BlockPromptStrategy:()=>l});var s=a(96062),m=a.n(s),p=a(78913);class l{async prompt(){const e=await m().prompt([{type:"list",name:"template",message:"Please select a template:",choices:p.v.templateChoices.block,default:""}]),t=e?.template||"",a=await m().prompt([{type:"input",name:"name",message:"Please enter a name for the block:",default:t||"block-name"}]);return{name:a?.name||"",template:t}}}}};

package/dist/522.index.js

@@ -1 +0,0 @@
-"use strict";exports.id=522,exports.ids=[522],exports.modules={32522:(e,t,s)=>{s.r(t),s.d(t,{BlockGenerator:()=>l});var a=s(57147),r=s(71017),i=s.n(r),c=s(32081);class l{constructor(e){this.template="",this.name="",this.title="",this.camelCaseName="",console.log(e),this.template=""===e.template?"default":e.template,this.name=e.name||"default",this.camelCaseName=this.toCamelCase(this.name),this.title=this.parseName(this.name)}run(){this.createBlockFolder(),this.createBlockFiles()}createBlockFolder(){(0,c.execSync)(`mkdir -p resources/scripts/editor/blocks/${this.name}`)}createBlockFiles(){a.writeFileSync(i().join(process.cwd(),`resources/scripts/editor/blocks/${this.name}/${this.name}.block.tsx`),this.getTemplate("tsx").replace(/{{name}}/g,this.name??"").replace(/{{title}}/g,this.title)),a.writeFileSync(i().join(process.cwd(),`resources/views/blocks/${this.name}.blade.php`),this.getTemplate("blade")),a.writeFileSync(i().join(process.cwd(),`app/Blocks/${this.camelCaseName}.php`),this.getTemplate("php").replace(/{{name}}/g,this.name??"").replace(/{{camelCaseName}}/g,this.camelCaseName))}parseName(e){return e.split("-").map((e=>e.charAt(0).toUpperCase()+e.slice(1))).join(" ")}toCamelCase(e){return e.split("-").reduce(((e,t)=>e+t.charAt(0).toUpperCase()+t.slice(1)),"")??""}getTemplate(e){try{const t=function(e){let t=__dirname;for(;t!==r.parse(t).root;){if(a.existsSync(r.join(t,".cliroot")))return t;t=r.dirname(t)}throw new Error("CLI root directory with .cliroot marker not found.")}(),s=`templates/blocks/${this.template}`;return a.readFileSync(i().join(t,`${s}/${e}.txt`),"utf8")}catch(e){return""}}}}};