@bmstravel/nvp-plop-templates 0.2.65 → 0.2.67

package/lib/base-api/actions/action.hbs

@@ -1,4 +1,4 @@
-import { IBaseActionSchema, IBaseAdapter, I{{pascalCase serviceName}}Service, UserAuthMeta } from "@src/types";
+import { IBaseActionSchema, IBaseAdapter } from "@src/types";
 import { Context } from "moleculer";
 import { VISIBILITY, ERR_SYSTEM } from "@src/common";
 import { MoleculerRegularError } from "@src/errors";
@@ -7,8 +7,8 @@ export type {{pascalCase actionName}}Params = {
 
 }
 
-async function handler(ctx: Context<{{pascalCase actionName}}Params, UserAuthMeta>) {
-	const $this: I{{pascalCase serviceName}}Service = this;
+async function handler(ctx: Context<{{pascalCase actionName}}Params, UserService.UserAuthMeta>) {
+	const $this: {{pascalCase serviceName}}Service.I{{pascalCase serviceName}}Service = this;
 	const $adapter: IBaseAdapter = $this.adapter;
 	const i18next = ctx.broker.i18next
 	try {
@@ -53,7 +53,7 @@ async function handler(ctx: Context<{{pascalCase actionName}}Params, UserAuthMet
  * @example
  * rest: "POST {{pascalCase serviceName}}/{{pascalCase actionName}}",
  */
-const {{pascalCase actionName}}Action: IBaseActionSchema<ReturnType<typeof handler>, {{pascalCase actionName}}Params, UserAuthMeta> = {
+const {{pascalCase actionName}}Action: IBaseActionSchema<ReturnType<typeof handler>, {{pascalCase actionName}}Params, UserService.UserAuthMeta> = {
 	{{#if actionPath}}
 	rest: "{{method}} {{actionPath}}",
 	{{/if}}

package/lib/base-api/methods/method.hbs

@@ -1,11 +1,11 @@
-import { I{{pascalCase serviceName}}Service, IBaseAdapter } from "@src/types";
+import { IBaseAdapter } from "@src/types";
 
 export type {{pascalCase methodName}}Params = {
 
 }
 
 async function {{camelCase methodName}}(payload: {{pascalCase methodName}}Params) {
-	const $this: I{{pascalCase serviceName}}Service = this;
+	const $this: {{pascalCase serviceName}}Service.I{{pascalCase serviceName}}Service = this;
 	const $adapter: IBaseAdapter = $this.adapter
 	const $cacher = $this.broker.cacher
 	return new $this.Promise((resolve, _reject) => {

package/lib/base-api/schemas/model.hbs

@@ -1,37 +1,11 @@
 import { DataTypes } from "sequelize";
-import dayjs from "dayjs";
 {{#eq dataTypeId "uuid"}}
 import { generateUuid } from '@bmstravel/nvp-utils'
 {{/eq}}
 import { ISequelizeModel } from '@src/types'
 import { STATUS } from "@src/common"
 
-export interface I{{pascalCase name}} {
-	{{#if hasId}}
-	{{#eq dataTypeId "integer"}}
-	id: number;
-	{{/eq}}
-	{{#eq dataTypeId "uuid"}}
-	id: string;
-	{{/eq}}
-	{{/if}}
-	// BEGIN addition here
-
-	// END addition here
-	{{#if hasId}}
-	status: STATUS
-	creator?: string
-	createdBy?: any
-	updatedBy?: any
-	deleteBy?: any
-	isDelete?: boolean
-	createdAt: number;
-	updatedAt: number;
-	deletedAt?: number;
-	{{/if}}
-}
-
-const {{pascalCase name}}Model: ISequelizeModel<I{{pascalCase name}}> = {
+const {{pascalCase name}}Model: ISequelizeModel<{{pascalCase name}}Service.I{{pascalCase name}}> = {
 	name: "{{camelCase name}}",
 	define: {
 		{{#if hasId}}
@@ -63,15 +37,15 @@ const {{pascalCase name}}Model: ISequelizeModel<I{{pascalCase name}}> = {
 			allowNull: true,
 		},
 		createdBy: {
-			type: DataTypes.STRING(15),
+			type: DataTypes.STRING(50),
 			allowNull: true,
 		},
 		updatedBy: {
-			type: DataTypes.STRING(15),
+			type: DataTypes.STRING(50),
 			allowNull: true,
 		},
 		deleteBy: {
-			type: DataTypes.STRING(15),
+			type: DataTypes.STRING(50),
 			allowNull: true,
 		},
 		isDelete: {
@@ -104,7 +78,7 @@ const {{pascalCase name}}Model: ISequelizeModel<I{{pascalCase name}}> = {
 				if (value == null || typeof value == "undefined") {
 					this.setDataValue("updatedAt", new Date().getTime())
 				} else {
-					this.setDataValue("updatedAt", value)
+					this.setDataValue("updatedAt", value || new Date().getTime())
 				}
 			},
 		},

package/lib/base-api/schemas/types/model.type.hbs

@@ -0,0 +1,24 @@
+		export interface I{{pascalCase name}} {
+			{{#if hasId}}
+			{{#eq dataTypeId "integer"}}
+			id: number;
+			{{/eq}}
+			{{#eq dataTypeId "uuid"}}
+			id: string;
+			{{/eq}}
+			{{/if}}
+			// BEGIN addition here
+
+			// END addition here
+			{{#if hasId}}
+			status: STATUS
+			creator?: string
+			createdBy?: any
+			updatedBy?: any
+			deleteBy?: any
+			isDelete?: boolean
+			createdAt: number;
+			updatedAt: number;
+			deletedAt?: number;
+			{{/if}}
+		}

package/lib/base-api/services/serviceWithModel.hbs

@@ -16,17 +16,12 @@ import {
 	EventService,
 	HookService,
 } from '@bmstravel/nvp-decorator'
-import {
-	MoleculerDBService,
-	I{{pascalCase serviceName}},
-	{{pascalCase serviceName}}ServiceSettingsOptions,
-	{{pascalCase serviceName}}ServiceOptions,
-} from "@src/types";
+import { MoleculerDBService } from "@src/types";
 import { VERSION{{#if hasHelloAction}} , Config, VISIBILITY{{/if}} } from "@src/common";
 import {{camelCase model}}Model from '@src/models/sequelize/{{camelCase model}}'
 
 const serviceName = '{{camelCase serviceName}}'
-@Service<{{pascalCase serviceName}}ServiceOptions>({
+@Service<{{pascalCase serviceName}}Service.{{pascalCase serviceName}}ServiceOptions>({
 	name: serviceName,
 	{{#eq serviceVersion "none"}}{{/eq}}
 	{{#unlessEq serviceVersion "none"}}
@@ -95,8 +90,8 @@ const serviceName = '{{camelCase serviceName}}'
 {{/unlessEq}}
 {{/unlessEq}}
 export default class {{pascalCase serviceName}}Service extends MoleculerDBService<
-	{{pascalCase serviceName}}ServiceSettingsOptions,
-	I{{pascalCase serviceName}}
+	{{pascalCase serviceName}}Service.{{pascalCase serviceName}}ServiceSettingsOptions,
+	{{pascalCase serviceName}}Service.I{{pascalCase serviceName}}
 > {
 	public constructor(
 		public broker: moleculer.ServiceBroker,

package/lib/base-api/services/types/model.hbs

@@ -1,42 +1,26 @@
-import { Options } from '@bmstravel/nvp-decorator';
-import {{pascalCase serviceName}}Service from "@src/services/{{camelCase serviceName}}.service"
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { ServiceActionsSchema } from "moleculer";
-import {
-	IBaseService,
-	IBaseServiceActions,
-	IBaseServiceMethods,
-} from "./db.service-interface";
-/* MOL_METHOD_INJECT */
+		export interface {{pascalCase serviceName}}ServiceSettingsOptions {
+			rest?: "/{{camelCase serviceName}}";
+			[x: string]: any;
+		}
 
-/* MOL_METHOD_TYPE */
+		export interface {{pascalCase serviceName}}ServiceOptions extends Options {
+			name: '{{camelCase serviceName}}';
+			settings: {{pascalCase serviceName}}ServiceSettingsOptions;
+		}
 
-export interface {{pascalCase serviceName}}ServiceSettingsOptions {
-	/**
-	 * if implements will replace /v1/{{camelCase serviceName}}/* to /{{camelCase serviceName}}/*
-	 */
-	rest?: "/{{camelCase serviceName}}";
-	[x: string]: any;
-}
+		export type I{{pascalCase serviceName}}Actions = IBaseServiceActions & {
+			/* MOL_ACTION */
+			{{#if hasHelloAction}}
+			hello: ServiceActionsSchema;
+			{{/if}}
+		}
 
-export interface {{pascalCase serviceName}}ServiceOptions extends Options {
-  name: '{{camelCase serviceName}}';
-  settings: {{pascalCase serviceName}}ServiceSettingsOptions;
-}
+		type {{pascalCase serviceName}}Methods = InstanceType<typeof {{pascalCase serviceName}}Service>
+		export type I{{pascalCase serviceName}}Methods = IBaseServiceMethods & Partial<{{pascalCase serviceName}}Methods> & {
+			/* MOL_METHOD */
+		}
 
-export type I{{pascalCase serviceName}}Actions = IBaseServiceActions & {
-	/* MOL_ACTION */
-	{{#if hasHelloAction}}
-	hello: ServiceActionsSchema;
-	{{/if}}
-}
-
-type {{pascalCase serviceName}}Methods = InstanceType<typeof {{pascalCase serviceName}}Service>
-export type I{{pascalCase serviceName}}Methods = IBaseServiceMethods & Partial<{{pascalCase serviceName}}Methods> & {
-	/* MOL_METHOD */
-}
-
-export type I{{pascalCase serviceName}}Service = IBaseService<I{{pascalCase serviceName}}Actions, I{{pascalCase serviceName}}Methods> & I{{pascalCase serviceName}}Methods &  {
-	actions: I{{pascalCase serviceName}}Actions;
-	methods: I{{pascalCase serviceName}}Methods;
-}
+		export type I{{pascalCase serviceName}}Service = IBaseService<I{{pascalCase serviceName}}Actions, I{{pascalCase serviceName}}Methods> & I{{pascalCase serviceName}}Methods &  {
+			actions: I{{pascalCase serviceName}}Actions;
+			methods: I{{pascalCase serviceName}}Methods;
+		}

package/lib/base-api/services/types/model.type.import.hbs

@@ -0,0 +1,7 @@
+import { Options } from '@bmstravel/nvp-decorator';
+import {{pascalCase serviceName}}ServicePrototype from "@src/services/{{camelCase serviceName}}.service"
+import { DbServiceSettings } from 'moleculer-db';
+import { IBaseService, IBaseServiceActions, IBaseServiceMethods } from "../db.service-interface"
+/* MOL_METHOD_INJECT */
+
+/* MOL_METHOD_TYPE */

package/lib/base-api/services/types/modelWithModel.hbs

@@ -1,45 +1,28 @@
-import { Options } from '@bmstravel/nvp-decorator';
-import {{pascalCase serviceName}}Service from "@src/services/{{camelCase serviceName}}.service"
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { ServiceActionsSchema } from "moleculer";
-import { DbServiceSettings } from 'moleculer-db';
-import {
-	IBaseService,
-	IBaseServiceActions,
-	IBaseServiceMethods,
-} from "./db.service-interface";
-/* MOL_METHOD_INJECT */
+		export interface {{pascalCase serviceName}}ServiceSettingsOptions extends Omit<DbServiceSettings, "fields"> {
+			rest?: "/{{camelCase serviceName}}";
+			fields?: (keyof Required<any>)[];
+			populates?: any;
+			[x: string]: any;
+		}
 
-/* MOL_METHOD_TYPE */
+		export interface {{pascalCase serviceName}}ServiceOptions extends Options {
+			name: '{{camelCase serviceName}}';
+			settings: {{pascalCase serviceName}}ServiceSettingsOptions;
+		}
 
-export interface {{pascalCase serviceName}}ServiceSettingsOptions extends Omit<DbServiceSettings, "fields"> {
-	/**
-	 * if implements will replace /v1/{{camelCase serviceName}}/* to /{{camelCase serviceName}}/*
-	 */
-	rest?: "/{{camelCase serviceName}}";
-	fields?: (keyof Required<any>)[];
-	populates?: any;
-	[x: string]: any;
-}
+		export type I{{pascalCase serviceName}}Actions = IBaseServiceActions & {
+			/* MOL_ACTION */
+			{{#if hasHelloAction}}
+			hello: ServiceActionsSchema;
+			{{/if}}
+		}
 
-export interface {{pascalCase serviceName}}ServiceOptions extends Options {
-  name: '{{camelCase serviceName}}';
-  settings: {{pascalCase serviceName}}ServiceSettingsOptions;
-}
+		type {{pascalCase serviceName}}Methods = InstanceType<typeof {{pascalCase serviceName}}ServicePrototype>
+		export type I{{pascalCase serviceName}}Methods = IBaseServiceMethods & Partial<{{pascalCase serviceName}}Methods> & {
+			/* MOL_METHOD */
+		}
 
-export type I{{pascalCase serviceName}}Actions = IBaseServiceActions & {
-	/* MOL_ACTION */
-	{{#if hasHelloAction}}
-	hello: ServiceActionsSchema;
-	{{/if}}
-}
-
-type {{pascalCase serviceName}}Methods = InstanceType<typeof {{pascalCase serviceName}}Service>
-export type I{{pascalCase serviceName}}Methods = IBaseServiceMethods & Partial<{{pascalCase serviceName}}Methods> & {
-	/* MOL_METHOD */
-}
-
-export type I{{pascalCase serviceName}}Service = IBaseService<I{{pascalCase serviceName}}Actions, I{{pascalCase serviceName}}Methods> & I{{pascalCase serviceName}}Methods &  {
-	actions: I{{pascalCase serviceName}}Actions;
-	methods: I{{pascalCase serviceName}}Methods;
-}
+		export type I{{pascalCase serviceName}}Service = IBaseService<I{{pascalCase serviceName}}Actions, I{{pascalCase serviceName}}Methods> & I{{pascalCase serviceName}}Methods &  {
+			actions: I{{pascalCase serviceName}}Actions;
+			methods: I{{pascalCase serviceName}}Methods;
+		}

package/lib/base-api/services/types/modelWithModel.type.import.hbs

@@ -0,0 +1,7 @@
+import { Options } from '@bmstravel/nvp-decorator';
+import {{pascalCase serviceName}}ServicePrototype from "@src/services/{{camelCase serviceName}}.service"
+import { DbServiceSettings } from 'moleculer-db';
+import { IBaseService, IBaseServiceActions, IBaseServiceMethods } from "../db.service-interface"
+/* MOL_METHOD_INJECT */
+
+/* MOL_METHOD_TYPE */

package/lib/base-api/type.d.ts.hbs

@@ -0,0 +1,55 @@
+
+/* PLOP_INJECT_IMPORT */
+
+declare global {
+	{{#if name}}
+	namespace {{pascalCase name}}Service {
+	{{/if}}
+	{{#if serviceName}}
+	namespace {{pascalCase serviceName}}Service {
+	{{/if}}
+
+    /* ------------------------------ START MODEL ZONE ----------------------------- */
+		/* MOL_MODEL_ZONE */
+
+    /* ------------------------------- END MODEL ZONE ------------------------------ */
+
+	  /* ------------------------------ START SERVICE ZONE ----------------------------- */
+		/* MOL_SERVICE_ZONE */
+
+	  /* ------------------------------- END SERVICE ZONE ------------------------------ */
+
+		/* ------------------------------ START ACTION ZONE ----------------------------- */
+		/* MOL_ACTION_ZONE */
+
+	  /* ------------------------------- END ACTION ZONE ------------------------------ */
+
+		/* ------------------------------ START METHOD ZONE ----------------------------- */
+		/* MOL_METHOD_ZONE */
+
+		/* ------------------------------- END METHOD ZONE ------------------------------ */
+
+		/* ------------------------------ START EVENT ZONE ----------------------------- */
+		/* MOL_EVENT_ZONE */
+
+		/* ------------------------------- END EVENT ZONE ------------------------------ */
+
+		/* ------------------------------ START HOOK ZONE ----------------------------- */
+		/* MOL_HOOK_ZONE */
+
+		/* ------------------------------- END HOOK ZONE ------------------------------ */
+
+		/* ------------------------------ START MIXIN ZONE ----------------------------- */
+		/* MOL_MIXIN_ZONE */
+
+		/* ------------------------------- END MIXIN ZONE ------------------------------ */
+
+		/* ------------------------------ START OTHER ZONE ----------------------------- */
+
+		/* ----------------------------- OTHER ZONE ----------------------------- */
+		/* MOL_OTHER_ZONE */
+
+		/* ------------------------------- END OTHER ZONE ------------------------------ */
+
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bmstravel/nvp-plop-templates",
-  "version": "0.2.65",
+  "version": "0.2.67",
   "description": "🏆 Using for plop templates",
   "license": "MIT",
   "main": "lib/index.js",
@@ -15,5 +15,5 @@
     "phongnv86 <phongnguyenvan86@gmail.com>",
     "phongnv86 <phongnv@media-one.vn>"
   ],
-  "gitHead": "c01878afc3b49fe4d74de8665708ae673ba811de"
+  "gitHead": "bfe05d7c60e8b7ce2586a2d21f75c3c6fd0e335b"
 }