@nocobase/utils 1.3.44-beta → 1.4.0-alpha.0

package/lib/client.d.ts

@@ -13,6 +13,7 @@ export * from './common';
 export * from './date';
 export * from './forEach';
 export * from './getValuesByPath';
+export * from './handlebars';
 export * from './isValidFilter';
 export * from './json-templates';
 export * from './log';

package/lib/client.js

@@ -48,6 +48,7 @@ __reExport(client_exports, require("./common"), module.exports);
 __reExport(client_exports, require("./date"), module.exports);
 __reExport(client_exports, require("./forEach"), module.exports);
 __reExport(client_exports, require("./getValuesByPath"), module.exports);
+__reExport(client_exports, require("./handlebars"), module.exports);
 __reExport(client_exports, require("./isValidFilter"), module.exports);
 __reExport(client_exports, require("./json-templates"), module.exports);
 __reExport(client_exports, require("./log"), module.exports);
@@ -70,6 +71,7 @@ __reExport(client_exports, require("./url"), module.exports);
   ...require("./date"),
   ...require("./forEach"),
   ...require("./getValuesByPath"),
+  ...require("./handlebars"),
   ...require("./isValidFilter"),
   ...require("./json-templates"),
   ...require("./log"),

package/lib/date.d.ts

@@ -35,3 +35,4 @@ export declare const moment2str: (value?: dayjs.Dayjs, options?: Moment2strOptio
  * from https://github.com/moment/moment/blob/dca02edaeceda3fcd52b20b51c130631a058a022/src/lib/units/offset.js#L55-L70
  */
 export declare function offsetFromString(string: string | number): number;
+export declare const getPickerFormat: (picker: any) => "YYYY-MM" | "YYYY" | "YYYY[W]W" | "YYYY-MM-DD" | "YYYY[Q]Q";

package/lib/date.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var date_exports = {};
 __export(date_exports, {
   getDefaultFormat: () => getDefaultFormat,
+  getPickerFormat: () => getPickerFormat,
   moment2str: () => moment2str,
   offsetFromString: () => offsetFromString,
   str2moment: () => str2moment,
@@ -64,7 +65,7 @@ const getDefaultFormat = /* @__PURE__ */ __name((props) => {
   } else if (props["picker"] === "year") {
     return "YYYY";
   } else if (props["picker"] === "week") {
-    return "YYYY-wo";
+    return "YYYY[W]W";
   }
   return props["showTime"] ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
 }, "getDefaultFormat");
@@ -85,22 +86,31 @@ const toLocal = /* @__PURE__ */ __name((value) => {
     return value.startOf("second").toISOString();
   }
 }, "toLocal");
+const convertQuarterToFirstDay = /* @__PURE__ */ __name((quarterStr) => {
+  const year = parseInt(quarterStr.slice(0, 4));
+  const quarter = parseInt(quarterStr.slice(-1));
+  return (0, import_dayjs.dayjs)().quarter(quarter).year(year);
+}, "convertQuarterToFirstDay");
 const toMoment = /* @__PURE__ */ __name((val, options) => {
   if (!val) {
     return;
   }
   const offset = options.utcOffset || -1 * (/* @__PURE__ */ new Date()).getTimezoneOffset();
   const { gmt, picker, utc = true } = options;
-  if (!utc) {
-    return (0, import_dayjs.dayjs)(val);
-  }
-  if (import_dayjs.dayjs.isDayjs(val)) {
-    return val.utcOffset(offsetFromString(offset));
-  }
-  if (gmt || picker) {
-    return (0, import_dayjs.dayjs)(val).utcOffset(0);
+  if ((0, import_dayjs.dayjs)(val).isValid()) {
+    if (!utc) {
+      return (0, import_dayjs.dayjs)(val);
+    }
+    if (import_dayjs.dayjs.isDayjs(val)) {
+      return val.utcOffset(offsetFromString(offset));
+    }
+    if (gmt) {
+      return (0, import_dayjs.dayjs)(val).utcOffset(0);
+    }
+    return (0, import_dayjs.dayjs)(val).utcOffset(offsetFromString(offset));
+  } else {
+    return convertQuarterToFirstDay(val);
   }
-  return (0, import_dayjs.dayjs)(val).utcOffset(offsetFromString(offset));
 }, "toMoment");
 const str2moment = /* @__PURE__ */ __name((value, options = {}) => {
   return Array.isArray(value) ? value.map((val) => {
@@ -178,9 +188,24 @@ function absFloor(number) {
   }
 }
 __name(absFloor, "absFloor");
+const getPickerFormat = /* @__PURE__ */ __name((picker) => {
+  switch (picker) {
+    case "week":
+      return "YYYY[W]W";
+    case "month":
+      return "YYYY-MM";
+    case "quarter":
+      return "YYYY[Q]Q";
+    case "year":
+      return "YYYY";
+    default:
+      return "YYYY-MM-DD";
+  }
+}, "getPickerFormat");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultFormat,
+  getPickerFormat,
   moment2str,
   offsetFromString,
   str2moment,

package/lib/handlebars.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import Handlebars from 'handlebars';
+export { Handlebars };

package/lib/handlebars.js

@@ -0,0 +1,73 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var handlebars_exports = {};
+__export(handlebars_exports, {
+  Handlebars: () => import_handlebars.default
+});
+module.exports = __toCommonJS(handlebars_exports);
+var import_url = __toESM(require("url"));
+var import_handlebars = __toESM(require("handlebars"));
+var import_handlebars_helpers = __toESM(require("@budibase/handlebars-helpers"));
+var import_lodash = __toESM(require("lodash"));
+var import_dayjs = require("./dayjs");
+const allHelpers = (0, import_handlebars_helpers.default)();
+Object.keys(allHelpers).forEach(function(helperName) {
+  import_handlebars.default.registerHelper(helperName, allHelpers[helperName]);
+});
+import_handlebars.default.registerHelper("json", function(context) {
+  return JSON.stringify(context);
+});
+import_handlebars.default.registerHelper("urlParse", function(str) {
+  try {
+    return JSON.stringify(import_url.default.parse(str));
+  } catch (error) {
+    return `Invalid URL: ${str}`;
+  }
+});
+import_handlebars.default.registerHelper("dateFormat", (date, format, tz) => {
+  if (typeof tz === "string") {
+    return (0, import_dayjs.dayjs)(date).tz(tz).format(format);
+  }
+  return (0, import_dayjs.dayjs)(date).format(format);
+});
+import_handlebars.default.registerHelper("isNull", (value) => {
+  return import_lodash.default.isNull(value);
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Handlebars
+});

package/lib/index.d.ts

@@ -15,6 +15,7 @@ export * from './date';
 export * from './dayjs';
 export * from './forEach';
 export * from './fs-exists';
+export * from './handlebars';
 export * from './isValidFilter';
 export * from './json-templates';
 export * from './koa-multer';
@@ -32,5 +33,6 @@ export * from './toposort';
 export * from './uid';
 export * from './url';
 export * from './i18n';
+export * from './wrap-middleware';
 export { dayjs, lodash };
 export { Schema } from '@formily/json-schema';

package/lib/index.js

@@ -51,6 +51,7 @@ __reExport(src_exports, require("./date"), module.exports);
 __reExport(src_exports, require("./dayjs"), module.exports);
 __reExport(src_exports, require("./forEach"), module.exports);
 __reExport(src_exports, require("./fs-exists"), module.exports);
+__reExport(src_exports, require("./handlebars"), module.exports);
 __reExport(src_exports, require("./isValidFilter"), module.exports);
 __reExport(src_exports, require("./json-templates"), module.exports);
 __reExport(src_exports, require("./koa-multer"), module.exports);
@@ -68,6 +69,7 @@ __reExport(src_exports, require("./toposort"), module.exports);
 __reExport(src_exports, require("./uid"), module.exports);
 __reExport(src_exports, require("./url"), module.exports);
 __reExport(src_exports, require("./i18n"), module.exports);
+__reExport(src_exports, require("./wrap-middleware"), module.exports);
 var import_json_schema = require("@formily/json-schema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -81,6 +83,7 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./dayjs"),
   ...require("./forEach"),
   ...require("./fs-exists"),
+  ...require("./handlebars"),
   ...require("./isValidFilter"),
   ...require("./json-templates"),
   ...require("./koa-multer"),
@@ -97,5 +100,6 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./toposort"),
   ...require("./uid"),
   ...require("./url"),
-  ...require("./i18n")
+  ...require("./i18n"),
+  ...require("./wrap-middleware")
 });

package/lib/parse-filter.js

@@ -191,6 +191,9 @@ const parseFilter = /* @__PURE__ */ __name(async (filter, opts = {}) => {
       }
       if (isDateOperator(operator)) {
         const field = getField == null ? void 0 : getField(path);
+        if ((field == null ? void 0 : field.constructor.name) === "DateOnlyField" || (field == null ? void 0 : field.constructor.name) === "DatetimeNoTzField") {
+          return value;
+        }
         return dateValueWrapper(value, (field == null ? void 0 : field.timezone) || timezone);
       }
       return value;

package/lib/wrap-middleware.d.ts

@@ -0,0 +1 @@
+export declare function wrapMiddlewareWithLogging(fn: any, logger?: any): any;

package/lib/wrap-middleware.js

@@ -0,0 +1,63 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var wrap_middleware_exports = {};
+__export(wrap_middleware_exports, {
+  wrapMiddlewareWithLogging: () => wrapMiddlewareWithLogging
+});
+module.exports = __toCommonJS(wrap_middleware_exports);
+function wrapMiddlewareWithLogging(fn, logger) {
+  if (process.env["LOGGER_LEVEL"] !== "trace") {
+    return fn;
+  }
+  const name = fn.name || fn.toString().slice(0, 100);
+  return async (ctx, next) => {
+    const reqId = ctx.reqId;
+    if (!logger && !ctx.logger) {
+      return await fn(ctx, next);
+    }
+    if (!logger && ctx.logger) {
+      logger = ctx.logger;
+    }
+    logger.trace(`--> Entering middleware: ${name}`, { reqId });
+    const start = Date.now();
+    await fn(ctx, async () => {
+      const beforeNext = Date.now();
+      logger.trace(`--> Before next middleware: ${name} - ${beforeNext - start}ms`, { reqId });
+      await next();
+      const afterNext = Date.now();
+      logger.trace(`<-- After next middleware: ${name} - ${afterNext - beforeNext}ms`, { reqId });
+    });
+    const ms = Date.now() - start;
+    logger.trace(`<-- Exiting middleware: ${name} - ${ms}ms`, { reqId });
+  };
+}
+__name(wrapMiddlewareWithLogging, "wrapMiddlewareWithLogging");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  wrapMiddlewareWithLogging
+});

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.3.44-beta",
+  "version": "1.4.0-alpha.0",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
+    "@budibase/handlebars-helpers": "^0.14.0",
     "@hapi/topo": "^6.0.0",
     "@rc-component/mini-decimal": "^1.1.0",
     "dayjs": "^1.11.9",
     "deepmerge": "^4.2.2",
     "flat-to-nested": "^1.1.1",
     "graphlib": "^2.1.8",
+    "handlebars": "^4.7.8",
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "1d5666123ac1e2997e434e38defef963ba0d9f90"
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b"
 }