@adobe/helix-config 3.2.1 → 3.2.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.2.3](https://github.com/adobe/helix-config/compare/v3.2.2...v3.2.3) (2024-06-01)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ajv to v8.14.0 ([c39e9d5](https://github.com/adobe/helix-config/commit/c39e9d5b66b242e5d570194d5fa97a71c0bd7f66))
+
+## [3.2.2](https://github.com/adobe/helix-config/compare/v3.2.1...v3.2.2) (2024-05-31)
+
+
+### Bug Fixes
+
+* refactor to separate imports ([#94](https://github.com/adobe/helix-config/issues/94)) ([2678381](https://github.com/adobe/helix-config/commit/26783813cf54740d10bb485ba98e442213effdf4))
+
 ## [3.2.1](https://github.com/adobe/helix-config/compare/v3.2.0...v3.2.1) (2024-05-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -63,7 +63,7 @@
     "@adobe/helix-shared-git": "3.0.9",
     "@adobe/helix-shared-storage": "1.0.2",
     "@adobe/helix-shared-utils": "3.0.2",
-    "ajv": "8.13.0",
+    "ajv": "8.14.0",
     "ajv-formats": "3.0.1",
     "jose": "5.3.0"
   }

package/src/config-view.js

@@ -21,7 +21,7 @@ import {
 } from './ConfigContext.js';
 import { resolveLegacyConfig, fetchRobotsTxt, toArray } from './config-legacy.js';
 import { getMergedConfig } from './config-merge.js';
-import { deepGetOrCreate } from './storage/utils.js';
+import { deepGetOrCreate } from './utils.js';
 
 /**
  * @typedef Config

package/src/storage/config-store.js

@@ -15,13 +15,12 @@ import { HelixStorage } from '@adobe/helix-shared-storage';
 import { StatusCodeError } from './status-code-error.js';
 import {
   createToken, createUser,
-  deepGetOrCreate,
-  deepPut,
   migrateToken,
   updateCodeSource,
   updateContentSource,
 } from './utils.js';
 import { validate } from './config-validator.js';
+import { deepGetOrCreate, deepPut } from '../utils.js';
 
 const FRAGMENTS_COMMON = {
   content: 'object',

package/src/storage/utils.js

@@ -15,67 +15,6 @@ import { GitUrl } from '@adobe/helix-shared-git';
 import { decodeJwt } from 'jose';
 import { StatusCodeError } from './status-code-error.js';
 
-/**
- * Returns the property addressed by the given path in the object.
- * If {@code create} is {@code true}, intermediate objects will be created if they do not exist.
- *
- * @param {object} obj the object to search
- * @param {string|string[]} path the path or path segments
- * @param {boolean} create if {@code true} intermediate objects will be created if they do not exist
- * @returns {*}
- */
-export function deepGetOrCreate(obj, path, create = false) {
-  const parts = Array.isArray(path) ? path : path.split('/');
-  return parts.reduce((o, prop) => {
-    if (Array.isArray(o)) {
-      // todo: better support for arrays
-      return o.find((e) => e.id === prop);
-    } else {
-      if (create && !(prop in o)) {
-        // eslint-disable-next-line no-param-reassign
-        o[prop] = {};
-      }
-      return o[prop];
-    }
-  }, obj);
-}
-
-/**
- * Sets the property addressed by the given path in the object.
- * @param {object} obj the object to search
- * @param {string|string[]} path the path or path segments
- * @param {*} value the value to set on the object
- * @returns {object} the passed in `obj`
- */
-export function deepPut(obj, path, value) {
-  const parts = Array.isArray(path) ? path : path.split('/');
-  const last = parts.pop();
-  const parent = parts.reduce((o, prop) => {
-    if (!(prop in o)) {
-      // eslint-disable-next-line no-param-reassign
-      o[prop] = {};
-    }
-    return o[prop];
-  }, obj);
-
-  if (Array.isArray(parent)) {
-    // todo: better support for non id keys
-    const idx = parent.findIndex((e) => e.id === last);
-    if (idx >= 0 && value === null) {
-      parent.splice(idx, 1);
-    } else if (idx >= 0) {
-      parent[idx] = value;
-    } else if (value !== null) {
-      parent.push(value);
-    }
-  } else if (value === null) {
-    delete parent[last];
-  } else {
-    parent[last] = value;
-  }
-  return obj;
-}
-
 /**
  * Update the contentBusId field of the content object based on the source URL.
  * @param ctx

package/src/utils.js

@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/**
+ * Returns the property addressed by the given path in the object.
+ * If {@code create} is {@code true}, intermediate objects will be created if they do not exist.
+ *
+ * @param {object} obj the object to search
+ * @param {string|string[]} path the path or path segments
+ * @param {boolean} create if {@code true} intermediate objects will be created if they do not exist
+ * @returns {*}
+ */
+export function deepGetOrCreate(obj, path, create = false) {
+  const parts = Array.isArray(path) ? path : path.split('/');
+  return parts.reduce((o, prop) => {
+    if (Array.isArray(o)) {
+      // todo: better support for arrays
+      return o.find((e) => e.id === prop);
+    } else {
+      if (create && !(prop in o)) {
+        // eslint-disable-next-line no-param-reassign
+        o[prop] = {};
+      }
+      return o[prop];
+    }
+  }, obj);
+}
+
+/**
+ * Sets the property addressed by the given path in the object.
+ * @param {object} obj the object to search
+ * @param {string|string[]} path the path or path segments
+ * @param {*} value the value to set on the object
+ * @returns {object} the passed in `obj`
+ */
+export function deepPut(obj, path, value) {
+  const parts = Array.isArray(path) ? path : path.split('/');
+  const last = parts.pop();
+  const parent = parts.reduce((o, prop) => {
+    if (!(prop in o)) {
+      // eslint-disable-next-line no-param-reassign
+      o[prop] = {};
+    }
+    return o[prop];
+  }, obj);
+
+  if (Array.isArray(parent)) {
+    // todo: better support for non id keys
+    const idx = parent.findIndex((e) => e.id === last);
+    if (idx >= 0 && value === null) {
+      parent.splice(idx, 1);
+    } else if (idx >= 0) {
+      parent[idx] = value;
+    } else if (value !== null) {
+      parent.push(value);
+    }
+  } else if (value === null) {
+    delete parent[last];
+  } else {
+    parent[last] = value;
+  }
+  return obj;
+}