@embeddable.com/sdk-core 3.1.3 → 3.1.5

package/lib/push.d.ts

@@ -2,6 +2,11 @@ export declare const YAML_OR_JS_FILES: RegExp;
 declare const _default: () => Promise<void>;
 export default _default;
 export declare function archive(ctx: any, yamlFiles: [string, string][], includeBuild?: boolean): Promise<unknown>;
+export declare function sendBuildByApiKey(ctx: any, { apiKey, email, message }: any): Promise<{
+    bundleId: any;
+    email: any;
+    message: any;
+}>;
 export declare function sendBuild(ctx: any, { workspaceId, token }: {
     workspaceId: string;
     token: string;

package/lib/utils.d.ts

@@ -1 +1,8 @@
 export declare const checkNodeVersion: () => Promise<void>;
+/**
+ *  Get the value of a process argument by key
+ *  Example: getArgumentByKey("--email") or getArgumentByKey(["--email", "-e"])
+ * @param key  The key to search for in the process arguments
+ * @returns
+ */
+export declare const getArgumentByKey: (key: string | string[]) => string | undefined;

package/loader/custom-esm-loader.mjs

@@ -33,6 +33,8 @@ const NON_JS_TS_EXTENSIONS =
 
 const currentDir = dirname(fileURLToPath(import.meta.url));
 
+const isWindows = process.platform === "win32";
+
 export const resolve = async (specifier, context, nextResolve) => {
   if (NON_JS_TS_EXTENSIONS.test(specifier)) {
     const mockModulePath = pathToFileURL(
@@ -50,19 +52,37 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   // entrypoint
   if (!context.parentURL) {
+    const processCwd = pathToFileURL(process.cwd()).href;
+
+    const entryPointPath = isWindows
+      ? pathToFileURL(specifier.replace(`${processCwd}/file:/`, "")).href
+      : specifier;
+
     return {
       format: isTS ? "ts" : undefined,
-      url: specifier,
+      url: entryPointPath,
       shortCircuit: true,
     };
   }
+
+  // define if this is a package import
+  const isPackageImport =
+    !specifier.startsWith(".") &&
+    !specifier.startsWith("/") &&
+    !/^[A-Z]:/.test(specifier); // windows path
   // import/require from external library
-  if (context.parentURL.includes("/node_modules/") && !isTS) {
+  if (
+    (context.parentURL.includes("/node_modules/") || isPackageImport) &&
+    !isTS
+  ) {
     return nextResolve(specifier);
   }
+
+  const isFileUrl = specifier.startsWith("file://");
+  const isParentFileUrl = context.parentURL.startsWith("file://");
   const { resolvedModule } = ts.resolveModuleName(
-    specifier,
-    fileURLToPath(context.parentURL),
+    isFileUrl ? fileURLToPath(specifier) : specifier,
+    isParentFileUrl ? fileURLToPath(context.parentURL) : context.parentURL,
     tsconfig,
     host,
     moduleResolutionCache,
@@ -85,7 +105,12 @@ export const resolve = async (specifier, context, nextResolve) => {
   // - something TS couldn't resolve
   // - external library
   // - local project non-TS file
-  return nextResolve(specifier);
+  const specifierPathOrUrl =
+    !resolvedModule?.resolvedFileName?.includes("/node_modules/") && isWindows
+      ? pathToFileURL(specifier).href
+      : specifier;
+
+  return nextResolve(specifierPathOrUrl);
 };
 const tsconfigForSWCNode = {
   ...tsconfig,
@@ -110,6 +135,9 @@ export const load = async (url, context, nextLoad) => {
       shortCircuit: true,
     };
   } else {
+    if (isWindows && !url.startsWith("file://") && url.includes("node_modules")) {
+      return nextLoad(pathToFileURL(url).href, context);
+  }
     return nextLoad(url, context);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddable.com/sdk-core",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",

package/src/entryPoint.js

@@ -0,0 +1,12 @@
+const COMMANDS_MAP = require("../lib/index.js");
+
+async function main() {
+  const command = process.argv[2];
+  const runScript = COMMANDS_MAP[command];
+
+  if (!runScript) process.exit(1);
+
+  await runScript();
+}
+
+main();

package/src/generate.ts

@@ -63,12 +63,15 @@ async function runStencil(ctx: any) {
   const sys = ctx.dev?.sys || createNodeSys({ process });
   const devMode = !!ctx.dev;
 
+  const isWindows = process.platform === "win32";
+
   const validated = await loadConfig({
     initTsConfig: true,
     logger,
     sys,
     config: {
       devMode,
+      maxConcurrentWorkers: isWindows ? 0 : 8, // workers break on windows
       rootDir: ctx.client.buildDir,
       configPath: path.resolve(ctx.client.buildDir, "stencil.config.ts"),
       tsconfig: path.resolve(ctx.client.buildDir, "tsconfig.json"),

package/src/login.ts

@@ -1,9 +1,7 @@
-import * as path from "node:path";
-import * as os from "node:os";
 import * as fs from "node:fs/promises";
 import axios from "axios";
 import provideConfig from "./provideConfig";
-import { jwtDecode } from "jwt-decode";
+
 // @ts-ignore
 import reportErrorToRollbar from "./rollbar.mjs";
 import { CREDENTIALS_DIR, CREDENTIALS_FILE } from "./credentials";

package/src/provideConfig.ts

@@ -12,9 +12,12 @@ export default async () => {
     process.exit(1);
   }
 
+  const isWindows = process.platform === "win32";
   const configPath = fs.existsSync(tsConfigFilePath)
     ? tsConfigFilePath
     : configFilePath;
 
-  return (await import(configPath)).default;
+  const pathOrUrl = isWindows ? url.pathToFileURL(configPath).href : configPath;
+
+  return (await import(pathOrUrl)).default;
 };

package/src/push.ts

@@ -10,7 +10,7 @@ import reportErrorToRollbar from "./rollbar.mjs";
 
 import { findFiles } from "@embeddable.com/sdk-utils";
 import { getToken } from "./login";
-import { checkNodeVersion } from "./utils";
+import { checkNodeVersion, getArgumentByKey } from "./utils";
 
 // grab .cube.yml|js and .sc.yml|js files
 export const YAML_OR_JS_FILES = /^(.*)\.(cube|sc)\.(ya?ml|js)$/;
@@ -27,18 +27,21 @@ export default async () => {
 
     const token = await verify(config);
 
+    if (process.argv.includes("--api-key") || process.argv.includes("-k")) {
+      spinnerPushing = ora("Using API key...").start();
+      await pushByApiKey(config, spinnerPushing);
+
+      spinnerPushing.succeed("Published using API key");
+
+      return;
+    }
+
     const { workspaceId, name: workspaceName } = await selectWorkspace(
       config,
       token,
     );
 
-    const spinnerArchive = ora("Building...").start();
-
-    const filesList = await findFiles(config.client.srcDir, YAML_OR_JS_FILES);
-
-    await archive(config, filesList);
-    spinnerArchive.succeed("Bundling completed");
-
+    await buildArchive(config);
     spinnerPushing = ora(
       `Publishing to ${workspaceName} using ${config.pushBaseUrl}...`,
     ).start();
@@ -49,12 +52,46 @@ export default async () => {
     );
   } catch (error: any) {
     spinnerPushing?.fail("Publishing failed");
-    console.error(error.response?.data || error?.message || error);
+    if (error.response?.statusText === "Unauthorized") {
+      console.error("Unauthorized. Please check your credentials.");
+    } else {
+      console.error(error.response?.data || error?.message || error);
+    }
+
     await reportErrorToRollbar(error);
     process.exit(1);
   }
 };
 
+async function pushByApiKey(config: any, spinner: any) {
+  const apiKey = getArgumentByKey(["--api-key", "-k"]);
+
+  if (!apiKey) {
+    spinner.fail("No API key provided");
+    process.exit(1);
+  }
+
+  const email = getArgumentByKey(["--email", "-e"]);
+
+  if (!email || !/\S+@\S+\.\S+/.test(email)) {
+    spinner.fail(
+      "Invalid email provided. Please provide a valid email using --email (-e) flag",
+    );
+    process.exit(1);
+  }
+
+  // message is optional
+  const message = getArgumentByKey(["--message", "-m"]);
+
+  await buildArchive(config);
+
+  return sendBuildByApiKey(config, {
+    apiKey,
+    email,
+    message,
+  });
+}
+
 async function selectWorkspace(ctx: any, token: string) {
   const workspaceSpinner = ora({
     text: `Fetching workspaces using ${ctx.pushBaseUrl}...`,
@@ -112,6 +149,15 @@ async function verify(ctx: any) {
   return token;
 }
 
+async function buildArchive(config: any) {
+  const spinnerArchive = ora("Building...").start();
+
+  const filesList = await findFiles(config.client.srcDir, YAML_OR_JS_FILES);
+
+  await archive(config, filesList);
+  return spinnerArchive.succeed("Bundling completed");
+}
+
 export async function archive(
   ctx: any,
   yamlFiles: [string, string][],
@@ -143,6 +189,37 @@ export async function archive(
   });
 }
 
+export async function sendBuildByApiKey(
+  ctx: any,
+  { apiKey, email, message }: 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 form = new FormData();
+  form.set("file", file, "embeddable-build.zip");
+
+  const metadataBlob = new Blob(
+    [JSON.stringify({ authorEmail: email, description: message })],
+    { type: "application/json" },
+  );
+  form.set("metadata", metadataBlob, "metadata.json");
+
+  const response = await uploadFile(
+    form,
+    `${ctx.pushBaseUrl}/api/v1/bundle/upload`,
+    apiKey,
+  );
+  await fs.rm(ctx.client.archiveFile);
+
+  return { bundleId: response.data?.bundleId, email, message };
+}
+
 export async function sendBuild(
   ctx: any,
   { workspaceId, token }: { workspaceId: string; token: string },
@@ -158,7 +235,17 @@ export async function sendBuild(
   const form = new FormData();
   form.set("file", file, "embeddable-build.zip");
 
-  await axios.post(`${ctx.pushBaseUrl}/bundle/${workspaceId}/upload`, form, {
+  await uploadFile(
+    form,
+    `${ctx.pushBaseUrl}/bundle/${workspaceId}/upload`,
+    token,
+  );
+
+  await fs.rm(ctx.client.archiveFile);
+}
+
+async function uploadFile(formData: any, url: string, token: string) {
+  return axios.post(url, formData, {
     headers: {
       "Content-Type": "multipart/form-data",
       Authorization: `Bearer ${token}`,
@@ -166,8 +253,6 @@ export async function sendBuild(
     maxContentLength: Infinity,
     maxBodyLength: Infinity,
   });
-
-  await fs.rm(ctx.client.archiveFile);
 }
 
 async function getWorkspaces(ctx: any, token: string, workspaceSpinner: any) {

package/src/utils.ts

@@ -22,3 +22,25 @@ export const checkNodeVersion = async () => {
     process.exit(1);
   }
 };
+
+/**
+ *  Get the value of a process argument by key
+ *  Example: getArgumentByKey("--email") or getArgumentByKey(["--email", "-e"])
+ * @param key  The key to search for in the process arguments
+ * @returns
+ */
+export const getArgumentByKey = (key: string | string[]) => {
+  if (Array.isArray(key)) {
+    for (const k of key) {
+      if (process.argv.includes(k)) {
+        const index = process.argv.indexOf(k);
+        return index !== -1 ? process.argv[index + 1] : undefined;
+      }
+    }
+
+    return undefined;
+  }
+
+  const index = process.argv.indexOf(key);
+  return index !== -1 ? process.argv[index + 1] : undefined;
+};

package/lib/entryPoint.d.ts

@@ -1 +0,0 @@
-export {};

package/src/entryPoint.ts

@@ -1,16 +0,0 @@
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const COMMANDS_MAP = await import(path.join(__dirname, "../lib/index.js"));
-
-async function main() {
-  const command = process.argv[2];
-  const runScript = COMMANDS_MAP[command];
-
-  if (!runScript) process.exit(1);
-
-  await runScript();
-}
-
-main();