Added extra option and value in getPluginInfoFromString.

Closes #1217.
altair-graphql · May 2, 2020 · 53ff5ae · 53ff5ae
1 parent 7487bb8
commit 53ff5ae
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/altair-app/src/app/services/plugin/plugin-registry.service.spec.ts b/packages/altair-app/src/app/services/plugin/plugin-registry.service.spec.ts
@@ -68,6 +68,22 @@ describe('PluginRegistryService', () => {
       });
     });
 
+    it('return extra option if specified', () => {
+      const service: PluginRegistryService = TestBed.get(PluginRegistryService);
+      expect(service.getPluginInfoFromString('altair-graphql-plugin-plugin-name@0.0.1::[opt]->[1]')).toEqual({
+        name: 'altair-graphql-plugin-plugin-name',
+        version: '0.0.1',
+        pluginSource: PluginSource.NPM,
+        opt: '1',
+      } as any);
+      expect(service.getPluginInfoFromString('url:altair-graphql-plugin-plugin-name@0.0.1::[url]->[http://localhost:8080]')).toEqual({
+        name: 'altair-graphql-plugin-plugin-name',
+        version: '0.0.1',
+        pluginSource: PluginSource.URL,
+        url: 'http://localhost:8080',
+      } as any);
+    });
+
     it('return specified values', () => {
       const service: PluginRegistryService = TestBed.get(PluginRegistryService);
       expect(service.getPluginInfoFromString('url:altair-graphql-plugin-plugin-name@0.1.1')).toEqual({

diff --git a/packages/altair-app/src/app/services/plugin/plugin-registry.service.ts b/packages/altair-app/src/app/services/plugin/plugin-registry.service.ts
@@ -103,14 +103,14 @@ export class PluginRegistryService {
   }
 
   /**
-   * Given a plugin string in the format: <plugin-source>:<plugin-name>@<version>,
+   * Given a plugin string in the format: <plugin-source>:<plugin-name>@<version>::[<opt>]->[<opt-value>],
    * it returns the details of the plugin
    * @param pluginStr
    */
   getPluginInfoFromString(pluginStr: string) {
-    const matches = pluginStr.match(/((.*)\:)?(.[^@]*)(@(.*))?/);
+    const matches = pluginStr.match(/(([A-Za-z_]*)\:)?(.[A-Za-z0-9\-]*)(@([^#\:\[\]]*))?(\:\:\[(.*)\]->\[(.*)\])?/);
     if (matches && matches.length) {
-      const [, , pluginSource = PluginSource.NPM, pluginName, , pluginVersion = 'latest'] = matches;
+      const [, , pluginSource = PluginSource.NPM, pluginName, , pluginVersion = 'latest', , opt, optVal ] = matches;
       if (pluginName && pluginVersion) {
         if (!pluginName.startsWith(PLUGIN_NAME_PREFIX)) {
           throw new Error(`Plugin name must start with ${PLUGIN_NAME_PREFIX}`);
@@ -119,6 +119,7 @@ export class PluginRegistryService {
           name: pluginName,
           version: pluginVersion,
           pluginSource,
+          ...opt && optVal && { [opt]: optVal },
         };
       }
     }