@pronto-tools-and-more/pronto 8.21.0 → 9.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "8.21.0",
+  "version": "9.1.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,15 +17,15 @@
     "@lvce-editor/ipc": "^11.1.0",
     "@lvce-editor/json-rpc": "^5.0.0",
     "@lvce-editor/verror": "^1.4.0",
-    "@pronto-tools-and-more/file-watcher": "8.21.0",
-    "@pronto-tools-and-more/files": "8.21.0",
-    "@pronto-tools-and-more/network-process": "8.21.0",
-    "@pronto-tools-and-more/sass-compiler": "8.21.0",
-    "@pronto-tools-and-more/components-renderer": "8.21.0",
-    "@pronto-tools-and-more/components": "8.21.0",
-    "@pronto-tools-and-more/schema-process": "8.21.0",
-    "@pronto-tools-and-more/diff-process": "8.21.0",
-    "@pronto-tools-and-more/type-checker": "8.21.0",
+    "@pronto-tools-and-more/file-watcher": "9.1.0",
+    "@pronto-tools-and-more/files": "9.1.0",
+    "@pronto-tools-and-more/network-process": "9.1.0",
+    "@pronto-tools-and-more/sass-compiler": "9.1.0",
+    "@pronto-tools-and-more/components-renderer": "9.1.0",
+    "@pronto-tools-and-more/components": "9.1.0",
+    "@pronto-tools-and-more/schema-process": "9.1.0",
+    "@pronto-tools-and-more/diff-process": "9.1.0",
+    "@pronto-tools-and-more/type-checker": "9.1.0",
     "execa": "^9.5.1",
     "express": "^4.21.1"
   },

package/src/parts/Build/Build.js

@@ -50,6 +50,7 @@ export const build = async () => {
         reactComponents: Config.reactComponents,
         pathPrefix: Config.pathPrefix,
         isBuild: true,
+        hotReload: false,
       });
       const viewsPath = join(
         dist,

package/src/parts/CreateServer/CreateServer.js

@@ -35,7 +35,9 @@ export const createServer = async (root, errorColor) => {
       webSocketServer.clients,
       event,
       watcherRoot,
-      errorColor
+      errorColor,
+      Config.pathPrefix,
+      Config.hotReload
     );
   };
   FileWatcher.create(watcherRoot, handleFileChange);

package/src/parts/DiffNode/DiffNode.js

@@ -0,0 +1,34 @@
+export const diffNode = (changes, oldChild, newChild, diffArray, path) => {
+  const oldKeys = Object.keys(oldChild);
+  const newKeys = Object.keys(newChild);
+  if (oldKeys.length !== newKeys.length) {
+    changes.push([
+      {
+        type: "full-update",
+      },
+    ]);
+    return;
+  }
+  if (oldKeys.length !== newKeys.length) {
+    changes.push([
+      {
+        type: "full-update",
+      },
+    ]);
+    return;
+  }
+  for (const oldKey of oldKeys) {
+    if (Array.isArray(oldChild[oldKey]) && Array.isArray(newChild[oldKey])) {
+      changes.push(
+        diffArray(changes, oldChild[oldKey], newChild[oldKey], path)
+      );
+      return;
+    }
+    if (oldChild[oldKey] !== newChild[oldKey]) {
+    }
+  }
+  const oldEntries = Object.entries(oldChild);
+  const newEntries = Object.entries(newChild);
+  for (const [key, value] of Object.entries(oldChild)) {
+  }
+};

package/src/parts/DiffViews/DiffViews.js

@@ -1,4 +1,61 @@
-const diffInternal = () => {};
+const diffNode = (oldChild, newChild) => {
+  const oldKeys = Object.keys(oldChild);
+  const newKeys = Object.keys(newChild);
+  if (oldKeys.length !== newKeys.length) {
+    return [
+      {
+        type: "full-update",
+      },
+    ];
+  }
+  if (oldKeys.length !== newKeys.length) {
+    return [
+      {
+        type: "full-update",
+      },
+    ];
+  }
+  for (const oldKey of oldKeys) {
+    if (oldChild[oldKey] !== newChild[oldKey]) {
+    }
+  }
+  const oldEntries = Object.entries(oldChild);
+  const newEntries = Object.entries(newChild);
+  for (const [key, value] of Object.entries(oldChild)) {
+  }
+};
+
+const diffInternal = (oldChildren, newChildren) => {
+  if (oldChildren.length !== newChildren.length) {
+    return [
+      {
+        type: "full-update",
+      },
+    ];
+  }
+  const length = oldChildren.length;
+  for (let i = 0; i < oldChildren.length; i++) {
+    const oldChild = oldChildren[i];
+    const newChild = newChildren[i];
+    const oldKeys = Object.keys(oldChild);
+    const newKeys = Object.keys(newChild);
+    if (oldKeys.length !== newKeys.length) {
+      return [
+        {
+          type: "full-update",
+        },
+      ];
+    }
+    for (const oldKey of oldKeys) {
+      if (oldChild[oldKey] !== newChild[oldKey]) {
+      }
+    }
+    const oldEntries = Object.entries(oldChild);
+    const newEntries = Object.entries(newChild);
+    for (const [key, value] of Object.entries(oldChild)) {
+    }
+  }
+};
 
 export const diffViews = (oldViews, newViews) => {
   // TODO walk all nodes

package/src/parts/GetViewsResponse/GetViewsResponse.js

@@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import * as HandleViewsReactComponents from "../HandleViewsReactComponents/HandleViewsReactComponents.js";
 import * as HandleViewsSplit from "../HandleViewsSplit/HandleViewsSplit.js";
+import * as ViewsState from "../ViewsState/ViewsState.js";
 
 export const getViewsResponse = async ({
   storeFrontPath,
@@ -9,6 +10,7 @@ export const getViewsResponse = async ({
   reactComponents,
   pathPrefix,
   isBuild,
+  hotReload,
 }) => {
   if (reactComponents) {
     const content = await HandleViewsReactComponents.handleViewsReactComponents(
@@ -16,6 +18,10 @@ export const getViewsResponse = async ({
       pathPrefix,
       isBuild
     );
+    if (hotReload) {
+      // TODO optimize this code for react components, don't parse and stringify so often
+      ViewsState.set(JSON.parse(content));
+    }
     return content;
   }
   if (splitViews) {

package/src/parts/HandleFileChange/HandleFileChange.js

@@ -1,10 +1,19 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import * as SendComponentsUpdates from "../SendComponentsUpdates/SendComponentsUpdates.js";
 import * as SendFullUpdates from "../SendFullUpdates/SendFullUpdates.js";
 import * as SendSassUpdates from "../SendSassUpdates/SendSassUpdates.js";
 import * as SendUpdates from "../SendUpdates/SendUpdates.js";
+import * as SendViewsUpdate from "../SendViewsUpdate/SendViewsUpdate.js";
 
-export const handleFileChange = async (clients, event, root, errorColor) => {
+export const handleFileChange = async (
+  clients,
+  event,
+  root,
+  errorColor,
+  pathPrefix,
+  hotReload
+) => {
   const absolutePath = join(root, event.filename);
   if (event.filename === "default/readmode/custom.css") {
     const css = await readFile(absolutePath, "utf8");
@@ -26,6 +35,19 @@ export const handleFileChange = async (clients, event, root, errorColor) => {
       undefined,
       errorColor
     );
+  } else if (event.filename.startsWith("components/src/parts")) {
+    const storeFrontPath = join(root, "default", "storefront");
+    SendComponentsUpdates.sendComponentsUpdates(
+      clients,
+      storeFrontPath,
+      pathPrefix,
+      hotReload
+    );
+  } else if (
+    event.filename.endsWith(".json") &&
+    event.filename.includes("views")
+  ) {
+    SendViewsUpdate.sendViewsUpdate(clients);
   } else {
     SendFullUpdates.sendFullUpdates(clients);
   }

package/src/parts/HandleViews/HandleViews.js

@@ -10,6 +10,7 @@ export const handleViews =
       reactComponents,
       pathPrefix: "",
       isBuild: false,
+      hotReload: false,
     });
     res.end(content);
   };

package/src/parts/HandleViewsReactComponents/HandleViewsReactComponents.js

@@ -52,6 +52,7 @@ export const handleViewsReactComponents = async (
     const splitResult = await HandleViewsSplit.handleViewsSplit(storeFrontPath);
     const splitResultParsed = JSON.parse(splitResult);
     const merged = [...splitResultParsed, ...result];
+
     return JSON.stringify(merged, null, 2);
   } catch (error) {
     console.log(error);

package/src/parts/SendComponentsUpdates/SendComponentsUpdates.js

@@ -0,0 +1,35 @@
+import * as SendUpdates from "../SendUpdates/SendUpdates.js";
+import * as HandleViewsReactComponents from "../HandleViewsReactComponents/HandleViewsReactComponents.js";
+import * as ViewsState from "../ViewsState/ViewsState.js";
+import * as DiffViews from "../DiffViews/DiffViews.js";
+
+export const sendComponentsUpdates = async (
+  clients,
+  storefrontPath,
+  pathPrefix,
+  hotReload
+) => {
+  if (!hotReload) {
+    SendUpdates.sendUpdates(clients, {
+      jsonrpc: "2.0",
+      method: "reload",
+      params: [],
+    });
+    return;
+  }
+  const isBuilt = false;
+  const old = ViewsState.get();
+  const res = await HandleViewsReactComponents.handleViewsReactComponents(
+    storefrontPath,
+    pathPrefix,
+    isBuilt
+  );
+  const latest = ViewsState.get();
+  if (old !== latest) {
+    return;
+  }
+  const newViews = JSON.parse(res);
+  ViewsState.set(JSON.parse(res));
+  const changes = DiffViews.diffViews(old, newViews);
+  console.log({ changes });
+};

package/src/parts/SendViewsUpdate/SendViewsUpdate.js

@@ -0,0 +1,14 @@
+import * as SendUpdates from "../SendUpdates/SendUpdates.js";
+
+export const sendViewsUpdate = (clients) => {
+  SendUpdates.sendUpdates(clients, {
+    jsonrpc: "2.0",
+    method: "reload",
+    params: [],
+  });
+  // SendUpdates.sendUpdates(clients, {
+  //   jsonrpc: "2.0",
+  //   method: "updateViews",
+  //   params: [],
+  // });
+};

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '8.21.0'
+export const version = '9.1.0'