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

@superblocksteam/vite-plugin-file-sync 2.0.3-next.57 → 2.0.3-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 (96) hide show

package/dist/parsing/scope.js CHANGED Viewed

@@ -10,7 +10,7 @@ import { traverse } from "../traverse.js";
 import { entityParser } from "./entity/index.js";
 import { getSbElementId, setSbElementId, supplementElementIds } from "./ids.js";
 import { REQUIRED_IMPORTS_BY_PROPERTY_TYPE } from "./imports.js";
-import { getIdentiferName, isSbScopeFunction, nodeToValue } from "./util.js";
+import { getIdentiferName, isSbScopeFunction, nodeToValue, extractNameFromBindAttribute, } from "./util.js";
 export function getScopeElementId(scopeId, name) {
     return `SB-${generatePredictableId(scopeId + name)}-type`;
 }
@@ -239,7 +239,7 @@ export function addScopeToComponent({ elementLocation, scopeDefinition, }) {
     return addScopeDestructuring(componentPath, scopeDefinition);
 }
 function findEnclosingComponent(elementPath) {
-    let currentPath = elementPath.parentPath;
+    let currentPath = elementPath;
     while (currentPath) {
         // Check for component types
         if (currentPath.isFunctionDeclaration() ||
@@ -470,7 +470,7 @@ export function parseSbScopeDefinition(ast) {
                                                         setSbElementId(prop.node, entityId);
                                                     }
                                                     if (entityId) {
-                                                        scopeNameToEntityId[entityId] = entityId;
+                                                        scopeNameToEntityId[name] = entityId;
                                                     }
                                                 }
                                             });
@@ -503,6 +503,32 @@ export function parseSbScopeDefinition(ast) {
         scopeNameToEntityId,
     };
 }
+export function findBindComponentsInScopeUsage(usage) {
+    const componentPath = findEnclosingComponent(usage);
+    if (!componentPath) {
+        return [];
+    }
+    const allBindNames = findBindNamesInComponentPath(componentPath);
+    return Array.from(new Set(allBindNames));
+}
+function findBindNamesInComponentPath(componentPath) {
+    const bindNames = [];
+    componentPath.traverse({
+        JSXElement(path) {
+            const bindAttribute = path
+                .get("openingElement")
+                .get("attributes")
+                .find((n) => n.isJSXAttribute() && getIdentiferName(n.node.name) === "bind");
+            if (bindAttribute) {
+                const bindName = extractNameFromBindAttribute(bindAttribute.node, true);
+                if (bindName) {
+                    bindNames.push(bindName);
+                }
+            }
+        },
+    });
+    return bindNames;
+}
 /**
  * Creates an empty scope definition with the given scope name.
  * This generates a minimal scope with no entities or components and returns the parsed definition.

package/dist/parsing/scope.js.map CHANGED Viewed

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

package/dist/parsing/util.d.ts CHANGED Viewed

@@ -23,7 +23,7 @@ export declare function getObjectPropertyByKey(expression: NodePath<ObjectExpres
 export declare function extractImportsFromAst(ast: ParseResult<File>): Record<string, boolean>;
 export declare function isScopeFunction(name: string): name is "registerScope" | "registerPage";
 export declare function isSbScopeFunction(name: string): name is "createSbScope";
-export declare function extractNameFromBindAttribute(bindAttribute: t.JSXAttribute): string | null;
+export declare function extractNameFromBindAttribute(bindAttribute: t.JSXAttribute, identifierOnly?: boolean): string | null;
 export declare function getFunctionExpressionBody(node?: NodePath<ArrowFunctionExpression | FunctionExpression>): string;
 export declare function parseExpression(value: string): t.Expression | null;
 export declare function functionBodyContainsThisReference(code: string): boolean;

package/dist/parsing/util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/parsing/util.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,cAAc,CAAC;AAK7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,IAAI,EACJ,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,sBASpE;AAED,wBAAgB,wBAAwB,CACtC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,GAAG,EAAE,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAYrD,CAAC,CACP;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,8BAKjD;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAoDT;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EACA,CAAC,CAAC,UAAU,GACZ,CAAC,CAAC,GAAG,GACL,CAAC,CAAC,UAAU,GACZ,CAAC,CAAC,OAAO,GACT,CAAC,CAAC,gBAAgB,GAClB,CAAC,CAAC,aAAa,GAClB,MAAM,GAAG,IAAI,CAqBf;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,GAAG,MAAM,GAAG,IAAI,CAWxE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAS7E;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,WAEhD;AAED,wBAAgB,UAAU,CACxB,IAAI,EACA,CAAC,CAAC,UAAU,GACZ,CAAC,CAAC,aAAa,GACf,CAAC,CAAC,mBAAmB,GACrB,CAAC,CAAC,iBAAiB,GACtB,MAAM,GAAG,IAAI,CAsBf;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAa7D;AAED,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,eAAe,EACf,KAAK,GACN,EAAE;IACD,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,QA0DA;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EACtC,GAAG,EAAE,MAAM,GACV,QAAQ,CAAC,cAAc,CAAC,GAAG,IAAI,CAcjC;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,GACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkCzB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,4CAE3C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,2BAE7C;AAED,wBAAgB,4BAA4B,~~CAAC~~,aAAa,EAAE,CAAC,CAAC,YAAY,~~iBAqBzE~~;AAED,wBAAgB,yBAAyB,CACvC,IAAI,CAAC,EAAE,QAAQ,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,UAc9D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,uBAe5C;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,WAsB7D"}
1	+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/parsing/util.ts"],"names":[],"mappings":"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"}

package/dist/parsing/util.js CHANGED Viewed

@@ -240,7 +240,7 @@ export function isScopeFunction(name) {
 export function isSbScopeFunction(name) {
     return name === "createSbScope";
 }
-export function extractNameFromBindAttribute(bindAttribute) {
+export function extractNameFromBindAttribute(bindAttribute, identifierOnly = false) {
     const bindValue = bindAttribute.value;
     if (!bindValue || !t.isJSXExpressionContainer(bindValue)) {
         return null;
@@ -250,6 +250,9 @@ export function extractNameFromBindAttribute(bindAttribute) {
     if (t.isIdentifier(expression)) {
         return expression.name;
     }
+    if (identifierOnly) {
+        return null;
+    }
     // Case 2: Member expression (bind={x.y} or bind={x.y.z})
     if (t.isMemberExpression(expression)) {
         // Get the rightmost property name

package/dist/parsing/util.js.map CHANGED Viewed

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

package/dist/refactor/javascript.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../src/refactor/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAI7B,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AAEjE,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAWF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,UA8B3E;AAED,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,EACP,QAAQ,EACR,aAAa,EACb,oBAA4B,GAC7B,EAAE,mBAAmB,~~QAmKrB~~"}
1	+ {"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../src/refactor/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAI7B,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AAEjE,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAWF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,UA8B3E;AAED,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,EACP,QAAQ,EACR,aAAa,EACb,oBAA4B,GAC7B,EAAE,mBAAmB,QAsLrB"}

package/dist/refactor/javascript.js CHANGED Viewed

@@ -111,50 +111,61 @@ export function renameEntityInJavascript({ oldName, newName, nodePath, parentBin
         traversePath = traversePath.parentPath;
     }
     function handleMemberExpression(path) {
-        const object = path.get("object");
-        const property = path.get("property");
-        // An expression is not computed if it uses a .property accessor, otherwise its []
-        if (object.isIdentifier() && !path.node.computed) {
-            const objectName = object.node.name;
-            if (objectName === oldName) {
-                object.replaceInline(t.identifier(newName));
-                path.skip();
-            }
-        }
-        else if (property.isIdentifier() &&
-            !path.node.computed &&
-            parentBinding) {
-            const propertyName = property.node.name;
-            if (propertyName === oldName) {
+        // this captures a computed property like SomeObject[oldName] (look at the tests)
+        if (path.node.computed) {
+            const property = path.get("property");
+            if (property.isIdentifier() && property.node.name === oldName) {
                 property.replaceInline(t.identifier(newName));
                 path.skip();
+                return;
             }
         }
-        else if (property.isIdentifier() && path.node.computed) {
-            const propertyName = property.node.name;
-            if (propertyName === oldName) {
-                property.replaceInline(t.identifier(newName));
-                path.skip();
+        const components = [];
+        let current = path;
+        // MemberExpressions need to be unwound backwards, because of the way they are
+        // nested by babel
+        while (current.isMemberExpression() ||
+            current.isOptionalMemberExpression()) {
+            const property = current.get("property");
+            // this shouldnt happen, the babel type is weird
+            if (Array.isArray(property)) {
+                break;
             }
-            // Sometimes we need to unwind the objects of member expressions to get a value when You.have.nested.properties
-        }
-        else if (object.isMemberExpression() ||
-            object.isOptionalMemberExpression()) {
-            let nestedObject = object.get("object");
-            if (Array.isArray(nestedObject)) {
-                nestedObject = nestedObject[0];
+            if (property.isIdentifier()) {
+                components.unshift({ name: property.node.name, path: property });
             }
-            while (nestedObject && nestedObject.isMemberExpression()) {
-                nestedObject = nestedObject.get("object");
+            const object = current.get("object");
+            // again, this shouldnt happen, the babel type is weird
+            if (Array.isArray(object)) {
+                break;
             }
-            if (!nestedObject?.isIdentifier()) {
-                path.skip();
-                return;
+            current = object;
+        }
+        if (current.isIdentifier()) {
+            components.unshift({ name: current.node.name, path: current });
+        }
+        if (components.length === 0) {
+            return;
+        }
+        // handle the case where we want to rename something on app scope, like App.stateVar
+        if (parentBinding) {
+            for (let i = 0; i < components.length - 1; i++) {
+                if (components[i]?.name === parentBinding &&
+                    components[i + 1]?.name === oldName) {
+                    components[i + 1]?.path.replaceInline(t.identifier(newName));
+                    path.skip();
+                    return;
+                }
             }
-            const nestedObjectName = nestedObject.node.name;
-            if (nestedObjectName === oldName) {
-                nestedObject.replaceInline(t.identifier(newName));
-                path.skip();
+        }
+        else {
+            // otherwise its a simple replace
+            for (const component of components) {
+                if (component.name === oldName) {
+                    component.path.replaceInline(t.identifier(newName));
+                    path.skip();
+                    return;
+                }
             }
         }
     }

package/dist/refactor/javascript.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../src/refactor/javascript.ts"],"names":[],"mappings":"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~~MAAM~~,~~MAAM~~,~~GAAG,~~IAAI,CAAC,~~GAAG~~,CAAC,QAAQ,~~CAAC~~,CAAC;~~QAClC~~,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;~~QAEtC~~,~~kFAAkF;QAClF,~~IAAI,~~MAAM~~,CAAC,YAAY,EAAE,IAAI,~~CAAC,IAAI,CAAC,IAAI,CAAC,~~QAAQ,~~EAAE,~~CAAC~~;YACjD~~,~~MAAM,UAAU,GAAG,MAAM,CAAC,~~IAAI,CAAC,IAAI,~~CAAC;YACpC,IAAI,UAAU,~~KAAK,OAAO,EAAE,CAAC;~~gBAC3B~~,~~MAAM~~,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;~~gBAC5C~~,IAAI,CAAC,IAAI,EAAE,CAAC;~~YACd~~,CAAC;QACH,CAAC;~~aAAM~~,~~IACL~~,~~QAAQ~~,~~CAAC~~,~~YAAY,~~EAAE~~;YACvB~~,CAAC,IAAI,~~CAAC~~,IAAI,CAAC,~~QAAQ~~;~~YACnB~~,~~aAAa~~,~~EACb~~,CAAC;YACD,MAAM,~~YAAY~~,GAAG,~~QAAQ~~,CAAC,~~IAAI~~,CAAC,~~IAAI~~,CAAC;~~YACxC~~,IAAI,~~YAAY,~~KAAK,OAAO,EAAE,CAAC;~~gBAC7B~~,~~QAAQ~~,CAAC,~~aAAa~~,~~CAAC~~,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,~~CAAC~~,CAAC~~;gBAC9C~~,IAAI,CAAC,IAAI,EAAE,CAAC~~;YACd~~,CAAC;~~QACH~~,CAAC;~~aAAM~~,~~IAAI~~,QAAQ,CAAC,~~YAAY~~,~~EAAE~~,IAAI,~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~QAAQ~~,EAAE,CAAC;~~YACzD~~,MAAM,~~YAAY~~,GAAG,~~QAAQ~~,CAAC,~~IAAI,~~CAAC,IAAI,CAAC~~;YACxC~~,~~IAAI,~~YAAY,~~KAAK~~,~~OAAO,~~EAAE,CAAC;~~gBAC7B~~,~~QAAQ~~,CAAC,~~aAAa~~,CAAC,~~CAAC~~,~~CAAC~~,~~UAAU~~,~~CAAC,~~OAAO,CAAC,~~CAAC~~,CAAC~~;gBAC9C~~,IAAI,~~CAAC~~,IAAI,EAAE,CAAC~~;YACd~~,CAAC;~~YACD,+GAA+G;QACjH~~,CAAC;~~aAAM~~,~~IACL~~,MAAM,CAAC,~~kBAAkB~~,~~EAAE~~;~~YAC3B~~,~~MAAM~~,CAAC,~~0BAA0B~~,EAAE,~~EACnC,~~CAAC;~~YACD~~,IAAI,~~YAAY~~,GAAG,~~MAAM~~,CAAC,GAAG,CAAC,~~QAAQ~~,CAAC,CAAC~~;YACxC~~,~~IAAI~~,~~KAAK~~,CAAC,~~OAAO~~,CAAC,~~YAAY~~,CAAC,EAAE,~~CAAC;gBAChC~~,~~YAAY~~,~~GAAG~~,~~YAAY~~,CAAC,CAAC,~~CAAE~~,CAAC~~;YAClC~~,CAAC~~;YAED~~,~~OAAO~~,~~YAAY,~~IAAI,~~YAAY~~,~~CAAC~~,~~kBAAkB~~,~~EAAE~~,~~EAAE~~,CAAC~~;gBACzD~~,~~YAAY~~,GAAG,~~YAAY~~,CAAC,~~GAAG~~,CAAC,~~QAAQ~~,CAAC,CAAC~~;YAC5C~~,CAAC~~;YACD~~,~~IAAI~~,CAAC,~~YAAY~~,~~EAAE~~,~~YAAY~~,~~EAAE,EAAE,~~CAAC;~~gBAClC~~,IAAI,CAAC,IAAI,EAAE,CAAC;~~gBACZ~~,OAAO;~~YACT~~,CAAC;~~YAED~~,~~MAAM~~,~~gBAAgB~~,~~GAAG~~,~~YAAY~~,~~CAAC~~,IAAI,CAAC,IAAI,CAAC~~;YAChD~~,IAAI,~~gBAAgB,~~KAAK,OAAO,EAAE,CAAC;~~gBACjC~~,~~YAAY~~,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;~~gBAClD~~,IAAI,CAAC,IAAI,EAAE,CAAC;~~YACd~~,CAAC;QACH,CAAC;IACH,CAAC;IAED,YAAY,CAAC,QAAQ,CAAC;QACpB,GAAG,eAAe;QAClB,wBAAwB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,gBAAgB,CAAC,IAAI;YACnB,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../src/refactor/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWtD,SAAS,oBAAoB,CAC3B,GAAW,EACX,MAAc,EACd,KAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA0E;IAE1E,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,kBAAkB,CACvD,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEpD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,KAAK,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,iBAAiB,GAAG,aAAa;gBACrC,CAAC,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE;gBAC/B,CAAC,CAAC,OAAO,CAAC;YACZ,IACE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,iBAAiB,GAAG,CAAC;gBAChD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,aAAa,IAAI,OAAO,OAAO,CAAC,CAAC,EACnE,CAAC;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC1D,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QACD,OAAO,KAAK,OAAO,IAAI,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,EACP,QAAQ,EACR,aAAa,EACb,oBAAoB,GAAG,KAAK,GACR;IACpB,MAAM,eAAe,GAAG,oBAAoB;QAC1C,CAAC,CAAE;YACC,QAAQ,CAAC,IAAI;gBACX,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAE/D,wEAAwE;gBACxE,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;oBACnD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;oBACjC,IAAI,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC;wBAClC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;wBACjD,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;4BAClC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;gCAAE,SAAS;4BAE3C,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;4BAC3D,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gCACpD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gCACzD,IAAI,CAAC,IAAI,EAAE,CAAC;gCACZ,OAAO;4BACT,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,iGAAiG;gBACjG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;oBACrD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAE,CAAC;oBAEhD,2FAA2F;oBAC3F,kCAAkC;oBAClC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAEpC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;oBACjC,IAAI,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC;wBAClC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;4BACrD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;gCAAE,SAAS;4BAE3C,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;4BAC3D,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gCACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gCACzD,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gCAC3D,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;4BAClC,CAAC;wBACH,CAAC;oBACH,CAAC;oBAED,IAAI,CAAC,IAAI,EAAE,CAAC;oBACZ,OAAO;gBACT,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAE7C,iHAAiH;gBACjH,yEAAyE;gBACzE,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;oBACnD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACzC,SAAS;oBACX,CAAC;oBAED,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;wBAC/C,IACE,SAAS,CAAC,UAAU,EAAE,kBAAkB,EAAE;4BAC1C,SAAS,CAAC,UAAU,EAAE,0BAA0B,EAAE,EAClD,CAAC;4BACD,IAAI,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BAEpD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gCAC5B,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;4BAC1B,CAAC;4BAED,6GAA6G;4BAC7G,uBAAuB;4BACvB,IACE,QAAQ,CAAC,YAAY,EAAE;gCACvB,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa;gCACpC,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE,kBAAkB,EAAE,EACrD,CAAC;gCACD,sBAAsB,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gCACxD,IAAI,CAAC,IAAI,EAAE,CAAC;gCACZ,OAAO;4BACT,CAAC;4BAED,IAAI,QAAQ,CAAC,YAAY,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gCAC9D,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gCAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;4BACd,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACyB;QAC9B,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,YAAY,GAAG,QAAQ,CAAC;IAC5B,IAAI,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC;QAC9B,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC;IACzC,CAAC;IAED,SAAS,sBAAsB,CAC7B,IAA+D;QAE/D,iFAAiF;QACjF,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtC,IAAI,QAAQ,CAAC,YAAY,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC9D,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAqD,EAAE,CAAC;QAExE,IAAI,OAAO,GAAqB,IAAI,CAAC;QAErC,8EAA8E;QAC9E,kBAAkB;QAClB,OACE,OAAO,CAAC,kBAAkB,EAAE;YAC5B,OAAO,CAAC,0BAA0B,EAAE,EACpC,CAAC;YACD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEzC,gDAAgD;YAChD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,MAAM;YACR,CAAC;YAED,IAAI,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC5B,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACnE,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACrC,uDAAuD;YACvD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,MAAM;YACR,CAAC;YACD,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;YAC3B,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,oFAAoF;QACpF,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/C,IACE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,aAAa;oBACrC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,EACnC,CAAC;oBACD,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;oBACZ,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC/B,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oBACpD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACZ,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,YAAY,CAAC,QAAQ,CAAC;QACpB,GAAG,eAAe;QAClB,wBAAwB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,gBAAgB,CAAC,IAAI;YACnB,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"rename-manager.d.ts","sourceRoot":"","sources":["../src/rename-manager.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;~~AAgB7B~~,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,qBAAa,aAAa;;IAGlB,eAAe,CAAC,EACpB,UAAU,EACV,OAAO,EACP,GAAG,GACJ,EAAE;QACD,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;KACb;IAuGK,kBAAkB,CAAC,EACvB,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,GACd,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE;YACJ,GAAG,EAAE,kBAAkB,CAAC;YACxB,QAAQ,EAAE,MAAM,CAAC;SAClB,EAAE,CAAC;KACL;IAYD,qBAAqB,CAAC,EACpB,OAAO,EACP,OAAO,EACP,GAAG,EACH,aAAa,GACd,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;QACZ,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;~~CAqDF~~"}
1	+ {"version":3,"file":"rename-manager.d.ts","sourceRoot":"","sources":["../src/rename-manager.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAW7B,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,qBAAa,aAAa;;IAGlB,eAAe,CAAC,EACpB,UAAU,EACV,OAAO,EACP,GAAG,GACJ,EAAE;QACD,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;KACb;IAuGK,kBAAkB,CAAC,EACvB,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,GACd,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE;YACJ,GAAG,EAAE,kBAAkB,CAAC;YACxB,QAAQ,EAAE,MAAM,CAAC;SAClB,EAAE,CAAC;KACL;IAYD,qBAAqB,CAAC,EACpB,OAAO,EACP,OAAO,EACP,GAAG,EACH,aAAa,GACd,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;QACZ,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;CA4CF"}

package/dist/rename-manager.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import t from "@babel/types";
-import { getIdentiferName, getTemplateString, nodeToValue, stringToTaggedTemplate, extractNameFromBindAttribute, } from "./parsing/util.js";
+import { getIdentiferName, nodeToValue, extractNameFromBindAttribute, } from "./parsing/util.js";
 import { refactorNameInBlocks } from "./refactor/blocks.js";
-import { renameEntityInBindings, renameEntityInJavascript, } from "./refactor/javascript.js";
+import { renameEntityInJavascript } from "./refactor/javascript.js";
 import { traverse } from "./traverse.js";
 import { getLogger } from "./util/logger.js";
 const traverseFn = traverse.default || traverse;
@@ -97,23 +97,16 @@ export class RenameManager {
     }
     renameIdentifierInAST({ oldName, newName, ast, parentBinding, }) {
         const elementVisitor = {
-            TaggedTemplateExpression(path) {
-                const tagName = getIdentiferName(path.node.tag);
-                if (tagName !== "SB") {
-                    path.skip();
-                    return;
-                }
-                const quasi = path.get("quasi");
-                const templateString = getTemplateString(quasi.node);
-                if (templateString) {
-                    const newTemplateString = renameEntityInBindings({
-                        bindingString: templateString,
+            TemplateLiteral(path) {
+                const expressions = path.get("expressions");
+                if (expressions.length > 0) {
+                    renameEntityInJavascript({
                         oldName,
                         newName,
+                        nodePath: path,
+                        checkFunctionBinding: false,
                         parentBinding,
                     });
-                    path.replaceWith(stringToTaggedTemplate(newTemplateString));
-                    path.skip();
                 }
             },
             Function(path) {
@@ -124,7 +117,6 @@ export class RenameManager {
                     checkFunctionBinding: true,
                     parentBinding,
                 });
-                path.skip();
             },
         };
         traverseFn(ast, {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"rename-manager.js","sourceRoot":"","sources":["../src/rename-manager.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,cAAc,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAChB,~~iBAAiB,EACjB,~~WAAW,EACX,~~sBAAsB,EACtB,~~4BAA4B,GAC7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,~~EACL~~,~~sBAAsB,EACtB,~~wBAAwB,~~GACzB~~,MAAM,0BAA0B,CAAC;~~AAClC~~,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,MAAM,UAAU,GAAqB,QAAgB,CAAC,OAAO,IAAI,QAAQ,CAAC;AAE1E,MAAM,OAAO,aAAa;IACxB,gBAAe,CAAC;IAEhB,KAAK,CAAC,eAAe,CAAC,EACpB,UAAU,EACV,OAAO,EACP,GAAG,GAKJ;QACC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,UAAU;aAC7B,GAAG,CAAC,YAAY,CAAC;aACjB,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAC1C,CAAC;QAEhC,MAAM,aAAa,GAAyC,UAAU;aACnE,GAAG,CAAC,YAAY,CAAC;aACjB,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAC1C,CAAC;QAEhC,IAAI,OAAO,GAAkB,IAAI,CAAC;QAClC,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,GAAG,4BAA4B,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC3C,IAAI,SAAS,IAAI,CAAC,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACvD,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;oBAExC,iDAAiD;oBACjD,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC/B,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,sBAAsB,CACjD,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CACtB,CAAC;oBACJ,CAAC;oBACD,iDAAiD;yBAC5C,IAAI,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC1C,uCAAuC;wBACvC,MAAM,WAAW,GAAG,EAAE,CAAC;wBACvB,IAAI,OAAO,GAAiB,UAAU,CAAC;wBAEvC,sDAAsD;wBACtD,OAAO,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;4BACrC,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gCACrC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;4BAC7C,CAAC;4BACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;wBAC3B,CAAC;wBAED,0BAA0B;wBAC1B,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;4BAC5B,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACpC,CAAC;wBACD,oDAAoD;wBACpD,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;wBAEpD,yCAAyC;wBACzC,IAAI,WAAW,GAAG,aAAa,CAAC;wBAChC,OACE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;4BACjC,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,CAAC,EAC1C,CAAC;4BACD,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC;wBACrC,CAAC;wBAED,kCAAkC;wBAClC,IACE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;4BACjC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EACpC,CAAC;4BACD,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAC/C,CAAC;wBAED,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1B,UAAU,CAAC,aAAa,CACtB,YAAY,EACZ,CAAC,CAAC,YAAY,CACZ,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,EACvB,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAChD,CACF,CAAC;YACF,OAAO;QACT,CAAC;aAAM,CAAC;YACN,sCAAsC;YACtC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK;gBAChC,CAAC,CAAE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAY;gBACnD,CAAC,CAAC,IAAI,CAAC;YACT,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,SAAS,EAAE,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC;YACzB,OAAO;YACP,OAAO;YACP,GAAG;SACJ,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EACvB,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,GASd;QACC,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;YACtC,MAAM,oBAAoB,CAAC;gBACzB,MAAM;gBACN,OAAO;gBACP,OAAO;gBACP,SAAS,EAAE,aAAa;aACzB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,qBAAqB,CAAC,EACpB,OAAO,EACP,OAAO,EACP,GAAG,EACH,aAAa,GAMd;QACC,MAAM,cAAc,GAAoB;YACtC,~~wBAAwB~~,CAAC,IAAI;~~gBAC3B~~,MAAM,~~OAAO~~,GAAG,~~gBAAgB,CAAC,~~IAAI,CAAC,~~IAAI,CAAC,~~GAAG,CAAC,~~CAAC;gBAChD~~,~~IAAI,OAAO,KAAK,IAAI,EAAE,~~CAAC~~;oBACrB~~,~~IAAI,~~CAAC~~,IAAI,EAAE,CAAC~~;~~oBACZ~~,~~OAAO;gBACT,CAAC;gBAED,MAAM,KAAK,GAAG,~~IAAI,~~CAAC~~,~~GAAG,~~CAAC,~~OAAO,CAAC,CAAC;gBAChC,~~MAAM,~~cAAc,~~GAAG,~~iBAAiB,~~CAAC,~~KAAK,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,cAAc,~~EAAE,CAAC;~~oBACnB~~,~~MAAM~~,~~iBAAiB,GAAG,sBAAsB,~~CAAC;~~wBAC/C~~,~~aAAa,EAAE,cAAc;wBAC7B,~~OAAO;wBACP,OAAO;wBACP,~~aAAa;qBACd~~,~~CAAC~~,~~CAAC~~;~~oBACH~~,~~IAAI~~,~~CAAC~~,~~WAAW~~,~~CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC,CAAC~~;~~oBAC5D~~,~~IAAI,~~CAAC,~~IAAI,EAAE,~~CAAC;~~gBACd~~,CAAC;YACH,CAAC;YACD,QAAQ,CAAC,IAAI;gBACX,wBAAwB,CAAC;oBACvB,OAAO;oBACP,OAAO;oBACP,QAAQ,EAAE,IAAI;oBACd,oBAAoB,EAAE,IAAI;oBAC1B,aAAa;iBACd,CAAC,CAAC;~~gBACH~~,~~IAAI,~~CAAC~~,IAAI,EAAE,CAAC~~;~~YACd,CAAC;~~SACF,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE;YACd,iBAAiB,CAAC,IAAI;gBACpB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,CAAC;YACD,cAAc,CAAC,IAAI;gBACjB,2DAA2D;gBAC3D,IACE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;oBACtC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;wBACrC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;wBACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,EAC1C,CAAC;oBACD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;oBAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"rename-manager.js","sourceRoot":"","sources":["../src/rename-manager.ts"],"names":[],"mappings":"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"}

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

@@ -36,7 +36,7 @@ export declare class SbScopeManager extends EventEmitter<EventMap> {
      *
      * @param filePath - The path of the file to reset scope tracking for
      */
-    resetScope(filePath: string): void;
+    resetScope(filePath: string): string[];
     getScopeDefinitionAndFilePathByNameOrId({ identifier, type, }: {
         identifier: string;
         type: "name" | "id";
@@ -72,7 +72,10 @@ export declare class SbScopeManager extends EventEmitter<EventMap> {
         attributes?: Partial<SbEntity>;
     }): string[];
     updateScopeEntity({ entityId, updates }: UpdateEntityRequest): string;
-    deleteScopeEntity(entityId: SbElement): string[];
+    deleteScopeEntity(entityId: SbElement): {
+        changedFiles: string[];
+        deletedEntitiesNames: SbElement[];
+    };
     renameScopeEntity({ entityId, newName, oldName, }: {
         entityId: SbElement;
         newName: string;
@@ -92,6 +95,7 @@ export declare class SbScopeManager extends EventEmitter<EventMap> {
         scopeName: string;
     }): string[];
     private getScopeUsage;
+    private reconcileBindPropertiesAndScopeDefinitions;
     private updateScopeUsages;
 }
 export {};

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,~~EAMvB~~,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;~~IA8CH~~;;;;;;;;;;;OAWG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM;~~IA8C3B~~,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;IAwDI,iBAAiB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,mBAAmB;IAuC5D,iBAAiB,CAAC,QAAQ,EAAE,SAAS~~;IAqCrC~~,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;;;;;;;~~IA8CM~~,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IA6C1D,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,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

@@ -5,7 +5,7 @@ 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, addTypeParametersToScope, } from "./parsing/scope.js";
+import { buildScopeDestructuredUsageMap, fromEntityToNode, fromNodeToEntity, updateScopeUsages, addScopeToComponent, isComponentAlreadyUsingScope, parseSbScopeDefinition, updateEntityNode, getScopeElementId, findBindComponentsInScopeUsage, addTypeParametersToScope, } from "./parsing/scope.js";
 import { addImport, getImportPath } from "./parsing/util.js";
 export class SbScopeManager extends EventEmitter {
     // maps file name to scope definition
@@ -60,6 +60,7 @@ export class SbScopeManager extends EventEmitter {
                 return;
             this.getScopeUsage(ast, nonScopeFile);
         }
+        this.reconcileBindPropertiesAndScopeDefinitions();
     }
     /**
      * Resets the scope tracking for a given file path. This function handles two cases:
@@ -77,14 +78,14 @@ export class SbScopeManager extends EventEmitter {
         if (filePath.endsWith(SCOPE_FILE)) {
             const scopeDef = this.pageAndAppScopes.get(filePath);
             if (!scopeDef) {
-                return;
+                return [];
             }
             this.pageAndAppScopes.delete(filePath);
             const currentFiles = this.sourceTracker.getCurrentFiles();
             const ast = currentFiles[filePath]?.ast;
             if (!ast) {
                 console.error("AST not found for scope file", filePath);
-                return;
+                return [];
             }
             const scopeDefinition = parseSbScopeDefinition(ast);
             this.pageAndAppScopes.set(filePath, scopeDefinition);
@@ -112,10 +113,11 @@ export class SbScopeManager extends EventEmitter {
             const ast = currentFiles[filePath]?.ast;
             if (!ast) {
                 console.error("AST not found for scope file", filePath);
-                return;
+                return [];
             }
             this.getScopeUsage(ast, filePath);
         }
+        return this.reconcileBindPropertiesAndScopeDefinitions();
     }
     getScopeDefinitionAndFilePathByNameOrId({ identifier, type, }) {
         for (const [filePath, scopeDef] of this.pageAndAppScopes.entries()) {
@@ -294,7 +296,10 @@ export class SbScopeManager extends EventEmitter {
         if (!entityNode) {
             console.warn("Entity to delete not found", entityId);
             this.emit("entityNotFound", entityId, "deleteScopeEntity");
-            return [];
+            return {
+                changedFiles: [],
+                deletedEntitiesNames: [],
+            };
         }
         const entityName = (entityNode?.node?.key).name;
         const filePath = this.sourceTracker.getElementToFilePath(entityId);
@@ -314,7 +319,10 @@ export class SbScopeManager extends EventEmitter {
         scopeDef.entityNames = scopeDef.entityNames.filter((name) => name !== entityName);
         delete scopeDef.scopeNameToEntityId[entityName];
         const updatedFiles = this.updateScopeUsages(scopeDef.name, scopeDef.entityNames);
-        return [...updatedFiles, filePath];
+        return {
+            changedFiles: [...updatedFiles, filePath],
+            deletedEntitiesNames: [entityName],
+        };
     }
     renameScopeEntity({ entityId, newName, oldName, }) {
         const filePath = this.sourceTracker.getElementToFilePath(entityId);
@@ -342,6 +350,8 @@ export class SbScopeManager extends EventEmitter {
             key.replaceWith(t.identifier(newName));
         }
         scopeDef.entityNames = scopeDef.entityNames.map((name) => name === oldName ? newName : name);
+        scopeDef.scopeNameToEntityId[newName] = entityId;
+        delete scopeDef.scopeNameToEntityId[oldName];
         const updatedFiles = this.updateScopeUsages(scopeDef.name, scopeDef.entityNames);
         return {
             changedFiles: [...updatedFiles, filePath],
@@ -449,6 +459,35 @@ export class SbScopeManager extends EventEmitter {
         }
         buildScopeDestructuredUsageMap(ast, filePath, allScopeNames, this.scopeNameToScopeUsage);
     }
+    reconcileBindPropertiesAndScopeDefinitions() {
+        for (const [scopeName, scopeUsages] of Object.entries(this.scopeNameToScopeUsage)) {
+            const { scopeDefinition: scopeDef } = this.getScopeDefinitionAndFilePathByNameOrId({
+                identifier: scopeName,
+                type: "name",
+            });
+            if (!scopeDef) {
+                continue;
+            }
+            const missingComponents = new Set();
+            for (const [_, usages] of Object.entries(scopeUsages)) {
+                for (const usage of usages) {
+                    const bindNames = findBindComponentsInScopeUsage(usage);
+                    for (const bindName of bindNames) {
+                        if (!scopeDef.entityNames.includes(bindName)) {
+                            missingComponents.add(bindName);
+                        }
+                    }
+                }
+            }
+            const updatedFiles = [];
+            // Add missing components to the scope definition
+            for (const missingComponent of missingComponents) {
+                updatedFiles.push(...this.addScopeComponent(scopeName, missingComponent));
+            }
+            return updatedFiles;
+        }
+        return [];
+    }
     updateScopeUsages(scopeName, entityNames) {
         const uniqueEntityNames = [...new Set(entityNames)];
         const scopeUsages = this.scopeNameToScopeUsage[scopeName];