@open-mercato/shared 0.4.11-develop.1916.be37b7bcbb → 0.4.11-develop.1917.b6098e78cb

package/dist/lib/bootstrap/appResolver.js

@@ -1,12 +1,27 @@
 import path from "node:path";
 import fs from "node:fs";
+const nextConfigNames = [
+  "next.config.ts",
+  "next.config.js",
+  "next.config.mjs"
+];
+function hasNextConfigFile(appDir) {
+  return nextConfigNames.some((configName) => {
+    const configPath = path.join(appDir, configName);
+    if (!fs.existsSync(configPath)) {
+      return false;
+    }
+    try {
+      return fs.statSync(configPath).isFile();
+    } catch {
+      return false;
+    }
+  });
+}
 function findAppRoot(startDir = process.cwd()) {
   let current = startDir;
-  while (current !== path.dirname(current)) {
-    const configTs = path.join(current, "next.config.ts");
-    const configJs = path.join(current, "next.config.js");
-    const configMjs = path.join(current, "next.config.mjs");
-    if (fs.existsSync(configTs) || fs.existsSync(configJs) || fs.existsSync(configMjs)) {
+  while (true) {
+    if (hasNextConfigFile(current)) {
       const mercatoDir = path.join(current, ".mercato");
       const generatedDir = path.join(mercatoDir, "generated");
       if (fs.existsSync(generatedDir)) {
@@ -14,7 +29,11 @@ function findAppRoot(startDir = process.cwd()) {
       }
       return { appDir: current, mercatoDir, generatedDir };
     }
-    current = path.dirname(current);
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
   }
   return null;
 }
@@ -26,8 +45,7 @@ function findAllApps(rootDir) {
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
     const appDir = path.join(appsDir, entry.name);
-    const hasNextConfig = fs.existsSync(path.join(appDir, "next.config.ts")) || fs.existsSync(path.join(appDir, "next.config.js")) || fs.existsSync(path.join(appDir, "next.config.mjs"));
-    if (!hasNextConfig) continue;
+    if (!hasNextConfigFile(appDir)) continue;
     const mercatoDir = path.join(appDir, ".mercato");
     const generatedDir = path.join(mercatoDir, "generated");
     if (fs.existsSync(generatedDir)) {

package/dist/lib/bootstrap/appResolver.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/bootstrap/appResolver.ts"],
-  "sourcesContent": ["import path from 'node:path'\nimport fs from 'node:fs'\n\nexport interface AppRoot {\n  appDir: string\n  mercatoDir: string\n  generatedDir: string\n}\n\n/**\n * Find the Next.js app root by searching for next.config.ts/js/mjs.\n *\n * Starts from the given directory (defaults to cwd) and walks up the\n * directory tree until it finds a Next.js config file with a .mercato/generated\n * directory.\n *\n * @param startDir - Directory to start searching from (defaults to process.cwd())\n * @returns The resolved app root paths, or null if not found\n */\nexport function findAppRoot(startDir: string = process.cwd()): AppRoot | null {\n  let current = startDir\n\n  while (current !== path.dirname(current)) {\n    const configTs = path.join(current, 'next.config.ts')\n    const configJs = path.join(current, 'next.config.js')\n    const configMjs = path.join(current, 'next.config.mjs')\n\n    if (fs.existsSync(configTs) || fs.existsSync(configJs) || fs.existsSync(configMjs)) {\n      const mercatoDir = path.join(current, '.mercato')\n      const generatedDir = path.join(mercatoDir, 'generated')\n\n      // Only return if .mercato/generated exists\n      if (fs.existsSync(generatedDir)) {\n        return { appDir: current, mercatoDir, generatedDir }\n      }\n\n      // Found Next.js config but no .mercato/generated - return anyway for generate command\n      // The caller can decide whether to create the directory\n      return { appDir: current, mercatoDir, generatedDir }\n    }\n\n    current = path.dirname(current)\n  }\n\n  return null\n}\n\n/**\n * Find all apps with .mercato directories in a monorepo.\n *\n * Scans the apps/ directory for Next.js apps with .mercato/generated directories.\n *\n * @param rootDir - The monorepo root directory\n * @returns Array of app root paths\n */\nexport function findAllApps(rootDir: string): AppRoot[] {\n  const appsDir = path.join(rootDir, 'apps')\n  if (!fs.existsSync(appsDir)) return []\n\n  const apps: AppRoot[] = []\n  const entries = fs.readdirSync(appsDir, { withFileTypes: true })\n\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue\n\n    const appDir = path.join(appsDir, entry.name)\n\n    // Check for Next.js config\n    const hasNextConfig =\n      fs.existsSync(path.join(appDir, 'next.config.ts')) ||\n      fs.existsSync(path.join(appDir, 'next.config.js')) ||\n      fs.existsSync(path.join(appDir, 'next.config.mjs'))\n\n    if (!hasNextConfig) continue\n\n    const mercatoDir = path.join(appDir, '.mercato')\n    const generatedDir = path.join(mercatoDir, 'generated')\n\n    if (fs.existsSync(generatedDir)) {\n      apps.push({ appDir, mercatoDir, generatedDir })\n    }\n  }\n\n  return apps\n}\n"],
-  "mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,QAAQ;AAkBR,SAAS,YAAY,WAAmB,QAAQ,IAAI,GAAmB;AAC5E,MAAI,UAAU;AAEd,SAAO,YAAY,KAAK,QAAQ,OAAO,GAAG;AACxC,UAAM,WAAW,KAAK,KAAK,SAAS,gBAAgB;AACpD,UAAM,WAAW,KAAK,KAAK,SAAS,gBAAgB;AACpD,UAAM,YAAY,KAAK,KAAK,SAAS,iBAAiB;AAEtD,QAAI,GAAG,WAAW,QAAQ,KAAK,GAAG,WAAW,QAAQ,KAAK,GAAG,WAAW,SAAS,GAAG;AAClF,YAAM,aAAa,KAAK,KAAK,SAAS,UAAU;AAChD,YAAM,eAAe,KAAK,KAAK,YAAY,WAAW;AAGtD,UAAI,GAAG,WAAW,YAAY,GAAG;AAC/B,eAAO,EAAE,QAAQ,SAAS,YAAY,aAAa;AAAA,MACrD;AAIA,aAAO,EAAE,QAAQ,SAAS,YAAY,aAAa;AAAA,IACrD;AAEA,cAAU,KAAK,QAAQ,OAAO;AAAA,EAChC;AAEA,SAAO;AACT;AAUO,SAAS,YAAY,SAA4B;AACtD,QAAM,UAAU,KAAK,KAAK,SAAS,MAAM;AACzC,MAAI,CAAC,GAAG,WAAW,OAAO,EAAG,QAAO,CAAC;AAErC,QAAM,OAAkB,CAAC;AACzB,QAAM,UAAU,GAAG,YAAY,SAAS,EAAE,eAAe,KAAK,CAAC;AAE/D,aAAW,SAAS,SAAS;AAC3B,QAAI,CAAC,MAAM,YAAY,EAAG;AAE1B,UAAM,SAAS,KAAK,KAAK,SAAS,MAAM,IAAI;AAG5C,UAAM,gBACJ,GAAG,WAAW,KAAK,KAAK,QAAQ,gBAAgB,CAAC,KACjD,GAAG,WAAW,KAAK,KAAK,QAAQ,gBAAgB,CAAC,KACjD,GAAG,WAAW,KAAK,KAAK,QAAQ,iBAAiB,CAAC;AAEpD,QAAI,CAAC,cAAe;AAEpB,UAAM,aAAa,KAAK,KAAK,QAAQ,UAAU;AAC/C,UAAM,eAAe,KAAK,KAAK,YAAY,WAAW;AAEtD,QAAI,GAAG,WAAW,YAAY,GAAG;AAC/B,WAAK,KAAK,EAAE,QAAQ,YAAY,aAAa,CAAC;AAAA,IAChD;AAAA,EACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import path from 'node:path'\nimport fs from 'node:fs'\n\nexport interface AppRoot {\n  appDir: string\n  mercatoDir: string\n  generatedDir: string\n}\n\nconst nextConfigNames = [\n  'next.config.ts',\n  'next.config.js',\n  'next.config.mjs',\n] as const\n\nfunction hasNextConfigFile(appDir: string): boolean {\n  return nextConfigNames.some((configName) => {\n    const configPath = path.join(appDir, configName)\n\n    if (!fs.existsSync(configPath)) {\n      return false\n    }\n\n    try {\n      return fs.statSync(configPath).isFile()\n    } catch {\n      return false\n    }\n  })\n}\n\n/**\n * Find the Next.js app root by searching for next.config.ts/js/mjs.\n *\n * Starts from the given directory (defaults to cwd) and walks up the\n * directory tree until it finds a Next.js config file with a .mercato/generated\n * directory.\n *\n * @param startDir - Directory to start searching from (defaults to process.cwd())\n * @returns The resolved app root paths, or null if not found\n */\nexport function findAppRoot(startDir: string = process.cwd()): AppRoot | null {\n  let current = startDir\n\n  while (true) {\n    if (hasNextConfigFile(current)) {\n      const mercatoDir = path.join(current, '.mercato')\n      const generatedDir = path.join(mercatoDir, 'generated')\n\n      // Only return if .mercato/generated exists\n      if (fs.existsSync(generatedDir)) {\n        return { appDir: current, mercatoDir, generatedDir }\n      }\n\n      // Found Next.js config but no .mercato/generated - return anyway for generate command\n      // The caller can decide whether to create the directory\n      return { appDir: current, mercatoDir, generatedDir }\n    }\n\n    const parent = path.dirname(current)\n    if (parent === current) {\n      break\n    }\n\n    current = parent\n  }\n\n  return null\n}\n\n/**\n * Find all apps with .mercato directories in a monorepo.\n *\n * Scans the apps/ directory for Next.js apps with .mercato/generated directories.\n *\n * @param rootDir - The monorepo root directory\n * @returns Array of app root paths\n */\nexport function findAllApps(rootDir: string): AppRoot[] {\n  const appsDir = path.join(rootDir, 'apps')\n  if (!fs.existsSync(appsDir)) return []\n\n  const apps: AppRoot[] = []\n  const entries = fs.readdirSync(appsDir, { withFileTypes: true })\n\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue\n\n    const appDir = path.join(appsDir, entry.name)\n\n    if (!hasNextConfigFile(appDir)) continue\n\n    const mercatoDir = path.join(appDir, '.mercato')\n    const generatedDir = path.join(mercatoDir, 'generated')\n\n    if (fs.existsSync(generatedDir)) {\n      apps.push({ appDir, mercatoDir, generatedDir })\n    }\n  }\n\n  return apps\n}\n"],
+  "mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,QAAQ;AAQf,MAAM,kBAAkB;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AACF;AAEA,SAAS,kBAAkB,QAAyB;AAClD,SAAO,gBAAgB,KAAK,CAAC,eAAe;AAC1C,UAAM,aAAa,KAAK,KAAK,QAAQ,UAAU;AAE/C,QAAI,CAAC,GAAG,WAAW,UAAU,GAAG;AAC9B,aAAO;AAAA,IACT;AAEA,QAAI;AACF,aAAO,GAAG,SAAS,UAAU,EAAE,OAAO;AAAA,IACxC,QAAQ;AACN,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AACH;AAYO,SAAS,YAAY,WAAmB,QAAQ,IAAI,GAAmB;AAC5E,MAAI,UAAU;AAEd,SAAO,MAAM;AACX,QAAI,kBAAkB,OAAO,GAAG;AAC9B,YAAM,aAAa,KAAK,KAAK,SAAS,UAAU;AAChD,YAAM,eAAe,KAAK,KAAK,YAAY,WAAW;AAGtD,UAAI,GAAG,WAAW,YAAY,GAAG;AAC/B,eAAO,EAAE,QAAQ,SAAS,YAAY,aAAa;AAAA,MACrD;AAIA,aAAO,EAAE,QAAQ,SAAS,YAAY,aAAa;AAAA,IACrD;AAEA,UAAM,SAAS,KAAK,QAAQ,OAAO;AACnC,QAAI,WAAW,SAAS;AACtB;AAAA,IACF;AAEA,cAAU;AAAA,EACZ;AAEA,SAAO;AACT;AAUO,SAAS,YAAY,SAA4B;AACtD,QAAM,UAAU,KAAK,KAAK,SAAS,MAAM;AACzC,MAAI,CAAC,GAAG,WAAW,OAAO,EAAG,QAAO,CAAC;AAErC,QAAM,OAAkB,CAAC;AACzB,QAAM,UAAU,GAAG,YAAY,SAAS,EAAE,eAAe,KAAK,CAAC;AAE/D,aAAW,SAAS,SAAS;AAC3B,QAAI,CAAC,MAAM,YAAY,EAAG;AAE1B,UAAM,SAAS,KAAK,KAAK,SAAS,MAAM,IAAI;AAE5C,QAAI,CAAC,kBAAkB,MAAM,EAAG;AAEhC,UAAM,aAAa,KAAK,KAAK,QAAQ,UAAU;AAC/C,UAAM,eAAe,KAAK,KAAK,YAAY,WAAW;AAEtD,QAAI,GAAG,WAAW,YAAY,GAAG;AAC/B,WAAK,KAAK,EAAE,QAAQ,YAAY,aAAa,CAAC;AAAA,IAChD;AAAA,EACF;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.4.11-develop.1916.be37b7bcbb";
+const APP_VERSION = "0.4.11-develop.1917.b6098e78cb";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.4.11-develop.1916.be37b7bcbb'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.4.11-develop.1917.b6098e78cb'\nexport const appVersion = APP_VERSION\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.4.11-develop.1916.be37b7bcbb",
+  "version": "0.4.11-develop.1917.b6098e78cb",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {

package/src/lib/bootstrap/__tests__/appResolver.test.ts

@@ -21,6 +21,17 @@ function createApp(rootDir: string, relativeAppDir: string, configName: NextConf
   return { appDir, mercatoDir, generatedDir }
 }
 
+function createInvalidConfigDirectory(rootDir: string, relativeAppDir: string, configName: NextConfigName): AppRoot {
+  const appDir = path.join(rootDir, relativeAppDir)
+  const mercatoDir = path.join(appDir, '.mercato')
+  const generatedDir = path.join(mercatoDir, 'generated')
+
+  fs.mkdirSync(path.join(appDir, configName), { recursive: true })
+  fs.mkdirSync(generatedDir, { recursive: true })
+
+  return { appDir, mercatoDir, generatedDir }
+}
+
 describe('appResolver', () => {
   let tempDir: string
 
@@ -61,6 +72,16 @@ describe('appResolver', () => {
       expect(findAppRoot(nestedDir)).toEqual(innerApp)
     })
 
+    it('ignores directories masquerading as Next.js config files', () => {
+      const outerApp = createApp(tempDir, 'apps/outer', 'next.config.ts')
+      const invalidInnerApp = createInvalidConfigDirectory(outerApp.appDir, 'examples/inner', 'next.config.js')
+      const nestedDir = path.join(invalidInnerApp.appDir, 'src')
+
+      fs.mkdirSync(nestedDir, { recursive: true })
+
+      expect(findAppRoot(nestedDir)).toEqual(outerApp)
+    })
+
     it('returns null when no Next.js app can be found', () => {
       const nestedDir = path.join(tempDir, 'packages', 'shared', 'src')
 
@@ -80,6 +101,9 @@ describe('appResolver', () => {
       createApp(tempDir, 'apps/docs', 'next.config.js')
       createApp(tempDir, 'apps/admin', 'next.config.mjs')
       createApp(tempDir, 'apps/incomplete', 'next.config.ts', false)
+      createInvalidConfigDirectory(tempDir, 'apps/not-really-an-app', 'next.config.ts')
+
+      fs.mkdirSync(path.join(tempDir, 'apps', 'folder-without-next-config'), { recursive: true })
 
       fs.writeFileSync(path.join(tempDir, 'apps', 'README.md'), 'not an app')
 

package/src/lib/bootstrap/appResolver.ts

@@ -7,6 +7,28 @@ export interface AppRoot {
   generatedDir: string
 }
 
+const nextConfigNames = [
+  'next.config.ts',
+  'next.config.js',
+  'next.config.mjs',
+] as const
+
+function hasNextConfigFile(appDir: string): boolean {
+  return nextConfigNames.some((configName) => {
+    const configPath = path.join(appDir, configName)
+
+    if (!fs.existsSync(configPath)) {
+      return false
+    }
+
+    try {
+      return fs.statSync(configPath).isFile()
+    } catch {
+      return false
+    }
+  })
+}
+
 /**
  * Find the Next.js app root by searching for next.config.ts/js/mjs.
  *
@@ -20,12 +42,8 @@ export interface AppRoot {
 export function findAppRoot(startDir: string = process.cwd()): AppRoot | null {
   let current = startDir
 
-  while (current !== path.dirname(current)) {
-    const configTs = path.join(current, 'next.config.ts')
-    const configJs = path.join(current, 'next.config.js')
-    const configMjs = path.join(current, 'next.config.mjs')
-
-    if (fs.existsSync(configTs) || fs.existsSync(configJs) || fs.existsSync(configMjs)) {
+  while (true) {
+    if (hasNextConfigFile(current)) {
       const mercatoDir = path.join(current, '.mercato')
       const generatedDir = path.join(mercatoDir, 'generated')
 
@@ -39,7 +57,12 @@ export function findAppRoot(startDir: string = process.cwd()): AppRoot | null {
       return { appDir: current, mercatoDir, generatedDir }
     }
 
-    current = path.dirname(current)
+    const parent = path.dirname(current)
+    if (parent === current) {
+      break
+    }
+
+    current = parent
   }
 
   return null
@@ -65,13 +88,7 @@ export function findAllApps(rootDir: string): AppRoot[] {
 
     const appDir = path.join(appsDir, entry.name)
 
-    // Check for Next.js config
-    const hasNextConfig =
-      fs.existsSync(path.join(appDir, 'next.config.ts')) ||
-      fs.existsSync(path.join(appDir, 'next.config.js')) ||
-      fs.existsSync(path.join(appDir, 'next.config.mjs'))
-
-    if (!hasNextConfig) continue
+    if (!hasNextConfigFile(appDir)) continue
 
     const mercatoDir = path.join(appDir, '.mercato')
     const generatedDir = path.join(mercatoDir, 'generated')