@feathersjs/generators 5.0.0-pre.35 → 5.0.0-pre.37

package/lib/service/type/custom.tpl.ts

@@ -22,13 +22,15 @@ ${
 } from './${fileName}.schema'
 `
     : `
-export type ${upperName} = any
-export type ${upperName}Data = any
-export type ${upperName}Patch = any
-export type ${upperName}Query = any
+type ${upperName} = any
+type ${upperName}Data = any
+type ${upperName}Patch = any
+type ${upperName}Query = any
 `
 }
 
+export type { ${upperName}, ${upperName}Data, ${upperName}Patch, ${upperName}Query }
+
 export interface ${className}Options {
   app: Application
 }
@@ -38,24 +40,25 @@ export interface ${upperName}Params extends Params<${upperName}Query> {
 }
 
 // This is a skeleton for a custom service class. Remove or add the methods you need here
-export class ${className} implements ServiceInterface<${upperName}, ${upperName}Data, ${upperName}Params, ${upperName}Patch> {
+export class ${className}<ServiceParams extends Params = ${upperName}Params>
+    implements ServiceInterface<${upperName}, ${upperName}Data, ServiceParams, ${upperName}Patch> {
   constructor (public options: ${className}Options) {
   }
 
-  async find (_params?: ${upperName}Params): Promise<${upperName}[]> {
+  async find (_params?: ServiceParams): Promise<${upperName}[]> {
     return []
   }
 
-  async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}> {
+  async get (id: Id, _params?: ServiceParams): Promise<${upperName}> {
     return {
       id: 0,
       text: \`A new message with ID: \${id}!\`
     }
   }
 
-  async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}>
-  async create (data: ${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}[]>
-  async create (data: ${upperName}Data|${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}|${upperName}[]> {
+  async create (data: ${upperName}Data, params?: ServiceParams): Promise<${upperName}>
+  async create (data: ${upperName}Data[], params?: ServiceParams): Promise<${upperName}[]>
+  async create (data: ${upperName}Data|${upperName}Data[], params?: ServiceParams): Promise<${upperName}|${upperName}[]> {
     if (Array.isArray(data)) {
       return Promise.all(data.map(current => this.create(current, params)));
     }
@@ -67,14 +70,14 @@ export class ${className} implements ServiceInterface<${upperName}, ${upperName}
   }
 
   // This method has to be added to the 'methods' option to make it available to clients
-  async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}> {
+  async update (id: NullableId, data: ${upperName}Data, _params?: ServiceParams): Promise<${upperName}> {
     return {
       id: 0,
       ...data
     }
   }
 
-  async patch (id: NullableId, data: ${upperName}Patch, _params?: ${upperName}Params): Promise<${upperName}> {
+  async patch (id: NullableId, data: ${upperName}Patch, _params?: ServiceParams): Promise<${upperName}> {
     return {
       id: 0,
       text: \`Fallback for \${id}\`,
@@ -82,7 +85,7 @@ export class ${className} implements ServiceInterface<${upperName}, ${upperName}
     }
   }
 
-  async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}> {
+  async remove (id: NullableId, _params?: ServiceParams): Promise<${upperName}> {
     return {
       id: 0,
       text: 'removed'

package/lib/service/type/knex.tpl.js

@@ -32,12 +32,14 @@ ${schema
 } from './${fileName}.schema'
 `
     : `
-export type ${upperName} = any
-export type ${upperName}Data = any
-export type ${upperName}Patch = any
-export type ${upperName}Query = any
+type ${upperName} = any
+type ${upperName}Data = any
+type ${upperName}Patch = any
+type ${upperName}Query = any
 `}
 
+export type { ${upperName}, ${upperName}Data, ${upperName}Patch, ${upperName}Query }
+
 export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
 }
 
@@ -62,10 +64,6 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     ...folder,
     `${fileName}.class`
 ])))
-    .then((0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)('migrations', ({ kebabName }) => {
-    // Probably not great but it works to align with the Knex migration file format
-    const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14);
-    return `${migrationDate}_${kebabName}`;
-})));
+    .then((0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)('migrations', ({ kebabName }) => `${(0, commons_1.yyyymmddhhmmss)()}_${kebabName}`)));
 exports.generate = generate;
 //# sourceMappingURL=knex.tpl.js.map

package/lib/service/type/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,iBAAiB,GAAG,CAAC,EACzB,SAAS,EACe,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;mCAIL,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;oCAKJ,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;cACQ,SAAS;cACT,SAAS;cACT,SAAS;cACT,SAAS;CAEvB;;mBAEmB,SAAS,oCAAoC,SAAS;;;;eAI1D,SAAS,mCAAmC,SAAS;wBAC5C,SAAS,KAAK,SAAS,wBAAwB,SAAS;;;;;;sBAM1D,QAAQ,CAAC,QAAQ;aAC1B,QAAQ;;;CAGpB,CAAA;AA7CY,QAAA,QAAQ,YA6CpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,gBAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CACH,CACF;KACA,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAC9D,+EAA+E;IAC/E,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAElF,OAAO,GAAG,aAAa,IAAI,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CACH,CACF,CAAA;AAvBQ,QAAA,QAAQ,YAuBhB"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4D;AAG5D,MAAM,iBAAiB,GAAG,CAAC,EACzB,SAAS,EACe,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;mCAIL,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;oCAKJ,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;OACC,SAAS;OACT,SAAS;OACT,SAAS;OACT,SAAS;CAEhB;;gBAEgB,SAAS,KAAK,SAAS,SAAS,SAAS,UAAU,SAAS;;mBAEzD,SAAS,oCAAoC,SAAS;;;;eAI1D,SAAS,mCAAmC,SAAS;wBAC5C,SAAS,KAAK,SAAS,wBAAwB,SAAS;;;;;;sBAM1D,QAAQ,CAAC,QAAQ;aAC1B,QAAQ;;;CAGpB,CAAA;AA/CY,QAAA,QAAQ,YA+CpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,gBAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CACH,CACF;KACA,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,IAAA,wBAAc,GAAE,IAAI,SAAS,EAAE,CAAC,CACrG,CACF,CAAA;AAlBQ,QAAA,QAAQ,YAkBhB"}

package/lib/service/type/knex.tpl.ts

@@ -1,5 +1,5 @@
 import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
+import { renderSource, yyyymmddhhmmss } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
 const migrationTemplate = ({
@@ -42,13 +42,15 @@ ${
 } from './${fileName}.schema'
 `
     : `
-export type ${upperName} = any
-export type ${upperName}Data = any
-export type ${upperName}Patch = any
-export type ${upperName}Query = any
+type ${upperName} = any
+type ${upperName}Data = any
+type ${upperName}Patch = any
+type ${upperName}Query = any
 `
 }
 
+export type { ${upperName}, ${upperName}Data, ${upperName}Patch, ${upperName}Query }
+
 export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
 }
 
@@ -82,11 +84,6 @@ export const generate = (ctx: ServiceGeneratorContext) =>
     .then(
       renderSource(
         migrationTemplate,
-        toFile<ServiceGeneratorContext>('migrations', ({ kebabName }) => {
-          // Probably not great but it works to align with the Knex migration file format
-          const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14)
-
-          return `${migrationDate}_${kebabName}`
-        })
+        toFile<ServiceGeneratorContext>('migrations', ({ kebabName }) => `${yyyymmddhhmmss()}_${kebabName}`)
       )
     )

package/lib/service/type/mongodb.tpl.js

@@ -18,12 +18,14 @@ ${schema
 } from './${fileName}.schema'
 `
     : `
-export type ${upperName} = any
-export type ${upperName}Data = any
-export type ${upperName}Patch = any
-export type ${upperName}Query = any
+type ${upperName} = any
+type ${upperName}Data = any
+type ${upperName}Patch = any
+type ${upperName}Query = any
 `}
 
+export type { ${upperName}, ${upperName}Data, ${upperName}Patch, ${upperName}Query }
+
 export interface ${upperName}Params extends MongoDBAdapterParams<${upperName}Query> {
 }
 

package/lib/service/type/mongodb.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/service/type/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAGrC,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;oCAKJ,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;cACQ,SAAS;cACT,SAAS;cACT,SAAS;cACT,SAAS;CAEvB;;mBAEmB,SAAS,uCAAuC,SAAS;;;;eAI7D,SAAS,mCAAmC,SAAS;2BACzC,SAAS,KAAK,SAAS,wBAAwB,SAAS;;;;;;gEAMnB,SAAS;;;CAGxE,CAAA;AA5CY,QAAA,QAAQ,YA4CpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,gBAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}
+{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/service/type/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAGrC,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;oCAKJ,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;OACC,SAAS;OACT,SAAS;OACT,SAAS;OACT,SAAS;CAEhB;;gBAEgB,SAAS,KAAK,SAAS,SAAS,SAAS,UAAU,SAAS;;mBAEzD,SAAS,uCAAuC,SAAS;;;;eAI7D,SAAS,mCAAmC,SAAS;2BACzC,SAAS,KAAK,SAAS,wBAAwB,SAAS;;;;;;gEAMnB,SAAS;;;CAGxE,CAAA;AA9CY,QAAA,QAAQ,YA8CpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,gBAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}

package/lib/service/type/mongodb.tpl.ts

@@ -25,13 +25,15 @@ ${
 } from './${fileName}.schema'
 `
     : `
-export type ${upperName} = any
-export type ${upperName}Data = any
-export type ${upperName}Patch = any
-export type ${upperName}Query = any
+type ${upperName} = any
+type ${upperName}Data = any
+type ${upperName}Patch = any
+type ${upperName}Query = any
 `
 }
 
+export type { ${upperName}, ${upperName}Data, ${upperName}Patch, ${upperName}Query }
+
 export interface ${upperName}Params extends MongoDBAdapterParams<${upperName}Query> {
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feathersjs/generators",
-  "version": "5.0.0-pre.35",
+  "version": "5.0.0-pre.37",
   "description": "Feathers CLI core generators, powered by Pinion",
   "homepage": "https://feathersjs.com",
   "keywords": [
@@ -43,7 +43,7 @@
   "scripts": {
     "prepublish": "npm run compile",
     "compile": "shx rm -rf lib/ && tsc && shx cp -r src/. lib/",
-    "test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
+    "test": "npm run compile && mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "directories": {
     "lib": "lib"
@@ -55,35 +55,40 @@
     "@feathershq/pinion": "^0.3.5",
     "chalk": "^4.0.1",
     "lodash": "^4.17.21",
-    "prettier": "^2.8.1"
+    "prettier": "^2.8.3",
+    "typescript": "^4.9.5"
   },
   "devDependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.35",
-    "@feathersjs/authentication": "^5.0.0-pre.35",
-    "@feathersjs/authentication-client": "^5.0.0-pre.35",
-    "@feathersjs/authentication-local": "^5.0.0-pre.35",
-    "@feathersjs/authentication-oauth": "^5.0.0-pre.35",
-    "@feathersjs/configuration": "^5.0.0-pre.35",
-    "@feathersjs/errors": "^5.0.0-pre.35",
-    "@feathersjs/express": "^5.0.0-pre.35",
-    "@feathersjs/feathers": "^5.0.0-pre.35",
-    "@feathersjs/knex": "^5.0.0-pre.35",
-    "@feathersjs/koa": "^5.0.0-pre.35",
-    "@feathersjs/mongodb": "^5.0.0-pre.35",
-    "@feathersjs/rest-client": "^5.0.0-pre.35",
-    "@feathersjs/schema": "^5.0.0-pre.35",
-    "@feathersjs/socketio": "^5.0.0-pre.35",
-    "@feathersjs/transport-commons": "^5.0.0-pre.35",
-    "@feathersjs/typebox": "^5.0.0-pre.35",
+    "@feathersjs/adapter-commons": "^5.0.0-pre.37",
+    "@feathersjs/authentication": "^5.0.0-pre.37",
+    "@feathersjs/authentication-client": "^5.0.0-pre.37",
+    "@feathersjs/authentication-local": "^5.0.0-pre.37",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.37",
+    "@feathersjs/configuration": "^5.0.0-pre.37",
+    "@feathersjs/errors": "^5.0.0-pre.37",
+    "@feathersjs/express": "^5.0.0-pre.37",
+    "@feathersjs/feathers": "^5.0.0-pre.37",
+    "@feathersjs/knex": "^5.0.0-pre.37",
+    "@feathersjs/koa": "^5.0.0-pre.37",
+    "@feathersjs/mongodb": "^5.0.0-pre.37",
+    "@feathersjs/rest-client": "^5.0.0-pre.37",
+    "@feathersjs/schema": "^5.0.0-pre.37",
+    "@feathersjs/socketio": "^5.0.0-pre.37",
+    "@feathersjs/transport-commons": "^5.0.0-pre.37",
+    "@feathersjs/typebox": "^5.0.0-pre.37",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.18",
     "@types/prettier": "^2.7.2",
-    "axios": "^1.2.2",
+    "axios": "^1.3.0",
     "mocha": "^10.2.0",
+    "mongodb": "^5.0.1",
+    "mssql": "^9.1.1",
+    "mysql": "^2.18.1",
+    "pg": "^8.9.0",
     "shx": "^0.3.4",
+    "sqlite3": "^5.1.4",
     "ts-node": "^10.9.1",
-    "type-fest": "^3.5.0",
-    "typescript": "^4.9.4"
+    "type-fest": "^3.5.4"
   },
-  "gitHead": "c641598d9a4de3ceda10f56cf2af288a4236b15e"
+  "gitHead": "17a8b3b2614876772472d3cab3d96d45c01db6ed"
 }