@blokkli/editor 2.0.0-alpha.37 → 2.0.0-alpha.38

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@blokkli/editor",
   "configKey": "blokkli",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.38",
   "compatibility": {
     "nuxt": ">=3.15.0"
   },

package/dist/module.mjs

@@ -18,7 +18,7 @@ import { d as defineCodeTemplate, a as defineFileTemplate, w as withHelper } fro
 import { defu, createDefu } from 'defu';
 
 const name = "@blokkli/editor";
-const version = "2.0.0-alpha.37";
+const version = "2.0.0-alpha.38";
 
 function sortObjectKeys(obj) {
   if (Array.isArray(obj)) {

package/dist/modules/agent/index.mjs

@@ -8,7 +8,7 @@ import { d as defineCodeTemplate } from '../../shared/editor.6D5vApr0.mjs';
 import MagicString from 'magic-string';
 import { parse } from 'acorn';
 import { walk } from 'estree-walker-ts';
-import { transformSync } from 'esbuild';
+import { transformSync, buildSync } from 'esbuild';
 
 function toImportName(prefix, fileName) {
   const name = fileName.split(/[-_]/).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
@@ -253,27 +253,18 @@ export const toolDefinitions: ServerToolMetadata[]
 }
 
 const QUERY = "?blokkliAgentTool";
-const PROPERTIES_TO_REMOVE = /* @__PURE__ */ new Set([
-  "execute",
-  "resultSchema",
-  "component",
-  "label",
-  "prunedSummary",
-  "mockParams",
-  "mockParamsVariants",
-  "requiresApproval",
-  "icon"
-]);
-const SERVER_SAFE_IMPORTS = /* @__PURE__ */ new Set([
-  "zod",
-  "../schemas",
-  "#blokkli/agent/app/tools/schemas",
-  "../chart_schemas",
-  "#blokkli-build/charts-config"
+const PROPERTIES_TO_KEEP = /* @__PURE__ */ new Set([
+  "name",
+  "description",
+  "category",
+  "paramsSchema",
+  "modes",
+  "lazy",
+  "volatile",
+  "requiredAdapterMethods",
+  "requiredFeatures",
+  "resolve"
 ]);
-function isServerSafeImport(source) {
-  return SERVER_SAFE_IMPORTS.has(source);
-}
 function agentToolStripPlugin() {
   return {
     name: "blokkli:agent-tool-strip",
@@ -299,7 +290,7 @@ function agentToolStripPlugin() {
       try {
         rawSource = fs.readFileSync(filePath, "utf-8");
       } catch {
-        this.error(`Cannot read agent tool file: ${filePath}`);
+        return this.error(`Cannot read agent tool file: ${filePath}`);
       }
       const { code: jsSource } = transformSync(rawSource, {
         loader: "ts",
@@ -395,25 +386,61 @@ function validateTransformedOutput(output, filePath) {
   }
   return null;
 }
-function transformToolSource(source, filePath) {
-  const ast = parse(source, {
+function treeShake(code) {
+  const result = buildSync({
+    stdin: { contents: code, loader: "js", resolveDir: "/tmp" },
+    bundle: true,
+    write: false,
+    format: "esm",
+    target: "esnext",
+    treeShaking: true,
+    external: ["*"]
+  });
+  return result.outputFiles[0].text;
+}
+function removeDeadImports(code) {
+  const ast = parse(code, {
     sourceType: "module",
     ecmaVersion: "latest"
   });
-  const exportInfo = findToolExport(ast);
-  if (!exportInfo) {
-    return source;
-  }
-  const s = new MagicString(source);
-  const { toolObject, call } = exportInfo;
+  const importRanges = [];
+  walk(ast, {
+    enter(node) {
+      if (node.type === "ImportDeclaration") {
+        const n = node;
+        importRanges.push({ start: n.start, end: n.end });
+      }
+    },
+    leave() {
+    }
+  });
+  const usedIds = /* @__PURE__ */ new Set();
+  walk(ast, {
+    enter(node) {
+      if (node.type === "Identifier") {
+        const n = node;
+        const inImport = importRanges.some(
+          (r) => n.start >= r.start && n.start < r.end
+        );
+        if (!inImport) {
+          usedIds.add(n.name);
+        }
+      }
+    },
+    leave() {
+    }
+  });
+  const s = new MagicString(code);
   walk(ast, {
     enter(node) {
       if (node.type !== "ImportDeclaration") return;
       const importDecl = node;
-      const importSource = importDecl.source.value;
-      if (!isServerSafeImport(importSource)) {
+      const hasUsedBinding = (importDecl.specifiers || []).some(
+        (spec) => usedIds.has(spec.local.name)
+      );
+      if (!hasUsedBinding) {
         let removeEnd = importDecl.end;
-        if (source[removeEnd] === "\n") {
+        if (code[removeEnd] === "\n") {
           removeEnd++;
         }
         s.remove(importDecl.start, removeEnd);
@@ -422,6 +449,19 @@ function transformToolSource(source, filePath) {
     leave() {
     }
   });
+  return s.toString();
+}
+function transformToolSource(source, filePath) {
+  const ast = parse(source, {
+    sourceType: "module",
+    ecmaVersion: "latest"
+  });
+  const exportInfo = findToolExport(ast);
+  if (!exportInfo) {
+    return source;
+  }
+  const s = new MagicString(source);
+  const { toolObject, call } = exportInfo;
   for (const prop of toolObject.properties) {
     if (prop.type !== "Property") continue;
     const key = prop.key;
@@ -431,7 +471,7 @@ function transformToolSource(source, filePath) {
     } else if (key.type === "Literal" && typeof key.value === "string") {
       name = key.value;
     }
-    if (name && PROPERTIES_TO_REMOVE.has(name)) {
+    if (name && !PROPERTIES_TO_KEEP.has(name)) {
       const propNode = prop;
       let removeEnd = propNode.end;
       const afterProp = source.substring(removeEnd);
@@ -444,7 +484,7 @@ function transformToolSource(source, filePath) {
   }
   s.overwrite(call.start, toolObject.start, "");
   s.overwrite(toolObject.end, call.end, "");
-  const result = s.toString();
+  const result = removeDeadImports(treeShake(s.toString()));
   const error = validateTransformedOutput(result, filePath);
   if (error) {
     throw new Error(error);

package/dist/runtime/editor/components/FlexTextarea/index.d.vue.ts

@@ -28,8 +28,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {
     onSubmit?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
-    minHeight: number;
     maxHeight: number;
+    minHeight: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/editor/components/FlexTextarea/index.vue.d.ts

@@ -28,8 +28,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {
     onSubmit?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
-    minHeight: number;
     maxHeight: number;
+    minHeight: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/editor/plugins/Sidebar/Detached/index.d.vue.ts

@@ -34,8 +34,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
         width: number;
         height: number;
     };
-    minWidth: number;
     minHeight: number;
+    minWidth: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/editor/plugins/Sidebar/Detached/index.vue.d.ts

@@ -34,8 +34,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
         width: number;
         height: number;
     };
-    minWidth: number;
     minHeight: number;
+    minWidth: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/editor/plugins/Sidebar/index.d.vue.ts

@@ -200,9 +200,9 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
         width: number;
         height: number;
     };
+    minHeight: number;
     tourText: string;
     minWidth: number;
-    minHeight: number;
     region: SidebarRegion;
     tooltipTitle: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {

package/dist/runtime/editor/plugins/Sidebar/index.vue.d.ts

@@ -200,9 +200,9 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
         width: number;
         height: number;
     };
+    minHeight: number;
     tourText: string;
     minWidth: number;
-    minHeight: number;
     region: SidebarRegion;
     tooltipTitle: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blokkli/editor",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.38",
   "description": "Interactive page building experience for Nuxt",
   "keywords": [
     "cms",