@nocobase/plugin-field-sequence 3.0.0-alpha.5 → 3.0.0-alpha.7

package/dist/externalVersion.js

@@ -9,18 +9,18 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "3.0.0-alpha.5",
-  "@nocobase/flow-engine": "3.0.0-alpha.5",
+  "@nocobase/client": "3.0.0-alpha.7",
+  "@nocobase/flow-engine": "3.0.0-alpha.7",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.7",
   "@formily/react": "2.3.7",
-  "@nocobase/utils": "3.0.0-alpha.5",
+  "@nocobase/utils": "3.0.0-alpha.7",
   "antd": "5.24.2",
   "react-i18next": "11.18.6",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client-v2": "3.0.0-alpha.5",
+  "@nocobase/client-v2": "3.0.0-alpha.7",
   "lodash": "4.18.1",
-  "@nocobase/server": "3.0.0-alpha.5",
-  "@nocobase/database": "3.0.0-alpha.5",
+  "@nocobase/server": "3.0.0-alpha.7",
+  "@nocobase/database": "3.0.0-alpha.7",
   "dayjs": "1.11.13"
 };

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-08-01T20:52:30.511Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-08-05T22:31:38.309Z"}

package/dist/server/Plugin.js

@@ -152,15 +152,11 @@ class PluginFieldSequenceServer extends import_server.Plugin {
             );
             return;
           }
-          const [record] = await collection.model.findAll({
-            order: [[(autoIncrementField == null ? void 0 : autoIncrementField.name) ?? (createAtField == null ? void 0 : createAtField.name), "DESC"]],
-            limit: 1
-          });
-          if (!record) {
-            app.log.warn(`Collection [${collection.name}] has no records. Skipping sequences repair.`);
-            return;
-          }
           const sequencesFieldSet = import_lodash.default.uniq(sequencesList.map(({ field }) => field));
+          const primaryKeyFields = fields.filter((field) => field.options.primaryKey);
+          const sortablePrimaryKeyFields = primaryKeyFields.filter(
+            (field) => field.type === "bigInt" || field.type === "snowflakeId"
+          );
           for (const sequencesField of sequencesFieldSet) {
             const field = fieldMap[sequencesField];
             app.log.info(
@@ -178,7 +174,89 @@ class PluginFieldSequenceServer extends import_server.Plugin {
               );
               continue;
             }
-            await field.update(record, { overwrite: true });
+            const selectedFields = import_lodash.default.uniq([
+              field.name,
+              ...primaryKeyFields.map((primaryKeyField) => primaryKeyField.name),
+              ...createAtField ? [createAtField.name] : []
+            ]);
+            const latestRecordOrderField = createAtField ?? autoIncrementField;
+            const latestRecordOrder = [
+              [latestRecordOrderField.name, "DESC"],
+              ...sortablePrimaryKeyFields.filter((primaryKeyField) => primaryKeyField !== latestRecordOrderField).map((primaryKeyField) => [primaryKeyField.name, "DESC"])
+            ];
+            const latestRecordFilter = {
+              [field.name]: { $ne: null },
+              ...createAtField ? { [createAtField.name]: { $ne: null } } : {}
+            };
+            const chunkSize = 1e3;
+            const latestRecordQuery = {
+              fields: selectedFields,
+              filter: latestRecordFilter,
+              order: latestRecordOrder
+            };
+            latestRecordQuery["parseSort"] = false;
+            const [latestCandidate] = await collection.repository.find({ ...latestRecordQuery, limit: 1 });
+            let latestRecord = latestCandidate && field.match(latestCandidate.get(field.name)) ? latestCandidate : void 0;
+            let offset = 1;
+            while (!latestRecord && latestCandidate) {
+              const records = await collection.repository.find({
+                ...latestRecordQuery,
+                limit: chunkSize,
+                offset
+              });
+              latestRecord = records.find((record) => field.match(record.get(field.name)));
+              if (latestRecord || records.length < chunkSize) {
+                break;
+              }
+              offset += chunkSize;
+            }
+            if (!latestRecord) {
+              app.log.warn(
+                `Collection [${collection.name}] field [${field.name}] has no valid sequence records. Skipping sequences repair.`
+              );
+              continue;
+            }
+            const state = field.createRepairState();
+            if (!createAtField) {
+              field.collectRepairState(latestRecord, state);
+              await field.saveRepairState(state);
+              continue;
+            }
+            const latestCreatedAt = latestRecord.get(createAtField.name);
+            if (!(latestCreatedAt instanceof Date) || Number.isNaN(latestCreatedAt.getTime())) {
+              app.log.warn(
+                `Collection [${collection.name}] field [${field.name}] latest record has an invalid createdAt. Skipping sequences repair.`
+              );
+              continue;
+            }
+            const secondStart = new Date(Math.floor(latestCreatedAt.getTime() / 1e3) * 1e3);
+            const secondEnd = new Date(secondStart.getTime() + 1e3);
+            const latestBatchQuery = {
+              fields: selectedFields,
+              filter: {
+                [field.name]: { $ne: null },
+                [createAtField.name]: {
+                  $gte: secondStart,
+                  $lt: secondEnd
+                }
+              }
+            };
+            const collectRecords = async (records) => {
+              for (const record of records) {
+                field.collectRepairState(record, state, createAtField.name);
+              }
+            };
+            if (!app.db.inDialect("sqlite") && primaryKeyFields.length && primaryKeyFields.length === sortablePrimaryKeyFields.length) {
+              await collection.repository.chunkWithCursor({
+                ...latestBatchQuery,
+                chunkSize,
+                callback: collectRecords
+              });
+            } else {
+              latestBatchQuery["parseSort"] = false;
+              await collectRecords(await collection.repository.find(latestBatchQuery));
+            }
+            await field.saveRepairState(state);
           }
         });
       }

package/dist/server/fields/sequence-field.d.ts

@@ -23,6 +23,13 @@ export interface Pattern {
     }): Promise<void>;
 }
 export declare const sequencePatterns: Registry<Pattern>;
+export interface IntegerSequenceRepairState {
+    current: bigint;
+    lastGeneratedAt: Date;
+    cycleStart?: Date;
+    cycleEnd?: Date;
+}
+export type SequenceRepairState = Map<number, IntegerSequenceRepairState>;
 interface PatternConfig {
     type: string;
     title?: string;
@@ -41,6 +48,9 @@ export declare class SequenceField extends Field {
     setGroupValue: (instances: Model[], options: any) => Promise<void>;
     cleanHook: (_: any, options: any) => void;
     match(value: any): RegExpMatchArray;
+    createRepairState(): SequenceRepairState;
+    collectRepairState(instance: Model, state: SequenceRepairState, createdAtField?: string): void;
+    saveRepairState(state: SequenceRepairState): Promise<void>;
     update(instance: Model, options: any): Promise<void>;
     bind(): void;
     unbind(): void;

package/dist/server/fields/sequence-field.js

@@ -64,6 +64,47 @@ function parseBigInt(str, radix = 10) {
   }
   return negative ? -result : result;
 }
+function getCycleBounds(recordTime, cycle) {
+  const interval = import_cron_parser.default.parseExpression(cycle, { currentDate: recordTime });
+  const previous = interval.prev();
+  const next = interval.next();
+  if (next.getTime() === recordTime.getTime()) {
+    return {
+      cycleStart: new Date(next.getTime()),
+      cycleEnd: new Date(interval.next().getTime())
+    };
+  }
+  return {
+    cycleStart: new Date(previous.getTime()),
+    cycleEnd: new Date(next.getTime())
+  };
+}
+function mergeSequenceRepairState(state, current, recordTime, cycle) {
+  if (!state) {
+    return {
+      current,
+      lastGeneratedAt: recordTime,
+      ...cycle ? getCycleBounds(recordTime, cycle) : {}
+    };
+  }
+  if (cycle) {
+    const cycleBounds = state.cycleStart && state.cycleEnd ? { cycleStart: state.cycleStart, cycleEnd: state.cycleEnd } : getCycleBounds(state.lastGeneratedAt, cycle);
+    if (recordTime.getTime() >= cycleBounds.cycleEnd.getTime()) {
+      return {
+        current,
+        lastGeneratedAt: recordTime,
+        ...getCycleBounds(recordTime, cycle)
+      };
+    }
+    if (recordTime.getTime() < cycleBounds.cycleStart.getTime()) {
+      return state;
+    }
+  }
+  if (current > state.current) {
+    return { ...state, current, lastGeneratedAt: recordTime };
+  }
+  return state;
+}
 sequencePatterns.register("string", {
   validate(options) {
     if (!(options == null ? void 0 : options.value)) {
@@ -445,6 +486,54 @@ class SequenceField extends import_database.Field {
   match(value) {
     return typeof value === "string" ? value.match(this.matcher) : null;
   }
+  createRepairState() {
+    return /* @__PURE__ */ new Map();
+  }
+  collectRepairState(instance, state, createdAtField) {
+    const { name, patterns } = this.options;
+    const matched = this.match(instance.get(name));
+    if (!matched) {
+      return;
+    }
+    const recordTime = instance.get(createdAtField ?? "createdAt");
+    const generatedAt = recordTime ?? /* @__PURE__ */ new Date();
+    patterns.forEach((pattern, index) => {
+      if (pattern.type !== "integer") {
+        return;
+      }
+      const { base = 10, cycle, key } = pattern.options;
+      const current = parseBigInt(matched[index + 1], base);
+      state.set(key, mergeSequenceRepairState(state.get(key), current, generatedAt, cycle));
+    });
+  }
+  async saveRepairState(state) {
+    const SeqRepo = this.database.getRepository("sequences");
+    for (const [key, values] of state) {
+      const lastSeq = await SeqRepo.findOne({
+        filter: {
+          collection: this.collection.name,
+          field: this.name,
+          key
+        }
+      });
+      if (lastSeq) {
+        await lastSeq.update({
+          current: values.current,
+          lastGeneratedAt: values.lastGeneratedAt
+        });
+      } else {
+        await SeqRepo.create({
+          values: {
+            collection: this.collection.name,
+            field: this.name,
+            key,
+            current: values.current,
+            lastGeneratedAt: values.lastGeneratedAt
+          }
+        });
+      }
+    }
+  }
   async update(instance, options) {
     const { name, patterns } = this.options;
     const matched = this.match(instance.get(name));

package/package.json

@@ -6,7 +6,7 @@
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.ru-RU": "Автоматически генерирует коды по заданным правилам с поддержкой комбинаций дат, чисел и текста.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.7",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",
@@ -33,7 +33,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "82c7ed1cdb2f247c190582e34ee37f154cac0968",
+  "gitHead": "19cd28c710f3b3c614ebe2fd7d5a415d527ee559",
   "keywords": [
     "Collection fields"
   ]