@diagonal-hq/cli 0.4.2 → 0.5.0

package/dist/cli.mjs

@@ -263670,7 +263670,7 @@ function getParserClass(pluginsMap) {
 init_define_globalThis_DIAGONAL_SDK_RUNTIME();
 import { existsSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { builtinModules } from "node:module";
-import { basename, dirname, join, posix } from "node:path";
+import { basename, dirname, join, posix, relative } from "node:path";
 var APP_PREFIX = "@app/";
 var AUTHORING_MODULE = "@diagonal-hq/cli";
 var PAGES_SDK_MODULE = "@diagonal/pages";
@@ -263687,22 +263687,55 @@ var HOST_MODULES = /* @__PURE__ */ new Set([
   AUTHORING_MODULE
 ]);
 var SOURCE_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx"];
-var ASSET_TYPES = {
-  ".avif": "image/avif",
-  ".gif": "image/gif",
-  ".ico": "image/x-icon",
-  ".jpeg": "image/jpeg",
-  ".jpg": "image/jpeg",
-  ".mp4": "video/mp4",
-  ".otf": "font/otf",
-  ".png": "image/png",
-  ".svg": "image/svg+xml",
-  ".ttf": "font/ttf",
-  ".webm": "video/webm",
-  ".webp": "image/webp",
-  ".woff": "font/woff",
-  ".woff2": "font/woff2"
-};
+var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".apng",
+  ".avif",
+  ".bmp",
+  ".gif",
+  ".heic",
+  ".heif",
+  ".ico",
+  ".jpeg",
+  ".jpg",
+  ".jxl",
+  ".png",
+  ".svg",
+  ".svgz",
+  ".tif",
+  ".tiff",
+  ".webp",
+  ".cur",
+  ".m4v",
+  ".mov",
+  ".mp4",
+  ".mpeg",
+  ".mpg",
+  ".ogv",
+  ".webm",
+  ".aac",
+  ".flac",
+  ".m4a",
+  ".mp3",
+  ".oga",
+  ".ogg",
+  ".opus",
+  ".wav",
+  ".weba",
+  ".pdf",
+  ".eot",
+  ".otf",
+  ".ttf",
+  ".woff",
+  ".woff2"
+]);
+var BINARY_FILE_MESSAGE = "Binary files cannot be in the repository. Add it as an Application Asset and use Assets.<key>. For an icon, use Sdk.Icon or an SVG written as a TSX component";
+function binaryCssUrlMessage(value) {
+  return `url("${value}") names a file in the repository. Binary files cannot be in the repository. Add it as an Application Asset and use url(asset:<key>)`;
+}
+function binaryCssImportMessage(value) {
+  const request2 = value.split(/[?#]/)[0];
+  return BINARY_EXTENSIONS.has(posix.extname(request2).toLowerCase()) ? `"${value}" is a binary file. Binary files cannot be in the repository. Add it as an Application Asset and use url(asset:<key>)` : null;
+}
 var NODE_MODULES = new Set(builtinModules.flatMap((name) => [name, `node:${name}`]));
 var SERVER_PACKAGES = /* @__PURE__ */ new Set(["@diagonal/workflow", "@diagonal/workflow/workspace"]);
 function importKind(specifier) {
@@ -263729,10 +263762,12 @@ function importKind(specifier) {
   if (bare.endsWith(".css")) {
     return "style";
   }
-  return Object.hasOwn(ASSET_TYPES, posix.extname(bare).toLowerCase()) ? "asset" : "app";
+  return BINARY_EXTENSIONS.has(posix.extname(bare).toLowerCase()) ? "binary" : "app";
 }
 function unsupportedImportMessage(specifier, kind) {
   switch (kind) {
+    case "binary":
+      return `"${specifier}" is a binary file. ${BINARY_FILE_MESSAGE}`;
     case "node":
       return `"${specifier}" is a Node.js module. Pages run in the browser, so they cannot import it`;
     case "server":
@@ -263811,6 +263846,18 @@ function checkoutFile(root, path) {
   const realFile = realpathSync(file2);
   return realFile.startsWith(`${realRoot}/`) ? file2 : null;
 }
+function isExternalCssUrl(value) {
+  return /^(asset:|data:|https?:|#)/i.test(value);
+}
+function resolveCssReference(root, importerPath, value) {
+  const request2 = value.split(/[?#]/)[0];
+  if (posix.isAbsolute(request2)) {
+    return null;
+  }
+  const path = posix.normalize(posix.join(posix.dirname(importerPath), request2));
+  const file2 = checkoutFile(root, path);
+  return file2 !== null && isExactFile(file2) ? relative(realpathSync(root), realpathSync(file2)).split("\\").join("/") : null;
+}
 function assetUrlKey(value) {
   return /^asset:/i.test(value) ? value.slice(6) : null;
 }
@@ -263820,6 +263867,7 @@ function cssReferences(source) {
   const functions = [];
   let offset = 0;
   let importing = false;
+  let composing = false;
   let nextNewline = source.indexOf("\n");
   let line = 1;
   let lineStart = 0;
@@ -263875,6 +263923,15 @@ function cssReferences(source) {
     if (identifier4 !== null) {
       offset += identifier4[0].length;
       const name = identifier4[0].toLowerCase();
+      if (name === "composes" || name === "composes-with") {
+        skipSpace();
+        composing = source[offset] === ":";
+      } else if (composing && name === "from") {
+        importing = true;
+        composing = false;
+      } else if (importing && name !== "url") {
+        importing = false;
+      }
       if (source[offset] === "(") {
         offset++;
         if (name === "url") {
@@ -263896,6 +263953,7 @@ function cssReferences(source) {
       functions.pop();
     } else if (char === ";" || char === "{" || char === "}") {
       importing = false;
+      composing = false;
     }
     offset++;
   }
@@ -263958,7 +264016,7 @@ function defaultExportOf(ast, { helpers: helperPlacement = "none", allowAppImpor
       const specifier = statement2.source.value;
       const kind = importKind(specifier);
       const refused = unsupportedImportMessage(specifier, kind);
-      if (allowAppImports && refused !== null) {
+      if (allowAppImports && statement2.importKind !== "type" && refused !== null) {
         throw new SourceError(refused, statement2.source);
       }
       if (!isAuthoringModule(specifier) && !allowAppImports && !extraImports.includes(specifier)) {
@@ -267449,7 +267507,7 @@ function checkCapabilities(resources, platformSlugs, diagnostics) {
 // scripts/lib/runtime-build/module-graph.mjs
 init_define_globalThis_DIAGONAL_SDK_RUNTIME();
 import { readFileSync } from "node:fs";
-import { posix as posix2, join as join2, relative } from "node:path";
+import { posix as posix2, join as join2 } from "node:path";
 
 // scripts/lib/runtime-build/page-build-protocol.mjs
 init_define_globalThis_DIAGONAL_SDK_RUNTIME();
@@ -267461,14 +267519,15 @@ function sha256(value) {
 }
 
 // scripts/lib/runtime-build/module-graph.mjs
-var STYLE_KINDS = /* @__PURE__ */ new Set(["style", "style_module", "asset"]);
+var STYLE_KINDS = /* @__PURE__ */ new Set(["style", "style_module"]);
 function resolveFileSpecifier(root, from, specifier) {
   const request2 = specifier.startsWith(APP_PREFIX) ? specifier.slice(APP_PREFIX.length) : posix2.join(posix2.dirname(from), specifier);
   const path = posix2.normalize(request2);
   if (path.startsWith("../") || path === ".." || path.startsWith("/")) {
     return null;
   }
-  return isExactFile(join2(root, path)) ? path : null;
+  const file2 = checkoutFile(root, path);
+  return file2 !== null && isExactFile(file2) ? path : null;
 }
 function declaredPackages(manifest) {
   return /* @__PURE__ */ new Set([...Object.keys(manifest?.dependencies ?? {}), ...Object.keys(manifest?.peerDependencies ?? {})]);
@@ -267566,9 +267625,7 @@ function buildModuleGraph(root, entries, manifest, diagnostics, assetKeys = /* @
     }
     const kind = importKind(`./${posix2.basename(path)}`);
     if (STYLE_KINDS.has(kind)) {
-      if (kind !== "asset") {
-        checkStylesheet(root, path, assetKeys, diagnostics, scannedStyles);
-      }
+      checkStylesheet(root, path, assetKeys, diagnostics, scannedStyles);
       modules[path] = { kind, source_sha256: sha256(readFileSync(join2(root, path))), imports: [] };
       continue;
     }
@@ -267726,14 +267783,12 @@ function checkStylesheet(root, path, assetKeys, diagnostics, scanned) {
   }
   scanned.add(path);
   const { urls, imports } = cssReferences(readFileSync(join2(root, path), "utf8"));
-  if (assetKeys !== null) {
-    for (const url of urls) {
-      const key = assetUrlKey(url.value);
-      if (key !== null && !assetKeys.has(key)) {
-        diagnostics.push(
-          diagnostic(path, url.line, url.column, `Unknown asset "${key}". Add it to assets.ts`)
-        );
-      }
+  for (const url of urls) {
+    const key = assetUrlKey(url.value);
+    if (key !== null && assetKeys !== null && !assetKeys.has(key)) {
+      diagnostics.push(diagnostic(path, url.line, url.column, `Unknown asset "${key}". Add it to assets.ts`));
+    } else if (!isExternalCssUrl(url.value)) {
+      diagnostics.push(diagnostic(path, url.line, url.column, binaryCssUrlMessage(url.value)));
     }
   }
   for (const target of imports) {
@@ -267743,22 +267798,20 @@ function checkStylesheet(root, path, assetKeys, diagnostics, scanned) {
       );
       continue;
     }
-    if (/^(?:[a-z][a-z0-9+.-]*:|[\/#])/i.test(target.value)) {
+    if (isExternalCssUrl(target.value)) {
       continue;
     }
-    const file2 = checkoutFile(
-      root,
-      posix2.normalize(posix2.join(posix2.dirname(path), target.value.split(/[?#]/)[0]))
-    );
-    if (file2 !== null && isExactFile(file2)) {
-      checkStylesheet(
-        root,
-        relative(root, file2).split("\\").join("/"),
-        assetKeys,
-        diagnostics,
-        scanned
-      );
+    const binary = binaryCssImportMessage(target.value);
+    if (binary !== null) {
+      diagnostics.push(diagnostic(path, target.line, target.column, binary));
+      continue;
+    }
+    const resolved = resolveCssReference(root, path, target.value);
+    if (resolved === null) {
+      diagnostics.push(diagnostic(path, target.line, target.column, `Cannot find "${target.value}" from ${path}`));
+      continue;
     }
+    checkStylesheet(root, resolved, assetKeys, diagnostics, scanned);
   }
 }
 
@@ -298359,7 +298412,7 @@ var defineEmailLayout = (layout) => layout;
 
 // scripts/lib/runtime-build/app-modules.mjs
 var APP_IMPORT = "__appImport";
-var PRELUDE_SKIPPED_KINDS = /* @__PURE__ */ new Set(["host", "package", "style", "style_module", "asset"]);
+var PRELUDE_SKIPPED_KINDS = /* @__PURE__ */ new Set(["host", "package", "style", "style_module", "binary"]);
 var AUTHORING_HELPERS_SOURCE = objectLiteral(cli_exports);
 var AUTHORING_HELPERS_MODULE = Object.entries(cli_exports).map(([name, value]) => `export const ${name} = ${helperSource(value)};
 `).join("");
@@ -298732,7 +298785,7 @@ function foreignBindingText(statement2) {
       }
       continue;
     }
-    const placeholder2 = kind === "asset" ? `const ${local}: string = '';` : kind === "style_module" ? `const ${local}: Record<string, string> = {};` : `const ${local}: any = undefined;`;
+    const placeholder2 = kind === "style_module" ? `const ${local}: Record<string, string> = {};` : `const ${local}: any = undefined;`;
     statements2.push(placeholder2);
   }
   return statements2.join(" ");
@@ -300977,7 +301030,7 @@ function defineResourceArgument(ast) {
 }
 function isUnitSupportFile(path) {
   const extension = extname2(path).toLowerCase();
-  return extension === ".ts" || extension === ".css" || Object.hasOwn(ASSET_TYPES, extension);
+  return extension === ".ts" || extension === ".css";
 }
 function classify(path) {
   if (path === "assets.ts") {
@@ -301175,7 +301228,7 @@ function buildWorkspace(root, { assetCatalog = null, writeGeneratedResources = f
     }
     if (kind === "unknown") {
       diagnostics.push(
-        diagnosticAt(path, null, "The build does not know this file. Move or rename it")
+        diagnosticAt(path, null, BINARY_EXTENSIONS.has(extname2(path).toLowerCase()) ? BINARY_FILE_MESSAGE : "The build does not know this file. Move or rename it")
       );
       continue;
     }

package/package.json

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