@open-norantec/herbal 1.0.2-alpha.2 → 1.0.2-alpha.3

package/dist/sequelize-di.d.ts

@@ -1,14 +1,10 @@
-import { BelongsToOptions, ModelAttributeColumnOptions } from 'sequelize';
+import { BelongsToOptions, IndexesOptions, ModelAttributeColumnOptions } from 'sequelize';
 import { Model, TableOptions as SequelizeTableOptions, ModelClassGetter } from 'sequelize-typescript';
 import { Constructor } from 'type-fest';
 export * from 'sequelize-typescript';
-export interface TableOptions<M extends Model = Model> extends SequelizeTableOptions<M> {
-    standaloneIndexes?: Array<string | {
-        field: string;
-        name?: string;
-        unique?: string;
-    }>;
+export interface TableOptions<M extends Model = Model> extends Omit<SequelizeTableOptions<M>, 'indexes'> {
+    indexes?: Array<IndexesOptions | string>;
 }
-export declare function Table<M extends Model = Model>({ standaloneIndexes, ...options }: TableOptions<M>): (target: Constructor<M>) => void;
+export declare function Table<M extends Model = Model>({ indexes, ...options }: TableOptions<M>): (target: Constructor<M>) => void;
 export declare function BelongsTo(associatedClassGetter: ModelClassGetter<{}, {}>, options?: BelongsToOptions): Function;
 export declare function DateColumn(options: Partial<ModelAttributeColumnOptions>): Function;

package/dist/sequelize-di.js

@@ -37,44 +37,27 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateColumn = exports.BelongsTo = exports.Table = void 0;
-var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
 var sequelize_typescript_1 = require("sequelize-typescript");
 __exportStar(require("sequelize-typescript"), exports);
 function Table(_a) {
-    var standaloneIndexes = _a.standaloneIndexes, options = __rest(_a, ["standaloneIndexes"]);
+    var indexes = _a.indexes, options = __rest(_a, ["indexes"]);
     return function (target) {
         var newOptions = !options ? {} : options;
-        if (!Array.isArray(newOptions === null || newOptions === void 0 ? void 0 : newOptions.indexes))
-            newOptions.indexes = [];
-        newOptions.indexes = Array.from(newOptions.indexes)
-            .concat({
+        newOptions.indexes = [];
+        newOptions.indexes = Array.from(Array.isArray(indexes) ? indexes : []).map(function (item, index) {
+            if (typeof item === 'string') {
+                return [
+                    {
+                        name: "sidx__".concat(index),
+                        fields: [item],
+                    },
+                ];
+            }
+            return item;
+        }).concat({
             name: 'pagination',
             fields: ['id', 'created_at'],
-        })
-            .concat(Array.isArray(standaloneIndexes)
-            ? standaloneIndexes
-                .map(function (item, index) {
-                if (typeof item === 'string') {
-                    if (item.length === 0)
-                        return null;
-                    return {
-                        name: "idx_standalone__".concat(index),
-                        fields: [item],
-                    };
-                }
-                else if (typeof (item === null || item === void 0 ? void 0 : item.field) === 'string' && item.field.length > 0) {
-                    return {
-                        fields: [item.field],
-                        name: string_util_class_1.StringUtil.isFalsyString(item === null || item === void 0 ? void 0 : item.name) ? "idx_standalone__".concat(index) : item.name,
-                        unique: typeof (item === null || item === void 0 ? void 0 : item.unique) === 'boolean' ? item.unique : false,
-                    };
-                }
-                else {
-                    return null;
-                }
-            })
-                .filter(function (item) { return item !== null; })
-            : []);
+        });
         (0, sequelize_typescript_1.Table)(__assign(__assign({}, newOptions), { tableName: newOptions === null || newOptions === void 0 ? void 0 : newOptions.modelName, modelName: target.name }))(target);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "1.0.2-alpha.2",
+    "version": "1.0.2-alpha.3",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {