@embeddable.com/sdk-core 3.12.0-next.1 → 3.12.0-next.2

package/bin/embeddable

@@ -14,17 +14,20 @@ if (!process.env.LOADER_APPLIED) {
     VITE_CJS_IGNORE_WARNING: "true", // see https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated
   };
 
+  const isWindows = process.platform === "win32";
+
   const dirname = path.dirname(new URL(import.meta.url).pathname);
+  const normalizedDirname = isWindows
+    ? dirname.slice(1) // Remove leading slash on Windows
+    : dirname;
 
-  const entryPointPath = path.join(dirname, "../loader/entryPoint.js");
+  const entryPointPath = path.join(normalizedDirname, "../loader/entryPoint.js");
   const customLoaderPath = path.join(
-    dirname,
+    normalizedDirname,
     "../loader/custom-esm-loader.mjs",
   );
 
-  const isWindows = process.platform === "win32";
-
-  const entryPointPathOrUrl = isWindows
+   const entryPointPathOrUrl = isWindows
     ? pathToFileURL(entryPointPath).href
     : entryPointPath;
 

package/lib/index.esm.js

@@ -21995,7 +21995,7 @@ var defineConfig = ({ plugins, pushBaseUrl, audienceUrl, authDomain, authClientI
 };
 
 var name = "@embeddable.com/sdk-core";
-var version = "3.12.0-next.1";
+var version = "3.12.0-next.2";
 var description = "Core Embeddable SDK module responsible for web-components bundling and publishing.";
 var keywords = [
 	"embeddable",

package/lib/index.js

@@ -22023,7 +22023,7 @@ var defineConfig = ({ plugins, pushBaseUrl, audienceUrl, authDomain, authClientI
 };
 
 var name = "@embeddable.com/sdk-core";
-var version = "3.12.0-next.1";
+var version = "3.12.0-next.2";
 var description = "Core Embeddable SDK module responsible for web-components bundling and publishing.";
 var keywords = [
 	"embeddable",

package/loader/custom-esm-loader.mjs

@@ -12,6 +12,7 @@ import ts from "typescript";
 import { readDefaultTsConfig } from "@swc-node/register/read-default-tsconfig";
 import { compile } from "./custom-esm-register.cjs";
 import fs from "fs";
+import path from "path";
 
 // Find the tsconfig.json in the customer's project directory
 const tsconfigPath = ts.findConfigFile(
@@ -59,6 +60,13 @@ const currentDir = dirname(fileURLToPath(import.meta.url));
 
 const isWindows = process.platform === "win32";
 
+function cleanWindowsFileURL(url) {
+  // Remove any duplicate file:/ prefixes and normalize slashes
+  return url.replace(/file:\/+/g, 'file:///')
+    .replace(/\\/g, '/')
+    .replace(/file:\/+([A-Za-z]:)/, 'file:///$1');
+}
+
 export const resolve = async (specifier, context, nextResolve) => {
   if (NON_JS_TS_EXTENSIONS.test(specifier)) {
     const mockModulePath = pathToFileURL(
@@ -76,19 +84,54 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   // Entry point
   if (!context.parentURL) {
-    const processCwd = pathToFileURL(process.cwd()).href;
-
-    const entryPointPath = isWindows
-      ? pathToFileURL(specifier.replace(`${processCwd}/file:/`, "")).href
-      : specifier;
+    if (isWindows) {
+      // Handle the case where the specifier contains both the cwd and the actual path
+      const parts = specifier.split('file:/');
+      const lastPart = parts[parts.length - 1];
+      
+      // Convert the path to a proper file URL
+      const cleanPath = lastPart.replace(/^\/+/, '');
+      const entryPointPath = pathToFileURL(cleanPath).href;
+      
+      return {
+        format: isTS ? "ts" : undefined,
+        url: cleanWindowsFileURL(entryPointPath),
+        shortCircuit: true,
+      };
+    }
 
-    const resolved = {
+    return {
       format: isTS ? "ts" : undefined,
-      url: entryPointPath,
+      url: specifier,
       shortCircuit: true,
     };
+  }
 
-    return resolved;
+  // Handle SDK relative imports
+  if (isWindows && specifier.startsWith('.') && context.parentURL?.includes('embeddable-sdk')) {
+    const parentPath = fileURLToPath(context.parentURL);
+    const parentDir = dirname(parentPath);
+    let resolvedPath = join(parentDir, specifier);
+    
+    // If no extension is provided, try common extensions
+    if (!path.extname(resolvedPath)) {
+      const extensions = ['.js', '.mjs', '.cjs', '.ts', '.mts'];
+      for (const ext of extensions) {
+        const pathWithExt = resolvedPath + ext;
+        if (fs.existsSync(pathWithExt) && fs.statSync(pathWithExt).isFile()) {
+          resolvedPath = pathWithExt;
+          break;
+        }
+      }
+    }
+
+    // Check if the resolved path exists and is a file
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
+      return {
+        url: pathToFileURL(resolvedPath).href,
+        shortCircuit: true
+      };
+    }
   }
 
   // Determine if this is a package import
@@ -99,14 +142,14 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   // External library import
   if (
-    (context.parentURL.includes("/node_modules/") || isPackageImport) &&
+    (context.parentURL?.includes("/node_modules/") || isPackageImport) &&
     !isTS
   ) {
     return nextResolve(specifier);
   }
 
   const isFileUrl = specifier.startsWith("file://");
-  const isParentFileUrl = context.parentURL.startsWith("file://");
+  const isParentFileUrl = context.parentURL?.startsWith("file://");
 
   // Resolve the module using TypeScript's module resolution
   const { resolvedModule } = ts.resolveModuleName(

package/loader/entryPoint.js

@@ -1,8 +1,16 @@
-import COMMANDS_MAP from "../lib/index.js";
+import { build, defineConfig, dev, login, push } from "../lib/index.js";
 import { spawn } from "child_process";
 import path from "path";
 import fs from "fs";
 
+const COMMANDS_MAP = {
+  build,
+  login,
+  push,
+  dev,
+  defineConfig,
+};
+
 export async function main() {
   const command = process.argv[2];
   const runScript = COMMANDS_MAP[command];
@@ -40,11 +48,13 @@ async function runTypeScriptCheck(skipTypeCheck = false) {
       return;
     }
 
+    const isWindows = process.platform === "win32";
+    const tscBinary = isWindows ? "tsc.cmd" : "tsc";
     const tscPath = path.join(
       customerProjectDir,
       "node_modules",
       ".bin",
-      process.platform === "win32" ? "tsc.cmd" : "tsc",
+      tscBinary,
     );
 
     if (!fs.existsSync(tscPath) && !skipTypeCheck) {
@@ -55,20 +65,34 @@ async function runTypeScriptCheck(skipTypeCheck = false) {
       process.exit(1);
     }
 
-    const tsc = spawn(tscPath, ["--noEmit", "--pretty"], {
-      cwd: customerProjectDir,
-      stdio: "inherit",
-      env: { ...process.env, FORCE_COLOR: "true" },
-    });
+    try {
+      const tsc = spawn(tscPath, ["--noEmit", "--pretty"], {
+        cwd: customerProjectDir,
+        stdio: "inherit",
+        env: { ...process.env, FORCE_COLOR: "true" },
+        shell: isWindows, // Use shell on Windows
+        windowsVerbatimArguments: isWindows, // Preserve argument quoting on Windows
+      });
 
-    tsc.on("exit", (code) => {
-      if (code !== 0) {
+      tsc.on("error", (err) => {
+        outputWarning(`Failed to start TypeScript compiler: ${err.message}`);
         outputWarning(skipTypeCheckWarning);
         process.exit(1);
-      } else {
-        resolve();
-      }
-    });
+      });
+
+      tsc.on("exit", (code) => {
+        if (code !== 0) {
+          outputWarning(skipTypeCheckWarning);
+          process.exit(1);
+        } else {
+          resolve();
+        }
+      });
+    } catch (err) {
+      outputWarning(`Failed to start TypeScript compiler: ${err.message}`);
+      outputWarning(skipTypeCheckWarning);
+      process.exit(1);
+    }
   });
 }
 

package/loader/entryPoint.test.js

@@ -8,10 +8,11 @@ vi.mock("child_process");
 vi.mock("fs");
 vi.mock("path");
 vi.mock("../lib/index.js", () => ({
-  default: {
-    build: vi.fn().mockResolvedValue(undefined),
-    someOtherCommand: vi.fn().mockResolvedValue(undefined),
-  },
+  build: vi.fn().mockResolvedValue(undefined),
+  login: vi.fn().mockResolvedValue(undefined),
+  push: vi.fn().mockResolvedValue(undefined),
+  dev: vi.fn().mockResolvedValue(undefined),
+  defineConfig: vi.fn().mockResolvedValue(undefined),
 }));
 
 describe("entryPoint", () => {
@@ -44,7 +45,7 @@ describe("entryPoint", () => {
     });
 
     // Set up process.argv for the test
-    process.argv = ["node", "script.js", "someOtherCommand"];
+    process.argv = ["node", "script.js", "defineConfig"];
 
     // Dynamically import main after mocking process.exit
     const entryPoint = await import("./entryPoint.js");

package/package.json

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