@speedkit/cli 3.43.1 → 4.0.0

package/dist/services/query-builder/query-builder-service.js

@@ -1,16 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryBuilderService = void 0;
-const tslib_1 = require("tslib");
-const get_parsed_config_1 = require("../../helpers/get-parsed-config");
-const build_query_helper_1 = require("../../helpers/build-query-helper");
-const clipboardy_cjs_1 = tslib_1.__importDefault(require("clipboardy-cjs"));
-const query_builder_model_1 = require("./query-builder-model");
-const prewarm_1 = require("./query/prewarm");
-const parameter_1 = require("./query/parameter");
-const cli_1 = require("../cli");
-const safe_1 = require("../../helpers/safe");
-class QueryBuilderService {
+import { getSpeedKitConfigVersion } from "../../helpers/get-parsed-config.js";
+import { getBlacklistedFilter, getParameterFilter, getParameterReplaceFilter, getStrippedParameters, getWhitelistedFilter, } from "../../helpers/build-query-helper.js";
+import clipboardy from "clipboardy";
+import { QueryTpe, } from "./query-builder-model.js";
+import { Prewarm } from "./query/prewarm.js";
+import { Parameter } from "./query/parameter.js";
+import { safe } from "../../helpers/safe.js";
+export class QueryBuilderService {
     context;
     speedKitConfig;
     cli;
@@ -20,28 +15,28 @@ class QueryBuilderService {
         this.cli = cli;
     }
     async run() {
-        this.cli.startAction(`build ${this.context.queryType}-query`);
-        console.log(this.speedKitConfig);
-        const parameters = (0, build_query_helper_1.getStrippedParameters)(this.speedKitConfig);
-        const parameterReplaceFilter = (0, build_query_helper_1.getParameterReplaceFilter)(parameters, (0, get_parsed_config_1.getSpeedKitConfigVersion)(this.speedKitConfig));
-        const whitelistedFilter = (0, build_query_helper_1.getWhitelistedFilter)(this.speedKitConfig);
-        const blacklistedFilter = (0, build_query_helper_1.getBlacklistedFilter)(this.speedKitConfig);
-        const skConfigVersion = (0, get_parsed_config_1.getSpeedKitConfigVersion)(this.speedKitConfig);
-        const parameterFilter = (0, build_query_helper_1.getParameterFilter)(parameters, skConfigVersion);
-        const result = (0, safe_1.safe)(() => this.buildQuery(this.context.app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter));
+        this.cli.startAction(`QUERY:BUILD:${this.context.queryType}`, `build ${this.context.queryType}-query`);
+        const parameters = getStrippedParameters(this.speedKitConfig);
+        const parameterReplaceFilter = getParameterReplaceFilter(parameters, getSpeedKitConfigVersion(this.speedKitConfig));
+        const whitelistedFilter = getWhitelistedFilter(this.speedKitConfig);
+        const blacklistedFilter = getBlacklistedFilter(this.speedKitConfig);
+        const skConfigVersion = getSpeedKitConfigVersion(this.speedKitConfig);
+        const parameterFilter = getParameterFilter(parameters, skConfigVersion);
+        const result = safe(() => this.buildQuery(this.context.app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter));
+        this.cli.successAction(`QUERY:BUILD:${this.context.queryType}`);
         if (result.success !== true) {
-            this.cli.endAction(cli_1.CliActionStatus.FAILED);
+            this.cli.failAction(`QUERY:BUILD:${this.context.queryType}`, result.error);
             this.cli.writeError(result.error);
             console.error(result.errorObj);
             return;
         }
-        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+        this.cli.successAction(`QUERY:BUILD:${this.context.queryType}`);
         if (this.context.quiet) {
             process.stdout.write(result.data);
             return;
         }
         if (!this.context.isWindows) {
-            clipboardy_cjs_1.default.writeSync(result.data);
+            clipboardy.writeSync(result.data);
         }
         this.cli.write(this.cli.style.dim.italic(result.data));
         if (!this.context.isWindows) {
@@ -49,12 +44,11 @@ class QueryBuilderService {
         }
     }
     buildQuery(app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter) {
-        if (this.context.queryType === query_builder_model_1.QueryTpe.prewarm) {
-            return new prewarm_1.Prewarm(app, whitelistedFilter, blacklistedFilter, parameterReplaceFilter).query;
+        if (this.context.queryType === QueryTpe.prewarm) {
+            return new Prewarm(app, whitelistedFilter, blacklistedFilter, parameterReplaceFilter).query;
         }
-        if (this.context.queryType === query_builder_model_1.QueryTpe.parameter) {
-            return new parameter_1.Parameter(app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter).query;
+        if (this.context.queryType === QueryTpe.parameter) {
+            return new Parameter(app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter).query;
         }
     }
 }
-exports.QueryBuilderService = QueryBuilderService;

package/oclif.manifest.json

@@ -34,7 +34,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -82,7 +82,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -152,7 +152,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -193,7 +193,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -243,7 +243,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -283,7 +283,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -324,7 +324,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -408,7 +408,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -439,7 +439,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -529,7 +529,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -619,7 +619,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -660,7 +660,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -719,7 +719,7 @@
       "strict": true,
       "enableJsonFlag": false,
       "localhostUrl": "http://localhost:8888/orange.html",
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -742,7 +742,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -751,5 +751,5 @@
       ]
     }
   },
-  "version": "3.43.1"
+  "version": "4.0.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "3.43.1",
+  "version": "4.0.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -25,16 +25,33 @@
     "build": "tsc -b && copyfiles -u 1 src/**/*hbs ./dist && copyfiles -u 1 src/**/*js ./dist",
     "postbuild": "oclif manifest && oclif readme",
     "prepack": "npm run build",
-    "test": "mocha --config ./.mocharc.cjs --reporter mocha-junit-reporter --reporter-options mochaFile=junit.xml",
+    "test": "mocha",
     "coverage": "nyc mocha",
     "coverage:report": "nyc --reporter cobertura mocha"
   },
+  "mocha": {
+    "reporter": "xunit",
+    "reporter-option": [
+      "output=junit.xml",
+      "suiteName=SpeedKitCli"
+    ],
+    "quiet": true,
+    "node-option": [
+      "import=tsx"
+    ],
+    "extension": [
+      "ts"
+    ],
+    "spec": [
+      "src/**/*.spec.ts"
+    ]
+  },
   "bin": {
     "sk": "bin/run",
     "skdev": "bin/dev"
   },
   "engines": {
-    "node": ">=20.8.1"
+    "node": ">=22"
   },
   "keywords": [
     "oclif"
@@ -63,83 +80,75 @@
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "type": "commonjs",
+  "type": "module",
   "dependencies": {
     "@aws-sdk/client-athena": "^3.529",
-    "@inquirer/prompts": "^5.5.0",
-    "@nats-io/transport-node": "^3.3.1",
-    "@oclif/core": "^3.23",
-    "@oclif/plugin-autocomplete": "^3.0",
-    "@oclif/plugin-help": "^6.2.37",
-    "@oclif/plugin-not-found": "^3.2.74",
-    "@oclif/plugin-warn-if-update-available": "^3.1.55",
-    "baqend": "^4.1.0",
-    "chalk": "^4.1.2",
-    "clipboardy-cjs": "^3.0.0",
-    "css-select": "5.1.0",
+    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/js": "^10.0.1",
+    "@inquirer/prompts": "^8.4.1",
+    "@oclif/core": "^4.10.5",
+    "@oclif/errors": "^1.3.6",
+    "@oclif/plugin-autocomplete": "^3.2.45",
+    "@oclif/plugin-help": "^6.2.44",
+    "@oclif/plugin-not-found": "^3.2.80",
+    "@oclif/plugin-warn-if-update-available": "^3.1.60",
+    "baqend": "^4.2.5",
+    "chalk": "^5.6.2",
+    "cli-progress": "^3.12.0",
+    "clipboardy": "^5.3.1",
     "deepmerge": "^4.3.1",
-    "diff": "^5.2.2",
-    "dom-serializer": "2.0.0",
-    "domhandler": "5.0.3",
-    "domutils": "^3.1",
-    "dotenv": "^16.4.7",
+    "diff": "^9.0.0",
+    "dotenv": "^17.4.2",
     "encoding-japanese": "^2.2.0",
     "esbuild": "^0.27.3",
     "extract-zip": "^2.0.1",
-    "fetch-socks": "^1.3.2",
+    "fetch-socks": "^1.3.3",
     "fluent-ffmpeg": "^2.1.3",
-    "fs-extra": "^11.2.0",
-    "handlebars": "^4.7.8",
+    "fs-extra": "^11.3.4",
+    "handlebars": "^4.7.9",
     "htmlfy": "^1.0.1",
-    "htmlparser2": "8.0.2",
     "iconv-lite": "^0.7.2",
     "json2csv": "^6.0.0-alpha.2",
-    "node-fetch": "^2.7.0",
+    "node-fetch": "^3.3.2",
     "nypm": "^0.6.5",
-    "parse5": "7.1",
-    "parse5-htmlparser2-tree-adapter": "7.0.0",
-    "puppeteer": "^24.25.0",
+    "puppeteer": "^24.41.0",
     "puppeteer-extra": "^3.3.6",
     "semver": "^7.7.4",
+    "spinnies": "^0.5.1",
     "strip-comments": "^2.0.1",
-    "ts-node": "^10.9.2",
-    "uuid": "^9.0.1"
+    "tsx": "^4.21.0",
+    "tty-table": "^5.0.0",
+    "uuid": "^13.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.8.1",
+    "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^17.8.1",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^3",
+    "@oclif/test": "^4.1.18",
     "@types/chai": "^4.3.10",
-    "@types/fs-extra": "^9.0.13",
-    "@types/mocha": "^10.0.10",
-    "@types/mock-fs": "^4.13.4",
-    "@types/node": "^20.12.7",
+    "@types/node": "^25.6.0",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
     "chai": "^4.4.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.2",
-    "eslint-plugin-prettier": "^5.1",
-    "eslint-plugin-unicorn": "^51.0.1",
-    "globby": "^11.1.0",
+    "eslint": "10.2.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-unicorn": "^64.0.0",
+    "globby": "^16.2.0",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^16.4.0",
     "memfs": "^4.8.0",
-    "mocha": "^10.8.2",
-    "mocha-junit-reporter": "^2.2.1",
-    "mock-fs": "^5.2.0",
-    "nock": "^13.5.6",
-    "nyc": "^15.1.0",
-    "oclif": "^4.8.8",
-    "shx": "^0.3.4",
-    "ts-mocha": "^10.0.0",
+    "mocha": "^12.0.0-beta-3",
+    "mock-fs": "^5.5.0",
+    "nock": "^14.0.12",
+    "nyc": "^18.0.0",
+    "oclif": "^4.23.0",
+    "shx": "^0.4.0",
     "ts-sinon": "^2.0.2",
-    "tslib": "^2.6",
-    "typescript": "^5.4.5",
-    "typescript-json-serializer": "^6.0.1"
+    "tslib": "^2.8.1",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.58.2"
   },
   "lint-staged": {
     "*.ts": [

package/dist/dummy.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/dummy.spec.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-// Dummy function to test
-function add(a, b) {
-    return a + b;
-}
-// Describe your test suite
-describe("(dummy) add function test", () => {
-    // It block-describes a single test
-    it("should add two numbers", () => {
-        // Call our function with some test inputs
-        const result = add(2, 3);
-        // Assert that our function returned the correct value
-        (0, chai_1.expect)(result).to.equal(5);
-    });
-    // Add more tests here
-});