@firestartr/cli 2.11.0-snapshot-import-filter-fix → 2.11.0-snapshot-import-filter-fix-2

package/build/index.js

@@ -173409,25 +173409,23 @@ class CollectionMixins {
     async filter(kind, filters, elementList) {
         if (filters.length === 0)
             return elementList;
+        let filteredList = elementList;
         if (this.IS_FILTER_BY_NAME_SET(filters, kind)) {
-            return this.FILTER_BY_NAME_APPLY(filters, kind, (names) => {
-                const result = elementList.filter((el) => names.indexOf(el) !== -1);
-                return result;
-            });
+            filteredList = this.FILTER_BY_NAME_APPLY(filters, kind, (names) => filteredList.filter((el) => names.indexOf(el) !== -1));
         }
-        if (this.IS_FILTER_BY_REGEXP_SET(filters, kind)) {
-            return this.FILTER_BY_REGEXP_APPLY(filters, kind, (nameRegExp) => {
-                return elementList.filter((el) => nameRegExp.test(el));
+        else if (this.IS_FILTER_BY_REGEXP_SET(filters, kind)) {
+            filteredList = this.FILTER_BY_REGEXP_APPLY(filters, kind, (nameRegExp) => {
+                return filteredList.filter((el) => nameRegExp.test(el));
             });
         }
         if (this.IS_FILTER_BY_FUNCTION_SET(filters, kind)) {
-            await this.FILTER_BY_FUNCTION_APPLY(filters, kind, async (fn) => {
-                elementList = (await Promise.all(elementList.map(async (el) => {
+            filteredList = await this.FILTER_BY_FUNCTION_APPLY(filters, kind, async (fn) => {
+                return (await Promise.all(filteredList.map(async (el) => {
                     return (await fn(kind, el)) ? el : undefined;
                 }))).filter((el) => el !== undefined);
             });
         }
-        return elementList;
+        return filteredList;
     }
 }
 
@@ -713425,7 +713423,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-import-filter-fix"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-import-filter-fix-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.10.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js

package/build/packages/importer/src/decanter/collections.d.ts

@@ -8,7 +8,7 @@ export declare class CollectionMixins {
     FILTER_BY_NAME_APPLY(filters: any[], kind: string, fn: Function): any;
     FILTER_BY_REGEXP_APPLY(filters: any[], kind: string, fn: Function): any;
     FILTER_BY_FUNCTION_APPLY(filters: any[], kind: string, fn: Function): any;
-    filter(kind: string, filters: any[], elementList: any[]): Promise<any>;
+    filter(kind: string, filters: any[], elementList: any[]): Promise<any[]>;
 }
 export interface ICollection extends CollectionMixins {
 }

package/build/packages/importer/src/decanter/gh/github_org_settings_collection.d.ts

@@ -1,9 +1,10 @@
+import OrgSettingsGithubDecanter from './github_org_settings';
 import { ICollection } from '../collections';
 import { CollectionFilter } from '../filters';
 import { GithubDecanter } from './base';
 declare class OrgSettingsCollectionGithubDecanter extends GithubDecanter {
     static collectionKind: string;
-    collection(filters?: CollectionFilter[]): Promise<any>;
+    collection(filters?: CollectionFilter[]): Promise<OrgSettingsGithubDecanter[]>;
 }
 interface OrgSettingsCollectionGithubDecanter extends ICollection {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-import-filter-fix",
+  "version": "2.11.0-snapshot-import-filter-fix-2",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",