@nocobase/utils 1.5.0-beta.3 → 1.5.0-beta.30

package/lib/date.d.ts

@@ -36,3 +36,4 @@ export declare const moment2str: (value?: dayjs.Dayjs, options?: Moment2strOptio
  */
 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";
+export declare const getDateTimeFormat: (picker: any, format: any, showTime: any, timeFormat: any) => any;

package/lib/date.js

@@ -37,6 +37,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var date_exports = {};
 __export(date_exports, {
+  getDateTimeFormat: () => getDateTimeFormat,
   getDefaultFormat: () => getDefaultFormat,
   getPickerFormat: () => getPickerFormat,
   moment2str: () => moment2str,
@@ -205,8 +206,18 @@ const getPickerFormat = /* @__PURE__ */ __name((picker) => {
       return "YYYY-MM-DD";
   }
 }, "getPickerFormat");
+const getDateTimeFormat = /* @__PURE__ */ __name((picker, format, showTime, timeFormat) => {
+  if (picker === "date") {
+    if (showTime) {
+      return `${format} ${timeFormat || "HH:mm:ss"}`;
+    }
+    return format;
+  }
+  return format;
+}, "getDateTimeFormat");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getDateTimeFormat,
   getDefaultFormat,
   getPickerFormat,
   moment2str,

package/lib/index.d.ts

@@ -34,5 +34,6 @@ export * from './uid';
 export * from './url';
 export * from './i18n';
 export * from './wrap-middleware';
+export * from './object-to-cli-args';
 export { dayjs, lodash };
 export { Schema } from '@formily/json-schema';

package/lib/index.js

@@ -70,6 +70,7 @@ __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);
+__reExport(src_exports, require("./object-to-cli-args"), module.exports);
 var import_json_schema = require("@formily/json-schema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -101,5 +102,6 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./uid"),
   ...require("./url"),
   ...require("./i18n"),
-  ...require("./wrap-middleware")
+  ...require("./wrap-middleware"),
+  ...require("./object-to-cli-args")
 });

package/lib/object-to-cli-args.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Convert object to CLI arguments array
+ * @param obj Object to convert
+ * @returns CLI arguments array
+ */
+export declare function objectToCliArgs(obj: Record<string, any>): string[];

package/lib/object-to-cli-args.js

@@ -0,0 +1,43 @@
+/**
+ * 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 object_to_cli_args_exports = {};
+__export(object_to_cli_args_exports, {
+  objectToCliArgs: () => objectToCliArgs
+});
+module.exports = __toCommonJS(object_to_cli_args_exports);
+function objectToCliArgs(obj) {
+  return Object.entries(obj).filter(([_, value]) => value !== null && value !== void 0).map(([key, value]) => {
+    const stringValue = typeof value === "object" ? JSON.stringify(value) : value;
+    return `--${key}=${stringValue}`;
+  });
+}
+__name(objectToCliArgs, "objectToCliArgs");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  objectToCliArgs
+});

package/lib/parse-date.js

@@ -99,7 +99,7 @@ function parseWeek(value) {
 }
 __name(parseWeek, "parseWeek");
 function parseMonth(value) {
-  if (/^\d\d\d\d\-\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d$/.test(value)) {
     return {
       unit: "month",
       start: `${value}-01 00:00:00`
@@ -108,7 +108,7 @@ function parseMonth(value) {
 }
 __name(parseMonth, "parseMonth");
 function parseDay(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d$/.test(value)) {
     return {
       unit: "day",
       start: `${value} 00:00:00`
@@ -117,7 +117,7 @@ function parseDay(value) {
 }
 __name(parseDay, "parseDay");
 function parseHour(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d$/.test(value)) {
     return {
       unit: "hour",
       start: `${value}:00:00`
@@ -126,7 +126,7 @@ function parseHour(value) {
 }
 __name(parseHour, "parseHour");
 function parseMinute(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d$/.test(value)) {
     return {
       unit: "minute",
       start: `${value}:00`
@@ -135,7 +135,7 @@ function parseMinute(value) {
 }
 __name(parseMinute, "parseMinute");
 function parseSecond(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d\:\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d:\d\d$/.test(value)) {
     return {
       unit: "second",
       start: `${value}`
@@ -144,7 +144,7 @@ function parseSecond(value) {
 }
 __name(parseSecond, "parseSecond");
 function parseMillisecond(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d\:\d\d\.\d\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d:\d\d\.\d\d\d$/.test(value)) {
     return {
       unit: "millisecond",
       start: `${value}`
@@ -192,7 +192,7 @@ function parseDate(value, options = {}) {
   let timezone = options.timezone || "+00:00";
   const input = value;
   if (typeof value === "string") {
-    const match = /(.+)((\+|\-)\d\d\:\d\d)$/.exec(value);
+    const match = /(.+)((\+|-)\d\d:\d\d)$/.exec(value);
     if (match) {
       value = match[1];
       timezone = match[2];
@@ -242,13 +242,13 @@ function parseDateBetween(value, options = {}) {
   if (typeof value !== "string") {
     return;
   }
-  const match = /(.+)((\+|\-)\d\d\:\d\d)$/.exec(value);
+  const match = /(.+)((\+|-)\d\d:\d\d)$/.exec(value);
   let timezone = options.timezone || "+00:00";
   if (match) {
     value = match[1];
     timezone = match[2];
   }
-  const m = /^(\(|\[)(.+)\,(.+)(\)|\])$/.exec(value);
+  const m = /^(\(|\[)(.+),(.+)(\)|\])$/.exec(value);
   if (!m) {
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.5.0-beta.3",
+  "version": "1.5.0-beta.30",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "81afcf4affdb652faf4636e6d9351828ce8906be"
+  "gitHead": "40c48b2ecf3e2315a76dcb729dbda825b6a1331c"
 }