@pronto-tools-and-more/pronto 11.0.0 → 11.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "11.0.0",
+  "version": "11.2.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,16 +17,16 @@
     "@lvce-editor/ipc": "^11.7.0",
     "@lvce-editor/json-rpc": "^5.3.0",
     "@lvce-editor/verror": "^1.6.0",
-    "@pronto-tools-and-more/file-watcher": "11.0.0",
-    "@pronto-tools-and-more/files": "11.0.0",
-    "@pronto-tools-and-more/network-process": "11.0.0",
-    "@pronto-tools-and-more/sass-compiler": "11.0.0",
-    "@pronto-tools-and-more/components-renderer": "11.0.0",
-    "@pronto-tools-and-more/components": "11.0.0",
-    "@pronto-tools-and-more/schema-process": "11.0.0",
-    "@pronto-tools-and-more/diff-process": "11.0.0",
-    "@pronto-tools-and-more/type-checker": "11.0.0",
-    "@pronto-tools-and-more/custom-js-functions": "11.0.0",
+    "@pronto-tools-and-more/file-watcher": "11.2.0",
+    "@pronto-tools-and-more/files": "11.2.0",
+    "@pronto-tools-and-more/network-process": "11.2.0",
+    "@pronto-tools-and-more/sass-compiler": "11.2.0",
+    "@pronto-tools-and-more/components-renderer": "11.2.0",
+    "@pronto-tools-and-more/components": "11.2.0",
+    "@pronto-tools-and-more/schema-process": "11.2.0",
+    "@pronto-tools-and-more/diff-process": "11.2.0",
+    "@pronto-tools-and-more/type-checker": "11.2.0",
+    "@pronto-tools-and-more/custom-js-functions": "11.2.0",
     "execa": "^9.5.2",
     "express": "^4.21.2"
   },

package/src/parts/App/App.js

@@ -1,12 +1,13 @@
 import express from "express";
 import { join } from "node:path";
 import * as FilesPath from "../FilesPath/FilesPath.js";
+import * as HandleConfigLoader from "../HandleConfigLoader/HandleConfigLoader.js";
 import * as HandleCss from "../HandleCss/HandleCss.js";
+import * as HandleCustomServer from "../HandleCustomServer/HandleCustomServer.js";
 import * as HandleFeaturesJson from "../HandleFeaturesJson/HandleFeaturesJson.js";
 import * as HandleIndex from "../HandleIndex/HandleIndex.js";
 import * as HandleMainJs from "../HandleMainJs/HandleMainJs.js";
 import * as HandleViews from "../HandleViews/HandleViews.js";
-import * as HandleCustomServer from "../HandleCustomServer/HandleCustomServer.js";
 import * as ProxyPath from "../ProxyPath/ProxyPath.js";
 
 export const create = ({
@@ -42,6 +43,10 @@ export const create = ({
       filesPath: FilesPath.filesPath,
     })
   );
+  app.get(
+    "/assets/scripts/configLoader.js",
+    HandleConfigLoader.handleConfigLoader
+  );
   app.get(
     "/modules/main.js",
     HandleMainJs.handleMainJs({

package/src/parts/DiffProcess/DiffProcess.js

@@ -0,0 +1,31 @@
+import * as DiffProcessPath from "../DiffProcessPath/DiffProcessPath.js";
+import * as HandleIpc from "../HandleIpc/HandleIpc.js";
+import * as IpcParent from "../IpcParent/IpcParent.js";
+import * as IpcParentType from "../IpcParentType/IpcParentType.js";
+import * as JsonRpc from "../JsonRpc/JsonRpc.js";
+
+let ipcPromise;
+
+const create = async () => {
+  const ipc = await IpcParent.create({
+    path: DiffProcessPath.diffProcessRendererPath,
+    method: IpcParentType.NodeForkedProcess, // TODO worker could be faster
+    execArgv: [],
+    stdio: "inherit",
+  });
+  HandleIpc.handleIpc(ipc);
+  return ipc;
+};
+
+const getOrCreate = () => {
+  if (!ipcPromise) {
+    ipcPromise = create();
+  }
+  return ipcPromise;
+};
+
+export const invoke = async (method, ...params) => {
+  const ipc = await getOrCreate();
+  const result = await JsonRpc.invoke(ipc, method, ...params);
+  return result;
+};

package/src/parts/DiffProcessPath/DiffProcessPath.js

@@ -0,0 +1,13 @@
+import * as Path from "node:path";
+import * as ResolveBin from "../ResolveBin/ResolveBin.js";
+import * as Root from "../Root/Root.js";
+
+export const diffProcessRendererPath =
+  ResolveBin.resolveBin("@pronto-tools-and-more/diff-process") ||
+  Path.join(
+    Root.root,
+    "packages",
+    "pronto-diff-process",
+    "src",
+    "diffProcessMain.js"
+  );

package/src/parts/DiffViews/DiffViews.js

@@ -1,90 +1,6 @@
-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
-  // return one of four changes
-  // 1. full update
-  // 2. classname update
-  // 3. text update
-  // 4. node update
-
-  if (!oldViews) {
-    return [
-      {
-        type: "full-update",
-      },
-    ];
-  }
-  if (oldViews.length !== newViews.length) {
-    return [
-      {
-        type: "full-update",
-      },
-    ];
-  }
-  const length = oldViews.length;
+import * as DiffProcess from "../DiffProcess/DiffProcess.js";
 
-  for (let i = 0; i < length; i++) {
-    const oldView = oldViews[i];
-    const newView = newViews[i];
-  }
-  for (const item of oldViews) console.log({ oldViews, newViews });
-  return [];
+export const diffViews = async (oldViews, newViews) => {
+  const result = await DiffProcess.invoke("Diff.diff", oldViews, newViews);
+  return result;
 };

package/src/parts/GetOrCreateRendererIpc/GetOrCreateRendererIpc.js

@@ -0,0 +1,21 @@
+import * as GetRendererIpc from "../GetRendererIpc/GetRendererIpc.js";
+
+const state = {
+  /**
+   * @type {Promise[]}
+   */
+  preloadedIpcs: [],
+};
+
+export const getOrCreateRendererIpc = async (tsconfigPath, isBuild) => {
+  const cachedIpc = state.preloadedIpcs.pop();
+  if (cachedIpc) {
+    state.preloadedIpcs.push(GetRendererIpc.getRendererIpc(tsconfigPath));
+    return cachedIpc;
+  }
+  const oursPromise = GetRendererIpc.getRendererIpc(tsconfigPath);
+  if (!isBuild) {
+    state.preloadedIpcs.push(GetRendererIpc.getRendererIpc(tsconfigPath));
+  }
+  return oursPromise;
+};

package/src/parts/GetRendererIpc/GetRendererIpc.js

@@ -0,0 +1,26 @@
+import * as ComponentsRendererPath from "../ComponentsRendererPath/ComponentsRendererPath.js";
+import * as HandleIpc from "../HandleIpc/HandleIpc.js";
+import * as IpcParent from "../IpcParent/IpcParent.js";
+import * as IpcParentType from "../IpcParentType/IpcParentType.js";
+import * as JsonRpc from "../JsonRpc/JsonRpc.js";
+import * as UnhandleIpc from "../UnhandleIpc/UnhandleIpc.js";
+
+export const getRendererIpc = async (tsconfigPath) => {
+  const ipc = await IpcParent.create({
+    path: ComponentsRendererPath.componentsRendererPath,
+    method: IpcParentType.NodeForkedProcess, // TODO worker could be faster
+    execArgv: [],
+    stdio: "inherit",
+  });
+  HandleIpc.handleIpc(ipc);
+  await JsonRpc.invoke(ipc, "RenderViews.loadSwc", tsconfigPath);
+  return {
+    invoke(method, ...params) {
+      return JsonRpc.invoke(ipc, method, ...params);
+    },
+    dispose() {
+      UnhandleIpc.unhandleIpc(ipc);
+      ipc.dispose();
+    },
+  };
+};

package/src/parts/HandleConfigLoader/HandleConfigLoader.js

@@ -0,0 +1,7 @@
+export const handleConfigLoader = async (req, res) => {
+  // the default config loader makes
+  // useless http requests
+  // so remove it
+  res.setHeader("content-type", "application/javascript");
+  res.end("");
+};

package/src/parts/HandleFileChange/HandleFileChange.js

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import * as MatchesMemoryRef from "../MatchesMemoryRef/MatchesMemoryRef.js";
 import * as SendComponentsUpdates from "../SendComponentsUpdates/SendComponentsUpdates.js";
 import * as SendFullUpdates from "../SendFullUpdates/SendFullUpdates.js";
 import * as SendSassUpdates from "../SendSassUpdates/SendSassUpdates.js";
@@ -15,6 +16,9 @@ export const handleFileChange = async (
   hotReload
 ) => {
   const absolutePath = join(root, event.filename);
+  if (MatchesMemoryRef.matchesMemoryRef(absolutePath)) {
+    return;
+  }
   if (event.filename === "default/readmode/custom.css") {
     const css = await readFile(absolutePath, "utf8");
     const changes = [

package/src/parts/HandleViewsReactComponents/HandleViewsReactComponents.js

@@ -1,12 +1,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import * as ComponentsRendererPath from "../ComponentsRendererPath/ComponentsRendererPath.js";
-import * as HandleIpc from "../HandleIpc/HandleIpc.js";
+import * as GetOrCreateRendererIpc from "../GetOrCreateRendererIpc/GetOrCreateRendererIpc.js";
 import * as HandleViewsSplit from "../HandleViewsSplit/HandleViewsSplit.js";
-import * as IpcParent from "../IpcParent/IpcParent.js";
-import * as IpcParentType from "../IpcParentType/IpcParentType.js";
-import * as JsonRpc from "../JsonRpc/JsonRpc.js";
-import * as UnhandleIpc from "../UnhandleIpc/UnhandleIpc.js";
 
 export const handleViewsReactComponents = async (
   storeFrontPath,
@@ -32,28 +27,25 @@ export const handleViewsReactComponents = async (
     if (!existsSync(componentsPath)) {
       throw new Error(`components path not found: ${componentsPath}`);
     }
-    const ipc = await IpcParent.create({
-      path: ComponentsRendererPath.componentsRendererPath,
-      method: IpcParentType.NodeForkedProcess, // TODO worker could be faster
-      execArgv: [],
-      stdio: "inherit",
-    });
-    HandleIpc.handleIpc(ipc);
-    const result = await JsonRpc.invoke(
-      ipc,
+
+    const renderer = await GetOrCreateRendererIpc.getOrCreateRendererIpc(
+      tsconfigPath,
+      isBuild
+    );
+    const result = await renderer.invoke(
       "RenderViews.renderViews",
       componentsPath,
       tsconfigPath,
       pathPrefix,
       isBuild
     );
-    UnhandleIpc.unhandleIpc(ipc);
-    ipc.dispose();
+    renderer.dispose();
+
     const splitResult = await HandleViewsSplit.handleViewsSplit(storeFrontPath);
     const splitResultParsed = JSON.parse(splitResult);
     const merged = [...splitResultParsed, ...result];
-
-    return JSON.stringify(merged, null, 2);
+    const resultString = JSON.stringify(merged, null, 2);
+    return resultString;
   } catch (error) {
     console.log(error);
     console.error(`[pronto] views json error: ${error}`);

package/src/parts/MatchesMemoryRef/MatchesMemoryRef.js

@@ -0,0 +1,18 @@
+import { readFileSync } from "node:fs";
+
+const memoryRef = Object.create(null);
+
+export const matchesMemoryRef = (absolutePath) => {
+  try {
+    const oldContent = memoryRef[absolutePath];
+    const content = readFileSync(absolutePath, "utf8");
+    if (content === oldContent) {
+      return true;
+    }
+    memoryRef[absolutePath] = content;
+    return false;
+  } catch (error) {
+    // ignore
+    return false;
+  }
+};

package/src/parts/PidKey/PidKey.js

@@ -0,0 +1 @@
+export const pidKey = "data-prid";

package/src/parts/UpdateIndexHtml/UpdateIndexHtml.js

@@ -23,6 +23,7 @@ const replacementSnippetBody = (appId, baseUrl, contentUrl, platform) =>
 const occurrenceSnippetHead = "</head>";
 const replacementSnippetHead = `
     <link rel="stylesheet" href="/theme.css" />
+    <link rel="stylesheet" href="/assets/custom.css" />
     </head>`;
 
 export const updateIndexHtml = (

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '11.0.0'
+export const version = '11.2.0'