npm - @superblocksteam/vite-plugin-file-sync - Versions diffs - 2.0.0-next.7 → 2.0.0-next.71 - Mend

@superblocksteam/vite-plugin-file-sync 2.0.0-next.7 → 2.0.0-next.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (275) hide show

package/dist/routing.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { getLogger } from "./util/logger.js";
 /**
  * Generates the root source code for the app, wrapping the user's root component in a React Router RouterProvider.
  */
-export function generateRootSource(code, fileSyncManager) {
+export function generateRootSource(code, routes) {
     const ast = parse(code, {
         sourceType: "module",
         plugins: ["typescript", "jsx"],
@@ -27,7 +27,6 @@ export function generateRootSource(code, fileSyncManager) {
         getLogger().error("No default export found");
         return code;
     }
-    const routes = fileSyncManager.getRoutes();
     return /*js*/ stripIndent `
   // CSS from library
   import "@superblocksteam/library/index.css";

package/dist/routing.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"routing.js","sourceRoot":"","sources":["../src/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;GAEG;AACH,MAAM,UAAU,kBAAkB,~~CAChC~~,IAAY,~~EACZ~~,~~eAAgC~~;~~IAEhC~~,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE;QACtB,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC;KAC/B,CAAC,CAAC;IAEH,IAAI,YAAgC,CAAC;IAErC,QAAQ,CAAC,GAAG,EAAE;QACZ,wBAAwB,CAAC,IAAI;YAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC5C,IAAI,WAAW,CAAC,qBAAqB,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;gBACtC,IAAI,EAAE,EAAE,CAAC;oBACP,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,iDAAiD;IACjD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,SAAS,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,~~MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC;IAE3C,~~OAAO,MAAM,CAAC,WAAW,CAAA;;;;;;;;;;IAUvB,IAAI;;;;;kBAKU,YAAY;;UAEpB,MAAM;SACL,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE;QAC3B,OAAO;qBACE,SAAS,CAAC,IAAI,CAAC;qBACf,IAAI,KAAK,GAAG;;qEAEoC,SAAS;;;YAGlE,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;CAenB,CAAC;AACF,CAAC"}
1	+ {"version":3,"file":"routing.js","sourceRoot":"","sources":["../src/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,MAAuB;IACtE,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE;QACtB,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC;KAC/B,CAAC,CAAC;IAEH,IAAI,YAAgC,CAAC;IAErC,QAAQ,CAAC,GAAG,EAAE;QACZ,wBAAwB,CAAC,IAAI;YAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC5C,IAAI,WAAW,CAAC,qBAAqB,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;gBACtC,IAAI,EAAE,EAAE,CAAC;oBACP,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,iDAAiD;IACjD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,SAAS,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CAAA;;;;;;;;;;IAUvB,IAAI;;;;;kBAKU,YAAY;;UAEpB,MAAM;SACL,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE;QAC3B,OAAO;qBACE,SAAS,CAAC,IAAI,CAAC;qBACf,IAAI,KAAK,GAAG;;qEAEoC,SAAS;;;YAGlE,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;CAenB,CAAC;AACF,CAAC"}

package/dist/sb-scope-manager.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export declare class SbScopeManager extends EventEmitter<EventMap> {
     private pageAndAppScopes;
     private scopeIdToFilePath;
     private sourceTracker;
+    private filePathsWithDuplicateComponentNames;
     private scopeNameToScopeUsage;
     constructor(sourceTracker: SourceTracker);
     parseScopes(fileMeta: Record<string, {
@@ -89,10 +90,11 @@ export declare class SbScopeManager extends EventEmitter<EventMap> {
     };
     addScopeComponent(scopeName: string, componentName: string): string[];
     deleteScopeComponent(scopeName: string, componentName: string): string[];
-    renameScopeComponent({ newName, oldName, scopeName, }: {
+    renameScopeComponent({ newName, oldName, scopeName, componentFilePath, }: {
         newName: string;
         oldName?: string;
         scopeName: string;
+        componentFilePath: string;
     }): string[];
     private getScopeUsage;
     private reconcileBindPropertiesAndScopeDefinitions;

package/dist/sb-scope-manager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sb-scope-manager.d.ts","sourceRoot":"","sources":["../src/sb-scope-manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAEvC,OAAO,CAAuB,MAAM,cAAc,CAAC;~~AAKnD~~,OAAO,EAML,KAAK,iBAAiB,~~EAQvB~~,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,mBAAmB,EACpB,MAAM,uCAAuC,CAAC;AAE/C,KAAK,QAAQ,GAAG;IACd,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;CACzD,GAAG,aAAa,CAAC;AAElB,qBAAa,cAAe,SAAQ,YAAY,CAAC,QAAQ,CAAC;IAExD,OAAO,CAAC,gBAAgB,CAAwC;IAChE,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,aAAa,CAAgB;~~IAGrC~~,OAAO,CAAC,qBAAqB,CAGtB;gBAEK,aAAa,EAAE,aAAa;IAKjC,WAAW,CAChB,QAAQ,EAAE,MAAM,CACd,MAAM,EACN;QACE,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAClC,CACF;IA+CH;;;;;;;;;;;OAWG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM;IAgD3B,uCAAuC,CAAC,EAC7C,UAAU,EACV,IAAI,GACL,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB;;;;;;;IAYM,iCAAiC,CAAC,EACvC,eAAe,EACf,SAAS,EACT,iBAAiB,GAClB,EAAE;QACD,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACxC,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,GAAG,IAAI;IAyCD,yBAAyB,CAAC,QAAQ,EAAE,MAAM;IAK1C,sCAAsC,CAAC,EAC5C,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,EAAE;QACD,YAAY,EAAE,CAAC,CAAC,YAAY,CAAC;QAC7B,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;KACzC,GAAG;QACF,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE;IAwDH,OAAO,CAAC,oBAAoB;IAe5B;;OAEG;IACI,cAAc,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;KAChC;IA2DI,iBAAiB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,mBAAmB;IAuC5D,iBAAiB,CAAC,QAAQ,EAAE,SAAS;;8BAyCF,SAAS,EAAE;;IAI9C,iBAAiB,CAAC,EACvB,QAAQ,EACR,OAAO,EACP,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,SAAS,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB;;;;;;;~~IAkDM~~,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IA8C1D,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IA6C7D,oBAAoB,CAAC,EAC1B,OAAO,EACP,OAAO,EACP,SAAS,~~GACV~~,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;~~KACnB~~;~~IAsDD~~,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,0CAA0C;~~IAuClD~~,OAAO,CAAC,iBAAiB;CAS1B"}
1	+ {"version":3,"file":"sb-scope-manager.d.ts","sourceRoot":"","sources":["../src/sb-scope-manager.ts"],"names":[],"mappings":"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"}

package/dist/sb-scope-manager.js CHANGED Viewed

@@ -1,17 +1,19 @@
 import EventEmitter from "node:events";
 import path from "node:path";
 import t, { isObjectProperty } from "@babel/types";
+import { getStableEntityId } from "@superblocksteam/library-shared";
 import { sbEntitySymbol } from "@superblocksteam/library-shared/types";
 import { SCOPE_FILE } from "./file-system-helpers.js";
 import { supplementElementIds } from "./parsing/ids.js";
 import { getVariableReferences } from "./parsing/jsx.js";
-import { buildScopeDestructuredUsageMap, fromEntityToNode, fromNodeToEntity, updateScopeUsages, addScopeToComponent, isComponentAlreadyUsingScope, parseSbScopeDefinition, updateEntityNode, getScopeElementId, findBindComponentsInScopeUsage, addTypeParametersToScope, updateDestructuredEntitiesParam, } from "./parsing/scope.js";
+import { buildScopeDestructuredUsageMap, fromEntityToNode, fromNodeToEntity, updateScopeUsages, addScopeToComponent, isComponentAlreadyUsingScope, parseSbScopeDefinition, updateEntityNode, findBindComponentsInScopeUsage, addTypeParametersToScope, updateDestructuredEntitiesParam, } from "./parsing/scope.js";
 import { addImport, getImportPath } from "./parsing/util.js";
 export class SbScopeManager extends EventEmitter {
     // maps file name to scope definition
     pageAndAppScopes = new Map();
     scopeIdToFilePath = {};
     sourceTracker;
+    filePathsWithDuplicateComponentNames = new Set();
     // this maps scope name to file name to the node where the scope is being spread
     scopeNameToScopeUsage = {};
     constructor(sourceTracker) {
@@ -255,7 +257,7 @@ export class SbScopeManager extends EventEmitter {
                 },
             });
         });
-        const id = getScopeElementId(scopeId, payload.name);
+        const id = getStableEntityId(scopeId, payload.name);
         this.sourceTracker.setElementToLocation(id, newEntityNode);
         this.sourceTracker.setElementToFilePath(id, filePath);
         scopeDef.entityNames.push(payload.name);
@@ -268,7 +270,7 @@ export class SbScopeManager extends EventEmitter {
         const entityNode = this.sourceTracker.getElementToLocation(entityId);
         const filePath = this.sourceTracker.getElementToFilePath(entityId);
         if (!entityNode || !isObjectProperty(entityNode.node)) {
-            throw new Error("Entity to update not found" + entityId);
+            throw new Error("Entity to update not found " + entityId);
         }
         if (!filePath) {
             throw new Error("File path not found for entity: " + entityId);
@@ -352,7 +354,13 @@ export class SbScopeManager extends EventEmitter {
             key.replaceWith(t.identifier(newName));
         }
         scopeDef.entityNames = scopeDef.entityNames.map((name) => name === oldName ? newName : name);
-        scopeDef.scopeNameToEntityId[newName] = entityId;
+        // clear references to old name and set references to new name
+        const newEntityId = getStableEntityId(scopeDef.id, newName);
+        this.sourceTracker.deleteElementToLocation(entityId);
+        this.sourceTracker.deleteElementToFilePath(entityId);
+        scopeDef.scopeNameToEntityId[newName] = newEntityId;
+        this.sourceTracker.setElementToLocation(newEntityId, entityNode);
+        this.sourceTracker.setElementToFilePath(newEntityId, filePath);
         delete scopeDef.scopeNameToEntityId[oldName];
         const updatedFiles = this.updateScopeUsages(scopeDef.name, scopeDef.entityNames);
         updateDestructuredEntitiesParam(scopeDef);
@@ -385,7 +393,7 @@ export class SbScopeManager extends EventEmitter {
         scopeDef.entityNames.push(componentName);
         // Update all scope usages to include the new component
         const updatedFiles = this.updateScopeUsages(scopeDef.name, scopeDef.entityNames);
-        const entityId = getScopeElementId(scopeDef.id, componentName);
+        const entityId = getStableEntityId(scopeDef.id, componentName);
         this.sourceTracker.setElementToLocation(entityId, newComponents[0]);
         this.sourceTracker.setElementToFilePath(entityId, filePath);
         updateDestructuredEntitiesParam(scopeDef);
@@ -399,7 +407,7 @@ export class SbScopeManager extends EventEmitter {
         if (!scopeDef) {
             return [];
         }
-        const componentTypeId = getScopeElementId(scopeDef.id, componentName);
+        const componentTypeId = getStableEntityId(scopeDef.id, componentName);
         const componentNode = this.sourceTracker.getElementToLocation(componentTypeId);
         const filePath = this.sourceTracker.getElementToFilePath(componentTypeId);
         if (!componentNode ||
@@ -419,25 +427,27 @@ export class SbScopeManager extends EventEmitter {
         updateDestructuredEntitiesParam(scopeDef);
         return [...updatedFiles, filePath];
     }
-    renameScopeComponent({ newName, oldName, scopeName, }) {
+    renameScopeComponent({ newName, oldName, scopeName, componentFilePath, }) {
         if (!oldName) {
             return this.addScopeComponent(scopeName, newName);
         }
-        const { scopeDefinition: scopeDef } = this.getScopeDefinitionAndFilePathByNameOrId({
+        const { scopeDefinition: scopeDef, filePath: scopeFile } = this.getScopeDefinitionAndFilePathByNameOrId({
             identifier: scopeName,
             type: "name",
         });
         if (!scopeDef) {
             return [];
         }
-        const componentTypeId = getScopeElementId(scopeDef.id, oldName);
+        const componentTypeId = getStableEntityId(scopeDef.id, oldName);
         const filePath = this.sourceTracker.getElementToFilePath(componentTypeId);
         if (!filePath) {
-            return [];
+            // this could happen if we're renaming a component that had a duplicate name with somthing else
+            return this.resetScope(scopeFile);
         }
         const componentNode = this.sourceTracker.getElementToLocation(componentTypeId);
         if (!componentNode) {
-            return [];
+            // this could happen if we're renaming a component that had a duplicate name with somthing else
+            return this.resetScope(scopeFile);
         }
         // Update the key name in the AST
         const key = componentNode.get("key");
@@ -451,11 +461,16 @@ export class SbScopeManager extends EventEmitter {
         // clear references to old name and set references to new name
         this.sourceTracker.deleteElementToLocation(componentTypeId);
         this.sourceTracker.deleteElementToFilePath(componentTypeId);
-        const newComponentTypeId = getScopeElementId(scopeDef.id, newName);
+        const newComponentTypeId = getStableEntityId(scopeDef.id, newName);
         scopeDef.scopeNameToEntityId[newName] = newComponentTypeId;
         this.sourceTracker.setElementToLocation(newComponentTypeId, componentNode);
         this.sourceTracker.setElementToFilePath(newComponentTypeId, filePath);
         updateDestructuredEntitiesParam(scopeDef);
+        // handle edge case with a user fixing duplicate names
+        if (this.filePathsWithDuplicateComponentNames.has(componentFilePath)) {
+            const reconciledFiles = this.reconcileBindPropertiesAndScopeDefinitions();
+            return [...updatedFiles, ...reconciledFiles, filePath];
+        }
         return [...updatedFiles, filePath];
     }
     getScopeUsage(ast, filePath) {
@@ -466,6 +481,7 @@ export class SbScopeManager extends EventEmitter {
         buildScopeDestructuredUsageMap(ast, filePath, allScopeNames, this.scopeNameToScopeUsage);
     }
     reconcileBindPropertiesAndScopeDefinitions() {
+        this.filePathsWithDuplicateComponentNames.clear();
         for (const [scopeName, scopeUsages] of Object.entries(this.scopeNameToScopeUsage)) {
             const { scopeDefinition: scopeDef } = this.getScopeDefinitionAndFilePathByNameOrId({
                 identifier: scopeName,
@@ -475,10 +491,15 @@ export class SbScopeManager extends EventEmitter {
                 continue;
             }
             const missingComponents = new Set();
-            for (const [_, usages] of Object.entries(scopeUsages)) {
+            const seenNames = new Set();
+            for (const [filePath, usages] of Object.entries(scopeUsages)) {
                 for (const usage of usages) {
                     const bindNames = findBindComponentsInScopeUsage(usage);
                     for (const bindName of bindNames) {
+                        if (seenNames.has(bindName)) {
+                            this.filePathsWithDuplicateComponentNames.add(filePath);
+                        }
+                        seenNames.add(bindName);
                         if (!scopeDef.entityNames.includes(bindName)) {
                             missingComponents.add(bindName);
                         }

package/dist/sb-scope-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sb-scope-manager.js","sourceRoot":"","sources":["../src/sb-scope-manager.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"sb-scope-manager.js","sourceRoot":"","sources":["../src/sb-scope-manager.ts"],"names":[],"mappings":"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"}

package/dist/socket-manager.d.ts CHANGED Viewed

@@ -16,7 +16,9 @@ export declare class SocketManager extends EventEmitter<SocketManagerEvents> {
     private editorSockets;
     private librarySockets;
     private connectedUserPeerIdsMap;
-    constructor();
+    private tracer;
+    constructor(tracer: Tracer);
+    emit(eventName: keyof SocketManagerEvents, ...args: [ISocketClient<EditorClientMethods>] | [ISocketClient<LibraryClientMethods>]): boolean;
     private socketServer;
     startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, path, tracer, }: {
         server: http.Server;
@@ -25,7 +27,7 @@ export declare class SocketManager extends EventEmitter<SocketManagerEvents> {
         lockService?: LockService;
         aiService?: AiService;
         path: string;
-        tracer?: Tracer;
+        tracer: Tracer;
     }): void;
     /**
      * If we have no more socket connections, release the lock

package/dist/socket-manager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAKvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,~~EAAE~~,MAAM,EAAE,MAAM,oBAAoB,CAAC;~~AACjD~~,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACvD,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,mBAAmB,CAAC;IAClE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,uBAAuB,CAAuC~~;;IAMtE~~,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,IAAI,EACJ,MAAM,GACP,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,eAAe,CAAC;QACjC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,~~CAAC,~~EAAE,MAAM,CAAC;~~KACjB~~;~~IAmKD~~;;;OAGG;IACG,wCAAwC,CAAC,WAAW,CAAC,EAAE,WAAW;IAoBxE,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;CAMrE"}
1	+ {"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAKvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACvD,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,mBAAmB,CAAC;IAClE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,uBAAuB,CAAuC;IACtE,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM;IAKjB,IAAI,CACX,SAAS,EAAE,MAAM,mBAAmB,EACpC,GAAG,IAAI,EACH,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,GACpC,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,GACxC,OAAO;IAQV,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,IAAI,EACJ,MAAM,GACP,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,eAAe,CAAC;QACjC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB;IAoKD;;;OAGG;IACG,wCAAwC,CAAC,WAAW,CAAC,EAAE,WAAW;IAoBxE,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;CAMrE"}

package/dist/socket-manager.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import EventEmitter from "node:events";
-import { createISocketClient, ISocket } from "@superblocksteam/shared";
+import { createISocketClient, TracedSocket } from "@superblocksteam/shared";
 import { WebSocketServer } from "ws";
 import { getErrorMeta, getLogger } from "./util/logger.js";
 import { withMethodTracing } from "./util/tracing.js";
@@ -8,8 +8,17 @@ export class SocketManager extends EventEmitter {
     editorSockets = new Set();
     librarySockets = new Set();
     connectedUserPeerIdsMap = new Map();
-    constructor() {
+    tracer;
+    constructor(tracer) {
         super();
+        this.tracer = tracer;
+    }
+    emit(eventName, ...args) {
+        return this.tracer.startActiveSpan("event: " + eventName, (span) => {
+            const result = super.emit(eventName, ...args);
+            span.end();
+            return result;
+        });
     }
     socketServer;
     startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, path, tracer, }) {
@@ -41,7 +50,7 @@ export class SocketManager extends EventEmitter {
             }
         });
         wss.on("connection", (ws, isEditor, peerId, userId) => {
-            const socket = createISocketClient(new ISocket(ws, withMethodTracing(tracer, {
+            const socket = createISocketClient(new TracedSocket(ws, withMethodTracing(tracer, {
                 editor: {
                     // Update widgets
                     setProperties: [fileSyncManager.handleSetProperties],
@@ -97,7 +106,7 @@ export class SocketManager extends EventEmitter {
                         },
                     ],
                 },
-            }), [], undefined, undefined));
+            }), [], tracer, undefined, undefined));
             // we are storing all of the sockets for a given peerId (editor+library pair of connections)
             // which lets us handle synchronization of operations between the two
             let existingSockets = this.peerIds.get(peerId);

package/dist/socket-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"socket-manager.js","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,~~OAAO~~,EAAE,MAAM,yBAAyB,CAAC;~~AACvE~~,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAoBtD,MAAM,OAAO,aAAc,SAAQ,YAAiC;IAC1D,OAAO,GAAG,IAAI,GAAG,EAAmC,CAAC;IAErD,aAAa,GAAG,IAAI,GAAG,EAAsC,CAAC;IAC9D,cAAc,GAAG,IAAI,GAAG,EAAuC,CAAC;IAChE,uBAAuB,GAA6B,IAAI,GAAG,EAAE,CAAC;~~IAEtE~~;~~QACE~~,KAAK,EAAE,CAAC;~~IACV~~,CAAC;IAEO,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,IAAI,EACJ,MAAM,GASP;QACC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QAExB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;YAEjD,wFAAwF;YACxF,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC1B,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,QAAQ,EAAE,CAAC;oBACvD,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;gBAED,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;oBAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,SAAS,EAAE,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;wBAClD,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;wBAClC,OAAO;oBACT,CAAC;oBAED,GAAG,CAAC,IAAI,CACN,YAAY,EACZ,EAAE,EACF,QAAQ,EACR,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAC9B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAC/B,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CACJ,YAAY,EACZ,CAAC,EAAa,EAAE,QAAiB,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;YACpE,MAAM,MAAM,~~GAAG~~,mBAAmB,~~CAChC~~,IAAI,~~OAAO~~,~~CACT~~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"}
1	+ {"version":3,"file":"socket-manager.js","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"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"}

package/dist/source-tracker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"source-tracker.d.ts","sourceRoot":"","sources":["../src/source-tracker.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,KAAK,EACV,KAAK,mBAAmB,EACzB,MAAM,uCAAuC,CAAC;AAiC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EACV,IAAI,EAIL,MAAM,cAAc,CAAC;AAEtB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,cAAc,CAAC;CACxB,CAAC;AAiBF,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC;AAEtC,UAAU,iBAAiB;IACzB,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,EAAE,EAAE,QAAQ,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IACjE,aAAa,EAAE,CAAC,CAAC,EAAE;QACjB,MAAM,EAAE,cAAc,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,aAAa,EAAE,CAAC,CAAC,EAAE;QACjB,MAAM,EAAE,cAAc,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KACvC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,EAAE;QACf,MAAM,EAAE,cAAc,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,YAAY,CAAC;KACpB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,SAAS,EAAE,CAAC,CAAC,EAAE;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,YAAY,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACtC,CAAC;KACH,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,YAAY,EAAE,CAAC,CAAC,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAC7E,WAAW,EAAE,CAAC,CAAC,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5E;AAQD,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,iBAAiB,CAAiC;IAC1D,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,sBAAsB,CAOvB;IAEP,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAOX;IAEP,OAAO,CAAC,YAAY,CAA0B;;IAM9C,eAAe;cAZL,MAAM;aACP,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI;iBACpB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;IAcpC;;;;OAIG;IACH,kBAAkB,QAAa,OAAO,CACpC,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAC9D,CAcC;IAEF,oBAAoB,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC;IACjD,oBAAoB,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM;IAM3C,oBAAoB,IAAI,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzD,oBAAoB,CAAC,EAAE,EAAE,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;IAMnD,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IAGxD,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM;IAIpD,uBAAuB,CAAC,EAAE,EAAE,SAAS;IAGrC,uBAAuB,CAAC,EAAE,EAAE,SAAS;IAIrC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAS1E,OAAO,CAAC,sBAAsB;IA6B9B,uBAAuB,GAAI,WAAW;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,UAoCrE;IAEF,kCAAkC,GAChC,UAAU,MAAM,EAChB,cAAc,MAAM,mBAuDpB;IAEF,UAAU,GAAU,UAAU,MAAM,mBAwBlC;IAEF,WAAW,GAAU,eAGlB;QACD,IAAI,EAAE,QAAQ,CAAC;QACf,EAAE,EAAE,QAAQ,CAAC;KACd,KAAG,OAAO,CAAC,IAAI,CAAC,CAuGf;IAEF,MAAM,GAAU,wBAGb;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,qBAsBC;IAEF,SAAS,GAAU,wBAGhB;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,iCAmBC;IAEF,SAAS,GAAU,sBAGhB;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE;YACN,IAAI,EAAE,YAAY,CAAC;YACnB,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;SAChC,CAAC;KACH,mBAKC;IAEF,YAAY,GAAU,SAAS,mBAAmB,mBAGhD;IAEF,YAAY,GAAU,cAAc;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,yCAOzD;IAEF,YAAY,GAAU,4CAKnB;QACD,QAAQ,EAAE,SAAS,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,mBAoCC;IAGF,WAAW,GAAU,2BAGlB;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,KAAK,CAAC;KACd,mBAcC;IAEF,UAAU,GAAU,kEAOjB,aAAa,KAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAmM/C;IAEF,aAAa,GAAU,wBAGpB;QACD,MAAM,EAAE,cAAc,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,mBAsEC;IAGF,OAAO,CAAC,wBAAwB,CA0B9B;IAEF;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,kBAAkB,~~CA6CxB~~;IAEF,OAAO,CAAC,YAAY,~~CA4ClB~~;IAEF,OAAO,CAAC,eAAe,CAWrB;IAEF,OAAO,CAAC,mCAAmC,CAUzC;IAEF,WAAW,GAAU,6BAIlB;QACD,MAAM,EAAE,cAAc,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,YAAY,CAAC;KACpB,mBAKC;IAEF,aAAa,GAAU,sBAGpB;QACD,MAAM,EAAE,cAAc,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KACvC,KAAG,OAAO,CAAC,IAAI,CAAC,~~CA2Gf~~;IAEF,gBAAgB,GAAU,yBAGvB;QACD,MAAM,EAAE,cAAc,CAAC;QACvB,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,mBAgCC;IAEF,eAAe,GAAU,kDAKtB;QACD,cAAc,EAAE,SAAS,CAAC;QAC1B,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,~~mBAqCC~~;IAEF,gBAAgB,GAAI,gDAKjB;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,UAaC;IAEF;;;;OAIG;IACH,UAAU,GAAU,wBAGjB;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;KAClB,mBAyBC;IAEF,oBAAoB,GAAI,2BAGrB,IAAI,CAAC,aAAa,EAAE,YAAY,GAAG,UAAU,CAAC,cAmD/C;CACH"}
1	+ {"version":3,"file":"source-tracker.d.ts","sourceRoot":"","sources":["../src/source-tracker.ts"],"names":[],"mappings":"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"}

package/dist/source-tracker.js CHANGED Viewed

@@ -668,13 +668,33 @@ export class SourceTracker {
         let parentAttr = openingTag
             .get("attributes")
             .find((attr) => attr.isJSXAttribute() && attr.node.name.name === parent);
+        // If value is undefined, we want to delete the nested property
+        if (info.value === undefined) {
+            if (!parentAttr) {
+                // Property doesn't exist anyway, nothing to delete
+                return;
+            }
+            const expressionContainer = parentAttr?.get("value");
+            if (!expressionContainer ||
+                !expressionContainer.isJSXExpressionContainer()) {
+                // Can't delete from non-object, just return
+                return;
+            }
+            const currentNode = expressionContainer.get("expression");
+            writeNestedProperty({
+                node: currentNode,
+                paths,
+                info,
+                isDelete: true,
+            });
+            return;
+        }
         if (!parentAttr && parent) {
             const newAttr = openingTag.pushContainer("attributes", [
                 t.jsxAttribute(t.jsxIdentifier(parent), t.jSXExpressionContainer(t.objectExpression([]))),
             ]);
             parentAttr = newAttr[0];
         }
-        // why does this return an array of node paths, its super annoying
         const expressionContainer = parentAttr?.get("value");
         if (!expressionContainer ||
             !expressionContainer.isJSXExpressionContainer()) {
@@ -686,13 +706,13 @@ export class SourceTracker {
             paths,
             info,
         });
+        return currentNode.node;
     };
     setAttribute = (openingTag, property, info) => {
         const paths = splitJSPath(property);
         if (Array.isArray(paths) && paths.length > 1) {
             // Sometimes we want to set a nested attribute, like `columns.name.accessor`
-            this.setNestedAttribute({ openingTag, property, info });
-            return;
+            return this.setNestedAttribute({ openingTag, property, info });
         }
         let attr = openingTag
             .get("attributes")
@@ -779,21 +799,6 @@ export class SourceTracker {
                         }
                     }
                 }
-                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(source.id);
@@ -870,10 +875,19 @@ export class SourceTracker {
         }
         const hasNameAttribute = isNamedComponent(widgetNode.node);
         if (scopeName) {
+            if (!hasNameAttribute) {
+                // if this is the first component getting named, we might need to add a scope destructuring for it
+                this.sbScopeManager.addScopeDestructuringForComponent({
+                    elementLocation: widgetNode,
+                    scopeName,
+                    componentFilePath: filePath,
+                });
+            }
             const changedFiles = this.sbScopeManager.renameScopeComponent({
                 oldName: hasNameAttribute ? oldName : undefined,
                 newName,
                 scopeName,
+                componentFilePath: filePath,
             });
             changedFiles.forEach((file) => {
                 this.changedFiles.add(file);
@@ -914,7 +928,7 @@ export class SourceTracker {
         if (!pageElement) {
             throw new Error(`Page element not found for ${widgetSourceId}`);
         }
-        const attributes = pageElement.get("attributes");
+        const attributes = pageElement.get("openingElement").get("attributes");
         const attribute = attributes?.find((attr) => attr.isJSXAttribute() && attr.node.name.name === "name");
         attribute?.replaceWith(t.jsxAttribute(t.jsxIdentifier("name"), t.stringLiteral(newName)));
         this.changedFiles.add(filePath);