@speedkit/cli 2.10.0 → 2.11.0

package/dist/services/onboarding/onboarding-service-factory.js

@@ -2,44 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnboardingServiceFactory = void 0;
 const tslib_1 = require("tslib");
-const onboarding_service_1 = require("./onboarding-service");
-const integration_api_context_1 = tslib_1.__importDefault(require("../integration-api/context/integration-api-context"));
-const integration_api_service_factory_1 = tslib_1.__importDefault(require("../integration-api/factory/integration-api-service-factory"));
-const onboarding_model_1 = require("./onboarding-model");
-const fetch_event_handler_1 = require("./fetch-event-handler");
-const speed_kit_install_html_1 = require("./fetch-events/speed-kit-install-html");
-const customer_domain_document_response_1 = require("./fetch-events/customer-domain-document-response");
-const speed_kit_install_context_1 = require("./config-renderer/speed-kit-install-context");
-const install_speed_kit_js_template_1 = require("./templates/install-speed-kit-js-template");
+const client_athena_1 = require("@aws-sdk/client-athena");
+const vm = tslib_1.__importStar(require("node:vm"));
+const safe_1 = require("../../helpers/safe");
+const files_1 = require("../../models/files");
 const bundler_1 = require("../bundler");
-const speed_kit_install_js_1 = require("./fetch-events/speed-kit-install-js");
-const speed_kit_service_worker_js_1 = require("./fetch-events/speed-kit-service-worker-js");
-const customer_service_worker_js_1 = require("./fetch-events/customer-service-worker-js");
-const fileWatcher_1 = require("./file-events/fileWatcher");
 const cli_1 = require("../cli");
-const install_speed_kit_html_template_1 = require("./templates/install-speed-kit-html-template");
 const config_api_context_1 = tslib_1.__importDefault(require("../config-api/context/config-api-context"));
 const config_api_service_factory_1 = tslib_1.__importDefault(require("../config-api/factory/config-api-service-factory"));
-const speed_kit_asset_request_1 = require("./fetch-events/speed-kit-asset-request");
-const document_handler_runtime_service_factory_1 = tslib_1.__importDefault(require("../document-handler-runtime/factory/document-handler-runtime-service-factory"));
-const cache_1 = require("./request-cache/cache");
-const todo_collector_1 = require("./todo-collector");
-const dashboard_request_1 = require("./fetch-events/dashboard-request");
-const dashboard_1 = require("./dashboard");
-const param_query_builder_1 = require("./dashboard/param-query-builder");
-const athena_service_1 = require("./dashboard/athena-service");
-const client_athena_1 = require("@aws-sdk/client-athena");
 const diff_1 = require("../diff");
-const request_diff_service_1 = require("./dashboard/request-diff-service");
-const safe_1 = require("../../helpers/safe");
-const vm = tslib_1.__importStar(require("vm"));
-const external_recipe_1 = require("../integration-api/virtual/external-recipe");
+const document_handler_runtime_service_factory_1 = tslib_1.__importDefault(require("../document-handler-runtime/factory/document-handler-runtime-service-factory"));
+const integration_api_context_1 = tslib_1.__importDefault(require("../integration-api/context/integration-api-context"));
 const external_file_reader_1 = require("../integration-api/external/external-file-reader");
+const integration_api_service_factory_1 = tslib_1.__importDefault(require("../integration-api/factory/integration-api-service-factory"));
 const virtual_file_1 = require("../integration-api/struct/virtual-file");
+const external_recipe_1 = require("../integration-api/virtual/external-recipe");
 const install_file_recipe_1 = require("./config-renderer/install-file-recipe");
-const files_1 = require("../../models/files");
+const speed_kit_install_context_1 = require("./config-renderer/speed-kit-install-context");
+const dashboard_1 = require("./dashboard");
+const athena_service_1 = require("./dashboard/athena-service");
+const param_query_builder_1 = require("./dashboard/param-query-builder");
+const request_diff_service_1 = require("./dashboard/request-diff-service");
+const fetch_event_handler_1 = require("./fetch-event-handler");
+const customer_domain_document_response_1 = require("./fetch-events/customer-domain-document-response");
+const customer_service_worker_js_1 = require("./fetch-events/customer-service-worker-js");
+const dashboard_request_1 = require("./fetch-events/dashboard-request");
+const speed_kit_asset_request_1 = require("./fetch-events/speed-kit-asset-request");
+const speed_kit_install_html_1 = require("./fetch-events/speed-kit-install-html");
+const speed_kit_install_js_1 = require("./fetch-events/speed-kit-install-js");
 const speed_kit_rum_pi_request_1 = require("./fetch-events/speed-kit-rum-pi-request");
+const speed_kit_service_worker_js_1 = require("./fetch-events/speed-kit-service-worker-js");
+const file_watcher_1 = require("./file-events/file-watcher");
+const onboarding_model_1 = require("./onboarding-model");
+const onboarding_service_1 = require("./onboarding-service");
+const cache_1 = require("./request-cache/cache");
 const server_config_1 = require("./server-config");
+const install_speed_kit_html_template_1 = require("./templates/install-speed-kit-html-template");
+const install_speed_kit_js_template_1 = require("./templates/install-speed-kit-js-template");
+const todo_collector_1 = require("./todo-collector");
 class OnboardingServiceFactory {
     context;
     cliConfig;
@@ -58,30 +58,21 @@ class OnboardingServiceFactory {
             customerPath: this.context.customerPath,
             fileDependencies: [],
             requiredFiles: [],
-            verboseLevel: this.context.verboseLevel
+            verboseLevel: this.context.verboseLevel,
         };
         const documentHandler = await new document_handler_runtime_service_factory_1.default(documentHandlerContext, this.cliConfig, files).buildDocumentHandlerServer();
         const bundler = new bundler_1.BundleServiceFactory().buildService();
         const skTemplate = new install_speed_kit_js_template_1.InstallSpeedKitJsTemplate();
         const speedKitInstallContext = new speed_kit_install_context_1.SpeedKitInstallContext(customerConfig, this.context.configName, files, bundler, skTemplate, this.context.local);
         await this.buildInstallResource(speedKitInstallContext, files, cli);
-        const browserContext = new onboarding_model_1.BrowserContext(domainToStart, customerConfig.chromeFlags || []);
-        const fileWatcher = new fileWatcher_1.FileWatcher(cli, customerConfig, files, documentHandler, browserContext, cache);
+        const browserContext = new onboarding_model_1.BrowserContext(domainToStart, customerConfig.chromeFlags || [], this.cliConfig);
+        const fileWatcher = new file_watcher_1.FileWatcher(cli, customerConfig, files, documentHandler, browserContext, cache);
         const fetchHandler = await this.getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext);
         const fileTodoCollector = new todo_collector_1.TodoCollector(files.getInstallResources());
         return new onboarding_service_1.OnboardingService(browserContext, customerConfig, fetchHandler, fileWatcher, cli, fileTodoCollector);
     }
-    async getUrlForTest(customerConfig, cli) {
-        let domainToStart = customerConfig.origins[0];
-        if (customerConfig.origins.length > 1) {
-            domainToStart = await cli.select('select domain to start', customerConfig.origins.map((origin) => {
-                return { name: origin, value: origin };
-            }));
-        }
-        return domainToStart;
-    }
     async buildInstallResource(speedKitInstallContext, files, cli) {
-        cli.startAction('build file install_resource');
+        cli.startAction("build file install_resource");
         const installResourceFile = new virtual_file_1.VirtualFile(files_1.INTEGRATION_FILES.BUILD.INSTALL, new install_file_recipe_1.InstallFileRecipe(speedKitInstallContext));
         const result = await (0, safe_1.safe)(installResourceFile.buildContent());
         if (result.success === true) {
@@ -92,6 +83,38 @@ class OnboardingServiceFactory {
         cli.endAction(cli_1.CliActionStatus.FAILED);
         cli.writeError(result.error);
     }
+    async getAthenaClient(cli) {
+        const credentials = await this.getCredentials(cli);
+        if (!credentials) {
+            return;
+        }
+        const config = {
+            credentials: {
+                accessKeyId: credentials?.accessKeyId,
+                secretAccessKey: credentials?.secretAccessKey,
+            },
+            region: "eu-central-1",
+        };
+        return new athena_service_1.AthenaService(new client_athena_1.Athena(config), cli);
+    }
+    getConfigApi(app) {
+        const configApiContext = new config_api_context_1.default(app);
+        return new config_api_service_factory_1.default(configApiContext).getService();
+    }
+    async getCredentials(cli) {
+        cli.startAction("fetch athena credentials");
+        const configApiContext = new config_api_context_1.default("onboarding");
+        const configApi = new config_api_service_factory_1.default(configApiContext).getService();
+        const credentialsResult = await (0, safe_1.safe)(configApi.getModule("credentials"));
+        if (credentialsResult.success === true) {
+            const context = { module: { exports: { AWS_ATHENA: {} } } };
+            vm.runInNewContext(credentialsResult.data, context);
+            cli.endAction(cli_1.CliActionStatus.COMPLETED);
+            return context.module.exports.AWS_ATHENA;
+        }
+        cli.endAction(cli_1.CliActionStatus.FAILED);
+        cli.writeError(credentialsResult.error);
+    }
     async getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext) {
         const configApi = this.getConfigApi(customerConfig.app);
         const paramQueryBuilder = new param_query_builder_1.ParamQueryBuilder(customerConfig, files.getByName(files_1.INTEGRATION_FILES.CONFIG.SPEED_KIT));
@@ -106,8 +129,7 @@ class OnboardingServiceFactory {
         ];
         if (this.context.local) {
             const speedKitConfigLoader = new server_config_1.ServerConfig(cli, configApi);
-            handlers.push(new speed_kit_asset_request_1.SpeedKitAssetRequest(customerConfig, documentHandler, cache, cli, await speedKitConfigLoader.getServerSpeedKitConfig()));
-            handlers.push(new speed_kit_rum_pi_request_1.SpeedKitRumPiRequest(customerConfig, cache, cli));
+            handlers.push(new speed_kit_asset_request_1.SpeedKitAssetRequest(customerConfig, documentHandler, cache, cli, await speedKitConfigLoader.getServerSpeedKitConfig()), new speed_kit_rum_pi_request_1.SpeedKitRumPiRequest(customerConfig, cache, cli));
         }
         const athenaClient = await this.getAthenaClient(cli);
         if (athenaClient) {
@@ -120,50 +142,33 @@ class OnboardingServiceFactory {
         const integrationApiContext = new integration_api_context_1.default(this.context.customerPath, this.context.configName, []);
         const integrationApi = new integration_api_service_factory_1.default(integrationApiContext, this.cliConfig).buildService();
         const externalFileReader = new external_file_reader_1.ExternalFileReader();
-        return await integrationApi.run([
-            { name: files_1.INTEGRATION_FILES.CUSTOM.SW, recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_SW_PATH, externalFileReader) },
+        return integrationApi.run([
+            {
+                name: files_1.INTEGRATION_FILES.CUSTOM.SW,
+                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_SW_PATH, externalFileReader),
+            },
             {
                 name: files_1.INTEGRATION_FILES.CUSTOM.DYNAMIC_FETCHER,
-                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_DF_PATH, externalFileReader)
+                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_DF_PATH, externalFileReader),
             },
             {
                 name: files_1.INTEGRATION_FILES.CUSTOM.LOADER,
-                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_SNIPPET_PATH, externalFileReader)
+                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_SNIPPET_PATH, externalFileReader),
             },
             {
                 name: files_1.INTEGRATION_FILES.CUSTOM.DOCUMENT_HANDLER,
-                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_DOCUMENT_HANDLER_PATH, externalFileReader)
+                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_DOCUMENT_HANDLER_PATH, externalFileReader),
             },
         ]);
     }
-    getConfigApi(app) {
-        const configApiContext = new config_api_context_1.default(app);
-        return new config_api_service_factory_1.default(configApiContext).getService();
-    }
-    async getAthenaClient(cli) {
-        const credentials = await this.getCredentials(cli);
-        if (!credentials) {
-            return;
-        }
-        const config = {
-            region: 'eu-central-1',
-            credentials: { accessKeyId: credentials?.accessKeyId, secretAccessKey: credentials?.secretAccessKey },
-        };
-        return new athena_service_1.AthenaService(new client_athena_1.Athena(config), cli);
-    }
-    async getCredentials(cli) {
-        cli.startAction('fetch athena credentials');
-        const configApiContext = new config_api_context_1.default('onboarding');
-        const configApi = new config_api_service_factory_1.default(configApiContext).getService();
-        const credentialsResult = await (0, safe_1.safe)(configApi.getModule('credentials'));
-        if (credentialsResult.success === true) {
-            const context = { module: { exports: { AWS_ATHENA: {} } } };
-            vm.runInNewContext(credentialsResult.data, context);
-            cli.endAction(cli_1.CliActionStatus.COMPLETED);
-            return context.module.exports.AWS_ATHENA;
+    async getUrlForTest(customerConfig, cli) {
+        let domainToStart = customerConfig.origins[0];
+        if (customerConfig.origins.length > 1) {
+            domainToStart = await cli.select("select domain to start", customerConfig.origins.map((origin) => {
+                return { name: origin, value: origin };
+            }));
         }
-        cli.endAction(cli_1.CliActionStatus.FAILED);
-        cli.writeError(credentialsResult.error);
+        return domainToStart;
     }
 }
 exports.OnboardingServiceFactory = OnboardingServiceFactory;

package/dist/services/onboarding/onboarding-service.d.ts

@@ -1,8 +1,8 @@
+import { CliService } from "../cli";
 import CustomerConfig from "../integration-api/struct/customer-config";
-import { BrowserContext } from "./onboarding-model";
 import { FetchEventHandler } from "./fetch-event-handler";
-import { FileWatcher } from "./file-events/fileWatcher";
-import { CliService } from "../cli";
+import { FileWatcher } from "./file-events/file-watcher";
+import { BrowserContext } from "./onboarding-model";
 import { TodoCollector } from "./todo-collector";
 /**
  * Represents the OnboardingService which is responsible for setting up the browser to test a config using Puppeteer.
@@ -20,12 +20,12 @@ export declare class OnboardingService {
      * prepare puppeteerBrowser, add eventListeners and start
      */
     run(): Promise<void>;
-    private prepareBrowser;
-    private preparePage;
     private findPage;
+    private navigate;
+    private prepareBrowser;
     private prepareCleanState;
-    private reinstallSpeedKit;
+    private preparePage;
     private registerFileWatcher;
     private registerReinstallSpeedKitOnNavigate;
-    private navigate;
+    private reinstallSpeedKit;
 }

package/dist/services/onboarding/onboarding-service.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnboardingService = void 0;
 const tslib_1 = require("tslib");
-const puppeteer_extra_1 = tslib_1.__importDefault(require("puppeteer-extra"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const cli_1 = require("../cli");
+const puppeteer_extra_1 = tslib_1.__importDefault(require("puppeteer-extra"));
 const safe_1 = require("../../helpers/safe");
+const cli_1 = require("../cli");
 /**
  * Represents the OnboardingService which is responsible for setting up the browser to test a config using Puppeteer.
  */
@@ -29,58 +29,52 @@ class OnboardingService {
      * prepare puppeteerBrowser, add eventListeners and start
      */
     async run() {
-        this.cli.startAction('prepare browser');
+        this.cli.startAction("prepare browser");
         const browser = await this.prepareBrowser();
         const page = await this.preparePage(browser);
         this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
         if (this.browserContext.startParameterDashboard) {
-            await (await browser.newPage()).goto('http://skonboarding.local/');
+            // eslint-disable-next-line unicorn/no-await-expression-member
+            await (await browser.newPage()).goto("http://skonboarding.local/");
         }
         await this.navigate(page, `${this.customerConfig.scope}speed-kit-install.html?url=${this.customerConfig.scope}`);
     }
+    async findPage(browser) {
+        if (!browser)
+            throw new Error("Please start a browser first.");
+        const [page] = await browser.pages();
+        if (page) {
+            return page;
+        }
+        return browser.newPage();
+    }
+    async navigate(page, pathname) {
+        const goto = new URL(pathname, `${this.browserContext.domain}`);
+        await page.goto(goto.toString());
+        await page.bringToFront();
+    }
     async prepareBrowser() {
         const browser = await puppeteer_extra_1.default.launch({
-            devtools: true,
+            args: this.browserContext.browserArgs,
             defaultViewport: null,
-            headless: false, /* ignoreDefaultArgs: true, */
+            devtools: true,
             executablePath: this.browserContext.chromePath,
-            args: this.browserContext.browserArgs,
+            headless: false /* ignoreDefaultArgs: true, */,
         });
         for (const target of browser.targets()) {
-            if (target.type() === 'browser') {
+            if (target.type() === "browser") {
                 await this.fetchEventHandler.handleRequestFetchEvents(target);
             }
         }
-        browser.on('disconnected', () => {
-            this.cli.writeError('Browser disconnected, shutting down');
+        browser.on("disconnected", () => {
+            this.cli.writeError("Browser disconnected, shutting down");
             process.exit(-1);
         });
         return browser;
     }
-    async preparePage(browser) {
-        const page = await this.findPage(browser);
-        await this.prepareCleanState(page);
-        this.registerFileWatcher(page);
-        this.registerReinstallSpeedKitOnNavigate(page);
-        // inject open Todos from configFiles
-        page.on('framenavigated', async (frame) => {
-            const tasks = this.taskCollector.getOpenTasks();
-            await (0, safe_1.safe)(page.evaluate(`window.skOnboarding = ${JSON.stringify(tasks)}`));
-        });
-        return page;
-    }
-    async findPage(browser) {
-        if (!browser)
-            throw new Error('Please start a browser first.');
-        const [page] = await browser.pages();
-        if (page) {
-            return page;
-        }
-        return browser.newPage();
-    }
     async prepareCleanState(page) {
         const pageClient = await page.target().createCDPSession();
-        pageClient.on('ServiceWorker.workerRegistrationUpdated', ({ registrations }) => {
+        pageClient.on("ServiceWorker.workerRegistrationUpdated", ({ registrations, }) => {
             for (const registration of registrations) {
                 if (registration.isDeleted) {
                     this.cli.writeWarning((0, chalk_1.default) `{yellow Unregistered Service Worker} at {bold ${registration.scopeURL}} (${registration.registrationId})`);
@@ -89,21 +83,29 @@ class OnboardingService {
         });
         // cleanUp old serviceWorkers
         await pageClient.send("ServiceWorker.enable");
-        await pageClient.send("ServiceWorker.unregister", { scopeURL: this.browserContext.domain });
+        await pageClient.send("ServiceWorker.unregister", {
+            scopeURL: this.browserContext.domain,
+        });
         // clear storage for a clean start
-        await pageClient.send('Storage.clearCookies');
-        await pageClient.send("Storage.clearDataForOrigin", { origin: this.browserContext.domain, storageTypes: 'all' });
+        await pageClient.send("Storage.clearCookies");
+        await pageClient.send("Storage.clearDataForOrigin", {
+            origin: this.browserContext.domain,
+            storageTypes: "all",
+        });
         await pageClient.send("Emulation.clearDeviceMetricsOverride");
         await pageClient.send("Emulation.clearGeolocationOverride");
     }
-    async reinstallSpeedKit(page, pathname) {
-        const url = new URL(page.url());
-        let target = url.href;
-        if (!pathname.includes('/speed-kit-install.html')) {
-            target = `${this.customerConfig.scope}speed-kit-install.html?url=${encodeURIComponent(target)}`;
-        }
-        this.reinstallOnNextNavigate = false;
-        await this.navigate(page, target);
+    async preparePage(browser) {
+        const page = await this.findPage(browser);
+        await this.prepareCleanState(page);
+        this.registerFileWatcher(page);
+        this.registerReinstallSpeedKitOnNavigate(page);
+        // inject open Todos from configFiles
+        page.on("framenavigated", async (_frame) => {
+            const tasks = this.taskCollector.getOpenTasks();
+            await (0, safe_1.safe)(page.evaluate(`window.skOnboarding = ${JSON.stringify(tasks)}`));
+        });
+        return page;
     }
     registerFileWatcher(page) {
         this.fileWatcher.addCallbackOnFileChange(page, async () => {
@@ -111,7 +113,7 @@ class OnboardingService {
         });
     }
     registerReinstallSpeedKitOnNavigate(page) {
-        page.on('framenavigated', async (frame) => {
+        page.on("framenavigated", async (frame) => {
             if (frame.parentFrame() !== null) {
                 return;
             }
@@ -121,10 +123,14 @@ class OnboardingService {
             }
         });
     }
-    async navigate(page, pathname) {
-        const goto = new URL(pathname, `${this.browserContext.domain}`);
-        await page.goto(goto.toString());
-        await page.bringToFront();
+    async reinstallSpeedKit(page, pathname) {
+        const url = new URL(page.url());
+        let target = url.href;
+        if (!pathname.includes("/speed-kit-install.html")) {
+            target = `${this.customerConfig.scope}speed-kit-install.html?url=${encodeURIComponent(target)}`;
+        }
+        this.reinstallOnNextNavigate = false;
+        await this.navigate(page, target);
     }
 }
 exports.OnboardingService = OnboardingService;

package/dist/services/onboarding/request-cache/cache.d.ts

@@ -1,5 +1,5 @@
-import { BaqendResponse } from "../browser/baqend-response";
 import { CliService } from "../../cli";
+import { BaqendResponse } from "../browser/baqend-response";
 /**
  * This class represents a cache for storing responses from the localDocumentHandler.
  */
@@ -7,9 +7,9 @@ export declare class Cache {
     private cli;
     private inMemoryCache;
     constructor(cli: CliService);
+    addEntry(requestUri: string, response: BaqendResponse): void;
+    clear(): void;
     getAll(): IterableIterator<[string, BaqendResponse]>;
     getEntry(requestUri: string): BaqendResponse | void;
-    addEntry(requestUri: string, response: BaqendResponse): void;
     removeEntry(requestUri: string): void;
-    clear(): void;
 }

package/dist/services/onboarding/request-cache/cache.js

@@ -10,6 +10,13 @@ class Cache {
     constructor(cli) {
         this.cli = cli;
     }
+    addEntry(requestUri, response) {
+        this.inMemoryCache.set(requestUri, response);
+    }
+    clear() {
+        this.cli.writeWarning("clear request-caches");
+        this.inMemoryCache.clear();
+    }
     getAll() {
         return this.inMemoryCache.entries();
     }
@@ -18,15 +25,8 @@ class Cache {
             return this.inMemoryCache.get(requestUri);
         }
     }
-    addEntry(requestUri, response) {
-        this.inMemoryCache.set(requestUri, response);
-    }
     removeEntry(requestUri) {
         this.inMemoryCache.delete(requestUri);
     }
-    clear() {
-        this.cli.writeWarning('clear request-caches');
-        this.inMemoryCache.clear();
-    }
 }
 exports.Cache = Cache;

package/dist/services/onboarding/server-config/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerConfig = void 0;
-const cli_1 = require("../../cli");
 const safe_1 = require("../../../helpers/safe");
+const cli_1 = require("../../cli");
 class ServerConfig {
     cli;
     client;
@@ -18,7 +18,7 @@ class ServerConfig {
         return JSON.parse(serverConfig);
     }
     async getServerConfig() {
-        this.cli.startAction('wait for credentials from server-config');
+        this.cli.startAction("wait for credentials from server-config");
         const serverConfigResponse = await (0, safe_1.safe)(this.client.getServerConfig());
         if (serverConfigResponse.success === false) {
             this.cli.endAction(cli_1.CliActionStatus.FAILED);

package/dist/services/onboarding/todo-collector.d.ts

@@ -1,9 +1,9 @@
 import { FileInterface } from "../integration-api/integration-api-model";
 export type task = {
-    todo: string;
     context: string;
     file: string;
     line: number;
+    todo: string;
 };
 /**
  * Represents a TodoCollector class that collects open tasks from files.

package/dist/services/onboarding/todo-collector.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TodoCollector = void 0;
 const virtual_file_1 = require("../integration-api/struct/virtual-file");
-const TODO_MATCH = /(todo[^(\r\n|\r|\n)]*)((?:\r\n|\r|\n)[^(\r\n|\r|\n)]*(?:\r\n|\r|\n)[^(\r\n|\r|\n)]*(?:\r\n|\r|\n)[^(\r\n|\r|\n)]*)/i;
+const TODO_MATCH = /(todo[^\n\r()|]*)((?:(?:\r\n|\r|\n)[^\n\r()|]*){3})/i;
 /**
  * Represents a TodoCollector class that collects open tasks from files.
  * This files will then be injected to the current open page, so you or the browser-extension can access and display them
@@ -13,7 +13,7 @@ class TodoCollector {
         this.files = files;
     }
     getOpenTasks() {
-        const configFiles = this.files.filter(file => {
+        const configFiles = this.files.filter((file) => {
             return !(file.type instanceof virtual_file_1.VirtualFile);
         });
         const tasks = [];
@@ -21,10 +21,10 @@ class TodoCollector {
             const content = configFile.getContent();
             content.replace(TODO_MATCH, (taskString, task, taskContext) => {
                 tasks.push({
-                    todo: task,
                     context: encodeURI(taskContext),
                     file: configFile.name,
-                    line: this.lineNumber(task, content)
+                    line: this.lineNumber(task, content),
+                    todo: task,
                 });
                 return taskString;
             });
@@ -36,8 +36,10 @@ class TodoCollector {
     }
     lineNumberByIndex(index, string) {
         // RegExp
-        var line = 0, match, re = /(^)[\S\s]/gm;
-        while (match = re.exec(string)) {
+        let line = 0;
+        let match;
+        const re = /(^)[\S\s]/gm;
+        while ((match = re.exec(string))) {
             if (match.index > index)
                 break;
             line++;

package/oclif.manifest.json

@@ -104,14 +104,6 @@
           "multiple": false,
           "type": "option"
         },
-        "slackToken": {
-          "char": "t",
-          "description": "Slack hook found on 1Pass",
-          "name": "slackToken",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "artifacts": {
           "char": "a",
           "description": "Whitelist of files to deploy",
@@ -126,6 +118,14 @@
           "name": "dryRun",
           "allowNo": false,
           "type": "boolean"
+        },
+        "slackToken": {
+          "char": "t",
+          "description": "Slack hook found on 1Pass",
+          "name": "slackToken",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -696,5 +696,5 @@
       ]
     }
   },
-  "version": "2.10.0"
+  "version": "2.11.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -104,6 +104,7 @@
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^18.19",
     "@types/uuid": "^8.3.4",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
     "chai": "^4.4",
     "copyfiles": "^2.4.1",
     "esbuild": "^0.20",
@@ -117,14 +118,14 @@
     "lint-staged": "^14.0.1",
     "mocha": "^10.1.0",
     "mocha-junit-reporter": "^2.2.1",
-    "nock": "^13.5",
-    "ts-sinon": "^2.0.2",
     "mock-fs": "^5.2.0",
+    "nock": "^13.5",
     "nyc": "^15.1.0",
     "oclif": "^4.5",
     "shx": "^0.3.4",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9",
+    "ts-sinon": "^2.0.2",
     "tslib": "^2.6",
     "typescript": "^5.4",
     "typescript-json-serializer": "^4.3.0"