@pronto-tools-and-more/pronto 12.25.0 → 12.26.0

package/package.json

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

package/src/parts/Build/Build.js

@@ -126,6 +126,17 @@ export const build = async () => {
         )
       );
     }
+
+    if (
+      tag &&
+      Config.pushToReleaseOnGitTag &&
+      existsSync(join(dist, "src", "default", "storefront", "robots.prod.txt"))
+    ) {
+      await cp(
+        join(dist, "src", "default", "storefront", "robots.prod.txt"),
+        join(dist, "src", "default", "storefront", "robots.txt")
+      );
+    }
     if (Config.validateSchema) {
       await ValidateAllSchemas.validateAllSchemas();
     }

package/src/parts/GetPostIds/GetPostIds.js

@@ -0,0 +1,41 @@
+import * as GraphQlQueryPathSegments from "../GraphQlQueryPathSegments/GraphQlQueryPathSegments.js";
+
+export const getPostIds = async ({ appId, apiUrl, slug }) => {
+  const realBottom = {
+    ...GraphQlQueryPathSegments.bottom,
+    appInfo: {
+      ...GraphQlQueryPathSegments.bottom.appInfo,
+      appId,
+    },
+    pathSegments: [slug],
+  };
+  const response = await fetch(apiUrl, {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      operationName: GraphQlQueryPathSegments.queryName,
+      query: GraphQlQueryPathSegments.top,
+      variables: realBottom,
+    }),
+  });
+  const result = await response.json();
+  // @ts-ignore
+  if (result && result.error) {
+    // @ts-ignore
+    throw new Error(`api error: ${result.error}`);
+  }
+  // @ts-ignore
+  const realData = result.data.catalog.lookupPathSegments
+    .flatMap((item) => item.matches)
+    .map((match) => {
+      const { __typename, ...rest } = match;
+      return rest;
+    })
+    .map((match) => {
+      return match.id;
+    });
+  return realData;
+};

package/src/parts/HandleApiArticle/HandleApiArticle.js

@@ -1,99 +1,30 @@
-import * as GraphQlQueryPathSegments from "../GraphQlQueryPathSegments/GraphQlQueryPathSegments.js";
-import * as GraphQlQueryContent from "../GraphQlQueryContent/GraphQlQueryContent.js";
-
-const getPostIds = async ({ appId, apiUrl, slug }) => {
-  const realBottom = {
-    ...GraphQlQueryPathSegments.bottom,
-    appInfo: {
-      ...GraphQlQueryPathSegments.bottom.appInfo,
-      appId,
-    },
-    pathSegments: [slug],
-  };
-  const response = await fetch(apiUrl, {
-    method: "POST",
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      operationName: GraphQlQueryPathSegments.queryName,
-      query: GraphQlQueryPathSegments.top,
-      variables: realBottom,
-    }),
-  });
-  const result = await response.json();
-  // @ts-ignore
-  if (result && result.error) {
-    // @ts-ignore
-    throw new Error(`api error: ${result.error}`);
-  }
-  // @ts-ignore
-  const realData = result.data.catalog.lookupPathSegments
-    .flatMap((item) => item.matches)
-    .map((match) => {
-      const { __typename, ...rest } = match;
-      return rest;
-    })
-    .map((match) => {
-      return match.id;
-    });
-  return realData;
-};
-
-const getContent = async ({ appId, apiUrl, postId }) => {
-  const realBottom = {
-    ...GraphQlQueryContent.bottom,
-    appInfo: {
-      ...GraphQlQueryContent.bottom.appInfo,
-      appId,
-    },
-    filter: {
-      id: {
-        value: postId,
-      },
-    },
-  };
-  const response = await fetch(apiUrl, {
-    method: "POST",
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      operationName: GraphQlQueryContent.queryName,
-      query: GraphQlQueryContent.top,
-      variables: realBottom,
-    }),
-  });
-  const result = await response.json();
-  // @ts-ignore
-  if (result && result.error) {
-    // @ts-ignore
-    throw new Error(`api error: ${result.error}`);
-  }
-  // @ts-ignore
-  const realData = result.data.catalog.contentsConnection.edges
-    .map((edge) => edge.content)
-    .map((match) => {
-      const { __typename, ...rest } = match;
-      return rest;
-    });
-  return realData;
-};
+import * as GetPostIds from "../GetPostIds/GetPostIds.js";
+import * as HandleApiPostByName from "../HandleApiPostByName/HandleApiPostByName.js";
+import * as HandleApiArticleByCategoryId from "../HandleApiArticleByCategoryId/HandleApiArticleByCategoryId.js";
 
 export const handleApiArticle =
   ({ appId, apiUrl }) =>
   async (req, res, next) => {
     const articleSlug = req.url.slice("/articles/".length);
-    const postIds = await getPostIds({ appId, apiUrl, slug: articleSlug });
-    if (postIds.length === 0) {
-      res.setHeader("content-type", "application/json");
-      res.end(JSON.stringify("Not found", null, 2));
-      return;
+    const url = new URL(req.url, "https://example.com");
+    const categoryId = url.searchParams.get("categoryId");
+    if (categoryId) {
+      return HandleApiArticleByCategoryId.handleApiArticleByCategoryId({
+        apiUrl,
+        appId,
+        categoryId,
+        res,
+      });
     }
-    const postId = postIds[0];
-    const content = await getContent({ appId, apiUrl, postId });
-    res.setHeader("content-type", "application/json");
-    res.end(JSON.stringify(content, null, 2));
+    const postIds = await GetPostIds.getPostIds({
+      appId,
+      apiUrl,
+      slug: articleSlug,
+    });
+    return HandleApiPostByName.handleApiPostByName({
+      apiUrl,
+      appId,
+      postIds,
+      res,
+    });
   };

package/src/parts/HandleApiArticleByCategoryId/HandleApiArticleByCategoryId.js

@@ -0,0 +1,93 @@
+import * as GraphQlQueryContent from "../GraphQlQueryContent/GraphQlQueryContent.js";
+
+const getContent = async ({ appId, apiUrl, categoryId }) => {
+  const realBottom = {
+    ...GraphQlQueryContent.bottom,
+    appInfo: {
+      ...GraphQlQueryContent.bottom.appInfo,
+      appId,
+    },
+    filter: {
+      AND: [
+        {
+          contentType: {
+            value: "POST",
+          },
+        },
+        {
+          postType: {
+            value: "post",
+          },
+        },
+        {
+          taxonomies: {
+            content: {
+              value: {
+                AND: [
+                  {
+                    type: {
+                      value: "category",
+                    },
+                  },
+                  {
+                    OR: [
+                      {
+                        id: {
+                          value: categoryId,
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          id: {
+            value: "^()$",
+            operation: "REGEX",
+            negated: true,
+          },
+        },
+      ],
+    },
+  };
+  const response = await fetch(apiUrl, {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      operationName: GraphQlQueryContent.queryName,
+      query: GraphQlQueryContent.top,
+      variables: realBottom,
+    }),
+  });
+  const result = await response.json();
+  // @ts-ignore
+  if (result && result.error) {
+    // @ts-ignore
+    throw new Error(`api error: ${result.error}`);
+  }
+  // @ts-ignore
+  const realData = result.data.catalog.contentsConnection.edges
+    .map((edge) => edge.content)
+    .map((match) => {
+      const { __typename, ...rest } = match;
+      return rest;
+    });
+  return realData;
+};
+
+export const handleApiArticleByCategoryId = async ({
+  appId,
+  apiUrl,
+  categoryId,
+  res,
+}) => {
+  const content = await getContent({ appId, apiUrl, categoryId });
+  res.setHeader("content-type", "application/json");
+  res.end(JSON.stringify(content, null, 2));
+};

package/src/parts/HandleApiCollection/HandleApiCollection.js

@@ -32,6 +32,12 @@ const getCollections = async ({ appId, apiUrl, name }) => {
     throw new Error(`api error: ${result.error}`);
   }
   // @ts-ignore
+  if (result && result.errors) {
+    // @ts-ignore
+    throw new Error(`api error: ${result.errors[0].message}`);
+  }
+  console.log({ result });
+  // @ts-ignore
   const realData = result.data.catalog.collectionsConnection.edges
     .map((edge) => {
       return edge.node;

package/src/parts/HandleApiPostByName/HandleApiPostByName.js

@@ -0,0 +1,54 @@
+import * as GraphQlQueryContent from "../GraphQlQueryContent/GraphQlQueryContent.js";
+
+const getContent = async ({ appId, apiUrl, postId }) => {
+  const realBottom = {
+    ...GraphQlQueryContent.bottom,
+    appInfo: {
+      ...GraphQlQueryContent.bottom.appInfo,
+      appId,
+    },
+    filter: {
+      id: {
+        value: postId,
+      },
+    },
+  };
+  const response = await fetch(apiUrl, {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      operationName: GraphQlQueryContent.queryName,
+      query: GraphQlQueryContent.top,
+      variables: realBottom,
+    }),
+  });
+  const result = await response.json();
+  // @ts-ignore
+  if (result && result.error) {
+    // @ts-ignore
+    throw new Error(`api error: ${result.error}`);
+  }
+  // @ts-ignore
+  const realData = result.data.catalog.contentsConnection.edges
+    .map((edge) => edge.content)
+    .map((match) => {
+      const { __typename, ...rest } = match;
+      return rest;
+    });
+  return realData;
+};
+
+export const handleApiPostByName = async ({ postIds, res, appId, apiUrl }) => {
+  if (postIds.length === 0) {
+    res.setHeader("content-type", "application/json");
+    res.end(JSON.stringify("Not found", null, 2));
+    return;
+  }
+  const postId = postIds[0];
+  const content = await getContent({ appId, apiUrl, postId });
+  res.setHeader("content-type", "application/json");
+  res.end(JSON.stringify(content, null, 2));
+};

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '12.25.0'
+export const version = '12.26.0'