@airfleet/generator-init 0.21.3 → 0.22.0

package/generators/plugin/templates/.vscode/airfleet.code-snippets.ejs

@@ -5,7 +5,7 @@
     "body": [
       "<?php",
       "",
-      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Features;",
+      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\\\${TM_DIRECTORY/^.+[\\/\\\\]+(.*)$/$1/};",
       "",
       "use Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Vendor\\Airfleet\\Framework\\Features\\BasePluginFeature;",
       "",
@@ -41,7 +41,7 @@
     "body": [
       "<?php",
       "",
-      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Views\\\\${1|Components,Blocks,Partials,Templates,CustomTemplates|}\\\\${TM_FILENAME_BASE/(.+)Controller/$1/};",
+      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Views\\\\${1|Components,Blocks,Partials,Templates,CustomTemplates|}\\\\${TM_FILENAME_BASE/(.+)Setup/$1/};",
       "",
       "use Airfleet\\Plugins\\Views\\View\\ViewSetup;",
       "",
@@ -58,7 +58,7 @@
     "scope": "javascript",
     "prefix": "afjs",
     "body": [
-      "export class ${TM_FILENAME_BASE/(.)([^-]*)-?/${1:/upcase}${2}/g} {",
+      "export class ${TM_FILENAME_BASE/([^.]*)(\\..+)*$/${1:/pascalcase}/} {",
       "  initialize() {",
       "    const { domReady } = window._airfleet.elements.core;",
       "",
@@ -68,7 +68,7 @@
       "  }",
       "}",
       "",
-      "new ${TM_FILENAME_BASE/(.)([^-]*)-?/${1:/upcase}${2}/g}().initialize();",
+      "new ${TM_FILENAME_BASE/([^.]*)(\\..+)*$/${1:/pascalcase}/}().initialize();",
       ""
     ],
     "description": "Create a view script"
@@ -90,10 +90,10 @@
     "body": [
       "{",
       "  \"$schema\": \"https://advancedcustomfields.com/schemas/json/main/block.json\",",
-      "  \"name\": \"${1|airfleet/,airfleet/elements-|}$TM_FILENAME_BASE\",",
-      "  \"title\": \"$2${TM_FILENAME_BASE/-/ /g}\",",
+      "  \"name\": \"${1|airfleet/,airfleet/elements-|}${TM_FILENAME_BASE/([^.]*)(\\..+)*$/$1/}\",",
+      "  \"title\": \"$2${TM_FILENAME_BASE/([^\\.]*)(\\.block)?$/${1:/capitalize}/}\",",
       "  \"description\": \"$3\",",
-      "  \"keywords\": [\"airfleet\", \"${TM_FILENAME_BASE/-/\", \"/g}\"$4]",
+      "  \"keywords\": [\"airfleet\", \"${TM_FILENAME_BASE/([^.]*)(\\..+)*$/$1/}\"$4]",
       "}",
       ""
     ],
@@ -166,6 +166,6 @@
       "</div>",
       ""
     ],
-    "description": "Airfleet Partial Template (Blade)"
+    "description": "Bootstrap a Blade template for a partial"
   }
 }

package/generators/snippets/templates/airfleet.code-snippets.ejs

@@ -5,7 +5,7 @@
     "body": [
       "<?php",
       "",
-      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Features;",
+      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\\\${TM_DIRECTORY/^.+[\\/\\\\]+(.*)$/$1/};",
       "",
       "use Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Vendor\\Airfleet\\Framework\\Features\\BasePluginFeature;",
       "",
@@ -41,7 +41,7 @@
     "body": [
       "<?php",
       "",
-      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Views\\\\${1|Components,Blocks,Partials,Templates,CustomTemplates|}\\\\${TM_FILENAME_BASE/(.+)Controller/$1/};",
+      "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Views\\\\${1|Components,Blocks,Partials,Templates,CustomTemplates|}\\\\${TM_FILENAME_BASE/(.+)Setup/$1/};",
       "",
       "use Airfleet\\Plugins\\Views\\View\\ViewSetup;",
       "",
@@ -58,7 +58,7 @@
     "scope": "javascript",
     "prefix": "afjs",
     "body": [
-      "export class ${TM_FILENAME_BASE/(.)([^-]*)-?/${1:/upcase}${2}/g} {",
+      "export class ${TM_FILENAME_BASE/([^.]*)(\\..+)*$/${1:/pascalcase}/} {",
       "  initialize() {",
       "    const { domReady } = window._airfleet.elements.core;",
       "",
@@ -68,7 +68,7 @@
       "  }",
       "}",
       "",
-      "new ${TM_FILENAME_BASE/(.)([^-]*)-?/${1:/upcase}${2}/g}().initialize();",
+      "new ${TM_FILENAME_BASE/([^.]*)(\\..+)*$/${1:/pascalcase}/}().initialize();",
       ""
     ],
     "description": "Create a view script"
@@ -90,10 +90,10 @@
     "body": [
       "{",
       "  \"$schema\": \"https://advancedcustomfields.com/schemas/json/main/block.json\",",
-      "  \"name\": \"${1|airfleet/,airfleet/elements-|}$TM_FILENAME_BASE\",",
-      "  \"title\": \"$2${TM_FILENAME_BASE/-/ /g}\",",
+      "  \"name\": \"${1|airfleet/,airfleet/elements-|}${TM_FILENAME_BASE/([^.]*)(\\..+)*$/$1/}\",",
+      "  \"title\": \"$2${TM_FILENAME_BASE/([^\\.]*)(\\.block)?$/${1:/capitalize}/}\",",
       "  \"description\": \"$3\",",
-      "  \"keywords\": [\"airfleet\", \"${TM_FILENAME_BASE/-/\", \"/g}\"$4]",
+      "  \"keywords\": [\"airfleet\", \"${TM_FILENAME_BASE/([^.]*)(\\..+)*$/$1/}\"$4]",
       "}",
       ""
     ],

package/generators/view/index.js

@@ -40,7 +40,7 @@ export default class extends Generator {
         ? [this.viewsPrefix, this.viewType.slug, this.name.slug]
         : [this.viewType.slug, this.name.slug]
     ).join("-");
-    this.viewFolder = `${this.answers.viewsFolder}/${this.viewType.slug}/${this.name.slug}`;
+    this.viewFolder = this._viewFolder();
     this.cssClassPrefix = this._cssClassPrefix(this.viewType.slug);
     this.cssClass = `${this.cssClassPrefix}-${this.name.slug}`;
     this.namespace = this._phpNamespace();
@@ -64,7 +64,30 @@ export default class extends Generator {
     };
   }
 
+  _viewFolder() {
+    return `${this._viewFolderBase()}/${this.viewType.slug}/${this.name.slug}`;
+  }
+
+  _viewFolderBase() {
+    if (this.answers.source === "lightyear-theme") {
+      return this.answers.viewsFolderTheme;
+    }
+
+    return this.answers.viewsFolder;
+  }
+
   _viewsPrefix() {
+    if (this.answers.source === "lightyear-theme") {
+      switch (this.answers.viewsFolderTheme) {
+        case "views":
+          return "";
+        case "views-elements":
+          return "elements";
+        default:
+          throw new Error("Unable to determine views prefix. Unexpected views folder: " + this.answers.viewsFolderTheme);
+      }
+    }
+
     if (this.answers.viewsPrefix === "other") {
       return nameCases(this.answers.viewsPrefixOther).slug;
     }
@@ -77,6 +100,10 @@ export default class extends Generator {
   }
 
   _phpNamespace() {
+    return this._phpBaseNamespace() + "\\" + this._phpViewsNamespace();
+  }
+
+  _phpBaseNamespace() {
     switch (this.answers.source) {
       case "starter-theme":
         return "App";
@@ -87,6 +114,14 @@ export default class extends Generator {
     }
   }
 
+  _phpViewsNamespace() {
+    if (this.answers.source === "lightyear-theme") {
+      return nameCases(this.answers.viewsFolderTheme).pascal;
+    }
+
+    return this.answers.viewsNamespace;
+  }
+
   _cssClassPrefix(viewType) {
     switch (viewType) {
       case "partials":

package/generators/view/prompts.js

@@ -15,14 +15,21 @@ export default class {
     if (this.answers.source === "plugin") {
       await this._promptNext([this._pluginNamePrompt()]);
     }
-    await this._promptNext([
-      this._viewsFolderPrompt(),
-      this._viewsPrefixPrompt(),
-    ]);
 
-    if (this.answers.viewsPrefix === "other") {
-      await this._promptNext([this._viewsPrefixOtherPrompt()]);
+    if (this.answers.source === "lightyear-theme") {
+      await this._promptNext([this._themeViewsFolderPrompt()]);
+    } else {
+      await this._promptNext([
+        this._viewsFolderPrompt(),
+        this._viewsNamespacePrompt(),
+        this._viewsPrefixPrompt(),
+      ]);
+
+      if (this.answers.viewsPrefix === "other") {
+        await this._promptNext([this._viewsPrefixOtherPrompt()]);
+      }
     }
+
     await this._promptNext([
       this._viewTypePrompt(),
       this._viewNamePrompt(),
@@ -78,7 +85,7 @@ export default class {
           value: "plugin",
         },
       ],
-      default: "starter-theme",
+      default: "lightyear-theme",
       store: true,
     };
   }
@@ -93,6 +100,45 @@ export default class {
     };
   }
 
+  _themeViewsFolderPrompt() {
+    return {
+      type: "list",
+      name: "viewsFolderTheme",
+      message: `Views folder?`,
+      choices: [
+        "views",
+        "views-elements",
+      ],
+      default: "views",
+      store: true,
+    };
+  }
+
+  _viewsFolderPrompt() {
+    return {
+      type: "input",
+      name: "viewsFolder",
+      message: "Views folder?",
+      validate: requiredText("Please enter the views folder"),
+      default: "views",
+      store: true,
+    };
+  }
+
+  _viewsNamespacePrompt() {
+    return {
+      type: "list",
+      name: "viewsNamespace",
+      message: `Views PHP namespace?`,
+      choices: [
+        "Views",
+        "ViewsElements",
+      ],
+      default: "Views",
+      store: true,
+    };
+  }
+
   _viewsPrefixPrompt() {
     return {
       type: "list",
@@ -117,17 +163,6 @@ export default class {
     };
   }
 
-  _viewsFolderPrompt() {
-    return {
-      type: "input",
-      name: "viewsFolder",
-      message: "Views folder?",
-      validate: requiredText("Please enter the views folder"),
-      default: "views",
-      store: true,
-    };
-  }
-
   _viewTypePrompt() {
     return {
       type: "list",

package/generators/view/templates/ViewController.php.ejs

@@ -1,6 +1,6 @@
 <?php
 
-namespace <%= namespace %>\Views\<%= viewType.pascal %>\<%= name.pascal %>;
+namespace <%= namespace %>\<%= viewType.pascal %>\<%= name.pascal %>;
 
 use Airfleet\Plugins\Views\View\ViewController;
 

package/generators/view/templates/ViewSetup.php.ejs

@@ -1,6 +1,6 @@
 <?php
 
-namespace <%= namespace %>\Views\<%= viewType.pascal %>\<%= name.pascal %>;
+namespace <%= namespace %>\<%= viewType.pascal %>\<%= name.pascal %>;
 
 use Airfleet\Plugins\Views\View\ViewSetup;
 

package/generators/view/templates/setup/OverrideSetup.php.ejs

@@ -1,6 +1,6 @@
 <?php
 
-namespace <%= namespace %>\Views\<%= viewType.pascal %>\<%= name.pascal %>;
+namespace <%= namespace %>\<%= viewType.pascal %>\<%= name.pascal %>;
 
 use Airfleet\Plugins\Views\View\ViewSetup;
 

package/generators/view/templates/view-lightyear.scss.ejs

@@ -0,0 +1,5 @@
+@import '../../../assets/shared/styles/lib';
+
+.<%= cssClass %> {
+  // TODO
+}

package/generators/view/templates.js

@@ -68,26 +68,27 @@ export default class {
   }
 
   _stylesTemplates() {
+    const template = this.generator.answers.source === "lightyear-theme" ? `view-lightyear.scss.ejs` : `view.scss.ejs`;
     const extension = this.generator.answers.source === "starter-theme" ? "scss" : "entry.scss";
 
     return [
       {
-        template: `view.scss.ejs`,
+        template,
         destination: `${this.generator.viewFolder}/${this.generator.name.slug}.${extension}`,
         isEnabled: this._styleEnabled("frontend"),
       },
       {
-        template: `view.scss.ejs`,
+        template,
         destination: `${this.generator.viewFolder}/${this.generator.name.slug}.critical.${extension}`,
         isEnabled: this._styleEnabled("critical"),
       },
       {
-        template: `view.scss.ejs`,
+        template,
         destination: `${this.generator.viewFolder}/${this.generator.name.slug}.editor.${extension}`,
         isEnabled: this._styleEnabled("editor"),
       },
       {
-        template: `view.scss.ejs`,
+        template,
         destination: `${this.generator.viewFolder}/${this.generator.name.slug}.admin.${extension}`,
         isEnabled: this._styleEnabled("admin"),
       },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airfleet/generator-init",
   "description": "A Yeoman generator to scaffold common Airfleet features",
-  "version": "0.21.3",
+  "version": "0.22.0",
   "scripts": {},
   "publishConfig": {
     "access": "public"