nicot 1.2.6 → 1.2.9

package/dist/index.cjs

@@ -42,6 +42,7 @@ __export(index_exports, {
   BindingValue: () => BindingValue,
   BlankCursorPaginationReturnMessageDto: () => BlankCursorPaginationReturnMessageDto,
   BoolColumn: () => BoolColumn,
+  CreateOnlyColumn: () => CreateOnlyColumn,
   CrudBase: () => CrudBase,
   CrudService: () => CrudService,
   CursorPaginationDto: () => CursorPaginationDto,
@@ -66,6 +67,7 @@ __export(index_exports, {
   ImportEntryDto: () => ImportEntryDto,
   Inner: () => Inner,
   IntColumn: () => IntColumn,
+  InternalColumn: () => InternalColumn,
   JsonColumn: () => JsonColumn,
   NotChangeable: () => NotChangeable,
   NotColumn: () => NotColumn,
@@ -606,6 +608,8 @@ var QueryColumn = (options = {}) => (0, import_nesties3.MergePropertyDecorators)
     ...options
   })
 ]);
+var InternalColumn = () => (0, import_nesties3.MergePropertyDecorators)([NotQueryable(), NotWritable(), NotInResult()]);
+var CreateOnlyColumn = () => (0, import_nesties3.MergePropertyDecorators)([NotQueryable(), NotChangeable(), NotInResult()]);
 var RelationComputed = (type) => (obj, propertyKey) => {
   const fun = () => {
     const designType = Reflect.getMetadata("design:type", obj, propertyKey);
@@ -1473,30 +1477,7 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
 
 // src/crud-base.ts
 var import_p_queue = __toESM(require("p-queue"));
-
-// src/utility/observe-diff.ts
-var observeDiff = (obj, cb) => {
-  return new Proxy(obj, {
-    set(target, key, value) {
-      const oldValue = target[key];
-      const type = Object.prototype.hasOwnProperty.call(target, key) ? "update" : "add";
-      target[key] = value;
-      cb({ type, key, oldValue, newValue: value });
-      return true;
-    },
-    deleteProperty(target, key) {
-      if (Object.prototype.hasOwnProperty.call(target, key)) {
-        const oldValue = target[key];
-        delete target[key];
-        cb({ type: "delete", key, oldValue, newValue: void 0 });
-        return true;
-      }
-      return false;
-    }
-  });
-};
-
-// src/crud-base.ts
+var import_nfkit = require("nfkit");
 var Relation = (name, options = {}) => {
   return { name, inner: false, ...options };
 };
@@ -2109,12 +2090,12 @@ var CrudBase = class {
       where: { id, ...bindingEnt, ...cond }
     });
   }
-  async operation(id, cb, extraOptions = {}) {
+  async operation(id, cb, options = {}) {
     const bindingEnt = await this.getBindingPartialEntity();
     const where = {
       id,
       ...bindingEnt,
-      ...extraOptions.where || {}
+      ...options.find?.where || {}
     };
     const throw404 = () => {
       throw new import_nesties8.BlankReturnMessageDto(
@@ -2125,11 +2106,10 @@ var CrudBase = class {
     if (!await this.repo.exists({ where })) {
       throw404();
     }
-    const res = await this.repo.manager.transaction(async (tdb) => {
-      const repo = tdb.getRepository(this.entityClass);
+    const op = async (repo) => {
       const ent = await repo.findOne({
-        lock: { mode: "pessimistic_write" },
-        ...extraOptions,
+        lock: { mode: "pessimistic_write", tables: [repo.metadata.tableName] },
+        ...options.find || {},
         where
       });
       if (!ent) {
@@ -2137,7 +2117,7 @@ var CrudBase = class {
       }
       const initial = { ...ent };
       let changes = {};
-      const entProxy = observeDiff(ent, (change) => {
+      const entProxy = (0, import_nfkit.observeDiff)(ent, (change) => {
         if (change.type === "delete") {
           if (initial[change.key] === null) {
             delete changes[change.key];
@@ -2163,7 +2143,10 @@ var CrudBase = class {
       const result = await cb(entProxy, { repo, flush });
       await flush();
       return result;
-    });
+    };
+    const res = await (options.repo ? op(options.repo) : this.repo.manager.transaction(
+      (tdb) => op(tdb.getRepository(this.entityClass))
+    ));
     if (res == null) {
       return new import_nesties8.BlankReturnMessageDto(200, "success");
     } else {
@@ -2341,20 +2324,6 @@ var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
   return cl;
 };
 
-// src/utility/memorize.ts
-var Memorize = () => {
-  const cache = /* @__PURE__ */ new WeakMap();
-  return function(_target, propertyKey, descriptor) {
-    const getter = descriptor.get;
-    descriptor.get = function() {
-      if (cache.has(this)) return cache.get(this);
-      const value = getter.call(this);
-      cache.set(this, value);
-      return value;
-    };
-  };
-};
-
 // src/utility/mutate-pipe.ts
 var MutatorPipe = class {
   constructor(entityClass) {
@@ -2379,6 +2348,7 @@ var MutatorPipe = class {
 };
 
 // src/restful.ts
+var import_nfkit2 = require("nfkit");
 var getCurrentLevelRelations = (relations) => relations.filter((r) => !r.includes("."));
 var getNextLevelRelations = (relations, enteringField) => relations.filter((r) => r.includes(".") && r.startsWith(`${enteringField}.`)).map((r) => r.split(".").slice(1).join("."));
 var _RestfulFactory = class _RestfulFactory {
@@ -2722,28 +2692,23 @@ var _RestfulFactory = class _RestfulFactory {
   get idType() {
     return Reflect.getMetadata("design:type", this.entityClass.prototype, "id");
   }
-  usePrefix(methodDec, path) {
-    if (path) {
-      if (this.options.prefix) {
-        return methodDec(`${this.options.prefix}/${path}`);
-      } else {
-        return methodDec(path);
-      }
+  usePrefix(methodDec, ...paths) {
+    const usePaths = [this.options.prefix, ...paths].filter(
+      (s) => s && s.length > 0
+    );
+    if (usePaths.length > 0) {
+      return methodDec(usePaths.join("/"));
     } else {
-      if (this.options.prefix) {
-        return methodDec(this.options.prefix);
-      } else {
-        return methodDec();
-      }
+      return methodDec();
     }
   }
   create(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Post),
+      this.usePrefix(import_common3.Post, extras.prefix),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Create a new ${this.entityClassName}`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiBody)({ type: this.createDto }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityCreateReturnMessageDto }),
@@ -2755,10 +2720,10 @@ var _RestfulFactory = class _RestfulFactory {
   }
   findOne(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Get, ":id"),
+      this.usePrefix(import_common3.Get, extras.prefix, ":id"),
       (0, import_swagger6.ApiOperation)({
         summary: `Find a ${this.entityClassName} by id`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityReturnMessageDto }),
@@ -2777,20 +2742,20 @@ var _RestfulFactory = class _RestfulFactory {
   }
   findAll(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Get),
+      this.usePrefix(import_common3.Get, extras.prefix),
       (0, import_swagger6.ApiOperation)({
         summary: `Find all ${this.entityClassName}`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityArrayReturnMessageDto })
     ]);
   }
   findAllCursorPaginated(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Get),
+      this.usePrefix(import_common3.Get, extras.prefix),
       (0, import_swagger6.ApiOperation)({
         summary: `Find all ${this.entityClassName}`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityCursorPaginationReturnMessageDto })
     ]);
@@ -2813,11 +2778,11 @@ var _RestfulFactory = class _RestfulFactory {
   }
   update(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Patch, ":id"),
+      this.usePrefix(import_common3.Patch, extras.prefix, ":id"),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Update a ${this.entityClassName} by id`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_swagger6.ApiBody)({ type: this.updateDto }),
@@ -2835,11 +2800,11 @@ var _RestfulFactory = class _RestfulFactory {
   }
   delete(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Delete, ":id"),
+      this.usePrefix(import_common3.Delete, extras.prefix, ":id"),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Delete a ${this.entityClassName} by id`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_nesties10.ApiBlankResponse)(),
@@ -2852,11 +2817,11 @@ var _RestfulFactory = class _RestfulFactory {
   }
   import(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Post, "import"),
+      this.usePrefix(import_common3.Post, extras.prefix, "import"),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Import ${this.entityClassName}`,
-        ...extras
+        ...import_lodash5.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiBody)({ type: this.importDto }),
       (0, import_swagger6.ApiOkResponse)({ type: this.importReturnMessageDto }),
@@ -2865,11 +2830,11 @@ var _RestfulFactory = class _RestfulFactory {
   }
   operation(operationName, options = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
-      this.usePrefix(import_common3.Post, `:id/${operationName}`),
+      this.usePrefix(import_common3.Post, options.prefix, ":id", operationName),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `${(0, import_lodash5.upperFirst)(operationName)} a ${this.entityClassName} by id`,
-        ...options.operationExtras || {}
+        ...import_lodash5.default.omit(options, "prefix", "returnType")
       }),
       options.returnType ? (0, import_nesties10.ApiTypeResponse)(options.returnType) : (0, import_nesties10.ApiBlankResponse)(),
       (0, import_nesties10.ApiError)(
@@ -3000,58 +2965,58 @@ var _RestfulFactory = class _RestfulFactory {
   }
 };
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "fieldsToOmit", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInCreateToOmit", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "createDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInUpdateToOmit", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "updateDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "importDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInGetToOmit", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "queryableFields", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "findAllDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "findAllCursorPaginatedDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityResultDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityCreateResultDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityReturnMessageDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityCreateReturnMessageDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityArrayReturnMessageDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "entityCursorPaginationReturnMessageDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "importReturnMessageDto", 1);
 __decorateClass([
-  Memorize()
+  (0, import_nfkit2.Memorize)()
 ], _RestfulFactory.prototype, "idType", 1);
 var RestfulFactory = _RestfulFactory;
 
@@ -3125,6 +3090,7 @@ var applyQueryMatchBooleanMySQL = createQueryCondition(
   BindingValue,
   BlankCursorPaginationReturnMessageDto,
   BoolColumn,
+  CreateOnlyColumn,
   CrudBase,
   CrudService,
   CursorPaginationDto,
@@ -3149,6 +3115,7 @@ var applyQueryMatchBooleanMySQL = createQueryCondition(
   ImportEntryDto,
   Inner,
   IntColumn,
+  InternalColumn,
   JsonColumn,
   NotChangeable,
   NotColumn,