@pronto-tools-and-more/pronto 12.42.0 → 12.44.0

package/package.json

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

package/src/parts/App/App.js

@@ -33,6 +33,7 @@ export const create = ({
   shimConfigLoader,
   apiUrl,
   supportNormalHtmlElements,
+  useFrameWorkLatest,
 }) => {
   const app = express();
   const storeFrontPath = join(root, "src", "default", "storefront");
@@ -48,6 +49,7 @@ export const create = ({
       platform,
       mode,
       filesPath: FilesPath.filesPath,
+      useFrameWorkLatest,
     })
   );
 
@@ -68,6 +70,7 @@ export const create = ({
       companyUrl,
       filesPath: FilesPath.filesPath,
       mode,
+      useFrameWorkLatest,
     })
   );
   if (supportNormalHtmlElements) {
@@ -77,6 +80,7 @@ export const create = ({
         storeFrontPath,
         filesPath: FilesPath.filesPath,
         mode,
+        useFrameWorkLatest,
       })
     );
   }
@@ -95,6 +99,7 @@ export const create = ({
     HandleFeaturesJson.handleFeaturesJson({
       storeFrontPath,
       filesPath: FilesPath.filesPath,
+      useFrameWorkLatest,
     })
   );
   app.get(
@@ -113,9 +118,10 @@ export const create = ({
   app.use(express.static(defaultPath));
   app.use(express.static(contentPath));
   if (mode === "slim") {
+    const frameWorkName = useFrameWorkLatest ? "framework-latest" : "framework";
     app.use(
       express.static(
-        join(FilesPath.filesPath, "framework", "src", "default", "storefront")
+        join(FilesPath.filesPath, frameWorkName, "src", "default", "storefront")
       )
     );
   }

package/src/parts/Build/Build.js

@@ -28,8 +28,12 @@ export const build = async () => {
     await writeFile(rootCssMapFile, JSON.stringify(result.sourceMap) + "\n");
     if (Config.mode === "slim") {
       await mkdir(join(dist, "src"), { recursive: true });
+      const frameWorkName = Config.useFrameWorkLatest
+        ? "framework-latest"
+        : "framework";
+
       await cp(
-        join(FilesPath.filesPath, "framework", "src"),
+        join(FilesPath.filesPath, frameWorkName, "src"),
         join(dist, "src"),
         {
           recursive: true,

package/src/parts/CommandMap/CommandMap.js

@@ -12,6 +12,7 @@ import * as Split from "../Split/Split.js";
 import * as TypeCheck from "../TypeCheck/TypeCheck.js";
 import * as Upgrade from "../Upgrade/Upgrade.js";
 import * as UploadZip from "../UploadZip/UploadZip.js";
+import * as UpgradeLatest from "../UpgradeLatest/UpgradeLatest.js";
 import * as ValidateAllSchemas from "../ValidateAllSchemas/ValidateAllSchemas.js";
 
 export const commandMap = {
@@ -28,6 +29,7 @@ export const commandMap = {
   "ListExperienceVersionsAndPrint.listExperienceVersionsAndPrint":
     ListExperienceVersionsAndPrint.listExperienceVersionsAndPrint,
   "UploadZip.uploadZip": UploadZip.uploadZip,
+  "UpgradeLatest.upgradeLatest": UpgradeLatest.upgradeLatest,
   "ValidateAllSchema.validateAllSchemas": ValidateAllSchemas.validateAllSchemas,
   "PrintVersion.printVersion": PrintVersion.printVersion,
   "TypeCheck.typeCheck": TypeCheck.typeCheck,

package/src/parts/Config/Config.js

@@ -123,3 +123,5 @@ export const supportNormalHtmlElements =
 
 export const apiUrl =
   process.env.API_URL || "https://catalog.purplemanager.com/graphql";
+
+export const useFrameWorkLatest = config.useFrameWorkLatest || false;

package/src/parts/CreateServer/CreateServer.js

@@ -31,6 +31,7 @@ export const createServer = async (root, errorColor) => {
     releaseAppId: Config.releaseAppId,
     apiUrl: Config.apiUrl,
     supportNormalHtmlElements: Config.supportNormalHtmlElements,
+    useFrameWorkLatest: Config.useFrameWorkLatest,
   });
   const server = http.createServer(app);
   const webSocketServer = new ws.WebSocketServer({

package/src/parts/GetBasePath/GetBasePath.js

@@ -1,8 +1,14 @@
 import { join } from "node:path";
 
-export const getBasePath = (mode, storeFrontPath, filesPath) => {
+export const getBasePath = ({
+  mode,
+  storeFrontPath,
+  filesPath,
+  useFrameWorkLatest,
+}) => {
   if (mode === "slim") {
-    return join(filesPath, "framework", "src", "default", "storefront");
+    const frameWorkName = useFrameWorkLatest ? "framework-latest" : "framework";
+    return join(filesPath, frameWorkName, "src", "default", "storefront");
   }
   return storeFrontPath;
 };

package/src/parts/GetCommandFromCliArgs/GetCommandFromCliArgs.js

@@ -14,6 +14,9 @@ export const getCommandFromCliArgs = (argv) => {
   if (argv.includes("upgrade")) {
     return "Upgrade.upgrade";
   }
+  if (argv.includes("upgrade-latest")) {
+    return "UpgradeLatest.upgradeLatest";
+  }
   if (argv.includes("list-experience-versions")) {
     return "ListExperienceVersionsAndPrint.listExperienceVersionsAndPrint";
   }

package/src/parts/GetLatestUnstableVersion/GetLatestUnstableVersion.js

@@ -0,0 +1,11 @@
+import * as Assert from "../Assert/Assert.js";
+
+export const getLatestUnstableVersion = (versions) => {
+  Assert.array(versions);
+  for (const version of versions) {
+    if (version.endsWith("-SNAPSHOT")) {
+      return version;
+    }
+  }
+  throw new Error(`latest stable version not found`);
+};

package/src/parts/HandleCommonJs/HandleCommonJs.js

@@ -5,9 +5,14 @@ import * as GetCommonJsSnippet from "../GetCommonJsSnippet/GetCommonJsSnippet.js
 import * as GetNewCommonJsContent from "../GetNewCommonJsContent/GetNewCommonJsContent.js";
 
 export const handleCommonJs =
-  ({ storeFrontPath, filesPath, mode }) =>
+  ({ storeFrontPath, filesPath, mode, useFrameWorkLatest }) =>
   async (req, res) => {
-    const basePath = GetBasePath.getBasePath(mode, storeFrontPath, filesPath);
+    const basePath = GetBasePath.getBasePath({
+      mode,
+      storeFrontPath,
+      filesPath,
+      useFrameWorkLatest,
+    });
     // TODO use etag
     const commonPath = join(basePath, "modules", "common.js");
     const content = await readFile(commonPath, "utf8");

package/src/parts/HandleFeaturesJson/HandleFeaturesJson.js

@@ -3,14 +3,15 @@ import { readFile } from "fs/promises";
 import { join } from "path";
 
 export const handleFeaturesJson =
-  ({ storeFrontPath, filesPath }) =>
+  ({ storeFrontPath, filesPath, useFrameWorkLatest }) =>
   async (req, res) => {
     res.setHeader("Content-Type", "application/json");
+    const frameWorkName = useFrameWorkLatest ? "framework-latest" : "framework";
     const pathsToTry = [
       join(storeFrontPath, "assets", "features.json"),
       join(
         filesPath,
-        "framework",
+        frameWorkName,
         "src",
         "default",
         "storefront",

package/src/parts/HandleIndex/HandleIndex.js

@@ -2,8 +2,14 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import * as UpdateIndexHtml from "../UpdateIndexHtml/UpdateIndexHtml.js";
 
-const getIndexHtmlPath = (mode, filesPath, storeFrontPath) => {
+const getIndexHtmlPath = ({
+  mode,
+  filesPath,
+  storeFrontPath,
+  useFrameWorkLatest,
+}) => {
   if (mode === "slim") {
+    const frameWorkName = useFrameWorkLatest ? "framework-latest" : "framework";
     return join(
       filesPath,
       "framework",
@@ -17,9 +23,23 @@ const getIndexHtmlPath = (mode, filesPath, storeFrontPath) => {
 };
 
 export const handleIndex =
-  ({ storeFrontPath, appId, baseUrl, contentUrl, platform, mode, filesPath }) =>
+  ({
+    storeFrontPath,
+    appId,
+    baseUrl,
+    contentUrl,
+    platform,
+    mode,
+    filesPath,
+    useFrameWorkLatest,
+  }) =>
   async (req, res) => {
-    const indexHtmlPath = getIndexHtmlPath(mode, filesPath, storeFrontPath);
+    const indexHtmlPath = getIndexHtmlPath({
+      mode,
+      filesPath,
+      storeFrontPath,
+      useFrameWorkLatest,
+    });
     const indexHtmlContent = await readFile(indexHtmlPath, "utf8");
     const newIndexHtml = UpdateIndexHtml.updateIndexHtml(
       indexHtmlContent,

package/src/parts/HandleMainJs/HandleMainJs.js

@@ -14,9 +14,15 @@ export const handleMainJs =
     companyUrl,
     filesPath,
     mode,
+    useFrameWorkLatest,
   }) =>
   async (req, res) => {
-    const basePath = GetBasePath.getBasePath(mode, storeFrontPath, filesPath);
+    const basePath = GetBasePath.getBasePath({
+      mode,
+      storeFrontPath,
+      filesPath,
+      useFrameWorkLatest,
+    });
     // TODO use etag
     const mainPath = join(basePath, "modules", "main.js");
     const content = await readFile(mainPath, "utf8");

package/src/parts/UpgradeLatest/UpgradeLatest.js

@@ -0,0 +1,69 @@
+import { VError } from "@lvce-editor/verror";
+import { join } from "node:path";
+import * as Config from "../Config/Config.js";
+import * as Cwd from "../Cwd/Cwd.js";
+import * as DiffSimple from "../DiffSimple/DiffSimple.js";
+import * as DownloadDiffFiles from "../DownloadDiffFiles/DownloadDiffFiles.js";
+import * as GetLatestUnstableVersion from "../GetLatestUnstableVersion/GetLatestUnstableVersion.js";
+import * as GetSessionId from "../GetSessionId/GetSessionId.js";
+import * as ListExperienceVersions from "../ListExperienceVersions/ListExperienceVersions.js";
+import * as MakeUpgradeRequest from "../MakeUpgradeRequest/MakeUpgradeRequest.js";
+import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
+import * as PullWorkingCopy from "../PullWorkingCopy/PullWorkingCopy.js";
+
+export const upgradeLatest = async () => {
+  try {
+    const {
+      userEmail,
+      userPassword,
+      loginUrl,
+      appId,
+      listVersionsUrl,
+      appsUrl,
+      diffSimpleUrl,
+      downloadFileBaseUrl,
+      pullWorkingCopyUrl,
+    } = Config;
+    const src = join(Cwd.cwd, "src");
+    const sessionId = await GetSessionId.getSessionId({
+      loginUrl,
+      userEmail,
+      userPassword,
+    });
+    await PullWorkingCopy.pullWorkingCopy({
+      appId,
+      sessionId,
+      pullWorkingCopyUrl,
+    });
+    const versions = await ListExperienceVersions.listExperienceVersions({
+      listVersionsUrl,
+      sessionId,
+      appId,
+    });
+    const latestStableVersion =
+      GetLatestUnstableVersion.getLatestUnstableVersion(versions);
+    console.info(`[pronto] Found latest version ${latestStableVersion}`);
+    await MakeUpgradeRequest.makeUpgradeRequest({
+      appsUrl,
+      appId,
+      sessionId,
+      targetVersion: latestStableVersion,
+    });
+    const diffFiles = await DiffSimple.diffSimple({
+      diffSimpleUrl,
+      sessionId,
+      appId,
+    });
+    await DownloadDiffFiles.downloadDiffFiles({
+      diffFiles,
+      src,
+      downloadFileBaseUrl,
+      appId,
+      sessionId,
+    });
+  } catch (error) {
+    throw new VError(error, `Failed to upgrade`);
+  } finally {
+    NetworkProcess.dispose();
+  }
+};

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '12.42.0'
+export const version = '12.44.0'