@embeddable.com/sdk-core 3.1.7 → 3.1.8

package/package.json

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

package/src/defineConfig.ts

@@ -1,4 +1,5 @@
 import * as path from "node:path";
+import { existsSync } from "node:fs";
 
 export type EmbeddableConfig = {
   plugins: (() => {
@@ -15,6 +16,8 @@ export type EmbeddableConfig = {
   applicationEnvironment?: string;
   rollbarAccessToken?: string;
   previewBaseUrl?: string;
+  componentsSrc?: string;
+  modelsSrc?: string;
 };
 
 export default ({
@@ -27,10 +30,30 @@ export default ({
   applicationEnvironment,
   rollbarAccessToken,
   previewBaseUrl,
+  modelsSrc,
+  componentsSrc = "src",
 }: EmbeddableConfig) => {
   const coreRoot = path.resolve(__dirname, "..");
   const clientRoot = process.cwd();
 
+  if (!path.isAbsolute(componentsSrc)) {
+    componentsSrc = path.resolve(clientRoot, componentsSrc);
+
+    if (!existsSync(componentsSrc)) {
+      throw new Error(
+        `componentsSrc directory ${componentsSrc} does not exist`,
+      );
+    }
+  }
+
+  if (modelsSrc && !path.isAbsolute(modelsSrc)) {
+    modelsSrc = path.resolve(clientRoot, modelsSrc);
+
+    if (!existsSync(modelsSrc)) {
+      throw new Error(`modelsSrc directory ${modelsSrc} does not exist`);
+    }
+  }
+
   return {
     core: {
       rootDir: coreRoot,
@@ -39,8 +62,9 @@ export default ({
     },
     client: {
       rootDir: clientRoot,
+      srcDir: path.resolve(clientRoot, componentsSrc),
+      modelsSrc: modelsSrc ? path.resolve(clientRoot, modelsSrc) : undefined,
       buildDir: path.resolve(clientRoot, ".embeddable-build"),
-      srcDir: path.resolve(clientRoot, "src"),
       tmpDir: path.resolve(clientRoot, ".embeddable-tmp"),
       componentDir: path.resolve(clientRoot, ".embeddable-build", "component"),
       stencilBuild: path.resolve(

package/src/push.ts

@@ -41,7 +41,7 @@ export default async () => {
       token,
     );
 
-    const workspacePreviewUrl = `${config.previewBaseUrl}/workspace/${workspaceId}`
+    const workspacePreviewUrl = `${config.previewBaseUrl}/workspace/${workspaceId}`;
 
     await buildArchive(config);
     spinnerPushing = ora(
@@ -154,7 +154,10 @@ async function verify(ctx: any) {
 async function buildArchive(config: any) {
   const spinnerArchive = ora("Building...").start();
 
-  const filesList = await findFiles(config.client.srcDir, YAML_OR_JS_FILES);
+  const filesList = await findFiles(
+    config.client.modelsSrc || config.client.srcDir,
+    YAML_OR_JS_FILES,
+  );
 
   await archive(config, filesList);
   return spinnerArchive.succeed("Bundling completed");

package/src/validate.ts

@@ -28,7 +28,7 @@ export default async (ctx: any, exitIfInvalid = true) => {
 
   const filesList = await findFiles(ctx.client.srcDir, CUBE_YAML_FILE_REGEX);
   const securityContextFilesList = await findFiles(
-    ctx.client.srcDir,
+    ctx.client.modelsSrc || ctx.client.srcDir,
     SECURITY_CONTEXT_FILE_REGEX,
   );
 
@@ -81,13 +81,13 @@ export async function dataModelsValidation(filesList: [string, string][]) {
 
     const cubeModelSafeParse = cubeModelSchema.safeParse(cube);
     const viewModelSafeParse = viewModelSchema.safeParse(cube);
-  
+
     if (cube.cubes && !cubeModelSafeParse.success) {
       errorFormatter(cubeModelSafeParse.error.issues).forEach((error) => {
         errors.push(`${filePath}: ${error}`);
       });
     }
-    
+
     if (cube.views && !viewModelSafeParse.success) {
       errorFormatter(viewModelSafeParse.error.issues).forEach((error) => {
         errors.push(`${filePath}: ${error}`);
@@ -185,14 +185,15 @@ const cubeModelSchema = z
   );
 
 const viewModelSchema = z.object({
-  views: z.object({
-    name: z.string(),
-    cubes: z
-      .object({
-        join_path: z.string(),
-      })
-      .array()
-  })
+  views: z
+    .object({
+      name: z.string(),
+      cubes: z
+        .object({
+          join_path: z.string(),
+        })
+        .array(),
+    })
     .array()
     .min(1),
 });