@feathersjs/cli 5.0.0-pre.25 → 5.0.0-pre.28

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

@@ -15,15 +15,21 @@ export class ${className} extends MongoDBService<${upperName}Result, ${upperName
 exports.classCode = classCode;
 const optionTemplate = ({ kebabName }) => `    paginate: app.get('paginate'),
     Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))`;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName, language }) => [
+const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
     ...folder,
-    `${fileName}.${language}`
+    `${fileName}.service`
+]);
+const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    lib,
+    'services',
+    ...folder,
+    `${fileName}.class`
 ]);
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.classCode), (0, pinion_1.before)('export const hooks ='), toServiceFile))
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.importTemplate), (0, pinion_1.prepend)(), toServiceFile))
-    .then((0, pinion_1.inject)(optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile));
+    .then((0, commons_1.injectSource)(exports.classCode, (0, pinion_1.append)(), toClassFile))
+    .then((0, commons_1.injectSource)(exports.importTemplate, (0, pinion_1.prepend)(), toClassFile))
+    .then((0, commons_1.injectSource)(optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile, false));
 exports.generate = generate;
 //# sourceMappingURL=mongodb.tpl.js.map

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,+CAAsF;AACtF,2CAAyC;AAG5B,QAAA,cAAc,GAAG;kEACoC,CAAA;AAE3D,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,uCAAuC,SAAS;;;;eAIhE,SAAS,2BAA2B,SAAS,WAAW,SAAS,SAAS,SAAS;;CAEjG,CAAA;AAPY,QAAA,SAAS,aAOrB;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAChE;gEAC8D,SAAS,KAAK,CAAA;AAE9E,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7F,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,IAAI,QAAQ,EAAE;CAC1B,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAS,CAAC,EAAE,IAAA,eAAM,EAA0B,sBAAsB,CAAC,EAAE,aAAa,CAAC,CACrG;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,sBAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,aAAa,CAAC,CAAC;KACjE,IAAI,CAAC,IAAA,eAAM,EAAC,cAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAA;AAN7D,QAAA,QAAQ,YAMqD"}
+{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/service/type/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,2CAA4C;AAG/B,QAAA,cAAc,GAAG;kEACoC,CAAA;AAE3D,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,uCAAuC,SAAS;;;;eAIhE,SAAS,2BAA2B,SAAS,WAAW,SAAS,SAAS,SAAS;;CAEjG,CAAA;AAPY,QAAA,SAAS,aAOrB;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAChE;gEAC8D,SAAS,KAAK,CAAA;AAE9E,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACnF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,UAAU;CACtB,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACjF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAS,EAAE,IAAA,eAAM,GAAE,EAAE,WAAW,CAAC,CAAC;KACpD,IAAI,CAAC,IAAA,sBAAY,EAAC,sBAAc,EAAE,IAAA,gBAAO,GAAE,EAAE,WAAW,CAAC,CAAC;KAC1D,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAA;AAJ1E,QAAA,QAAQ,YAIkE"}

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

@@ -1,5 +1,5 @@
-import { generator, inject, toFile, before, after, prepend } from '@feathershq/pinion'
-import { getSource } from '../../commons'
+import { generator, toFile, after, prepend, append } from '@feathershq/pinion'
+import { injectSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
 export const importTemplate = `import { MongoDBService } from \'@feathersjs/mongodb\'
@@ -18,17 +18,22 @@ const optionTemplate = ({ kebabName }: ServiceGeneratorContext) =>
   `    paginate: app.get('paginate'),
     Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))`
 
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName, language }) => [
+const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
   lib,
   'services',
   ...folder,
-  `${fileName}.${language}`
+  `${fileName}.service`
+])
+
+const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+  lib,
+  'services',
+  ...folder,
+  `${fileName}.class`
 ])
 
 export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx)
-    .then(
-      inject(getSource(classCode), before<ServiceGeneratorContext>('export const hooks ='), toServiceFile)
-    )
-    .then(inject(getSource(importTemplate), prepend(), toServiceFile))
-    .then(inject(optionTemplate, after('const options ='), toServiceFile))
+    .then(injectSource(classCode, append(), toClassFile))
+    .then(injectSource(importTemplate, prepend(), toClassFile))
+    .then(injectSource(optionTemplate, after('const options ='), toServiceFile, false))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/cli",
   "description": "The command line interface for creating Feathers applications",
-  "version": "5.0.0-pre.25",
+  "version": "5.0.0-pre.28",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "bin": {
@@ -54,34 +54,34 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathershq/pinion": "^0.3.3",
+    "@feathershq/pinion": "^0.3.4",
     "chalk": "^4.0.1",
     "lodash": "^4.17.21",
     "prettier": "^2.7.1"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.25",
-    "@feathersjs/authentication-local": "^5.0.0-pre.25",
-    "@feathersjs/authentication-oauth": "^5.0.0-pre.25",
-    "@feathersjs/configuration": "^5.0.0-pre.25",
-    "@feathersjs/errors": "^5.0.0-pre.25",
-    "@feathersjs/express": "^5.0.0-pre.25",
-    "@feathersjs/feathers": "^5.0.0-pre.25",
-    "@feathersjs/knex": "^5.0.0-pre.25",
-    "@feathersjs/koa": "^5.0.0-pre.25",
-    "@feathersjs/mongodb": "^5.0.0-pre.25",
-    "@feathersjs/schema": "^5.0.0-pre.25",
-    "@feathersjs/socketio": "^5.0.0-pre.25",
-    "@feathersjs/transport-commons": "^5.0.0-pre.25",
+    "@feathersjs/authentication": "^5.0.0-pre.28",
+    "@feathersjs/authentication-local": "^5.0.0-pre.28",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.28",
+    "@feathersjs/configuration": "^5.0.0-pre.28",
+    "@feathersjs/errors": "^5.0.0-pre.28",
+    "@feathersjs/express": "^5.0.0-pre.28",
+    "@feathersjs/feathers": "^5.0.0-pre.28",
+    "@feathersjs/knex": "^5.0.0-pre.28",
+    "@feathersjs/koa": "^5.0.0-pre.28",
+    "@feathersjs/mongodb": "^5.0.0-pre.28",
+    "@feathersjs/schema": "^5.0.0-pre.28",
+    "@feathersjs/socketio": "^5.0.0-pre.28",
+    "@feathersjs/transport-commons": "^5.0.0-pre.28",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.40",
-    "@types/prettier": "^2.6.3",
+    "@types/node": "^18.6.3",
+    "@types/prettier": "^2.6.4",
     "axios": "^0.27.2",
     "mocha": "^10.0.0",
     "shx": "^0.3.4",
-    "ts-node": "^10.8.1",
-    "type-fest": "^2.13.0",
-    "typescript": "^4.7.3"
+    "ts-node": "^10.9.1",
+    "type-fest": "^2.18.0",
+    "typescript": "^4.7.4"
   },
-  "gitHead": "c0ab3b603920dff6e9c912b2767cf168094d45c8"
+  "gitHead": "bf8e54fddc14d688ba8f505e72c9630a71656ff1"
 }