@diagonal-hq/cli 0.4.0 → 0.4.1

package/dist/cli.mjs

@@ -266849,15 +266849,18 @@ function isTypeOnlyStatement(statement2) {
   if (statement2.type === "TSTypeAliasDeclaration" || statement2.type === "TSInterfaceDeclaration") {
     return true;
   }
+  if (statement2.type === "ExportAllDeclaration") {
+    return statement2.exportKind === "type";
+  }
   if (statement2.type !== "ExportNamedDeclaration") {
     return false;
   }
   if (statement2.exportKind === "type") {
     return true;
   }
-  return statement2.declaration?.type === "TSTypeAliasDeclaration" || statement2.declaration?.type === "TSInterfaceDeclaration";
+  return statement2.declaration?.type === "TSTypeAliasDeclaration" || statement2.declaration?.type === "TSInterfaceDeclaration" || statement2.specifiers.length > 0 && statement2.specifiers.every((specifier) => specifier.exportKind === "type");
 }
-function defaultExportOf(ast, { allowHelpers = false, allowAppImports = false, extraImports = [] } = {}) {
+function defaultExportOf(ast, { helpers: helperPlacement = "none", allowAppImports = false, extraImports = [] } = {}) {
   const imports = [];
   const helpers = [];
   let declaration = null;
@@ -266889,12 +266892,18 @@ function defaultExportOf(ast, { allowHelpers = false, allowAppImports = false, e
       declaration = statement2.declaration;
       continue;
     }
-    if (allowHelpers && declaration === null) {
+    if (allowAppImports && (statement2.type === "ExportNamedDeclaration" || statement2.type === "ExportAllDeclaration")) {
+      throw new SourceError(
+        "Named exports are not allowed in a page, layout, or component file. Remove export or move the code to a lib/ module",
+        statement2
+      );
+    }
+    if (helperPlacement === "anywhere" || helperPlacement === "above" && declaration === null) {
       helpers.push(statement2);
       continue;
     }
     throw new SourceError(
-      allowHelpers ? `Top-level ${statement2.type} after the default export is not allowed. Move it above the export` : `Top-level ${statement2.type} is not allowed. Put the code inside the exported function`,
+      helperPlacement === "above" ? `Top-level ${statement2.type} after the default export is not allowed. Move it above the export` : `Top-level ${statement2.type} is not allowed. Put the code inside the exported function`,
       statement2
     );
   }
@@ -295012,11 +295021,14 @@ function customComponentCatalog(components) {
   }));
 }
 function mapPosition(unit, line, column) {
-  const { prefixLine, prefixColumn, prefixLength } = unit.lint;
-  if (line !== prefixLine || column < prefixColumn) {
-    return { line, column };
+  const { prefixLine, prefixColumn, prefixLength, suffixLine, suffixColumn, suffixLength } = unit.lint;
+  if (line === prefixLine && column >= prefixColumn) {
+    column = Math.max(prefixColumn, column - prefixLength);
+  }
+  if (line === suffixLine && column >= suffixColumn) {
+    column = Math.max(suffixColumn, column - suffixLength);
   }
-  return { line, column: Math.max(prefixColumn, column - prefixLength) };
+  return { line, column };
 }
 function failureEntries(failure2) {
   const entries = [];
@@ -298355,6 +298367,7 @@ function compile(code2, functionNode) {
   }
 }
 var FACTORY_PREFIX = "return (";
+var FACTORY_SUFFIX = ");";
 var SDK_TYPE_DECLARATIONS = {
   LayoutProps: "{ children?: React.ReactNode }"
 };
@@ -298375,16 +298388,18 @@ function keptTypeRange(statement2, helpers) {
   return null;
 }
 var LAZY_IMPORT = "__lazy(";
-function lintUnit2(original, ast, functionNode, helpers, app) {
+function lintUnit2(original, ast, functionNode, helpers, app, functionBinding) {
   let source = original;
   for (const lazy of app.lazy) {
     source = source.slice(0, lazy.start) + LAZY_IMPORT + source.slice(lazy.start + LAZY_IMPORT.length);
   }
-  let kept = blankOut(source.slice(0, functionNode.start));
-  const ranges = ast.program.body.map((statement2) => keptTypeRange(statement2, helpers)).filter((range) => range !== null && range[1] <= functionNode.start);
+  let kept = blankOut(source);
+  const ranges = ast.program.body.map((statement2) => keptTypeRange(statement2, helpers)).filter((range) => range !== null);
   for (const [start, end] of ranges) {
     kept = kept.slice(0, start) + source.slice(start, end) + kept.slice(end);
   }
+  const trailing = kept.slice(functionNode.end);
+  kept = kept.slice(0, functionNode.start);
   for (const binding of app.bindings.toSorted((left, right) => right.start - left.start)) {
     const replaced = `${binding.text}${"\n".repeat(newlines(binding.original))}`;
     kept = kept.slice(0, binding.start) + replaced + kept.slice(binding.end);
@@ -298394,10 +298409,12 @@ function lintUnit2(original, ast, functionNode, helpers, app) {
   );
   const code2 = [
     kept,
-    FACTORY_PREFIX,
+    functionBinding === null ? FACTORY_PREFIX : "",
     sliceOf(source, functionNode),
-    ");",
-    blankOut(source.slice(functionNode.end)),
+    functionBinding === null ? FACTORY_SUFFIX : "",
+    trailing,
+    functionBinding === null ? "" : `
+return ${functionBinding};`,
     ...importedTypes.map((declaration) => `
 ${declaration}`),
     lazyDeclaration(app.lazy)
@@ -298406,7 +298423,10 @@ ${declaration}`),
     code: code2,
     prefixLine: functionNode.loc.start.line,
     prefixColumn: functionNode.loc.start.column + 1,
-    prefixLength: FACTORY_PREFIX.length,
+    prefixLength: functionBinding === null ? FACTORY_PREFIX.length : 0,
+    suffixLine: functionNode.loc.end.line,
+    suffixColumn: functionNode.loc.end.column + 1,
+    suffixLength: functionBinding === null ? FACTORY_SUFFIX.length : 0,
     appModules: Object.fromEntries([...app.modules].map(([path, module]) => [path, module.source]))
   };
 }
@@ -298511,7 +298531,11 @@ function functionUnit(source, ast, functionNode, helpers, app) {
 `).join("");
   const prelude = helpers.map((statement2) => `${sliceOf(source, statement2)}
 `).join("");
-  const code2 = `${app.prelude}${bindings}${prelude}${FACTORY_PREFIX}${sliceOf(source, functionNode)});`;
+  const functionBinding = functionNode.type === "FunctionDeclaration" ? functionNode.id?.name ?? null : null;
+  const functionSource = sliceOf(source, functionNode);
+  const returned = functionBinding === null ? `${FACTORY_PREFIX}${functionSource}${FACTORY_SUFFIX}` : `${functionSource}
+return ${functionBinding};`;
+  const code2 = `${app.prelude}${bindings}${prelude}${returned}`;
   const moduleReferences = [...app.modules].flatMap(
     ([path, module]) => customComponentReferences(parseSource(module.source, { jsx: path.endsWith("x") }).program).map(
       (reference) => ({ name: reference.name, node: null })
@@ -298527,15 +298551,18 @@ function functionUnit(source, ast, functionNode, helpers, app) {
       ...moduleReferences,
       ...[functionNode, ...helpers].flatMap((node) => customComponentReferences(node)).toSorted((left, right) => left.node.start - right.node.start)
     ],
-    lint: lintUnit2(source, ast, functionNode, helpers, app)
+    lint: lintUnit2(source, ast, functionNode, helpers, app, functionBinding)
   };
 }
 function exportedFunction(ast, kind) {
-  const { declaration } = defaultExportOf(ast, { allowAppImports: true });
+  const { declaration, helpers } = defaultExportOf(ast, {
+    helpers: "anywhere",
+    allowAppImports: true
+  });
   if (!isFunctionNode(declaration)) {
     throw new SourceError(`A ${kind} file must export default a function`, declaration);
   }
-  return declaration;
+  return { functionNode: declaration, helpers };
 }
 function buildComponent(path, name, source, ast, root = null) {
   if (!COMPONENT_NAME_PATTERN.test(name)) {
@@ -298544,19 +298571,19 @@ function buildComponent(path, name, source, ast, root = null) {
       ast.program
     );
   }
-  const functionNode = exportedFunction(ast, "component");
+  const { functionNode, helpers } = exportedFunction(ast, "component");
   return {
     path,
     name,
-    ...functionUnit(source, ast, functionNode, [], appImports(root, path, source, ast))
+    ...functionUnit(source, ast, functionNode, helpers, appImports(root, path, source, ast))
   };
 }
 function buildLayout(path, name, source, ast, root = null) {
-  const functionNode = exportedFunction(ast, "layout");
+  const { functionNode, helpers } = exportedFunction(ast, "layout");
   return {
     path,
     name,
-    ...functionUnit(source, ast, functionNode, [], appImports(root, path, source, ast))
+    ...functionUnit(source, ast, functionNode, helpers, appImports(root, path, source, ast))
   };
 }
 function normalizeRoute(route) {
@@ -298684,7 +298711,7 @@ function pageParams(meta, nodes, route) {
 }
 function buildPage(path, source, ast, root = null, resources = null) {
   const { declaration, helpers } = defaultExportOf(ast, {
-    allowHelpers: true,
+    helpers: "above",
     allowAppImports: true
   });
   const [metaNode, functionNode] = expectDefineCall(declaration, "definePage", 2);
@@ -300764,9 +300791,9 @@ function componentClosure(start, componentsByName) {
   }
   return [...closure].toSorted((left, right) => left.localeCompare(right));
 }
-function reportUnknownComponents(unit, componentsByName, diagnostics) {
+function reportUnknownComponents(unit, componentsByName, failedComponents, diagnostics) {
   for (const reference of unit.references) {
-    if (!componentsByName.has(reference.name)) {
+    if (!componentsByName.has(reference.name) && !failedComponents.has(reference.name)) {
       diagnostics.push(
         diagnosticAt(
           unit.path,
@@ -300889,6 +300916,8 @@ function buildWorkspace(root, { writeGeneratedResources = false } = {}) {
   );
   syncGeneratedResources(root, names2, writeGeneratedResources, diagnostics);
   const uiEntries = [];
+  const failedLayouts = /* @__PURE__ */ new Set();
+  const failedComponents = /* @__PURE__ */ new Set();
   for (const path of files) {
     const kind = classify(path);
     if (kind === "ignored") {
@@ -300952,6 +300981,11 @@ function buildWorkspace(root, { writeGeneratedResources = false } = {}) {
       }
     } catch (error) {
       diagnostics.push(diagnosticFromError(path, error));
+      if (kind === "layout") {
+        failedLayouts.add(stem(path));
+      } else if (kind === "component") {
+        failedComponents.add(stem(path));
+      }
     }
   }
   if (output.config === null && !diagnostics.some((diagnostic2) => diagnostic2.path === CONFIG_PATH)) {
@@ -301002,11 +301036,13 @@ function buildWorkspace(root, { writeGeneratedResources = false } = {}) {
   );
   const layoutsByName = new Map(output.layouts.map((layout) => [layout.name, layout]));
   for (const unit of [...output.components, ...output.layouts, ...output.pages]) {
-    reportUnknownComponents(unit, componentsByName, diagnostics);
+    reportUnknownComponents(unit, componentsByName, failedComponents, diagnostics);
   }
   if (resourcesComplete) {
     lintUnits(
-      [...output.components, ...output.layouts, ...output.pages],
+      [...output.components, ...output.layouts, ...output.pages].filter(
+        (unit) => !unit.references.some((reference) => failedComponents.has(reference.name))
+      ),
       output.resources,
       output.components,
       diagnostics
@@ -301027,7 +301063,7 @@ function buildWorkspace(root, { writeGeneratedResources = false } = {}) {
       const names3 = references.map((reference) => reference.name);
       if (page.layout !== null) {
         const layout = layoutsByName.get(page.layout);
-        if (layout === void 0) {
+        if (layout === void 0 && !failedLayouts.has(page.layout)) {
           diagnostics.push(
             diagnosticAt(
               page.path,
@@ -301035,7 +301071,7 @@ function buildWorkspace(root, { writeGeneratedResources = false } = {}) {
               `Unknown layout "${page.layout}". Add layouts/${page.layout}.tsx`
             )
           );
-        } else {
+        } else if (layout !== void 0) {
           names3.push(...layout.references.map((reference) => reference.name));
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diagonal-hq/cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "The diagonal CLI and the configuration helpers for file-based Diagonal workspaces.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {