@archie/devtools 0.1.0 → 0.1.2

package/dist/{chunk-THKKWDMJ.mjs → chunk-WBZJILZ6.mjs}

@@ -151,11 +151,17 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
     }
     return "STATIC";
   }
-  const SHELL_FILE_RE = /(^|\/)shell\.jsx$/;
+  const SHELL_FILE_RE = /(^|\/)shell\.(jsx|tsx)$/;
   const SHELL_DIR_RE = /(^|\/)components\/shell\//;
+  const SHELL_BASENAME_RE = /shell/i;
   const CHROME_ANCESTOR_TAGS = /* @__PURE__ */ new Set(["nav", "aside", "header"]);
-  function computeIsChrome(file, path2) {
+  function isChromeFilePath(file) {
     if (SHELL_FILE_RE.test(file) || SHELL_DIR_RE.test(file)) return true;
+    const base = file.split("/").pop() ?? file;
+    return SHELL_BASENAME_RE.test(base);
+  }
+  function computeIsChrome(file, path2) {
+    if (isChromeFilePath(file)) return true;
     let current = path2.parentPath;
     while (current) {
       if (current.isJSXElement()) {
@@ -169,17 +175,65 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
   function computeContainerKind(path2) {
     const elPath = path2.parentPath;
     if (!elPath?.isJSXElement()) return "none";
-    const children = meaningfulChildren(t, elPath.node.children);
-    if (children.length === 0) return "none";
-    const allPlain = children.every((c) => t.isJSXElement(c) || t.isJSXText(c));
+    if (!elPath.node.closingElement) return "none";
+    const children = elPath.node.children;
+    const allPlain = children.every((c) => {
+      if (t.isJSXElement(c)) return true;
+      if (t.isJSXText(c)) return c.value.trim() === "";
+      return false;
+    });
     return allPlain ? "plain" : "expression";
   }
-  function computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind) {
+  const kitBoundNamesCache = /* @__PURE__ */ new WeakMap();
+  function computeKitBoundNames(programPath) {
+    const cached = kitBoundNamesCache.get(programPath.node);
+    if (cached) return cached;
+    const names = /* @__PURE__ */ new Set();
+    for (const stmt of programPath.node.body) {
+      if (!t.isVariableDeclaration(stmt)) continue;
+      for (const decl of stmt.declarations) {
+        if (!t.isObjectPattern(decl.id)) continue;
+        if (!decl.init || !t.isIdentifier(decl.init) || decl.init.name !== "Kit") continue;
+        for (const prop of decl.id.properties) {
+          if (!t.isObjectProperty(prop)) continue;
+          const value = t.isIdentifier(prop.value) ? prop.value : t.isIdentifier(prop.key) ? prop.key : null;
+          if (value) names.add(value.name);
+        }
+      }
+    }
+    kitBoundNamesCache.set(programPath.node, names);
+    return names;
+  }
+  function isKitComponentTagName(path2) {
+    const name = path2.node.name;
+    let head = null;
+    if (t.isJSXIdentifier(name)) {
+      head = name.name;
+    } else if (t.isJSXMemberExpression(name)) {
+      let cur = name;
+      while (t.isJSXMemberExpression(cur)) cur = cur.object;
+      if (t.isJSXIdentifier(cur)) head = cur.name;
+    }
+    if (!head || !/^[A-Z]/.test(head)) return false;
+    if (head === "Kit") return true;
+    const programPath = path2.scope.getProgramParent().path;
+    if (programPath.isProgram() && computeKitBoundNames(programPath).has(head)) return true;
+    const binding = path2.scope.getBinding(head);
+    if (binding) {
+      const bp = binding.path;
+      const isImport = bp.isImportSpecifier() || bp.isImportDefaultSpecifier() || bp.isImportNamespaceSpecifier();
+      if (isImport) {
+        const decl = bp.parentPath;
+        if (decl?.isImportDeclaration() && /kit-runtime/.test(decl.node.source.value)) return true;
+      }
+    }
+    return false;
+  }
+  function computeLockReason(isKitOrigin, isChrome, dynamicType) {
     if (isKitOrigin) return "KIT_INTERNAL";
     if (isChrome) return "CHROME_STRUCTURAL";
     if (dynamicType === "ARRAY") return "DYNAMIC_ARRAY";
     if (dynamicType === "CONDITIONAL") return "DYNAMIC_CONDITIONAL";
-    if (containerKind === "expression") return "EXPRESSION_CONTAINER";
     return void 0;
   }
   function isMovable(path2) {
@@ -856,7 +910,8 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
           const dynamicType = computeDynamicType(path2);
           const isChrome = computeIsChrome(file, path2);
           const containerKind = computeContainerKind(path2);
-          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind);
+          const isKitComponentContainer = isKitComponentTagName(path2);
+          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType);
           metaObj.properties.push(
             t.objectProperty(t.identifier("vid"), t.stringLiteral(vid)),
             t.objectProperty(t.identifier("isKitOrigin"), t.booleanLiteral(isKitOrigin)),
@@ -864,6 +919,11 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
             t.objectProperty(t.identifier("isChrome"), t.booleanLiteral(isChrome)),
             t.objectProperty(t.identifier("containerKind"), t.stringLiteral(containerKind))
           );
+          if (isKitComponentContainer) {
+            metaObj.properties.push(
+              t.objectProperty(t.identifier("isKitContainer"), t.booleanLiteral(true))
+            );
+          }
           if (lockReason) {
             metaObj.properties.push(
               t.objectProperty(t.identifier("lockReason"), t.stringLiteral(lockReason))

package/dist/client/client.js

@@ -4235,6 +4235,7 @@ function isNonDroppableNodeMeta(meta) {
   if (meta.containerKind && meta.containerKind !== "plain") return true;
   if (meta.isChrome) return true;
   if (meta.isKitOrigin) return true;
+  if (meta.isKitContainer) return true;
   return false;
 }
 function isNonDraggableNodeMeta(meta) {
@@ -4261,26 +4262,37 @@ function collectSubtreeIds(rootId, projection) {
 }
 function computeDroppableSet(sourceId, projection, nodeMap) {
   const excluded = collectSubtreeIds(sourceId, projection);
+  const sourceFile = nodeMap.get(sourceId)?.editorMeta?.file;
   const droppable = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (excluded.has(containerId)) continue;
     if (isStructuralContainer(containerId, nodeMap)) continue;
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) continue;
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) continue;
     droppable.add(containerId);
   }
   return droppable;
 }
-function buildBlockedNodeMetaContainerIds(projection, nodeMap) {
+function buildBlockedNodeMetaContainerIds(projection, nodeMap, sourceId) {
+  const sourceFile = sourceId ? nodeMap.get(sourceId)?.editorMeta?.file : void 0;
   const blocked = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) {
       blocked.add(containerId);
+      continue;
+    }
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) {
+      blocked.add(containerId);
     }
   }
   return blocked;
 }
 function resolveRefusalCode(meta, fallback) {
-  return meta?.lockReason ?? fallback;
+  if (meta?.lockReason) return meta.lockReason;
+  if (meta?.isKitContainer) return "KIT_INTERNAL";
+  return fallback;
 }
 function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainerId) {
   const blocked = /* @__PURE__ */ new Set();
@@ -4291,8 +4303,10 @@ function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainer
   return blocked;
 }
 
+// src/client/dnd/design-mode/node-meta-guard.ts
+var VID_PATTERN = /^[a-z0-9]{6,8}$/;
+
 // src/client/dnd/design-mode/fiber-bridge.ts
-var import_editor_protocol = require("@8base-archie/editor-protocol");
 var FIBER_KEY_PREFIX = "__reactFiber$";
 var PROPS_KEY_PREFIX = "__reactProps$";
 var metaCache = /* @__PURE__ */ new WeakMap();
@@ -4555,9 +4569,6 @@ function resolveDragSurface(el) {
   };
 }
 
-// src/types/editor-meta.ts
-var import_editor_protocol2 = require("@8base-archie/editor-protocol");
-
 // src/client/dnd/design-mode/node-key.ts
 var _runtimeKeyMap = /* @__PURE__ */ new WeakMap();
 var _runtimeKeyCounter = 0;
@@ -4585,7 +4596,7 @@ function getNodeKeyFromElement(el) {
 }
 function resolveVidFromElement(el) {
   const key2 = getNodeKeyFromElement(el);
-  return import_editor_protocol2.VID_PATTERN.test(key2) ? key2 : null;
+  return VID_PATTERN.test(key2) ? key2 : null;
 }
 function getInspectorRefFromElement(el) {
   const resolved = resolveDragSurface(el);
@@ -8595,7 +8606,7 @@ function useDragLifecycle({
     const sourceCommitLane = getCommitLaneSnapshot(srcContainerId);
     const startPosition = getCurrentCommitPlacement(anchorNodeId, srcContainerId);
     const blockedContainerIds = buildBlockedStructuralContainerIds(proj, refs.nodeMapRef.current, srcContainerId);
-    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current)) {
+    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current, anchorNodeId)) {
       blockedContainerIds.add(id);
     }
     const droppableSet = computeDroppableSet(anchorNodeId, proj, refs.nodeMapRef.current);
@@ -8680,9 +8691,8 @@ function useDragLifecycle({
       if (dropTargetId && !refs.droppableContainerIdsRef.current?.has(dropTargetId)) {
         const targetContainerEl = resolveNodeElement(dropTargetId);
         const targetMeta = refs.nodeMapRef.current.get(dropTargetId)?.editorMeta;
-        const fallbackCode = targetMeta?.containerKind === "expression" ? "EXPRESSION_CONTAINER" : "CONTAINER_NOT_PLAIN";
         emitRefused(
-          resolveRefusalCode(targetMeta, fallbackCode),
+          resolveRefusalCode(targetMeta, "CONTAINER_NOT_PLAIN"),
           "Drop target is outside the droppable set for this node.",
           targetContainerEl
         );

package/dist/client/client.mjs

@@ -4200,6 +4200,7 @@ function isNonDroppableNodeMeta(meta) {
   if (meta.containerKind && meta.containerKind !== "plain") return true;
   if (meta.isChrome) return true;
   if (meta.isKitOrigin) return true;
+  if (meta.isKitContainer) return true;
   return false;
 }
 function isNonDraggableNodeMeta(meta) {
@@ -4226,26 +4227,37 @@ function collectSubtreeIds(rootId, projection) {
 }
 function computeDroppableSet(sourceId, projection, nodeMap) {
   const excluded = collectSubtreeIds(sourceId, projection);
+  const sourceFile = nodeMap.get(sourceId)?.editorMeta?.file;
   const droppable = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (excluded.has(containerId)) continue;
     if (isStructuralContainer(containerId, nodeMap)) continue;
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) continue;
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) continue;
     droppable.add(containerId);
   }
   return droppable;
 }
-function buildBlockedNodeMetaContainerIds(projection, nodeMap) {
+function buildBlockedNodeMetaContainerIds(projection, nodeMap, sourceId) {
+  const sourceFile = sourceId ? nodeMap.get(sourceId)?.editorMeta?.file : void 0;
   const blocked = /* @__PURE__ */ new Set();
   for (const containerId of projection.containerIndex.keys()) {
     if (isNonDroppableNodeMeta(nodeMap.get(containerId)?.editorMeta)) {
       blocked.add(containerId);
+      continue;
+    }
+    const containerFile = nodeMap.get(containerId)?.editorMeta?.file;
+    if (sourceFile && containerFile && containerFile !== sourceFile) {
+      blocked.add(containerId);
     }
   }
   return blocked;
 }
 function resolveRefusalCode(meta, fallback) {
-  return meta?.lockReason ?? fallback;
+  if (meta?.lockReason) return meta.lockReason;
+  if (meta?.isKitContainer) return "KIT_INTERNAL";
+  return fallback;
 }
 function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainerId) {
   const blocked = /* @__PURE__ */ new Set();
@@ -4256,8 +4268,10 @@ function buildBlockedStructuralContainerIds(projection, nodeMap, sourceContainer
   return blocked;
 }
 
+// src/client/dnd/design-mode/node-meta-guard.ts
+var VID_PATTERN = /^[a-z0-9]{6,8}$/;
+
 // src/client/dnd/design-mode/fiber-bridge.ts
-import { NodeMetaSchema } from "@8base-archie/editor-protocol";
 var FIBER_KEY_PREFIX = "__reactFiber$";
 var PROPS_KEY_PREFIX = "__reactProps$";
 var metaCache = /* @__PURE__ */ new WeakMap();
@@ -4520,9 +4534,6 @@ function resolveDragSurface(el) {
   };
 }
 
-// src/types/editor-meta.ts
-import { VID_PATTERN, VID_ATTR } from "@8base-archie/editor-protocol";
-
 // src/client/dnd/design-mode/node-key.ts
 var _runtimeKeyMap = /* @__PURE__ */ new WeakMap();
 var _runtimeKeyCounter = 0;
@@ -8560,7 +8571,7 @@ function useDragLifecycle({
     const sourceCommitLane = getCommitLaneSnapshot(srcContainerId);
     const startPosition = getCurrentCommitPlacement(anchorNodeId, srcContainerId);
     const blockedContainerIds = buildBlockedStructuralContainerIds(proj, refs.nodeMapRef.current, srcContainerId);
-    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current)) {
+    for (const id of buildBlockedNodeMetaContainerIds(proj, refs.nodeMapRef.current, anchorNodeId)) {
       blockedContainerIds.add(id);
     }
     const droppableSet = computeDroppableSet(anchorNodeId, proj, refs.nodeMapRef.current);
@@ -8645,9 +8656,8 @@ function useDragLifecycle({
       if (dropTargetId && !refs.droppableContainerIdsRef.current?.has(dropTargetId)) {
         const targetContainerEl = resolveNodeElement(dropTargetId);
         const targetMeta = refs.nodeMapRef.current.get(dropTargetId)?.editorMeta;
-        const fallbackCode = targetMeta?.containerKind === "expression" ? "EXPRESSION_CONTAINER" : "CONTAINER_NOT_PLAIN";
         emitRefused(
-          resolveRefusalCode(targetMeta, fallbackCode),
+          resolveRefusalCode(targetMeta, "CONTAINER_NOT_PLAIN"),
           "Drop target is outside the droppable set for this node.",
           targetContainerEl
         );

package/dist/collection-binding.mjs

@@ -1,6 +1,6 @@
 import {
   meaningfulChildren
-} from "./chunk-THKKWDMJ.mjs";
+} from "./chunk-WBZJILZ6.mjs";
 
 // src/babel-plugin-collection-binding.ts
 import { VISITOR_KEYS } from "@babel/types";

package/dist/index.d.mts

@@ -644,6 +644,14 @@ interface EditorMeta {
      * writable, static, non-chrome, non-kit element.
      */
     lockReason?: 'KIT_INTERNAL' | 'DYNAMIC_ARRAY' | 'DYNAMIC_CONDITIONAL' | 'CHROME_STRUCTURAL' | 'EXPRESSION_CONTAINER';
+    /**
+     * `true` when this element's own tag is a Kit component instance
+     * (`isKitComponentTagName` in `babel-plugin-editor-meta.ts`). Devtools-local
+     * only, not in the `.strict()` NodeMeta protocol schema, and never folded
+     * into `isKitOrigin`/`lockReason` — it blocks this element as a drop
+     * CONTAINER only, not the element's own draggability/inspectability.
+     */
+    isKitContainer?: boolean;
 }
 
 interface ArchieDevToolsOptions {

package/dist/index.d.ts

@@ -644,6 +644,14 @@ interface EditorMeta {
      * writable, static, non-chrome, non-kit element.
      */
     lockReason?: 'KIT_INTERNAL' | 'DYNAMIC_ARRAY' | 'DYNAMIC_CONDITIONAL' | 'CHROME_STRUCTURAL' | 'EXPRESSION_CONTAINER';
+    /**
+     * `true` when this element's own tag is a Kit component instance
+     * (`isKitComponentTagName` in `babel-plugin-editor-meta.ts`). Devtools-local
+     * only, not in the `.strict()` NodeMeta protocol schema, and never folded
+     * into `isKitOrigin`/`lockReason` — it blocks this element as a drop
+     * CONTAINER only, not the element's own draggability/inspectability.
+     */
+    isKitContainer?: boolean;
 }
 
 interface ArchieDevToolsOptions {

package/dist/index.js

@@ -350,11 +350,17 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
     }
     return "STATIC";
   }
-  const SHELL_FILE_RE = /(^|\/)shell\.jsx$/;
+  const SHELL_FILE_RE = /(^|\/)shell\.(jsx|tsx)$/;
   const SHELL_DIR_RE = /(^|\/)components\/shell\//;
+  const SHELL_BASENAME_RE = /shell/i;
   const CHROME_ANCESTOR_TAGS = /* @__PURE__ */ new Set(["nav", "aside", "header"]);
-  function computeIsChrome(file, path) {
+  function isChromeFilePath(file) {
     if (SHELL_FILE_RE.test(file) || SHELL_DIR_RE.test(file)) return true;
+    const base = file.split("/").pop() ?? file;
+    return SHELL_BASENAME_RE.test(base);
+  }
+  function computeIsChrome(file, path) {
+    if (isChromeFilePath(file)) return true;
     let current = path.parentPath;
     while (current) {
       if (current.isJSXElement()) {
@@ -368,17 +374,65 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
   function computeContainerKind(path) {
     const elPath = path.parentPath;
     if (!elPath?.isJSXElement()) return "none";
-    const children = meaningfulChildren(t, elPath.node.children);
-    if (children.length === 0) return "none";
-    const allPlain = children.every((c) => t.isJSXElement(c) || t.isJSXText(c));
+    if (!elPath.node.closingElement) return "none";
+    const children = elPath.node.children;
+    const allPlain = children.every((c) => {
+      if (t.isJSXElement(c)) return true;
+      if (t.isJSXText(c)) return c.value.trim() === "";
+      return false;
+    });
     return allPlain ? "plain" : "expression";
   }
-  function computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind) {
+  const kitBoundNamesCache = /* @__PURE__ */ new WeakMap();
+  function computeKitBoundNames(programPath) {
+    const cached = kitBoundNamesCache.get(programPath.node);
+    if (cached) return cached;
+    const names = /* @__PURE__ */ new Set();
+    for (const stmt of programPath.node.body) {
+      if (!t.isVariableDeclaration(stmt)) continue;
+      for (const decl of stmt.declarations) {
+        if (!t.isObjectPattern(decl.id)) continue;
+        if (!decl.init || !t.isIdentifier(decl.init) || decl.init.name !== "Kit") continue;
+        for (const prop of decl.id.properties) {
+          if (!t.isObjectProperty(prop)) continue;
+          const value = t.isIdentifier(prop.value) ? prop.value : t.isIdentifier(prop.key) ? prop.key : null;
+          if (value) names.add(value.name);
+        }
+      }
+    }
+    kitBoundNamesCache.set(programPath.node, names);
+    return names;
+  }
+  function isKitComponentTagName(path) {
+    const name = path.node.name;
+    let head = null;
+    if (t.isJSXIdentifier(name)) {
+      head = name.name;
+    } else if (t.isJSXMemberExpression(name)) {
+      let cur = name;
+      while (t.isJSXMemberExpression(cur)) cur = cur.object;
+      if (t.isJSXIdentifier(cur)) head = cur.name;
+    }
+    if (!head || !/^[A-Z]/.test(head)) return false;
+    if (head === "Kit") return true;
+    const programPath = path.scope.getProgramParent().path;
+    if (programPath.isProgram() && computeKitBoundNames(programPath).has(head)) return true;
+    const binding = path.scope.getBinding(head);
+    if (binding) {
+      const bp = binding.path;
+      const isImport = bp.isImportSpecifier() || bp.isImportDefaultSpecifier() || bp.isImportNamespaceSpecifier();
+      if (isImport) {
+        const decl = bp.parentPath;
+        if (decl?.isImportDeclaration() && /kit-runtime/.test(decl.node.source.value)) return true;
+      }
+    }
+    return false;
+  }
+  function computeLockReason(isKitOrigin, isChrome, dynamicType) {
     if (isKitOrigin) return "KIT_INTERNAL";
     if (isChrome) return "CHROME_STRUCTURAL";
     if (dynamicType === "ARRAY") return "DYNAMIC_ARRAY";
     if (dynamicType === "CONDITIONAL") return "DYNAMIC_CONDITIONAL";
-    if (containerKind === "expression") return "EXPRESSION_CONTAINER";
     return void 0;
   }
   function isMovable(path) {
@@ -1055,7 +1109,8 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
           const dynamicType = computeDynamicType(path);
           const isChrome = computeIsChrome(file, path);
           const containerKind = computeContainerKind(path);
-          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType, containerKind);
+          const isKitComponentContainer = isKitComponentTagName(path);
+          const lockReason = computeLockReason(isKitOrigin, isChrome, dynamicType);
           metaObj.properties.push(
             t.objectProperty(t.identifier("vid"), t.stringLiteral(vid)),
             t.objectProperty(t.identifier("isKitOrigin"), t.booleanLiteral(isKitOrigin)),
@@ -1063,6 +1118,11 @@ function babelPluginEditorMeta({ types: t }, opts = {}) {
             t.objectProperty(t.identifier("isChrome"), t.booleanLiteral(isChrome)),
             t.objectProperty(t.identifier("containerKind"), t.stringLiteral(containerKind))
           );
+          if (isKitComponentContainer) {
+            metaObj.properties.push(
+              t.objectProperty(t.identifier("isKitContainer"), t.booleanLiteral(true))
+            );
+          }
           if (lockReason) {
             metaObj.properties.push(
               t.objectProperty(t.identifier("lockReason"), t.stringLiteral(lockReason))

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   __dirname,
   babelPluginEditorMeta
-} from "./chunk-THKKWDMJ.mjs";
+} from "./chunk-WBZJILZ6.mjs";
 
 // src/index.ts
 import { readFileSync } from "fs";

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@archie/devtools",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "DevTools for Archie generated applications - Route synchronization and editor communication",
+  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/8base-archie/archie-devtools.git"