pacc 3.1.9 → 3.3.0

package/LICENSE

@@ -1,23 +1,12 @@
-Copyright (c) 2023-2024 by arlac77
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (C) 2023-2025 by arlac77
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -1,5 +1,5 @@
 [![npm](https://img.shields.io/npm/v/pacc.svg)](https://www.npmjs.com/package/pacc)
-[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+[![License](https://img.shields.io/badge/License-0BSD-blue.svg)](https://spdx.org/licenses/0BSD.html)
 [![Typed with TypeScript](https://flat.badgen.net/badge/icon/Typed?icon=typescript\&label\&labelColor=blue\&color=555555)](https://typescriptlang.org)
 [![bundlejs](https://deno.bundlejs.com/?q=pacc\&badge=detailed)](https://bundlejs.com/?q=pacc)
 [![downloads](http://img.shields.io/npm/dm/pacc.svg?style=flat-square)](https://npmjs.org/package/pacc)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "3.1.9",
+  "version": "3.3.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -8,8 +8,8 @@
   "types": "./types/attribute.d.mts",
   "exports": {
     ".": {
-      "default": "./src/attribute.mjs",
-      "types": "./types/attribute.d.mts"
+      "types": "./types/attribute.d.mts",
+      "default": "./src/attribute.mjs"
     }
   },
   "description": "property path utils",
@@ -22,26 +22,26 @@
   "license": "0BSD",
   "scripts": {
     "prepare": "node --run prepare:typescript",
-    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
+    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "node --run test:browser-ava && node --run test:ava",
     "test:browser-ava": "browser-ava --headless --no-keep-open tests/*-ava.mjs tests/*-ava-browser.mjs",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
-    "docs": "documentation readme --section=API ./src/**/*.mjs",
+    "docs": "documentation readme --section=API ./src**/*.mjs",
     "lint": "node --run lint:docs && node --run lint:typescript",
-    "lint:docs": "documentation lint ./src/**/*.mjs",
-    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
+    "lint:docs": "documentation lint ./src**/*.mjs",
+    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "devDependencies": {
     "ava": "^6.2.0",
-    "browser-ava": "^2.3.4",
+    "browser-ava": "^2.3.9",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.0",
-    "typescript": "^5.7.2"
+    "semantic-release": "^24.2.1",
+    "typescript": "^5.7.3"
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=22.13.1"
   },
   "repository": {
     "type": "git",

package/src/attribute.mjs

@@ -81,7 +81,7 @@ export function setAttribute(object, expression, value) {
  * @returns {any} value associated with the given property name
  */
 export function getAttribute(object, expression) {
-  return object?.[expression] || getAttributeAndOperator(object, expression)[0];
+  return getAttributeAndOperator(object, expression)[0];
 }
 
 /**
@@ -92,8 +92,21 @@ export function getAttribute(object, expression) {
  * @returns {[any,Token]} value associated with the given property name
  */
 export function getAttributeAndOperator(object, expression) {
-  let op = EQUAL;
+  switch (typeof object?.[expression]) {
+    case "function":
+      object = object[expression]();
+      if (typeof object[Symbol.iterator] === "function") {
+        object = [...object];
+      }
+      return [object, EQUAL];
+    case "undefined":
+      break;
+    default:
+      return [object[expression], EQUAL];
+  }
+
   let predicateTokens;
+  let op = EQUAL;
 
   for (const token of tokens(expression)) {
     switch (token) {
@@ -118,7 +131,7 @@ export function getAttributeAndOperator(object, expression) {
         predicateTokens = undefined;
         break;
       case STAR:
-        if(!predicateTokens) {
+        if (!predicateTokens) {
           const error = new Error("unexpected '*' in attribute path");
           // @ts-ignore
           error.expression = expression;
@@ -128,14 +141,20 @@ export function getAttributeAndOperator(object, expression) {
         break;
 
       default:
-        if (object === undefined) {
-          break;
-        }
-
-        if (object[token] !== undefined) {
-          object = object[token];
-        } else {
-          return [undefined, op];
+        if (object !== undefined) {
+          switch (typeof object[token]) {
+            case "function":
+              object = object[token]();
+              if (typeof object[Symbol.iterator] === "function") {
+                object = [...object];
+              }
+              break;
+            default:
+              object = object[token];
+              break;
+            case "undefined":
+              return [undefined, op];
+          }
         }
     }
   }