Merge pull request #53 from magebitcom/release

v1.1.0

Author: KristofersOzolinsMagebit

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Main
+name: Create Release
 
 on:
   push:

package-lock.json

@@ -4,7 +4,7 @@
   "description": "Magento 2 code generation, inspection and utility tools",
   "publisher": "magebit",
   "icon": "assets/logo.png",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "engines": {
     "vscode": "^1.93.1"
   },
@@ -106,6 +106,10 @@
       {
         "command": "magento-toolbox.generateWebapiXmlFile",
         "title": "Magento Toolbox: Generate Webapi XML"
+      },
+      {
+        "command": "magento-toolbox.generatePreference",
+        "title": "Magento Toolbox: Generate Preference"
       }
     ],
     "menus": {
@@ -135,6 +139,10 @@
         {
           "command": "magento-toolbox.generateContextPlugin",
           "when": "magento-toolbox.canGeneratePlugin"
+        },
+        {
+          "command": "magento-toolbox.generatePreference",
+          "when": "magento-toolbox.canGeneratePreference"
         }
       ],
       "magento-toolbox.explorer-submenu": [

package.json

@@ -76,7 +76,7 @@ export default class GenerateContextPluginCommand extends Command {
     await manager.generate(workspaceFolder.uri);
     await manager.writeFiles();
     await manager.refreshIndex(workspaceFolder);
-    manager.openFirstFile();
+    manager.openAllFiles();
   }
 
   private resolvePluginMethod(pluginSubjectInfo: PluginSubjectInfo): PhpMethod | undefined {

src/command/GenerateContextPluginCommand.ts

@@ -59,6 +59,6 @@ export default class GenerateObserverCommand extends Command {
     await manager.generate(workspaceFolder.uri);
     await manager.writeFiles();
     await manager.refreshIndex(workspaceFolder);
-    manager.openFirstFile();
+    manager.openAllFiles();
   }
 }

src/command/GenerateObserverCommand.ts

@@ -0,0 +1,79 @@
+import { Command } from 'command/Command';
+import WizzardClosedError from 'webview/error/WizzardClosedError';
+import FileGeneratorManager from 'generator/FileGeneratorManager';
+import Common from 'util/Common';
+import { TextDocument, Uri, window } from 'vscode';
+import IndexManager from 'indexer/IndexManager';
+import ModuleIndexer from 'indexer/module/ModuleIndexer';
+import PreferenceWizard, { PreferenceWizardData } from 'wizard/PreferenceWizard';
+import PreferenceClassGenerator from 'generator/preference/PreferenceClassGenerator';
+import PhpDocumentParser from 'common/php/PhpDocumentParser';
+import { ClasslikeInfo } from 'common/php/ClasslikeInfo';
+import PreferenceDiGenerator from 'generator/preference/PreferenceDiGenerator';
+
+export default class GeneratePreferenceCommand extends Command {
+  constructor() {
+    super('magento-toolbox.generatePreference');
+  }
+
+  public async execute(uri?: Uri): Promise<void> {
+    const moduleIndex = IndexManager.getIndexData(ModuleIndexer.KEY);
+    let contextModule: string | undefined;
+
+    const contextUri = uri || window.activeTextEditor?.document.uri;
+
+    if (moduleIndex && contextUri) {
+      const module = moduleIndex.getModuleByUri(contextUri);
+
+      if (module) {
+        contextModule = module.name;
+      }
+    }
+
+    const parentClassName = await this.getParentClassName(window.activeTextEditor?.document);
+
+    const preferenceWizard = new PreferenceWizard();
+
+    let data: PreferenceWizardData;
+
+    try {
+      data = await preferenceWizard.show(parentClassName, contextModule);
+    } catch (error) {
+      if (error instanceof WizzardClosedError) {
+        return;
+      }
+
+      throw error;
+    }
+
+    const manager = new FileGeneratorManager([
+      new PreferenceClassGenerator(data),
+      new PreferenceDiGenerator(data),
+    ]);
+
+    const workspaceFolder = Common.getActiveWorkspaceFolder();
+
+    if (!workspaceFolder) {
+      window.showErrorMessage('No active workspace folder');
+      return;
+    }
+
+    await manager.generate(workspaceFolder.uri);
+    await manager.writeFiles();
+    await manager.refreshIndex(workspaceFolder);
+    manager.openAllFiles();
+  }
+
+  private async getParentClassName(
+    document: TextDocument | undefined
+  ): Promise<string | undefined> {
+    if (!document) {
+      return undefined;
+    }
+
+    const phpFile = await PhpDocumentParser.parse(document);
+    const info = new ClasslikeInfo(phpFile);
+
+    return info.getNamespace();
+  }
+}

src/command/GeneratePreferenceCommand.ts

@@ -4,6 +4,7 @@ import CopyMagentoPathCommand from 'command/CopyMagentoPathCommand';
 
 export interface EditorContext {
   canGeneratePlugin: boolean;
+  canGeneratePreference: boolean;
   supportedMagentoPathExtensions: string[];
 }
 
@@ -25,6 +26,7 @@ class Context {
       await this.setContext({
         ...this.editorContext,
         canGeneratePlugin: await this.canGeneratePlugin(editor),
+        canGeneratePreference: await this.canGeneratePreference(editor),
       });
     }
 
@@ -43,6 +45,7 @@ class Context {
   public getDefaultContext(): EditorContext {
     return {
       canGeneratePlugin: false,
+      canGeneratePreference: false,
       supportedMagentoPathExtensions: [
         ...CopyMagentoPathCommand.TEMPLATE_EXTENSIONS,
         ...CopyMagentoPathCommand.WEB_EXTENSIONS,
@@ -83,6 +86,15 @@ class Context {
 
     return false;
   }
+
+  private async canGeneratePreference(editor: TextEditor): Promise<boolean> {
+    if (editor.document.languageId !== 'php') {
+      return false;
+    }
+
+    const phpFile = await PhpDocumentParser.parse(editor.document);
+    return phpFile.classes.length > 0 || phpFile.interfaces.length > 0;
+  }
 }
 
 export default new Context();

src/common/Context.ts

@@ -25,12 +25,17 @@ export default class PhpNamespace {
     return this.parts.join(PhpNamespace.NS_SEPARATOR);
   }
 
-  public append(part: string | PhpNamespace): PhpNamespace {
-    if (typeof part === 'string') {
-      return new PhpNamespace([...this.parts, part]);
-    }
-
-    return new PhpNamespace([...this.parts, ...part.getParts()]);
+  public append(...parts: (string | PhpNamespace)[]): PhpNamespace {
+    return new PhpNamespace([
+      ...this.parts,
+      ...parts.flatMap(part => {
+        if (typeof part === 'string') {
+          return [part];
+        }
+
+        return part.getParts();
+      }),
+    ]);
   }
 
   public prepend(part: string | PhpNamespace): PhpNamespace {

src/common/PhpNamespace.ts

@@ -23,6 +23,7 @@ import GenerateGraphqlSchemaFileCommand from 'command/GenerateGraphqlSchemaFile'
 import GenerateRoutesXmlFileCommand from 'command/GenerateRoutesXmlFileCommand';
 import GenerateAclXmlFileCommand from 'command/GenerateAclXmlFileCommand';
 import GenerateDiXmlFileCommand from 'command/GenerateDiXmlFileCommand';
+import GeneratePreferenceCommand from 'command/GeneratePreferenceCommand';
 
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
@@ -42,6 +43,7 @@ export async function activate(context: vscode.ExtensionContext) {
     GenerateRoutesXmlFileCommand,
     GenerateAclXmlFileCommand,
     GenerateDiXmlFileCommand,
+    GeneratePreferenceCommand,
   ];
 
   ExtensionState.init(context);