Merge branch 'main' into fix-r2-bindings

Author: dylandepass

.eslintrc.cjs

@@ -46,6 +46,13 @@ module.exports = {
     // parameters is definitely desirable
     'no-param-reassign': 'off',
 
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        devDependencies: true,
+      },
+    ],
+
     // Allow while (true) infinite loops
     // 'no-constant-condition': ['error', { checkLoops: false }],
 

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Current Mocha Test",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "--timeout", "999999",
+        "--colors",
+        "--no-timeouts",
+        "${file}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "skipFiles": ["<node_internals>/**"],
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
+  },
+  "eslint.enable": true,
+  "prettier.enable": true,
+  "eslint.validate": ["javascript"],
+  "stylelint.enable": true,
+  "[css]": {
+    "editor.defaultFormatter": "stylelint.vscode-stylelint"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "liveServer.settings.port": 5501,
+}

CHANGELOG.md

@@ -1,3 +1,39 @@
+# [1.2.0](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.1.9...v1.2.0) (2024-10-22)
+
+
+### Bug Fixes
+
+* add ci r2 bindings ([dff1907](https://github.com/adobe-rnd/helix-commerce-api/commit/dff1907971d82879c72d9bdfaccf544f6b2658d4))
+* add envs to configs ([b733899](https://github.com/adobe-rnd/helix-commerce-api/commit/b73389958597660dec359349bb257d09632549e0))
+* add tests ([28cceb8](https://github.com/adobe-rnd/helix-commerce-api/commit/28cceb847c0d83c31e93fba5c3fbab8314c3afe5))
+* cleanup ([a4a3afa](https://github.com/adobe-rnd/helix-commerce-api/commit/a4a3afac3b5124c214d0de4546d94f5ef3988da6))
+* disable preview ([dd25a23](https://github.com/adobe-rnd/helix-commerce-api/commit/dd25a23a9ff794ca621d3cde961571b1af9f5837))
+* don't default org repo ([21ad084](https://github.com/adobe-rnd/helix-commerce-api/commit/21ad08478f3ee250863b66702f706414ed4cc396))
+* encoding ([11bb8bc](https://github.com/adobe-rnd/helix-commerce-api/commit/11bb8bcdc0e5c68826dc8a084ea525c7e9a87ddc))
+* more cleanup ([f1c2d27](https://github.com/adobe-rnd/helix-commerce-api/commit/f1c2d27c430b9bb15c54425a87683af7ceac8ff6))
+* org not owner ([478bf85](https://github.com/adobe-rnd/helix-commerce-api/commit/478bf85985f0fc81d8ec54a591ece26a099caa04))
+* pattern matching ([f58f18e](https://github.com/adobe-rnd/helix-commerce-api/commit/f58f18e89ddc68b6ce7e889761d75d596b1d89e0))
+* preview call ([4ba5ea8](https://github.com/adobe-rnd/helix-commerce-api/commit/4ba5ea8a754d19512a82e4462aafa8f07f1ab1f9))
+* pull from helix catalog ([918ca03](https://github.com/adobe-rnd/helix-commerce-api/commit/918ca03b432dbc3a2ea6a7a0742ae571aafa1669))
+* remove content type and body for 301 ([9280dab](https://github.com/adobe-rnd/helix-commerce-api/commit/9280dabe7594057f16f3d6e572127061700d0d53))
+* rename catalog functions ([28e4374](https://github.com/adobe-rnd/helix-commerce-api/commit/28e43745bd016da50f0cf96cb6adca90d721e377))
+* return 301 for urlKey lookup ([e0388d5](https://github.com/adobe-rnd/helix-commerce-api/commit/e0388d5f7232a2cc61c6e734dd585b399486376b))
+* switch to org--repo tenant ([5957e1a](https://github.com/adobe-rnd/helix-commerce-api/commit/5957e1a1f1374c1cfa52b9848143d50727c4bcdf))
+* switch to org/site ([44853a8](https://github.com/adobe-rnd/helix-commerce-api/commit/44853a8229d123b07b924a0a40a661cb8bed2295))
+* test and update ([71dc947](https://github.com/adobe-rnd/helix-commerce-api/commit/71dc94731a44a1b1a732be0221324e6e573e02d7))
+* tests ([e6fbd50](https://github.com/adobe-rnd/helix-commerce-api/commit/e6fbd50c6eff061f89f054ac68ea35d6b678f534))
+* tests ([29a006c](https://github.com/adobe-rnd/helix-commerce-api/commit/29a006ca8e881f5ee67867f7aebd803833451648))
+* tweak r2 paths ([c90abd4](https://github.com/adobe-rnd/helix-commerce-api/commit/c90abd415e549f1d43c42a8650e00262d0e6788d))
+* urlKey tests ([3a84208](https://github.com/adobe-rnd/helix-commerce-api/commit/3a842085164544f9dcb9ac4e352b0f4a117fa209))
+* use env in catalog route ([0959827](https://github.com/adobe-rnd/helix-commerce-api/commit/095982795f6cb0be072b6015f3d64584bacf6e74))
+* use sku from path and sanitize ([18d0009](https://github.com/adobe-rnd/helix-commerce-api/commit/18d0009d890331116df29b95cc67189a82f18530))
+* validation in put product ([739c10f](https://github.com/adobe-rnd/helix-commerce-api/commit/739c10f68c11cfd12ee1609c8d4995a6a4c441d4))
+
+
+### Features
+
+* wip catalog service ([069a010](https://github.com/adobe-rnd/helix-commerce-api/commit/069a010e2075d0562244818de9f05dcf53c9fd67))
+
 ## [1.1.9](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.1.8...v1.1.9) (2024-10-10)
 
 

jsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "target": "ES6",
+    "module": "NodeNext",   
+    "moduleResolution": "NodeNext",
+    "checkJs": true,
+    "allowJs": true,
+    "baseUrl": ".",
+    "paths": {
+      "*": ["types/*"],         
+      "@cloudflare/workers-types/*": ["node_modules/@cloudflare/workers-types/*"]
+    }
+  },
+  "include": [
+    "./**/*.js",
+    "./src/types.d.ts" 
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "helix-commerce-api",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "private": true,
   "description": "API for markup content and a commerce graphql commerce proxy",
   "main": "src/index.js",
@@ -9,7 +9,7 @@
     "prepare": "husky",
     "build": "node build.js",
     "lint": "eslint . --ext js,cjs,mjs",
-    "test": "c8 mocha -i -g 'Post-Deploy' --spec test/*.test.js",
+    "test": "c8 --all --include 'src/**/*.js' mocha -i -g 'Post-Deploy' --spec 'test/**/*.test.js'",
     "dev": "if test -e .dev.vars; then wrangler dev --; else echo \"Need a .dev.vars files before starting local dev server\"; fi",
     "dev:remote": "wrangler dev --remote",
     "test-postdeploy": "mocha --spec test/post-deploy.test.js",
@@ -52,12 +52,14 @@
     "eslint": "8.57.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.29.1",
+    "esmock": "^2.6.9",
     "husky": "9.1.4",
     "lint-staged": "15.2.9",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.5.4",
     "semantic-release": "24.0.0",
+    "sinon": "^19.0.2",
     "wrangler": "3.71.0"
   },
   "lint-staged": {

package.json

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/* eslint-disable no-await-in-loop */
+
+import { errorResponse } from '../utils/http.js';
+import { fetchProduct } from '../utils/r2.js';
+
+/**
+ * Handles a GET request for a product.
+ * @param {Context} ctx - The context object containing request information and utilities.
+ * @param {Config} config - The configuration object with application settings.
+ * @returns {Promise<Response>} - A promise that resolves to the product response.
+ */
+export async function handleProductFetchRequest(ctx, config) {
+  try {
+    const sku = ctx.url.pathname.split('/').pop();
+    const product = await fetchProduct(ctx, config, sku);
+
+    return new Response(JSON.stringify(product), {
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (e) {
+    if (e.response) {
+      return e.response;
+    }
+    ctx.log.error(e);
+    return errorResponse(500, 'internal server error');
+  }
+}