@gradial/aci 0.1.36 → 0.1.37

package/dist/next/middleware.js

@@ -272,7 +272,7 @@ function normalizeRoutePath(value) {
     return pathname.replace(/\/{2,}/g, '/').replace(/\/$/, '') || '/';
 }
 export const aciMiddlewareMatcher = [
-    '/((?!_next(?:/|$)|api(?:/|$)|favicon\\.ico$|\\.gradial-dam(?:/|$)).*)',
+    '/((?!_next(?:/|$)|api(?:/|$)|favicon\\.ico$|\\.gradial-dam(?:/|$)|gradial/assets(?:/|$)).*)',
 ];
 export const config = {
     matcher: aciMiddlewareMatcher,

package/dist/testing/conformance/checks.js

@@ -319,7 +319,7 @@ export function checkMiddleware(ctx) {
     // the SDK's canonical value. Next.js requires config.matcher to be
     // statically analyzable, so importing the matcher from the SDK breaks the
     // build. Instead the template inlines the value and this check detects drift.
-    const canonicalMatcher = "['/((?!_next(?:/|$)|api(?:/|$)|favicon\\\\.ico$|\\\\.gradial-dam(?:/|$)).*)']";
+    const canonicalMatcher = "['/((?!_next(?:/|$)|api(?:/|$)|favicon\\\\.ico$|\\\\.gradial-dam(?:/|$)|gradial/assets(?:/|$)).*)']";
     // Check for actual import/usage of aciMiddlewareMatcher (not just a mention
     // in a comment). Look for `matcher: aciMiddlewareMatcher` or
     // `import { ... aciMiddlewareMatcher ... }`.

package/dist/testing/conformance/preset.js

@@ -56,7 +56,9 @@ function resolveChecks(input) {
 export function runConformanceChecks(options) {
     const ctx = {
         framework: options.framework,
-        siteId: options.siteId,
+        // 'env' mode carries no site identity in the repo; checks never compare
+        // against a value, so the context uses the empty string.
+        siteId: options.siteId ?? '',
         rootDir: options.rootDir || process.cwd(),
         siteIdMode: options.siteIdMode || 'literal',
     };
@@ -83,7 +85,9 @@ export function conformancePreset(options) {
     test('ACI conformance', async (t) => {
         const ctx = {
             framework: options.framework,
-            siteId: options.siteId,
+            // 'env' mode carries no site identity in the repo; checks never compare
+            // against a value, so the context uses the empty string.
+            siteId: options.siteId ?? '',
             rootDir: options.rootDir || process.cwd(),
             siteIdMode: options.siteIdMode || 'literal',
         };

package/dist/testing/conformance/types.d.ts

@@ -8,35 +8,48 @@
 export type ConformanceFramework = 'next' | 'astro';
 /** Individual check names that can be enabled/disabled. */
 export type ConformanceCheckName = 'config' | 'registry' | 'pageEntry' | 'middleware' | 'noFileContentProvider' | 'noCustomContent' | 'noLegacyAssetRoute' | 'buildSucceeds' | 'contentCompile' | 'sdkVersion';
-/** Options for the conformance preset. */
-export interface ConformancePresetOptions {
+/** Options common to both siteId modes. */
+export interface ConformancePresetCommonOptions {
     /** Framework the site uses. */
     framework: ConformanceFramework;
-    /** Expected siteId value (verified in config and middleware). */
-    siteId: string;
     /** Root directory of the site project. Defaults to process.cwd(). */
     rootDir?: string;
-    /**
-     * How the middleware is expected to obtain its siteId. Defaults to 'literal'.
-     *
-     * - 'literal': the middleware passes the canonical siteId as a string
-     *   literal (or `process.env.ACI_SITE_ID || '<canonical>'` / `??` with the
-     *   canonical literal as the default). This is what the template stamps for
-     *   single-tenant repos.
-     * - 'env': the middleware must read siteId ONLY from the environment —
-     *   exactly `siteId: process.env.ACI_SITE_ID`, with no literal default, no
-     *   `||`/`??` fallback, no other env var names, and no computed
-     *   expressions. Use this for tenant-agnostic repos deployed to multiple
-     *   sites (the platform owns tenant identity and injects ACI_SITE_ID per
-     *   deployment; a missing env produces a clean 500 at runtime).
-     */
-    siteIdMode?: 'literal' | 'env';
     /**
      * Which checks to run. Defaults to all checks.
      * Pass an array to run only those checks, or an object to enable/disable individually.
      */
     checks?: ConformanceCheckName[] | Partial<Record<ConformanceCheckName, boolean>>;
 }
+/**
+ * Options for the conformance preset.
+ *
+ * The siteId requirement is keyed off `siteIdMode` (defaults to 'literal'):
+ *
+ * - 'literal': `siteId` is REQUIRED — it is the tenant's canonical site id,
+ *   and the middleware must pass it as a string literal (or
+ *   `process.env.ACI_SITE_ID || '<canonical>'` / `??` with the canonical
+ *   literal as the default). This is what the template stamps for
+ *   single-tenant repos.
+ * - 'env': `siteId` is FORBIDDEN — tenant-agnostic repos deployed to
+ *   multiple sites have no site identity in the repo at all. The middleware
+ *   must read siteId ONLY from the environment — exactly
+ *   `siteId: process.env.ACI_SITE_ID`, with no literal default, no
+ *   `||`/`??` fallback, no other env var names, and no computed
+ *   expressions — and `.aci.yaml` must not pin a siteId. The platform owns
+ *   tenant identity and injects ACI_SITE_ID per deployment; a missing env
+ *   produces a clean 500 at runtime.
+ */
+export type ConformancePresetOptions = ConformancePresetCommonOptions & ({
+    /** See ConformancePresetOptions: 'literal' expects a canonical siteId in the repo. */
+    siteIdMode?: 'literal';
+    /** Expected canonical siteId value (verified in config and middleware). */
+    siteId: string;
+} | {
+    /** See ConformancePresetOptions: 'env' means the repo carries no site identity. */
+    siteIdMode: 'env';
+    /** Forbidden in env mode — the repo must not carry a site identity. */
+    siteId?: never;
+});
 /** Result of a single conformance check. */
 export interface ConformanceCheckResult {
     name: ConformanceCheckName;
@@ -55,6 +68,10 @@ export type ConformanceCheckFn = (ctx: ConformanceContext) => ConformanceCheckRe
 /** Context passed to each check function. */
 export interface ConformanceContext {
     framework: ConformanceFramework;
+    /**
+     * Canonical siteId in 'literal' mode; '' in 'env' mode (no site identity
+     * in the repo — env-mode checks never compare against a value).
+     */
     siteId: string;
     rootDir: string;
     /** See ConformancePresetOptions.siteIdMode. Defaults to 'literal'. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradial/aci",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -127,12 +127,12 @@
     "zod": "^4.0.0"
   },
   "optionalDependencies": {
-    "@gradial/aci-cli-darwin-arm64": "0.1.36",
-    "@gradial/aci-cli-darwin-x64": "0.1.36",
-    "@gradial/aci-cli-linux-arm64": "0.1.36",
-    "@gradial/aci-cli-linux-x64": "0.1.36",
-    "@gradial/aci-cli-win32-arm64": "0.1.36",
-    "@gradial/aci-cli-win32-x64": "0.1.36"
+    "@gradial/aci-cli-darwin-arm64": "0.1.37",
+    "@gradial/aci-cli-darwin-x64": "0.1.37",
+    "@gradial/aci-cli-linux-arm64": "0.1.37",
+    "@gradial/aci-cli-linux-x64": "0.1.37",
+    "@gradial/aci-cli-win32-arm64": "0.1.37",
+    "@gradial/aci-cli-win32-x64": "0.1.37"
   },
   "scripts": {
     "build": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.json",