crabatool 1.0.371 → 1.0.380

package/index.js

@@ -4,10 +4,12 @@ var start = require('./tool/start.js');
 exports = module.exports;
 exports.utils = require('./lib/utils.js');
 exports.server = require('./lib/server.js');
-exports.stringBuilder = require('./lib/stringBuilder.js');
 exports.stringUtils = require('./lib/stringUtils.js');
 exports.pager = require('./lib/pager.js');
+exports.cuid = require('./lib/cuid.js');
+exports.JSONCRUD = require('./lib/jsoncrud.js');
 exports.DbHelper = require('./lib/db/dbHelper.js');
+exports.StringBuilder = require('./lib/stringBuilder.js');
 
 
 exports.run = function(options) {

package/lib/jsoncrud.js

@@ -0,0 +1,254 @@
+const fs = require('fs').promises
+const path = require('path')
+const cuid = require('./cuid.js');
+
+class JSONCRUD {
+  /**
+   * @param {Object} config - 配置项
+   * @param {string} [config.storagePath] - 文件存储路径
+   * @param {boolean} [config.useMemory] - 是否使用内存存储
+   */
+  constructor(config = {}) {
+    this.config = config
+    this.entities = {}    // 存储所有实体 { entityName: { data, relations } }
+    this.initialized = false
+
+    if (config.storagePath && !config.useMemory) {
+      this.storageFile = path.resolve(config.storagePath)
+      this.initFileStorage()
+    } else {
+      this.useMemory = true
+      this.initialized = true
+    }
+  }
+
+  // 初始化实体结构
+  defineEntity(entityName, relations = {}) {
+    if (!this.entities[entityName]) {
+      this.entities[entityName] = {
+        data: [],
+        relations: relations  // 定义关联关系 { targetEntity: foreignKey }
+      }
+    }
+  }
+
+  // 保存到文件
+  async saveToFile() {
+    if (!this.useMemory) {
+      // 构建包含所有实体的存储对象
+      const dataToSave = Object.entries(this.entities).reduce((acc, [entityName, entityData]) => {
+        acc[entityName] = entityData.data
+        return acc
+      }, {})
+
+      // 创建存储目录（如果不存在）
+      await fs.mkdir(path.dirname(this.storageFile), { recursive: true })
+
+      // 原子化写入（避免写入过程中崩溃导致数据丢失）
+      const tmpFile = `${this.storageFile}.tmp`
+      await fs.writeFile(tmpFile, JSON.stringify(dataToSave, null, 2))
+      await fs.rename(tmpFile, this.storageFile)
+    }
+  }
+
+  // 核心CRUD方法
+  async create(entityName, item) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+
+    const newItem = {
+      ...item,
+      id: cuid.newCuidString(),
+      createdAt: new Date().toISOString()
+    }
+    this.entities[entityName].data.push(newItem)
+    await this.persist()
+    return newItem
+  }
+
+  async find(entityName, {
+    filterFunc,
+    page = 1,
+    pageSize = 10,
+    sortBy = 'createdAt',
+    sortOrder = 'desc'
+  } = {}) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+
+    var allData = [...this.entities[entityName].data];
+    if (typeof filterFunc == 'function') {
+      allData = allData.filter(filterFunc);
+    }
+    const sorted = allData.sort((a, b) => {
+      sortOrder === 'asc' ?
+        a[sortBy]?.localeCompare(b[sortBy]) :
+        b[sortBy]?.localeCompare(a[sortBy])
+    });
+
+    const start = (page - 1) * pageSize
+    const end = start + pageSize
+
+    return {
+      data: sorted.slice(start, end),
+      pageData: {
+        count: allData.length,
+        page,
+        pageSize,
+        totalPages: Math.ceil(allData.length / pageSize)
+      }
+    }
+  }
+
+  async findRelated(entityName, targetEntity, relationKey, targetId) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+    this.verifyEntityExists(targetEntity)
+
+    const relationConfig = this.entities[entityName].relations[targetEntity]
+    if (!relationConfig) {
+      throw new Error(`Relation between ${entityName} and ${targetEntity} not defined`)
+    }
+
+    return this.entities[entityName].data.filter(
+      item => item[relationConfig.foreignKey] === targetId
+    )
+  }
+
+  async update(entityName, id, updates) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+
+    const index = this.entities[entityName].data.findIndex(item => item.id === id)
+    if (index === -1) return null
+
+    this.entities[entityName].data[index] = {
+      ...this.entities[entityName].data[index],
+      ...updates,
+      updatedAt: new Date().toISOString()
+    }
+    await this.persist()
+    return this.entities[entityName].data[index]
+  }
+
+  async delete(entityName, id) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+
+    const initialLength = this.entities[entityName].data.length
+    this.entities[entityName].data = this.entities[entityName].data.filter(
+      item => item.id !== id
+    )
+    const success = this.entities[entityName].data.length < initialLength
+    if (success) await this.persist()
+    return success
+  }
+
+  // 辅助方法
+  verifyEntityExists(entityName, create) {
+    if (!this.entities[entityName]) {
+      this.defineEntity(entityName);
+    }
+  }
+
+  // 等待初始化完成
+  async ready() {
+    while (!this.initialized) {
+      await new Promise(resolve => setTimeout(resolve, 50))
+    }
+  }
+
+  // 初始化文件存储
+  async initFileStorage() {
+    try {
+      // 1. 读取存储文件内容
+      const fileContent = await fs.readFile(this.storageFile, 'utf-8')
+      const storedData = JSON.parse(fileContent || '{}')
+
+      // 2. 自动创建存储中的实体（如果尚未定义）
+      Object.keys(storedData).forEach(entityName => {
+        if (!this.entities[entityName]) {
+          this.defineEntity(entityName, {}) // 默认空关联关系
+        }
+      })
+
+      // 3. 合并存储数据到已定义实体
+      Object.entries(storedData).forEach(([entityName, items]) => {
+        if (this.entities[entityName]) {
+          // 保留现有关联关系配置
+          this.entities[entityName].data = items.map(item => ({
+            ...item,
+            // 确保存在时间戳字段
+            createdAt: item.createdAt || new Date().toISOString(),
+            updatedAt: item.updatedAt || null
+          }))
+        }
+      })
+
+    } catch (err) {
+      if (err.code === 'ENOENT') {
+        // 4. 文件不存在时初始化空文件
+        await this.saveToFile()
+      } else if (err instanceof SyntaxError) {
+        // 5. 处理文件内容损坏的情况
+        console.error('Storage file corruption detected, resetting...')
+        await this.saveToFile()
+      } else {
+        throw err
+      }
+    } finally {
+      // 6. 确保初始化完成标记
+      this.initialized = true
+    }
+  }
+
+  // 通用保存方法
+  async persist() {
+    if (this.useMemory) return
+    await this.saveToFile()
+  }
+
+}
+exports = module.exports = JSONCRUD;
+
+/*
+// 使用示例
+async function main() {
+  const db = new JSONCRUD({ storagePath: './multi-data.json' })
+  
+  // 1. 定义实体和关联关系
+  db.defineEntity('users', {
+    posts: { foreignKey: 'authorId' }
+  })
+  
+  db.defineEntity('posts', {
+    author: { foreignKey: 'id' } // 反向关联
+  })
+
+  // 2. 创建数据
+  const user = await db.create('users', {
+    name: 'John',
+    email: 'john@example.com'
+  })
+  
+  await db.create('posts', {
+    title: 'First Post',
+    content: 'Hello World',
+    authorId: user.id
+  })
+
+  // 3. 分页查询
+  const postPage = await db.find('posts', {
+    page: 1,
+    pageSize: 5,
+    sortBy: 'createdAt'
+  })
+  console.log('Paginated posts:', postPage)
+
+  // 4. 关联查询
+  const userPosts = await db.findRelated('posts', 'users', 'author', user.id)
+  console.log('User posts:', userPosts)
+}
+
+main()
+*/

package/lib/server.js

@@ -157,6 +157,15 @@ function createServer(app, options) {
     var port = server.address().port;
     var url = 'http://127.0.0.1:' + port;
 
+    // 告诉业务已经启动服务了
+    var globaljs = path.join(webPath, '../lib/global.js');
+    if (fs.existsSync(globaljs)) {
+      var global = require(globaljs);
+      if (global.main) {
+        global.main(server);
+      }
+    }
+
     if (options && options.onRun) {
       options.onRun(port);
     }

package/lib/utils.js

@@ -136,7 +136,7 @@ class Utils {
         text = text.replace('_', ''); // 第一个字符不能是下划线
         return text.replace(/[^a-zA-Z0-9_]/g, ''); // 过滤非字母、数字、下划线的其它字符
     }
-    
+
     format() {
         // 字符串参数化
         var args = new Array(arguments.length);
@@ -346,6 +346,14 @@ class Utils {
         next(); // 继续处理
     }
 
+    isEmpty(v) {
+        return v === '' || this._isUndefinedOrNull(v);
+    }
+
+    isUndefinedOrNull(v) {
+        return v === null || v === undefined;
+    }
+    
     // 删除文件夹，清空文件夹，删除目录，清空目录，清空整个目录，包括子目录和文件
     cleardirsSync(dirname) {
         if (!fs.existsSync(dirname)) {
@@ -543,11 +551,19 @@ class Utils {
 
             var stat = fs.statSync(filePath);
             if (stat.isDirectory()) {
-                var options2 = {};
-                Object.assign(options2, options);
-                options2.source = filePath;
-                utils.getFiles(options2, fileList);
-            } else {
+                if (options.level === 0) {
+                    return;
+                }
+
+                if (options.folder) {
+                    fileList.push(filePath);
+                } else {
+                    var options2 = {};
+                    Object.assign(options2, options);
+                    options2.source = filePath;
+                    utils.getFiles(options2, fileList);
+                }
+            } else if (!options.folder) {
                 var ename = path.extname(filePath);
                 if (!ename || (exts && !exts.includes(ename))) {
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.371",
+  "version": "1.0.380",
   "description": "crabatool",
   "main": "index.js",
   "bin": {