jitsu-cli 1.10.4 → 2.14.0-beta.101

package/bin/jitsu

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("../dist/main.js");

package/build.mts

@@ -0,0 +1,39 @@
+import * as esbuild from "esbuild";
+import { mkdirSync } from "fs";
+
+// Ensure dist directory exists
+mkdirSync("./dist", { recursive: true });
+
+// External modules that should not be bundled
+// These are either native modules or need to be loaded at runtime
+const externalModules = [
+  // Native/binary modules
+  "figlet", // ASCII art library with data files
+  "fsevents", // macOS-only native file system events
+  "esbuild", // esbuild has native binaries, used at runtime to build user functions
+
+  // Large runtime dependencies
+  "typescript", // TypeScript compiler (large, used at runtime)
+  "jest-cli", // Jest test runner
+];
+
+// Bundle the CLI
+esbuild
+  .build({
+    entryPoints: ["./src/index.ts"],
+    bundle: true,
+    platform: "node",
+    target: "node20",
+    format: "cjs",
+    outfile: "./dist/main.js",
+    sourcemap: true,
+    minify: false,
+    external: externalModules,
+    logLevel: "info",
+    loader: {
+      ".json": "json",
+    },
+  })
+  .then(() => {
+    console.log("\nBuild complete!");
+  });

package/compiled/package.json

@@ -1,18 +1,27 @@
 {
     "name": "jitsu-cli",
-    "version": "0.0.0",
+    "version": "2.14.0-beta.101",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/jitsucom/jitsu",
+        "directory": "cli/jitsu-cli"
+    },
     "description": "",
     "author": "Jitsu Dev Team <dev@jitsu.com>",
     "publishConfig": {
         "access": "public"
     },
-    "bin": "./bin/jitsu-cli",
+    "bin": {
+        "jitsu-cli": "./bin/jitsu-cli",
+        "jitsu": "./bin/jitsu"
+    },
     "license": "MIT",
     "private": false,
     "scripts": {
-        "clean": "rm -rf ./dist",
-        "compile": "tsc -p . ",
-        "build": "pnpm compile && webpack",
+        "clean": "rm -rf ./dist ./compiled",
+        "typecheck": "tsc --noEmit",
+        "build": "tsc && tsx build.mts",
+        "cli": "tsx src/index.ts",
         "run": "pnpm build && node dist/main.js",
         "login": "pnpm build && node dist/main.js login",
         "init child": "pnpm build && node dist/main.js init",
@@ -22,31 +31,23 @@
         "deploy child": "pnpm build && node dist/main.js deploy"
     },
     "dependencies": {
+        "esbuild": "catalog:",
         "figlet": "^1.6.0",
         "jest-cli": "^29.7.0",
-        "tslib": "^2.6.3",
-        "typescript": "^5.6.3"
+        "tslib": "catalog:",
+        "typescript": "catalog:"
     },
     "devDependencies": {
-        "@babel/preset-env": "^7.23.2",
-        "@babel/preset-typescript": "^7.23.2",
+        "@jitsu/common-config": "workspace:*",
         "@jitsu/functions-lib": "workspace:*",
         "@jitsu/protocols": "workspace:*",
-        "@rollup/plugin-commonjs": "^28.0.2",
-        "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^16.0.0",
-        "@rollup/plugin-terser": "^0.4.3",
-        "@rollup/plugin-typescript": "^11.1.3",
         "@types/chalk": "^2.2.0",
         "@types/commander": "^2.12.2",
         "@types/express": "^4.17.21",
         "@types/inquirer": "^9.0.3",
-        "@types/jest": "^29.5.5",
-        "@types/lodash": "^4.14.198",
-        "@types/node": "^18.15.3",
-        "@types/webpack": "^5.28.5",
-        "@webpack-cli/generators": "^3.0.7",
-        "babel-loader": "^9.1.3",
+        "@types/lodash": "catalog:",
+        "@types/node": "catalog:",
+        "@vitest/ui": "catalog:",
         "chalk": "^5.3.0",
         "commander": "^11.0.0",
         "cross-fetch": "^4.0.0",
@@ -54,18 +55,14 @@
         "etag": "^1.8.1",
         "inquirer": "^9.2.11",
         "jest": "^29.7.0",
+        "js-yaml": "^4.1.0",
+        "@types/js-yaml": "^4.0.9",
         "json5": "^2.2.3",
         "juava": "workspace:*",
-        "lodash": "^4.17.21",
-        "node-fetch": "^3.3.2",
-        "node-loader": "^2.0.0",
+        "lodash": "catalog:",
         "prismjs": "^1.30.0",
-        "rollup": "^3.29.5",
         "semver": "^7.5.4",
-        "ts-jest": "^29.1.1",
-        "ts-loader": "^9.5.1",
-        "ts-node": "^10.9.2",
-        "webpack": "^5.99.5",
-        "webpack-cli": "^6.0.1"
+        "tsx": "catalog:",
+        "vitest": "catalog:"
     }
 }

package/compiled/src/commands/build.js

@@ -1,22 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = build;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_1 = require("fs");
-const plugin_typescript_1 = tslib_1.__importDefault(require("@rollup/plugin-typescript"));
-const plugin_node_resolve_1 = tslib_1.__importDefault(require("@rollup/plugin-node-resolve"));
-const plugin_commonjs_1 = tslib_1.__importDefault(require("@rollup/plugin-commonjs"));
-const plugin_json_1 = tslib_1.__importDefault(require("@rollup/plugin-json"));
-const rollup_1 = require("rollup");
-const child_process_1 = require("child_process");
-const shared_1 = require("./shared");
-const chalk_code_highlight_1 = require("../lib/chalk-code-highlight");
-const compiled_function_1 = require("../lib/compiled-function");
-const ts = tslib_1.__importStar(require("typescript"));
-async function build({ dir }) {
-    const { packageJson, projectDir } = await (0, shared_1.loadPackageJson)(dir || process.cwd());
-    console.log(`Building ${(0, chalk_code_highlight_1.b)(packageJson.name)} project`);
+import path from "path";
+import { mkdirSync, readdirSync, existsSync, lstatSync } from "fs";
+import * as esbuild from "esbuild";
+import { exec } from "child_process";
+import { loadPackageJson } from "./shared";
+import { b, green, red } from "../lib/chalk-code-highlight";
+import { getFunctionFromFilePath } from "../lib/compiled-function";
+import * as ts from "typescript";
+export async function build({ dir }) {
+    const { packageJson, projectDir } = await loadPackageJson(dir || process.cwd());
+    console.log(`Building ${b(packageJson.name)} project`);
     const errors = checkTypescript(projectDir);
     if (errors) {
         console.error(`Found ${errors.length} errors in functions files. Exiting`);
@@ -29,10 +21,10 @@ async function build({ dir }) {
     catch (e) {
         throw new Error(`Some of the functions failed to compile. See details above. Last error: ${e.message || "unknown"}`);
     }
-    console.log(`${(0, chalk_code_highlight_1.b)("Build finished.")}`);
+    console.log(`${b("Build finished.")}`);
 }
 const run = async (cmd) => {
-    const child = (0, child_process_1.exec)(cmd, err => {
+    const child = exec(cmd, err => {
         if (err) {
             console.error(err);
             return;
@@ -44,20 +36,20 @@ const run = async (cmd) => {
 };
 async function buildFiles(projectDir, dir = "") {
     let lastError = undefined;
-    const srcDir = path_1.default.resolve(projectDir, "src", dir);
-    if (!(0, fs_1.existsSync)(srcDir)) {
-        console.info(`${(0, chalk_code_highlight_1.b)(dir)} directory not found in ${(0, chalk_code_highlight_1.b)(path_1.default.resolve(projectDir, "src"))}`);
+    const srcDir = path.resolve(projectDir, "src", dir);
+    if (!existsSync(srcDir)) {
+        console.info(`${b(dir)} directory not found in ${b(path.resolve(projectDir, "src"))}`);
         return;
     }
-    const files = (0, fs_1.readdirSync)(srcDir);
+    const files = readdirSync(srcDir);
     if (files.length === 0) {
-        console.warn(`No functions found in ${(0, chalk_code_highlight_1.b)(srcDir)} directory`);
+        console.warn(`No functions found in ${b(srcDir)} directory`);
         return;
     }
     for (const file of files) {
-        if ((0, fs_1.lstatSync)(path_1.default.resolve(srcDir, file)).isDirectory()) {
+        if (lstatSync(path.resolve(srcDir, file)).isDirectory()) {
             try {
-                await buildFiles(projectDir, path_1.default.join(dir, file));
+                await buildFiles(projectDir, path.join(dir, file));
             }
             catch (e) {
                 lastError = e;
@@ -69,7 +61,7 @@ async function buildFiles(projectDir, dir = "") {
         }
         catch (e) {
             console.error([
-                `${(0, chalk_code_highlight_1.red)(`⚠`)} Function ${(0, chalk_code_highlight_1.b)(file)} failed to compile: ${(0, chalk_code_highlight_1.red)(e?.message)}. See details below`,
+                `${red(`⚠`)} Function ${b(file)} failed to compile: ${red(e?.message)}. See details below`,
                 ...(e?.stack?.split("\n") || []).map(s => `  ${s}`),
             ]
                 .filter(Boolean)
@@ -82,55 +74,51 @@ async function buildFiles(projectDir, dir = "") {
     }
 }
 async function buildFile(projectDir, dir, fileName) {
-    const funcFile = path_1.default.resolve(projectDir, "src", path_1.default.join(dir, fileName));
+    const funcFile = path.resolve(projectDir, "src", path.join(dir, fileName));
     process.chdir(projectDir);
-    const rollupPlugins = [
-        (0, plugin_typescript_1.default)(),
-        (0, plugin_node_resolve_1.default)({ preferBuiltins: false }),
-        (0, plugin_commonjs_1.default)(),
-        (0, plugin_json_1.default)(),
-    ];
-    const bundle = await (0, rollup_1.rollup)({
-        input: [funcFile],
-        plugins: rollupPlugins,
+    mkdirSync(path.resolve(projectDir, "dist/" + dir), { recursive: true });
+    const compiledFunctionPath = `dist/${dir}/${fileName.replace(".ts", ".js")}`;
+    await esbuild.build({
+        entryPoints: [funcFile],
+        absWorkingDir: projectDir,
+        bundle: true,
+        platform: "neutral",
+        format: "esm",
+        outfile: path.resolve(projectDir, compiledFunctionPath),
         external: ["@jitsu/functions-lib"],
         logLevel: "silent",
+        loader: {
+            ".json": "json",
+        },
+        nodePaths: [path.resolve(projectDir, "node_modules")],
     });
-    let format = "es";
-    let output = await bundle.generate({
-        dir: projectDir,
-        format: format,
-    });
-    (0, fs_1.mkdirSync)(path_1.default.resolve(projectDir, "dist/" + dir), { recursive: true });
-    const compiledFunctionPath = `dist/${dir}/${fileName.replace(".ts", ".js")}`;
-    (0, fs_1.writeFileSync)(path_1.default.resolve(projectDir, compiledFunctionPath), output.output[0].code);
-    const compiledFunction = await (0, compiled_function_1.getFunctionFromFilePath)(path_1.default.resolve(projectDir, compiledFunctionPath), "function");
-    console.log([`${(0, chalk_code_highlight_1.green)(`✓`)} Function ${(0, chalk_code_highlight_1.b)(fileName)} compiled successfully`, `  slug = ${(0, chalk_code_highlight_1.b)(compiledFunction.meta.slug)}`]
+    const compiledFunction = await getFunctionFromFilePath(projectDir, path.resolve(projectDir, compiledFunctionPath), "function");
+    console.log([`${green(`✓`)} Function ${b(fileName)} compiled successfully`, `  slug = ${b(compiledFunction.meta.slug)}`]
         .filter(Boolean)
         .join("\n"));
 }
 function checkTypescript(projectDir) {
-    const tsconfigPath = path_1.default.resolve(projectDir, "tsconfig.json");
-    if (!(0, fs_1.existsSync)(tsconfigPath)) {
-        console.info(`No ${(0, chalk_code_highlight_1.b)("tsconfig.json")} file found in ${(0, chalk_code_highlight_1.b)(projectDir)}. Assuming JavaScript project`);
+    const tsconfigPath = path.resolve(projectDir, "tsconfig.json");
+    if (!existsSync(tsconfigPath)) {
+        console.info(`No ${b("tsconfig.json")} file found in ${b(projectDir)}. Assuming JavaScript project`);
         return;
     }
-    console.log(`Checking TypeScript files in ${(0, chalk_code_highlight_1.b)(projectDir)}`);
     let compilerOptions = {};
     let filenames = [];
     const tsconfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
     tsconfig.config.compilerOptions = {
         ...tsconfig.config.compilerOptions,
-        typeRoots: [path_1.default.resolve(projectDir, "node_modules", "@types")],
+        typeRoots: [path.resolve(projectDir, "node_modules", "@types")],
         checkJs: true,
         allowJs: true,
+        skipLibCheck: true,
         noEmit: true,
         esModuleInterop: typeof compilerOptions.esModuleInterop !== "undefined" ? compilerOptions.esModuleInterop : true,
         moduleResolution: typeof compilerOptions.moduleResolution !== "undefined" ? compilerOptions.moduleResolution : "node",
         target: "esnext",
         module: "esnext",
     };
-    const parsed = ts.parseJsonConfigFileContent(tsconfig.config, ts.sys, path_1.default.dirname(tsconfigPath));
+    const parsed = ts.parseJsonConfigFileContent(tsconfig.config, ts.sys, path.dirname(tsconfigPath));
     filenames = parsed.fileNames;
     compilerOptions = parsed.options;
     let program = ts.createProgram(filenames, compilerOptions);

package/compiled/src/commands/config/handlers.js

@@ -0,0 +1,292 @@
+import { ApiClient, ApiError } from "../../lib/api-client";
+import { readDefaultWorkspace, resolveAuth } from "../../lib/auth-file";
+import { buildBody } from "../../lib/body-builder";
+import { consumeBodyFields } from "../../lib/body-fields";
+import { print } from "../../lib/renderer";
+async function resolveWorkspaceId(client, idOrSlug) {
+    try {
+        const ws = await client.request({
+            method: "GET",
+            path: `/api/workspace/${encodeURIComponent(idOrSlug)}`,
+        });
+        return ws.id;
+    }
+    catch (e) {
+        if (e instanceof ApiError && e.status === 404) {
+            throw new Error(`Workspace '${idOrSlug}' not found (or you don't have access)`);
+        }
+        throw e;
+    }
+}
+function gatherBody(opts) {
+    const fields = consumeBodyFields();
+    return buildBody({ file: opts.file, json: opts.json, fields });
+}
+function requireWorkspace(opts) {
+    if (opts.workspace)
+        return opts.workspace;
+    const fallback = readDefaultWorkspace();
+    if (fallback)
+        return fallback;
+    throw new Error("--workspace / -w is required (or set a default via `jitsu set-default-workspace <id-or-slug>`)");
+}
+async function requireResolvedWorkspaceId(opts, client) {
+    return resolveWorkspaceId(client, requireWorkspace(opts));
+}
+export async function runList(resource, opts) {
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    switch (resource.kind) {
+        case "workspace": {
+            const data = await client.request({ method: "GET", path: "/api/workspace" });
+            print(data, opts.output);
+            return;
+        }
+        case "configObject": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "GET",
+                path: `/api/${encodeURIComponent(ws)}/config/${resource.type}`,
+            });
+            print(data.objects ?? data, opts.output);
+            return;
+        }
+        case "link": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "GET",
+                path: `/api/${encodeURIComponent(ws)}/config/link`,
+            });
+            print(data.links ?? data, opts.output);
+            return;
+        }
+        case "profile-builder": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "GET",
+                path: `/api/${encodeURIComponent(ws)}/config/profile-builder`,
+            });
+            print(data.profileBuilders ?? data, opts.output);
+            return;
+        }
+    }
+}
+export async function runGet(resource, id, opts) {
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    switch (resource.kind) {
+        case "workspace": {
+            const data = await client.request({ method: "GET", path: `/api/workspace/${encodeURIComponent(id)}` });
+            print(data, opts.output);
+            return;
+        }
+        case "configObject": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "GET",
+                path: `/api/${encodeURIComponent(ws)}/config/${resource.type}/${encodeURIComponent(id)}`,
+            });
+            print(data, opts.output);
+            return;
+        }
+        default:
+            throw new Error(`get is not supported for ${resource.noun}`);
+    }
+}
+export async function runCreate(resource, opts) {
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    const body = gatherBody(opts) ?? {};
+    switch (resource.kind) {
+        case "workspace": {
+            const data = await client.request({ method: "POST", path: "/api/workspace", body });
+            print(data, opts.output);
+            return;
+        }
+        case "configObject": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "POST",
+                path: `/api/${encodeURIComponent(ws)}/config/${resource.type}`,
+                body,
+            });
+            print(data, opts.output);
+            return;
+        }
+        case "link": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "POST",
+                path: `/api/${encodeURIComponent(ws)}/config/link`,
+                body,
+            });
+            print(data, opts.output);
+            return;
+        }
+        case "profile-builder": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const data = await client.request({
+                method: "POST",
+                path: `/api/${encodeURIComponent(ws)}/config/profile-builder`,
+                body,
+            });
+            print(data, opts.output);
+            return;
+        }
+    }
+}
+export async function runUpdate(resource, id, opts) {
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    const body = gatherBody(opts);
+    if (body === undefined) {
+        throw new Error("update requires at least one of -f, --json, or --field.path=value flags");
+    }
+    switch (resource.kind) {
+        case "workspace": {
+            if (!id)
+                throw new Error("workspace id or slug is required");
+            const data = await client.request({
+                method: "PUT",
+                path: `/api/workspace/${encodeURIComponent(id)}`,
+                body,
+            });
+            print(data, opts.output);
+            return;
+        }
+        case "configObject": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            if (!id)
+                throw new Error("id is required");
+            const data = await client.request({
+                method: "PUT",
+                path: `/api/${encodeURIComponent(ws)}/config/${resource.type}/${encodeURIComponent(id)}`,
+                body,
+            });
+            print(data ?? { ok: true }, opts.output);
+            return;
+        }
+        case "link": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const finalBody = mergePositionalId(body, id, "id");
+            const data = await client.request({
+                method: "PUT",
+                path: `/api/${encodeURIComponent(ws)}/config/link`,
+                body: finalBody,
+            });
+            print(data, opts.output);
+            return;
+        }
+        case "profile-builder": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            if (!id)
+                throw new Error("id is required");
+            const finalBody = mergeNestedPositionalId(body, id, "profileBuilder", "id");
+            const data = await client.request({
+                method: "PUT",
+                path: `/api/${encodeURIComponent(ws)}/config/profile-builder`,
+                body: finalBody,
+            });
+            print(data, opts.output);
+            return;
+        }
+    }
+}
+function mergePositionalId(body, id, key) {
+    if (id === undefined)
+        return body;
+    if (body && typeof body === "object" && body[key] !== undefined && body[key] !== id) {
+        throw new Error(`positional id '${id}' conflicts with body.${key} '${body[key]}'`);
+    }
+    return { ...(body && typeof body === "object" ? body : {}), [key]: id };
+}
+function mergeNestedPositionalId(body, id, outer, inner) {
+    const base = body && typeof body === "object" ? body : {};
+    const nested = base[outer] && typeof base[outer] === "object" ? base[outer] : {};
+    if (nested[inner] !== undefined && nested[inner] !== id) {
+        throw new Error(`positional id '${id}' conflicts with body.${outer}.${inner} '${nested[inner]}'`);
+    }
+    return { ...base, [outer]: { ...nested, [inner]: id } };
+}
+export async function runDelete(resource, id, opts) {
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    switch (resource.kind) {
+        case "workspace": {
+            if (!id)
+                throw new Error("workspace id is required");
+            const data = await client.request({
+                method: "DELETE",
+                path: "/api/workspace",
+                body: { workspaceId: id },
+            });
+            print(data, opts.output);
+            return;
+        }
+        case "configObject": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            if (!id)
+                throw new Error("id is required");
+            const query = {};
+            if (opts.cascade)
+                query.cascade = "true";
+            if (opts.strict)
+                query.strict = "true";
+            const data = await client.request({
+                method: "DELETE",
+                path: `/api/${encodeURIComponent(ws)}/config/${resource.type}/${encodeURIComponent(id)}`,
+                query,
+            });
+            print(data ?? { ok: true }, opts.output);
+            return;
+        }
+        case "link": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            const query = {};
+            if (id) {
+                query.id = id;
+            }
+            else if (opts.from && opts.to) {
+                query.fromId = opts.from;
+                query.toId = opts.to;
+            }
+            else {
+                throw new Error("connection delete requires either <id> or both --from and --to");
+            }
+            const data = await client.request({
+                method: "DELETE",
+                path: `/api/${encodeURIComponent(ws)}/config/link`,
+                query,
+            });
+            print(data ?? { ok: true }, opts.output);
+            return;
+        }
+        case "profile-builder": {
+            const ws = await requireResolvedWorkspaceId(opts, client);
+            if (!id)
+                throw new Error("id is required");
+            const data = await client.request({
+                method: "DELETE",
+                path: `/api/${encodeURIComponent(ws)}/config/profile-builder`,
+                query: { id },
+            });
+            print(data ?? { ok: true }, opts.output);
+            return;
+        }
+    }
+}
+export async function runTest(resource, opts) {
+    if (resource.kind !== "configObject" || !resource.supportsTest) {
+        throw new Error(`test is not supported for ${resource.noun}`);
+    }
+    const auth = resolveAuth(opts);
+    const client = new ApiClient(auth);
+    const ws = await requireResolvedWorkspaceId(opts, client);
+    const body = gatherBody(opts) ?? {};
+    const data = await client.request({
+        method: "POST",
+        path: `/api/${encodeURIComponent(ws)}/config/${resource.type}/test`,
+        body,
+    });
+    print(data, opts.output);
+}