@superblocksteam/cli 2.0.0-next.14 → 2.0.0-next.16

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/2.0.0-next.14 linux-x64 node-v20.19.0
+@superblocksteam/cli/2.0.0-next.16 linux-x64 node-v20.19.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/dist/index.js

@@ -84155,7 +84155,7 @@ var require_methodTracing = __commonJS({
       }
       return void 0;
     }
-    function addTracingToMethods3(object2, methods, tracer2) {
+    function addTracingToMethods5(object2, methods, tracer2) {
       methods.forEach((method) => {
         if (typeof object2[method] === "function") {
           const descriptor = findDescriptor(object2, method);
@@ -84165,7 +84165,7 @@ var require_methodTracing = __commonJS({
         }
       });
     }
-    exports2.addTracingToMethods = addTracingToMethods3;
+    exports2.addTracingToMethods = addTracingToMethods5;
   }
 });
 
@@ -263726,7 +263726,7 @@ init_esm();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.0-next.14",
+  version: "2.0.0-next.16",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -263763,8 +263763,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.4.1",
     "@superblocksteam/shared": "0.9132.0",
-    "@superblocksteam/util": "2.0.0-next.14",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.14",
+    "@superblocksteam/util": "2.0.0-next.16",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.16",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -263874,7 +263874,7 @@ import path21 from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/file-sync-vite-plugin.js
 init_cjs_shims();
-var import_shared21 = __toESM(require_dist3(), 1);
+var import_shared22 = __toESM(require_dist3(), 1);
 var import_body_parser = __toESM(require_body_parser(), 1);
 var import_common_tags2 = __toESM(require_lib7(), 1);
 import path17 from "node:path";
@@ -275631,6 +275631,7 @@ var import_types24 = __toESM(require_lib10(), 1);
 import fs8 from "fs/promises";
 import EventEmitter6 from "node:events";
 import path16 from "node:path";
+var import_shared16 = __toESM(require_dist3(), 1);
 var import_util26 = __toESM(require_dist4(), 1);
 init_lodash();
 var import_yaml3 = __toESM(require_dist(), 1);
@@ -277109,7 +277110,7 @@ function generateJSXAttribute(name17, info) {
     return import_types11.default.jsxAttribute(import_types11.default.jsxIdentifier(name17), import_types11.default.jsxExpressionContainer(valueNode));
   }
 }
-function writeNestedProperty({ node, paths, info }) {
+function writeNestedProperty({ node, paths, info, isDelete = false }) {
   let currentNode = node;
   const cleanedPaths = paths.map((path45) => {
     if (path45.startsWith("[")) {
@@ -277127,7 +277128,14 @@ function writeNestedProperty({ node, paths, info }) {
     }
     if (currentNode.isObjectExpression()) {
       let property = currentNode.get("properties").find((prop) => prop.isObjectProperty() && getIdentiferName(prop.node.key) === currentKey);
+      if (isDelete && cleanedPaths.length === 0) {
+        property?.remove();
+        return;
+      }
       if (!property) {
+        if (isDelete) {
+          return;
+        }
         const value3 = cleanedPaths.length > 0 ? import_types11.default.objectExpression([]) : import_types11.default.stringLiteral("");
         property = currentNode.pushContainer("properties", [
           import_types11.default.objectProperty(import_types11.default.identifier(currentKey.toString()), value3)
@@ -277141,7 +277149,16 @@ function writeNestedProperty({ node, paths, info }) {
     } else if (currentNode.isArrayExpression() && typeof currentKey === "number") {
       const index = currentKey;
       const nodeAtIndex = currentNode.get("elements")[index];
+      if (isDelete && cleanedPaths.length === 0) {
+        if (nodeAtIndex && nodeAtIndex.node != null) {
+          nodeAtIndex.remove();
+        }
+        return;
+      }
       if (!nodeAtIndex || nodeAtIndex.node == null) {
+        if (isDelete) {
+          return;
+        }
         if (cleanedPaths.length > 0) {
           const newObjectNode = import_types11.default.objectExpression([]);
           if (currentNode.get("elements").length > 0) {
@@ -277170,7 +277187,7 @@ function writeNestedProperty({ node, paths, info }) {
       }
     }
   }
-  if (currentNode) {
+  if (currentNode && !isDelete) {
     const valueNode = getPropertyExpression(info, "");
     currentNode.replaceWith(valueNode);
   }
@@ -302694,6 +302711,23 @@ var SourceTracker = class {
   setNestedAttribute = ({ openingTag, property, info }) => {
     const [parent, ...paths] = splitJSPathAdvanced(property, []);
     let parentAttr = openingTag.get("attributes").find((attr) => attr.isJSXAttribute() && attr.node.name.name === parent);
+    if (info.value === void 0) {
+      if (!parentAttr) {
+        return;
+      }
+      const expressionContainer2 = parentAttr?.get("value");
+      if (!expressionContainer2 || !expressionContainer2.isJSXExpressionContainer()) {
+        return;
+      }
+      const currentNode2 = expressionContainer2.get("expression");
+      writeNestedProperty({
+        node: currentNode2,
+        paths,
+        info,
+        isDelete: true
+      });
+      return;
+    }
     if (!parentAttr && parent) {
       const newAttr = openingTag.pushContainer("attributes", [
         import_types22.default.jsxAttribute(import_types22.default.jsxIdentifier(parent), import_types22.default.jSXExpressionContainer(import_types22.default.objectExpression([])))
@@ -302796,21 +302830,6 @@ var SourceTracker = class {
             }
           }
         }
-        if (info.type === "EVENT" && jsxAttribute) {
-          const referencedGlobalFunctions = getVariableReferences(jsxAttribute, GLOBAL_LIBRARY_NAMES);
-          referencedGlobalFunctions.forEach((funcName) => {
-            if (!this.fileToMeta[fileName].imports[funcName]) {
-              addImport({
-                importPath: "@superblocksteam/library",
-                importName: funcName,
-                path: openingTag,
-                onAdd: () => {
-                  this.fileToMeta[fileName].imports[funcName] = true;
-                }
-              });
-            }
-          });
-        }
         if (ATTRIBUTE_TYPES_WITH_STATE_ACCESS.includes(info.type) && jsxAttribute) {
           const elementLocation = this.getElementToLocation(source2.id);
           const scopeImports = this.sbScopeManager.getAndUpdateScopeImportsForCodeSnippet({
@@ -303109,7 +303128,7 @@ var FileSyncManager = class extends EventEmitter6 {
   watcher;
   registeredComponentPaths = {};
   renameManager = new RenameManager();
-  constructor(fsOperationQueue, generationNumberSequence) {
+  constructor(fsOperationQueue, generationNumberSequence, tracer2) {
     super({ captureRejections: true });
     this.rootDir = "/";
     this.fsOperationQueue = fsOperationQueue;
@@ -303133,6 +303152,25 @@ var FileSyncManager = class extends EventEmitter6 {
       handleUpdateTheme: { operation: "updating the theme" },
       handleRenameElement: { operation: "renaming an element" }
     });
+    const methods = [
+      "handleCreatePage",
+      "handleReparent",
+      "handleCreateComponent",
+      "handleDeleteComponents",
+      "handleSetProperty",
+      "handleSetProperties",
+      "handleDeleteProperties",
+      "handleBatchUpdate",
+      "handleUpdateApi",
+      "handleDeleteApi",
+      "handleRenameApi",
+      "handleAddEntity",
+      "handleUpdateEntity",
+      "handleDeleteEntity",
+      "handleUpdateTheme",
+      "handleRenameElement"
+    ];
+    (0, import_shared16.addTracingToMethods)(this, methods, tracer2);
   }
   get appFilePath() {
     if (!this.rootDir) {
@@ -304187,19 +304225,19 @@ var indexHtml = (
 
 // ../../../vite-plugin-file-sync/dist/lock-service/index.js
 init_cjs_shims();
-var import_shared19 = __toESM(require_dist3(), 1);
+var import_shared20 = __toESM(require_dist3(), 1);
 import EventEmitter7 from "node:events";
 
 // ../../../vite-plugin-file-sync/dist/sync-service/server-rpc/client.js
 init_cjs_shims();
-var import_shared17 = __toESM(require_dist3(), 1);
 var import_shared18 = __toESM(require_dist3(), 1);
+var import_shared19 = __toESM(require_dist3(), 1);
 
 // ../../../vite-plugin-file-sync/dist/sync-service/server-rpc/handlers.js
 init_cjs_shims();
-var import_shared16 = __toESM(require_dist3(), 1);
+var import_shared17 = __toESM(require_dist3(), 1);
 async function notImplemented() {
-  throw new import_shared16.NotImplementedError("Signing methods are not implemented");
+  throw new import_shared17.NotImplementedError("Signing methods are not implemented");
 }
 function createRequestHandlers2() {
   const requestHandlers = {
@@ -304219,7 +304257,7 @@ function createRequestHandlers2() {
 async function connectToISocketRPCServer2({ superblocksBaseUrl, token: token2 }) {
   const requestHandlers = createRequestHandlers2();
   const authorization = `Bearer ${token2}`;
-  const wsUrl = new URL(`api/${import_shared17.serverWsPath}`, superblocksBaseUrl);
+  const wsUrl = new URL(`api/${import_shared18.serverWsPath}`, superblocksBaseUrl);
   if (wsUrl.protocol === "http:") {
     wsUrl.protocol = "ws:";
   } else if (wsUrl.protocol === "https:") {
@@ -304239,8 +304277,8 @@ async function connectToISocketRPCServer2({ superblocksBaseUrl, token: token2 })
 }
 async function connectISocket2(wsUrl, authorization, requestHandlers, globalMiddlewares, timeouts) {
   const ws = await connectWebSocket2(wsUrl);
-  const isocket = new import_shared17.ISocketWithClientAuth(ws, authorization, requestHandlers, globalMiddlewares, timeouts);
-  return (0, import_shared17.createISocketClient)(isocket);
+  const isocket = new import_shared18.ISocketWithClientAuth(ws, authorization, requestHandlers, globalMiddlewares, timeouts);
+  return (0, import_shared18.createISocketClient)(isocket);
 }
 function connectWebSocket2(wsUrl) {
   return new Promise((resolve8, reject) => {
@@ -304258,9 +304296,9 @@ async function unwrapResponseDto(request) {
   if (!response.responseMeta.success || response.responseMeta.error || response.responseMeta.status !== 200) {
     const errorMessage = response.responseMeta.error?.message ?? response.responseMeta.message ?? `Request failed with status ${response.responseMeta.status}`;
     if (response.responseMeta.status === 409) {
-      throw new import_shared18.ConflictError(errorMessage);
+      throw new import_shared19.ConflictError(errorMessage);
     } else if (response.responseMeta.status === 404) {
-      throw new import_shared17.NotFoundError(errorMessage);
+      throw new import_shared18.NotFoundError(errorMessage);
     }
     throw new Error(errorMessage);
   }
@@ -304321,7 +304359,7 @@ var LockService = class extends EventEmitter7 {
       "shutdown",
       "shutdownAndExit"
     ];
-    (0, import_shared19.addTracingToMethods)(this, methods, this._tracer);
+    (0, import_shared20.addTracingToMethods)(this, methods, this._tracer);
   }
   setSyncCallback(callback) {
     this.syncCallback = callback;
@@ -304366,7 +304404,7 @@ var LockService = class extends EventEmitter7 {
         return;
       }
     } catch (error) {
-      if (error instanceof import_shared19.ConflictError) {
+      if (error instanceof import_shared20.ConflictError) {
         logger3.error(`[lock-service] ${error.message}`);
         this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
         this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
@@ -304422,7 +304460,7 @@ var LockService = class extends EventEmitter7 {
           return true;
         }
       } catch (error) {
-        if (error instanceof import_shared19.NotFoundError) {
+        if (error instanceof import_shared20.NotFoundError) {
           logger3.info(`[lock-service] Lock was removed, shutting down: ${error.message}`);
           this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
           this.status = LockServiceStatus.LOCK_INVALID;
@@ -304630,7 +304668,7 @@ function generateRootSource(code, fileSyncManager) {
 
 // ../../../vite-plugin-file-sync/dist/socket-manager.js
 init_cjs_shims();
-var import_shared20 = __toESM(require_dist3(), 1);
+var import_shared21 = __toESM(require_dist3(), 1);
 import EventEmitter8 from "node:events";
 
 // ../../../vite-plugin-file-sync/dist/util/tracing.js
@@ -304724,7 +304762,7 @@ var SocketManager = class extends EventEmitter8 {
       }
     });
     wss.on("connection", (ws, isEditor, peerId, userId) => {
-      const socket = (0, import_shared20.createISocketClient)(new import_shared20.ISocket(ws, withMethodTracing(tracer2, {
+      const socket = (0, import_shared21.createISocketClient)(new import_shared21.ISocket(ws, withMethodTracing(tracer2, {
         editor: {
           // Update widgets
           setProperties: [fileSyncManager.handleSetProperties],
@@ -304885,7 +304923,7 @@ var fileSyncVitePlugin = (pluginParams, options8) => {
   const aiService = pluginParams.aiService;
   const fsOperationQueue = pluginParams.fsOperationQueue;
   const httpServer2 = pluginParams.httpServer;
-  const fileSyncManager = new FileSyncManager(fsOperationQueue, generationNumberSequence);
+  const fileSyncManager = new FileSyncManager(fsOperationQueue, generationNumberSequence, pluginParams.tracer);
   if (syncService) {
     syncService.generationNumberSequence = generationNumberSequence;
   }
@@ -305495,7 +305533,7 @@ async function getAppScope(fileSyncManager) {
     pageId: apiPb.trigger.application?.pageId,
     organizationId: apiPb.metadata.organization,
     updated: apiPb.metadata?.timestamps?.updated ? new Date(apiPb.metadata?.timestamps?.updated) : void 0,
-    triggerType: import_shared21.ApiTriggerType.UI,
+    triggerType: import_shared22.ApiTriggerType.UI,
     apiPb
   }));
   const appScope = {
@@ -308628,7 +308666,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path21.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.14";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.16";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -314782,6 +314820,9 @@ function createAnthropic(options8 = {}) {
 }
 var anthropic = createAnthropic();
 
+// ../../../vite-plugin-file-sync/dist/ai-service/index.js
+var import_shared33 = __toESM(require_dist3(), 1);
+
 // ../../../vite-plugin-file-sync/dist/ai-service/app-interface/shell.js
 init_cjs_shims();
 import { exec } from "node:child_process";
@@ -322675,6 +322716,7 @@ var AiService = class extends EventEmitter10 {
   templateRenderer;
   appShell;
   clark;
+  tracer;
   constructor(config2) {
     super();
     this.config = config2;
@@ -322704,6 +322746,15 @@ var AiService = class extends EventEmitter10 {
         transitionTo({ type: SERVICE_STARTED_WITH_DRAFT });
       }
     });
+    this.tracer = config2.tracer;
+    const methods = [
+      "handleAiGenerate",
+      "handleUserAcceptedDraft",
+      "handleUserRejectedDraft",
+      "handleUserCanceled",
+      "handleBuildSystemError"
+    ];
+    (0, import_shared33.addTracingToMethods)(this, methods, this.tracer);
   }
   createClarkTransitionHandler() {
     const clarkStateHandlerFactories = {
@@ -322821,7 +322872,7 @@ var OperationQueue = class {
 // ../../../vite-plugin-file-sync/dist/sync-service/index.js
 init_cjs_shims();
 import EventEmitter11 from "node:events";
-var import_shared34 = __toESM(require_dist3(), 1);
+var import_shared36 = __toESM(require_dist3(), 1);
 
 // ../../../vite-plugin-file-sync/dist/util/with-resolvers.js
 init_cjs_shims();
@@ -322841,7 +322892,7 @@ import * as fsp3 from "node:fs/promises";
 
 // ../../../vite-plugin-file-sync/dist/sync-service/hash-dir-tree.js
 init_cjs_shims();
-var import_shared32 = __toESM(require_dist3(), 1);
+var import_shared34 = __toESM(require_dist3(), 1);
 var import_util32 = __toESM(require_dist4(), 1);
 async function hashLocalDirectory2(localDirectoryPath) {
   const directoryContents = [];
@@ -322850,7 +322901,7 @@ async function hashLocalDirectory2(localDirectoryPath) {
     let entry;
     switch (localDirEntry.type) {
       case "-": {
-        const hash3 = await (0, import_shared32.hashFileContents)(localDirEntry.contents);
+        const hash3 = await (0, import_shared34.hashFileContents)(localDirEntry.contents);
         entry = {
           type: "-",
           executable: localDirEntry.executable,
@@ -322882,7 +322933,7 @@ async function hashLocalDirectory2(localDirectoryPath) {
     }
     directoryContents.push(entry);
   }
-  const hash2 = await (0, import_shared32.hashDirectoryContents)(directoryContents);
+  const hash2 = await (0, import_shared34.hashDirectoryContents)(directoryContents);
   return { contents: directoryContents, hash: hash2 };
 }
 
@@ -323362,7 +323413,7 @@ var HashCache = class {
 
 // ../../../vite-plugin-file-sync/dist/sync-service/snapshot/take-snapshot.js
 init_cjs_shims();
-var import_shared33 = __toESM(require_dist3(), 1);
+var import_shared35 = __toESM(require_dist3(), 1);
 var import_util33 = __toESM(require_dist4(), 1);
 async function snapshotLocalDirectory(localDirectoryPath) {
   const directoryContents = [];
@@ -323371,7 +323422,7 @@ async function snapshotLocalDirectory(localDirectoryPath) {
     let entry;
     switch (localDirEntry.type) {
       case "-": {
-        const hash2 = await (0, import_shared33.hashFileContents)(localDirEntry.contents);
+        const hash2 = await (0, import_shared35.hashFileContents)(localDirEntry.contents);
         entry = {
           type: "-",
           name: localDirEntry.name,
@@ -323404,7 +323455,7 @@ async function snapshotLocalDirectory(localDirectoryPath) {
     }
     directoryContents.push(entry);
   }
-  const directoryHash = await (0, import_shared33.hashDirectoryContents)(directoryContents);
+  const directoryHash = await (0, import_shared35.hashDirectoryContents)(directoryContents);
   return {
     hash: directoryHash,
     contents: directoryContents
@@ -323535,7 +323586,7 @@ var SyncService = class extends EventEmitter11 {
       "discardLocalDraftChanges",
       "commitLocalDraftChanges"
     ];
-    (0, import_shared34.addTracingToMethods)(this, methods, this._tracer);
+    (0, import_shared36.addTracingToMethods)(this, methods, this._tracer);
   }
   /** The current status of the sync service, which indicates what the service is currently doing */
   get status() {
@@ -324720,7 +324771,8 @@ async function dev(options8) {
           organizationId: currentUser.organizations[0].id,
           anthropicApiKey: process.env.ANTHROPIC_API_KEY || "",
           fsOperationQueue,
-          draftInterface: syncService
+          draftInterface: syncService,
+          tracer: dev_tracer_default
         });
         const isSynced = localContents.hash === serverHash;
         if (isSynced) {
@@ -324780,11 +324832,11 @@ async function dev(options8) {
 
 // ../sdk/dist/cli-replacement/init.js
 init_cjs_shims();
-var import_shared35 = __toESM(require_dist3(), 1);
+var import_shared37 = __toESM(require_dist3(), 1);
 var import_util35 = __toESM(require_dist4(), 1);
 async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, projectRootFolder, appRelativePath, sdk: sdk2, skipSigningVerification }) {
   const headers = {
-    [import_util35.COMPONENT_EVENT_HEADER]: import_shared35.ComponentEvent.INIT
+    [import_util35.COMPONENT_EVENT_HEADER]: import_shared37.ComponentEvent.INIT
   };
   const application = await sdk2.fetchApplicationWithComponents({
     applicationId: resourceId,
@@ -324805,7 +324857,7 @@ async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, pr
 }
 
 // ../sdk/dist/index.js
-var import_shared36 = __toESM(require_dist3(), 1);
+var import_shared38 = __toESM(require_dist3(), 1);
 
 // src/commands/commits.mts
 var import_util38 = __toESM(require_dist4(), 1);
@@ -329888,7 +329940,7 @@ ${error.message}.`
             task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
             let viewMode;
             if (commitId) {
-              viewMode = import_shared36.ExportViewMode.EXPORT_COMMIT;
+              viewMode = import_shared38.ExportViewMode.EXPORT_COMMIT;
             } else {
               viewMode = await getMode(task, mode);
             }

package/oclif.manifest.json

@@ -509,5 +509,5 @@
       "strict": true
     }
   },
-  "version": "2.0.0-next.14"
+  "version": "2.0.0-next.16"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.0-next.14",
+  "version": "2.0.0-next.16",
   "type": "module",
   "description": "Official Superblocks CLI",
   "homepage": "https://www.superblocks.com",
@@ -42,9 +42,9 @@
   "devDependencies": {
     "@eslint/js": "^9.16.0",
     "@oclif/test": "^4.1.11",
-    "@superblocksteam/sdk": "2.0.0-next.14",
+    "@superblocksteam/sdk": "2.0.0-next.16",
     "@superblocksteam/shared": "0.9132.0",
-    "@superblocksteam/util": "2.0.0-next.14",
+    "@superblocksteam/util": "2.0.0-next.16",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",