@weasel-js/forge 1.8.1 → 1.9.1

package/dist/test/index.d.ts

@@ -1,4 +1,4 @@
-import { F as FrameSetup } from '../FrameController-BH8xJHZ8.js';
+import { F as FrameSetup } from '../FrameController-CpcY0DNB.js';
 import '@weasel-js/labkit/config';
 import 'react';
 

package/dist/test/index.js

@@ -1,6 +1,6 @@
-import { StoryTrial } from '../chunk-GHTVXHNJ.js';
+import { StoryTrial } from '../chunk-QN3HJQXZ.js';
 import '../chunk-NI5FYQHW.js';
-import { loadStories } from '../chunk-5N4YP5HS.js';
+import { loadStories } from '../chunk-Q2EZXJFE.js';
 import '../chunk-L5XM5VKB.js';
 import '../chunk-HRGPFQBW.js';
 import '../chunk-MGQWCPYE.js';

package/dist/vite/index.js

@@ -344,6 +344,79 @@ function namesIn(node) {
   walk(node);
   return out;
 }
+function parseFile(code, file) {
+  const plugins = ["typescript", "decorators-legacy", .../\.[jt]sx$/.test(file) ? ["jsx"] : []];
+  return parse(code, { sourceType: "module", plugins }).program;
+}
+function calleeOf(node, bindings, depth = 0) {
+  if (!node || depth > 16) return void 0;
+  switch (node.type) {
+    case "TSSatisfiesExpression":
+    case "TSAsExpression":
+    case "TSTypeAssertion":
+    case "TSNonNullExpression":
+    case "ParenthesizedExpression":
+      return calleeOf(node.expression, bindings, depth + 1);
+    case "CallExpression":
+      return node.callee.type === "Identifier" ? node.callee.name : void 0;
+    case "Identifier":
+      return calleeOf(bindings.get(node.name), bindings, depth + 1);
+    default:
+      return void 0;
+  }
+}
+function stringLiteral(node) {
+  if (node.type === "StringLiteral") return node.value;
+  if (node.type === "TemplateLiteral" && node.expressions.length === 0) return node.quasis.map((q) => q.value.cooked ?? q.value.raw).join("");
+  return void 0;
+}
+function isDefaultExport(stmt) {
+  if (stmt.type === "ExportDefaultDeclaration") return true;
+  return stmt.type === "ExportNamedDeclaration" && stmt.specifiers.some((s) => s.type === "ExportSpecifier" && exportedName(s.exported) === "default");
+}
+function docOf(node) {
+  const comments = node.leadingComments;
+  const last = comments?.[comments.length - 1];
+  if (last?.type !== "CommentBlock" || !last.value.startsWith("*")) return void 0;
+  const text = last.value.slice(1).split("\n").map((line) => line.replace(/^\s*\*/, "").trim()).join("\n").trim();
+  return text || void 0;
+}
+function exportedName(node) {
+  return node.type === "Identifier" ? node.name : node.value;
+}
+function objectOf(node, bindings, wrappers, depth = 0) {
+  if (!node || depth > 16) return null;
+  switch (node.type) {
+    case "ObjectExpression":
+      return node;
+    case "TSSatisfiesExpression":
+    case "TSAsExpression":
+    case "TSTypeAssertion":
+    case "TSNonNullExpression":
+    case "ParenthesizedExpression":
+      return objectOf(node.expression, bindings, wrappers, depth + 1);
+    case "CallExpression":
+      return node.callee.type === "Identifier" && wrappers.has(node.callee.name) ? objectOf(node.arguments[0], bindings, wrappers, depth + 1) : null;
+    case "Identifier":
+      return objectOf(bindings.get(node.name), bindings, wrappers, depth + 1);
+    default:
+      return null;
+  }
+}
+function prop(obj, key) {
+  for (const p of obj?.properties ?? []) {
+    if (p.type !== "ObjectProperty" || p.computed) continue;
+    const name = p.key.type === "Identifier" ? p.key.name : p.key.type === "StringLiteral" ? p.key.value : null;
+    if (name === key) return p.value;
+  }
+  return void 0;
+}
+function stringProp(obj, key) {
+  const value = prop(obj, key);
+  return value?.type === "StringLiteral" ? value.value : void 0;
+}
+
+// src/vite/indexFile.ts
 function indexFile(code, file, autoTitle2, wrappers = /* @__PURE__ */ new Set()) {
   try {
     return indexProgram(parseFile(code, file), file, autoTitle2, wrappers);
@@ -377,27 +450,6 @@ function foreignCallees(code, file) {
   }
   return [...found.values()];
 }
-function parseFile(code, file) {
-  const plugins = ["typescript", "decorators-legacy", .../\.[jt]sx$/.test(file) ? ["jsx"] : []];
-  return parse(code, { sourceType: "module", plugins }).program;
-}
-function calleeOf(node, bindings, depth = 0) {
-  if (!node || depth > 16) return void 0;
-  switch (node.type) {
-    case "TSSatisfiesExpression":
-    case "TSAsExpression":
-    case "TSTypeAssertion":
-    case "TSNonNullExpression":
-    case "ParenthesizedExpression":
-      return calleeOf(node.expression, bindings, depth + 1);
-    case "CallExpression":
-      return node.callee.type === "Identifier" ? node.callee.name : void 0;
-    case "Identifier":
-      return calleeOf(bindings.get(node.name), bindings, depth + 1);
-    default:
-      return void 0;
-  }
-}
 function scan(program, extra) {
   const bindings = /* @__PURE__ */ new Map();
   const wrappers = new Set(extra);
@@ -455,10 +507,12 @@ function indexProgram(program, file, autoTitle2, extra) {
   const componentName = componentNode?.type === "Identifier" ? componentNode.name : void 0;
   const metaIsolate = isolateOf(meta, bindings, wrappers, "default");
   const metaTags = tagsOf(meta);
+  const native = wrappers.has(calleeOf(metaNode, bindings) ?? "");
   return exported.filter(({ name }) => name !== "__namedExportsOrder").filter(({ name }) => (!include || include(name)) && (!exclude || !exclude(name))).map(({ name, node, doc }) => {
     const spec = objectOf(node, bindings, wrappers);
     const isolate = isolateOf(spec, bindings, wrappers, name) ?? metaIsolate;
     const tags = combineTags(metaTags, tagsOf(spec));
+    const viewport = native ? viewportOf(spec, bindings, wrappers) : void 0;
     return {
       id: storyId(title, name),
       title,
@@ -469,6 +523,7 @@ function indexProgram(program, file, autoTitle2, extra) {
       ...metaDoc === void 0 ? {} : { componentDescription: metaDoc },
       ...componentName === void 0 ? {} : { componentName },
       ...isolate === void 0 ? {} : { isolate },
+      ...viewport === void 0 ? {} : { viewport },
       ...tags === void 0 ? {} : { tags }
     };
   });
@@ -482,6 +537,12 @@ function isolateOf(obj, bindings, wrappers, exportName) {
   if (literal === void 0) throw new Error(`${exportName}: isolate must be a string literal`);
   return literal;
 }
+function viewportOf(obj, bindings, wrappers) {
+  const value = objectOf(prop(obj, "viewport"), bindings, wrappers);
+  const width = prop(value, "width");
+  const height = prop(value, "height");
+  return width?.type === "NumericLiteral" && height?.type === "NumericLiteral" ? { width: width.value, height: height.value } : void 0;
+}
 function tagsOf(obj) {
   const value = prop(obj, "tags");
   if (value?.type !== "ArrayExpression") return void 0;
@@ -496,56 +557,6 @@ function combineTags(meta, own) {
   }
   return [...out];
 }
-function stringLiteral(node) {
-  if (node.type === "StringLiteral") return node.value;
-  if (node.type === "TemplateLiteral" && node.expressions.length === 0) return node.quasis.map((q) => q.value.cooked ?? q.value.raw).join("");
-  return void 0;
-}
-function isDefaultExport(stmt) {
-  if (stmt.type === "ExportDefaultDeclaration") return true;
-  return stmt.type === "ExportNamedDeclaration" && stmt.specifiers.some((s) => s.type === "ExportSpecifier" && exportedName(s.exported) === "default");
-}
-function docOf(node) {
-  const comments = node.leadingComments;
-  const last = comments?.[comments.length - 1];
-  if (last?.type !== "CommentBlock" || !last.value.startsWith("*")) return void 0;
-  const text = last.value.slice(1).split("\n").map((line) => line.replace(/^\s*\*/, "").trim()).join("\n").trim();
-  return text || void 0;
-}
-function exportedName(node) {
-  return node.type === "Identifier" ? node.name : node.value;
-}
-function objectOf(node, bindings, wrappers, depth = 0) {
-  if (!node || depth > 16) return null;
-  switch (node.type) {
-    case "ObjectExpression":
-      return node;
-    case "TSSatisfiesExpression":
-    case "TSAsExpression":
-    case "TSTypeAssertion":
-    case "TSNonNullExpression":
-    case "ParenthesizedExpression":
-      return objectOf(node.expression, bindings, wrappers, depth + 1);
-    case "CallExpression":
-      return node.callee.type === "Identifier" && wrappers.has(node.callee.name) ? objectOf(node.arguments[0], bindings, wrappers, depth + 1) : null;
-    case "Identifier":
-      return objectOf(bindings.get(node.name), bindings, wrappers, depth + 1);
-    default:
-      return null;
-  }
-}
-function prop(obj, key) {
-  for (const p of obj?.properties ?? []) {
-    if (p.type !== "ObjectProperty" || p.computed) continue;
-    const name = p.key.type === "Identifier" ? p.key.name : p.key.type === "StringLiteral" ? p.key.value : null;
-    if (name === key) return p.value;
-  }
-  return void 0;
-}
-function stringProp(obj, key) {
-  const value = prop(obj, key);
-  return value?.type === "StringLiteral" ? value.value : void 0;
-}
 function storyFilter(obj, key) {
   const value = prop(obj, key);
   if (value?.type === "RegExpLiteral") {
@@ -604,9 +615,11 @@ function createWrapperResolver(read) {
   return async (file, callees, resolve4) => {
     const reads = /* @__PURE__ */ new Set();
     const wrappers = /* @__PURE__ */ new Set();
-    if (callees.length === 0) return { wrappers, reads };
+    let unresolved = false;
+    if (callees.length === 0) return { wrappers, reads, unresolved };
     const target = async (spec, importer) => {
       const id = (await resolve4(spec, importer).catch(() => null))?.split("?")[0];
+      if (!id) unresolved = true;
       return id && !id.startsWith("\0") ? id : null;
     };
     const declaring = async (at, name, depth = 0) => {
@@ -634,7 +647,7 @@ function createWrapperResolver(read) {
       return null;
     };
     const forge2 = await target("@weasel-js/forge", file);
-    if (!forge2) return { wrappers, reads };
+    if (!forge2) return { wrappers, reads, unresolved };
     const own = new Set(
       (await Promise.all(["meta", "story"].map((name) => declaring(forge2, name)))).filter((key) => key !== null)
     );
@@ -643,7 +656,7 @@ function createWrapperResolver(read) {
       const key = from ? await declaring(from, callee.imported) : null;
       if (key && own.has(key)) wrappers.add(callee.local);
     }
-    return { wrappers, reads };
+    return { wrappers, reads, unresolved };
   };
 }
 
@@ -792,7 +805,7 @@ import.meta.hot?.accept('virtual:forge/importers.js', () => location.reload());
     const current = files();
     if (event === "change" && current.has(file)) server.ws.send({ type: "custom", event: "forge:story", data: { file } });
     const own = event === "add" ? matches(file) : current.has(file);
-    const through = [...wrappersOf].filter(([story, { reads }]) => story !== file && reads.has(file)).map(([story]) => story);
+    const through = [...wrappersOf].filter(([story, { reads, unresolved }]) => story !== file && (reads.has(file) || event === "add" && unresolved)).map(([story]) => story);
     if (!own && through.length === 0) return false;
     const before = JSON.stringify(index());
     if (own && event === "unlink") {
@@ -922,9 +935,9 @@ function forgeTest(options) {
       },
       transform(code, id) {
         if (!matches(id)) return void 0;
-        const title = autoTitle(id, root, options.stories);
-        const entries = indexFile(code, id, title);
-        if (entries.length === 0) return void 0;
+        const entries = indexFile(code, id, autoTitle(id, root, options.stories));
+        const title = entries[0]?.title;
+        if (title === void 0) return void 0;
         const q = (value) => JSON.stringify(value);
         const lines = [
           "",