@superblocksteam/cli 2.0.0-next.6 → 2.0.0-next.7

package/README.md

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

package/dist/index.js

@@ -263726,7 +263726,7 @@ init_esm();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.0-next.6",
+  version: "2.0.0-next.7",
   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.9122.0",
-    "@superblocksteam/util": "2.0.0-next.6",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.6",
+    "@superblocksteam/util": "2.0.0-next.7",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.7",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -263908,11 +263908,12 @@ init_cjs_shims();
 
 // ../../../library-shared/dist/utils/properties.js
 init_cjs_shims();
-function PropertyInfo(value2, type2 = "STATIC") {
+function PropertyInfo(value2, type2 = "STATIC", extra) {
   return {
     __info: true,
     value: value2,
-    type: type2
+    type: type2,
+    ...extra
   };
 }
 var Property = {
@@ -263922,7 +263923,7 @@ var Property = {
   Expression: (value2) => PropertyInfo(value2, "EXPRESSION"),
   Event: (value2) => PropertyInfo(value2, "EVENT"),
   Dimension: (value2) => PropertyInfo(value2, "DIMENSION"),
-  Computed: (value2) => PropertyInfo(value2, "COMPUTED"),
+  Computed: (value2, args) => PropertyInfo(value2, "COMPUTED", args ? { args } : {}),
   Any: (value2, type2 = "STATIC") => PropertyInfo(value2, type2)
 };
 function isPropertyInfo(value2) {
@@ -276058,11 +276059,11 @@ function isValidJSXExpression(value2) {
   }
 }
 var transformers = {
-  oneLineArrow: (value2) => value2.startsWith("{") ? `() => (${value2})` : `() => ${value2}`,
-  multiLineArrow: (value2) => `() => {
+  oneLineArrow: (value2, argsString) => value2.startsWith("{") ? `(${argsString}) => (${value2})` : `(${argsString}) => ${value2}`,
+  multiLineArrow: (value2, argsString) => `(${argsString}) => {
     ${value2}
   }`,
-  traditional: (value2) => `function (this: any) {
+  traditional: (value2, argsString) => `function (this: any${argsString ? `, ${argsString}` : ""}) {
     ${value2}
   }`,
   computed: (value2) => `sbComputed(${value2})`
@@ -276070,24 +276071,28 @@ var transformers = {
 function findFirstValidExpression(testCases) {
   return testCases.find(isValidJSXExpression);
 }
-function toCodeComputed(value2) {
+function toCodeComputed(value2, info) {
+  let argsString = "";
+  if (isComputedPropertyInfo(info)) {
+    argsString = info.args ? `{ ${info.args.join(", ")} }` : "";
+  }
   const { hasThisReference, hasReturnStatement } = getFunctionBodyThisExpressionData(value2);
   if (hasThisReference) {
     if (!hasReturnStatement) {
-      return transformers.computed(transformers.traditional(`return ${value2}`));
+      return transformers.computed(transformers.traditional(`return ${value2}`, argsString));
     }
-    return transformers.computed(transformers.traditional(value2));
+    return transformers.computed(transformers.traditional(value2, argsString));
   }
   const computedTestCases = [
-    transformers.oneLineArrow(value2),
-    transformers.multiLineArrow(value2),
-    transformers.traditional(value2)
+    transformers.oneLineArrow(value2, argsString),
+    transformers.multiLineArrow(value2, argsString),
+    transformers.traditional(value2, argsString)
   ];
   const validComputedExpression = findFirstValidExpression(computedTestCases);
   if (validComputedExpression) {
     return transformers.computed(validComputedExpression);
   }
-  return transformers.computed(transformers.multiLineArrow(value2));
+  return transformers.computed(transformers.multiLineArrow(value2, argsString));
 }
 
 // ../../../vite-plugin-file-sync/dist/parsing/computed/to-value-computed.js
@@ -276103,7 +276108,7 @@ function toValueComputed(expression) {
 
 // ../../../vite-plugin-file-sync/dist/parsing/computed/index.js
 var parser5 = {
-  toCode: (value2) => toCodeComputed(value2),
+  toCode: (value2, info) => toCodeComputed(value2, info),
   toValue: (code) => toValueComputed(code)
 };
 
@@ -277096,15 +277101,15 @@ function generateJSXElement({ id: id2, tagName, properties, children }) {
   jsxElement.children = childElements;
   return jsxElement;
 }
-function generateJSXAttribute(name17, { value: value2, type: type2 }) {
-  const valueNode = getPropertyExpression(Property.Any(value2, type2), name17);
+function generateJSXAttribute(name17, info) {
+  const valueNode = getPropertyExpression(info, name17);
   if (import_types11.default.isStringLiteral(valueNode)) {
     return import_types11.default.jsxAttribute(import_types11.default.jsxIdentifier(name17), valueNode);
   } else {
     return import_types11.default.jsxAttribute(import_types11.default.jsxIdentifier(name17), import_types11.default.jsxExpressionContainer(valueNode));
   }
 }
-function writeNestedProperty({ node, paths, value: value2, type: type2 }) {
+function writeNestedProperty({ node, paths, info }) {
   let currentNode = node;
   const cleanedPaths = paths.map((path45) => {
     if (path45.startsWith("[")) {
@@ -277123,16 +277128,16 @@ function writeNestedProperty({ node, paths, value: value2, type: type2 }) {
     if (currentNode.isObjectExpression()) {
       let property = currentNode.get("properties").find((prop) => prop.isObjectProperty() && getIdentiferName(prop.node.key) === currentKey);
       if (!property) {
-        const value4 = cleanedPaths.length > 0 ? import_types11.default.objectExpression([]) : import_types11.default.stringLiteral("");
+        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()), value4)
+          import_types11.default.objectProperty(import_types11.default.identifier(currentKey.toString()), value3)
         ])[0];
       }
-      const value3 = property?.get("value");
-      if (!value3) {
+      const value2 = property?.get("value");
+      if (!value2) {
         break;
       }
-      currentNode = Array.isArray(value3) ? value3[0] : value3;
+      currentNode = Array.isArray(value2) ? value2[0] : value2;
     } else if (currentNode.isArrayExpression() && typeof currentKey === "number") {
       const index = currentKey;
       const nodeAtIndex = currentNode.get("elements")[index];
@@ -277157,7 +277162,7 @@ function writeNestedProperty({ node, paths, value: value2, type: type2 }) {
           }
         } else {
           currentNode = currentNode.pushContainer("elements", [
-            import_types11.default.stringLiteral(String(value2))
+            import_types11.default.stringLiteral(String(info.value))
           ])[0];
         }
       } else {
@@ -277166,18 +277171,19 @@ function writeNestedProperty({ node, paths, value: value2, type: type2 }) {
     }
   }
   if (currentNode) {
-    const valueNode = getPropertyExpression(Property.Any(value2, type2), "");
+    const valueNode = getPropertyExpression(info, "");
     currentNode.replaceWith(valueNode);
   }
 }
-function getPropertyExpression({ value: value2, type: type2 }, fieldName = "") {
+function getPropertyExpression(info, fieldName = "") {
   const logger3 = getLogger();
+  const { value: value2, type: type2 } = info;
   try {
     if (type2 === "BINDING") {
       const cleanedValue = typeof value2 === "string" ? value2.replaceAll("${", "\\${") : value2;
       return stringToTaggedTemplate(cleanedValue);
     } else if (type2 === "TEMPLATE") {
-      const code = parsingRegistry.TEMPLATE.toCode(value2);
+      const code = parsingRegistry.TEMPLATE.toCode(value2, info);
       const expression = parseExpression(code);
       if (expression) {
         return expression;
@@ -277185,7 +277191,7 @@ function getPropertyExpression({ value: value2, type: type2 }, fieldName = "") {
         return import_types11.default.stringLiteral(code);
       }
     } else if (type2 === "DIMENSION") {
-      const code = parsingRegistry.DIMENSION.toCode(value2);
+      const code = parsingRegistry.DIMENSION.toCode(value2, info);
       const expression = parseExpression(code);
       if (expression) {
         return expression;
@@ -277194,7 +277200,7 @@ function getPropertyExpression({ value: value2, type: type2 }, fieldName = "") {
       }
     }
     if (type2 === "EVENT") {
-      const code = parsingRegistry.EVENT.toCode(value2);
+      const code = parsingRegistry.EVENT.toCode(value2, info);
       const expression = parseExpression(code);
       if (expression) {
         return expression;
@@ -277218,7 +277224,7 @@ function getPropertyExpression({ value: value2, type: type2 }, fieldName = "") {
       }
       if (parsed === void 0) {
         try {
-          const code = parsingRegistry.COMPUTED.toCode(value2);
+          const code = parsingRegistry.COMPUTED.toCode(value2, info);
           const computedExpression = parseExpression(code);
           if (computedExpression) {
             return computedExpression;
@@ -302669,7 +302675,7 @@ var SourceTracker = class {
    * And you want to update the `accessor` property, you can use this function to do so, passing a property path like
    * `columns.name.accessor`, rather than the entire columns object.
    */
-  setNestedAttribute = ({ openingTag, property, value: value2, type: type2 }) => {
+  setNestedAttribute = ({ openingTag, property, info }) => {
     const [parent, ...paths] = splitJSPathAdvanced(property, []);
     let parentAttr = openingTag.get("attributes").find((attr) => attr.isJSXAttribute() && attr.node.name.name === parent);
     if (!parentAttr && parent) {
@@ -302686,14 +302692,13 @@ var SourceTracker = class {
     writeNestedProperty({
       node: currentNode,
       paths,
-      value: value2,
-      type: type2
+      info
     });
   };
-  setAttribute = (openingTag, property, value2, type2) => {
+  setAttribute = (openingTag, property, info) => {
     const paths = splitJSPath(property);
     if (Array.isArray(paths) && paths.length > 1) {
-      this.setNestedAttribute({ openingTag, property, value: value2, type: type2 });
+      this.setNestedAttribute({ openingTag, property, info });
       return;
     }
     let attr = openingTag.get("attributes").find((attr2) => attr2.isJSXAttribute() && attr2.node.name.name === property);
@@ -302702,6 +302707,7 @@ var SourceTracker = class {
         import_types22.default.jsxAttribute(import_types22.default.jsxIdentifier(property), import_types22.default.stringLiteral(""))
       ])[0];
     }
+    const value2 = info.value;
     if (value2 === void 0 || typeof value2 === "string" && value2 === "") {
       attr.remove();
       return;
@@ -302711,7 +302717,7 @@ var SourceTracker = class {
       throw new Error("Attribute name not found");
     }
     const attrValue = attr.get("value");
-    const jsxAttribute = generateJSXAttribute(property, Property.Any(value2, type2));
+    const jsxAttribute = generateJSXAttribute(property, info);
     if (jsxAttribute.value) {
       attrValue.replaceWith(jsxAttribute.value);
     }
@@ -302728,10 +302734,10 @@ var SourceTracker = class {
       element.node.closingElement = import_types22.default.jsxClosingElement(import_types22.default.jsxIdentifier(getTagName(openingElement.node.name) ?? ""));
     }
   };
-  setProperty = async ({ source: source2, property, value: value2, type: type2 }) => {
+  setProperty = async ({ source: source2, property, info }) => {
     await this.setProperties({
       source: source2,
-      changes: { [property]: { value: value2, type: type2 } }
+      changes: { [property]: info }
     });
   };
   setProperties = async ({ source: source2, changes }) => {
@@ -302755,11 +302761,10 @@ var SourceTracker = class {
       if (!openingTag.isJSXOpeningElement()) {
         throw new Error(`Element ${source2.id} is not a JSXOpeningElement`);
       }
-      for (const [key2, { value: value2, type: type2 }] of Object.entries(changes)) {
-        const processedValue = value2;
-        const jsxAttribute = this.setAttribute(openingTag, key2, processedValue, type2);
-        if (type2 in REQUIRED_IMPORTS_BY_PROPERTY_TYPE) {
-          const requiredImports = REQUIRED_IMPORTS_BY_PROPERTY_TYPE[type2];
+      for (const [key2, info] of Object.entries(changes)) {
+        const jsxAttribute = this.setAttribute(openingTag, key2, info);
+        if (info.type in REQUIRED_IMPORTS_BY_PROPERTY_TYPE) {
+          const requiredImports = REQUIRED_IMPORTS_BY_PROPERTY_TYPE[info.type];
           if (requiredImports) {
             for (const { importName, importPath } of requiredImports) {
               if (!this.fileToMeta[fileName].imports[importName]) {
@@ -302775,7 +302780,7 @@ var SourceTracker = class {
             }
           }
         }
-        if (type2 === "EVENT" && jsxAttribute) {
+        if (info.type === "EVENT" && jsxAttribute) {
           const referencedGlobalFunctions = getVariableReferences(jsxAttribute, GLOBAL_LIBRARY_NAMES);
           referencedGlobalFunctions.forEach((funcName) => {
             if (!this.fileToMeta[fileName].imports[funcName]) {
@@ -302790,7 +302795,7 @@ var SourceTracker = class {
             }
           });
         }
-        if (ATTRIBUTE_TYPES_WITH_STATE_ACCESS.includes(type2) && jsxAttribute) {
+        if (ATTRIBUTE_TYPES_WITH_STATE_ACCESS.includes(info.type) && jsxAttribute) {
           const elementLocation = this.getElementToLocation(source2.id);
           const scopeImports = this.sbScopeManager.getAndUpdateScopeImportsForCodeSnippet({
             jsxAttribute,
@@ -303574,13 +303579,12 @@ export default registerPage(Page, { name: "${name17}" });
     }
   };
   handleSetProperty = async (payload, writeFile8 = true) => {
-    const { element: { source: source2 }, property, value: { value: value2, type: type2 }, transaction } = payload;
+    const { element: { source: source2 }, property, value: value2, transaction } = payload;
     this.trackTransaction(transaction?.id);
     await this.sourceTracker?.setProperty({
       source: source2,
       property,
-      value: value2,
-      type: type2
+      info: value2
     });
     if (writeFile8) {
       const changes = await this.sourceTracker?.getAndFlushChanges() ?? [];
@@ -308607,7 +308611,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.6";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.7";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {

package/oclif.manifest.json

@@ -509,5 +509,5 @@
       "strict": true
     }
   },
-  "version": "2.0.0-next.6"
+  "version": "2.0.0-next.7"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.0-next.6",
+  "version": "2.0.0-next.7",
   "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.6",
+    "@superblocksteam/sdk": "2.0.0-next.7",
     "@superblocksteam/shared": "0.9122.0",
-    "@superblocksteam/util": "2.0.0-next.6",
+    "@superblocksteam/util": "2.0.0-next.7",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",