Commit 5fd0f24f authored by Fauzi Fadhillah's avatar Fauzi Fadhillah
Browse files

fix(typing): fix typing for returning null

parent 74b63d74

dist/sequelize-cache/base-model.d.ts

+0 −2
Original line number Diff line number Diff line
@@ -6,11 +6,9 @@ export interface DefaultOptionsCache { 
}

export interface FindAllNestedOptionsCache<T = any> extends Omit<FindOptions<T>, UnusedOptionsAttribute> {

    ttl: number;

    rejectOnEmpty?: boolean | Error;

}

export interface FindAllOptionsCache<T = any> extends Omit<FindOptions<T>, UnusedOptionsAttribute | 'include'> {

    ttl?: number;

    rejectOnEmpty?: boolean | Error;

}

export declare class Model<TAttributes extends {} = any, TCreate extends {} = TAttributes> extends TSModel<TAttributes, TCreate> {

    static modelTTL: number;

dist/sequelize-cache/base-model.js

+4 −6
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ class Model extends sequelize_typescript_1.Model { 
        options = options ?? {};

        const TTL = options?.ttl || this['modelTTL'] || sequelize_cache_1.SequelizeCache.defaultTTL;

        delete options?.ttl;

        const rejectOnEmpty = options?.rejectOnEmpty;

        delete options?.rejectOnEmpty;

        const scope = (0, lodash_1.cloneDeep)(this['_scope']);

        const defaultOptions = this['_defaultsOptions']({ ...options, limit: 1 }, scope);

        const optionsString = cache_utilty_1.default.setOneQueryOptions(defaultOptions);
@@ -72,7 +70,7 @@ class Model extends sequelize_typescript_1.Model { 
        }

        if (!modelString) {

            const message = this['notFoundMessage'] || this['defaultNotFoundMessage'](this.name);

            this['rejectOnEmptyMode']({ rejectOnEmpty }, this['notFoundException'](message));

            this['rejectOnEmptyMode'](options, this['notFoundException'](message));

        }

        const include = options && 'include' in options ? options?.include : undefined;

        const model = transformCacheToModel(this, modelString, { include, raw: options.raw });
@@ -82,8 +80,6 @@ class Model extends sequelize_typescript_1.Model { 
        options = options ?? {};

        const TTL = options?.ttl || this['modelTTL'] || sequelize_cache_1.SequelizeCache.defaultTTL;

        delete options?.ttl;

        const rejectOnEmpty = options?.rejectOnEmpty;

        delete options?.rejectOnEmpty;

        const scope = (0, lodash_1.cloneDeep)(this['_scope']);

        const defaultOptions = this['_defaultsOptions'](options, scope);

        const optionsString = cache_utilty_1.default
@@ -100,13 +96,15 @@ class Model extends sequelize_typescript_1.Model { 
        }

        if (!modelString) {

            const message = this['notFoundMessage'] || this['defaultNotFoundMessage'](this.name);

            this['rejectOnEmptyMode']({ rejectOnEmpty }, this['notFoundException'](message));

            this['rejectOnEmptyMode'](options, this['notFoundException'](message));

        }

        const include = options && 'include' in options ? options?.include : undefined;

        const model = transformCacheToModel(this, modelString, { include, raw: options.raw });

        return model;

    }

    static rejectOnEmptyMode(options, modelException) {

        if (options.rejectOnEmpty)

            return;

        if (typeof options?.rejectOnEmpty == 'boolean' && options?.rejectOnEmpty) {

            throw modelException;

        }

dist/sequelize-cache/base-model.js.map

+1 −1
Original line number Diff line number Diff line 
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/sequelize-cache/base-model.ts"],"names":[],"mappings":"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"}
 
 No newline at end of file
 
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/sequelize-cache/base-model.ts"],"names":[],"mappings":"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"}
 
 No newline at end of file

dist/tsconfig.build.tsbuildinfo

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

src/sequelize-cache/base-model.ts

+5 −9
Original line number Diff line number Diff line
@@ -55,12 +55,10 @@ export interface DefaultOptionsCache { 
}

export interface FindAllNestedOptionsCache<T = any> extends Omit<FindOptions<T>, UnusedOptionsAttribute> {

  ttl: number

  rejectOnEmpty?: boolean | Error

}



export interface FindAllOptionsCache<T = any> extends Omit<FindOptions<T>, UnusedOptionsAttribute | 'include'> {

  ttl?: number

  rejectOnEmpty?: boolean | Error

}

function transformCacheToModel(modelClass: any, dataCache: string, options: { include?: Includeable | Includeable[], raw?: boolean }) {

  const modelData = JSON.parse(dataCache)
@@ -165,8 +163,6 @@ export class Model<TAttributes extends {} = any, TCreate extends {} = TAttribute 
    options = options ?? {} as any

    const TTL = options?.ttl || this['modelTTL'] || SequelizeCache.defaultTTL

    delete options?.ttl

    const rejectOnEmpty = options?.rejectOnEmpty

    delete options?.rejectOnEmpty



    const scope = cloneDeep(this['_scope'])

    const defaultOptions = this['_defaultsOptions']({...options, limit: 1 }, scope)
@@ -192,7 +188,7 @@ export class Model<TAttributes extends {} = any, TCreate extends {} = TAttribute 


    if (!modelString) {

      const message = this['notFoundMessage'] || this['defaultNotFoundMessage'](this.name)

      this['rejectOnEmptyMode']({ rejectOnEmpty }, this['notFoundException'](message))

      this['rejectOnEmptyMode'](options, this['notFoundException'](message))

    }



    const include = options && 'include' in options ? options?.include : undefined
@@ -235,8 +231,6 @@ export class Model<TAttributes extends {} = any, TCreate extends {} = TAttribute 


    const TTL = options?.ttl || this['modelTTL'] || SequelizeCache.defaultTTL

    delete options?.ttl

    const rejectOnEmpty = options?.rejectOnEmpty

    delete options?.rejectOnEmpty



    const scope = cloneDeep(this['_scope'])

    const defaultOptions = this['_defaultsOptions'](options, scope)
@@ -258,7 +252,7 @@ export class Model<TAttributes extends {} = any, TCreate extends {} = TAttribute 
    }

    if (!modelString) {

      const message = this['notFoundMessage'] || this['defaultNotFoundMessage'](this.name)

      this['rejectOnEmptyMode']({ rejectOnEmpty }, this['notFoundException'](message))

      this['rejectOnEmptyMode'](options, this['notFoundException'](message))

    }



    const include = options && 'include' in options ? options?.include : undefined
@@ -268,7 +262,9 @@ export class Model<TAttributes extends {} = any, TCreate extends {} = TAttribute 
    return model

  }



  private static rejectOnEmptyMode(options: { rejectOnEmpty: boolean | Error }, modelException: Error): void {

  private static rejectOnEmptyMode(options: { rejectOnEmpty?: boolean | Error }, modelException: Error): void {

    if (options.rejectOnEmpty) return;

    

    if (typeof options?.rejectOnEmpty == 'boolean' && options?.rejectOnEmpty) {

      throw modelException

    }