@aeriajs/common 0.0.97 → 0.0.99

package/dist/index.d.ts

@@ -1,14 +1,11 @@
 export * from './arraysIntersect.js';
 export * from './checkForUndefined.js';
-export * from './convertConditionToQuery.js';
-export * from './date.js';
 export * from './deepClone.js';
 export * from './deepMerge.js';
 export * from './dynamicImport.js';
 export * from './result.js';
 export * from './endpointError.js';
 export * from './evaluateCondition.js';
-export * from './formatValue.js';
 export * from './freshItem.js';
 export * from './getMissingProperties.js';
 export * from './getReferenceProperty.js';

package/dist/index.js

@@ -16,15 +16,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./arraysIntersect.js"), exports);
 __exportStar(require("./checkForUndefined.js"), exports);
-__exportStar(require("./convertConditionToQuery.js"), exports);
-__exportStar(require("./date.js"), exports);
 __exportStar(require("./deepClone.js"), exports);
 __exportStar(require("./deepMerge.js"), exports);
 __exportStar(require("./dynamicImport.js"), exports);
 __exportStar(require("./result.js"), exports);
 __exportStar(require("./endpointError.js"), exports);
 __exportStar(require("./evaluateCondition.js"), exports);
-__exportStar(require("./formatValue.js"), exports);
 __exportStar(require("./freshItem.js"), exports);
 __exportStar(require("./getMissingProperties.js"), exports);
 __exportStar(require("./getReferenceProperty.js"), exports);

package/dist/index.mjs

@@ -1,15 +1,12 @@
 "use strict";
 export * from "./arraysIntersect.mjs";
 export * from "./checkForUndefined.mjs";
-export * from "./convertConditionToQuery.mjs";
-export * from "./date.mjs";
 export * from "./deepClone.mjs";
 export * from "./deepMerge.mjs";
 export * from "./dynamicImport.mjs";
 export * from "./result.mjs";
 export * from "./endpointError.mjs";
 export * from "./evaluateCondition.mjs";
-export * from "./formatValue.mjs";
 export * from "./freshItem.mjs";
 export * from "./getMissingProperties.mjs";
 export * from "./getReferenceProperty.mjs";

package/dist/isObjectId.d.ts

@@ -1,2 +1,2 @@
 import type { ObjectId } from 'mongodb';
-export declare const isObjectId: (value: any) => value is ObjectId;
+export declare const isObjectId: (value: unknown) => value is ObjectId;

package/dist/isObjectId.js

@@ -6,6 +6,9 @@ const isObjectId = (value) => {
     // the latter is prone to errors when `mongodb` dependency is duplicated
     // -- when ./node_modules/mongodb and ../node_modules/mongodb are both
     // present and the bundler doesn't handle this correctly
-    return value._bsontype === 'ObjectId';
+    return !!(value
+        && typeof value === 'object'
+        && '_bsontype' in value
+        && value._bsontype === 'ObjectId');
 };
 exports.isObjectId = isObjectId;

package/dist/isObjectId.mjs

@@ -1,4 +1,4 @@
 "use strict";
 export const isObjectId = (value) => {
-  return value._bsontype === "ObjectId";
+  return !!(value && typeof value === "object" && "_bsontype" in value && value._bsontype === "ObjectId");
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.97",
+  "version": "0.0.99",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "bson": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/types": "^0.0.83",
+    "@aeriajs/types": "^0.0.85",
     "bson": "^6.5.0"
   },
   "scripts": {

package/dist/convertConditionToQuery.d.ts

@@ -1,2 +0,0 @@
-import type { Condition } from '@aeriajs/types';
-export declare const convertConditionToQuery: (condition: Condition, subject?: Record<string, unknown>) => Record<string, unknown>;

package/dist/convertConditionToQuery.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertConditionToQuery = void 0;
-const getValueFromPath_js_1 = require("./getValueFromPath.js");
-const convertExpression = (condition, subject) => {
-    const term2 = 'term2' in condition
-        ? condition.fromState
-            ? (0, getValueFromPath_js_1.getValueFromPath)(subject, condition.term2)
-            : condition.term2
-        : null;
-    switch (condition.operator) {
-        case 'truthy': return {
-            $ne: [
-                null,
-                undefined,
-            ],
-        };
-        case 'equal': return term2;
-        case 'gt': return {
-            $gt: term2,
-        };
-        case 'lt': return {
-            $lt: term2,
-        };
-        case 'gte': return {
-            $gte: term2,
-        };
-        case 'lte': return {
-            $lte: term2,
-        };
-        case 'regex': return {
-            $regex: term2,
-            $options: condition.regexOptions,
-        };
-        case 'in': {
-            return Array.isArray(term2)
-                ? {
-                    $in: term2,
-                }
-                : term2;
-        }
-    }
-};
-const convertConditionToQuery = (condition, subject) => {
-    if ('or' in condition) {
-        return {
-            $or: condition.or.map((sub) => (0, exports.convertConditionToQuery)(sub, subject)),
-        };
-    }
-    if ('and' in condition) {
-        return {
-            $and: condition.and.map((sub) => (0, exports.convertConditionToQuery)(sub, subject)),
-        };
-    }
-    if ('not' in condition) {
-        return {
-            $not: (0, exports.convertConditionToQuery)(condition.not, subject),
-        };
-    }
-    return {
-        [condition.term1]: convertExpression(condition, subject),
-    };
-};
-exports.convertConditionToQuery = convertConditionToQuery;

package/dist/convertConditionToQuery.mjs

@@ -1,62 +0,0 @@
-"use strict";
-import { getValueFromPath } from "./getValueFromPath.mjs";
-const convertExpression = (condition, subject) => {
-  const term2 = "term2" in condition ? condition.fromState ? getValueFromPath(subject, condition.term2) : condition.term2 : null;
-  switch (condition.operator) {
-    case "truthy":
-      return {
-        $ne: [
-          null,
-          void 0
-        ]
-      };
-    case "equal":
-      return term2;
-    case "gt":
-      return {
-        $gt: term2
-      };
-    case "lt":
-      return {
-        $lt: term2
-      };
-    case "gte":
-      return {
-        $gte: term2
-      };
-    case "lte":
-      return {
-        $lte: term2
-      };
-    case "regex":
-      return {
-        $regex: term2,
-        $options: condition.regexOptions
-      };
-    case "in": {
-      return Array.isArray(term2) ? {
-        $in: term2
-      } : term2;
-    }
-  }
-};
-export const convertConditionToQuery = (condition, subject) => {
-  if ("or" in condition) {
-    return {
-      $or: condition.or.map((sub) => convertConditionToQuery(sub, subject))
-    };
-  }
-  if ("and" in condition) {
-    return {
-      $and: condition.and.map((sub) => convertConditionToQuery(sub, subject))
-    };
-  }
-  if ("not" in condition) {
-    return {
-      $not: convertConditionToQuery(condition.not, subject)
-    };
-  }
-  return {
-    [condition.term1]: convertExpression(condition, subject)
-  };
-};

package/dist/date.d.ts

@@ -1,7 +0,0 @@
-export type DateFormatOptions = {
-    hours?: boolean;
-    hoursOnly?: boolean;
-    locale?: string;
-};
-export declare const formatDateTime: (date: Date | string, options?: DateFormatOptions) => string;
-export declare const getRelativeTimeFromNow: (target: any) => string | undefined;

package/dist/date.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRelativeTimeFromNow = exports.formatDateTime = void 0;
-const rtf = new Intl.RelativeTimeFormat(undefined, {
-    numeric: 'auto',
-});
-const units = {
-    year: 31536000000,
-    month: 2628000000,
-    day: 86400000,
-    hour: 3600000,
-    minute: 6000,
-    second: 1000,
-};
-const formatDateTime = function (date, options) {
-    const target = date instanceof Date
-        ? date
-        : new Date(date);
-    if (isNaN(target.getDate())) {
-        return '-';
-    }
-    const { hours, hoursOnly, locale = 'navigator' in globalThis
-        ? navigator.language
-        : 'en-US', } = options || {};
-    if (hoursOnly) {
-        return target.toLocaleTimeString();
-    }
-    return hours
-        ? target.toLocaleString(locale)
-        : target.toLocaleDateString(locale);
-};
-exports.formatDateTime = formatDateTime;
-const getRelativeTimeFromNow = function (target) {
-    const now = new Date();
-    const elapsed = now - target;
-    for (const [u, value] of Object.entries(units)) {
-        if (Math.abs(elapsed) > value || u === 'second') {
-            return rtf.format(-1 * Math.round(elapsed / value), u);
-        }
-    }
-};
-exports.getRelativeTimeFromNow = getRelativeTimeFromNow;

package/dist/date.mjs

@@ -1,36 +0,0 @@
-"use strict";
-const rtf = new Intl.RelativeTimeFormat(void 0, {
-  numeric: "auto"
-});
-const units = {
-  year: 31536e6,
-  month: 2628e6,
-  day: 864e5,
-  hour: 36e5,
-  minute: 6e3,
-  second: 1e3
-};
-export const formatDateTime = function(date, options) {
-  const target = date instanceof Date ? date : new Date(date);
-  if (isNaN(target.getDate())) {
-    return "-";
-  }
-  const {
-    hours,
-    hoursOnly,
-    locale = "navigator" in globalThis ? navigator.language : "en-US"
-  } = options || {};
-  if (hoursOnly) {
-    return target.toLocaleTimeString();
-  }
-  return hours ? target.toLocaleString(locale) : target.toLocaleDateString(locale);
-};
-export const getRelativeTimeFromNow = function(target) {
-  const now = /* @__PURE__ */ new Date();
-  const elapsed = now - target;
-  for (const [u, value] of Object.entries(units)) {
-    if (Math.abs(elapsed) > value || u === "second") {
-      return rtf.format(-1 * Math.round(elapsed / value), u);
-    }
-  }
-};

package/dist/formatValue.d.ts

@@ -1,2 +0,0 @@
-import type { Property } from '@aeriajs/types';
-export declare const formatValue: (value: any, key: string, property?: Property, index?: string) => string;

package/dist/formatValue.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatValue = void 0;
-const date_js_1 = require("./date.js");
-const getReferenceProperty_js_1 = require("./getReferenceProperty.js");
-const formatValue = (value, key, property, index) => {
-    if (Array.isArray(value)) {
-        return value.map((v) => (0, exports.formatValue)(v, key, property, index)).join(', ');
-    }
-    const firstValue = (() => {
-        if (!property) {
-            return value;
-        }
-        const refProperty = (0, getReferenceProperty_js_1.getReferenceProperty)(property);
-        if (refProperty) {
-            const firstIndex = index || refProperty.indexes?.[0];
-            return firstIndex && value?.[firstIndex];
-        }
-        if (value instanceof Object) {
-            return Object.values(value)[0];
-        }
-        return value;
-    })();
-    const formatted = (() => {
-        if (!property) {
-            return firstValue;
-        }
-        if ('type' in property) {
-            if (property.type === 'boolean') {
-                return firstValue
-                    ? 'true'
-                    : false;
-            }
-        }
-        if ('format' in property && property.format) {
-            if ([
-                'date',
-                'date-time',
-            ].includes(property.format)) {
-                return (0, date_js_1.formatDateTime)(String(value), {
-                    hours: property.format === 'date-time',
-                });
-            }
-        }
-        if ([
-            undefined,
-            null,
-        ].includes(firstValue)) {
-            return '-';
-        }
-        return firstValue;
-    })();
-    return String(formatted);
-};
-exports.formatValue = formatValue;

package/dist/formatValue.mjs

@@ -1,50 +0,0 @@
-"use strict";
-import { formatDateTime } from "./date.mjs";
-import { getReferenceProperty } from "./getReferenceProperty.mjs";
-export const formatValue = (value, key, property, index) => {
-  if (Array.isArray(value)) {
-    return value.map((v) => formatValue(v, key, property, index)).join(", ");
-  }
-  const firstValue = (() => {
-    if (!property) {
-      return value;
-    }
-    const refProperty = getReferenceProperty(property);
-    if (refProperty) {
-      const firstIndex = index || refProperty.indexes?.[0];
-      return firstIndex && value?.[firstIndex];
-    }
-    if (value instanceof Object) {
-      return Object.values(value)[0];
-    }
-    return value;
-  })();
-  const formatted = (() => {
-    if (!property) {
-      return firstValue;
-    }
-    if ("type" in property) {
-      if (property.type === "boolean") {
-        return firstValue ? "true" : false;
-      }
-    }
-    if ("format" in property && property.format) {
-      if ([
-        "date",
-        "date-time"
-      ].includes(property.format)) {
-        return formatDateTime(String(value), {
-          hours: property.format === "date-time"
-        });
-      }
-    }
-    if ([
-      void 0,
-      null
-    ].includes(firstValue)) {
-      return "-";
-    }
-    return firstValue;
-  })();
-  return String(formatted);
-};