jitsu-cli 2.14.0-beta.85 → 2.14.0-beta.96

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jitsu Labs, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/compiled/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jitsu-cli",
-    "version": "2.14.0-beta.85",
+    "version": "2.14.0-beta.96",
     "repository": {
         "type": "git",
         "url": "https://github.com/jitsucom/jitsu",

package/compiled/src/commands/deploy.js

@@ -102,12 +102,54 @@ async function deployFunctions({ host, apikey, name: names }, projectDir, packag
         }
         profileBuilders = (await res.json()).profileBuilders;
     }
+    const existingFunctions = await fetchExistingFunctions({ host, apikey, workspaceId: workspace.id });
     for (const file of selectedFiles) {
         console.log(`${b(`𝑓`)} Deploying function ${b(path.basename(file))} to workspace ${workspace.name} (${host}/${workspace.slug || workspace.id})`);
-        await deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, path.resolve(functionsDir, file), profileBuilders);
+        await deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, path.resolve(functionsDir, file), profileBuilders, existingFunctions);
     }
 }
-async function deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, file, profileBuilders = []) {
+async function fetchExistingFunctions({ host, apikey, workspaceId, }) {
+    const res = await fetch(`${host}/api/${workspaceId}/config/function`, {
+        headers: { Authorization: `Bearer ${apikey}` },
+    });
+    if (!res.ok) {
+        console.error(red(`Cannot list existing functions:\n${b(await res.text())}`));
+        process.exit(1);
+    }
+    const { objects } = (await res.json());
+    const bySlug = new Map();
+    const byId = new Map();
+    for (const f of objects) {
+        const entry = { id: f.id, slug: f.slug };
+        byId.set(f.id, entry);
+        if (f.slug)
+            bySlug.set(f.slug, entry);
+    }
+    return { bySlug, byId };
+}
+function cacheAfterCreate(cache, id, slug) {
+    const entry = { id, slug };
+    cache.byId.set(id, entry);
+    if (slug)
+        cache.bySlug.set(slug, entry);
+}
+function cacheAfterUpdate(cache, id, newSlug) {
+    const entry = cache.byId.get(id);
+    if (!entry) {
+        cacheAfterCreate(cache, id, newSlug);
+        return;
+    }
+    if (entry.slug && entry.slug !== newSlug) {
+        cache.bySlug.delete(entry.slug);
+    }
+    entry.slug = newSlug;
+    if (newSlug)
+        cache.bySlug.set(newSlug, entry);
+}
+async function deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, file, profileBuilders = [], existingFunctions = {
+    bySlug: new Map(),
+    byId: new Map(),
+}) {
     const code = readFileSync(file, "utf-8");
     const wrapped = await getFunctionFromFilePath(projectDir, file, kind, profileBuilders);
     const meta = wrapped.meta;
@@ -120,19 +162,8 @@ async function deployFunction(projectDir, { host, apikey }, packageJson, workspa
     }
     let existingFunctionId;
     if (meta.slug) {
-        const res = await fetch(`${host}/api/${workspace.id}/config/function`, {
-            headers: {
-                Authorization: `Bearer ${apikey}`,
-            },
-        });
-        if (!res.ok) {
-            console.error(red(`Cannot add function to workspace:\n${b(await res.text())}`));
-            process.exit(1);
-        }
-        else {
-            const existing = (await res.json());
-            existingFunctionId = existing.objects.find(f => f.slug === meta.slug || f.id === meta.id)?.id;
-        }
+        existingFunctionId =
+            existingFunctions.bySlug.get(meta.slug)?.id ?? (meta.id ? existingFunctions.byId.get(meta.id)?.id : undefined);
     }
     let functionPayload = {};
     if (kind === "profile") {
@@ -171,6 +202,7 @@ async function deployFunction(projectDir, { host, apikey }, packageJson, workspa
             process.exit(1);
         }
         else {
+            cacheAfterCreate(existingFunctions, id, meta.slug);
             console.log(`Function ${b(meta.name)} was successfully added to workspace ${workspace.name} with id: ${b(id)}`);
         }
     }
@@ -198,6 +230,7 @@ async function deployFunction(projectDir, { host, apikey }, packageJson, workspa
             process.exit(1);
         }
         else {
+            cacheAfterUpdate(existingFunctions, id, meta.slug);
             console.log(`${green(`✓`)} ${b(meta.name)} deployed successfully!`);
         }
     }

package/dist/main.js

@@ -43189,6 +43189,7 @@ ${b(await res.text())}`));
     }
     profileBuilders2 = (await res.json()).profileBuilders;
   }
+  const existingFunctions = await fetchExistingFunctions({ host, apikey, workspaceId: workspace.id });
   for (const file of selectedFiles) {
     console.log(
       `${b(`\u{1D453}`)} Deploying function ${b(import_path2.default.basename(file))} to workspace ${workspace.name} (${host}/${workspace.slug || workspace.id})`
@@ -43200,11 +43201,55 @@ ${b(await res.text())}`));
       workspace,
       kind2,
       import_path2.default.resolve(functionsDir, file),
-      profileBuilders2
+      profileBuilders2,
+      existingFunctions
     );
   }
 }
-async function deployFunction(projectDir2, { host, apikey }, packageJson, workspace, kind2, file, profileBuilders2 = []) {
+async function fetchExistingFunctions({
+  host,
+  apikey,
+  workspaceId
+}) {
+  const res = await fetch(`${host}/api/${workspaceId}/config/function`, {
+    headers: { Authorization: `Bearer ${apikey}` }
+  });
+  if (!res.ok) {
+    console.error(red(`Cannot list existing functions:
+${b(await res.text())}`));
+    process.exit(1);
+  }
+  const { objects } = await res.json();
+  const bySlug = /* @__PURE__ */ new Map();
+  const byId = /* @__PURE__ */ new Map();
+  for (const f of objects) {
+    const entry = { id: f.id, slug: f.slug };
+    byId.set(f.id, entry);
+    if (f.slug) bySlug.set(f.slug, entry);
+  }
+  return { bySlug, byId };
+}
+function cacheAfterCreate(cache, id2, slug) {
+  const entry = { id: id2, slug };
+  cache.byId.set(id2, entry);
+  if (slug) cache.bySlug.set(slug, entry);
+}
+function cacheAfterUpdate(cache, id2, newSlug) {
+  const entry = cache.byId.get(id2);
+  if (!entry) {
+    cacheAfterCreate(cache, id2, newSlug);
+    return;
+  }
+  if (entry.slug && entry.slug !== newSlug) {
+    cache.bySlug.delete(entry.slug);
+  }
+  entry.slug = newSlug;
+  if (newSlug) cache.bySlug.set(newSlug, entry);
+}
+async function deployFunction(projectDir2, { host, apikey }, packageJson, workspace, kind2, file, profileBuilders2 = [], existingFunctions = {
+  bySlug: /* @__PURE__ */ new Map(),
+  byId: /* @__PURE__ */ new Map()
+}) {
   const code2 = (0, import_fs5.readFileSync)(file, "utf-8");
   const wrapped = await getFunctionFromFilePath(projectDir2, file, kind2, profileBuilders2);
   const meta = wrapped.meta;
@@ -43216,19 +43261,7 @@ async function deployFunction(projectDir2, { host, apikey }, packageJson, worksp
   }
   let existingFunctionId;
   if (meta.slug) {
-    const res = await fetch(`${host}/api/${workspace.id}/config/function`, {
-      headers: {
-        Authorization: `Bearer ${apikey}`
-      }
-    });
-    if (!res.ok) {
-      console.error(red(`Cannot add function to workspace:
-${b(await res.text())}`));
-      process.exit(1);
-    } else {
-      const existing = await res.json();
-      existingFunctionId = existing.objects.find((f) => f.slug === meta.slug || f.id === meta.id)?.id;
-    }
+    existingFunctionId = existingFunctions.bySlug.get(meta.slug)?.id ?? (meta.id ? existingFunctions.byId.get(meta.id)?.id : void 0);
   }
   let functionPayload = {};
   if (kind2 === "profile") {
@@ -43267,6 +43300,7 @@ ${b(await res.text())}`));
 ${b(await res.text())}`));
       process.exit(1);
     } else {
+      cacheAfterCreate(existingFunctions, id2, meta.slug);
       console.log(`Function ${b(meta.name)} was successfully added to workspace ${workspace.name} with id: ${b(id2)}`);
     }
   } else {
@@ -43293,6 +43327,7 @@ ${b(await res.text())}`));
 ${b(await res.text())}`));
       process.exit(1);
     } else {
+      cacheAfterUpdate(existingFunctions, id2, meta.slug);
       console.log(`${green(`\u2713`)} ${b(meta.name)} deployed successfully!`);
     }
   }
@@ -43305,7 +43340,7 @@ var fs4 = __toESM(require("fs"));
 // package.json
 var package_default = {
   name: "jitsu-cli",
-  version: "2.14.0-beta.85",
+  version: "2.14.0-beta.96",
   repository: {
     type: "git",
     url: "https://github.com/jitsucom/jitsu",