@embeddable.com/sdk-core 3.14.0-next.2 → 3.14.0-next.4

package/lib/index.esm.js

@@ -21860,8 +21860,8 @@ async function selectWorkspace(ora, ctx, token) {
 
 // grab cube files
 const CUBE_FILES = /^(.*)\.cube\.(ya?ml|js)$/;
-// grab security context and client context files
-const PRESET_FILES = /^(.*)\.(sc|cc)\.ya?ml$/;
+const CLIENT_CONTEXT_FILES = /^(.*)\.cc\.ya?ml$/;
+const SECURITY_CONTEXT_FILES = /^(.*)\.sc\.ya?ml$/;
 var push = async () => {
     var _a;
     await initLogger("push");
@@ -21958,11 +21958,15 @@ async function buildArchive(config) {
     const filesList = [];
     if (config.pushModels) {
         const cubeFilesList = await findFiles(config.client.modelsSrc || config.client.srcDir, CUBE_FILES);
-        const contextFilesList = await findFiles(config.client.presetsSrc || config.client.srcDir, PRESET_FILES);
+        const clientContextFilesList = await findFiles(config.client.presetsSrc || config.client.srcDir, CLIENT_CONTEXT_FILES);
+        const securityContextFilesList = await findFiles(config.client.presetsSrc || config.client.srcDir, SECURITY_CONTEXT_FILES);
         filesList.push(...cubeFilesList.map((entry) => [
             path.basename(entry[1]),
             entry[1],
-        ]), ...contextFilesList.map((entry) => [
+        ]), ...clientContextFilesList.map((entry) => [
+            path.basename(entry[1]),
+            entry[1],
+        ]), ...securityContextFilesList.map((entry) => [
             path.basename(entry[1]),
             entry[1],
         ]));
@@ -22121,13 +22125,6 @@ var dev = async () => {
             }
         }
         workspacePreparation.succeed("Workspace is ready");
-        const { themeWatcher, lifecycleWatcher } = await buildGlobalHooks(config);
-        if (themeWatcher) {
-            await globalHookWatcher(themeWatcher, config);
-        }
-        if (lifecycleWatcher) {
-            await globalHookWatcher(lifecycleWatcher, config);
-        }
         const server = http.createServer(async (request, res) => {
             var _a;
             res.setHeader("Access-Control-Allow-Origin", "*");
@@ -22150,6 +22147,7 @@ var dev = async () => {
             catch (_b) { }
             serve(request, res, done);
         });
+        const { themeWatcher, lifecycleWatcher } = await buildGlobalHooks(config);
         wss = new WebSocketServer({ server });
         server.listen(SERVER_PORT, async () => {
             const watchers = [];
@@ -22170,27 +22168,34 @@ var dev = async () => {
                 metaFileName: "embeddable-components-meta.js",
                 editorsMetaFileName: "embeddable-editors-meta.js",
             });
-            await sendDataModelsAndContextsChanges(config);
-            for (const getPlugin of config.plugins) {
-                const plugin = getPlugin();
-                breadcrumbs.push("validate plugin");
-                await plugin.validate(config);
-                breadcrumbs.push("build plugin");
-                const watcher = await plugin.build(config);
-                breadcrumbs.push("configure watcher");
-                await configureWatcher(watcher, config);
-                watchers.push(watcher);
-            }
-            const dataModelAndSecurityContextWatch = await dataModelAndSecurityContextWatcher(config);
-            const customGlobalCssWatch = globalCssWatcher(config);
-            watchers.push(dataModelAndSecurityContextWatch);
-            watchers.push(customGlobalCssWatch);
-            if (themeWatcher) {
-                watchers.push(themeWatcher);
+            await sendBuildChanges(config);
+            if (config.pushComponents) {
+                for (const getPlugin of config.plugins) {
+                    const plugin = getPlugin();
+                    breadcrumbs.push("validate plugin");
+                    await plugin.validate(config);
+                    breadcrumbs.push("build plugin");
+                    const watcher = await plugin.build(config);
+                    breadcrumbs.push("configure watcher");
+                    await configureWatcher(watcher, config);
+                    watchers.push(watcher);
+                }
+                const customGlobalCssWatch = globalCssWatcher(config);
+                watchers.push(customGlobalCssWatch);
+                if (themeWatcher) {
+                    await globalHookWatcher(themeWatcher, config);
+                    watchers.push(themeWatcher);
+                }
+                if (lifecycleWatcher) {
+                    await globalHookWatcher(lifecycleWatcher, config);
+                    watchers.push(lifecycleWatcher);
+                }
             }
-            if (lifecycleWatcher) {
-                watchers.push(lifecycleWatcher);
+            else {
+                await openDevWorkspacePage(config.previewBaseUrl);
             }
+            const cubeSecurityContextAndClientContextWatch = await cubeSecurityContextAndClientContextWatcher(config);
+            watchers.push(cubeSecurityContextAndClientContextWatch);
         });
     }
     catch (error) {
@@ -22253,31 +22258,45 @@ const onBuildStart = async (ctx) => {
     }
     sendMessage("componentsBuildStart", { changedFiles });
 };
+const openDevWorkspacePage = async (previewBaseUrl) => {
+    const open = (await import('open')).default;
+    return await open(`${previewBaseUrl}/workspace/${previewWorkspace}`);
+};
 const onBundleBuildEnd = async (ctx) => {
     if (!onlyTypesChanged() || changedFiles.length === 0) {
         await buildWebComponent(ctx);
     }
     if (browserWindow == null) {
-        const open = (await import('open')).default;
-        browserWindow = await open(`${ctx.previewBaseUrl}/workspace/${previewWorkspace}`);
+        browserWindow = await openDevWorkspacePage(ctx.previewBaseUrl);
     }
     else {
         sendMessage("componentsBuildSuccess");
     }
 };
-const dataModelAndSecurityContextWatcher = async (ctx) => {
-    const [modelsFiles, presetsFiles] = await Promise.all([
-        fg("**/*.cube.{yaml,yml,js}", {
-            cwd: ctx.client.modelsSrc,
-            absolute: true,
-        }),
-        fg("**/*.{sc,cc}.{yaml,yml}", {
+const cubeSecurityContextAndClientContextWatcher = async (ctx) => {
+    let filesToWatch = [];
+    if (ctx.pushComponents) {
+        const clientContextFiles = await fg("**/*.cc.{yaml,yml}", {
             cwd: ctx.client.presetsSrc,
             absolute: true,
-        }),
-    ]);
-    const fsWatcher = chokidar.watch([...modelsFiles, ...presetsFiles], chokidarWatchOptions);
-    fsWatcher.on("all", () => sendDataModelsAndContextsChanges(ctx));
+        });
+        filesToWatch = [...filesToWatch, ...clientContextFiles];
+    }
+    if (ctx.pushModels) {
+        const [cubeFiles, securityContextFiles] = await Promise.all([
+            fg("**/*.cube.{yaml,yml,js}", {
+                cwd: ctx.client.modelsSrc,
+                absolute: true,
+            }),
+            fg("**/*.sc.{yaml,yml}", {
+                cwd: ctx.client.presetsSrc,
+                absolute: true,
+            }),
+        ]);
+        filesToWatch = [...filesToWatch, ...cubeFiles, ...securityContextFiles];
+    }
+    const fsWatcher = chokidar.watch(filesToWatch, chokidarWatchOptions);
+    fsWatcher.on("all", () => sendBuildChanges(ctx));
     return fsWatcher;
 };
 const globalCssWatcher = (ctx) => {
@@ -22287,33 +22306,46 @@ const globalCssWatcher = (ctx) => {
     });
     return fsWatcher;
 };
-const sendDataModelsAndContextsChanges = async (ctx) => {
-    sendMessage("dataModelsAndOrSecurityContextUpdateStart");
+const sendBuildChanges = async (ctx) => {
     const isValid = await validate(ctx);
-    if (isValid) {
-        const token = await getToken();
-        const sending = ora("Synchronising data models and/or security contexts...").start();
-        const cubeFilesList = await findFiles(ctx.client.modelsSrc, CUBE_FILES);
-        const contextFilesList = await findFiles(ctx.client.presetsSrc, PRESET_FILES);
+    if (!isValid) {
+        return sendMessage("dataModelsAndOrSecurityContextUpdateError");
+    }
+    const sending = ora("Synchronising data models and/or security contexts...").start();
+    let filesList = [];
+    if (ctx.pushComponents) {
+        const clientContextFilesList = await findFiles(ctx.client.presetsSrc, CLIENT_CONTEXT_FILES);
         // Map the files to include their full filenames
-        const filesList = [...cubeFilesList, ...contextFilesList].map((entry) => [path.basename(entry[1]), entry[1]]);
-        // add manifest to the archive
-        filesList.push([
-            "embeddable-manifest.json",
-            path.resolve(ctx.client.buildDir, "embeddable-manifest.json"),
-        ]);
-        await archive({
-            ctx,
-            filesList,
-            isDev: true,
-        });
-        await sendBuild(ctx, { workspaceId: previewWorkspace, token });
-        sending.succeed(`Data models and/or security context synchronized`);
-        sendMessage("dataModelsAndOrSecurityContextUpdateSuccess");
+        const clientContextFileList = [...clientContextFilesList].map((entry) => [path.basename(entry[1]), entry[1]]);
+        filesList = [...clientContextFileList];
     }
-    else {
-        sendMessage("dataModelsAndOrSecurityContextUpdateError");
+    if (ctx.pushModels) {
+        const cubeFilesList = await findFiles(ctx.client.modelsSrc, CUBE_FILES);
+        const securityContextFilesList = await findFiles(ctx.client.presetsSrc, SECURITY_CONTEXT_FILES);
+        // Map the files to include their full filenames
+        const cubeAndSecurityContextFileList = [
+            ...cubeFilesList,
+            ...securityContextFilesList,
+        ].map((entry) => [path.basename(entry[1]), entry[1]]);
+        filesList = [
+            ...filesList,
+            ...cubeAndSecurityContextFileList,
+            // add manifest to the archive
+            [
+                "embeddable-manifest.json",
+                path.resolve(ctx.client.buildDir, "embeddable-manifest.json"),
+            ],
+        ];
     }
+    const token = await getToken();
+    await archive({
+        ctx,
+        filesList,
+        isDev: true,
+    });
+    await sendBuild(ctx, { workspaceId: previewWorkspace, token });
+    sending.succeed(`Data models and/or security context synchronized`);
+    sendMessage("dataModelsAndOrSecurityContextUpdateSuccess");
 };
 const onClose = async (server, sys, watchers, config) => {
     server.close();
@@ -22335,20 +22367,21 @@ const onClose = async (server, sys, watchers, config) => {
 const getPreviewWorkspace = async (startedOra, ctx) => {
     const token = await getToken();
     const params = minimist(process.argv.slice(2));
-    let primaryWorkspace = params.w || params.workspace;
-    if (!primaryWorkspace) {
+    let primaryWorkspaceId = params.w || params.workspace;
+    if (!primaryWorkspaceId) {
         startedOra.stop(); // Stop current Ora, otherwise the last option will get hidden by it.
         const { workspaceId } = await selectWorkspace(ora, ctx, token);
-        primaryWorkspace = workspaceId;
+        primaryWorkspaceId = workspaceId;
         startedOra.start();
     }
     try {
         const instanceUrl = process.env.CUBE_CLOUD_ENDPOINT;
-        const response = await axios.get(`${ctx.pushBaseUrl}/workspace/dev-workspace`, {
-            params: {
-                primaryWorkspace,
-                instanceUrl,
-            },
+        const response = await axios.post(`${ctx.pushBaseUrl}/workspace/dev-workspace`, {
+            primaryWorkspaceId,
+            instanceUrl,
+            pushModels: ctx.pushModels,
+            pushComponents: ctx.pushComponents,
+        }, {
             headers: {
                 Authorization: `Bearer ${token}`,
             },