chore: 迁移日期时间工具库至luxon

packages/basic/jest.setup.js

@@ -1,22 +1,28 @@
 const fc = require('fast-check');
 fc.configureGlobal({ numRuns: 100 });
 
-const { default: NaslSDK, Helpers } = require('./src/sdk');
-const { toString, fromString } = require('./src/init/dataTypes/tools');
+const Basic = require('./src/index');
+const { Helpers } = require('./src/sdk');
 
 try {
-  const utils = NaslSDK.initUtils({
+  Basic.initDataTypes({
+    dataTypesMap: {
+      'nasl.core.DateTime': { typeName: 'DateTime' },
+      'nasl.core.Date': { typeName: 'Date' },
+    },
+  });
+  const { utils } = Basic.initUtils({
     typeDefinitionMap: new Map(),
     enumsMap: {},
     dataTypesMap: {},
 
-    toString,
-    fromString,
+    toString: Basic.Tools.toString,
+    fromString: Basic.Tools.fromString,
   });
 
   // 全局变量
-  global.sdkUtils = utils;
-  global.sdkHelpers = Helpers;
+  global.Utils = utils;
+  global.Helpers = Helpers;
 } catch (error) {
-  console.log('Error initializing NaslSDK:', error);
+  console.log('Error initializing Basic:', error);
 }

packages/basic/package.json

@@ -13,6 +13,7 @@
     "zip": "node scripts/zip.js",
     "prepublish": "npm run clean && npm run build && npm run test",
     "test": "jest --coverage",
+    "test:update": "jest --updateSnapshot",
     "prebuild": "npm run clean",
     "postbuild": "npm run zip",
     "clean": "rm -rf dist cjs esm typings",
@@ -31,13 +32,10 @@
     "axios": "0.21.4",
     "bignumber.js": "9.1.2",
     "crypto-js": "4.2.0",
-    "date-fns": "2.30.0",
-    "date-fns-tz": "2.0.0",
     "decimal.js": "10.4.3",
     "lodash": "4.17.21",
+    "luxon": "^3.7.2",
     "mockjs": "1.1.0",
-    "moment": "2.30.1",
-    "moment-timezone": "0.5.45",
     "qs": "6.11.2",
     "safe-json-stringify": "^1.2.0"
   },
@@ -51,8 +49,10 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.13",
+    "@types/luxon": "^3.7.1",
     "@types/node": "^20.11.16",
     "@types/safe-json-stringify": "^1.1.5",
+    "date-fns": "2.30.0",
     "fast-check": "^3.14.0",
     "is-ci": "^4.1.0",
     "jest": "^29.7.0",

packages/basic/src/init/dataTypes/tools.ts

@@ -1,6 +1,4 @@
-import { format } from 'date-fns';
-import momentTZ from 'moment-timezone';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { flatMap, difference } from 'lodash';
 import { Helpers } from '../../sdk';
 
@@ -694,7 +692,7 @@ export const genInitData = (typeKey, defaultValue, parentLevel?) => {
     }
     if (typeName === 'DateTime' && parsedValue !== undefined) {
       if (parsedValue instanceof Date) {
-        parsedValue = moment(new Date()).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+        parsedValue = DateTime.fromJSDate(parsedValue).toFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
       }
       return parsedValue;
     } else if (['nasl.io.File'].includes(typeKey)) {
@@ -769,7 +767,7 @@ export const toString = (typeKey, variable, tz?, tabSize = 0, collection = new S
 
     // 日期时间处理
     if (typeKey === 'nasl.core.Date') {
-      str = momentTZ.tz(safeNewDate(variable), getAppTimezone(tz)).format('YYYY-MM-DD');
+      str = DateTime.fromJSDate(safeNewDate(variable)).setZone(getAppTimezone(tz)).toFormat('yyyy-MM-dd');
     } else if (typeKey === 'nasl.core.Time') {
       const timeRegex = /^([01]?\d|2[0-3])(?::([0-5]?\d)(?::([0-5]?\d))?)?$/;
       // 纯时间 12:30:00
@@ -797,14 +795,14 @@ export const toString = (typeKey, variable, tz?, tabSize = 0, collection = new S
           }
           varArr.push(varItem || '00');
         });
-        str = momentTZ
-          .tz(safeNewDate('2022-01-01 ' + varArr.join(':')), getAppTimezone(tz))
-          .format(formatArr.join(':'));
+        str = DateTime.fromJSDate(safeNewDate('2022-01-01 ' + varArr.join(':')))
+          .setZone(getAppTimezone(tz))
+          .toFormat(formatArr.join(':'));
       } else {
-        str = momentTZ.tz(safeNewDate(variable), getAppTimezone(tz)).format('HH:mm:ss');
+        str = DateTime.fromJSDate(safeNewDate(variable)).setZone(getAppTimezone(tz)).toFormat('HH:mm:ss');
       }
     } else if (typeKey === 'nasl.core.DateTime') {
-      str = momentTZ.tz(safeNewDate(variable), getAppTimezone(tz)).format('YYYY-MM-DD HH:mm:ss');
+      str = DateTime.fromJSDate(safeNewDate(variable)).setZone(getAppTimezone(tz)).toFormat('yyyy-MM-dd HH:mm:ss');
     }
     if (tabSize > 0) {
       if (['nasl.core.String', 'nasl.core.Text'].includes(typeKey)) {
@@ -1032,13 +1030,12 @@ export const fromString = (variable, typeKey) => {
   // 日期
   if (typeName === 'DateTime') {
     const date = safeNewDate(variable);
-    const outputDate = format(date, "yyyy-MM-dd'T'HH:mm:ss.SSSxxx");
+    const outputDate = DateTime.fromJSDate(date).toFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
     return outputDate;
   } else if (typeName === 'Date') {
-    return moment(safeNewDate(variable)).format('YYYY-MM-DD');
+    return DateTime.fromJSDate(safeNewDate(variable)).toFormat('yyyy-MM-dd');
   } else if (typeName === 'Time' && TimeReg.test(variable)) {
-    // ???
-    return moment(safeNewDate('2022-01-01 ' + variable)).format('HH:mm:ss');
+    return DateTime.fromJSDate(safeNewDate('2022-01-01 ' + variable)).toFormat('HH:mm:ss');
   }
   // 浮点数
   else if (['Decimal', 'Double'].includes(typeName) && FloatNumberReg.test(variable)) {

packages/basic/src/sdk/Formatters/DateFormatter.ts

@@ -1,4 +1,4 @@
-import { format } from 'date-fns';
+import { DateTime } from 'luxon';
 import Formatter from './Formatter';
 
 /**
@@ -53,7 +53,14 @@ export class DateFormatter extends Formatter {
     pattern = pattern || this.pattern;
 
     if (pattern === `yyyy-MM-dd'T'HH:mm:ss.SSSxxx`) {
-      return format(value, pattern);
+      let dt =
+        value instanceof Date
+          ? DateTime.fromJSDate(value)
+          : typeof value === 'string' && value?.includes('T')
+            ? DateTime.fromISO(value)
+            : DateTime.fromJSDate(new Date(value));
+
+      return dt.toFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
     }
 
     if (value && !isNaN(value)) value = +value;

packages/basic/src/sdk/helper.ts

@@ -1,5 +1,4 @@
-import moment from 'moment';
-import momentTZ from 'moment-timezone';
+import { DateTime } from 'luxon';
 import { isObject } from 'lodash';
 
 export const findAsync = async (arr, callback) => {
@@ -67,16 +66,26 @@ export const sortRule = (valueA, valueB, sort) => {
   }
 };
 
-export const getAppTimezone = (inputTz) => {
-  const _appTimeZone = window?.appInfo?.appTimeZone;
-  const tz = inputTz === 'global' ? _appTimeZone : inputTz;
-
-  if (tz && tz !== 'user') {
-    // 指定的固定的时区
-    return tz;
-  } else {
-    // 用户本地时区，包括 tz 是 null 的场景
-    return Intl.DateTimeFormat().resolvedOptions().timeZone;
+/**
+ * 获取应用的时区
+ * 逻辑：
+ * 1. 如果输入的时区是 'global'，则使用应用配置的时区（window.appInfo.appTimeZone）
+ * 2. 如果输入的时区是其他非 'user' 的值，则使用该值作为时区
+ * 3. 如果输入的时区是 'user' 或者没有输入，则使用用户本地的时区（Intl.DateTimeFormat().resolvedOptions().timeZone）
+ */
+export const getAppTimezone = (tz?: string) => {
+  const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  const globalTimeZone =
+    (window?.appInfo?.appTimeZone === 'user' ? userTimeZone : window?.appInfo?.appTimeZone) ?? userTimeZone;
+
+  tz = tz ?? 'user';
+  switch (tz) {
+    case 'global':
+      return globalTimeZone;
+    case 'user':
+      return userTimeZone;
+    default:
+      return tz;
   }
 };
 
@@ -95,12 +104,33 @@ export function isValidTimezoneIANAString(timezoneString) {
 
 export function naslDateToLocalDate(date) {
   const localTZ = Intl.DateTimeFormat().resolvedOptions().timeZone;
-  const localDate = momentTZ.tz(date, 'YYYY-MM-DD', localTZ);
-  return safeNewDate(localDate.format('YYYY-MM-DD HH:mm:ss'));
+  // 仅日期部分
+  if (/^\d{4}-\d{2}-\d{2}$/.test(date)) {
+    const localDate = DateTime.fromFormat(date, 'yyyy-MM-dd', { zone: localTZ });
+    return safeNewDate(localDate.toFormat('yyyy-MM-dd HH:mm:ss'));
+  }
+
+  // 日期时间
+  if (/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/.test(date)) {
+    const localDate = DateTime.fromFormat(date, 'yyyy-MM-dd HH:mm:ss', { zone: localTZ });
+    return safeNewDate(localDate.toFormat('yyyy-MM-dd HH:mm:ss'));
+  }
+
+  // ISO 字符串
+  if (typeof date === 'string' && date.includes('T')) {
+    const localDate = DateTime.fromISO(date, { zone: localTZ });
+    return safeNewDate(localDate.toFormat('yyyy-MM-dd HH:mm:ss'));
+  }
+
+  // 其他情况直接转换
+  const localDate = DateTime.fromJSDate(safeNewDate(date), { zone: localTZ });
+  return safeNewDate(localDate.toFormat('yyyy-MM-dd HH:mm:ss'));
 }
 
 export function convertJSDateInTargetTimeZone(date, tz) {
-  return safeNewDate(momentTZ.tz(safeNewDate(date), getAppTimezone(tz)).format('YYYY-MM-DD HH:mm:ss'));
+  return safeNewDate(
+    DateTime.fromJSDate(safeNewDate(date)).setZone(getAppTimezone(tz)).toFormat('yyyy-MM-dd HH:mm:ss'),
+  );
 }
 
 export const safeNewDate = (dateStr) => {
@@ -198,7 +228,7 @@ export function isInputValidNaslDateTime(input) {
 export function toValue(date, typeKey) {
   if (!date) return date;
   if (typeKey === 'format')
-    return moment(date).format('YYYY-MM-DD'); // value 的真实格式
+    return DateTime.fromJSDate(date).toFormat('yyyy-MM-dd'); // value 的真实格式
   else if (typeKey === 'json') return this.JsonSerialize(date);
   else if (typeKey === 'timestamp') return date.getTime();
   else return date;