repository-provider 32.7.17 → 32.7.18

package/README.md

@@ -422,7 +422,7 @@ mapAttributes({a:1},{a:"a'"}) // {"a'": 1}
 
 ### Parameters
 
-*   `object` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
+*   `object` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 *   `mapping` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** keys renamed after mapping
@@ -454,7 +454,7 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `default` **any?** the default value
 *   `set` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** set the value
 *   `get` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** get the value can be used to calculate default values
-*   `env` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)?** environment variable use to provide the value
+*   `env` **([Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)> | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))?** environment variable use to provide the value
 
 ## tokens
 
@@ -464,8 +464,6 @@ Split property path into tokens
 
 *   `string` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 
-Returns **Iterator<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
-
 ## setAttribute
 
 Set Object attribute.
@@ -520,7 +518,7 @@ Creates an instance of BaseObject.
 
 ### Parameters
 
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
 *   `additionalProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
 
 ### updateAttributes
@@ -529,8 +527,8 @@ Takes values from options.
 
 #### Parameters
 
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
-*   `additionalProperties` &#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `additionalProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
 
 ### update
 
@@ -1100,8 +1098,7 @@ Object with a name.
 
 *   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
-*   `additionalProperties` &#x20;
-*   `Object`  |
+*   `additionalProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
 
 ### Properties
 
@@ -1552,7 +1549,6 @@ Abstract repository collection.
 
     *   `options.description` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** human readable description
     *   `options.id` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** internal id
-    *   `options.uuid` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** internal id
     *   `options.url` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** home
 
 ### Properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repository-provider",
-  "version": "32.7.17",
+  "version": "32.7.18",
   "publishConfig": {
     "access": "public"
   },
@@ -34,10 +34,10 @@
   },
   "devDependencies": {
     "ava": "^5.2.0",
-    "browser-ava": "^1.3.38",
+    "browser-ava": "^1.3.43",
     "c8": "^7.13.0",
-    "documentation": "^14.0.1",
-    "repository-provider-test-support": "^2.3.5",
+    "documentation": "^14.0.2",
+    "repository-provider-test-support": "^2.3.6",
     "semantic-release": "^21.0.2",
     "typescript": "^5.0.4"
   },

package/src/attribute-extras.mjs

@@ -155,7 +155,7 @@ export function optionJSON(
  * ```js
  * mapAttributes({a:1},{a:"a'"}) // {"a'": 1}
  * ```
- * @param {Object} [object]
+ * @param {Object} object
  * @param {Object} mapping
  * @return {Object} keys renamed after mapping
  */

package/src/attribute.mjs

@@ -10,29 +10,60 @@
  * @property {any} [default] the default value
  * @property {Function} [set] set the value
  * @property {Function} [get] get the value can be used to calculate default values
- * @property {string|string[]} [env] environment variable use to provide the value
+ * @property {string[]|string} [env] environment variable use to provide the value
  */
 
 /**
  * Split property path into tokens
+ * @generator
  * @param {string} string
- * @return {Iterator<string>}
+ * @yields {string}
  */
-function* tokens(string) {
+export function* tokens(string) {
   let identifier = "";
+  let last;
 
   for (const c of string) {
     switch (c) {
       case "\t":
       case " ":
+        if (identifier.length) {
+          yield identifier;
+          identifier = "";
+        }
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         break;
 
+      case "!":
       case ">":
       case "<":
+        if (last) {
+          yield last;
+        }
+        last = c;
+        break;
+
+      case "=":
+        if (last) {
+          yield last + c;
+          last = undefined;
+          break;
+        }
 
+      case "+":
+      case "-":
       case ".":
+      case "(":
+      case ")":
       case "[":
       case "]":
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         if (identifier.length) {
           yield identifier;
           identifier = "";
@@ -40,6 +71,10 @@ function* tokens(string) {
         yield c;
         break;
       default:
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         identifier += c;
     }
   }
@@ -47,6 +82,9 @@ function* tokens(string) {
   if (identifier.length) {
     yield identifier;
   }
+  if (last) {
+    yield last;
+  }
 }
 
 /**
@@ -116,3 +154,47 @@ export function getAttribute(object, name) {
 
   return object;
 }
+
+/**
+ * Deliver attribute value and operator.
+ * The name may be a property path like 'a.b.c <='.
+ * @param {Object} object
+ * @param {string} expression
+ * @returns {[any,string]} value associated with the given property name
+ */
+export function getAttributeAndOperator(object, expression, getters = {}) {
+  let op = "=";
+
+  for (const token of tokens(expression)) {
+    switch (token) {
+      case ">=":
+      case "<=":
+      case ">":
+      case "<":
+      case "=":
+      case "!=":
+        op = token;
+        break;
+      case ".":
+      case "[":
+      case "]":
+        break;
+
+      default:
+        if (object === undefined) {
+          break;
+        }
+
+        const g = getters[token];
+        if (g) {
+          object = g(object);
+        } else {
+          if (object[token] !== undefined) {
+            object = object[token];
+          }
+        }
+    }
+  }
+
+  return [object, op];
+}

package/src/base-object.mjs

@@ -6,7 +6,7 @@ import { description_attribute, id_attribute } from "./attributes.mjs";
 
   /**
    * Creates an instance of BaseObject.
-   * @param {Object} [options]
+   * @param {Object} options
    * @param {Object} [additionalProperties]
    */
   export class BaseObject {
@@ -63,7 +63,8 @@ import { description_attribute, id_attribute } from "./attributes.mjs";
 
   /**
    * Takes values from options.
-   * @param {Object} [options]
+   * @param {Object} options
+   * @param {Object} [additionalProperties]
    */
   updateAttributes(options, additionalProperties) {
     definePropertiesFromOptions(