everything-dev 1.12.4 → 1.14.0

package/src/cli/init.ts

@@ -5,6 +5,7 @@ import {
   existsSync,
   lstatSync,
   mkdirSync,
+  mkdtempSync,
   readFileSync,
   rmSync,
   writeFileSync,
@@ -20,40 +21,12 @@ import {
   normalizePackageManifestsInTree,
 } from "../internal/manifest-normalizer";
 import type { BosConfig } from "../types";
+import { isPathExcluded } from "../utils/path-match";
+import { saveBosConfig } from "../utils/save-config";
 import { writeSnapshot } from "./snapshot";
 
 const require = createRequire(import.meta.url);
 
-const BOS_CONFIG_ORDER = [
-  "extends",
-  "account",
-  "domain",
-  "testnet",
-  "staging",
-  "repository",
-  "app",
-  "plugins",
-  "shared",
-];
-
-function rebuildOrderedConfig(config: Record<string, unknown>): Record<string, unknown> {
-  const ordered: Record<string, unknown> = {};
-
-  for (const key of BOS_CONFIG_ORDER) {
-    if (key in config) {
-      ordered[key] = config[key];
-    }
-  }
-
-  for (const key of Object.keys(config)) {
-    if (!BOS_CONFIG_ORDER.includes(key)) {
-      ordered[key] = config[key];
-    }
-  }
-
-  return ordered;
-}
-
 interface SourceResult {
   sourceDir: string;
   parentConfig: BosConfig;
@@ -86,6 +59,19 @@ export async function resolveSourceDir(opts: {
   return { sourceDir, parentConfig, cleanup };
 }
 
+export async function readTemplatekeep(sourceDir: string): Promise<string[]> {
+  const keepFile = join(sourceDir, ".templatekeep");
+  if (!existsSync(keepFile)) {
+    return [];
+  }
+
+  const content = readFileSync(keepFile, "utf-8");
+  return content
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0 && !line.startsWith("#"));
+}
+
 export async function fetchParentConfig(
   extendsAccount: string,
   extendsGateway: string,
@@ -161,19 +147,6 @@ function parseGitHubUrl(url: string): { owner: string; repo: string; branch: str
   return null;
 }
 
-export async function readTemplatekeep(sourceDir: string): Promise<string[]> {
-  const keepFile = join(sourceDir, ".templatekeep");
-  if (!existsSync(keepFile)) {
-    return [];
-  }
-
-  const content = readFileSync(keepFile, "utf-8");
-  return content
-    .split("\n")
-    .map((line) => line.trim())
-    .filter((line) => line.length > 0 && !line.startsWith("#"));
-}
-
 export async function copyFilteredFiles(
   sourceDir: string,
   destination: string,
@@ -218,7 +191,7 @@ export async function copyFilteredFiles(
         const pluginName = pluginMatch[1];
         if (!(options.plugins?.includes(pluginName) ?? true)) continue;
       }
-      if (isRouteExcluded(match, excludedRoutePatterns)) continue;
+      if (isPathExcluded(match, excludedRoutePatterns)) continue;
       allFiles.add(match);
     }
   }
@@ -235,7 +208,7 @@ export async function copyFilteredFiles(
           absolute: false,
         });
         for (const match of matches) {
-          if (!isRouteExcluded(match, excludedRoutePatterns)) {
+          if (!isPathExcluded(match, excludedRoutePatterns)) {
             routeFiles.add(match);
           }
         }
@@ -266,19 +239,6 @@ export async function copyFilteredFiles(
   return count;
 }
 
-function isRouteExcluded(filePath: string, excludedPatterns: string[]): boolean {
-  if (excludedPatterns.length === 0) return false;
-  for (const pattern of excludedPatterns) {
-    if (pattern.endsWith("/**")) {
-      const prefix = pattern.slice(0, -3);
-      if (filePath.startsWith(`${prefix}/`) || filePath === prefix) return true;
-    } else if (filePath === pattern || filePath.startsWith(`${pattern}/`)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 export async function personalizeConfig(
   destination: string,
   opts: {
@@ -334,13 +294,124 @@ export async function personalizeConfig(
       }
 
       if (isInit) {
+        const parentDomain = opts.extendsGateway;
+
         for (const pluginKey of Object.keys(plugins)) {
           const plugin = plugins[pluginKey];
-          if (plugin && typeof plugin === "object") {
-            const p = plugin as Record<string, unknown>;
-            delete p.production;
-            delete p.integrity;
+          let pluginObj: Record<string, unknown>;
+
+          if (typeof plugin === "string") {
+            pluginObj = { extends: plugin };
+            plugins[pluginKey] = pluginObj;
+          } else if (plugin && typeof plugin === "object") {
+            pluginObj = { ...(plugin as Record<string, unknown>) };
+          } else {
+            continue;
           }
+
+          if (
+            pluginObj.development &&
+            typeof pluginObj.development === "string" &&
+            pluginObj.development.startsWith("local:")
+          ) {
+            const pluginDir = join(destination, pluginObj.development.slice("local:".length));
+            const pluginConfigPath = join(pluginDir, "bos.config.json");
+
+            if (existsSync(pluginConfigPath)) {
+              try {
+                const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8")) as Record<
+                  string,
+                  unknown
+                >;
+                delete pluginConfig.extends;
+                if (pluginConfig.app && typeof pluginConfig.app === "object") {
+                  const app = pluginConfig.app as Record<string, unknown>;
+                  for (const entryKey of Object.keys(app)) {
+                    const entry = app[entryKey];
+                    if (entry && typeof entry === "object") {
+                      const e = entry as Record<string, unknown>;
+                      delete e.production;
+                      delete e.integrity;
+                    }
+                  }
+                }
+                writeFileSync(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
+              } catch {}
+            } else if (existsSync(pluginDir)) {
+              const pluginConfig: Record<string, unknown> = {};
+              pluginConfig.domain = `${pluginKey}.${opts.domain ?? parentDomain}`;
+              pluginConfig.app = { api: { development: "local:." } };
+
+              if (opts.pluginRoutes?.[pluginKey]) {
+                pluginConfig.routes = opts.pluginRoutes[pluginKey];
+              }
+              if (pluginObj.sidebar) {
+                pluginConfig.sidebar = pluginObj.sidebar;
+              }
+
+              mkdirSync(pluginDir, { recursive: true });
+              writeFileSync(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
+            }
+
+            const cleanEntry: Record<string, unknown> = { development: pluginObj.development };
+            if (pluginObj.extends) {
+              cleanEntry.extends = pluginObj.extends;
+            }
+            if (pluginObj.secrets) {
+              cleanEntry.secrets = pluginObj.secrets;
+            }
+            if (pluginObj.variables) {
+              cleanEntry.variables = pluginObj.variables;
+            }
+            plugins[pluginKey] = cleanEntry;
+          } else {
+            delete pluginObj.production;
+            delete pluginObj.integrity;
+            delete pluginObj.sidebar;
+            delete pluginObj.routes;
+          }
+        }
+      } else {
+        for (const pluginKey of Object.keys(plugins)) {
+          const pluginDir = resolve(
+            destination,
+            (plugins[pluginKey] as Record<string, unknown>)?.development
+              ?.toString()
+              ?.slice("local:".length) ?? "",
+          );
+          const pluginConfigPath = join(pluginDir, "bos.config.json");
+          if (!existsSync(pluginConfigPath)) continue;
+
+          try {
+            const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8")) as Record<
+              string,
+              unknown
+            >;
+            let changed = false;
+
+            if ("extends" in pluginConfig) {
+              delete pluginConfig.extends;
+              changed = true;
+            }
+            if (pluginConfig.app && typeof pluginConfig.app === "object") {
+              const app = pluginConfig.app as Record<string, unknown>;
+              for (const entryKey of Object.keys(app)) {
+                const entry = app[entryKey];
+                if (entry && typeof entry === "object") {
+                  const e = entry as Record<string, unknown>;
+                  if ("production" in e || "integrity" in e) {
+                    delete e.production;
+                    delete e.integrity;
+                    changed = true;
+                  }
+                }
+              }
+            }
+
+            if (changed) {
+              writeFileSync(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
+            }
+          } catch {}
         }
       }
 
@@ -349,7 +420,7 @@ export async function personalizeConfig(
       }
     }
 
-    writeFileSync(configPath, `${JSON.stringify(rebuildOrderedConfig(config), null, 2)}\n`);
+    await saveBosConfig(destination, config);
   }
 
   const pkgPath = join(destination, "package.json");
@@ -377,14 +448,14 @@ export async function personalizeConfig(
           scripts[key] = scripts[key].replaceAll(from, to);
         }
       };
-      rewrite("dev", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("dev:ui", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("dev:api", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("dev:proxy", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("build", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("deploy", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("publish", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
-      rewrite("start", "packages/everything-dev/cli.js", "node_modules/.bin/bos");
+      rewrite("dev", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("dev:ui", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("dev:api", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("dev:proxy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("build", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("deploy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("publish", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+      rewrite("start", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
 
       scripts.postinstall = "node_modules/.bin/bos types gen || true";
       scripts["types:gen"] = "node_modules/.bin/bos types gen";
@@ -463,32 +534,71 @@ export async function personalizeConfig(
     );
   }
 
-  const authTypesGenPath = join(destination, "ui", "src", "lib", "auth-types.gen.ts");
-  if (!existsSync(authTypesGenPath)) {
-    mkdirSync(dirname(authTypesGenPath), { recursive: true });
-    writeFileSync(
-      authTypesGenPath,
-      `import type { Auth } from "better-auth";\nexport type { Auth } from "better-auth";\nexport type AuthSessionUser = NonNullable<Auth["$Infer"]["Session"]["user"]> & {\n  role?: string | null;\n  isAnonymous?: boolean | null;\n  walletAddress?: string | null;\n  banned?: boolean | null;\n};\nexport type AuthSessionData = NonNullable<Auth["$Infer"]["Session"]["session"]> & {\n  activeOrganizationId?: string | null;\n};\nexport type AuthSession = {\n  user: AuthSessionUser | null;\n  session: AuthSessionData | null;\n};\nexport interface AuthOrganizationContext {\n  activeOrganizationId: string | null;\n  organization: { id: string; name: string; slug: string; logo?: string | null; metadata?: Record<string, unknown> } | null;\n  member: { id: string; role: string } | null;\n  isPersonal: boolean;\n  hasOrganization: boolean;\n}\nexport interface AuthRequestContext {\n  user: AuthSessionUser | null;\n  userId: string | null;\n  isAuthenticated: boolean;\n  authMethod: "session" | "apiKey" | "anonymous" | "none";\n  near: {\n    primaryAccountId: string | null;\n    linkedAccounts: Array<{ accountId: string; network: string; publicKey: string; isPrimary: boolean }>;\n    hasNearAccount: boolean;\n  };\n  organization: AuthOrganizationContext;\n  organizations?: Array<{ id: string; role: string; name?: string; slug?: string }>;\n}\nexport type AuthActiveMember = { id: string | null; role: string | null; organizationId: string | null };\nexport type AuthOrganization = NonNullable<AuthOrganizationContext["organization"]>;\nexport type AuthOrganizationMember = NonNullable<AuthOrganizationContext["member"]>;\nexport type AuthOrganizationSummary = NonNullable<AuthRequestContext["organizations"]>[number];\nexport type AuthBaseSession = Auth["$Infer"]["Session"];\nexport type createAuthInstance = never;\nexport interface AuthServices {\n  auth: Auth;\n  db: unknown;\n  driver: { close(): Promise<void> };\n  handler: (req: Request) => Promise<Response>;\n}\n`,
-    );
+  const authTypesContent = generateAuthTypesTemplate();
+  const authTypesPaths = [
+    join(destination, "ui", "src", "lib", "auth-types.gen.ts"),
+    join(destination, "api", "src", "lib", "auth-types.gen.ts"),
+  ];
+  if (existsSync(join(destination, "host", "src"))) {
+    authTypesPaths.push(join(destination, "host", "src", "lib", "auth-types.gen.ts"));
   }
-
-  const apiAuthTypesGenPath = join(destination, "api", "src", "lib", "auth-types.gen.ts");
-  if (!existsSync(apiAuthTypesGenPath)) {
-    mkdirSync(dirname(apiAuthTypesGenPath), { recursive: true });
-    writeFileSync(
-      apiAuthTypesGenPath,
-      `import type { Auth } from "better-auth";\nexport type { Auth } from "better-auth";\nexport type AuthSessionUser = NonNullable<Auth["$Infer"]["Session"]["user"]> & {\n  role?: string | null;\n  isAnonymous?: boolean | null;\n  walletAddress?: string | null;\n  banned?: boolean | null;\n};\nexport type AuthSessionData = NonNullable<Auth["$Infer"]["Session"]["session"]> & {\n  activeOrganizationId?: string | null;\n};\nexport type AuthSession = {\n  user: AuthSessionUser | null;\n  session: AuthSessionData | null;\n};\nexport interface AuthOrganizationContext {\n  activeOrganizationId: string | null;\n  organization: { id: string; name: string; slug: string; logo?: string | null; metadata?: Record<string, unknown> } | null;\n  member: { id: string; role: string } | null;\n  isPersonal: boolean;\n  hasOrganization: boolean;\n}\nexport interface AuthRequestContext {\n  user: AuthSessionUser | null;\n  userId: string | null;\n  isAuthenticated: boolean;\n  authMethod: "session" | "apiKey" | "anonymous" | "none";\n  near: {\n    primaryAccountId: string | null;\n    linkedAccounts: Array<{ accountId: string; network: string; publicKey: string; isPrimary: boolean }>;\n    hasNearAccount: boolean;\n  };\n  organization: AuthOrganizationContext;\n  organizations?: Array<{ id: string; role: string; name?: string; slug?: string }>;\n}\nexport type AuthActiveMember = { id: string | null; role: string | null; organizationId: string | null };\nexport type AuthOrganization = NonNullable<AuthOrganizationContext["organization"]>;\nexport type AuthOrganizationMember = NonNullable<AuthOrganizationContext["member"]>;\nexport type AuthOrganizationSummary = NonNullable<AuthRequestContext["organizations"]>[number];\nexport type AuthBaseSession = Auth["$Infer"]["Session"];\nexport type createAuthInstance = never;\nexport interface AuthServices {\n  auth: Auth;\n  db: unknown;\n  driver: { close(): Promise<void> };\n  handler: (req: Request) => Promise<Response>;\n}\n`,
-    );
+  for (const authTypesGenPath of authTypesPaths) {
+    if (!existsSync(authTypesGenPath)) {
+      mkdirSync(dirname(authTypesGenPath), { recursive: true });
+      writeFileSync(authTypesGenPath, authTypesContent);
+    }
   }
+}
 
-  const hostAuthTypesGenPath = join(destination, "host", "src", "lib", "auth-types.gen.ts");
-  if (existsSync(join(destination, "host", "src")) && !existsSync(hostAuthTypesGenPath)) {
-    mkdirSync(dirname(hostAuthTypesGenPath), { recursive: true });
-    writeFileSync(
-      hostAuthTypesGenPath,
-      `import type { Auth } from "better-auth";\nexport type { Auth } from "better-auth";\nexport type AuthSessionUser = NonNullable<Auth["$Infer"]["Session"]["user"]> & {\n  role?: string | null;\n  isAnonymous?: boolean | null;\n  walletAddress?: string | null;\n  banned?: boolean | null;\n};\nexport type AuthSessionData = NonNullable<Auth["$Infer"]["Session"]["session"]> & {\n  activeOrganizationId?: string | null;\n};\nexport type AuthSession = {\n  user: AuthSessionUser | null;\n  session: AuthSessionData | null;\n};\nexport interface AuthOrganizationContext {\n  activeOrganizationId: string | null;\n  organization: { id: string; name: string; slug: string; logo?: string | null; metadata?: Record<string, unknown> } | null;\n  member: { id: string; role: string } | null;\n  isPersonal: boolean;\n  hasOrganization: boolean;\n}\nexport interface AuthRequestContext {\n  user: AuthSessionUser | null;\n  userId: string | null;\n  isAuthenticated: boolean;\n  authMethod: "session" | "apiKey" | "anonymous" | "none";\n  near: {\n    primaryAccountId: string | null;\n    linkedAccounts: Array<{ accountId: string; network: string; publicKey: string; isPrimary: boolean }>;\n    hasNearAccount: boolean;\n  };\n  organization: AuthOrganizationContext;\n  organizations?: Array<{ id: string; role: string; name?: string; slug?: string }>;\n}\nexport type AuthActiveMember = { id: string | null; role: string | null; organizationId: string | null };\nexport type AuthOrganization = NonNullable<AuthOrganizationContext["organization"]>;\nexport type AuthOrganizationMember = NonNullable<AuthOrganizationContext["member"]>;\nexport type AuthOrganizationSummary = NonNullable<AuthRequestContext["organizations"]>[number];\nexport type AuthBaseSession = Auth["$Infer"]["Session"];\nexport type createAuthInstance = never;\nexport interface AuthServices {\n  auth: Auth;\n  db: unknown;\n  driver: { close(): Promise<void> };\n  handler: (req: Request) => Promise<Response>;\n}\n`,
-    );
-  }
+function generateAuthTypesTemplate(): string {
+  return `import type { Auth } from "better-auth";
+export type { Auth } from "better-auth";
+export type AuthSessionUser = NonNullable<Auth["$Infer"]["Session"]["user"]> & {
+  role?: string | null;
+  isAnonymous?: boolean | null;
+  walletAddress?: string | null;
+  banned?: boolean | null;
+};
+export type AuthSessionData = NonNullable<Auth["$Infer"]["Session"]["session"]> & {
+  activeOrganizationId?: string | null;
+};
+export type AuthSession = {
+  user: AuthSessionUser | null;
+  session: AuthSessionData | null;
+};
+export interface AuthOrganizationContext {
+  activeOrganizationId: string | null;
+  organization: { id: string; name: string; slug: string; logo?: string | null; metadata?: Record<string, unknown> } | null;
+  member: { id: string; role: string } | null;
+  isPersonal: boolean;
+  hasOrganization: boolean;
+}
+export interface AuthRequestContext {
+  user: AuthSessionUser | null;
+  userId: string | null;
+  isAuthenticated: boolean;
+  authMethod: "session" | "apiKey" | "anonymous" | "none";
+  near: {
+    primaryAccountId: string | null;
+    linkedAccounts: Array<{ accountId: string; network: string; publicKey: string; isPrimary: boolean }>;
+    hasNearAccount: boolean;
+  };
+  organization: AuthOrganizationContext;
+  organizations?: Array<{ id: string; role: string; name?: string; slug?: string }>;
+}
+export type AuthActiveMember = { id: string | null; role: string | null; organizationId: string | null };
+export type AuthOrganization = NonNullable<AuthOrganizationContext["organization"]>;
+export type AuthOrganizationMember = NonNullable<AuthOrganizationContext["member"]>;
+export type AuthOrganizationSummary = NonNullable<AuthRequestContext["organizations"]>[number];
+export type AuthBaseSession = Auth["$Infer"]["Session"];
+export type createAuthInstance = never;
+export interface AuthServices {
+  auth: Auth;
+  db: unknown;
+  driver: { close(): Promise<void> };
+  handler: (req: Request) => Promise<Response>;
+}
+`;
 }
 
 export async function runBunInstall(destination: string): Promise<void> {
@@ -579,7 +689,7 @@ export async function writeInitSnapshot(
     for (const match of matches) {
       const pluginMatch = match.match(/^plugins\/([^/]+)/);
       if (pluginMatch && !(options.plugins?.includes(pluginMatch[1]) ?? true)) continue;
-      if (isRouteExcluded(match, excludedRoutePatterns)) continue;
+      if (isPathExcluded(match, excludedRoutePatterns)) continue;
       allFiles.add(match);
     }
   }
@@ -595,7 +705,7 @@ export async function writeInitSnapshot(
           absolute: false,
         });
         for (const match of matches) {
-          if (!isRouteExcluded(match, excludedRoutePatterns)) {
+          if (!isPathExcluded(match, excludedRoutePatterns)) {
             allFiles.add(match);
           }
         }
@@ -626,18 +736,7 @@ function computeHash(data: Uint8Array): string {
 }
 
 function mkTmpDir(prefix: string): string {
-  const base = join(tmpdir(), prefix);
-  let attempt = 0;
-  while (true) {
-    const dir = `${base}-${Date.now()}-${attempt}`;
-    try {
-      mkdirSync(dir, { recursive: true });
-      return dir;
-    } catch {
-      attempt++;
-      if (attempt > 10) throw new Error("Failed to create temp directory");
-    }
-  }
+  return mkdtempSync(join(tmpdir(), `${prefix}-`));
 }
 
 export async function generateDatabaseMigrations(destination: string): Promise<void> {

package/src/cli/prompts.ts

@@ -16,7 +16,7 @@ function deriveAccountFromDomain(domain: string, extendsAccount: string): string
   return `${firstSegment}.${suffix}`;
 }
 
-const AVAILABLE_PLUGINS = [{ value: "_template", label: "template" }];
+const AVAILABLE_PLUGINS = [{ value: "settings", label: "settings" }];
 
 export async function promptInitOptions(input: {
   extendsAccount?: string;
@@ -89,7 +89,7 @@ export async function promptInitOptions(input: {
     ((await p.multiselect({
       message: "Select plugins:",
       options: AVAILABLE_PLUGINS,
-      initialValues: ["_template"],
+      initialValues: ["settings"],
       required: false,
     })) as string[]);
 

package/src/cli/status.ts

@@ -7,6 +7,19 @@ import { readSnapshot } from "./snapshot";
 
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
 
+const CATALOG_TOOL_PACKAGES = [
+  "@rspack/core",
+  "@rspack/cli",
+  "@rsbuild/core",
+  "@rsbuild/plugin-react",
+  "@module-federation/enhanced",
+  "@module-federation/node",
+  "@module-federation/rsbuild-plugin",
+  "@module-federation/runtime-core",
+  "@module-federation/sdk",
+  "@module-federation/dts-plugin",
+] as const;
+
 async function fetchLatestNpmVersion(packageName: string): Promise<string | null> {
   try {
     const response = await fetch(`https://registry.npmjs.org/${packageName}/latest`, {
@@ -61,6 +74,13 @@ export async function getStatus(projectDir: string): Promise<StatusResult> {
     packages.push({ name, installed, latest: latest ?? undefined });
   }
 
+  for (const name of CATALOG_TOOL_PACKAGES) {
+    const installed = readInstalledVersion(projectDir, name);
+    if (!installed) continue;
+    const latest = await fetchLatestNpmVersion(name);
+    packages.push({ name, installed, latest: latest ?? undefined });
+  }
+
   const snapshot = await readSnapshot(projectDir);
 
   const extendsRef = config.extends as string | undefined;