@pronto-tools-and-more/pronto 4.7.0 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "4.7.0",
+  "version": "4.9.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -13,13 +13,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@pronto-tools-and-more/file-watcher": "4.7.0",
-    "@pronto-tools-and-more/files": "4.7.0",
-    "@pronto-tools-and-more/network-process": "4.7.0",
-    "@pronto-tools-and-more/sass-compiler": "4.7.0",
+    "@pronto-tools-and-more/file-watcher": "4.9.0",
+    "@pronto-tools-and-more/files": "4.9.0",
+    "@pronto-tools-and-more/network-process": "4.9.0",
+    "@pronto-tools-and-more/sass-compiler": "4.9.0",
     "@lvce-editor/assert": "^1.2.0",
     "@lvce-editor/ipc": "^9.4.0",
-    "@lvce-editor/json-rpc": "^1.4.0",
+    "@lvce-editor/json-rpc": "^2.0.0",
     "@lvce-editor/verror": "^1.4.0",
     "execa": "^9.3.1",
     "express": "^4.19.2"

package/src/parts/App/App.js

@@ -1,53 +1,12 @@
 import express from "express";
-import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import * as CompileSass from "../CompileSass/CompileSass.js";
 import * as Config from "../Config/Config.js";
 import * as FilesPath from "../FilesPath/FilesPath.js";
+import * as HandleCss from "../HandleCss/HandleCss.js";
+import * as HandleIndex from "../HandleIndex/HandleIndex.js";
 import * as HandleMainJs from "../HandleMainJs/HandleMainJs.js";
+import * as HandleViews from "../HandleViews/HandleViews.js";
 import * as ProxyPath from "../ProxyPath/ProxyPath.js";
-import * as UpdateCss from "../UpdateCss/UpdateCss.js";
-import * as UpdateIndexHtml from "../UpdateIndexHtml/UpdateIndexHtml.js";
-
-const handleIndex =
-  (storeFrontPath, appId, baseUrl, contentUrl, platform) =>
-  async (req, res) => {
-    const indexHtmlPath = join(storeFrontPath, "index.html");
-    const indexHtmlContent = await readFile(indexHtmlPath, "utf8");
-    const newIndexHtml = UpdateIndexHtml.updateIndexHtml(
-      indexHtmlContent,
-      appId,
-      baseUrl,
-      contentUrl,
-      platform
-    );
-    res.end(newIndexHtml);
-  };
-
-const handleCss = (storeFrontPath) => async (req, res, next) => {
-  const pathName = req._parsedUrl.pathname;
-  if (!pathName.endsWith(".css")) {
-    return next();
-  }
-  if (pathName === "/assets/custom.css") {
-    try {
-      const result = await CompileSass.compileSass(Config.rootSassFile);
-      res.end(result.css);
-    } catch (error) {
-      console.warn(error);
-      res.end(`css error: ${error}`);
-    }
-    return;
-  }
-  const cssPath = join(storeFrontPath, pathName);
-  if (!existsSync(cssPath)) {
-    return next();
-  }
-  const cssContent = await readFile(cssPath, "utf8");
-  const newCss = UpdateCss.updateCss(cssContent);
-  res.end(newCss);
-};
 
 export const create = ({
   root,
@@ -67,7 +26,13 @@ export const create = ({
   const contentPath = join(root, "src", "default", "content");
   app.get(
     "/",
-    handleIndex(storeFrontPath, appId, baseUrl, contentUrl, platform)
+    HandleIndex.handleIndex(
+      storeFrontPath,
+      appId,
+      baseUrl,
+      contentUrl,
+      platform
+    )
   );
   app.get(
     "/modules/main.js",
@@ -82,7 +47,14 @@ export const create = ({
       mode,
     })
   );
-  app.use("*", handleCss(storeFrontPath));
+  app.get(
+    "/assets/views.json",
+    HandleViews.handleViews({
+      storeFrontPath,
+      splitViews: Config.splitViews,
+    })
+  );
+  app.use("*", HandleCss.handleCss(storeFrontPath));
   app.use(express.static(FilesPath.filesPath));
   if (mode === "slim") {
     app.use(

package/src/parts/Build/Build.js

@@ -6,6 +6,7 @@ import * as Config from "../Config/Config.js";
 import * as Cwd from "../Cwd/Cwd.js";
 import * as FilesPath from "../FilesPath/FilesPath.js";
 import * as SassProcess from "../SassProcess/SassProcess.js";
+import * as GetViewsJson from "../GetViewsJson/GetViewsJson.js";
 
 const sourceMap = false;
 
@@ -34,6 +35,15 @@ export const build = async () => {
         errorOnExist: false,
       });
     }
+    if (Config.splitViews) {
+      const viewsJson = await GetViewsJson.getViewsJson(
+        join(Cwd.cwd, "src", "default", "storefront", "assets", "views")
+      );
+      await writeFile(
+        join(dist, "src", "default", "storefront", "assets", "views.json"),
+        JSON.stringify(viewsJson, null, 2) + "\n"
+      );
+    }
   } catch (error) {
     throw new VError(error, `Failed to build`);
   } finally {

package/src/parts/CommandMap/CommandMap.js

@@ -7,15 +7,17 @@ import * as PushCode from "../PushCode/PushCode.js";
 import * as Server from "../Server/Server.js";
 import * as Upgrade from "../Upgrade/Upgrade.js";
 import * as UploadZip from "../UploadZip/UploadZip.js";
+import * as Split from "../Split/Split.js";
 
 export const commandMap = {
   "Build.build": Build.build,
   "Help.help": Help.help,
+  "History.history": History.history,
   "Login.login": Login.login,
   "PullCode.pullCode": PullCode.pullCode,
   "PushCode.pushCode": PushCode.pushCode,
   "Server.start": Server.start,
-  "UploadZip.uploadZip": UploadZip.uploadZip,
+  "Split.split": Split.split,
   "Upgrade.upgrade": Upgrade.upgrade,
-  "History.history": History.history,
+  "UploadZip.uploadZip": UploadZip.uploadZip,
 };

package/src/parts/Config/Config.js

@@ -94,3 +94,5 @@ export const catalogApiBaseUrl =
   config.catalogApiBaseUrl || "https://catalog.purplemanager.com";
 
 export const companyUrl = config.companyUrl || "https://sprylab.com";
+
+export const splitViews = config.splitViews || false;

package/src/parts/GetCommandFromCliArgs/GetCommandFromCliArgs.js

@@ -20,5 +20,8 @@ export const getCommandFromCliArgs = (argv) => {
   if (argv.includes("history")) {
     return "History.history";
   }
+  if (argv.includes("split")) {
+    return "Split.split";
+  }
   return "Help.help";
 };

package/src/parts/GetViewsJson/GetViewsJson.js

@@ -0,0 +1,32 @@
+import { VError } from "@lvce-editor/verror";
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+
+const getContents = async (folder) => {
+  const promises = [];
+  const dirents = await readdir(folder);
+  for (const dirent of dirents) {
+    const absolutePath = join(folder, dirent);
+    promises.push(readFile(absolutePath, "utf8"));
+  }
+  const contents = await Promise.all(promises);
+  return contents;
+};
+
+const parseContent = (content) => {
+  return JSON.parse(content);
+};
+
+const parseContents = (contents) => {
+  return contents.map(parseContent);
+};
+
+export const getViewsJson = async (folder) => {
+  try {
+    const contents = await getContents(folder);
+    const parsed = parseContents(contents);
+    return parsed;
+  } catch (error) {
+    throw new VError(error, `Failed to generate views json`);
+  }
+};

package/src/parts/HandleCss/HandleCss.js

@@ -0,0 +1,30 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import * as CompileSass from "../CompileSass/CompileSass.js";
+import * as Config from "../Config/Config.js";
+import * as UpdateCss from "../UpdateCss/UpdateCss.js";
+
+export const handleCss = (storeFrontPath) => async (req, res, next) => {
+  const pathName = req._parsedUrl.pathname;
+  if (!pathName.endsWith(".css")) {
+    return next();
+  }
+  if (pathName === "/assets/custom.css") {
+    try {
+      const result = await CompileSass.compileSass(Config.rootSassFile);
+      res.end(result.css);
+    } catch (error) {
+      console.warn(error);
+      res.end(`css error: ${error}`);
+    }
+    return;
+  }
+  const cssPath = join(storeFrontPath, pathName);
+  if (!existsSync(cssPath)) {
+    return next();
+  }
+  const cssContent = await readFile(cssPath, "utf8");
+  const newCss = UpdateCss.updateCss(cssContent);
+  res.end(newCss);
+};

package/src/parts/HandleIndex/HandleIndex.js

@@ -0,0 +1,18 @@
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import * as UpdateIndexHtml from "../UpdateIndexHtml/UpdateIndexHtml.js";
+
+export const handleIndex =
+  (storeFrontPath, appId, baseUrl, contentUrl, platform) =>
+  async (req, res) => {
+    const indexHtmlPath = join(storeFrontPath, "index.html");
+    const indexHtmlContent = await readFile(indexHtmlPath, "utf8");
+    const newIndexHtml = UpdateIndexHtml.updateIndexHtml(
+      indexHtmlContent,
+      appId,
+      baseUrl,
+      contentUrl,
+      platform
+    );
+    res.end(newIndexHtml);
+  };

package/src/parts/HandleViews/HandleViews.js

@@ -0,0 +1,30 @@
+import { readdir } from "node:fs/promises";
+import { join } from "node:path";
+import { pipeline } from "node:stream/promises";
+import * as JsonFile from "../JsonFile/JsonFile.js";
+
+const handleViewsSplit = async (storeFrontPath) => {
+  const viewsFolderPath = join(storeFrontPath, "assets", "views");
+  const dirents = await readdir(viewsFolderPath);
+  const promises = [];
+  for (const dirent of dirents) {
+    const absolutePath = join(viewsFolderPath, dirent);
+    const promise = JsonFile.readJson(absolutePath);
+    promises.push(promise);
+  }
+  const contents = await Promise.all(promises);
+  const stringified = JSON.stringify(contents, null, 2) + "\n";
+  return stringified;
+};
+
+export const handleViews =
+  ({ storeFrontPath, splitViews }) =>
+  async (req, res) => {
+    if (splitViews) {
+      const content = await handleViewsSplit(storeFrontPath);
+      res.end(content);
+      return;
+    }
+    const viewsFilePath = join(storeFrontPath, "assets", "views.json");
+    await pipeline(viewsFilePath, res);
+  };

package/src/parts/Help/Help.js

@@ -1,3 +1,3 @@
 export const help = () => {
-  console.info("pronto [build|dev|pull|push|upgrade]");
+  console.info("pronto [build|dev|pull|push|upgrade|split]");
 };

package/src/parts/JsonFile/JsonFile.js

@@ -0,0 +1,12 @@
+import { readFile, writeFile } from "node:fs/promises";
+
+export const readJson = async (path) => {
+  const content = await readFile(path, "utf8");
+  const parsed = JSON.parse(content);
+  return parsed;
+};
+
+export const writeJson = async (path, value) => {
+  const stringified = JSON.stringify(value, null, 2) + "\n";
+  await writeFile(path, stringified);
+};

package/src/parts/Split/Split.js

@@ -0,0 +1,75 @@
+import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
+import * as Cwd from "../Cwd/Cwd.js";
+import { VError } from "@lvce-editor/verror";
+import { join } from "path";
+import { mkdir, readFile, rm, writeFile } from "fs/promises";
+import * as JsonFile from "../JsonFile/JsonFile.js";
+import { existsSync } from "fs";
+
+const getFileName = (item) => {
+  if (item.path) {
+    if (item.path === "/") {
+      return item.name + ".json";
+    }
+    return item.path + ".json";
+  }
+  if (item.globalData) {
+    return `globalData.json`;
+  }
+  return `unknown.json`;
+};
+
+const splitViewsJson = async (viewsJsonPath, viewsJsonFolder) => {
+  const viewsJsonContent = await readFile(viewsJsonPath, "utf8");
+  const viewsJsonArray = JSON.parse(viewsJsonContent);
+  const splitItems = [];
+  for (const item of viewsJsonArray) {
+    const fileName = getFileName(item);
+    const splitItem = {
+      path: join(viewsJsonFolder, fileName),
+      content: JSON.stringify(item, null, 2) + "\n",
+    };
+    splitItems.push(splitItem);
+  }
+  return splitItems;
+};
+
+export const split = async () => {
+  try {
+    const viewsJsonPath = join(
+      Cwd.cwd,
+      "src",
+      "default",
+      "storefront",
+      "assets",
+      "views.json"
+    );
+    const viewsJsonFolder = join(
+      Cwd.cwd,
+      "src",
+      "default",
+      "storefront",
+      "assets",
+      "views"
+    );
+    if (existsSync(viewsJsonFolder)) {
+      console.info("[pronto] project is already split");
+      return;
+    }
+    await mkdir(viewsJsonFolder, { recursive: true });
+    const splitItems = await splitViewsJson(viewsJsonPath, viewsJsonFolder);
+    for (const splitItem of splitItems) {
+      await writeFile(splitItem.path, splitItem.content);
+    }
+    await rm(viewsJsonPath);
+    const configPath = join(Cwd.cwd, "pronto.json");
+    const config = await JsonFile.readJson(configPath);
+    const newConfig = {
+      ...config,
+      splitViews: true,
+    };
+    await JsonFile.writeJson(configPath, newConfig);
+  } catch (error) {
+    throw new VError(error, `Failed to split views.json`);
+  }
+};