@embeddable.com/sdk-core 3.13.3-next.1 → 3.13.4-next.0

package/lib/push.d.ts

@@ -8,18 +8,15 @@ export declare function archive(args: {
     ctx: ResolvedEmbeddableConfig;
     filesList: [string, string][];
     isDev: boolean;
-    includeComponents: boolean;
 }): Promise<unknown>;
+export declare function createFormData(filePath: string, metadata: Record<string, any>): Promise<import("formdata-node").FormData>;
 export declare function sendBuildByApiKey(ctx: ResolvedEmbeddableConfig, { apiKey, email, message, }: {
     apiKey: string;
     email: string;
     message?: string;
-}): Promise<{
-    bundleId: any;
-    email: string;
-    message: string | undefined;
-}>;
-export declare function sendBuild(ctx: ResolvedEmbeddableConfig, { workspaceId, token }: {
+}): Promise<any>;
+export declare function sendBuild(ctx: ResolvedEmbeddableConfig, { workspaceId, token, message, }: {
     workspaceId: string;
     token: string;
+    message?: string;
 }): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddable.com/sdk-core",
-  "version": "3.13.3-next.1",
+  "version": "3.13.4-next.0",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",
@@ -39,7 +39,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@embeddable.com/sdk-utils": "0.7.1",
+    "@embeddable.com/sdk-utils": "0.7.2",
     "@inquirer/prompts": "^7.2.1",
     "@stencil/core": "^4.23.0",
     "@swc-node/register": "^1.10.9",

package/src/dev.ts

@@ -343,7 +343,6 @@ const sendDataModelsAndContextsChanges = async (ctx: any) => {
       ctx,
       filesList,
       isDev: true,
-      includeComponents: false,
     });
     await sendBuild(ctx, { workspaceId: previewWorkspace, token });
     sending.succeed(`Data models and/or security context synchronized`);

package/src/push.test.ts

@@ -227,29 +227,6 @@ describe("push", () => {
       expect(process.exit).toHaveBeenCalledWith(1);
     });
 
-    it("should only include model files when pushComponents is false", async () => {
-      const mockArchiver = {
-        finalize: vi.fn(),
-        pipe: vi.fn(),
-        directory: vi.fn(),
-        file: vi.fn(),
-      };
-      vi.mocked(archiver.create).mockReturnValue(mockArchiver as any);
-
-      vi.mocked(provideConfig).mockResolvedValue({
-        ...config,
-        pushModels: true,
-        pushComponents: false,
-      });
-
-      await push();
-
-      // Should not include component build directory
-      expect(mockArchiver.directory).not.toHaveBeenCalled();
-      // Should include model files
-      expect(mockArchiver.file).toHaveBeenCalled();
-    });
-
     it("should only include component files when pushModels is false", async () => {
       const mockArchiver = {
         finalize: vi.fn(),
@@ -498,45 +475,6 @@ describe("push", () => {
       );
     });
 
-    it("should only include model files when pushComponents is false", async () => {
-      vi.mocked(findFiles)
-        .mockResolvedValueOnce([["model.cube.yml", "/path/to/model.cube.yml"]])
-        .mockResolvedValueOnce([["context.sc.yml", "/path/to/context.sc.yml"]]);
-
-      const testConfig = {
-        ...config,
-        pushModels: true,
-        pushComponents: false,
-        client: {
-          ...config.client,
-          srcDir: "/src",
-        },
-      } as ResolvedEmbeddableConfig;
-
-      await buildArchive(testConfig);
-
-      // Should not include component build directory
-      expect(mockArchiver.directory).not.toHaveBeenCalled();
-      // Should not include global.css
-      expect(mockArchiver.file).not.toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({ name: "global.css" }),
-      );
-      // Should include model files
-      expect(mockArchiver.file).toHaveBeenCalledWith(
-        "/path/to/model.cube.yml",
-        {
-          name: "model.cube.yml",
-        },
-      );
-      expect(mockArchiver.file).toHaveBeenCalledWith(
-        "/path/to/context.sc.yml",
-        {
-          name: "context.sc.yml",
-        },
-      );
-    });
-
     it("should only include component files when pushModels is false", async () => {
       const testConfig = {
         ...config,

package/src/push.ts

@@ -64,6 +64,7 @@ export default async () => {
     );
 
     const workspacePreviewUrl = `${config.previewBaseUrl}/workspace/${workspaceId}`;
+    const message = getArgumentByKey(["--message", "-m"]);
 
     breadcrumbs.push("build archive");
     await buildArchive(config);
@@ -72,7 +73,7 @@ export default async () => {
     );
 
     breadcrumbs.push("send build");
-    await sendBuild(config, { workspaceId, token });
+    await sendBuild(config, { workspaceId, token, message });
     spinnerPushing.succeed(
       `Published to ${workspaceName} using ${workspacePreviewUrl}`,
     );
@@ -170,7 +171,6 @@ export async function buildArchive(config: ResolvedEmbeddableConfig) {
     ctx: config,
     filesList,
     isDev: false,
-    includeComponents: config.pushComponents,
   });
   return spinnerArchive.succeed("Bundling completed");
 }
@@ -179,9 +179,8 @@ export async function archive(args: {
   ctx: ResolvedEmbeddableConfig;
   filesList: [string, string][];
   isDev: boolean;
-  includeComponents: boolean;
 }) {
-  const { ctx, filesList, isDev, includeComponents } = args;
+  const { ctx, filesList, isDev } = args;
   const output = fsSync.createWriteStream(ctx.client.archiveFile);
 
   const archive = archiver.create("zip", {
@@ -189,7 +188,7 @@ export async function archive(args: {
   });
 
   archive.pipe(output);
-  if (!isDev && includeComponents) {
+  if (!isDev) {
     archive.directory(ctx.client.buildDir, false);
     archive.file(ctx.client.globalCss, {
       name: "global.css",
@@ -209,38 +208,40 @@ export async function archive(args: {
   });
 }
 
-export async function sendBuildByApiKey(
-  ctx: ResolvedEmbeddableConfig,
-  {
-    apiKey,
-    email,
-    message,
-  }: { apiKey: string; email: string; message?: string },
+export async function createFormData(
+  filePath: string,
+  metadata: Record<string, any>,
 ) {
   const { FormData, Blob } = await import("formdata-node");
   const { fileFromPath } = await import("formdata-node/file-from-path");
 
-  const file = await fileFromPath(
-    ctx.client.archiveFile,
-    "embeddable-build.zip",
-  );
-
+  const file = await fileFromPath(filePath, "embeddable-build.zip");
   const form = new FormData();
   form.set("file", file, "embeddable-build.zip");
 
-  const metadataBlob = new Blob(
-    [
-      JSON.stringify({
-        pushModels: ctx.pushModels,
-        pushComponents: ctx.pushComponents,
-        authorEmail: email,
-        description: message,
-      }),
-    ],
-    { type: "application/json" },
-  );
+  const metadataBlob = new Blob([JSON.stringify(metadata)], {
+    type: "application/json",
+  });
   form.set("request", metadataBlob, "request.json");
 
+  return form;
+}
+
+export async function sendBuildByApiKey(
+  ctx: ResolvedEmbeddableConfig,
+  {
+    apiKey,
+    email,
+    message,
+  }: { apiKey: string; email: string; message?: string },
+) {
+  const form = await createFormData(ctx.client.archiveFile, {
+    pushModels: ctx.pushModels,
+    pushComponents: ctx.pushComponents,
+    authorEmail: email,
+    description: message,
+  });
+
   const response = await uploadFile(
     form,
     `${ctx.pushBaseUrl}/api/v1/bundle/upload`,
@@ -248,23 +249,23 @@ export async function sendBuildByApiKey(
   );
   await fs.rm(ctx.client.archiveFile);
 
-  return { bundleId: response.data?.bundleId, email, message };
+  return { ...response.data, message };
 }
 
 export async function sendBuild(
   ctx: ResolvedEmbeddableConfig,
-  { workspaceId, token }: { workspaceId: string; token: string },
+  {
+    workspaceId,
+    token,
+    message,
+  }: { workspaceId: string; token: string; message?: string },
 ) {
-  const { FormData } = await import("formdata-node");
-  const { fileFromPath } = await import("formdata-node/file-from-path");
-
-  const file = await fileFromPath(
-    ctx.client.archiveFile,
-    "embeddable-build.zip",
-  );
-
-  const form = new FormData();
-  form.set("file", file, "embeddable-build.zip");
+  const form = await createFormData(ctx.client.archiveFile, {
+    pushModels: ctx.pushModels,
+    pushComponents: ctx.pushComponents,
+    authorEmail: "",
+    description: message,
+  });
 
   await uploadFile(
     form,