@decocms/blocks-cli 7.1.1 → 7.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks-cli",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "type": "module",
   "description": "Deco codegen (generate-blocks, generate-schema, generate-invoke) and Fresh-to-TanStack migration tooling",
   "repository": {
@@ -34,7 +34,7 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.1.1",
+    "@decocms/blocks": "7.2.0",
     "ts-morph": "^27.0.0",
     "tsx": "^4.19.0"
   },

package/scripts/generate-invoke.test.ts

@@ -1,7 +1,7 @@
 /**
  * Integration test for scripts/generate-invoke.ts.
  *
- * The generator scans a `vtex/invoke.ts` file from @decocms/apps and emits a
+ * The generator scans an `invoke.ts` file from @decocms/apps-vtex and emits a
  * site-local `src/server/invoke.gen.ts` with top-level `createServerFn`
  * declarations. The piece we care most about locking is the Set-Cookie
  * bridge: every handler must call `forwardResponseCookies()` after the
@@ -81,20 +81,17 @@ describe("generate-invoke.ts — output shape", () => {
 
   beforeAll(() => {
     const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "gen-invoke-"));
-    appsDir = path.join(tmp, "apps");
+    // Mirrors @decocms/apps-vtex's actual layout post-migration: invoke.ts
+    // sits at the package root (no more vtex/ nesting — the old vtex/
+    // directory in apps-start IS this package's root now).
+    appsDir = path.join(tmp, "apps-vtex");
     siteDir = path.join(tmp, "site");
-    fs.mkdirSync(path.join(appsDir, "vtex", "actions"), { recursive: true });
+    fs.mkdirSync(path.join(appsDir, "actions"), { recursive: true });
     fs.mkdirSync(path.join(siteDir, "src", "server"), { recursive: true });
-    fs.writeFileSync(path.join(appsDir, "vtex", "invoke.ts"), FIXTURE_INVOKE_TS);
-    fs.writeFileSync(
-      path.join(appsDir, "vtex", "actions", "checkout.ts"),
-      FIXTURE_ACTIONS_CHECKOUT_TS,
-    );
-    fs.writeFileSync(
-      path.join(appsDir, "vtex", "actions", "session.ts"),
-      FIXTURE_ACTIONS_SESSION_TS,
-    );
-    fs.writeFileSync(path.join(appsDir, "vtex", "types.ts"), FIXTURE_TYPES_TS);
+    fs.writeFileSync(path.join(appsDir, "invoke.ts"), FIXTURE_INVOKE_TS);
+    fs.writeFileSync(path.join(appsDir, "actions", "checkout.ts"), FIXTURE_ACTIONS_CHECKOUT_TS);
+    fs.writeFileSync(path.join(appsDir, "actions", "session.ts"), FIXTURE_ACTIONS_SESSION_TS);
+    fs.writeFileSync(path.join(appsDir, "types.ts"), FIXTURE_TYPES_TS);
     outFile = path.join(siteDir, "src", "server", "invoke.gen.ts");
 
     const result = spawnSync(

package/scripts/generate-invoke.ts

@@ -1,11 +1,11 @@
 #!/usr/bin/env tsx
 /**
- * Scans @decocms/apps vtex/invoke.ts and generates a site-local invoke file
+ * Scans @decocms/apps-vtex's invoke.ts and generates a site-local invoke file
  * with top-level createServerFn declarations.
  *
  * TanStack Start's compiler only transforms createServerFn().handler() when
  * the call is at module top-level (assigned to a const). The factory pattern
- * used in @decocms/apps/vtex/invoke.ts causes the "fast path" in the compiler
+ * used in @decocms/apps-vtex/invoke.ts causes the "fast path" in the compiler
  * to skip the .handler() calls because they're inside a function body.
  *
  * This script generates an equivalent file where each server function is a
@@ -16,7 +16,7 @@
  *
  * Env / CLI:
  *   --out-file   override output (default: src/server/invoke.gen.ts)
- *   --apps-dir   override @decocms/apps location (default: auto-resolve from node_modules)
+ *   --apps-dir   override @decocms/apps-vtex location (default: auto-resolve from node_modules)
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -35,19 +35,23 @@ function resolveAppsDir(): string {
   const explicit = arg("apps-dir", "");
   if (explicit) return path.resolve(cwd, explicit);
 
-  // Try common locations
+  // Try common locations. Both point at the directory that contains
+  // invoke.ts directly at its root: the installed @decocms/apps-vtex
+  // package (no more vtex/ nesting — that directory IS the package root
+  // now), or a raw apps-start checkout's vtex/ subdirectory as a legacy
+  // fallback for anyone still developing against the pre-split monorepo.
   const candidates = [
-    path.resolve(cwd, "node_modules/@decocms/apps"),
-    path.resolve(cwd, "../apps-start"),
+    path.resolve(cwd, "node_modules/@decocms/apps-vtex"),
+    path.resolve(cwd, "../apps-start/vtex"),
   ];
   for (const c of candidates) {
-    if (fs.existsSync(path.join(c, "vtex/invoke.ts"))) return c;
+    if (fs.existsSync(path.join(c, "invoke.ts"))) return c;
   }
-  throw new Error("Could not find @decocms/apps. Use --apps-dir to specify its location.");
+  throw new Error("Could not find @decocms/apps-vtex. Use --apps-dir to specify its location.");
 }
 
 const appsDir = resolveAppsDir();
-const invokeFile = path.join(appsDir, "vtex/invoke.ts");
+const invokeFile = path.join(appsDir, "invoke.ts");
 
 if (!fs.existsSync(invokeFile)) {
   console.error(`invoke.ts not found at: ${invokeFile}`);
@@ -60,7 +64,7 @@ if (!fs.existsSync(invokeFile)) {
 
 interface ActionDef {
   name: string;
-  /** The import source for the action function (e.g., "@decocms/apps/vtex/actions/checkout") */
+  /** The import source for the action function (e.g., "@decocms/apps-vtex/actions/checkout") */
   importSource: string;
   /** The imported function name (e.g., "addItemsToCart") */
   importedFn: string;
@@ -85,7 +89,7 @@ for (const imp of sourceFile.getImportDeclarations()) {
     const localName = named.getName();
     const importedName = named.getAliasNode()?.getText() || localName;
     importMap.set(localName, {
-      source: source.startsWith("./") ? `@decocms/apps/vtex/${source.slice(2)}` : source,
+      source: source.startsWith("./") ? `@decocms/apps-vtex/${source.slice(2)}` : source,
       importedName: localName,
     });
   }
@@ -100,7 +104,7 @@ for (const imp of sourceFile.getImportDeclarations()) {
         const localName = named.getName();
         const source = imp.getModuleSpecifierValue();
         typeImportMap.set(localName, {
-          source: source.startsWith("./") ? `@decocms/apps/vtex/${source.slice(2)}` : source,
+          source: source.startsWith("./") ? `@decocms/apps-vtex/${source.slice(2)}` : source,
           importedName: localName,
         });
       }
@@ -111,7 +115,7 @@ for (const imp of sourceFile.getImportDeclarations()) {
     for (const named of imp.getNamedImports()) {
       const localName = named.getName();
       typeImportMap.set(localName, {
-        source: source.startsWith("./") ? `@decocms/apps/vtex/${source.slice(2)}` : source,
+        source: source.startsWith("./") ? `@decocms/apps-vtex/${source.slice(2)}` : source,
         importedName: localName,
       });
     }
@@ -376,7 +380,7 @@ for (const action of actions) {
 
   if (action.importedFn) {
     // Emit the wrapper body verbatim. The arrow function in
-    // @decocms/apps/vtex/invoke.ts is the contract that maps the external
+    // @decocms/apps-vtex/invoke.ts is the contract that maps the external
     // invoke shape (what storefront callers send) to the internal action
     // shape (what vtex/actions/* expects). Most wrappers are direct
     // pass-throughs (`actionFn(data)`) but some adapt the payload
@@ -450,7 +454,7 @@ for (const action of actions) {
 out += `} as const;
 
 // Re-export OrderForm type (commonly imported from invoke by site components)
-export type { OrderForm } from "@decocms/apps/vtex/types";
+export type { OrderForm } from "@decocms/apps-vtex/types";
 
 // ---------------------------------------------------------------------------
 // Default invoke object — import this if you don't need site extensions

package/scripts/generate-schema.ts

@@ -839,14 +839,22 @@ function generateMeta(): MetaResponse {
   }
 
   // ---------------------------------------------------------------------------
-  // App loaders pass: walk @decocms/apps/*/loaders/ directories and register
-  // each .ts file as a CMS loader. CMS keys are derived from the file path
-  // (e.g. "vtex/loaders/intelligentSearch/productList.ts").
+  // App loaders pass: walk each @decocms/apps-<namespace> package's src/loaders/
+  // directory and register each .ts file as a CMS loader. CMS keys are derived
+  // from the file path (e.g. "vtex/loaders/intelligentSearch/productList.ts") —
+  // this key format is a CMS decofile convention, independent of the npm
+  // package layout, so it stays "<namespace>/loaders/..." even though the
+  // namespace now maps to its own "@decocms/apps-<namespace>" package rather
+  // than a subdirectory of one monolithic "@decocms/apps" package.
   //
   // Only apps installed in src/apps/ are scanned. An app bridge file that
-  // re-exports from "@decocms/apps/{namespace}/mod" signals the namespace.
+  // re-exports from "@decocms/apps-{namespace}/mod" signals the namespace.
   // ---------------------------------------------------------------------------
-  const appsPkgDir = path.resolve(root, "node_modules/@decocms/apps");
+
+  /** Absolute path to the installed @decocms/apps-<namespace> package, if present. */
+  function getAppPkgDir(namespace: string): string {
+    return path.resolve(root, `node_modules/@decocms/apps-${namespace}`);
+  }
 
   /** Detect installed app namespaces from src/apps/ bridge files. */
   function detectInstalledAppNamespaces(): Set<string> {
@@ -855,7 +863,7 @@ function generateMeta(): MetaResponse {
     if (!fs.existsSync(siteAppsDir)) return namespaces;
 
     const appFiles = findTsxFiles(siteAppsDir);
-    const re = /["']@decocms\/apps\/([^/]+)\/mod["']/;
+    const re = /["']@decocms\/apps-([^/]+)\/mod["']/;
     for (const filePath of appFiles) {
       try {
         const content = fs.readFileSync(filePath, "utf-8");
@@ -869,13 +877,13 @@ function generateMeta(): MetaResponse {
   // Discover app loader files via filesystem walk (scoped to installed apps)
   function discoverAppLoaders(): Array<{ cmsKey: string; sourceFile: string; namespace: string }> {
     const result: Array<{ cmsKey: string; sourceFile: string; namespace: string }> = [];
-    if (!fs.existsSync(appsPkgDir)) return result;
 
     const installed = detectInstalledAppNamespaces();
     if (installed.size === 0) return result;
 
     for (const namespace of installed) {
-      const loadersDir = path.join(appsPkgDir, namespace, "loaders");
+      const pkgDir = getAppPkgDir(namespace);
+      const loadersDir = path.join(pkgDir, "src", "loaders");
       if (!fs.existsSync(loadersDir)) continue;
 
       const files = fs.readdirSync(loadersDir, { recursive: true }) as string[];
@@ -888,7 +896,9 @@ function generateMeta(): MetaResponse {
         if (rel.includes("__tests__") || rel.includes("__test__") || rel.endsWith(".test.ts")) continue;
 
         const cmsKey = `${namespace}/loaders/${rel.replace(/\\/g, "/")}`;
-        const sourceFile = `${namespace}/loaders/${rel.replace(/\\/g, "/")}`;
+        // Absolute — each namespace now resolves against its own package dir,
+        // not a single shared "appsPkgDir" (see absSourceFile below).
+        const sourceFile = path.join(loadersDir, rel);
         result.push({ cmsKey, sourceFile, namespace });
       }
     }
@@ -908,9 +918,9 @@ function generateMeta(): MetaResponse {
 
   const installedNs = detectInstalledAppNamespaces();
   console.log(`Installed app namespaces: ${[...installedNs].join(", ") || "(none)"}`);
-  console.log(`Scanning app loaders from @decocms/apps (${appLoaders.length} files)...`);
+  console.log(`Scanning app loaders from ${[...installedNs].map((ns) => `@decocms/apps-${ns}`).join(", ") || "(none)"} (${appLoaders.length} files)...`);
   for (const appLoader of appLoaders) {
-    const absSourceFile = path.resolve(appsPkgDir, appLoader.sourceFile);
+    const absSourceFile = appLoader.sourceFile;
 
     try {
       // Resolve the real path to de-duplicate re-exports pointing to the same file