@bagelink/blox 1.11.5 → 1.11.9

package/dist/vite-plugin.cjs

@@ -1073,7 +1073,6 @@ function bloxPlugin() {
   return {
     name: "vite-plugin-blox",
     enforce: "pre",
-    // must run before @vitejs/plugin-vue
     transform(code, id) {
       if (!id.endsWith(".vue")) return;
       if (!code.includes("defineBlock")) return;
@@ -1084,41 +1083,75 @@ function bloxPlugin() {
       const attrs = setupMatch[2];
       const body = setupMatch[3];
       const closeTag = setupMatch[4];
-      const hoisted = [];
       let remaining = body;
-      while (true) {
-        const m = /^([ \t]*defineBlock\()/m.exec(remaining);
-        if (!m) break;
-        const start = m.index;
-        const parenStart = start + m[1].length - 1;
-        let depth = 1;
-        let i = parenStart + 1;
-        while (i < remaining.length && depth > 0) {
-          if (remaining[i] === "(") depth++;
-          else if (remaining[i] === ")") depth--;
-          i++;
-        }
-        if (remaining[i] === "\n") i++;
-        const fullCall = remaining.slice(start, i).trim();
-        const nameMatch = fullCall.match(/name\s*:\s*['"](\w+)['"]/);
-        if (!nameMatch) {
-          console.warn("[vite-plugin-blox] defineBlock() call missing `name` property — skipping");
-          break;
+      const hoistedDecls = [];
+      const blockCallMatch = /^[ \t]*defineBlock\(/m.exec(remaining);
+      if (!blockCallMatch) return;
+      const callStart = blockCallMatch.index;
+      const parenStart = callStart + blockCallMatch[0].length - 1;
+      let depth = 1;
+      let i = parenStart + 1;
+      while (i < remaining.length && depth > 0) {
+        if (remaining[i] === "(") depth++;
+        else if (remaining[i] === ")") depth--;
+        i++;
+      }
+      if (remaining[i] === "\n") i++;
+      const callExpr = remaining.slice(callStart, i).trimEnd();
+      const nameMatch = callExpr.match(/name\s*:\s*['"](\w+)['"]/);
+      if (!nameMatch) {
+        console.warn("[vite-plugin-blox] defineBlock() missing `name` — skipping");
+        return;
+      }
+      const blockName = nameMatch[1];
+      remaining = remaining.slice(0, callStart) + remaining.slice(i);
+      const identifiers = /* @__PURE__ */ new Set();
+      const identRe = /\b([a-z_$][\w$]*)\b/gi;
+      let identMatch;
+      while ((identMatch = identRe.exec(callExpr)) !== null) {
+        identifiers.add(identMatch[1]);
+      }
+      for (const ident of identifiers) {
+        const declRe = new RegExp(`^([ \\t]*const\\s+${ident}\\s*=\\s*)`, "m");
+        const declMatch = declRe.exec(remaining);
+        if (!declMatch) continue;
+        const declStart = declMatch.index;
+        const exprStart = declStart + declMatch[0].length;
+        let d = 0;
+        let j = exprStart;
+        while (j < remaining.length) {
+          const ch = remaining[j];
+          if (ch === "(" || ch === "[" || ch === "{") {
+            d++;
+          } else if (ch === ")" || ch === "]" || ch === "}") {
+            d--;
+          } else if (ch === "\n" && d === 0) {
+            j++;
+            break;
+          }
+          j++;
         }
-        const varName = nameMatch[1];
-        const callExpr = remaining.slice(start, i).trimEnd();
-        hoisted.push(`export const ${varName} = ${callExpr.trimStart()}`);
-        remaining = remaining.slice(0, start) + remaining.slice(i);
+        const fullDecl = remaining.slice(declStart, j).trimEnd();
+        hoistedDecls.push(fullDecl);
+        remaining = remaining.slice(0, declStart) + remaining.slice(j);
+      }
+      const hoistedImports = [];
+      const importRe = /^[ \t]*import\s[^\n]+from\s+['"](?:@bagelink\/blox|@bagelink\/vue)['"]\s*/gm;
+      let importMatch;
+      while ((importMatch = importRe.exec(remaining)) !== null) {
+        hoistedImports.push(importMatch[0].trimEnd());
       }
-      if (hoisted.length === 0) return;
       const langMatch = attrs.match(/lang="([^"]+)"/);
       const lang = langMatch ? ` lang="${langMatch[1]}"` : "";
-      const newBlock = [
+      const nonSetupBlock = [
         `<script${lang}>`,
-        hoisted.join("\n"),
-        `<\/script>`,
-        `${openTag}${remaining}${closeTag}`
+        ...hoistedImports,
+        ...hoistedDecls,
+        `export const ${blockName} = ${callExpr.trimStart()}`,
+        `<\/script>`
       ].join("\n");
+      const newBlock = `${nonSetupBlock}
+${openTag}${remaining}${closeTag}`;
       const s = new MagicString(code);
       const blockStart = code.indexOf(openTag);
       const blockEnd = blockStart + openTag.length + body.length + closeTag.length;

package/dist/vite-plugin.d.ts

@@ -1,24 +1,23 @@
 import { Plugin } from 'vite';
 /**
- * Vite plugin that hoists `defineBlock({ name: '...', ... })` call statements
- * out of `<script setup>` into a plain `<script>` block as
- * `export const <name> = defineBlock({ ... })`.
+ * Vite plugin that hoists `defineBlock(...)` out of `<script setup>` into a
+ * plain `<script>` block. Also hoists any variables referenced by defineBlock
+ * (e.g. `const schema = defineSchema(...)`) and the relevant imports.
  *
- * Write a single clean `<script setup>` with no assignment or export:
+ * @example
  * ```vue
  * <script setup lang="ts">
- * defineBlock({ name: 'aboutBox', label: 'About Box', icon: 'info', schema })
- * defineProps<AboutBoxProps>()
- * </script>
- * ```
+ * import { defineBlock } from '@bagelink/blox'
+ * import { defineSchema, $ } from '@bagelink/vue'
  *
- * The plugin rewrites it before Vue's compiler sees it:
- * ```vue
- * <script lang="ts">
- * export const aboutBox = defineBlock({ name: 'aboutBox', label: 'About Box', icon: 'info', schema })
- * </script>
- * <script setup lang="ts">
- * defineProps<AboutBoxProps>()
+ * // Either inline:
+ * defineBlock({ name: 'hero', label: 'Hero', schema: defineSchema({ ... }) })
+ *
+ * // Or via variable (also hoisted automatically):
+ * const schema = defineSchema({ ... })
+ * defineBlock({ name: 'hero', label: 'Hero', schema })
+ *
+ * defineProps<HeroProps>()
  * </script>
  * ```
  */

package/dist/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAiFnC"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,UAAU,IAAI,MAAM,CA6HnC"}

package/dist/vite-plugin.mjs

@@ -1071,7 +1071,6 @@ function bloxPlugin() {
   return {
     name: "vite-plugin-blox",
     enforce: "pre",
-    // must run before @vitejs/plugin-vue
     transform(code, id) {
       if (!id.endsWith(".vue")) return;
       if (!code.includes("defineBlock")) return;
@@ -1082,41 +1081,75 @@ function bloxPlugin() {
       const attrs = setupMatch[2];
       const body = setupMatch[3];
       const closeTag = setupMatch[4];
-      const hoisted = [];
       let remaining = body;
-      while (true) {
-        const m = /^([ \t]*defineBlock\()/m.exec(remaining);
-        if (!m) break;
-        const start = m.index;
-        const parenStart = start + m[1].length - 1;
-        let depth = 1;
-        let i = parenStart + 1;
-        while (i < remaining.length && depth > 0) {
-          if (remaining[i] === "(") depth++;
-          else if (remaining[i] === ")") depth--;
-          i++;
-        }
-        if (remaining[i] === "\n") i++;
-        const fullCall = remaining.slice(start, i).trim();
-        const nameMatch = fullCall.match(/name\s*:\s*['"](\w+)['"]/);
-        if (!nameMatch) {
-          console.warn("[vite-plugin-blox] defineBlock() call missing `name` property — skipping");
-          break;
+      const hoistedDecls = [];
+      const blockCallMatch = /^[ \t]*defineBlock\(/m.exec(remaining);
+      if (!blockCallMatch) return;
+      const callStart = blockCallMatch.index;
+      const parenStart = callStart + blockCallMatch[0].length - 1;
+      let depth = 1;
+      let i = parenStart + 1;
+      while (i < remaining.length && depth > 0) {
+        if (remaining[i] === "(") depth++;
+        else if (remaining[i] === ")") depth--;
+        i++;
+      }
+      if (remaining[i] === "\n") i++;
+      const callExpr = remaining.slice(callStart, i).trimEnd();
+      const nameMatch = callExpr.match(/name\s*:\s*['"](\w+)['"]/);
+      if (!nameMatch) {
+        console.warn("[vite-plugin-blox] defineBlock() missing `name` — skipping");
+        return;
+      }
+      const blockName = nameMatch[1];
+      remaining = remaining.slice(0, callStart) + remaining.slice(i);
+      const identifiers = /* @__PURE__ */ new Set();
+      const identRe = /\b([a-z_$][\w$]*)\b/gi;
+      let identMatch;
+      while ((identMatch = identRe.exec(callExpr)) !== null) {
+        identifiers.add(identMatch[1]);
+      }
+      for (const ident of identifiers) {
+        const declRe = new RegExp(`^([ \\t]*const\\s+${ident}\\s*=\\s*)`, "m");
+        const declMatch = declRe.exec(remaining);
+        if (!declMatch) continue;
+        const declStart = declMatch.index;
+        const exprStart = declStart + declMatch[0].length;
+        let d = 0;
+        let j = exprStart;
+        while (j < remaining.length) {
+          const ch = remaining[j];
+          if (ch === "(" || ch === "[" || ch === "{") {
+            d++;
+          } else if (ch === ")" || ch === "]" || ch === "}") {
+            d--;
+          } else if (ch === "\n" && d === 0) {
+            j++;
+            break;
+          }
+          j++;
         }
-        const varName = nameMatch[1];
-        const callExpr = remaining.slice(start, i).trimEnd();
-        hoisted.push(`export const ${varName} = ${callExpr.trimStart()}`);
-        remaining = remaining.slice(0, start) + remaining.slice(i);
+        const fullDecl = remaining.slice(declStart, j).trimEnd();
+        hoistedDecls.push(fullDecl);
+        remaining = remaining.slice(0, declStart) + remaining.slice(j);
+      }
+      const hoistedImports = [];
+      const importRe = /^[ \t]*import\s[^\n]+from\s+['"](?:@bagelink\/blox|@bagelink\/vue)['"]\s*/gm;
+      let importMatch;
+      while ((importMatch = importRe.exec(remaining)) !== null) {
+        hoistedImports.push(importMatch[0].trimEnd());
       }
-      if (hoisted.length === 0) return;
       const langMatch = attrs.match(/lang="([^"]+)"/);
       const lang = langMatch ? ` lang="${langMatch[1]}"` : "";
-      const newBlock = [
+      const nonSetupBlock = [
         `<script${lang}>`,
-        hoisted.join("\n"),
-        `<\/script>`,
-        `${openTag}${remaining}${closeTag}`
+        ...hoistedImports,
+        ...hoistedDecls,
+        `export const ${blockName} = ${callExpr.trimStart()}`,
+        `<\/script>`
       ].join("\n");
+      const newBlock = `${nonSetupBlock}
+${openTag}${remaining}${closeTag}`;
       const s = new MagicString(code);
       const blockStart = code.indexOf(openTag);
       const blockEnd = blockStart + openTag.length + body.length + closeTag.length;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/blox",
   "type": "module",
-  "version": "1.11.5",
+  "version": "1.11.9",
   "description": "Blox page builder library for drag-and-drop page building and static data management",
   "author": {
     "name": "Bagel Studio",