npm - everything-dev - Versions diffs - 1.12.3 → 1.13.1 - Mend

everything-dev 1.12.3 → 1.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (124) hide show

package/cli.js +1 -1
package/dist/app.cjs +24 -101
package/dist/app.cjs.map +1 -1
package/dist/app.mjs +25 -102
package/dist/app.mjs.map +1 -1
package/dist/cli/init.cjs +143 -66
package/dist/cli/init.cjs.map +1 -1
package/dist/cli/init.d.cts +1 -1
package/dist/cli/init.d.cts.map +1 -1
package/dist/cli/init.d.mts +1 -1
package/dist/cli/init.d.mts.map +1 -1
package/dist/cli/init.mjs +144 -67
package/dist/cli/init.mjs.map +1 -1
package/dist/cli/prompts.cjs +3 -3
package/dist/cli/prompts.cjs.map +1 -1
package/dist/cli/prompts.mjs +3 -3
package/dist/cli/prompts.mjs.map +1 -1
package/dist/cli/sync.cjs +15 -56
package/dist/cli/sync.cjs.map +1 -1
package/dist/cli/sync.mjs +15 -56
package/dist/cli/sync.mjs.map +1 -1
package/dist/cli/upgrade.cjs +3 -1
package/dist/cli/upgrade.cjs.map +1 -1
package/dist/cli/upgrade.mjs +3 -1
package/dist/cli/upgrade.mjs.map +1 -1
package/dist/config.cjs +223 -81
package/dist/config.cjs.map +1 -1
package/dist/config.d.cts +21 -5
package/dist/config.d.cts.map +1 -1
package/dist/config.d.mts +21 -5
package/dist/config.d.mts.map +1 -1
package/dist/config.mjs +217 -83
package/dist/config.mjs.map +1 -1
package/dist/contract.d.cts +104 -8
package/dist/contract.d.cts.map +1 -1
package/dist/contract.d.mts +104 -8
package/dist/contract.d.mts.map +1 -1
package/dist/host.cjs +34 -1
package/dist/host.cjs.map +1 -1
package/dist/host.d.cts.map +1 -1
package/dist/host.d.mts.map +1 -1
package/dist/host.mjs +34 -1
package/dist/host.mjs.map +1 -1
package/dist/index.cjs +17 -0
package/dist/index.d.cts +5 -3
package/dist/index.d.mts +5 -3
package/dist/index.mjs +5 -3
package/dist/merge.cjs +113 -0
package/dist/merge.cjs.map +1 -0
package/dist/merge.d.cts +7 -0
package/dist/merge.d.cts.map +1 -0
package/dist/merge.d.mts +7 -0
package/dist/merge.d.mts.map +1 -0
package/dist/merge.mjs +107 -0
package/dist/merge.mjs.map +1 -0
package/dist/plugin.cjs +117 -105
package/dist/plugin.cjs.map +1 -1
package/dist/plugin.d.cts +114 -8
package/dist/plugin.d.cts.map +1 -1
package/dist/plugin.d.mts +114 -8
package/dist/plugin.d.mts.map +1 -1
package/dist/plugin.mjs +117 -105
package/dist/plugin.mjs.map +1 -1
package/dist/service-descriptor.cjs +21 -0
package/dist/service-descriptor.cjs.map +1 -1
package/dist/service-descriptor.d.cts +23 -1
package/dist/service-descriptor.d.cts.map +1 -1
package/dist/service-descriptor.d.mts +23 -1
package/dist/service-descriptor.d.mts.map +1 -1
package/dist/service-descriptor.mjs +21 -0
package/dist/service-descriptor.mjs.map +1 -1
package/dist/shared.cjs +24 -2
package/dist/shared.cjs.map +1 -1
package/dist/shared.d.cts +3 -0
package/dist/shared.d.cts.map +1 -1
package/dist/shared.d.mts +3 -0
package/dist/shared.d.mts.map +1 -1
package/dist/shared.mjs +25 -3
package/dist/shared.mjs.map +1 -1
package/dist/sidebar.cjs +124 -0
package/dist/sidebar.cjs.map +1 -0
package/dist/sidebar.d.cts +8 -0
package/dist/sidebar.d.cts.map +1 -0
package/dist/sidebar.d.mts +8 -0
package/dist/sidebar.d.mts.map +1 -0
package/dist/sidebar.mjs +122 -0
package/dist/sidebar.mjs.map +1 -0
package/dist/types.cjs +104 -10
package/dist/types.cjs.map +1 -1
package/dist/types.d.cts +256 -29
package/dist/types.d.cts.map +1 -1
package/dist/types.d.mts +256 -29
package/dist/types.d.mts.map +1 -1
package/dist/types.mjs +100 -11
package/dist/types.mjs.map +1 -1
package/dist/utils/path-match.cjs +18 -0
package/dist/utils/path-match.cjs.map +1 -0
package/dist/utils/path-match.mjs +17 -0
package/dist/utils/path-match.mjs.map +1 -0
package/dist/utils/save-config.cjs +19 -0
package/dist/utils/save-config.cjs.map +1 -0
package/dist/utils/save-config.mjs +18 -0
package/dist/utils/save-config.mjs.map +1 -0
package/package.json +3 -2
package/skills/dev-workflow/SKILL.md +8 -0
package/skills/extends-config/SKILL.md +132 -0
package/skills/init-upgrade/SKILL.md +128 -0
package/skills/publish-sync/SKILL.md +30 -0
package/src/app.ts +23 -118
package/src/cli/init.ts +199 -100
package/src/cli/prompts.ts +2 -2
package/src/cli/sync.ts +27 -96
package/src/cli/upgrade.ts +2 -0
package/src/config.ts +356 -132
package/src/host.ts +45 -0
package/src/index.ts +1 -0
package/src/merge.ts +198 -0
package/src/plugin.ts +340 -318
package/src/service-descriptor.ts +23 -0
package/src/shared.ts +48 -5
package/src/sidebar.ts +162 -0
package/src/types.ts +134 -28
package/src/utils/path-match.ts +16 -0
package/src/utils/save-config.ts +20 -0

package/src/host.ts CHANGED Viewed

@@ -54,6 +54,15 @@ function buildClientRuntimeConfig(runtimeConfig: RuntimeConfig): ClientRuntimeCo
           integrity: runtimeConfig.api.integrity,
         }
       : undefined,
+    auth: runtimeConfig.auth
+      ? {
+          name: runtimeConfig.auth.name,
+          url: runtimeConfig.auth.url,
+          entry: runtimeConfig.auth.entry,
+          integrity: runtimeConfig.auth.integrity,
+          sidebar: runtimeConfig.auth.sidebar,
+        }
+      : undefined,
     plugins: runtimeConfig.plugins
       ? Object.fromEntries(
           Object.entries(runtimeConfig.plugins).map(([key, plugin]) => [
@@ -63,6 +72,18 @@ function buildClientRuntimeConfig(runtimeConfig: RuntimeConfig): ClientRuntimeCo
               url: plugin.url,
               entry: plugin.entry,
               integrity: plugin.integrity,
+              ...(plugin.ui
+                ? {
+                    ui: {
+                      name: plugin.ui.name,
+                      url: plugin.ui.url,
+                      entry: plugin.ui.entry,
+                      source: plugin.ui.source,
+                      integrity: plugin.ui.integrity,
+                    },
+                  }
+                : {}),
+              ...(plugin.sidebar ? { sidebar: plugin.sidebar } : {}),
             },
           ]),
         )
@@ -79,6 +100,15 @@ function renderLoadingShell(runtimeConfig: ClientRuntimeConfig, error?: string |
   const uiIntegrity = runtimeConfig.ui?.integrity;
   const sriAttr = uiIntegrity ? ` integrity="${uiIntegrity}" crossorigin="anonymous"` : "";
+  const pluginUiScripts = Object.values(runtimeConfig.plugins ?? {})
+    .filter((plugin) => plugin.ui?.url && plugin.ui.source === "remote")
+    .map((plugin) => {
+      const uiIntegrity = plugin.ui!.integrity;
+      const sri = uiIntegrity ? ` integrity="${uiIntegrity}" crossorigin="anonymous"` : "";
+      return `<script src="${plugin.ui!.url}/remoteEntry.js"${sri}></script>`;
+    })
+    .join("\n");
   return `
 		<!DOCTYPE html>
 		<html lang="en">
@@ -92,6 +122,7 @@ function renderLoadingShell(runtimeConfig: ClientRuntimeConfig, error?: string |
 					@keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
 				</style>
 				${runtimeConfig.assetsUrl ? `<script src="${runtimeConfig.assetsUrl}/remoteEntry.js"${sriAttr}></script>` : ""}
+				${pluginUiScripts}
 				<script>${bootstrap}</script>
 			</head>
 			<body>
@@ -454,6 +485,20 @@ async function runHostServer(opts: {
     }
   }
+  for (const [pluginKey, pluginConfig] of Object.entries(runtimeConfig.plugins ?? {})) {
+    if (!pluginConfig.ui?.url) continue;
+    const pluginUiUrl = pluginConfig.ui.url;
+    const proxyPrefix = `/__mf/plugin-ui/${pluginKey}`;
+    app.all(`${proxyPrefix}/*`, async (c) => {
+      const targetUrl = `${pluginUiUrl}${c.req.path.replace(proxyPrefix, "")}`;
+      const response = await fetch(targetUrl, {
+        method: c.req.method,
+        headers: c.req.header(),
+      });
+      return response;
+    });
+  }
   app.get("*", async (c) => {
     const routerModule = await ensureRouterModuleLoaded();

package/src/index.ts CHANGED Viewed

@@ -4,4 +4,5 @@ export * from "./contract.meta";
 export * from "./fastkv";
 export * from "./plugin";
 export * from "./sdk";
+export * from "./sidebar";
 export * from "./types";

package/src/merge.ts ADDED Viewed

@@ -0,0 +1,198 @@
+import { createDefu } from "defu";
+import type { BosConfigInput, ExtendsConfig } from "./types";
+export const BOS_CONFIG_ORDER = [
+  "extends",
+  "account",
+  "domain",
+  "testnet",
+  "staging",
+  "repository",
+  "app",
+  "plugins",
+  "shared",
+] as const;
+export type BosConfigFieldName = (typeof BOS_CONFIG_ORDER)[number];
+export type BosEnv = "development" | "production" | "staging";
+export interface ResolvedConfigMeta {
+  env: BosEnv;
+  resolvedAt: string;
+  extendsChain: string[];
+  source?: string;
+}
+const ARRAY_UNION_KEYS = new Set(["secrets"]);
+export function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function unionArrays(a: unknown, b: unknown): unknown[] | undefined {
+  const aArr = Array.isArray(a) ? a : [];
+  const bArr = Array.isArray(b) ? b : [];
+  if (aArr.length === 0 && bArr.length === 0) return undefined;
+  const seen = new Set<string>();
+  const result: unknown[] = [];
+  for (const item of [...aArr, ...bArr]) {
+    if (typeof item === "string") {
+      if (seen.has(item)) continue;
+      seen.add(item);
+    }
+    result.push(item);
+  }
+  return result;
+}
+function cleanNullSentinels(obj: Record<string, unknown>): Record<string, unknown> {
+  const out: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === null || value === undefined) continue;
+    if (isPlainObject(value)) {
+      const cleaned = cleanNullSentinels(value);
+      if (Object.keys(cleaned).length > 0) {
+        out[key] = cleaned;
+      }
+    } else {
+      out[key] = value;
+    }
+  }
+  return out;
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const bosConfigMerger = createDefu((obj: any, key: any, value: any): boolean | undefined => {
+  if (obj[key] === null) return true;
+  if (value === null) {
+    obj[key] = null;
+    return true;
+  }
+  if (Array.isArray(obj[key]) && Array.isArray(value)) {
+    if (ARRAY_UNION_KEYS.has(key)) {
+      obj[key] = unionArrays(obj[key], value);
+    } else {
+      obj[key] = value;
+    }
+    return true;
+  }
+  return false;
+});
+export function resolveExtendsRef(
+  extendsField: string | ExtendsConfig | undefined,
+  env: BosEnv,
+): string | undefined {
+  if (!extendsField) return undefined;
+  if (typeof extendsField === "string") return extendsField;
+  return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);
+}
+export function mergeBosConfigWithExtends(
+  parent: BosConfigInput,
+  child: BosConfigInput,
+): BosConfigInput {
+  const merged = bosConfigMerger(child, parent) as BosConfigInput;
+  if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {
+    const plugins: Record<string, unknown> = { ...parent.plugins };
+    for (const [key, rawValue] of Object.entries(child.plugins)) {
+      const value = rawValue as unknown;
+      if (value === null || value === false) {
+        delete plugins[key];
+      } else if (isPlainObject(plugins[key]) && isPlainObject(value)) {
+        plugins[key] = bosConfigMerger(
+          value as Record<string, unknown>,
+          plugins[key] as Record<string, unknown>,
+        );
+      } else {
+        plugins[key] = value;
+      }
+    }
+    (merged as Record<string, unknown>).plugins = plugins;
+  } else if (child.plugins !== undefined) {
+    (merged as Record<string, unknown>).plugins = cleanNullSentinels(
+      child.plugins as Record<string, unknown>,
+    );
+  }
+  const mergedRecord = merged as Record<string, unknown>;
+  if (isPlainObject(mergedRecord.app)) {
+    for (const entryVal of Object.values(mergedRecord.app as Record<string, unknown>)) {
+      if (!isPlainObject(entryVal)) continue;
+      for (const secretKey of ARRAY_UNION_KEYS) {
+        if (Array.isArray(entryVal[secretKey])) {
+          entryVal[secretKey] =
+            (unionArrays(entryVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(
+              Boolean,
+            ) ?? entryVal[secretKey];
+        }
+      }
+    }
+  }
+  if (isPlainObject(mergedRecord.plugins)) {
+    for (const pluginVal of Object.values(mergedRecord.plugins as Record<string, unknown>)) {
+      if (!isPlainObject(pluginVal)) continue;
+      for (const secretKey of ARRAY_UNION_KEYS) {
+        if (Array.isArray(pluginVal[secretKey])) {
+          pluginVal[secretKey] =
+            (unionArrays(pluginVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(
+              Boolean,
+            ) ?? pluginVal[secretKey];
+        }
+      }
+    }
+  }
+  return rebuildOrderedConfig(mergedRecord) as BosConfigInput;
+}
+export function mergeBosConfigWithTemplate(
+  local: BosConfigInput,
+  template: BosConfigInput,
+): BosConfigInput {
+  const merged = mergeJsonValuesPreservingLocalOrder(local, template) as BosConfigInput;
+  return rebuildOrderedConfig(merged as Record<string, unknown>) as BosConfigInput;
+}
+function mergeJsonValuesPreservingLocalOrder(local: unknown, template: unknown): unknown {
+  if (isPlainObject(local) && isPlainObject(template)) {
+    const merged: Record<string, unknown> = {};
+    for (const key of Object.keys(local)) {
+      merged[key] = mergeJsonValuesPreservingLocalOrder(
+        local[key],
+        (template as Record<string, unknown>)[key],
+      );
+    }
+    for (const key of Object.keys(template as Record<string, unknown>)) {
+      if (!(key in merged)) {
+        merged[key] = (template as Record<string, unknown>)[key];
+      }
+    }
+    return merged;
+  }
+  return local ?? template;
+}
+export function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T {
+  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 as BosConfigFieldName)) {
+      ordered[key] = config[key];
+    }
+  }
+  return ordered as T;
+}
+export { bosConfigMerger };