@superblocksteam/sdk 2.0.6-next.7 → 2.0.6-next.70

package/dist/vite-plugin-generate-build-manifest.mjs

@@ -0,0 +1,131 @@
+import path from "node:path";
+import { parse } from "@babel/parser";
+import { getClientApiId } from "@superblocksteam/library-shared";
+import { resolveLanguageSpecificStepContentFromBlocks } from "@superblocksteam/util";
+import { getPageName } from "@superblocksteam/vite-plugin-file-sync";
+import { extractIdentifierPathsFromApi, extractApiDependencies, } from "@superblocksteam/vite-plugin-file-sync/binding-extraction";
+import { getScope, extractImportsFromAst, } from "@superblocksteam/vite-plugin-file-sync/parsing";
+import { yellow, red } from "colorette";
+import fg from "fast-glob";
+import fs from "fs-extra";
+import { createLogger } from "vite";
+import yaml from "yaml";
+import { getLogger } from "./dev-utils/dev-logger.mjs";
+export const scopeFileBaseName = "scope.ts";
+export const apiFileBaseName = "api.yaml";
+/**
+ * Vite plugin that generates a build manifest for the application.
+ *
+ * This plugin will:
+ * 1. Read all api.yaml and api.yml files in the application
+ * 2. Read all scope.ts files in the application
+ * 3. Generate a build manifest for the application
+ * 4. Write the build manifest to a file in the build output directory
+ *
+ * The build manifest is a JSON object with the following properties:
+ * - apis: a map of all apis in the application keyed by their file path
+ * - apiDependencies: an array where each item represents an api and its dependencies
+ *
+ * @param root - The root directory of the application
+ * @returns A Vite plugin that generates a build manifest for the application
+ */
+export function generateBuildManifestPlugin(root) {
+    const viteLogger = createLogger();
+    const logger = getLogger();
+    viteLogger.info = (msg) => logger.info(msg);
+    viteLogger.warn = (msg) => {
+        logger.warn(yellow(msg));
+    };
+    viteLogger.warnOnce = (msg) => {
+        logger.warn(yellow(msg));
+    };
+    viteLogger.error = (msg) => {
+        logger.error(red(msg));
+    };
+    viteLogger.clearScreen = () => { };
+    const scopesByPage = {};
+    const apiFiles = {};
+    let buildManifest = { apis: {}, apiDependencies: [] };
+    return {
+        name: "sb-generate-build-manifest",
+        apply: "build",
+        enforce: "pre",
+        async buildStart() {
+            const apiDocuments = await fg(["**/api.yaml", "**/api.yml"], {
+                cwd: root,
+            });
+            for (const apiFilePath of apiDocuments) {
+                const absoluteApiFilePath = path.join(root, apiFilePath);
+                const document = await fs.readFile(absoluteApiFilePath, "utf-8");
+                const apiPb = yaml.parse(document);
+                await resolveLanguageSpecificStepContentFromBlocks(path.dirname(absoluteApiFilePath), apiPb.blocks ?? [], {});
+                const pageName = getPageName(apiFilePath);
+                apiPb.metadata.id = getClientApiId(apiPb.metadata.name, pageName);
+                apiFiles[apiFilePath] = { apiPb, pageName };
+            }
+        },
+        transform(code, id) {
+            if (id.endsWith(scopeFileBaseName)) {
+                const ast = parse(code, {
+                    sourceType: "module",
+                    sourceFilename: id,
+                    plugins: [["typescript", {}]],
+                });
+                const scopeFileMeta = {
+                    code,
+                    ast,
+                    imports: extractImportsFromAst(ast),
+                };
+                const scope = getScope(id, scopeFileMeta);
+                scopesByPage[getPageName(id)] = scope;
+            }
+            return code;
+        },
+        async generateBundle() {
+            const allApiNames = getAllUniqueApiNames(apiFiles);
+            const allApis = Object.entries(apiFiles).reduce((acc, [id, api]) => {
+                acc[id] = {
+                    api,
+                    scopeId: scopesByPage[api.pageName]?.scopeId ?? "",
+                };
+                return acc;
+            }, {});
+            const deps = await getApiDependencies(allApiNames, apiFiles);
+            buildManifest = {
+                apis: allApis,
+                apiDependencies: deps,
+            };
+            this.emitFile({
+                type: "prebuilt-chunk",
+                fileName: "assets/build-manifest.js",
+                code: `export default ${JSON.stringify(buildManifest)}`,
+                exports: ["default"],
+            });
+        },
+    };
+}
+function getAllUniqueApiNames(apiFiles) {
+    const allApiNamesSet = new Set(Object.values(apiFiles).map((api) => api.apiPb.metadata.name));
+    return Array.from(allApiNamesSet);
+}
+async function getApiDependencies(apiNames, apiFiles) {
+    const deps = [];
+    // TODO: This logic is a copy of the extractApiParamsAndDependencies function in the
+    // fileSyncVitePlugin (https://github.com/superblocksteam/superblocks/blob/474c0b11d79a1d6988864fb20d5ec26f92931fde/packages/vite-plugin-file-sync/src/file-sync-vite-plugin.ts#L261-L280).
+    //
+    // This logic should be refactored so that it can be shared between the two plugins.
+    await Promise.all([
+        ...Object.values(apiFiles).map(async (api) => {
+            const bindings = await extractIdentifierPathsFromApi(api);
+            const allIdentifiers = bindings.flatMap((binding) => binding.bindings);
+            const apiDependencies = extractApiDependencies(apiNames, bindings);
+            deps.push({
+                apiName: api.apiPb.metadata.name,
+                params: allIdentifiers,
+                dependencies: apiDependencies,
+            });
+        }),
+    ]);
+    return deps;
+}
+//# sourceMappingURL=vite-plugin-generate-build-manifest.mjs.map

package/dist/vite-plugin-generate-build-manifest.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-generate-build-manifest.mjs","sourceRoot":"","sources":["../src/vite-plugin-generate-build-manifest.mts"],"names":[],"mappings":"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"}

package/dist/vite-plugin-inject-sb-ids-transform.mjs

@@ -22,7 +22,7 @@ const routesFileBaseName = "routes.json";
 export async function injectSuperblocksIdsPlugin(root) {
     const viteLogger = createLogger();
     const logger = getLogger();
-    viteLogger.info = logger.info;
+    viteLogger.info = (msg) => logger.info(msg);
     viteLogger.warn = (msg) => {
         logger.warn(yellow(msg));
     };

package/dist/vite-plugin-inject-sb-ids-transform.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-inject-sb-ids-transform.mjs","sourceRoot":"","sources":["../src/vite-plugin-inject-sb-ids-transform.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vite-plugin-inject-sb-ids-transform.mjs","sourceRoot":"","sources":["../src/vite-plugin-inject-sb-ids-transform.mts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.6-next.7",
+  "version": "2.0.6-next.70",
   "type": "module",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
@@ -30,9 +30,11 @@
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
-    "@superblocksteam/shared": "0.9160.0",
-    "@superblocksteam/util": "2.0.6-next.7",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.7",
+    "@superblocksteam/library": "2.0.6-next.70",
+    "@superblocksteam/library-shared": "2.0.6-next.70",
+    "@superblocksteam/shared": "0.9198.0",
+    "@superblocksteam/util": "2.0.6-next.70",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.70",
     "@vitejs/plugin-react": "^4.3.4",
     "axios": "^1.4.0",
     "chokidar": "^4.0.3",

package/src/application-build.mts

@@ -9,8 +9,8 @@ import { customComponentsPlugin } from "./dev-utils/custom-build.mjs";
 import { getLogger } from "./dev-utils/dev-logger.mjs";
 import { ddRumPlugin } from "./dev-utils/vite-plugin-dd-rum.mjs";
 import { superblocksCdnPlugin } from "./dev-utils/vite-plugin-sb-cdn.mjs";
+import { generateBuildManifestPlugin } from "./vite-plugin-generate-build-manifest.mjs";
 import { injectSuperblocksIdsPlugin } from "./vite-plugin-inject-sb-ids-transform.mjs";
-import type { Plugin } from "vite";
 
 export async function buildApplication({
   root,
@@ -81,7 +81,7 @@ async function buildWithVite({
 }) {
   const viteLogger = createLogger();
   const logger = getLogger();
-  viteLogger.info = logger.info;
+  viteLogger.info = (msg: string) => logger.info(msg);
   viteLogger.warn = (msg: string) => {
     logger.warn(yellow(msg));
   };
@@ -133,7 +133,7 @@ async function buildWithVite({
     logLevel: "info",
     plugins: [
       tsconfigPaths(),
-      injectIndexVitePlugin({ assetsCdnUrl, logger }) as Plugin,
+      injectIndexVitePlugin({ assetsCdnUrl }),
       customComponentsPlugin(),
       injectSuperblocksIdsPlugin(root),
       superblocksCdnPlugin({
@@ -142,12 +142,15 @@ async function buildWithVite({
           "react/jsx-runtime": "https://esm.sh/react@18.2.0/jsx-runtime.mjs",
           "react/jsx-dev-runtime":
             "https://esm.sh/react@18.2.0/jsx-dev-runtime.mjs",
+          "./user-facing/build-manifest.js": "/assets/build-manifest.js",
+          "/assets/user-facing/build-manifest.js": "/assets/build-manifest.js",
         },
         cssImports: {
           "@superblocksteam/library/index.css": `${libraryUrl}/index.css`,
         },
       }),
       react(),
+      generateBuildManifestPlugin(root),
 
       ddRumPlugin({
         clientToken: ddClientToken ?? "",

package/src/cli-replacement/automatic-upgrades.ts

@@ -1,11 +1,13 @@
 import * as child_process from "node:child_process";
 import { promisify } from "node:util";
 import { isNativeError } from "node:util/types";
+import { traceFunction } from "@superblocksteam/shared";
 import { resolveCommand, type DetectResult } from "package-manager-detector";
 import { detect } from "package-manager-detector/detect";
 import gt from "semver/functions/gt.js";
 import valid from "semver/functions/valid.js";
-import { getLogger } from "../dev-utils/dev-logger.mjs";
+import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
+import tracer from "../dev-utils/dev-tracer.js";
 import type { ResponseMeta } from "../socket/handlers.js";
 import type { ApplicationConfig } from "../types/common.js";
 import type { LockService } from "@superblocksteam/vite-plugin-file-sync/lock-service";
@@ -55,7 +57,7 @@ async function getRemoteVersions(
       return data.data;
     } else {
       const error = (await response.json()) as CheckVersionsErrorResponse;
-      console.log(
+      logger.error(
         `Could not get latest CLI version: ${error.responseMeta.message}`,
       );
     }
@@ -68,7 +70,9 @@ async function getRemoteVersions(
   }
 }
 
-export async function getCurrentCliVersion(): Promise<string | undefined> {
+export async function getCurrentCliVersion(): Promise<
+  PackageVersionInfo | undefined
+> {
   try {
     const command = process.platform === "win32" ? "where" : "which";
     const { stdout } = await exec(`${command} superblocks`);
@@ -85,7 +89,16 @@ export async function getCurrentCliVersion(): Promise<string | undefined> {
       /@superblocksteam\/cli(-ephemeral)?\//,
       "",
     );
-    return version;
+
+    const aliasMatch = json.cliVersion?.match(/@superblocksteam\/([^\/]+)/);
+    if (aliasMatch && aliasMatch[1] !== "cli") {
+      return {
+        version: version,
+        alias: `@superblocksteam/${aliasMatch[1]}`,
+      };
+    }
+
+    return { version };
   } catch (error) {
     if (isNativeError(error)) {
       logger.error(`Error getting CLI version: ${error.message}`);
@@ -104,16 +117,16 @@ export async function getCurrentLibraryVersion(
       case "pnpm":
         return await getPnpmLibraryVersion();
       default:
-        console.error(
+        logger.error(
           `${pm.agent} is currently not supported for automatic upgrades.`,
         );
         return undefined;
     }
   } catch (error) {
-    console.error(
+    logger.error(
       "Could not resolve current library version. Skipping automatic upgrade.",
+      getErrorMeta(error),
     );
-    console.error(error);
     return undefined;
   }
 }
@@ -200,10 +213,10 @@ async function upgradeCliWithOclif(targetVersion: string): Promise<boolean> {
 
     if (!superblocksPath) return false;
 
-    const { stdout: updateOutput } = await exec(
+    const { stdout: updateOutput, stderr: updateErrorOutput } = await exec(
       `${superblocksPath} update --version=${targetVersion}`,
     );
-    return !updateOutput.includes("not updatable");
+    return !(updateOutput + updateErrorOutput).includes("not updatable");
   } catch (error) {
     if (isNativeError(error)) {
       logger.error(`Error checking CLI updatability: ${error.message}`);
@@ -216,21 +229,61 @@ async function upgradePackageWithPackageManager(
   pm: DetectResult,
   packageName: string,
   targetVersion: string,
-  alias?: string,
+  {
+    alias,
+    global,
+  }: {
+    alias?: string;
+    global?: boolean;
+  },
 ): Promise<void> {
   const packageSpec = alias
     ? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}`
     : `@superblocksteam/${packageName}@${targetVersion}`;
 
-  const installCommand = resolveCommand(pm.agent, "install", [packageSpec]);
+  const installCommand = resolveCommand(
+    pm.agent,
+    global ? "global" : "install",
+    [packageSpec],
+  );
 
   if (!installCommand) {
-    console.error("Could not determine how to upgrade Superblocks packages.");
+    logger.error("Could not determine how to upgrade Superblocks packages.");
     return;
   }
 
   const { command, args } = installCommand;
-  await exec(`${command} ${args.join(" ")}`);
+  logger.info(
+    `Running ${command} ${args.join(" ")} to upgrade ${packageName}...`,
+  );
+  let resolver: (value: void | PromiseLike<void>) => void;
+  let rejecter: (reason?: any) => void;
+  const promise = new Promise<void>((resolve, reject) => {
+    resolver = resolve;
+    rejecter = reject;
+  });
+  const cp = child_process.exec(
+    `${command} ${args.join(" ")}`,
+    {
+      cwd: process.cwd(),
+    },
+    (error) => {
+      if (error) {
+        logger.error(`Failed to upgrade ${packageName} to ${targetVersion}`);
+        rejecter(error);
+      } else {
+        logger.info(`Successfully upgraded ${packageName} to ${targetVersion}`);
+        resolver();
+      }
+    },
+  );
+  cp.stdout?.on("data", (data) => {
+    logger.info(data);
+  });
+  cp.stderr?.on("data", (data) => {
+    logger.warn(data);
+  });
+  return promise;
 }
 
 export async function getCurrentLibraryVersionWithoutPM(): Promise<
@@ -255,109 +308,196 @@ export async function getCurrentLibraryVersionWithoutPM(): Promise<
 export async function checkVersionsAndUpgrade(
   lockService: LockService,
   config?: ApplicationConfig,
-) {
-  // Detect package manager
-  const pm = await detect({
-    strategies: [
-      "packageManager-field",
-      "lockfile",
-      "install-metadata",
-      "devEngines-field",
-    ],
-    cwd: process.cwd(),
-  });
-
-  if (!pm || !config?.id) return;
-
-  // Get current versions
-  const currentCliVersion = await getCurrentCliVersion();
-  const currentLibraryInfo = await getCurrentLibraryVersion(pm);
-
-  // Skip if we're in local development
-  if (
-    !currentCliVersion ||
-    !valid(currentCliVersion) ||
-    currentCliVersion.startsWith("file:") ||
-    currentCliVersion.startsWith("link:") ||
-    !currentLibraryInfo ||
-    !valid(currentLibraryInfo.version) ||
-    currentLibraryInfo.version.startsWith("file:") ||
-    currentLibraryInfo.version.startsWith("link:")
-  ) {
-    return;
-  }
+): Promise<{
+  cliUpdated: boolean;
+  libraryUpdated: boolean;
+}> {
+  const cliUpdated = false;
+  const libraryUpdated = false;
+  let hasFailedToUpgrade = false;
+
+  logger.info("Checking versions");
+
+  await traceFunction({
+    name: "checkVersionsAndUpgrade",
+    tracer,
+    fn: async () => {
+      // Detect package manager
+      const pm = await traceFunction({
+        name: "detectPackageManager",
+        tracer,
+        fn: async () => {
+          return await detect({
+            strategies: [
+              "packageManager-field",
+              "lockfile",
+              "install-metadata",
+              "devEngines-field",
+            ],
+            cwd: process.cwd(),
+          });
+        },
+      });
+
+      if (!pm || !config?.id) return;
+
+      // Get current versions
+      const currentCliInfo = await traceFunction({
+        name: "getCurrentCliVersion",
+        tracer,
+        fn: async () => {
+          return await getCurrentCliVersion();
+        },
+      });
+      const currentLibraryInfo = await traceFunction({
+        name: "getCurrentLibraryVersion",
+        tracer,
+        fn: async () => {
+          return await getCurrentLibraryVersion(pm);
+        },
+      });
+
+      // Skip if we're in local development
+      if (
+        !currentCliInfo ||
+        !valid(currentCliInfo.version) ||
+        currentCliInfo.version.startsWith("file:") ||
+        currentCliInfo.version.startsWith("link:") ||
+        !currentLibraryInfo ||
+        !valid(currentLibraryInfo.version) ||
+        currentLibraryInfo.version.startsWith("file:") ||
+        currentLibraryInfo.version.startsWith("link:")
+      ) {
+        return;
+      }
+
+      // Get target versions from server
+      const targetVersions = await traceFunction({
+        name: "getRemoteVersions",
+        tracer,
+        fn: async () => {
+          return await getRemoteVersions(config);
+        },
+      });
+      if (!targetVersions) return;
+
+      let cliNeedsUpgrade: boolean | string;
+      let libraryNeedsUpgrade: boolean | string;
+      try {
+        // If version is latest, then semver can throw an error
+        // Check if CLI needs upgrade
+        cliNeedsUpgrade =
+          targetVersions.cli && gt(targetVersions.cli, currentCliInfo.version);
+
+        // Check if library needs upgrade
+        libraryNeedsUpgrade =
+          targetVersions.library &&
+          gt(targetVersions.library, currentLibraryInfo.version);
+      } catch (error) {
+        logger.error(
+          "Error checking versions to upgrade, releasing lock and exiting",
+          getErrorMeta(error),
+        );
+        await traceFunction({
+          name: "shutdownLockService",
+          tracer,
+          fn: async () => {
+            await lockService.shutdown({
+              serverInitiated: false,
+            });
+          },
+        });
+        hasFailedToUpgrade = true;
+        return;
+      }
+
+      if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
+        return; // Everything is up to date
+      }
+
+      let cliUpdated = false;
+      let libraryUpdated = false;
+
+      // Upgrade CLI if needed
+      if (cliNeedsUpgrade) {
+        logger.info(
+          `Beginning CLI upgrade from ${currentCliInfo.version} to ${targetVersions.cli}`,
+        );
 
-  // Get target versions from server
-  const targetVersions = await getRemoteVersions(config);
-  if (!targetVersions) return;
+        const oclifUpgradeSucceeded = await traceFunction({
+          name: "upgradeCliWithOclif",
+          tracer,
+          fn: async () => {
+            return await upgradeCliWithOclif(targetVersions.cli);
+          },
+        });
+        if (!oclifUpgradeSucceeded) {
+          logger.info(`Falling back to package manager upgrade for CLI`);
+          // Fall back to package manager upgrade
+          await traceFunction({
+            name: "upgradePackageWithPackageManager - cli",
+            tracer,
+            fn: async () => {
+              await upgradePackageWithPackageManager(
+                pm,
+                "cli",
+                targetVersions.cli,
+                {
+                  alias: currentCliInfo.alias,
+                  global: true,
+                },
+              );
+            },
+          });
+          cliUpdated = true;
+        }
+      }
+
+      // Upgrade library if needed
+      if (libraryNeedsUpgrade) {
+        logger.info(
+          `Beginning library upgrade from ${currentLibraryInfo.version} to ${targetVersions.library}`,
+        );
+        await traceFunction({
+          name: "upgradePackageWithPackageManager - library",
+          tracer,
+          fn: async () => {
+            await upgradePackageWithPackageManager(
+              pm,
+              "library",
+              targetVersions.library,
+              {
+                alias: currentLibraryInfo.alias,
+                global: false,
+              },
+            );
+          },
+        });
+        libraryUpdated = true;
+      }
+
+      // Log what was updated
+      if (cliUpdated && libraryUpdated) {
+        logger.info(
+          "@superblocksteam/cli and @superblocksteam/library have been updated.",
+        );
+      } else if (cliUpdated) {
+        logger.info("@superblocksteam/cli has been updated.");
+      } else if (libraryUpdated) {
+        logger.info("@superblocksteam/library has been updated.");
+      } else {
+        logger.info("No upgrades needed");
+      }
+    },
+  });
 
-  let cliNeedsUpgrade: boolean | string;
-  let libraryNeedsUpgrade: boolean | string;
-  try {
-    // If version is latest, then semver can throw an error
-    // Check if CLI needs upgrade
-    cliNeedsUpgrade =
-      targetVersions.cli && gt(targetVersions.cli, currentCliVersion);
-
-    // Check if library needs upgrade
-    libraryNeedsUpgrade =
-      targetVersions.library &&
-      gt(targetVersions.library, currentLibraryInfo.version);
-  } catch (error) {
-    console.warn(
-      "Error checking versions to upgrade, releasing lock and exiting",
-      error,
-    );
-    await lockService.shutdown({
-      serverInitiated: false,
-    });
+  // Restart CLI if anything was updated
+  if (hasFailedToUpgrade) {
     process.exit(1);
   }
 
-  if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
-    return; // Everything is up to date
-  }
-
-  let cliUpdated = false;
-  let libraryUpdated = false;
-
-  // Upgrade CLI if needed
-  if (cliNeedsUpgrade) {
-    const oclifUpgradeSucceeded = await upgradeCliWithOclif(targetVersions.cli);
-
-    if (!oclifUpgradeSucceeded) {
-      // Fall back to package manager upgrade
-      await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
-      cliUpdated = true;
-    }
-  }
-
-  // Upgrade library if needed
-  if (libraryNeedsUpgrade) {
-    await upgradePackageWithPackageManager(
-      pm,
-      "library",
-      targetVersions.library,
-      currentLibraryInfo.alias,
-    );
-    libraryUpdated = true;
-  }
-
-  // Log what was updated
-  if (cliUpdated && libraryUpdated) {
-    logger.info(
-      "@superblocksteam/cli and @superblocksteam/library have been updated.",
-    );
-  } else if (cliUpdated) {
-    logger.info("@superblocksteam/cli has been updated.");
-  } else if (libraryUpdated) {
-    logger.info("@superblocksteam/library has been updated.");
-  }
-
-  // Restart CLI if anything was updated
-  if (cliUpdated || libraryUpdated) {
-    logger.info("Restarting the CLI…");
-    await lockService.releaseLock();
-    process.exit(AUTO_UPGRADE_EXIT_CODE);
-  }
+  return {
+    cliUpdated,
+    libraryUpdated,
+  };
 }