pmcf 1.76.1 → 1.76.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.76.1",
+  "version": "1.76.2",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -16,6 +16,12 @@ const BaseTypeDefinition = {
       identifier: true,
       writeable: true
     },
+   /* fullName: {
+      type: "string",
+      collection: false,
+      identifier: true,
+      writeable: false
+    },*/
     description: { type: "string", collection: false, writeable: true },
     directory: { type: "string", collection: false, writeable: false },
     packaging: { type: "string", collection: false, writeable: true }
@@ -269,7 +275,7 @@ export class Base {
   }
 
   get domains() {
-    return this.owner?.domains || new Set();;
+    return this.owner?.domains || new Set();
   }
 
   get administratorEmail() {

package/src/filter.mjs

@@ -1,6 +1,24 @@
 export function* objectFilter(type, objects, filter) {
   if (filter) {
     advance: for (const object of objects) {
+      const compare = (op, key, value) => {
+        switch (op) {
+          case "=":
+            return object[key] == value;
+          case "!=":
+            return object[key] != value;
+          case "<":
+            return object[key] < value;
+          case "<=":
+            return object[key] <= value;
+          case ">":
+            return object[key] > value;
+          case ">=":
+            return object[key] >= value;
+        }
+        return false;
+      };
+
       const filterString = key => {
         if (filter[key] === undefined) {
           return true;
@@ -27,21 +45,7 @@ export function* objectFilter(type, objects, filter) {
           case "string":
             const m = filter[key].match(/^([=><!]+)(\d+)/);
             if (m) {
-              const value = parseInt(m[2]);
-              switch (m[1]) {
-                case "=":
-                  return object[key] === value;
-                case "!=":
-                  return object[key] !== value;
-                case "<":
-                  return object[key] < value;
-                case "<=":
-                  return object[key] <= value;
-                case ">":
-                  return object[key] > value;
-                case ">=":
-                  return object[key] >= value;
-              }
+              return compare(m[1], key, parseInt(m[2]));
             }
         }
         return false;